diff --git a/offlineimap/folder/Maildir.py b/offlineimap/folder/Maildir.py
index ca42e13..205feea 100644
--- a/offlineimap/folder/Maildir.py
+++ b/offlineimap/folder/Maildir.py
@@ -366,9 +366,8 @@ class MaildirFolder(BaseFolder):
                         content, 'Delivery-date')
             except Exception as e:
                 # This should never happen.
-                from email.Parser import Parser
                 from offlineimap.ui import getglobalui
-                datestr = Parser().parsestr(content, True).get("Date")
+                datestr = emailutil.get_message_date(content)
                 ui = getglobalui()
                 ui.warn("UID %d has invalid date %s: %s\n"
                         "Not using message timestamp as file prefix" %
@@ -387,9 +386,8 @@ class MaildirFolder(BaseFolder):
             # In case date is wrongly so far into the future as to be > max
             # int32.
             except Exception as e:
-                from email.Parser import Parser
                 from offlineimap.ui import getglobalui
-                datestr = Parser().parsestr(content, True).get("Date")
+                datestr = emailutil.get_message_date(content)
                 ui = getglobalui()
                 ui.warn("UID %d has invalid date %s: %s\n"
                         "Not changing file modification time" % (uid, datestr, e))