From 6be8b8e611e1f2cf7fce59318db27db28b1cd3bc Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Mon, 10 Nov 2025 15:37:09 +0100
Subject: [PATCH] Fixed email address extra

---
 app/src/main/java/eu/faircode/email/UriHelper.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

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) {