Client Side email templates processing improvements

This update improves the processing of Client Side email templates.
Exploit Type
Product Name