Fix another mailing issue (based on #1281)
2 files changed