2 files changed, 6 insertions, 14 deletions

diff --git a/framework/src/domain/mime/mimetreeparser/multipartencrypted.cpp b/framework/src/domain/mime/mimetreeparser/multipartencrypted.cpp
index 5316a6a7..30fe4bc0 100644
--- a/framework/src/domain/mime/mimetreeparser/multipartencrypted.cpp
+++ b/framework/src/domain/mime/mimetreeparser/multipartencrypted.cpp
@@ -57,8 +57,7 @@ MessagePart::Ptr MultiPartEncryptedBodyPartFormatter::process(Interface::BodyPar
     KMime::Content *data = findTypeInDirectChilds(node, "application/octet-stream");
     if (data) {
         useThisCryptProto = GpgME::OpenPGP;
-    }
-    if (!data) {
+    } else {
         data = findTypeInDirectChilds(node, "application/pkcs7-mime");
         if (data) {
             useThisCryptProto = GpgME::CMS;
diff --git a/framework/src/domain/mime/mimetreeparser/objecttreeparser.cpp b/framework/src/domain/mime/mimetreeparser/objecttreeparser.cpp
index b5cbd35b..e86f138b 100644
--- a/framework/src/domain/mime/mimetreeparser/objecttreeparser.cpp
+++ b/framework/src/domain/mime/mimetreeparser/objecttreeparser.cpp
@@ -456,19 +456,13 @@ MessagePart::Ptr ObjectTreeParser::parseObjectTreeInternal(KMime::Content *node,
 
         //Try the specific type handler
         if (auto mp = processType(node, mediaType, subType)) {
-            if (mp) {
-                parsedPart->appendSubPart(mp);
-            }
+            parsedPart->appendSubPart(mp);
         //Fallback to the generic handler
         } else if (auto mp = processType(node, mediaType, "*")) {
-            if (mp) {
-                parsedPart->appendSubPart(mp);
-            }
+            parsedPart->appendSubPart(mp);
         //Fallback to the default handler
-        } else {
-            if (auto mp = defaultHandling(node)) {
-                parsedPart->appendSubPart(mp);
-            }
+        } else if (auto mp = defaultHandling(node)) {
+            parsedPart->appendSubPart(mp);
         }
         mNodeHelper->setNodeProcessed(node, false);
 
@@ -492,8 +486,7 @@ MessagePart::Ptr ObjectTreeParser::defaultHandling(KMime::Content *node)
         }
     }
 
-    const auto mp = AttachmentMessagePart::Ptr(new AttachmentMessagePart(this, node));
-    return mp;
+    return AttachmentMessagePart::Ptr(new AttachmentMessagePart(this, node));
 }
 
 const QTextCodec *ObjectTreeParser::codecFor(KMime::Content *node) const