diff --git a/app/src/main/java/eu/faircode/email/MessageHelper.java b/app/src/main/java/eu/faircode/email/MessageHelper.java
index ae028f2bfe..8795fd346f 100644
--- a/app/src/main/java/eu/faircode/email/MessageHelper.java
+++ b/app/src/main/java/eu/faircode/email/MessageHelper.java
@@ -608,7 +608,7 @@ public class MessageHelper {
 
                 return new Address[]{new InternetAddress(to.getTo().split(",")[0])};
             } catch (android.net.ParseException ex) {
-                throw new ParseException(list);
+                throw new IllegalArgumentException(list, ex);
             }
         } catch (android.net.ParseException ex) {
             Log.w(ex);