diff --git a/app/src/main/java/eu/faircode/email/MessageHelper.java b/app/src/main/java/eu/faircode/email/MessageHelper.java
index 23777dbd69..0b5d5a077a 100644
--- a/app/src/main/java/eu/faircode/email/MessageHelper.java
+++ b/app/src/main/java/eu/faircode/email/MessageHelper.java
@@ -856,7 +856,7 @@ public class MessageHelper {
 
     static Pair<String, String> getExtra(String email, String extra) {
         String name = null;
-        int comma = extra.indexOf(',');
+        int comma = extra.lastIndexOf(',');
         if (comma >= 0) {
             name = extra.substring(0, comma).trim();
             extra = extra.substring(comma + 1).trim();