ZEN-11961: Email sending works fine now