diff --git a/src/lib/components/channel/MessageInput.svelte b/src/lib/components/channel/MessageInput.svelte
index db7d465970..cb4dc08669 100644
--- a/src/lib/components/channel/MessageInput.svelte
+++ b/src/lib/components/channel/MessageInput.svelte
@@ -18,7 +18,11 @@
 		user
 	} from '$lib/stores';
 	import { processingQueueChannels, processNextInQueue } from '$lib/utils/channelQueue';
-	import { getMentionUserQueries, resolveMentions, getChannelMentionCandidates } from '$lib/utils/channelMentions';
+	import {
+		getMentionUserQueries,
+		resolveMentions,
+		getChannelMentionCandidates
+	} from '$lib/utils/channelMentions';
 	import type { Editor } from '@tiptap/core';
 	import QueuedMessageItem from '../chat/MessageInput/QueuedMessageItem.svelte';
 	import {
diff --git a/src/lib/components/chat/Messages/Markdown/MarkdownInlineTokens/MentionToken.svelte b/src/lib/components/chat/Messages/Markdown/MarkdownInlineTokens/MentionToken.svelte
index fab0a2a701..9c815360ef 100644
--- a/src/lib/components/chat/Messages/Markdown/MarkdownInlineTokens/MentionToken.svelte
+++ b/src/lib/components/chat/Messages/Markdown/MarkdownInlineTokens/MentionToken.svelte
@@ -15,7 +15,7 @@
 </script>
 
 <script lang="ts">
-	import type { Token } from 'marked';
+	import type { Tokens } from 'marked';
 	import { LinkPreview } from 'bits-ui';
 
 	import { getContext } from 'svelte';
@@ -27,7 +27,7 @@
 
 	const i18n = getContext<typeof import('$lib/i18n').default>('i18n');
 
-	export let token: Token;
+	export let token: Tokens.Generic;
 
 	let triggerChar = '';
 	let label = '';
diff --git a/src/lib/components/common/RichTextInput.svelte b/src/lib/components/common/RichTextInput.svelte
index 44a6de05ce..a5b9140253 100644
--- a/src/lib/components/common/RichTextInput.svelte
+++ b/src/lib/components/common/RichTextInput.svelte
@@ -1042,9 +1042,15 @@
 					const stripMentionLinks = (fragment: Fragment): Fragment => {
 						const nodes: Node[] = [];
 						fragment.forEach((node) => {
-							nodes.push(node.type.name === 'mention'
-								? node.mark(node.marks.filter((mark) => mark.type.name !== 'link'))
-								: node.isLeaf ? node : node.copy(stripMentionLinks(node.content)));
+							nodes.push(
+								node.type.name === 'mention'
+									? node.mark(
+											node.marks.filter((mark) => !['link', 'underline'].includes(mark.type.name))
+										)
+									: node.isLeaf
+										? node
+										: node.copy(stripMentionLinks(node.content))
+							);
 						});
 						return Fragment.fromArray(nodes);
 					};
@@ -1071,7 +1077,7 @@
 				handlePaste: (view, event, slice) => {
 					// Paste literal text when automatic formatting is disabled.
 					if (!richText || !autoFormat) {
-						// swallow HTML completely
+						// Discard formatting while retaining explicit mention identities.
 						event.preventDefault();
 						const { state, dispatch } = view;
 
@@ -1088,8 +1094,10 @@
 						const mentions = plainMentionPaste(slice, state.schema);
 						if (mentions) {
 							dispatch(
-								state.tr.replaceWith(state.selection.from, state.selection.to, mentions)
-									.setMeta('paste', true).scrollIntoView()
+								state.tr
+									.replaceWith(state.selection.from, state.selection.to, mentions)
+									.setMeta('paste', true)
+									.scrollIntoView()
 							);
 							return true;
 						}