diff --git a/app/src/main/java/eu/faircode/email/MessageHelper.java b/app/src/main/java/eu/faircode/email/MessageHelper.java
index eaa8740274..36357126ed 100644
--- a/app/src/main/java/eu/faircode/email/MessageHelper.java
+++ b/app/src/main/java/eu/faircode/email/MessageHelper.java
@@ -3714,6 +3714,10 @@ public class MessageHelper {
                         }
 
                         db.attachment().setDownloaded(epart.attachment.id, efile.length());
+
+                        if (Helper.isTnef(epart.attachment.type, epart.attachment.name))
+                            subsequence = decodeTNEF(context, epart.attachment, subsequence);
+
                     } catch (Throwable ex) {
                         db.attachment().setError(epart.attachment.id, Log.formatThrowable(ex));
                         db.attachment().setAvailable(epart.attachment.id, true); // unrecoverable