Bug 991010 - Fix intermittent failure of test_email_XXX.py
Merge pull request #17887 from askeing/991010

Bug 991010 - Fix intermittent failure of test_email_XXX.py