UI-3069 CLONE - Some UI problems in the notification emails