6 files changed, 64 insertions, 17 deletions

diff --git a/framework/src/domain/mime/mimetreeparser/messagepart.cpp b/framework/src/domain/mime/mimetreeparser/messagepart.cpp
index 00abb003..df4dfeac 100644
--- a/framework/src/domain/mime/mimetreeparser/messagepart.cpp
+++ b/framework/src/domain/mime/mimetreeparser/messagepart.cpp
@@ -1292,3 +1292,18 @@ QString EncapsulatedRfc822MessagePart::text() const
     return renderInternalText();
 }
 
+QString EncapsulatedRfc822MessagePart::from() const
+{
+    if (auto from = mMessage->from(false)) {
+        return from->asUnicodeString();
+    }
+    return {};
+}
+
+QDateTime EncapsulatedRfc822MessagePart::date() const
+{
+    if (auto date = mMessage->date(false)) {
+        return date->dateTime();
+    }
+    return {};
+}
diff --git a/framework/src/domain/mime/mimetreeparser/messagepart.h b/framework/src/domain/mime/mimetreeparser/messagepart.h
index dd3a842f..7d266ac5 100644
--- a/framework/src/domain/mime/mimetreeparser/messagepart.h
+++ b/framework/src/domain/mime/mimetreeparser/messagepart.h
@@ -281,6 +281,8 @@ public:
     virtual ~EncapsulatedRfc822MessagePart();
 
     QString text() const Q_DECL_OVERRIDE;
+    QString from() const;
+    QDateTime date() const;
 private:
     const KMime::Message::Ptr mMessage;
 
