--- /opt/apache2/vhosts/vc.taajama.com/src/0.9-stable/trac/Notify.py	Tue Nov  8 16:55:05 2005
+++ Notify.py	Wed Nov 16 18:45:39 2005
@@ -172,9 +172,17 @@
         msg = MIMEText(body, 'plain', 'utf-8')
         self.add_headers(msg, headers);
         self.add_headers(msg, mime_headers);
-
-        self.env.log.debug("Sending SMTP notification to %s on port %d"
-                           % (self.smtp_server, self.smtp_port))
+        if msg.__contains__('MIME-Version'):
+            msg.__delitem__('MIME-Version')
+        if msg.__contains__('Content-Transfer-Encoding'):
+            msg.__delitem__('Content-Transfer-Encoding')
+        if msg.__contains__('Content-Type'):
+            msg.__delitem__('Content-Type')
+        msg['MIME-Version']=unicode('1.0','ascii')
+        msg['Content-Transfer-Encoding']=unicode('Base64','ascii')
+        msg['Content-Type']=unicode('text/plain','ascii')
+        self.env.log.debug("Sending SMTP notification to %s:%d content:\n%s"
+                           % (self.smtp_server, self.smtp_port,msg.as_string()))
         self.server.sendmail(self.from_email, [rcpt], msg.as_string())
 
     def finish_send(self):