but neglected to incorporate 43578's changes to Lib/email/test/test_email.py. As a result, all the buildbots have failed test_email on the branch since then. This should repair it.