diff --git a/framework/src/domain/mime/mimetreeparser/objecttreeparser.cpp b/framework/src/domain/mime/mimetreeparser/objecttreeparser.cpp
index b137be87..8d8ddf12 100644
--- a/framework/src/domain/mime/mimetreeparser/objecttreeparser.cpp
+++ b/framework/src/domain/mime/mimetreeparser/objecttreeparser.cpp
@@ -190,20 +190,17 @@ KMime::Content *ObjectTreeParser::find(const std::function<bool(KMime::Content *
  * Filter to avoid evaluating a subtree.
  * Select parts to include it in the result set. Selecting a part in a branch will keep any parent parts from being selected.
  */
-static QVector<MessagePart::Ptr> collect(MessagePart::Ptr start, const std::function<bool(const MessagePartPtr &)> &filter, const std::function<bool(const MessagePartPtr &)> &select)
+static QVector<MessagePart::Ptr> collect(MessagePart::Ptr start, const std::function<bool(const MessagePartPtr &)> &evaluateSubtree, const std::function<bool(const MessagePartPtr &)> &select)
 {
     MessagePartPtr ptr = start.dynamicCast<MessagePart>();
     Q_ASSERT(ptr);
-    if (!filter(ptr)) {
-        return {};
-    }
-
     QVector<MessagePart::Ptr> list;
-    if (ptr) {
+    if (evaluateSubtree(ptr)) {
         for (const auto &p: ptr->subParts()) {
-            list << ::collect(p, filter, select);
+            list << ::collect(p, evaluateSubtree, select);
         }
     }
+
     //Don't consider this part if we already selected a subpart
     if (list.isEmpty()) {
         if (select(ptr)) {
@@ -213,14 +210,25 @@ static QVector<MessagePart::Ptr> collect(MessagePart::Ptr start, const std::func
     return list;
 }
 
-QVector<MessagePart::Ptr> ObjectTreeParser::collectContentParts()
+QVector<MessagePartPtr> ObjectTreeParser::collectContentParts()
 {
-    QVector<MessagePart::Ptr> contentParts = ::collect(mParsedPart,
-        [] (const MessagePartPtr &part) {
-            // return p->type() != "EncapsulatedPart";
+    return collectContentParts(mParsedPart);
+}
+
+QVector<MessagePart::Ptr> ObjectTreeParser::collectContentParts(MessagePart::Ptr start)
+{
+    return ::collect(start,
+        [start] (const MessagePartPtr &part) {
+            //Ignore the top-level
+            if (start.data() == part.data()) {
+                return true;
+            }
+            if (auto e = part.dynamicCast<MimeTreeParser::EncapsulatedRfc822MessagePart>()) {
+                return false;
+            }
             return true;
         },
-        [] (const MessagePartPtr &part) {
+        [start] (const MessagePartPtr &part) {
             if (dynamic_cast<MimeTreeParser::AttachmentMessagePart*>(part.data())) {
                 return false;
             } else if (const auto text = dynamic_cast<MimeTreeParser::TextMessagePart*>(part.data())) {
@@ -233,6 +241,11 @@ QVector<MessagePart::Ptr> ObjectTreeParser::collectContentParts()
                 return true;
             } else if (dynamic_cast<MimeTreeParser::HtmlMessagePart*>(part.data())) {
                 return true;
+            } else if (dynamic_cast<MimeTreeParser::EncapsulatedRfc822MessagePart*>(part.data())) {
+                if (start.data() == part.data()) {
+                    return false;
+                }
+                return true;
             } else if (const auto enc = dynamic_cast<MimeTreeParser::EncryptedMessagePart*>(part.data())) {
                 if (enc->error()) {
                     return true;
@@ -247,7 +260,6 @@ QVector<MessagePart::Ptr> ObjectTreeParser::collectContentParts()
             }
             return false;
         });
-    return contentParts;
 }
 
 QVector<MessagePart::Ptr> ObjectTreeParser::collectAttachmentParts()
diff --git a/framework/src/domain/mime/mimetreeparser/objecttreeparser.h b/framework/src/domain/mime/mimetreeparser/objecttreeparser.h
index 398cbcd7..d219a52b 100644
--- a/framework/src/domain/mime/mimetreeparser/objecttreeparser.h
+++ b/framework/src/domain/mime/mimetreeparser/objecttreeparser.h
@@ -285,6 +285,7 @@ public:
     MessagePartPtr parsedPart() const;
     KMime::Content *find(const std::function<bool(KMime::Content *)> &select);
     QVector<MessagePartPtr> collectContentParts();
+    QVector<MessagePartPtr> collectContentParts(MessagePart::Ptr start);
     QVector<MessagePartPtr> collectAttachmentParts();
     void decryptParts();
     void importCertificates();
diff --git a/framework/src/domain/mime/mimetreeparser/tests/interfacetest.cpp b/framework/src/domain/mime/mimetreeparser/tests/interfacetest.cpp
index f9b557c9..b9fdd356 100644
--- a/framework/src/domain/mime/mimetreeparser/tests/interfacetest.cpp
+++ b/framework/src/domain/mime/mimetreeparser/tests/interfacetest.cpp
@@ -319,6 +319,24 @@ private slots:
         QVERIFY(bool(part));
         QVERIFY(part->error());
     }
+
+    void testEncapsulated()
+    {
+        MimeTreeParser::ObjectTreeParser otp;
+        otp.parseObjectTree(readMailFromFile("encapsulated-with-attachment.mbox"));
+        otp.decryptParts();
+        auto partList = otp.collectContentParts();
+        QCOMPARE(partList.size(), 2);
+        auto part = partList[1].dynamicCast<MimeTreeParser::EncapsulatedRfc822MessagePart>();
+        QVERIFY(bool(part));
+        QCOMPARE(part->from(), QLatin1String("Thomas McGuire <dontspamme@gmx.net>"));
+        QCOMPARE(part->date().toString(), QLatin1String("Wed Aug 5 10:57:58 2009 GMT+0200"));
+        auto subPartList = otp.collectContentParts(part);
+        QCOMPARE(subPartList.size(), 1);
+        qWarning() << subPartList[0]->metaObject()->className();
+        auto subPart = subPartList[0].dynamicCast<MimeTreeParser::TextMessagePart>();
+        QVERIFY(bool(subPart));
+    }
 };
 
 QTEST_GUILESS_MAIN(InterfaceTest)
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;