fix view models to be used with MailAddress class