Time fallbacks

3 years ago · ccf888cd77
parent ce0334bd2a
commit ccf888cd77
1 changed files with 5 additions and 3 deletions
--- a/app/src/main/java/eu/faircode/email/Core.java
+++ b/app/src/main/java/eu/faircode/email/Core.java
@ -2912,10 +2912,10 @@ class Core {
                            msgid = helper.getMessageID();

                            if (TextUtils.isEmpty(msgid)) {
-                                Long time = helper.getReceived();
+                                Long time = helper.getSent();
                                if (time == null)
-                                    time = helper.getSent();
-                                if (time != null)
+                                    msgid = helper.getHash();
+                                else
                                    msgid = Long.toString(time);
                            }
                        }
@ -3943,6 +3943,8 @@ class Core {
                if (received == null || received == 0 || received > future)
                    received = helper.getReceivedHeader();
            }
+            if (received == null || received == 0)
+                received = sent;
            if (received == null)
                received = 0L;