diff --git a/app/src/main/java/eu/faircode/email/Core.java b/app/src/main/java/eu/faircode/email/Core.java
index 3629f93b9d..2cb2c71090 100644
--- a/app/src/main/java/eu/faircode/email/Core.java
+++ b/app/src/main/java/eu/faircode/email/Core.java
@@ -2522,11 +2522,13 @@ class Core {
             }
 
             Uri uri = ContactInfo.getLookupUri(context, message.from);
-            String avatar = (uri == null ? null : uri.toString());
-            if (!Objects.equals(message.avatar, avatar)) {
-                update = true;
-                message.avatar = avatar;
-                Log.i(folder.name + " updated id=" + message.id + " uid=" + message.uid + " avatar=" + avatar);
+            if (uri != null) {
+                String avatar = uri.toString();
+                if (!Objects.equals(message.avatar, avatar)) {
+                    update = true;
+                    message.avatar = avatar;
+                    Log.i(folder.name + " updated id=" + message.id + " uid=" + message.uid + " avatar=" + avatar);
+                }
             }
 
             if (update || process)