--- google/appengine/api/mail.py.orig	2011-08-15 14:16:02.000000000 -0700
+++ google/appengine/api/mail.py	2011-08-23 15:17:35.000000000 -0700
@@ -510,6 +510,9 @@ def mail_message_to_mime_message(protoco
   result['Reply-To'] = protocol_message.replyto()
   result['Subject'] = protocol_message.subject()
 
+  for header in protocol_message.header_list():
+    result[header.name()] = header.value()
+
   return result
 
 
@@ -1352,4 +1355,3 @@ class InboundEmailMessage(EmailMessage):
 
 
 Parser.Parser
-