Set the plain type for plain mails

2 files changed, 2 insertions, 0 deletions

diff --git a/framework/src/domain/mime/mailtemplates.cpp b/framework/src/domain/mime/mailtemplates.cpp
index ce1cd52f..8c7904e0 100644
--- a/framework/src/domain/mime/mailtemplates.cpp
+++ b/framework/src/domain/mime/mailtemplates.cpp
@@ -972,6 +972,7 @@ KMime::Message::Ptr MailTemplates::createMessage(KMime::Message::Ptr existingMes
     } else {
         //FIXME same implementation as above for attachments
         mail->setBody(body.toUtf8());
+        mail->contentType(true)->setMimeType("text/plain");
     }
 
     mail->assemble();
diff --git a/framework/src/domain/mime/tests/mailtemplatetest.cpp b/framework/src/domain/mime/tests/mailtemplatetest.cpp
index eccb3aa7..cc0fd61e 100644
--- a/framework/src/domain/mime/tests/mailtemplatetest.cpp
+++ b/framework/src/domain/mime/tests/mailtemplatetest.cpp
@@ -124,6 +124,7 @@ private slots:
         QCOMPARE(result->subject()->asUnicodeString(), subject);
         QCOMPARE(result->body(), body.toUtf8());
         QVERIFY(result->date(false)->dateTime().isValid());
+        QVERIFY(result->contentType()->isMimeType("text/plain"));
     }
 
     void testCreatePlainMailWithAttachments()