diff --git a/app/src/main/java/eu/faircode/email/Core.java b/app/src/main/java/eu/faircode/email/Core.java
index da90c91e01..802b5e7d02 100644
--- a/app/src/main/java/eu/faircode/email/Core.java
+++ b/app/src/main/java/eu/faircode/email/Core.java
@@ -5780,8 +5780,8 @@ class Core {
         for (int m = 0; m < messages.size() && m < MAX_NOTIFICATION_DISPLAY; m++) {
             TupleMessageEx message = messages.get(m);
             ContactInfo[] info = ContactInfo.get(context,
-                    message.account, message.folderType,
-                    message.bimi_selector, message.from);
+                    message.account, message.folderType, message.bimi_selector,
+                    message.isForwarder() ? message.submitter : message.from);
 
             Address[] modified = (message.from == null
                     ? new InternetAddress[0]
diff --git a/app/src/main/java/eu/faircode/email/WidgetUnifiedRemoteViewsFactory.java b/app/src/main/java/eu/faircode/email/WidgetUnifiedRemoteViewsFactory.java
index cd36dee79d..4a2b8edea3 100644
--- a/app/src/main/java/eu/faircode/email/WidgetUnifiedRemoteViewsFactory.java
+++ b/app/src/main/java/eu/faircode/email/WidgetUnifiedRemoteViewsFactory.java
@@ -225,7 +225,9 @@ public class WidgetUnifiedRemoteViewsFactory implements RemoteViewsService.Remot
             views.setViewVisibility(R.id.stripe, hasColor && color_stripe ? View.VISIBLE : View.GONE);
 
             if (avatars) {
-                ContactInfo[] info = ContactInfo.get(context, message.account, null, message.bimi_selector, message.from);
+                ContactInfo[] info = ContactInfo.get(context,
+                        message.account, null, message.bimi_selector,
+                        message.isForwarder() ? message.submitter : message.from);
                 views.setImageViewBitmap(R.id.avatar, info.length == 0 ? null : info[0].getPhotoBitmap());
             }
             views.setViewVisibility(R.id.avatar, avatars ? View.VISIBLE : View.GONE);