diff --git a/app/src/main/java/eu/faircode/email/Core.java b/app/src/main/java/eu/faircode/email/Core.java index 13830f482a..6e220343d3 100644 --- a/app/src/main/java/eu/faircode/email/Core.java +++ b/app/src/main/java/eu/faircode/email/Core.java @@ -1267,7 +1267,7 @@ class Core { imessages = ifolder.search( new AndTerm( new SentDateTerm(ComparisonTerm.GE, new Date()), - new HeaderTerm("X-Correlation-ID", message.msgid))); + new HeaderTerm(MessageHelper.HEADER_CORRELATION_ID, message.msgid))); } catch (MessagingException ex) { Log.e(ex); } diff --git a/app/src/main/java/eu/faircode/email/MessageHelper.java b/app/src/main/java/eu/faircode/email/MessageHelper.java index 5157c695a6..021e40cd9e 100644 --- a/app/src/main/java/eu/faircode/email/MessageHelper.java +++ b/app/src/main/java/eu/faircode/email/MessageHelper.java @@ -109,6 +109,7 @@ public class MessageHelper { static final int SMALL_MESSAGE_SIZE = 64 * 1024; // bytes static final int DEFAULT_ATTACHMENT_DOWNLOAD_SIZE = 256 * 1024; // bytes + static final String HEADER_CORRELATION_ID = "X-Correlation-ID"; private static final int MAX_MESSAGE_SIZE = 10 * 1024 * 1024; // bytes private static final long ATTACHMENT_PROGRESS_UPDATE = 1500L; // milliseconds @@ -180,7 +181,7 @@ public class MessageHelper { imessage.addHeader("References", message.references); if (message.inreplyto != null) imessage.addHeader("In-Reply-To", message.inreplyto); - imessage.addHeader("X-Correlation-ID", message.msgid); + imessage.addHeader(HEADER_CORRELATION_ID, message.msgid); // Addresses if (message.from != null && message.from.length > 0) { @@ -791,7 +792,7 @@ public class MessageHelper { ensureMessage(false); // Outlook outbox -> sent - String header = imessage.getHeader("X-Correlation-ID", null); + String header = imessage.getHeader(HEADER_CORRELATION_ID, null); if (header == null) header = imessage.getHeader("Message-ID", null); return (header == null ? null : MimeUtility.unfold(header));