From 659a4b38496b1720b0f90872fed364ab00cb63db Mon Sep 17 00:00:00 2001
From: Christian Mollekopf <chrigi_1@fastmail.fm>
Date: Wed, 2 Aug 2017 17:18:42 -0600
Subject: Hostname based messageid

---
 framework/src/domain/mime/mailtemplates.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/framework/src/domain/mime/mailtemplates.cpp b/framework/src/domain/mime/mailtemplates.cpp
index 8c7904e0..608f7546 100644
--- a/framework/src/domain/mime/mailtemplates.cpp
+++ b/framework/src/domain/mime/mailtemplates.cpp
@@ -29,6 +29,7 @@
 #include <QWebEngineSettings>
 #include <QWebEngineScript>
 #include <QSysInfo>
+#include <QHostInfo>
 #include <QTextCodec>
 #include <QTextDocument>
 
@@ -954,7 +955,12 @@ KMime::Message::Ptr MailTemplates::createMessage(KMime::Message::Ptr existingMes
 
     mail->subject(true)->fromUnicodeString(subject, "utf-8");
     if (!mail->messageID()) {
-        mail->messageID(true)->generate("org.kde.kube");
+        auto fqdn = QUrl::toAce(QHostInfo::localHostName());
+        if (fqdn.isEmpty()) {
+            qWarning() << "Unable to generate a Message-ID, falling back to 'localhost.localdomain'.";
+            fqdn = "local.domain";
+        }
+        mail->messageID(true)->generate(fqdn);
     }
     if (!mail->date(true)->dateTime().isValid()) {
         mail->date(true)->setDateTime(QDateTime::currentDateTimeUtc());
-- 
cgit v1.2.3