From d1c2a688dfa67e2fcd095640ed2419cf4b36f862 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Fri, 15 Nov 2019 22:09:09 +0100
Subject: [PATCH] Prefer Date header over INTERNALDATE

Servers have so many bugs, does nobody pay attention?
---
 app/src/main/java/eu/faircode/email/MessageHelper.java | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/app/src/main/java/eu/faircode/email/MessageHelper.java b/app/src/main/java/eu/faircode/email/MessageHelper.java
index 259ed2e3bc..26da91c0d9 100644
--- a/app/src/main/java/eu/faircode/email/MessageHelper.java
+++ b/app/src/main/java/eu/faircode/email/MessageHelper.java
@@ -772,6 +772,16 @@ public class MessageHelper {
     }
 
     long getReceived() throws MessagingException {
+        String date = imessage.getHeader("Date", null);
+        if (date != null) {
+            try {
+                Date received = new MailDateFormat().parse(date);
+                Log.i("Parsed received=" + received);
+                return received.getTime();
+            } catch (java.text.ParseException ignored) {
+            }
+        }
+
         Date received = imessage.getReceivedDate();
         if (received == null)
             received = imessage.getSentDate();