diff --git a/app/src/main/java/eu/faircode/email/MessageHelper.java b/app/src/main/java/eu/faircode/email/MessageHelper.java
index cf68d5795e..70ac0d95ec 100644
--- a/app/src/main/java/eu/faircode/email/MessageHelper.java
+++ b/app/src/main/java/eu/faircode/email/MessageHelper.java
@@ -3802,7 +3802,7 @@ public class MessageHelper {
                         } else
                             Log.w(msg);
                     }
-                } catch (DecodingException ex) {
+                } catch (DecodingException | UnsupportedEncodingException ex) {
                     Log.e(ex);
                     warnings.add(Log.formatThrowable(ex, false));
                     return null;