Merge "Add missing properties to MailAddress class"