Fix up date parsing to use message date if no rtime is available

diff --git a/offlineimap/folder/IMAP.py b/offlineimap/folder/IMAP.py
index 8a4f7e41741ba18e9b6d560052d5f71e8d52d72c..d89059670e2985668192ae793365f467b2369cf4 100644 (file)
--- a/offlineimap/folder/IMAP.py
+++ b/offlineimap/folder/IMAP.py
@@ -197,9 +197,15 @@ class IMAPFolder(BaseFolder):
             # This backend always assigns a new uid, so the uid arg is ignored.
             # In order to get the new uid, we need to save off the message ID.
 
+            message = rfc822.Message(StringIO(content))
+            datetuple_msg = rfc822.parsedate(message.getheader('Date'))
+            # Will be None if missing or not in a valid format.
+
             # If time isn't known
-            if rtime == None:
+            if rtime == None and datetuple_msg == None:
                 datetuple = time.localtime()
+            elif rtime == None:
+                datetuple = datetuple_msg
             else:
                 datetuple = time.localtime(rtime)