Reflect change in mailer 1.6
Amend 7247a94dc0677fc0ba2e19a95e167e11be53a0af