From 9ec84cf80ff0547268406089559f98d7faa7e080 Mon Sep 17 00:00:00 2001
From: Jacek Piszczek <jacadcaps@runbox.com>
Date: Wed, 24 Mar 2021 14:24:35 -0400
Subject: [PATCH] Process Message-ID and In-Reply-To in EVELOPE

---
 src/vmime/net/imap/IMAPMessage.cpp | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/vmime/net/imap/IMAPMessage.cpp b/src/vmime/net/imap/IMAPMessage.cpp
index f74a4a4b..d3134a93 100644
--- a/src/vmime/net/imap/IMAPMessage.cpp
+++ b/src/vmime/net/imap/IMAPMessage.cpp
@@ -571,6 +571,16 @@ int IMAPMessage::processFetchResponse(
 					if (!bcc.isEmpty()) {
 						hdr->Bcc()->setValue(bcc.toAddressList());
 					}
+
+					// Message-ID
+					if (!env->env_message_id->isNIL) {
+						hdr->MessageId()->setValue(messageId(env->env_message_id->value));
+					}
+
+					// In-Reply-To
+					if (!env->env_in_reply_to->isNIL) {
+						hdr->InReplyTo()->setValue(messageIdSequence(env->env_message_id->value));
+					}
 				}
 
 				break;