Fixes to mailer.