From b722265bf9a65f892d1157190ac3de44db62c87f Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Thu, 19 Feb 2026 05:05:19 +0000
Subject: [PATCH 01/18] Initial plan


From 88d4431630bd0bbe51de45fe3bb1dddd02854668 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Thu, 19 Feb 2026 05:09:31 +0000
Subject: [PATCH 02/18] Add URL extraction from message AST and blocks for link
 previews

Co-authored-by: ggazzo <5263975+ggazzo@users.noreply.github.com>
---
 .../server/functions/extractTextFromBlocks.ts | 94 +++++++++++++++++++
 .../server/functions/parseUrlsInMessage.ts    | 17 +++-
 2 files changed, 110 insertions(+), 1 deletion(-)
 create mode 100644 apps/meteor/app/lib/server/functions/extractTextFromBlocks.ts

diff --git a/apps/meteor/app/lib/server/functions/extractTextFromBlocks.ts b/apps/meteor/app/lib/server/functions/extractTextFromBlocks.ts
new file mode 100644
index 0000000000000..fca42fff5bc52
--- /dev/null
+++ b/apps/meteor/app/lib/server/functions/extractTextFromBlocks.ts
@@ -0,0 +1,94 @@
+import type { MessageSurfaceLayout } from '@rocket.chat/ui-kit';
+import type { Root } from '@rocket.chat/message-parser';
+
+/**
+ * Extracts all text content from message blocks (UI Kit)
+ * Traverses through all block types and extracts text from TextObjects (plain_text and mrkdwn)
+ */
+export const extractTextFromBlocks = (blocks?: MessageSurfaceLayout): string[] => {
+	if (!blocks || !Array.isArray(blocks)) {
+		return [];
+	}
+
+	const textParts: string[] = [];
+
+	const extractTextFromObject = (obj: any): void => {
+		if (!obj || typeof obj !== 'object') {
+			return;
+		}
+
+		// Handle text objects (PlainText and Markdown)
+		if (obj.type === 'plain_text' || obj.type === 'mrkdwn') {
+			if (typeof obj.text === 'string') {
+				textParts.push(obj.text);
+			}
+		}
+
+		// Handle arrays (e.g., fields, elements)
+		if (Array.isArray(obj)) {
+			obj.forEach((item) => extractTextFromObject(item));
+			return;
+		}
+
+		// Recursively check all properties
+		Object.values(obj).forEach((value) => {
+			if (value && typeof value === 'object') {
+				extractTextFromObject(value);
+			}
+		});
+	};
+
+	blocks.forEach((block) => extractTextFromObject(block));
+
+	return textParts;
+};
+
+/**
+ * Extracts all URLs from parsed message AST (message-parser output)
+ * Looks for LINK nodes and extracts the src URL
+ */
+export const extractUrlsFromMessageAST = (md?: Root): string[] => {
+	if (!md || !Array.isArray(md)) {
+		return [];
+	}
+
+	const urls: string[] = [];
+
+	const traverse = (node: any): void => {
+		if (!node || typeof node !== 'object') {
+			return;
+		}
+
+		// Handle LINK nodes - these contain the normalized URLs with proper schema
+		if (node.type === 'LINK' && node.value?.src?.value) {
+			let url = node.value.src.value;
+			// If URL starts with //, convert to https://
+			if (url.startsWith('//')) {
+				url = 'https:' + url;
+			}
+			urls.push(url);
+		}
+
+		// Handle arrays
+		if (Array.isArray(node)) {
+			node.forEach((item) => traverse(item));
+			return;
+		}
+
+		// Recursively traverse all properties
+		if (node.value !== undefined) {
+			traverse(node.value);
+		}
+
+		// For objects with other properties, traverse them
+		Object.entries(node).forEach(([key, value]) => {
+			if (key !== 'type' && value && typeof value === 'object') {
+				traverse(value);
+			}
+		});
+	};
+
+	traverse(md);
+
+	return urls;
+};
diff --git a/apps/meteor/app/lib/server/functions/parseUrlsInMessage.ts b/apps/meteor/app/lib/server/functions/parseUrlsInMessage.ts
index ea8bed9f77d46..6fc66d42b187e 100644
--- a/apps/meteor/app/lib/server/functions/parseUrlsInMessage.ts
+++ b/apps/meteor/app/lib/server/functions/parseUrlsInMessage.ts
@@ -3,6 +3,7 @@ import type { IMessage, AtLeast } from '@rocket.chat/core-typings';
 import { getMessageUrlRegex } from '../../../../lib/getMessageUrlRegex';
 import { Markdown } from '../../../markdown/server';
 import { settings } from '../../../settings/server';
