setup mailer
Merge branch 'mailer-v2'
rid mailer