diff --git a/Cargo.toml b/Cargo.toml
index a7f44ac7..a278c41a 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -18,7 +18,7 @@ ui = { path = "ui", version = "*" }
 
 [profile.release]
 lto = true
-#debug = true
+debug = true
 
 [workspace]
 members = ["melib", "ui"]
diff --git a/melib/src/mailbox/email/attachments.rs b/melib/src/mailbox/email/attachments.rs
index 160f346e..174a3b1c 100644
--- a/melib/src/mailbox/email/attachments.rs
+++ b/melib/src/mailbox/email/attachments.rs
@@ -369,6 +369,24 @@ impl Attachment {
             ContentType::Text {
                 kind: Text::Html, ..
             } => true,
+            ContentType::Text {
+                kind: Text::Plain, ..
+            } => false,
+            ContentType::Multipart {
+                kind: MultipartType::Alternative,
+                ref subattachments,
+                ..
+            } => {
+                for a in subattachments.iter() {
+                    if let ContentType::Text {
+                        kind: Text::Plain, ..
+                    } = a.content_type
+                    {
+                        return false;
+                    }
+                }
+                return true;
+            }
             ContentType::Multipart {
                 ref subattachments, ..
             } => subattachments
@@ -380,6 +398,10 @@ impl Attachment {
                     ContentType::Text {
                         kind: Text::Html, ..
                     } => acc,
+                    ContentType::Multipart {
+                        kind: MultipartType::Alternative,
+                        ..
+                    } => a.is_html(),
                     _ => acc,
                 }),
             _ => false,