Merge "Don't pass a MailAddress pass the email to mail()" into REL1_31