rework of EmailAddress