From 780be56970738f4cc12ee4dea1f4a7f66638e2f8 Mon Sep 17 00:00:00 2001
From: Rohit Bansal <40559587+Rohit3523@users.noreply.github.com>
Date: Mon, 22 Dec 2025 18:39:44 +0530
Subject: [PATCH 1/2] Remove count limit

---
 app/lib/methods/loadMessagesForRoom.ts | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/lib/methods/loadMessagesForRoom.ts b/app/lib/methods/loadMessagesForRoom.ts
index 747b8b2aad2..d487befeb88 100644
--- a/app/lib/methods/loadMessagesForRoom.ts
+++ b/app/lib/methods/loadMessagesForRoom.ts
@@ -9,7 +9,6 @@ import updateMessages from './updateMessages';
 import { generateLoadMoreId } from './helpers/generateLoadMoreId';
 
 const COUNT = 50;
-const COUNT_LIMIT = COUNT * 10;
 
 async function load({ rid: roomId, latest, t }: { rid: string; latest?: Date; t: RoomTypes }): Promise<IMessage[]> {
 	const apiType = roomTypeToApiType(t);
@@ -21,7 +20,7 @@ async function load({ rid: roomId, latest, t }: { rid: string; latest?: Date; t:
 	let mainMessagesCount = 0;
 
 	async function fetchBatch(lastTs?: string): Promise<void> {
-		if (allMessages.length >= COUNT_LIMIT) {
+		if (allMessages.length >= COUNT) {
 			return;
 		}
 
@@ -77,7 +76,7 @@ export function loadMessagesForRoom(args: {
 			if (data?.length) {
 				const lastMessage = data[data.length - 1];
 				const lastMessageRecord = await getMessageById(lastMessage._id as string);
-				if (!lastMessageRecord && (data.length === COUNT || data.length >= COUNT_LIMIT)) {
+				if (!lastMessageRecord && data.length === COUNT) {
 					const loadMoreMessage = {
 						_id: generateLoadMoreId(lastMessage._id as string),
 						rid: lastMessage.rid,

From 9cfa3f6bfc312e7c1964e5fc33150e5389ee8a5f Mon Sep 17 00:00:00 2001
From: Rohit Bansal <40559587+Rohit3523@users.noreply.github.com>
Date: Mon, 12 Jan 2026 02:20:00 +0530
Subject: [PATCH 2/2] Added showThreadMessages

---
 app/lib/methods/loadMessagesForRoom.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/lib/methods/loadMessagesForRoom.ts b/app/lib/methods/loadMessagesForRoom.ts
index d487befeb88..10aa131ec5e 100644
--- a/app/lib/methods/loadMessagesForRoom.ts
+++ b/app/lib/methods/loadMessagesForRoom.ts
@@ -24,7 +24,7 @@ async function load({ rid: roomId, latest, t }: { rid: string; latest?: Date; t:
 			return;
 		}
 
-		const params = { roomId, count: COUNT, ...(lastTs && { latest: lastTs }) };
+		const params = { roomId, showThreadMessages: false, count: COUNT, ...(lastTs && { latest: lastTs }) };
 
 		let data;
 		switch (apiType) {