Enhancements to the mailer.