diff --git a/Lib/rfc822.py b/Lib/rfc822.py
index 826269fe1a1..0ce546ced77 100644
--- a/Lib/rfc822.py
+++ b/Lib/rfc822.py
@@ -495,7 +495,7 @@ def quote(str):
 def parseaddr(address):
     """Parse an address into a (realname, mailaddr) tuple."""
     a = AddressList(address)
-    list = a.getaddrlist()
+    list = a.addresslist
     if not list:
         return (None, None)
     else:
diff --git a/Lib/test/test_rfc822.py b/Lib/test/test_rfc822.py
index dfce7c91512..6add15b16d4 100644
--- a/Lib/test/test_rfc822.py
+++ b/Lib/test/test_rfc822.py
@@ -213,6 +213,15 @@ def test_2getaddrlist(self):
         addrs.sort()
         eq(addrs, ccs)
 
+    def test_parseaddr(self):
+        eq = self.assertEqual
+        eq(rfc822.parseaddr('<>'), ('', ''))
+        eq(rfc822.parseaddr('aperson@dom.ain'), ('', 'aperson@dom.ain'))
+        eq(rfc822.parseaddr('bperson@dom.ain (Bea A. Person)'),
+           ('Bea A. Person', 'bperson@dom.ain'))
+        eq(rfc822.parseaddr('Cynthia Person <cperson@dom.ain>'),
+           ('Cynthia Person', 'cperson@dom.ain'))
+
 def test_main():
     test_support.run_unittest(MessageTestCase)