A couple of fixes to the mailers

I did these while investigating a delivery problem, but they are a handy side effect.