13 files changed, 176 insertions, 54 deletions

diff --git a/components/mailviewer/contents/ui/MailDataModel.qml b/components/mailviewer/contents/ui/MailDataModel.qml
index 46427194..0f64972c 100644
--- a/components/mailviewer/contents/ui/MailDataModel.qml
+++ b/components/mailviewer/contents/ui/MailDataModel.qml
@@ -21,8 +21,7 @@ import QtQml.Models 2.2
 import org.kube.framework 1.0 as Kube
 
 DelegateModel {
-    id: mailDataModel
-    property bool debug: true
+    id: root
 
     delegate: Item {
         id: partColumn
@@ -65,13 +64,13 @@ DelegateModel {
                     partLoader.setSource("TextContent.qml",
                                         {"content": model.content,
                                         "embedded": model.embeded,
-                                        "type": model.type,
-                                        "debug": debug})
+                                        "type": model.type
+                                        })
                     break
                 case "html":
                     partLoader.setSource("HtmlContent.qml",
                                         {"content": model.content,
-                                        "debug": debug})
+                                        })
                     break;
                 case "error":
                     partLoader.setSource("ErrorPart.qml",
@@ -80,11 +79,13 @@ DelegateModel {
                                         "errorString": model.errorString,
                                         })
                     break;
-                case "envelope":
+                case "encapsulated":
                     partLoader.setSource("MailPart.qml",
-                                        {"rootIndex": mailDataModel.modelIndex(index),
-                                        "model": mailDataModel.model,
-                                        "debug": debug})
+                                        {"rootIndex": root.modelIndex(index),
+                                        "model": root.model,
+                                        "sender": model.sender,
+                                        "date": model.date
+                                        })
                     break;
             }
         }
diff --git a/components/mailviewer/contents/ui/MailPart.qml b/components/mailviewer/contents/ui/MailPart.qml
index bf534e85..7ff426e9 100644
--- a/components/mailviewer/contents/ui/MailPart.qml
+++ b/components/mailviewer/contents/ui/MailPart.qml
@@ -18,29 +18,54 @@
 
 import QtQuick 2.4
 
+import org.kube.framework 1.0 as Kube
+
 Item {
     id: root
     property alias rootIndex: visualModel.rootIndex
     property alias model: visualModel.model
-    property alias debug: visualModel.debug
-    height: partListView.height + 10
-    width: parent.width
+    property variant sender
+    property variant date
+    height: childrenRect.height
 
     MailDataModel {
         id: visualModel
     }
 
+    Rectangle {
+        id: border
+        anchors {
+            top: parent.top
+            left: parent.left
+            leftMargin: Kube.Units.smallSpacing
+        }
+        color: "lightgrey"
+        height: partListView.height
+        width: Kube.Units.smallSpacing
+    }
+
+    Text {
+        id: sender
+        anchors {
+            left: border.right
+            leftMargin: Kube.Units.smallSpacing
+        }
+
+        text: "sent by " + root.sender + " on  " + root.date
+        color: "grey"
+    }
     ListView {
         id: partListView
         model: visualModel
         anchors {
-                top: parent.top
-                left: parent.left
-                margins: 5
+            top: sender.bottom
+            left: border.right
+            margins: Kube.Units.smallSpacing
+            leftMargin: Kube.Units.smallSpacing
         }
-        spacing: 5
+        spacing: 7
         height: contentHeight
-        width: parent.width - 10
+        width: parent.width - Kube.Units.smallSpacing * 3
         interactive: false
     }
 }
