New mailer
Merge pull request #567 from ndomar/switching_user_mailer

New mailer