modifications to mailer