diff --git a/app/src/main/java/eu/faircode/email/UriHelper.java b/app/src/main/java/eu/faircode/email/UriHelper.java
index bd45ec0a17..9be9cacdae 100644
--- a/app/src/main/java/eu/faircode/email/UriHelper.java
+++ b/app/src/main/java/eu/faircode/email/UriHelper.java
@@ -195,7 +195,11 @@ public class UriHelper {
         if (plus < 0)
             return null;
 
-        return email.substring(plus + 1);
+        int at = email.indexOf('@', plus + 1);
+        if (at < 0)
+            return null;
+
+        return email.substring(plus + 1, at);
     }
 
     static String getEmailDomain(String address) {