Mailer view fixes