fixed naming issue and DRYed up the default mailer :from