4 files changed, 63 insertions, 14 deletions

diff --git a/framework/src/domain/mime/mimetreeparser/bodypartformatter_impl.cpp b/framework/src/domain/mime/mimetreeparser/bodypartformatter_impl.cpp
index 532a906e..a6713fef 100644
--- a/framework/src/domain/mime/mimetreeparser/bodypartformatter_impl.cpp
+++ b/framework/src/domain/mime/mimetreeparser/bodypartformatter_impl.cpp
@@ -92,34 +92,48 @@ class MessageRfc822BodyPartFormatter
 {
     static const MessageRfc822BodyPartFormatter *self;
 public:
-    MessagePart::Ptr process(Interface::BodyPart &) const Q_DECL_OVERRIDE;
-    static const MimeTreeParser::Interface::BodyPartFormatter *create();
+    MessagePart::Ptr process(Interface::BodyPart &part) const Q_DECL_OVERRIDE
+    {
+        return MessagePart::Ptr(new EncapsulatedRfc822MessagePart(part.objectTreeParser(), part.content(), part.content()->bodyAsMessage()));
+    }
+
+    static const MimeTreeParser::Interface::BodyPartFormatter *create()
+    {
+        if (!self) {
+            self = new MessageRfc822BodyPartFormatter();
+        }
+        return self;
+    }
 };
 
 const MessageRfc822BodyPartFormatter *MessageRfc822BodyPartFormatter::self;
 
-const MimeTreeParser::Interface::BodyPartFormatter *MessageRfc822BodyPartFormatter::create()
+class HeadersBodyPartFormatter
+    : public MimeTreeParser::Interface::BodyPartFormatter
 {
-    if (!self) {
-        self = new MessageRfc822BodyPartFormatter();
+    static const HeadersBodyPartFormatter *self;
+public:
+    MessagePart::Ptr process(Interface::BodyPart &part) const Q_DECL_OVERRIDE
+    {
+        return MessagePart::Ptr(new HeadersPart(part.objectTreeParser(), part.content()));
     }
-    return self;
-}
 
-MessagePart::Ptr MessageRfc822BodyPartFormatter::process(Interface::BodyPart &part) const
-{
-    const KMime::Message::Ptr message = part.content()->bodyAsMessage();
-    return MessagePart::Ptr(new EncapsulatedRfc822MessagePart(part.objectTreeParser(), part.content(), message));
-}
+    static const MimeTreeParser::Interface::BodyPartFormatter *create() {
+        if (!self) {
+            self = new HeadersBodyPartFormatter();
+        }
+        return self;
+    }
+};
 
-typedef TextPlainBodyPartFormatter ApplicationPgpBodyPartFormatter;
+const HeadersBodyPartFormatter *HeadersBodyPartFormatter::self = nullptr;
 
 } // anon namespace
 
 void BodyPartFormatterBaseFactoryPrivate::messageviewer_create_builtin_bodypart_formatters()
 {
     insert("application", "octet-stream", AnyTypeBodyPartFormatter::create());
-    insert("application", "pgp", ApplicationPgpBodyPartFormatter::create());
+    insert("application", "pgp", TextPlainBodyPartFormatter::create());
     insert("application", "pkcs7-mime", ApplicationPkcs7MimeBodyPartFormatter::create());
     insert("application", "x-pkcs7-mime", ApplicationPkcs7MimeBodyPartFormatter::create());
     insert("application", "pgp-encrypted", ApplicationPGPEncryptedBodyPartFormatter::create());
@@ -129,6 +143,7 @@ void BodyPartFormatterBaseFactoryPrivate::messageviewer_create_builtin_bodypart_
     insert("text", "rtf", AnyTypeBodyPartFormatter::create());
     insert("text", "plain", MailmanBodyPartFormatter::create());
     insert("text", "plain", TextPlainBodyPartFormatter::create());
+    insert("text", "rfc822-headers", HeadersBodyPartFormatter::create());
     insert("text", "*", MailmanBodyPartFormatter::create());
     insert("text", "*", TextPlainBodyPartFormatter::create());
 
diff --git a/framework/src/domain/mime/mimetreeparser/messagepart.cpp b/framework/src/domain/mime/mimetreeparser/messagepart.cpp
index 541efd7f..17719ff8 100644
--- a/framework/src/domain/mime/mimetreeparser/messagepart.cpp
+++ b/framework/src/domain/mime/mimetreeparser/messagepart.cpp
@@ -1160,3 +1160,13 @@ QDateTime EncapsulatedRfc822MessagePart::date() const
     }
     return {};
 }
+
+HeadersPart::HeadersPart(ObjectTreeParser *otp, KMime::Content *node)
+    : MessagePart(otp, QString(), node)
+{
+}
+
+HeadersPart::~HeadersPart()
+{
+
+}
diff --git a/framework/src/domain/mime/mimetreeparser/messagepart.h b/framework/src/domain/mime/mimetreeparser/messagepart.h
index 1d416e8f..c039637a 100644
--- a/framework/src/domain/mime/mimetreeparser/messagepart.h
+++ b/framework/src/domain/mime/mimetreeparser/messagepart.h
@@ -375,6 +375,15 @@ protected:
     friend class ::PartPrivate;
 };
 
+class HeadersPart : public MessagePart
+{
+    Q_OBJECT
+public:
+    typedef QSharedPointer<HeadersPart> Ptr;
+    HeadersPart(ObjectTreeParser *otp, KMime::Content *node);
+    virtual ~HeadersPart();
+};
+
 }
 
 #endif //__MIMETREEPARSER_MESSAGEPART_H__
diff --git a/framework/src/domain/mime/mimetreeparser/tests/mimetreeparsertest.cpp b/framework/src/domain/mime/mimetreeparser/tests/mimetreeparsertest.cpp
index 961dbf9a..90a07a7c 100644
--- a/framework/src/domain/mime/mimetreeparser/tests/mimetreeparsertest.cpp
+++ b/framework/src/domain/mime/mimetreeparser/tests/mimetreeparsertest.cpp
@@ -371,6 +371,21 @@ private slots:
         QCOMPARE(part->signatureState(), MimeTreeParser::KMMsgFullySigned);
         QVERIFY(otp.plainTextContent().contains(QString::fromUtf8("encrypted message text")));
     }
+
+    void testOpenpgpMultipartEmbedded()
+    {
+        MimeTreeParser::ObjectTreeParser otp;
+        otp.parseObjectTree(readMailFromFile("openpgp-multipart-embedded.mbox"));
+        otp.print();
+        otp.decryptParts();
+        otp.print();
+        auto partList = otp.collectContentParts();
+        QCOMPARE(partList.size(), 1);
+        auto part = partList[0].dynamicCast<MimeTreeParser::MessagePart>();
+        QCOMPARE(part->encryptions().size(), 1);
+        QCOMPARE(part->encryptionState(), MimeTreeParser::KMMsgFullyEncrypted);
+        QCOMPARE(otp.plainTextContent(), QString::fromUtf8("sdflskjsdf\n\n-- \nThis is a HTML signature.\n"));
+    }
 };
 
 QTEST_GUILESS_MAIN(InterfaceTest)