Further refinements to email templates.