From 7e26af8d1683c8dc8ced733c3707ef3ef346b021 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Wed, 6 May 2020 15:53:59 +0200
Subject: [PATCH] Too many things on my mind

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

diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 8c2e9eecab..02860de23f 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -1308,7 +1308,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                         main = map.get(email);
                 }
 
-                if (main == null) {
+                if (main == null || !main.hasPhoto()) {
                     ibAvatar.setImageDrawable(null);
                     ibAvatar.setTag(null);
                 } else {
@@ -1318,7 +1318,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                     ibAvatar.setTag(lookupUri);
                     ibAvatar.setEnabled(lookupUri != null);
                 }
-                ibAvatar.setVisibility(main == null ? View.GONE : View.VISIBLE);
+                ibAvatar.setVisibility(main == null || !main.hasPhoto() ? View.GONE : View.VISIBLE);
             }
 
             Address[] _senders = fillIn(senders, map);