Add mailer config
Merge branch 'master' into stable