diff -r 50d721553198 -r c80feeb715d1 mercurial/mail.py
--- a/mercurial/mail.py	Fri Sep 20 09:16:07 2013 -0400
+++ b/mercurial/mail.py	Tue Sep 24 15:10:32 2013 -0400
@@ -9,6 +9,10 @@
 import util, encoding, sslutil
 import os, smtplib, socket, quopri, time, sys
 import email
+# On python2.4 you have to import these by name or they fail to
+# load. This was not a problem on Python 2.7.
+import email.Header
+import email.MIMEText
 
 _oldheaderinit = email.Header.Header.__init__
 def _unifiedheaderinit(self, *args, **kw):