--- a/roundup/anypy/email_.py	Fri May 09 17:32:44 2014 +1000
+++ b/roundup/anypy/email_.py	Fri May 09 18:23:54 2014 +1000
@@ -17,26 +17,6 @@
 email.Header.Header.__dict__['__init__'] = _unifiedheaderinit
 ##
 
-try:
-    # Python 2.5+
-    from email.parser import FeedParser
-except ImportError:
-    # Python 2.4
-    try :
-        from email.Parser import FeedParser
-    except ImportError:
-        from email.Parser import Parser
-        class FeedParser:
-            def __init__(self):
-                self.content = []
-
-            def feed(self, s):
-                self.content.append(s)
-
-            def close(self):
-                p = Parser()
-                return p.parsestr(''.join(self.content))
-
 # Match encoded-word strings in the form =?charset?q?Hello_World?=
 ecre = re.compile(r'''
   =\?                   # literal =?

--- a/roundup/roundupdb.py	Fri May 09 17:32:44 2014 +1000
+++ b/roundup/roundupdb.py	Fri May 09 18:23:54 2014 +1000
@@ -25,14 +25,13 @@
 import os.path
 import logging
 from email import Encoders
+from email.parser import FeedParser
 from email.Utils import formataddr
 from email.Header import Header
 from email.MIMEText import MIMEText
 from email.MIMEBase import MIMEBase
 from email.MIMEMultipart import MIMEMultipart
 
-from anypy.email_ import FeedParser
-
 from roundup import password, date, hyperdb
 from roundup.i18n import _
 from roundup.hyperdb import iter_roles