[1.3] [1.4] Fix failure in email tests
Merge pull request #18213 from viorelaioia/bug_994630_v1.3

 [1.3] [1.4] Fix failure in email tests