Mailer fix
Merge branch 'hotfix/mailerfix'