Mailer changes for Heroku