From 7b821a6f7bc2fe75c91ee071ddb711a4774b9635 Mon Sep 17 00:00:00 2001 From: Christian Mollekopf Date: Fri, 23 Mar 2018 16:28:45 +0100 Subject: Make sure we don't end up with any CRLF's --- framework/src/domain/mime/mailtemplates.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/framework/src/domain/mime/mailtemplates.cpp b/framework/src/domain/mime/mailtemplates.cpp index 997eb3ae..a614da1a 100644 --- a/framework/src/domain/mime/mailtemplates.cpp +++ b/framework/src/domain/mime/mailtemplates.cpp @@ -951,8 +951,7 @@ void MailTemplates::forward(const KMime::Message::Ptr &origMsg, fwdAttachment->contentDisposition()->setDisposition(KMime::Headers::CDinline); fwdAttachment->contentType()->setMimeType("message/rfc822"); fwdAttachment->contentDisposition()->setFilename(forwardedMessage->subject()->asUnicodeString() + ".eml"); - // The mail was parsed in loadMessage before, so no need to assemble it - fwdAttachment->setBody(forwardedMessage->encodedContent()); + fwdAttachment->setBody(KMime::CRLFtoLF(forwardedMessage->encodedContent(false))); wrapperMsg->addContent(fwdAttachment); wrapperMsg->assemble(); -- cgit v1.2.3