Bug 991010 - Fix intermittent failure of test_email_XXX.py