FORV-11 Deployment of email content fix