From 0a8a0c04c8ce2a7a62b0dbb7eed1d5a8f27c91e9 Mon Sep 17 00:00:00 2001
From: Manos Pitsidianakis <el13635@mail.ntua.gr>
Date: Tue, 24 Nov 2020 11:07:58 +0200
Subject: [PATCH] compose: treat inline message/rfc822 as attachments

---
 src/components/mail/view.rs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/components/mail/view.rs b/src/components/mail/view.rs
index ab8a57f5f..01387eca8 100644
--- a/src/components/mail/view.rs
+++ b/src/components/mail/view.rs
@@ -620,7 +620,7 @@ impl MailView {
             acc: &mut Vec<AttachmentDisplay>,
             active_jobs: &mut HashSet<JobId>,
         ) {
-            if a.content_disposition.kind.is_attachment() {
+            if a.content_disposition.kind.is_attachment() || a.content_type == "message/rfc822" {
                 acc.push(AttachmentDisplay::Attachment { inner: a.clone() });
             } else if a.content_type().is_text_html() {
                 let bytes = decode(a, None);
@@ -923,7 +923,9 @@ impl MailView {
             let ret = find_attachment(root_attachment, &path[1..]);
             if lidx == 0 {
                 return ret.and_then(|a| {
-                    if a.content_disposition.kind.is_attachment() {
+                    if a.content_disposition.kind.is_attachment()
+                        || a.content_type == "message/rfc822"
+                    {
                         Some(a)
                     } else {
                         None