mailer bug fix