From 92a34626b807f554512a66f4734310cdba142ba8 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sun, 27 Aug 2023 08:40:24 +0200
Subject: [PATCH] Added another Outlook sent messages fallback

---
 app/src/main/java/eu/faircode/email/Core.java       | 13 ++++++++++++-
 .../main/java/eu/faircode/email/MessageHelper.java  |  1 +
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/eu/faircode/email/Core.java b/app/src/main/java/eu/faircode/email/Core.java
index 9eabb5ffbc..2621efedb3 100644
--- a/app/src/main/java/eu/faircode/email/Core.java
+++ b/app/src/main/java/eu/faircode/email/Core.java
@@ -2289,7 +2289,8 @@ class Core {
                     " host=" + account.host +
                     " outlook=" + account.isOutlook() +
                     " messages=" + (imessages == null ? null : imessages.length));
-            imessages = ifolder.search(new HeaderTerm("X-Microsoft-Original-Message-ID", message.msgid));
+            imessages = ifolder.search(
+                    new HeaderTerm(MessageHelper.HEADER_MICROSOFT_ORIGINAL_MESSAGE_ID, message.msgid));
         }
 
         // Searching for random header:
@@ -4411,6 +4412,16 @@ class Core {
             String msgid = helper.getMessageID();
             Log.i(folder.name + " searching for " + msgid);
             List<EntityMessage> dups = db.message().getMessagesByMsgId(folder.account, msgid);
+            if (dups.size() == 0 &&
+                    account.isOutlook() &&
+                    EntityFolder.SENT.equals(folder.type)) {
+                String originalId = imessage.getHeader(MessageHelper.HEADER_MICROSOFT_ORIGINAL_MESSAGE_ID, null);
+                if (originalId != null) {
+                    dups = db.message().getMessagesByMsgId(folder.account, originalId);
+                    EntityLog.log(context, folder.name + " found with original ID" +
+                            " msgid=" + msgid + " count=" + dups.size());
+                }
+            }
             for (EntityMessage dup : dups) {
                 EntityFolder dfolder = db.folder().getFolder(dup.folder);
                 Log.i(folder.name + " found as id=" + dup.id + "/" + dup.uid +
diff --git a/app/src/main/java/eu/faircode/email/MessageHelper.java b/app/src/main/java/eu/faircode/email/MessageHelper.java
index 7c0a4d88f0..596cf3c99d 100644
--- a/app/src/main/java/eu/faircode/email/MessageHelper.java
+++ b/app/src/main/java/eu/faircode/email/MessageHelper.java
@@ -177,6 +177,7 @@ public class MessageHelper {
     static final int SMALL_MESSAGE_SIZE = 192 * 1024; // bytes
     static final int DEFAULT_DOWNLOAD_SIZE = 4 * 1024 * 1024; // bytes
     static final String HEADER_CORRELATION_ID = "X-Correlation-ID";
+    static final String HEADER_MICROSOFT_ORIGINAL_MESSAGE_ID = "X-Microsoft-Original-Message-ID";
     static final int MAX_SUBJECT_AGE = 48; // hours
     static final int DEFAULT_THREAD_RANGE = 7; // 2^7 = 128 days
     static final int MAX_UNZIP_COUNT = 20;