diff --git a/components/mailviewer/contents/ui/MailViewer.qml b/components/mailviewer/contents/ui/MailViewer.qml
index 23307009..9031ec17 100644
--- a/components/mailviewer/contents/ui/MailViewer.qml
+++ b/components/mailviewer/contents/ui/MailViewer.qml
@@ -22,7 +22,6 @@ Item {
     id: root
     property alias rootIndex: visualModel.rootIndex
     property alias model: visualModel.model
-    property alias debug: visualModel.debug
     height: partListView.height
 
     MailDataModel {
diff --git a/components/mailviewer/contents/ui/TextContent.qml b/components/mailviewer/contents/ui/TextContent.qml
index f8ef7f9a..a0094a3e 100644
--- a/components/mailviewer/contents/ui/TextContent.qml
+++ b/components/mailviewer/contents/ui/TextContent.qml
@@ -24,7 +24,6 @@ Item {
     id: root
 
     property string content
-    property bool debug: true
     property bool embedded: true
     property string type
 
@@ -54,13 +53,5 @@ Item {
             color: embedded ? Kube.Colors.disabledTextColor : Kube.Colors.textColor
             onLinkActivated: Qt.openUrlExternally(link)
         }
-
-        //BEGIN debug
-        Text {
-            width: parent.width
-            visible: root.debug
-            text: type
-        }
-        //END debug
     }
 }
diff --git a/framework/qml/MailViewer.qml b/framework/qml/MailViewer.qml
index 9e14fc7f..cd170f8f 100644
--- a/framework/qml/MailViewer.qml
+++ b/framework/qml/MailViewer.qml
@@ -318,7 +318,6 @@ Rectangle {
             anchors.left: body.left
             anchors.right: body.right
             model: messageParser.parts
-            debug: false
         }
 
     }
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;
diff --git a/framework/src/domain/mime/partmodel.cpp b/framework/src/domain/mime/partmodel.cpp
index ea3e90e1..6ee3d46f 100644
--- a/framework/src/domain/mime/partmodel.cpp
+++ b/framework/src/domain/mime/partmodel.cpp
@@ -35,6 +35,8 @@ public:
     void createTree();
     PartModel *q;
     QVector<MimeTreeParser::MessagePartPtr> mParts;
+    QHash<MimeTreeParser::MessagePart*, QVector<MimeTreeParser::MessagePartPtr>> mEncapsulatedParts;
+    QHash<MimeTreeParser::MessagePart*, MimeTreeParser::MessagePart*> mParents;
     std::shared_ptr<MimeTreeParser::ObjectTreeParser> mParser;
 };
 
@@ -44,6 +46,14 @@ PartModelPrivate::PartModelPrivate(PartModel *q_ptr, const std::shared_ptr<MimeT
 {
     mParts = mParser->collectContentParts();
     qWarning() << "Collected content parts: " << mParts.size();
+    for (auto p : mParts) {
+        if (auto e = p.dynamicCast<MimeTreeParser::EncapsulatedRfc822MessagePart>()) {
+            mEncapsulatedParts[e.data()] = mParser->collectContentParts(e);
+            for (auto subPart : mEncapsulatedParts[e.data()]) {
+                mParents[subPart.data()] = e.data();
+            }
+        }
+    }
 }
 
 PartModelPrivate::~PartModelPrivate()
@@ -71,6 +81,8 @@ QHash<int, QByteArray> PartModel::roleNames() const
     roles[EncryptionErrorType] = "errorType";
     roles[EncryptionErrorString] = "errorString";
     roles[IsErrorRole] = "error";
+    roles[SenderRole] = "sender";
+    roles[DateRole] = "date";
     return roles;
 }
 
@@ -79,6 +91,15 @@ QModelIndex PartModel::index(int row, int column, const QModelIndex &parent) con
     if (row < 0 || column != 0) {
         return QModelIndex();
     }
+    if (parent.isValid()) {
+        if (auto e = dynamic_cast<MimeTreeParser::EncapsulatedRfc822MessagePart*>(static_cast<MimeTreeParser::MessagePart*>(parent.internalPointer()))) {
+            const auto parts = d->mEncapsulatedParts[e];
+            if (row < parts.size()) {
+                return createIndex(row, column, parts.at(row).data());
+            }
+        }
+        return QModelIndex();
+    }
     if (row < d->mParts.size()) {
         return createIndex(row, column, d->mParts.at(row).data());
     }
