1 files changed, 3 insertions, 1 deletions
diff --git a/src/main/java/de/pixart/messenger/ui/ConversationFragment.java b/src/main/java/de/pixart/messenger/ui/ConversationFragment.java
index 58f9441fa..f1ebb0d63 100644
--- a/src/main/java/de/pixart/messenger/ui/ConversationFragment.java
+++ b/src/main/java/de/pixart/messenger/ui/ConversationFragment.java
@@ -2540,7 +2540,9 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke
                             if (!ReadByMarker.contains(marker, addedMarkers)) {
                                 addedMarkers.add(marker); //may be put outside this condition. set should do dedup anyway
                                 MucOptions.User user = mucOptions.findUser(marker);
-                                shownMarkers.add(user);
+                                if (user != null && !users.contains(user)) {
+                                    shownMarkers.add(user);
+                                }
                             }
                         }
                         final ReadByMarker markerForSender = ReadByMarker.from(messageList.get(i));