Fixes: NB#240946 - "x message/rfc822" shown instead of original attachments in Forward editor.

Conflicts:

	debian/changelog

1 files changed, 9 insertions, 0 deletions

diff --git a/src/libraries/qmfclient/qmailmessage.cpp b/src/libraries/qmfclient/qmailmessage.cpp
index 1f557d2b..ba716197 100644
--- a/src/libraries/qmfclient/qmailmessage.cpp
+++ b/src/libraries/qmfclient/qmailmessage.cpp
@@ -5792,6 +5792,15 @@ QString QMailMessagePart::displayName() const
         id = contentID();
 
     if (id.isEmpty()) {
+        bool isRFC822 = (contentType().type().toLower() == "message") &&
+            (contentType().subType().toLower() == "rfc822");
+        if (isRFC822) {
+            QMailMessage msg = QMailMessage::fromRfc2822(body().data(QMailMessageBody::Decoded));
+            id = msg.subject();
+        }
+    }
+
+    if (id.isEmpty()) {
         int partNumber = impl(this)->partNumber();
         if (partNumber != -1) {
             id = QString::number(partNumber) + ' ';