Mailer fixes