Reverting the Revision: 77368.  I committed Flox's big patch for tests by
mistake. ( It may come in for sure tough)
diff --git a/Lib/test/test_mailbox.py b/Lib/test/test_mailbox.py
index 01b1c36..548850a 100644
--- a/Lib/test/test_mailbox.py
+++ b/Lib/test/test_mailbox.py
@@ -5,6 +5,7 @@
 import socket
 import email
 import email.message
+import rfc822
 import re
 import StringIO
 from test import test_support
@@ -16,8 +17,6 @@
 except ImportError:
     pass
 
-# Silence Py3k warning
-rfc822 = test_support.import_module('rfc822')
 
 class TestBase(unittest.TestCase):