Added support for Mandatory Error message in email!