SOC-3828 | Some UI problems in the notification emails