More changes to mailer.