NXP-13892: Enhance the email templates