{IMP}[website_mail] Improved code for mail templates(issues fixed for thunderbird mail)