diff --git a/app/src/main/java/eu/faircode/email/MessageHelper.java b/app/src/main/java/eu/faircode/email/MessageHelper.java
index 82e0c1887c..5ebb50afa0 100644
--- a/app/src/main/java/eu/faircode/email/MessageHelper.java
+++ b/app/src/main/java/eu/faircode/email/MessageHelper.java
@@ -617,12 +617,11 @@ public class MessageHelper {
         subject = MimeUtility.unfold(subject);
         subject = new String(subject.getBytes(StandardCharsets.ISO_8859_1));
 
-        if (subject.startsWith("=?"))
-            try {
-                subject = MimeUtility.decodeText(subject);
-            } catch (UnsupportedEncodingException ex) {
-                Log.w(ex);
-            }
+        try {
+            subject = MimeUtility.decodeText(subject);
+        } catch (UnsupportedEncodingException ex) {
+            Log.w(ex);
+        }
 
         subject = decodeMime(subject);