Added email address encoding