From 14b04b15c5b2a978d54b085ee39ff52b79b6b1be Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Wed, 28 Jun 2023 08:04:03 +0200
Subject: [PATCH] Refactoring

---
 app/src/main/java/eu/faircode/email/AdapterMessage.java | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 9211d96bbb..4f16de1d1c 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -5132,11 +5132,8 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
         }
 
         private void onInsertContact(String name, String email) {
-            if (TextUtils.isEmpty(name)) {
-                int at = email.indexOf('@');
-                if (at > 0)
-                    name = email.substring(0, at);
-            }
+            if (TextUtils.isEmpty(name))
+                name = UriHelper.getEmailUser(email);
 
             // https://developer.android.com/training/contacts-provider/modify-data
             Intent insert = new Intent();