Updates mailer settings
Merge branch 'development'