diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 55c597e850..f52ace243b 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -1988,7 +1988,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             pbCalendarWait.setVisibility(View.GONE);
         }
 
-        private void bindSeen(TupleMessageEx message) {
+        void bindSeen(TupleMessageEx message) {
             if (cards && shadow_unread && shadow_border) {
                 boolean shadow = (message.unseen > 0);
                 int color = (shadow
diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index c8306186c3..8e77ff91ad 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -8438,8 +8438,22 @@ public class FragmentMessages extends FragmentBase
         view.postDelayed(new RunnableEx("seen_delay") {
             @Override
             public void delegate() {
-                if (values.containsKey("expanded") && values.get("expanded").contains(id))
+                if (values.containsKey("expanded") && values.get("expanded").contains(id)) {
+                    int pos = adapter.getPositionForKey(id);
+                    if (pos != NO_POSITION) {
+                        TupleMessageEx message = adapter.getItemAtPosition(pos);
+                        AdapterMessage.ViewHolder holder =
+                                (AdapterMessage.ViewHolder) rvMessage.findViewHolderForAdapterPosition(pos);
+                        if (message != null && holder != null) {
+                            message.unseen = 0;
+                            message.ui_seen = true;
+                            message.visible_unseen = 0;
+                            message.ui_unsnoozed = false;
+                            holder.bindSeen(message);
+                        }
+                    }
                     taskExpand.execute(FragmentMessages.this, dargs, "messages:seen_delay");
+                }
             }
         }, seen_delay);