Fixing email templates