@@ -88,26 +109,35 @@ QModelIndex PartModel::index(int row, int column, const QModelIndex &parent) con
 QVariant PartModel::data(const QModelIndex &index, int role) const
 {
     if (!index.isValid()) {
-        switch (role) {
-        case Qt::DisplayRole:
-            return QString("root");
-        case IsEmbededRole:
-            return false;
-        }
         return QVariant();
     }
 
     if (index.internalPointer()) {
         const auto messagePart = static_cast<MimeTreeParser::MessagePart*>(index.internalPointer());
-        qWarning() << "Found message part " << messagePart->metaObject()->className() << messagePart->partMetaData()->status << messagePart->error();
+        // qWarning() << "Found message part " << messagePart->metaObject()->className() << messagePart->partMetaData()->status << messagePart->error();
         Q_ASSERT(messagePart);
         switch(role) {
             case Qt::DisplayRole:
                 return QStringLiteral("Content%1");
+            case SenderRole: {
+                if (auto e = dynamic_cast<MimeTreeParser::EncapsulatedRfc822MessagePart*>(messagePart)) {
+                    return e->from();
+                }
+                return {};
+            }
+            case DateRole: {
+                if (auto e = dynamic_cast<MimeTreeParser::EncapsulatedRfc822MessagePart*>(messagePart)) {
+                    return e->date();
+                }
+                return {};
+            }
             case TypeRole: {
                 if (messagePart->error()) {
                     return "error";
                 }
+                if (dynamic_cast<MimeTreeParser::EncapsulatedRfc822MessagePart*>(messagePart)) {
+                    return "encapsulated";
+                }
                 //For simple html we don't need a browser
                 auto complexHtml = [&] {
                     if (messagePart->isHtml()) {
@@ -165,11 +195,39 @@ QVariant PartModel::data(const QModelIndex &index, int role) const
 
 QModelIndex PartModel::parent(const QModelIndex &index) const
 {
-    return QModelIndex();
+    if (index.isValid()) {
+        if (auto e = static_cast<MimeTreeParser::MessagePart*>(index.internalPointer())) {
+            for (const auto &p : d->mParts) {
+                if (p.data() == e) {
+                    return QModelIndex();
+                }
+            }
+            const auto parentPart = d->mParents[e];
+            Q_ASSERT(parentPart);
+            int row = 0;
+            const auto parts = d->mEncapsulatedParts[parentPart];
+            for (const auto &p : parts) {
+                if (p.data() == e) {
+                    break;
+                }
+                row++;
+            }
+            return createIndex(row, 0, parentPart);
+        }
+        return {};
+    }
+    return {};
 }
 
 int PartModel::rowCount(const QModelIndex &parent) const
 {
+    if (parent.isValid()) {
+        if (auto e = dynamic_cast<MimeTreeParser::EncapsulatedRfc822MessagePart*>(static_cast<MimeTreeParser::MessagePart*>(parent.internalPointer()))) {
+            const auto parts = d->mEncapsulatedParts[e];
+            return parts.size();
+        }
+        return 0;
+    }
     return d->mParts.count();
 }
 
diff --git a/framework/src/domain/mime/partmodel.h b/framework/src/domain/mime/partmodel.h
index efbd154b..a0e14b61 100644
--- a/framework/src/domain/mime/partmodel.h
+++ b/framework/src/domain/mime/partmodel.h
@@ -47,7 +47,9 @@ public:
         IsErrorRole,
         SecurityLevelRole,
         EncryptionErrorType,
-        EncryptionErrorString
+        EncryptionErrorString,
+        SenderRole,
+        DateRole
     };
 
     QHash<int, QByteArray> roleNames() const Q_DECL_OVERRIDE;