1 files changed, 4 insertions, 0 deletions

diff --git a/framework/src/domain/mime/attachmentmodel.cpp b/framework/src/domain/mime/attachmentmodel.cpp
index 95a65d81..12f7ca74 100644
--- a/framework/src/domain/mime/attachmentmodel.cpp
+++ b/framework/src/domain/mime/attachmentmodel.cpp
@@ -152,6 +152,10 @@ static QString saveAttachmentToDisk(const QModelIndex &index, const QString &pat
         Q_ASSERT(part);
         auto node = part->node();
         auto data = node->decodedContent();
+        //This is necessary to store messages embedded messages (EncapsulatedRfc822MessagePart)
+        if (data.isEmpty()) {
+            data = node->encodedContent();
+        }
         if (part->isText()) {
             // convert CRLF to LF before writing text attachments to disk
             data = KMime::CRLFtoLF(data);