Mailer bug fix