views/mbox: Use Date: header from original message

[patchwork] / apps / patchwork / views / __init__.py

diff --git a/apps/patchwork/views/__init__.py b/apps/patchwork/views/__init__.py
index cb35c1fda7f145e3c6854e7ad6916d265117b527..681532a5cfaeb26a86c0f8e1c6211e11cd931f2d 100644 (file)
--- a/apps/patchwork/views/__init__.py
+++ b/apps/patchwork/views/__init__.py
@@ -195,7 +195,6 @@ def patch_to_mbox(patch):
 
     mail = PatchMbox(body)
     mail['Subject'] = patch.name
-    mail['Date'] = email.utils.formatdate(utc_timestamp)
     mail['From'] = email.utils.formataddr((
                     str(Header(patch.submitter.name, mail.patch_charset)),
                     patch.submitter.email))
@@ -204,10 +203,13 @@ def patch_to_mbox(patch):
     mail.set_unixfrom('From patchwork ' + patch.date.ctime())
 
 
-    copied_headers = ['To', 'Cc']
+    copied_headers = ['To', 'Cc', 'Date']
     orig_headers = HeaderParser().parsestr(str(patch.headers))
     for header in copied_headers:
         if header in orig_headers:
             mail[header] = orig_headers[header]
 
+    if 'Date' not in mail:
+        mail['Date'] = email.utils.formatdate(utc_timestamp)
+
     return mail