diff --git a/app/src/main/java/eu/faircode/email/MessageHelper.java b/app/src/main/java/eu/faircode/email/MessageHelper.java
index 87ca9b39eb..8321db2cab 100644
--- a/app/src/main/java/eu/faircode/email/MessageHelper.java
+++ b/app/src/main/java/eu/faircode/email/MessageHelper.java
@@ -1022,7 +1022,10 @@ public class MessageHelper {
         subject = MimeUtility.unfold(subject);
         subject = decodeMime(subject);
 
-        return subject;
+        return subject
+                .trim()
+                .replace("\n", "")
+                .replace("\r", "");
     }
 
     Long getSize() throws MessagingException {