Encapsulated parts

1 files changed, 3 insertions, 4 deletions

diff --git a/framework/src/domain/mime/mimetreeparser/textplain.cpp b/framework/src/domain/mime/mimetreeparser/textplain.cpp
index 32201a8a..d62cb2cf 100644
--- a/framework/src/domain/mime/mimetreeparser/textplain.cpp
+++ b/framework/src/domain/mime/mimetreeparser/textplain.cpp
@@ -41,13 +41,12 @@ const Interface::BodyPartFormatter *TextPlainBodyPartFormatter::create()
 MessagePart::Ptr TextPlainBodyPartFormatter::process(Interface::BodyPart &part) const
 {
     KMime::Content *node = part.content();
-    const bool isFirstTextPart = (node->topLevel()->textContent() == node);
 
     TextMessagePart::Ptr mp;
-    if (isFirstTextPart) {
-        mp = TextMessagePart::Ptr(new TextMessagePart(part.objectTreeParser(), node));
+    if (KMime::isAttachment(node)) {
+        mp = AttachmentMessagePart::Ptr(new AttachmentMessagePart(part.objectTreeParser(), node));
     } else {
-        mp = TextMessagePart::Ptr(new AttachmentMessagePart(part.objectTreeParser(), node));
+        mp = TextMessagePart::Ptr(new TextMessagePart(part.objectTreeParser(), node));
     }
 
     return mp;