Fix mailer bug