2 files changed, 2 insertions, 1 deletions

diff --git a/framework/src/domain/mime/mailtemplates.cpp b/framework/src/domain/mime/mailtemplates.cpp
index 74d9f3ae..c562698f 100644
--- a/framework/src/domain/mime/mailtemplates.cpp
+++ b/framework/src/domain/mime/mailtemplates.cpp
@@ -979,7 +979,7 @@ KMime::Message::Ptr MailTemplates::createMessage(KMime::Message::Ptr existingMes
     mail->from(true)->addAddress(from);
 
     mail->subject(true)->fromUnicodeString(subject, "utf-8");
-    if (!mail->messageID()) {
+    if (!mail->messageID(false)) {
         auto fqdn = QUrl::toAce(QHostInfo::localHostName());
         if (fqdn.isEmpty()) {
             qWarning() << "Unable to generate a Message-ID, falling back to 'localhost.localdomain'.";
diff --git a/framework/src/domain/mime/tests/mailtemplatetest.cpp b/framework/src/domain/mime/tests/mailtemplatetest.cpp
index b0d91182..302fae95 100644
--- a/framework/src/domain/mime/tests/mailtemplatetest.cpp
+++ b/framework/src/domain/mime/tests/mailtemplatetest.cpp
@@ -242,6 +242,7 @@ private slots:
         QCOMPARE(result->body(), body.toUtf8());
         QVERIFY(result->date(false)->dateTime().isValid());
         QVERIFY(result->contentType()->isMimeType("text/plain"));
+        QVERIFY(result->messageID(false) && !result->messageID(false)->isEmpty());
     }
 
     void testCreateHtmlMail()