added mailer file
merge changes, but shouldn't have effected functionality. I just took garrett's changes.
resolve mailer merge conflict