Fix mailer
Fix mailer view