More fixes for old email templates.
Closes #1469