--- Message.py.orig	2004-12-22 16:01:38.000000000 +0100
+++ Message.py	2006-03-28 10:59:42.000000000 +0200
@@ -126,7 +126,7 @@
         """
         from email.Generator import Generator
         fp = StringIO()
-        g = Generator(fp)
+        g = Generator(fp,mangle_from_=unixfrom)
         g.flatten(self, unixfrom=unixfrom)
         return fp.getvalue()