1 files changed, 7 insertions, 0 deletions

diff --git a/common/mailpreprocessor.cpp b/common/mailpreprocessor.cpp
index bde8a64..1366718 100644
--- a/common/mailpreprocessor.cpp
+++ b/common/mailpreprocessor.cpp
@@ -127,6 +127,13 @@ static void updatedIndexedProperties(Sink::ApplicationDomain::Mail &mail, KMime:
             parentMessageId = inReplyTo.first();
         }
     }
+    if (messageId.isEmpty()) {
+        auto tmp = KMime::Message::Ptr::create();
+        auto header = tmp->messageID(true);
+        header->generate("kube.kde.org");
+        messageId = header->as7BitString();
+        SinkWarning() << "Message id is empty, generating one: " << messageId;
+    }
 
     mail.setExtractedMessageId(messageId);
     if (!parentMessageId.isEmpty()) {