From 93165ad8d42da7e3b43e1d4b7abb4e5fcdccea5b Mon Sep 17 00:00:00 2001
From: Septicity <nickmoff@outlook.com>
Date: Wed, 1 Apr 2026 21:04:48 -0500
Subject: [PATCH] fix: Make scrolling in encrypted rooms with many PMP messages
 no longer "sticky"

---
 .changeset/fix-pmp-encrypted-sticky-scrolling.md | 5 +++++
 src/app/features/room/message/Message.tsx        | 5 -----
 2 files changed, 5 insertions(+), 5 deletions(-)
 create mode 100644 .changeset/fix-pmp-encrypted-sticky-scrolling.md

diff --git a/.changeset/fix-pmp-encrypted-sticky-scrolling.md b/.changeset/fix-pmp-encrypted-sticky-scrolling.md
new file mode 100644
index 000000000..df6d3b941
--- /dev/null
+++ b/.changeset/fix-pmp-encrypted-sticky-scrolling.md
@@ -0,0 +1,5 @@
+---
+default: patch
+---
+
+Fixed the "sticky scrolling" issue in encrypted rooms with many PMP messages.
diff --git a/src/app/features/room/message/Message.tsx b/src/app/features/room/message/Message.tsx
index 4bfab3bbb..27b456c18 100644
--- a/src/app/features/room/message/Message.tsx
+++ b/src/app/features/room/message/Message.tsx
@@ -396,11 +396,6 @@ function MessageInternal(
       triggerTimelineRegroup();
     };
 
-    if (mEvent.getClearContent()) {
-      setContentVersion((v) => (v === 0 ? 1 : v));
-      triggerTimelineRegroup();
-    }
-
     mEvent.on(MatrixEventEvent.Decrypted, onUpdate);
     mEvent.on(MatrixEventEvent.Replaced, onUpdate);
     return () => {