From b80587ec79669d8c1ce371964796bf99dd9ce577 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sun, 15 Feb 2026 14:08:52 +0100
Subject: [PATCH] Fixed duplicate extras

---
 .../eu/faircode/email/AdapterMessage.java     | 26 -------------------
 1 file changed, 26 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 35fd4017c7..db3c5574cf 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -9161,12 +9161,9 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                 keyPosition.put(message.id, i);
                 positionKey.put(i, message.id);
 
-                addExtra(message.from, message.extra);
-
                 if (threading) {
                     message.senders = merge(message.from, message.senders);
                     message.recipients = merge(message.to, message.recipients);
-                    addExtra(message.senders, message.extra);
                 } else {
                     message.senders = message.from;
                     message.recipients = message.to;
@@ -9215,29 +9212,6 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
         return result.toArray(new Address[0]);
     }
 
-    static void addExtra(Address[] addresses, String extra) {
-        if (addresses == null || addresses.length == 0)
-            return;
-        if (extra == null)
-            return;
-
-        String email = ((InternetAddress) addresses[0]).getAddress();
-        if (email == null)
-            return;
-
-        Pair<String, String> p = MessageHelper.getExtra(email, extra);
-
-        if (p.first != null)
-            try {
-                ((InternetAddress) addresses[0]).setPersonal(p.first);
-            } catch (Throwable ex) {
-                Log.e(ex);
-            }
-
-        if (p.second != null)
-            ((InternetAddress) addresses[0]).setAddress(p.second);
-    }
-
     PagedList<TupleMessageEx> getCurrentList() {
         return differ.getCurrentList();
     }