Mailer setup for the contact section
Merge branch 'mail-setup'