SSP-2427 updates for email formatting through message templates