Add contact Mailer
Merge branch 'Contact-mailer'
Contact mailer fix