Minor changes to mailer