ES-957 and additional adjustments for the email side