diff --git a/app/src/main/java/eu/faircode/email/MessageHelper.java b/app/src/main/java/eu/faircode/email/MessageHelper.java
index 6d45675e36..686701f261 100644
--- a/app/src/main/java/eu/faircode/email/MessageHelper.java
+++ b/app/src/main/java/eu/faircode/email/MessageHelper.java
@@ -1020,6 +1020,8 @@ public class MessageHelper {
                 String filename;
                 try {
                     filename = part.getFileName();
+                    if (filename != null)
+                        filename = decodeMime(filename);
                 } catch (MessagingException ex) {
                     Log.w(ex);
                     parts.warnings.add(Helper.formatThrowable(ex, false));