3 files changed, 43 insertions, 4 deletions

diff --git a/framework/domain/mimetreeparser/interface.cpp b/framework/domain/mimetreeparser/interface.cpp
index ab56f800..c2fd1e65 100644
--- a/framework/domain/mimetreeparser/interface.cpp
+++ b/framework/domain/mimetreeparser/interface.cpp
@@ -56,6 +56,14 @@ MailMime::MailMime()
 {
 }
 
+QByteArray MailMime::cid() const
+{
+    if (!d->mNode || !d->mNode->contentID()) {
+        return QByteArray();
+    }
+    return d->mNode->contentID()->identifier();
+}
+
 bool MailMime::isFirstTextPart() const
 {
     if (!d->mNode || !d->mNode->topLevel()) {
@@ -750,9 +758,16 @@ Parser::~Parser()
 {
 }
 
-QUrl Parser::getPart(const QByteArray &cid)
+Part::Ptr Parser::getPart(const QUrl &url)
 {
-    return d->mEmbeddedPartMap.value(cid);
+    if (url.scheme() == QStringLiteral("cid") && !url.path().isEmpty()) {
+        const auto cid = url.path();
+        return find(d->mTree, [&cid](const Part::Ptr &p){
+             const auto mime = p->mailMime();
+             return mime->cid() == cid;
+        });
+    }
+    return Part::Ptr();
 }
 
 QVector<Part::Ptr> Parser::collectContentParts() const
@@ -857,6 +872,7 @@ QVector<Part::Ptr> Parser::collectAttachmentParts() const
                                     return true;
                              });
 }
+
 QVector<Part::Ptr> Parser::collect(const Part::Ptr &start, std::function<bool(const Part::Ptr &)> select, std::function<bool(const Content::Ptr &)> filter) const
 {
     QVector<Part::Ptr> ret;
@@ -879,3 +895,17 @@ QVector<Part::Ptr> Parser::collect(const Part::Ptr &start, std::function<bool(co
     }
     return ret;
 }
+
+Part::Ptr Parser::find(const Part::Ptr &start, std::function<bool(const Part::Ptr &)> select) const
+{
+    foreach (const auto &part, start->subParts()) {
+        if (select(part)) {
+            return part;
+        }
+        const auto ret = find(part, select);
+        if (ret) {
+            return ret;
+        }
+    }
+    return Part::Ptr();
+}
diff --git a/framework/domain/mimetreeparser/interface.h b/framework/domain/mimetreeparser/interface.h
index 4b569546..cc6c68d2 100644
--- a/framework/domain/mimetreeparser/interface.h
+++ b/framework/domain/mimetreeparser/interface.h
@@ -349,10 +349,10 @@ public:
     Parser(const QByteArray &mimeMessage);
     ~Parser();
 
-    Part::Ptr getPart(QUrl url);
-    QUrl getPart(const QByteArray &cid);
+    Part::Ptr getPart(const QUrl &url);
 
     QVector<Part::Ptr> collect(const Part::Ptr &start, std::function<bool(const Part::Ptr &)> select, std::function<bool(const Content::Ptr &)> filter) const;
+    Part::Ptr find(const Part::Ptr &start, std::function<bool(const Part::Ptr &)> select) const;
     QVector<Part::Ptr> collectContentParts() const;
     QVector<Part::Ptr> collectAttachmentParts() const;
     //template <> QVector<ContentPart::Ptr> collect<ContentPart>() const;
diff --git a/framework/domain/mimetreeparser/tests/interfacetest.cpp b/framework/domain/mimetreeparser/tests/interfacetest.cpp
index 923a7446..d52606c2 100644
--- a/framework/domain/mimetreeparser/tests/interfacetest.cpp
+++ b/framework/domain/mimetreeparser/tests/interfacetest.cpp
@@ -240,6 +240,15 @@ private slots:
         auto contentAttachmentList = parser.collectAttachmentParts();
         QCOMPARE(contentAttachmentList.size(), 0);
     }
+
+    void testCidLink()
+    {
+        Parser parser(readMailFromFile("cid-links.mbox"));
+        printTree(parser.d->mTree,QString());
+        QCOMPARE(parser.getPart(QUrl("cid:9359201d15e53f31a68c307b3369b6@info")), parser.d->mTree->subParts().at(1));
+        QVERIFY(!parser.getPart(QUrl("cid:")));
+        QVERIFY(!parser.getPart(QUrl("cid:unknown")));
+    }
 };
 
 QTEST_GUILESS_MAIN(InterfaceTest)