From e8632e18e0bef91873c6024073b5f461c07d6fe3 Mon Sep 17 00:00:00 2001
From: Christian Mollekopf <chrigi_1@fastmail.fm>
Date: Tue, 20 Feb 2018 19:04:04 +0100
Subject: Fixed encrypted+signed messages

---
 .../src/domain/mime/mimetreeparser/messagepart.cpp    | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

(limited to 'framework/src/domain/mime/mimetreeparser/messagepart.cpp')

diff --git a/framework/src/domain/mime/mimetreeparser/messagepart.cpp b/framework/src/domain/mime/mimetreeparser/messagepart.cpp
index 5b532524..4f27704f 100644
--- a/framework/src/domain/mime/mimetreeparser/messagepart.cpp
+++ b/framework/src/domain/mime/mimetreeparser/messagepart.cpp
@@ -891,18 +891,19 @@ void SignedMessagePart::setVerificationResult(const GpgME::VerificationResult &r
         sigStatusToMetaData();
         if (mNode && !textNode) {
             mOtp->mNodeHelper->setPartMetaData(mNode, mMetaData);
-            if (!mVerifiedText.isEmpty()) {
-                auto tempNode = new KMime::Content();
-                tempNode->setContent(KMime::CRLFtoLF(mVerifiedText.constData()));
-                tempNode->parse();
-                bindLifetime(tempNode);
+        }
+
+        if (!mVerifiedText.isEmpty() && !textNode) {
 
-                if (!tempNode->head().isEmpty()) {
-                    tempNode->contentDescription()->from7BitString("signed data");
-                }
+            auto tempNode = new KMime::Content();
+            tempNode->setContent(KMime::CRLFtoLF(mVerifiedText.constData()));
+            tempNode->parse();
+            bindLifetime(tempNode);
 
-                parseInternal(tempNode, false);
+            if (!tempNode->head().isEmpty()) {
+                tempNode->contentDescription()->from7BitString("signed data");
             }
+            parseInternal(tempNode, false);
         }
     }
 }
-- 
cgit v1.2.3