--- a/mercurial/mail.py	Fri Sep 20 10:15:51 2013 -0400
+++ b/mercurial/mail.py	Fri Sep 20 10:16:02 2013 -0400
@@ -8,7 +8,7 @@
 from i18n import _
 import util, encoding, sslutil
 import os, smtplib, socket, quopri, time, sys
-import email.Header, email.MIMEText, email.Utils
+import email
 
 _oldheaderinit = email.Header.Header.__init__
 def _unifiedheaderinit(self, *args, **kw):