2 files changed, 12 insertions, 1 deletions

diff --git a/framework/domain/mimetreeparser/interface.cpp b/framework/domain/mimetreeparser/interface.cpp
index c2fd1e65..b5e29e6b 100644
--- a/framework/domain/mimetreeparser/interface.cpp
+++ b/framework/domain/mimetreeparser/interface.cpp
@@ -143,6 +143,15 @@ MailMime::Ptr MailMime::parent() const
     return d->parent;
 }
 
+QByteArray MailMime::decodedContent() const
+{
+    if (!d->mNode) {
+        return QByteArray();
+    }
+    return d->mNode->decodedContent();
+}
+
+
 class PartPrivate
 {
 public:
@@ -581,7 +590,7 @@ void SinglePartPrivate::fillFrom(MimeTreeParser::AttachmentMessagePart::Ptr part
    q->reachParentD()->createMailMime(part.staticCast<MimeTreeParser::TextMessagePart>());
    mType = q->mailMime()->mimetype().name().toUtf8();
    mContent.clear();
-   mContent.append(std::make_shared<Content>(part->text().toLocal8Bit(), q));
+   mContent.append(std::make_shared<Content>(q->mailMime()->decodedContent(), q));
 }
 
 SinglePart::SinglePart()
diff --git a/framework/domain/mimetreeparser/interface.h b/framework/domain/mimetreeparser/interface.h
index cc6c68d2..f88271af 100644
--- a/framework/domain/mimetreeparser/interface.h
+++ b/framework/domain/mimetreeparser/interface.h
@@ -100,6 +100,8 @@ public:
     // overwrite default charset with given charset
     QString encodedContent(QByteArray charset) const;
 
+    QByteArray decodedContent() const;
+
     bool isFirstTextPart() const;
     bool isFirstPart() const;
     bool isTopLevelPart() const;