Edited mailing model
Merge branch 'mailer_mayhem'

No comment