From 2876e12c7fb5e746e25bff5d1c2487fc1806a88c Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Tue, 24 Dec 2019 09:26:10 +0100
Subject: [PATCH] Always fill in contact names again

---
 .../eu/faircode/email/AdapterMessage.java     | 27 +++++++++----------
 1 file changed, 12 insertions(+), 15 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index b14678efde..39385173bf 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -1058,21 +1058,18 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             ibAvatar.setTag(lookupUri);
             ibAvatar.setEnabled(lookupUri != null);
 
-            // Updating in message lists causes jitter
-            if (viewType == ViewType.THREAD) {
-                String displayName = info.getDisplayName();
-                if (!TextUtils.isEmpty(displayName) &&
-                        addresses != null && addresses.length == 1) {
-                    String email = ((InternetAddress) addresses[0]).getAddress();
-                    String personal = ((InternetAddress) addresses[0]).getPersonal();
-                    if (TextUtils.isEmpty(personal) || !personal.equals(displayName))
-                        try {
-                            InternetAddress a = new InternetAddress(email, displayName);
-                            tvFrom.setText(MessageHelper.formatAddresses(new Address[]{a}, name_email, false));
-                        } catch (UnsupportedEncodingException ex) {
-                            Log.w(ex);
-                        }
-                }
+            String displayName = info.getDisplayName();
+            if (!TextUtils.isEmpty(displayName) &&
+                    addresses != null && addresses.length == 1) {
+                String email = ((InternetAddress) addresses[0]).getAddress();
+                String personal = ((InternetAddress) addresses[0]).getPersonal();
+                if (TextUtils.isEmpty(personal))
+                    try {
+                        InternetAddress a = new InternetAddress(email, displayName, StandardCharsets.UTF_8.name());
+                        tvFrom.setText(MessageHelper.formatAddresses(new Address[]{a}, name_email, false));
+                    } catch (UnsupportedEncodingException ex) {
+                        Log.w(ex);
+                    }
             }
 
             if (distinguish_contacts && info.isKnown())