diff --git a/app/src/main/java/eu/faircode/email/MessageHelper.java b/app/src/main/java/eu/faircode/email/MessageHelper.java
index c2ddd1850d..e6d7c2430f 100644
--- a/app/src/main/java/eu/faircode/email/MessageHelper.java
+++ b/app/src/main/java/eu/faircode/email/MessageHelper.java
@@ -1035,7 +1035,7 @@ public class MessageHelper {
                     disposition = part.getDisposition();
                     if (disposition != null)
                         disposition = disposition.toLowerCase();
-                } catch (MessagingException ex) {
+                } catch (ParseException ex) {
                     Log.w(ex);
                     parts.warnings.add(Helper.formatThrowable(ex));
                     disposition = null;
@@ -1045,9 +1045,13 @@ public class MessageHelper {
                 try {
                     filename = part.getFileName();
                 } catch (MessagingException ex) {
-                    Log.w(ex);
-                    parts.warnings.add(Helper.formatThrowable(ex));
-                    filename = null;
+                    if (ex instanceof ParseException ||
+                            ex.getCause() instanceof UnsupportedEncodingException) {
+                        Log.w(ex);
+                        parts.warnings.add(Helper.formatThrowable(ex));
+                        filename = null;
+                    } else
+                        throw ex;
                 }
 
                 //Log.i("Part" +