mailer fixes