+import { extractTextFromBlocks, extractUrlsFromMessageAST } from './extractTextFromBlocks';
 
 // TODO move this function to message service to be used like a "beforeSaveMessage" hook
 export const parseUrlsInMessage = (message: AtLeast<IMessage, 'msg'> & { parseUrls?: boolean }, previewUrls?: string[]) => {
@@ -14,7 +15,21 @@ export const parseUrlsInMessage = (message: AtLeast<IMessage, 'msg'> & { parseUr
 	message = Markdown.code(message);
 
 	const urls = message.html?.match(getMessageUrlRegex()) || [];
-	if (urls) {
+	
+	// Extract URLs from parsed message AST (message.md) - these have normalized schemas
+	if (message.md) {
+		const astUrls = extractUrlsFromMessageAST(message.md);
+		urls.push(...astUrls);
+	}
+	
+	// Also extract URLs from message blocks if they exist
+	if (message.blocks) {
+		const blockTexts = extractTextFromBlocks(message.blocks);
+		const blockUrls = blockTexts.flatMap((text) => text.match(getMessageUrlRegex()) || []);
+		urls.push(...blockUrls);
+	}
+	
+	if (urls.length > 0) {
 		message.urls = [...new Set(urls)].map((url) => ({
 			url,
 			meta: {},

From 041bb740aedd782c8f879f3f495d2103dfda530d Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Thu, 19 Feb 2026 05:11:54 +0000
Subject: [PATCH 03/18] Parse message text to extract URLs from schema-less
 links

Co-authored-by: ggazzo <5263975+ggazzo@users.noreply.github.com>
---
 .../functions/extractTextFromBlocks.spec.ts   | 181 ++++++++++++++++++
 .../server/functions/parseUrlsInMessage.ts    |  22 ++-
 2 files changed, 199 insertions(+), 4 deletions(-)
 create mode 100644 apps/meteor/app/lib/server/functions/extractTextFromBlocks.spec.ts

diff --git a/apps/meteor/app/lib/server/functions/extractTextFromBlocks.spec.ts b/apps/meteor/app/lib/server/functions/extractTextFromBlocks.spec.ts
new file mode 100644
index 0000000000000..09af3d53e58bf
--- /dev/null
+++ b/apps/meteor/app/lib/server/functions/extractTextFromBlocks.spec.ts
@@ -0,0 +1,181 @@
+import { expect } from 'chai';
+import { describe, it } from 'mocha';
+
+import { extractUrlsFromMessageAST, extractTextFromBlocks } from './extractTextFromBlocks';
+
+describe('extractUrlsFromMessageAST', () => {
+	it('should extract URLs from LINK nodes', () => {
+		const md = [
+			{
+				type: 'PARAGRAPH',
+				value: [
+					{
+						type: 'LINK',
+						value: {
+							src: {
+								type: 'PLAIN_TEXT',
+								value: 'https://rocket.chat',
+							},
+							label: [
+								{
+									type: 'PLAIN_TEXT',
+									value: 'rocket.chat',
+								},
+							],
+						},
+					},
+				],
+			},
+		];
+
+		const urls = extractUrlsFromMessageAST(md as any);
+		expect(urls).to.deep.equal(['https://rocket.chat']);
+	});
+
+	it('should convert // prefix to https://', () => {
+		const md = [
+			{
+				type: 'PARAGRAPH',
+				value: [
+					{
+						type: 'LINK',
+						value: {
+							src: {
+								type: 'PLAIN_TEXT',
+								value: '//github.com/RocketChat/Rocket.Chat',
+							},
+							label: [
+								{
+									type: 'PLAIN_TEXT',
+									value: 'github.com/RocketChat/Rocket.Chat',
+								},
+							],
+						},
+					},
+				],
+			},
+		];
+
+		const urls = extractUrlsFromMessageAST(md as any);
+		expect(urls).to.deep.equal(['https://github.com/RocketChat/Rocket.Chat']);
+	});
+
+	it('should handle multiple links', () => {
+		const md = [
+			{
+				type: 'PARAGRAPH',
+				value: [
+					{
+						type: 'LINK',
+						value: {
+							src: {
+								type: 'PLAIN_TEXT',
+								value: 'https://rocket.chat',
+							},
+							label: [
+								{
+									type: 'PLAIN_TEXT',
+									value: 'rocket.chat',
+								},
+							],
+						},
+					},
+					{
+						type: 'PLAIN_TEXT',
+						value: ' and ',
+					},
+					{
+						type: 'LINK',
+						value: {
+							src: {
+								type: 'PLAIN_TEXT',
+								value: '//github.com/RocketChat',
+							},
+							label: [
+								{
+									type: 'PLAIN_TEXT',
+									value: 'github.com/RocketChat',
+								},
+							],
+						},
+					},
+				],
+			},
+		];
+
+		const urls = extractUrlsFromMessageAST(md as any);
+		expect(urls).to.deep.equal(['https://rocket.chat', 'https://github.com/RocketChat']);
+	});
+
+	it('should return empty array for undefined or non-array input', () => {
+		expect(extractUrlsFromMessageAST(undefined)).to.deep.equal([]);
+		expect(extractUrlsFromMessageAST(null as any)).to.deep.equal([]);
+		expect(extractUrlsFromMessageAST({} as any)).to.deep.equal([]);
+	});
+});
+
+describe('extractTextFromBlocks', () => {
+	it('should extract text from plain_text blocks', () => {
+		const blocks = [
+			{
+				type: 'section',
+				text: {
+					type: 'plain_text',
+					text: 'Hello World',
+				},
+			},
+		];
+
+		const texts = extractTextFromBlocks(blocks as any);
+		expect(texts).to.deep.equal(['Hello World']);
+	});
+
+	it('should extract text from mrkdwn blocks', () => {
+		const blocks = [
+			{
+				type: 'section',
+				text: {
+					type: 'mrkdwn',
+					text: 'Check out https://rocket.chat',
+				},
+			},
+		];
+
+		const texts = extractTextFromBlocks(blocks as any);
+		expect(texts).to.deep.equal(['Check out https://rocket.chat']);
+	});
+
+	it('should extract text from multiple blocks and nested elements', () => {
+		const blocks = [
+			{
+				type: 'section',
+				text: {
+					type: 'mrkdwn',
+					text: 'First block',
+				},
+			},
+			{
+				type: 'context',
+				elements: [
+					{
+						type: 'plain_text',
+						text: 'Second block element 1',
+					},
+					{
+						type: 'mrkdwn',
+						text: 'Second block element 2',
+					},
+				],
+			},
+		];
+
+		const texts = extractTextFromBlocks(blocks as any);
+		expect(texts).to.deep.equal(['First block', 'Second block element 1', 'Second block element 2']);
+	});
+
+	it('should return empty array for undefined or non-array input', () => {
+		expect(extractTextFromBlocks(undefined)).to.deep.equal([]);
+		expect(extractTextFromBlocks(null as any)).to.deep.equal([]);
+		expect(extractTextFromBlocks({} as any)).to.deep.equal([]);
+	});
+});
diff --git a/apps/meteor/app/lib/server/functions/parseUrlsInMessage.ts b/apps/meteor/app/lib/server/functions/parseUrlsInMessage.ts
index 6fc66d42b187e..af064352793a9 100644
--- a/apps/meteor/app/lib/server/functions/parseUrlsInMessage.ts
+++ b/apps/meteor/app/lib/server/functions/parseUrlsInMessage.ts
@@ -1,4 +1,5 @@
 import type { IMessage, AtLeast } from '@rocket.chat/core-typings';
+import { parse } from '@rocket.chat/message-parser';
 
 import { getMessageUrlRegex } from '../../../../lib/getMessageUrlRegex';
 import { Markdown } from '../../../markdown/server';
@@ -16,10 +17,23 @@ export const parseUrlsInMessage = (message: AtLeast<IMessage, 'msg'> & { parseUr
 
 	const urls = message.html?.match(getMessageUrlRegex()) || [];
 	
-	// Extract URLs from parsed message AST (message.md) - these have normalized schemas
-	if (message.md) {
-		const astUrls = extractUrlsFromMessageAST(message.md);
-		urls.push(...astUrls);
+	// Parse the message to extract URLs from links without schema
+	// The message parser converts links like "github.com" to proper links with "//" prefix
+	if (message.msg) {
+		try {
+			const customDomains = settings.get<string>('Message_CustomDomain_AutoLink')
+				? settings
+						.get<string>('Message_CustomDomain_AutoLink')
+						.split(',')
+						.map((domain) => domain.trim())
+				: [];
+			
+			const parsedMessage = parse(message.msg, { customDomains });
+			const astUrls = extractUrlsFromMessageAST(parsedMessage);
+			urls.push(...astUrls);
+		} catch (e) {
+			// If parsing fails, just continue with URLs from regex
+		}
 	}
 	
 	// Also extract URLs from message blocks if they exist

From 8d8a4b6eaeee475c7828c0215b05b388dac8aee7 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Thu, 19 Feb 2026 05:13:08 +0000
Subject: [PATCH 04/18] Address code review feedback - improve types and error
 logging

Co-authored-by: ggazzo <5263975+ggazzo@users.noreply.github.com>
---
 apps/meteor/app/lib/server/functions/extractTextFromBlocks.ts | 4 ++--
 apps/meteor/app/lib/server/functions/parseUrlsInMessage.ts    | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/apps/meteor/app/lib/server/functions/extractTextFromBlocks.ts b/apps/meteor/app/lib/server/functions/extractTextFromBlocks.ts
index fca42fff5bc52..d194766da6593 100644
--- a/apps/meteor/app/lib/server/functions/extractTextFromBlocks.ts
+++ b/apps/meteor/app/lib/server/functions/extractTextFromBlocks.ts
@@ -12,7 +12,7 @@ export const extractTextFromBlocks = (blocks?: MessageSurfaceLayout): string[] =
 
 	const textParts: string[] = [];
 
-	const extractTextFromObject = (obj: any): void => {
+	const extractTextFromObject = (obj: Record<string, any> | any[] | null | undefined): void => {
 		if (!obj || typeof obj !== 'object') {
 			return;
 		}
@@ -54,7 +54,7 @@ export const extractUrlsFromMessageAST = (md?: Root): string[] => {
 
 	const urls: string[] = [];
 
-	const traverse = (node: any): void => {
+	const traverse = (node: Record<string, any> | any[] | null | undefined): void => {
 		if (!node || typeof node !== 'object') {
 			return;
 		}
diff --git a/apps/meteor/app/lib/server/functions/parseUrlsInMessage.ts b/apps/meteor/app/lib/server/functions/parseUrlsInMessage.ts
index af064352793a9..6711dfe3b12f0 100644
--- a/apps/meteor/app/lib/server/functions/parseUrlsInMessage.ts
+++ b/apps/meteor/app/lib/server/functions/parseUrlsInMessage.ts
@@ -33,6 +33,8 @@ export const parseUrlsInMessage = (message: AtLeast<IMessage, 'msg'> & { parseUr
 			urls.push(...astUrls);
 		} catch (e) {
 			// If parsing fails, just continue with URLs from regex
+			// This can happen with malformed messages or if the parser encounters unexpected input
+			console.debug('Failed to parse message for URL extraction:', e);
 		}
 	}
 	

From fed775caaaee36e92406f87a030c68d1f09472dd Mon Sep 17 00:00:00 2001
From: Guilherme Gazzo <guilherme@gazzo.xyz>
Date: Thu, 19 Feb 2026 13:28:06 -0300
Subject: [PATCH 05/18] Remove deprecated extractTextFromBlocks function and
 add unit tests for URL extraction from message AST. Update parseUrlsInMessage
 to utilize new URL extraction logic.

---
 .../server/functions/extractTextFromBlocks.ts | 94 -------------------
 ...c.ts => extractUrlsFromMessageAST.spec.ts} | 68 +-------------
 .../functions/extractUrlsFromMessageAST.ts    | 33 +++++++
 .../server/functions/parseUrlsInMessage.ts    | 42 +++------
 .../app/lib/server/functions/sendMessage.ts   |  5 +-
 .../app/lib/server/functions/updateMessage.ts |  5 +-
 6 files changed, 53 insertions(+), 194 deletions(-)
 delete mode 100644 apps/meteor/app/lib/server/functions/extractTextFromBlocks.ts
 rename apps/meteor/app/lib/server/functions/{extractTextFromBlocks.spec.ts => extractUrlsFromMessageAST.spec.ts} (59%)
 create mode 100644 apps/meteor/app/lib/server/functions/extractUrlsFromMessageAST.ts

diff --git a/apps/meteor/app/lib/server/functions/extractTextFromBlocks.ts b/apps/meteor/app/lib/server/functions/extractTextFromBlocks.ts
deleted file mode 100644
index d194766da6593..0000000000000
--- a/apps/meteor/app/lib/server/functions/extractTextFromBlocks.ts
+++ /dev/null
@@ -1,94 +0,0 @@
-import type { MessageSurfaceLayout } from '@rocket.chat/ui-kit';
-import type { Root } from '@rocket.chat/message-parser';
-
-/**
- * Extracts all text content from message blocks (UI Kit)
- * Traverses through all block types and extracts text from TextObjects (plain_text and mrkdwn)
- */
-export const extractTextFromBlocks = (blocks?: MessageSurfaceLayout): string[] => {
-	if (!blocks || !Array.isArray(blocks)) {
-		return [];
-	}
-
-	const textParts: string[] = [];
-
-	const extractTextFromObject = (obj: Record<string, any> | any[] | null | undefined): void => {
-		if (!obj || typeof obj !== 'object') {
-			return;
-		}
-
-		// Handle text objects (PlainText and Markdown)
-		if (obj.type === 'plain_text' || obj.type === 'mrkdwn') {
-			if (typeof obj.text === 'string') {
-				textParts.push(obj.text);
-			}
-		}
-
-		// Handle arrays (e.g., fields, elements)
-		if (Array.isArray(obj)) {
-			obj.forEach((item) => extractTextFromObject(item));
-			return;
-		}
-
-		// Recursively check all properties
-		Object.values(obj).forEach((value) => {
-			if (value && typeof value === 'object') {
-				extractTextFromObject(value);
-			}
-		});
-	};
-
-	blocks.forEach((block) => extractTextFromObject(block));
-
-	return textParts;
-};
-
-/**
- * Extracts all URLs from parsed message AST (message-parser output)
- * Looks for LINK nodes and extracts the src URL
- */
-export const extractUrlsFromMessageAST = (md?: Root): string[] => {
-	if (!md || !Array.isArray(md)) {
-		return [];
-	}
-
-	const urls: string[] = [];
-
-	const traverse = (node: Record<string, any> | any[] | null | undefined): void => {
-		if (!node || typeof node !== 'object') {
-			return;
-		}
-
-		// Handle LINK nodes - these contain the normalized URLs with proper schema
-		if (node.type === 'LINK' && node.value?.src?.value) {
-			let url = node.value.src.value;
-			// If URL starts with //, convert to https://
-			if (url.startsWith('//')) {
-				url = 'https:' + url;
-			}
-			urls.push(url);
-		}
-
-		// Handle arrays
-		if (Array.isArray(node)) {
-			node.forEach((item) => traverse(item));
-			return;
-		}
-
-		// Recursively traverse all properties
-		if (node.value !== undefined) {
-			traverse(node.value);
-		}
-
-		// For objects with other properties, traverse them
-		Object.entries(node).forEach(([key, value]) => {
-			if (key !== 'type' && value && typeof value === 'object') {
-				traverse(value);
-			}
-		});
-	};
-
-	traverse(md);
-
-	return urls;
-};
diff --git a/apps/meteor/app/lib/server/functions/extractTextFromBlocks.spec.ts b/apps/meteor/app/lib/server/functions/extractUrlsFromMessageAST.spec.ts
similarity index 59%
rename from apps/meteor/app/lib/server/functions/extractTextFromBlocks.spec.ts
rename to apps/meteor/app/lib/server/functions/extractUrlsFromMessageAST.spec.ts
index 09af3d53e58bf..1516dbb70819c 100644
--- a/apps/meteor/app/lib/server/functions/extractTextFromBlocks.spec.ts
+++ b/apps/meteor/app/lib/server/functions/extractUrlsFromMessageAST.spec.ts
@@ -1,7 +1,7 @@
 import { expect } from 'chai';
 import { describe, it } from 'mocha';
 
-import { extractUrlsFromMessageAST, extractTextFromBlocks } from './extractTextFromBlocks';
+import { extractUrlsFromMessageAST } from './extractUrlsFromMessageAST';
 
 describe('extractUrlsFromMessageAST', () => {
 	it('should extract URLs from LINK nodes', () => {
@@ -113,69 +113,3 @@ describe('extractUrlsFromMessageAST', () => {
 		expect(extractUrlsFromMessageAST({} as any)).to.deep.equal([]);
 	});
 });
-
-describe('extractTextFromBlocks', () => {
-	it('should extract text from plain_text blocks', () => {
-		const blocks = [
-			{
-				type: 'section',
-				text: {
-					type: 'plain_text',
-					text: 'Hello World',
-				},
-			},
-		];
-
-		const texts = extractTextFromBlocks(blocks as any);
-		expect(texts).to.deep.equal(['Hello World']);
-	});
-
-	it('should extract text from mrkdwn blocks', () => {
-		const blocks = [
-			{
-				type: 'section',
-				text: {
-					type: 'mrkdwn',
-					text: 'Check out https://rocket.chat',
-				},
-			},
-		];
-
-		const texts = extractTextFromBlocks(blocks as any);
-		expect(texts).to.deep.equal(['Check out https://rocket.chat']);
-	});
-
-	it('should extract text from multiple blocks and nested elements', () => {
-		const blocks = [
-			{
-				type: 'section',
-				text: {
-					type: 'mrkdwn',
-					text: 'First block',
-				},
-			},
-			{
-				type: 'context',
-				elements: [
-					{
-						type: 'plain_text',
-						text: 'Second block element 1',
-					},
-					{
-						type: 'mrkdwn',
-						text: 'Second block element 2',
-					},
-				],
-			},
-		];
-
-		const texts = extractTextFromBlocks(blocks as any);
-		expect(texts).to.deep.equal(['First block', 'Second block element 1', 'Second block element 2']);
-	});
-
-	it('should return empty array for undefined or non-array input', () => {
-		expect(extractTextFromBlocks(undefined)).to.deep.equal([]);
-		expect(extractTextFromBlocks(null as any)).to.deep.equal([]);
-		expect(extractTextFromBlocks({} as any)).to.deep.equal([]);
-	});
-});
diff --git a/apps/meteor/app/lib/server/functions/extractUrlsFromMessageAST.ts b/apps/meteor/app/lib/server/functions/extractUrlsFromMessageAST.ts
new file mode 100644
index 0000000000000..222aa7c56d76d
--- /dev/null
+++ b/apps/meteor/app/lib/server/functions/extractUrlsFromMessageAST.ts
@@ -0,0 +1,33 @@
+import type { Root } from '@rocket.chat/message-parser';
+
+/**
+ * Extracts all URLs from parsed message AST (message-parser output)
+ * Looks for LINK nodes and extracts the src URL
+ */
+export const extractUrlsFromMessageAST = (md?: Root | Root[number] | Root[number]['value']): string[] => {
+	if (!md || !Array.isArray(md)) {
+		return [];
+	}
+
+	const urls: string[] = [];
+
+	const walk = (node: any): void => {
+		if (Array.isArray(node)) {
+			node.forEach(walk);
+			return;
+		}
+		if (typeof node !== 'object' || node === null) {
+			return;
+		}
+		if (node.type === 'LINK' && node.value?.src?.value) {
+			urls.push(node.value.src.value);
+		}
+		if (node.value !== undefined) {
+			walk(node.value);
+		}
+	};
+
+	walk(md);
+
+	return urls;
+};
diff --git a/apps/meteor/app/lib/server/functions/parseUrlsInMessage.ts b/apps/meteor/app/lib/server/functions/parseUrlsInMessage.ts
index 6711dfe3b12f0..4049999625ce5 100644
--- a/apps/meteor/app/lib/server/functions/parseUrlsInMessage.ts
+++ b/apps/meteor/app/lib/server/functions/parseUrlsInMessage.ts
@@ -1,10 +1,9 @@
 import type { IMessage, AtLeast } from '@rocket.chat/core-typings';
-import { parse } from '@rocket.chat/message-parser';
 
+import { extractUrlsFromMessageAST } from './extractUrlsFromMessageAST';
 import { getMessageUrlRegex } from '../../../../lib/getMessageUrlRegex';
 import { Markdown } from '../../../markdown/server';
 import { settings } from '../../../settings/server';
-import { extractTextFromBlocks, extractUrlsFromMessageAST } from './extractTextFromBlocks';
 
 // TODO move this function to message service to be used like a "beforeSaveMessage" hook
 export const parseUrlsInMessage = (message: AtLeast<IMessage, 'msg'> & { parseUrls?: boolean }, previewUrls?: string[]) => {
@@ -15,36 +14,21 @@ export const parseUrlsInMessage = (message: AtLeast<IMessage, 'msg'> & { parseUr
 	message.html = message.msg;
 	message = Markdown.code(message);
 
-	const urls = message.html?.match(getMessageUrlRegex()) || [];
-	
+	const urls: string[] = [];
+
+	// Also extract URLs from message blocks if they exist
+	if (message.md) {
+		const astUrls = extractUrlsFromMessageAST(message.md);
+		urls.push(...astUrls);
+	}
+
 	// Parse the message to extract URLs from links without schema
 	// The message parser converts links like "github.com" to proper links with "//" prefix
-	if (message.msg) {
-		try {
-			const customDomains = settings.get<string>('Message_CustomDomain_AutoLink')
-				? settings
-						.get<string>('Message_CustomDomain_AutoLink')
-						.split(',')
-						.map((domain) => domain.trim())
-				: [];
-			
-			const parsedMessage = parse(message.msg, { customDomains });
-			const astUrls = extractUrlsFromMessageAST(parsedMessage);
-			urls.push(...astUrls);
-		} catch (e) {
-			// If parsing fails, just continue with URLs from regex
-			// This can happen with malformed messages or if the parser encounters unexpected input
-			console.debug('Failed to parse message for URL extraction:', e);
-		}
+	if (!message.md) {
+		const htmlUrls = message.html?.match(getMessageUrlRegex()) || [];
+		urls.push(...htmlUrls);
 	}
-	
-	// Also extract URLs from message blocks if they exist
-	if (message.blocks) {
-		const blockTexts = extractTextFromBlocks(message.blocks);
-		const blockUrls = blockTexts.flatMap((text) => text.match(getMessageUrlRegex()) || []);
-		urls.push(...blockUrls);
-	}
-	
+
 	if (urls.length > 0) {
 		message.urls = [...new Set(urls)].map((url) => ({
 			url,
diff --git a/apps/meteor/app/lib/server/functions/sendMessage.ts b/apps/meteor/app/lib/server/functions/sendMessage.ts
index 036004aad5a7c..cda5d054cc4e5 100644
--- a/apps/meteor/app/lib/server/functions/sendMessage.ts
+++ b/apps/meteor/app/lib/server/functions/sendMessage.ts
@@ -257,10 +257,11 @@ export const sendMessage = async function (user: any, message: any, room: any, o
 		}
 	}
 
-	parseUrlsInMessage(message, previewUrls);
-
 	message = await Message.beforeSave({ message, room, user });
 
+	// TODO: move this to the message service
+	parseUrlsInMessage(message, previewUrls);
+
 	if (!message) {
 		return;
 	}
diff --git a/apps/meteor/app/lib/server/functions/updateMessage.ts b/apps/meteor/app/lib/server/functions/updateMessage.ts
index baf2628e73394..1dbc898677c62 100644
--- a/apps/meteor/app/lib/server/functions/updateMessage.ts
+++ b/apps/meteor/app/lib/server/functions/updateMessage.ts
@@ -51,8 +51,6 @@ export const updateMessage = async function (
 		},
 	});
 
-	parseUrlsInMessage(messageData, previewUrls);
-
 	const room = await Rooms.findOneById(messageData.rid);
 	if (!room) {
 		return;
@@ -60,6 +58,9 @@ export const updateMessage = async function (
 
 	messageData = await Message.beforeSave({ message: messageData, room, user });
 
+	// TODO: move this to the message service
+	parseUrlsInMessage(messageData, previewUrls);
+
 	if (messageData.customFields) {
 		validateCustomMessageFields({
 			customFields: messageData.customFields,

From cfdadc97ef242350c5d39bbb100f053aa0a1a011 Mon Sep 17 00:00:00 2001
From: Guilherme Gazzo <guilherme@gazzo.xyz>
Date: Thu, 19 Feb 2026 16:04:45 -0300
Subject: [PATCH 06/18] Add test case for local image URL parsing in
 url.test.ts

---
 packages/message-parser/tests/url.test.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/message-parser/tests/url.test.ts b/packages/message-parser/tests/url.test.ts
index df637b5893dc9..1595f92f8fc44 100644
--- a/packages/message-parser/tests/url.test.ts
+++ b/packages/message-parser/tests/url.test.ts
@@ -27,6 +27,7 @@ test.each([
 	['https://rocket.chat/test?search', [paragraph([link('https://rocket.chat/test?search')])]],
 	['https://rocket.chat/test?search=test', [paragraph([link('https://rocket.chat/test?search=test')])]],
 	['https://rocket.chat', [paragraph([link('https://rocket.chat')])]],
+	['http://127.0.0.1:3000/images/logo/logo.png', [paragraph([link('http://127.0.0.1:3000/images/logo/logo.png')])]],
 	['https://localhost', [paragraph([link('https://localhost')])]],
 	['https://localhost:3000', [paragraph([link('https://localhost:3000')])]],
 	['https://localhost:3000#fragment', [paragraph([link('https://localhost:3000#fragment')])]],

From ecb75d95b7f620fb97dc5db472788c07d8804522 Mon Sep 17 00:00:00 2001
From: Guilherme Gazzo <guilherme@gazzo.xyz>
Date: Thu, 19 Feb 2026 16:35:35 -0300
Subject: [PATCH 07/18] Refactor chat end-to-end test to use async/await and
 implement retry logic for oembed iframe generation

---
 apps/meteor/tests/end-to-end/api/chat.ts | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/apps/meteor/tests/end-to-end/api/chat.ts b/apps/meteor/tests/end-to-end/api/chat.ts
index 8952f9a197f54..c1a2bb74a25b4 100644
--- a/apps/meteor/tests/end-to-end/api/chat.ts
+++ b/apps/meteor/tests/end-to-end/api/chat.ts
@@ -5,6 +5,7 @@ import { expect } from 'chai';
 import { after, before, beforeEach, describe, it } from 'mocha';
 import type { Response } from 'supertest';
 
+import { retry } from './helpers/retry';
 import { sleep } from '../../../lib/utils/sleep';
 import { getCredentials, api, request, credentials, apiUrl } from '../../data/api-data';
 import { followMessage, sendSimpleMessage, deleteMessage } from '../../data/chat.helper';
@@ -1257,9 +1258,9 @@ describe('[Chat]', () => {
 				imgUrlMsgId = imgUrlResponse.body.message._id;
 			});
 
-			it('should have an iframe oembed with style max-width', (done) => {
-				setTimeout(() => {
-					void request
+			it('should have an iframe oembed with style max-width', async () => {
+				await retry('Oembed is generated async thats why the retry is required', async () => {
+					await request
 						.get(api('chat.getMessage'))
 						.set(credentials)
 						.query({
@@ -1274,9 +1275,8 @@ describe('[Chat]', () => {
 								.to.have.property('meta')
 								.to.have.property('oembedHtml')
 								.to.have.string('<iframe style="max-width: 100%;width:400px;height:225px"');
-						})
-						.end(done);
-				}, 1000);
+						});
+				});
 			});
 
 			it('should embed an image preview if message has an image url', (done) => {

From caa4e62f94afec7e03ab187f4a41c9c90505accb Mon Sep 17 00:00:00 2001
From: Guilherme Gazzo <guilherme@gazzo.xyz>
Date: Thu, 19 Feb 2026 18:13:09 -0300
Subject: [PATCH 08/18] Update autoLink function to enable IP address detection
 in URL parsing

---
 packages/message-parser/src/utils.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/message-parser/src/utils.ts b/packages/message-parser/src/utils.ts
index a4defac5552bb..252cc67274818 100644
--- a/packages/message-parser/src/utils.ts
+++ b/packages/message-parser/src/utils.ts
@@ -83,7 +83,7 @@ export const link = (src: string, label?: Markup[]): Link => ({
 export const autoLink = (src: string, customDomains?: string[]) => {
 	const validHosts = ['localhost', ...(customDomains ?? [])];
 	const { isIcann, isIp, isPrivate, domain } = tldParse(src, {
-		detectIp: false,
+		detectIp: true,
 		allowPrivateDomains: true,
 		validHosts,
 	});

From 3a4f6b2a7442568e81072e9d42d5dbf88b719b8b Mon Sep 17 00:00:00 2001
From: Guilherme Gazzo <guilherme@gazzo.xyz>
Date: Thu, 19 Feb 2026 18:56:48 -0300
Subject: [PATCH 09/18] Fix message link formatting in live chat tests to
 correctly place quoted message text before the URL.

---
 apps/meteor/tests/end-to-end/api/livechat/20-messages.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/meteor/tests/end-to-end/api/livechat/20-messages.ts b/apps/meteor/tests/end-to-end/api/livechat/20-messages.ts
index a247280422ccb..6c16f6221d201 100644
--- a/apps/meteor/tests/end-to-end/api/livechat/20-messages.ts
+++ b/apps/meteor/tests/end-to-end/api/livechat/20-messages.ts
@@ -46,7 +46,7 @@ describe('LIVECHAT - messages', () => {
 
 			const msgLink = `${siteUrl}/live/${roomId}?msg=${agentMsg._id}`;
 			const quotedMsgSentence = faker.lorem.sentence();
-			const wholeQuotedMsg = `[${msgLink}](${quotedMsgSentence})`;
+			const wholeQuotedMsg = `[${quotedMsgSentence}](${msgLink})`;
 
 			const quotedMessage = await sendMessage(roomId, wholeQuotedMsg, token);
 

From 934eb0ec6d3aec4fbb05e7dd3d7ab98da143aa89 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Thu, 19 Feb 2026 22:00:22 +0000
Subject: [PATCH 10/18] Move parseUrlsInMessage call back to before
 Message.beforeSave in sendMessage and updateMessage

Co-authored-by: ggazzo <5263975+ggazzo@users.noreply.github.com>
---
 apps/meteor/app/lib/server/functions/sendMessage.ts   | 5 ++---
 apps/meteor/app/lib/server/functions/updateMessage.ts | 5 ++---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/apps/meteor/app/lib/server/functions/sendMessage.ts b/apps/meteor/app/lib/server/functions/sendMessage.ts
index cda5d054cc4e5..036004aad5a7c 100644
--- a/apps/meteor/app/lib/server/functions/sendMessage.ts
+++ b/apps/meteor/app/lib/server/functions/sendMessage.ts
@@ -257,11 +257,10 @@ export const sendMessage = async function (user: any, message: any, room: any, o
 		}
 	}
 
-	message = await Message.beforeSave({ message, room, user });
-
-	// TODO: move this to the message service
 	parseUrlsInMessage(message, previewUrls);
 
+	message = await Message.beforeSave({ message, room, user });
+
 	if (!message) {
 		return;
 	}
diff --git a/apps/meteor/app/lib/server/functions/updateMessage.ts b/apps/meteor/app/lib/server/functions/updateMessage.ts
index 1dbc898677c62..baf2628e73394 100644
--- a/apps/meteor/app/lib/server/functions/updateMessage.ts
+++ b/apps/meteor/app/lib/server/functions/updateMessage.ts
@@ -51,6 +51,8 @@ export const updateMessage = async function (
 		},
 	});
 
+	parseUrlsInMessage(messageData, previewUrls);
+
 	const room = await Rooms.findOneById(messageData.rid);
 	if (!room) {
 		return;
@@ -58,9 +60,6 @@ export const updateMessage = async function (
 
 	messageData = await Message.beforeSave({ message: messageData, room, user });
 
-	// TODO: move this to the message service
-	parseUrlsInMessage(messageData, previewUrls);
-
 	if (messageData.customFields) {
 		validateCustomMessageFields({
 			customFields: messageData.customFields,

From 71bea1ba6e94a3a61bf93f2d0deee996717bf92f Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Thu, 19 Feb 2026 22:05:56 +0000
Subject: [PATCH 11/18] Move parseUrlsInMessage inside Message.beforeSave
 method

Co-authored-by: ggazzo <5263975+ggazzo@users.noreply.github.com>
---
 apps/meteor/app/lib/server/functions/sendMessage.ts   | 5 +----
 apps/meteor/app/lib/server/functions/updateMessage.ts | 5 +----
 apps/meteor/server/services/messages/service.ts       | 6 ++++++
 packages/core-services/src/types/IMessageService.ts   | 2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/apps/meteor/app/lib/server/functions/sendMessage.ts b/apps/meteor/app/lib/server/functions/sendMessage.ts
index 036004aad5a7c..756c95f96613a 100644
--- a/apps/meteor/app/lib/server/functions/sendMessage.ts
+++ b/apps/meteor/app/lib/server/functions/sendMessage.ts
@@ -4,7 +4,6 @@ import type { IMessage, IRoom } from '@rocket.chat/core-typings';
 import { Messages } from '@rocket.chat/models';
 import { Match, check } from 'meteor/check';
 
-import { parseUrlsInMessage } from './parseUrlsInMessage';
 import { isRelativeURL } from '../../../../lib/utils/isRelativeURL';
 import { isURL } from '../../../../lib/utils/isURL';
 import { hasPermissionAsync } from '../../../authorization/server/functions/hasPermission';
@@ -257,9 +256,7 @@ export const sendMessage = async function (user: any, message: any, room: any, o
 		}
 	}
 
-	parseUrlsInMessage(message, previewUrls);
-
-	message = await Message.beforeSave({ message, room, user });
+	message = await Message.beforeSave({ message, room, user, previewUrls });
 
 	if (!message) {
 		return;
diff --git a/apps/meteor/app/lib/server/functions/updateMessage.ts b/apps/meteor/app/lib/server/functions/updateMessage.ts
index baf2628e73394..5d05890812a63 100644
--- a/apps/meteor/app/lib/server/functions/updateMessage.ts
+++ b/apps/meteor/app/lib/server/functions/updateMessage.ts
@@ -4,7 +4,6 @@ import type { IMessage, IUser, AtLeast } from '@rocket.chat/core-typings';
 import { Messages, Rooms } from '@rocket.chat/models';
 import { Meteor } from 'meteor/meteor';
 
-import { parseUrlsInMessage } from './parseUrlsInMessage';
 import { settings } from '../../../settings/server';
 import { afterSaveMessage } from '../lib/afterSaveMessage';
 import { notifyOnRoomChangedById } from '../lib/notifyListener';
@@ -51,14 +50,12 @@ export const updateMessage = async function (
 		},
 	});
 
-	parseUrlsInMessage(messageData, previewUrls);
-
 	const room = await Rooms.findOneById(messageData.rid);
 	if (!room) {
 		return;
 	}
 
-	messageData = await Message.beforeSave({ message: messageData, room, user });
+	messageData = await Message.beforeSave({ message: messageData, room, user, previewUrls });
 
 	if (messageData.customFields) {
 		validateCustomMessageFields({
diff --git a/apps/meteor/server/services/messages/service.ts b/apps/meteor/server/services/messages/service.ts
index 89bc4393217b9..cc3dae65fb16e 100644
--- a/apps/meteor/server/services/messages/service.ts
+++ b/apps/meteor/server/services/messages/service.ts
@@ -7,6 +7,7 @@ import { Messages, Rooms } from '@rocket.chat/models';
 
 import { OEmbed } from './hooks/AfterSaveOEmbed';
 import { deleteMessage } from '../../../app/lib/server/functions/deleteMessage';
+import { parseUrlsInMessage } from '../../../app/lib/server/functions/parseUrlsInMessage';
 import { sendMessage } from '../../../app/lib/server/functions/sendMessage';
 import { updateMessage } from '../../../app/lib/server/functions/updateMessage';
 import { notifyOnRoomChangedById, notifyOnMessageChange } from '../../../app/lib/server/lib/notifyListener';
@@ -217,10 +218,12 @@ export class MessageService extends ServiceClassInternal implements IMessageServ
 		message,
 		room,
 		user,
+		previewUrls,
 	}: {
 		message: IMessage;
 		room: IRoom;
 		user: Pick<IUser, '_id' | 'username' | 'name' | 'emails' | 'language'>;
+		previewUrls?: string[];
 	}): Promise<IMessage> {
 		// TODO looks like this one was not being used (so I'll left it commented)
 		// await this.joinDiscussionOnMessage({ message, room, user });
@@ -244,6 +247,9 @@ export class MessageService extends ServiceClassInternal implements IMessageServ
 			},
 		});
 
+		// Parse URLs in the message for link previews
+		parseUrlsInMessage(message, previewUrls);
+
 		if (!this.isEditedOrOld(message)) {
 			await Promise.all([
 				this.checkMAC.isWithinLimits({ message, room }),
diff --git a/packages/core-services/src/types/IMessageService.ts b/packages/core-services/src/types/IMessageService.ts
index 4be232027707c..ab6c2e67388c3 100644
--- a/packages/core-services/src/types/IMessageService.ts
+++ b/packages/core-services/src/types/IMessageService.ts
@@ -42,7 +42,7 @@ export interface IMessageService {
 		user: Pick<IUser, '_id' | 'username' | 'name'>,
 		extraData?: Partial<T>,
 	): Promise<IMessage>;
-	beforeSave(param: { message: IMessage; room: IRoom; user: IUser }): Promise<IMessage>;
+	beforeSave(param: { message: IMessage; room: IRoom; user: IUser; previewUrls?: string[] }): Promise<IMessage>;
 	sendMessageWithValidation(user: IUser, message: Partial<IMessage>, room: Partial<IRoom>, upsert?: boolean): Promise<IMessage>;
 	deleteMessage(user: IUser, message: IMessage): Promise<void>;
 	updateMessage(message: IMessage, user: IUser, originalMsg?: IMessage): Promise<void>;

From 8cebc11ab025faf075e633883c48d8a37709e5e2 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Thu, 19 Feb 2026 22:06:51 +0000
Subject: [PATCH 12/18] Remove completed TODO comment from parseUrlsInMessage

Co-authored-by: ggazzo <5263975+ggazzo@users.noreply.github.com>
---
 apps/meteor/app/lib/server/functions/parseUrlsInMessage.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/apps/meteor/app/lib/server/functions/parseUrlsInMessage.ts b/apps/meteor/app/lib/server/functions/parseUrlsInMessage.ts
index 4049999625ce5..afe95e6524781 100644
--- a/apps/meteor/app/lib/server/functions/parseUrlsInMessage.ts
+++ b/apps/meteor/app/lib/server/functions/parseUrlsInMessage.ts
@@ -5,7 +5,6 @@ import { getMessageUrlRegex } from '../../../../lib/getMessageUrlRegex';
 import { Markdown } from '../../../markdown/server';
 import { settings } from '../../../settings/server';
 
-// TODO move this function to message service to be used like a "beforeSaveMessage" hook
 export const parseUrlsInMessage = (message: AtLeast<IMessage, 'msg'> & { parseUrls?: boolean }, previewUrls?: string[]) => {
 	if (message.parseUrls === false) {
 		return message;

From eaeea57dbffc3aef3588404450b0e5a2c87b9111 Mon Sep 17 00:00:00 2001
From: Guilherme Gazzo <guilherme@gazzo.xyz>
Date: Thu, 19 Feb 2026 21:48:54 -0300
Subject: [PATCH 13/18] Refactor insertMessage and parseUrlsInMessage to
 improve URL handling and message processing. Update insertMessage to assign
 parsed URLs directly to the message object. Enhance parseUrlsInMessage to
 return structured URL data and clean up unused code. Adjust MessageService to
 utilize the updated URL parsing logic.

---
 .../app/lib/server/functions/insertMessage.ts |  3 +-
 .../server/functions/parseUrlsInMessage.ts    | 41 ++++++++-----------
 .../app/markdown/lib/parser/original/token.ts | 15 +++++--
 .../messages/hooks/BeforeSaveJumpToMessage.ts |  7 ++++
 .../server/services/messages/service.ts       |  4 +-
 5 files changed, 39 insertions(+), 31 deletions(-)

diff --git a/apps/meteor/app/lib/server/functions/insertMessage.ts b/apps/meteor/app/lib/server/functions/insertMessage.ts
index ab20be0dfe677..3c053ba424d1e 100644
--- a/apps/meteor/app/lib/server/functions/insertMessage.ts
+++ b/apps/meteor/app/lib/server/functions/insertMessage.ts
@@ -4,6 +4,7 @@ import { Messages, Rooms } from '@rocket.chat/models';
 import { parseUrlsInMessage } from './parseUrlsInMessage';
 import { validateMessage, prepareMessageObject } from './sendMessage';
 
+// TODO: remove and move to Message.Service
 export const insertMessage = async function (
 	user: Pick<IUser, '_id' | 'username'>,
 	message: IMessage,
@@ -16,7 +17,7 @@ export const insertMessage = async function (
 
 	await validateMessage(message, { _id: rid }, user);
 	prepareMessageObject(message, rid, user);
-	parseUrlsInMessage(message);
+	message.urls = parseUrlsInMessage(message);
 
 	if (message._id && upsert) {
 		const { _id, ...rest } = message;
diff --git a/apps/meteor/app/lib/server/functions/parseUrlsInMessage.ts b/apps/meteor/app/lib/server/functions/parseUrlsInMessage.ts
index afe95e6524781..2b051e96a5ad9 100644
--- a/apps/meteor/app/lib/server/functions/parseUrlsInMessage.ts
+++ b/apps/meteor/app/lib/server/functions/parseUrlsInMessage.ts
@@ -5,39 +5,32 @@ import { getMessageUrlRegex } from '../../../../lib/getMessageUrlRegex';
 import { Markdown } from '../../../markdown/server';
 import { settings } from '../../../settings/server';
 
+const prepareUrl = (url: string, previewUrls: string[] | undefined) => ({
+	url,
+	meta: {},
+	...(previewUrls && !previewUrls.includes(url) && !url.includes(settings.get('Site_Url')) && { ignoreParse: true }),
+});
+
+const prepareUrls = (urls: string[], previewUrls?: string[]) => [...new Set(urls)].map((url) => prepareUrl(url, previewUrls));
+
 export const parseUrlsInMessage = (message: AtLeast<IMessage, 'msg'> & { parseUrls?: boolean }, previewUrls?: string[]) => {
 	if (message.parseUrls === false) {
-		return message;
+		return [];
 	}
 
-	message.html = message.msg;
-	message = Markdown.code(message);
-
-	const urls: string[] = [];
-
 	// Also extract URLs from message blocks if they exist
 	if (message.md) {
 		const astUrls = extractUrlsFromMessageAST(message.md);
-		urls.push(...astUrls);
+		return prepareUrls(astUrls, previewUrls);
 	}
 
+	// TODO: remove this after make the parser official
 	// Parse the message to extract URLs from links without schema
 	// The message parser converts links like "github.com" to proper links with "//" prefix
-	if (!message.md) {
-		const htmlUrls = message.html?.match(getMessageUrlRegex()) || [];
-		urls.push(...htmlUrls);
-	}
-
-	if (urls.length > 0) {
-		message.urls = [...new Set(urls)].map((url) => ({
-			url,
-			meta: {},
-			...(previewUrls && !previewUrls.includes(url) && !url.includes(settings.get('Site_Url')) && { ignoreParse: true }),
-		}));
-	}
-
-	message = Markdown.mountTokensBack(message, false);
-	message.msg = message.html || message.msg;
-	delete message.html;
-	delete message.tokens;
+	const result = Markdown.code({
+		html: message.msg,
+		msg: message.msg,
+	});
+	const htmlUrls = result.html?.match(getMessageUrlRegex()) || [];
+	return prepareUrls(htmlUrls, previewUrls);
 };
diff --git a/apps/meteor/app/markdown/lib/parser/original/token.ts b/apps/meteor/app/markdown/lib/parser/original/token.ts
index d4b5a4ef8ace6..f7170b4e69075 100644
--- a/apps/meteor/app/markdown/lib/parser/original/token.ts
+++ b/apps/meteor/app/markdown/lib/parser/original/token.ts
@@ -2,10 +2,19 @@
  * Markdown is a named function that will parse markdown syntax
  * @param {String} msg - The message html
  */
-import type { IMessage, TokenType, TokenExtra } from '@rocket.chat/core-typings';
+import type { TokenType, TokenExtra } from '@rocket.chat/core-typings';
 import { Random } from '@rocket.chat/random';
 
-export const addAsToken = (message: IMessage, html: string, type: TokenType, extra?: TokenExtra): string => {
+type MessageTokens = {
+	tokens?: {
+		token: string;
+		type: TokenType;
+		text: string;
+		extra?: TokenExtra;
+	}[];
+};
+
+export const addAsToken = (message: MessageTokens, html: string, type: TokenType, extra?: TokenExtra): string => {
 	if (!message.tokens) {
 		message.tokens = [];
 	}
@@ -22,7 +31,7 @@ export const addAsToken = (message: IMessage, html: string, type: TokenType, ext
 
 export const isToken = (msg: string): boolean => /=!=[.a-z0-9]{17}=!=/gim.test(msg.trim());
 
-export const validateAllowedTokens = (message: IMessage, id: string, desiredTokens: TokenType[]): boolean => {
+export const validateAllowedTokens = (message: MessageTokens, id: string, desiredTokens: TokenType[]): boolean => {
 	const tokens: string[] = id.match(/=!=[.a-z0-9]{17}=!=/gim) || [];
 	const tokensFound = message.tokens?.filter(({ token }) => tokens.includes(token)) || [];
 	return tokensFound.length === 0 || tokensFound.every((token) => token.type && desiredTokens.includes(token.type));
diff --git a/apps/meteor/server/services/messages/hooks/BeforeSaveJumpToMessage.ts b/apps/meteor/server/services/messages/hooks/BeforeSaveJumpToMessage.ts
index 3981f02c9bce1..96df401485990 100644
--- a/apps/meteor/server/services/messages/hooks/BeforeSaveJumpToMessage.ts
+++ b/apps/meteor/server/services/messages/hooks/BeforeSaveJumpToMessage.ts
@@ -138,22 +138,27 @@ export class BeforeSaveJumpToMessage {
 
 		const quotes = [];
 
+		console.log('message.urls', message.urls);
 		for (const item of message.urls) {
 			if (!item.url.includes(config.siteUrl)) {
+				console.log('item.url', item.url, config.siteUrl);
 				continue;
 			}
 
 			const linkedMessage = linkedMessages.find((msg) => msg?.url === item.url);
 			if (!linkedMessage) {
+				console.log('linkedMessage not found', item.url);
 				continue;
 			}
 
 			const messageFromUrl = validMessages.find((msg) => msg._id === linkedMessage.msgId);
 			if (!messageFromUrl) {
+				console.log('messageFromUrl not found', item.url);
 				continue;
 			}
 
 			if (!validRooms?.find((room) => room?._id === messageFromUrl.rid)) {
+				console.log('validRooms not found', item.url);
 				continue;
 			}
 
@@ -162,6 +167,8 @@ export class BeforeSaveJumpToMessage {
 			quotes.push(createQuoteAttachment(messageFromUrl, item.url, useRealName, this.getUserAvatarURL(messageFromUrl.u.username)));
 		}
 
+		console.log('quotes', quotes);
+
 		if (quotes.length > 0) {
 			const currentAttachments = message.attachments || [];
 			message.attachments = [...currentAttachments, ...quotes];
diff --git a/apps/meteor/server/services/messages/service.ts b/apps/meteor/server/services/messages/service.ts
index cc3dae65fb16e..4856077fac7b5 100644
--- a/apps/meteor/server/services/messages/service.ts
+++ b/apps/meteor/server/services/messages/service.ts
@@ -236,6 +236,7 @@ export class MessageService extends ServiceClassInternal implements IMessageServ
 		message = await this.cannedResponse.replacePlaceholders({ message, room, user });
 		message = await this.badWords.filterBadWords({ message });
 		message = await this.markdownParser.parseMarkdown({ message, config: this.getMarkdownConfig() });
+		message.urls = parseUrlsInMessage(message, previewUrls);
 		message = await this.spotify.convertSpotifyLinks({ message });
 		message = await this.jumpToMessage.createAttachmentForMessageURLs({
 			message,
@@ -247,9 +248,6 @@ export class MessageService extends ServiceClassInternal implements IMessageServ
 			},
 		});
 
-		// Parse URLs in the message for link previews
-		parseUrlsInMessage(message, previewUrls);
-
 		if (!this.isEditedOrOld(message)) {
 			await Promise.all([
 				this.checkMAC.isWithinLimits({ message, room }),

From c52a37d571ed1596b282986a697f713bfed9bcfc Mon Sep 17 00:00:00 2001
From: Guilherme Gazzo <guilhermegazzo@gmail.com>
Date: Thu, 19 Feb 2026 21:58:32 -0300
Subject: [PATCH 14/18] remove consoles

---
 .../services/messages/hooks/BeforeSaveJumpToMessage.ts     | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/apps/meteor/server/services/messages/hooks/BeforeSaveJumpToMessage.ts b/apps/meteor/server/services/messages/hooks/BeforeSaveJumpToMessage.ts
index 96df401485990..3981f02c9bce1 100644
--- a/apps/meteor/server/services/messages/hooks/BeforeSaveJumpToMessage.ts
+++ b/apps/meteor/server/services/messages/hooks/BeforeSaveJumpToMessage.ts
@@ -138,27 +138,22 @@ export class BeforeSaveJumpToMessage {
 
 		const quotes = [];
 
-		console.log('message.urls', message.urls);
 		for (const item of message.urls) {
 			if (!item.url.includes(config.siteUrl)) {
-				console.log('item.url', item.url, config.siteUrl);
 				continue;
 			}
 
 			const linkedMessage = linkedMessages.find((msg) => msg?.url === item.url);
 			if (!linkedMessage) {
-				console.log('linkedMessage not found', item.url);
 				continue;
 			}
 
 			const messageFromUrl = validMessages.find((msg) => msg._id === linkedMessage.msgId);
 			if (!messageFromUrl) {
-				console.log('messageFromUrl not found', item.url);
 				continue;
 			}
 
 			if (!validRooms?.find((room) => room?._id === messageFromUrl.rid)) {
-				console.log('validRooms not found', item.url);
 				continue;
 			}
 
@@ -167,8 +162,6 @@ export class BeforeSaveJumpToMessage {
 			quotes.push(createQuoteAttachment(messageFromUrl, item.url, useRealName, this.getUserAvatarURL(messageFromUrl.u.username)));
 		}
 
-		console.log('quotes', quotes);
-
 		if (quotes.length > 0) {
 			const currentAttachments = message.attachments || [];
 			message.attachments = [...currentAttachments, ...quotes];

From d408d136c9b4372386db697c6d4eb4d05cf1afb8 Mon Sep 17 00:00:00 2001
From: Guilherme Gazzo <guilhermegazzo@gmail.com>
Date: Thu, 19 Feb 2026 22:36:42 -0300
Subject: [PATCH 15/18] message.parseUrls

---
 apps/meteor/app/lib/server/functions/parseUrlsInMessage.ts | 5 +----
 apps/meteor/server/services/messages/service.ts            | 5 ++++-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/apps/meteor/app/lib/server/functions/parseUrlsInMessage.ts b/apps/meteor/app/lib/server/functions/parseUrlsInMessage.ts
index 2b051e96a5ad9..394369982c039 100644
--- a/apps/meteor/app/lib/server/functions/parseUrlsInMessage.ts
+++ b/apps/meteor/app/lib/server/functions/parseUrlsInMessage.ts
@@ -13,10 +13,7 @@ const prepareUrl = (url: string, previewUrls: string[] | undefined) => ({
 
 const prepareUrls = (urls: string[], previewUrls?: string[]) => [...new Set(urls)].map((url) => prepareUrl(url, previewUrls));
 
-export const parseUrlsInMessage = (message: AtLeast<IMessage, 'msg'> & { parseUrls?: boolean }, previewUrls?: string[]) => {
-	if (message.parseUrls === false) {
-		return [];
-	}
+export const parseUrlsInMessage = (message: AtLeast<IMessage, 'msg'>, previewUrls?: string[]) => {
 
 	// Also extract URLs from message blocks if they exist
 	if (message.md) {
diff --git a/apps/meteor/server/services/messages/service.ts b/apps/meteor/server/services/messages/service.ts
index 4856077fac7b5..4ea67b38a7235 100644
--- a/apps/meteor/server/services/messages/service.ts
+++ b/apps/meteor/server/services/messages/service.ts
@@ -236,7 +236,10 @@ export class MessageService extends ServiceClassInternal implements IMessageServ
 		message = await this.cannedResponse.replacePlaceholders({ message, room, user });
 		message = await this.badWords.filterBadWords({ message });
 		message = await this.markdownParser.parseMarkdown({ message, config: this.getMarkdownConfig() });
-		message.urls = parseUrlsInMessage(message, previewUrls);
+		if(message.parseUrls){
+			message.urls = parseUrlsInMessage(message, previewUrls);
+
+		}
 		message = await this.spotify.convertSpotifyLinks({ message });
 		message = await this.jumpToMessage.createAttachmentForMessageURLs({
 			message,

From dda52b6bb29f769ac1d925454db0f9e479b5e886 Mon Sep 17 00:00:00 2001
From: Guilherme Gazzo <guilherme@gazzo.xyz>
Date: Thu, 19 Feb 2026 22:53:28 -0300
Subject: [PATCH 16/18] Refactor parseUrlsInMessage to include optional
 parseUrls flag in message object. Update MessageService to always parse URLs,
 simplifying the logic by removing the conditional check for parseUrls.

---
 .../meteor/app/lib/server/functions/parseUrlsInMessage.ts | 8 ++++++--
 apps/meteor/server/services/messages/service.ts           | 5 +----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/apps/meteor/app/lib/server/functions/parseUrlsInMessage.ts b/apps/meteor/app/lib/server/functions/parseUrlsInMessage.ts
index 394369982c039..233b4f4600c27 100644
--- a/apps/meteor/app/lib/server/functions/parseUrlsInMessage.ts
+++ b/apps/meteor/app/lib/server/functions/parseUrlsInMessage.ts
@@ -13,8 +13,12 @@ const prepareUrl = (url: string, previewUrls: string[] | undefined) => ({
 
 const prepareUrls = (urls: string[], previewUrls?: string[]) => [...new Set(urls)].map((url) => prepareUrl(url, previewUrls));
 
-export const parseUrlsInMessage = (message: AtLeast<IMessage, 'msg'>, previewUrls?: string[]) => {
-
+export const parseUrlsInMessage = (
+	message: AtLeast<IMessage, 'msg' | 'md'> & {
+		parseUrls?: boolean;
+	},
+	previewUrls?: string[],
+) => {
 	// Also extract URLs from message blocks if they exist
 	if (message.md) {
 		const astUrls = extractUrlsFromMessageAST(message.md);
diff --git a/apps/meteor/server/services/messages/service.ts b/apps/meteor/server/services/messages/service.ts
index 4ea67b38a7235..4856077fac7b5 100644
--- a/apps/meteor/server/services/messages/service.ts
+++ b/apps/meteor/server/services/messages/service.ts
@@ -236,10 +236,7 @@ export class MessageService extends ServiceClassInternal implements IMessageServ
 		message = await this.cannedResponse.replacePlaceholders({ message, room, user });
 		message = await this.badWords.filterBadWords({ message });
 		message = await this.markdownParser.parseMarkdown({ message, config: this.getMarkdownConfig() });
-		if(message.parseUrls){
-			message.urls = parseUrlsInMessage(message, previewUrls);
-
-		}
+		message.urls = parseUrlsInMessage(message, previewUrls);
 		message = await this.spotify.convertSpotifyLinks({ message });
 		message = await this.jumpToMessage.createAttachmentForMessageURLs({
 			message,

From e4a7ee9d7909830e203cedae8331316c25205485 Mon Sep 17 00:00:00 2001
From: Guilherme Gazzo <guilherme@gazzo.xyz>
Date: Thu, 19 Feb 2026 23:20:04 -0300
Subject: [PATCH 17/18] Update sendMessage and updateMessage functions to
 include parseUrls flag in beforeSave calls, enhancing URL processing
 flexibility.

---
 apps/meteor/app/lib/server/functions/sendMessage.ts   | 2 +-
 apps/meteor/app/lib/server/functions/updateMessage.ts | 9 +++++++--
 apps/meteor/server/services/messages/service.ts       | 6 +++++-
 packages/core-services/src/types/IMessageService.ts   | 2 +-
 4 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/apps/meteor/app/lib/server/functions/sendMessage.ts b/apps/meteor/app/lib/server/functions/sendMessage.ts
index 756c95f96613a..c6a8483b67b4d 100644
--- a/apps/meteor/app/lib/server/functions/sendMessage.ts
+++ b/apps/meteor/app/lib/server/functions/sendMessage.ts
@@ -256,7 +256,7 @@ export const sendMessage = async function (user: any, message: any, room: any, o
 		}
 	}
 
-	message = await Message.beforeSave({ message, room, user, previewUrls });
+	message = await Message.beforeSave({ message, room, user, previewUrls, parseUrls: message.parseUrls });
 
 	if (!message) {
 		return;
diff --git a/apps/meteor/app/lib/server/functions/updateMessage.ts b/apps/meteor/app/lib/server/functions/updateMessage.ts
index 5d05890812a63..7f089f6872975 100644
--- a/apps/meteor/app/lib/server/functions/updateMessage.ts
+++ b/apps/meteor/app/lib/server/functions/updateMessage.ts
@@ -10,7 +10,12 @@ import { notifyOnRoomChangedById } from '../lib/notifyListener';
 import { validateCustomMessageFields } from '../lib/validateCustomMessageFields';
 
 export const updateMessage = async function (
-	message: AtLeast<IMessage, '_id' | 'rid' | 'msg' | 'customFields'> | AtLeast<IMessage, '_id' | 'rid' | 'content'>,
+	{
+		parseUrls,
+		...message
+	}: (AtLeast<IMessage, '_id' | 'rid' | 'msg' | 'customFields'> | AtLeast<IMessage, '_id' | 'rid' | 'content'>) & {
+		parseUrls?: boolean;
+	},
 	user: IUser,
 	originalMsg?: IMessage,
 	previewUrls?: string[],
@@ -55,7 +60,7 @@ export const updateMessage = async function (
 		return;
 	}
 
-	messageData = await Message.beforeSave({ message: messageData, room, user, previewUrls });
+	messageData = await Message.beforeSave({ message: messageData, room, user, previewUrls, parseUrls });
 
 	if (messageData.customFields) {
 		validateCustomMessageFields({
diff --git a/apps/meteor/server/services/messages/service.ts b/apps/meteor/server/services/messages/service.ts
index 4856077fac7b5..3298f953ee671 100644
--- a/apps/meteor/server/services/messages/service.ts
+++ b/apps/meteor/server/services/messages/service.ts
@@ -219,11 +219,13 @@ export class MessageService extends ServiceClassInternal implements IMessageServ
 		room,
 		user,
 		previewUrls,
+		parseUrls = true,
 	}: {
 		message: IMessage;
 		room: IRoom;
 		user: Pick<IUser, '_id' | 'username' | 'name' | 'emails' | 'language'>;
 		previewUrls?: string[];
+		parseUrls?: boolean;
 	}): Promise<IMessage> {
 		// TODO looks like this one was not being used (so I'll left it commented)
 		// await this.joinDiscussionOnMessage({ message, room, user });
@@ -236,7 +238,9 @@ export class MessageService extends ServiceClassInternal implements IMessageServ
 		message = await this.cannedResponse.replacePlaceholders({ message, room, user });
 		message = await this.badWords.filterBadWords({ message });
 		message = await this.markdownParser.parseMarkdown({ message, config: this.getMarkdownConfig() });
-		message.urls = parseUrlsInMessage(message, previewUrls);
+		if (parseUrls) {
+			message.urls = parseUrlsInMessage(message, previewUrls);
+		}
 		message = await this.spotify.convertSpotifyLinks({ message });
 		message = await this.jumpToMessage.createAttachmentForMessageURLs({
 			message,
diff --git a/packages/core-services/src/types/IMessageService.ts b/packages/core-services/src/types/IMessageService.ts
index ab6c2e67388c3..341610b9b4135 100644
--- a/packages/core-services/src/types/IMessageService.ts
+++ b/packages/core-services/src/types/IMessageService.ts
@@ -42,7 +42,7 @@ export interface IMessageService {
 		user: Pick<IUser, '_id' | 'username' | 'name'>,
 		extraData?: Partial<T>,
 	): Promise<IMessage>;
-	beforeSave(param: { message: IMessage; room: IRoom; user: IUser; previewUrls?: string[] }): Promise<IMessage>;
+	beforeSave(param: { message: IMessage; room: IRoom; user: IUser; previewUrls?: string[]; parseUrls?: boolean }): Promise<IMessage>;
 	sendMessageWithValidation(user: IUser, message: Partial<IMessage>, room: Partial<IRoom>, upsert?: boolean): Promise<IMessage>;
 	deleteMessage(user: IUser, message: IMessage): Promise<void>;
 	updateMessage(message: IMessage, user: IUser, originalMsg?: IMessage): Promise<void>;

From e5a3f476662d1206c0f4556d9273024e7b611afa Mon Sep 17 00:00:00 2001
From: Guilherme Gazzo <guilherme@gazzo.xyz>
Date: Fri, 20 Feb 2026 00:45:39 -0300
Subject: [PATCH 18/18] Refactor chat end-to-end test to improve readability
 and add retry options for async oembed generation.

---
 apps/meteor/tests/end-to-end/api/chat.ts | 41 ++++++++++++++----------
 1 file changed, 24 insertions(+), 17 deletions(-)

diff --git a/apps/meteor/tests/end-to-end/api/chat.ts b/apps/meteor/tests/end-to-end/api/chat.ts
index c1a2bb74a25b4..4652ae424193e 100644
--- a/apps/meteor/tests/end-to-end/api/chat.ts
+++ b/apps/meteor/tests/end-to-end/api/chat.ts
@@ -1259,24 +1259,31 @@ describe('[Chat]', () => {
 			});
 
 			it('should have an iframe oembed with style max-width', async () => {
-				await retry('Oembed is generated async thats why the retry is required', async () => {
-					await request
-						.get(api('chat.getMessage'))
-						.set(credentials)
-						.query({
-							msgId: ytEmbedMsgId,
-						})
-						.expect('Content-Type', 'application/json')
-						.expect(200)
-						.expect((res) => {
-							expect(res.body).to.have.property('message').to.have.property('urls').to.be.an('array').that.is.not.empty;
+				await retry(
+					'Oembed is generated async thats why the retry is required',
+					async () => {
+						await request
+							.get(api('chat.getMessage'))
+							.set(credentials)
+							.query({
+								msgId: ytEmbedMsgId,
+							})
+							.expect('Content-Type', 'application/json')
+							.expect(200)
+							.expect((res) => {
+								expect(res.body).to.have.property('message').to.have.property('urls').to.be.an('array').that.is.not.empty;
 
-							expect(res.body.message.urls[0])
-								.to.have.property('meta')
-								.to.have.property('oembedHtml')
-								.to.have.string('<iframe style="max-width: 100%;width:400px;height:225px"');
-						});
-				});
+								expect(res.body.message.urls[0])
+									.to.have.property('meta')
+									.to.have.property('oembedHtml')
+									.to.have.string('<iframe style="max-width: 100%;width:400px;height:225px"');
+							});
+					},
+					{
+						delayMs: 100,
+						retries: 5,
+					},
+				);
 			});
 
 			it('should embed an image preview if message has an image url', (done) => {