Making some changes to mailer.