Make the mailer code clearer