[PATCH 05 of 13 V2 py3 support] mail: correct import of email module

[Augie Fackler]

# HG changeset patch
# User Augie Fackler <raf at durin42.com>
# Date 1379686562 14400
#      Fri Sep 20 10:16:02 2013 -0400
# Node ID 555ffd018f135ea23418543b2c9918a5e9a6f218
# Parent  bf06b242df1e84113ab661e9128af90448f2df13
mail: correct import of email module

diff --git a/mercurial/mail.py b/mercurial/mail.py
--- a/mercurial/mail.py
+++ b/mercurial/mail.py
@@ -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):