From ee7b7eb4f218ee96064c1d6a907500e9c0ee07e9 Mon Sep 17 00:00:00 2001
From: Hocuri <hocuri@gmx.de>
Date: Sat, 11 Jul 2020 18:19:43 +0200
Subject: [PATCH] Once more, fix #1575 Messages sent by DeltaChat trigger spam
 filters due to incorrect/non-compliant formatting options

---
 src/mimefactory.rs | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/mimefactory.rs b/src/mimefactory.rs
index c1f9320ce..d2dbc07f8 100644
--- a/src/mimefactory.rs
+++ b/src/mimefactory.rs
@@ -499,7 +499,16 @@ impl<'a, 'b> MimeFactory<'a, 'b> {
         let e2ee_guaranteed = self.is_e2ee_guaranteed();
         let encrypt_helper = EncryptHelper::new(self.context).await?;
 
-        let subject = encode_words(&subject_str);
+        let subject = if subject_str
+            .chars()
+            .all(|c| c.is_ascii_alphanumeric() || c == ' ')
+        // We do not use needs_encoding() here because needs_encoding() returns true if the string contains a space
+        // but we do not want to encode all subjects just because they contain a space.
+        {
+            subject_str
+        } else {
+            encode_words(&subject_str)
+        };
 
         let mut message = match self.loaded {
             Loaded::Message { .. } => {