diff --git a/src/components/MessagesList/MessagesGroup/Message/MessagePart/AudioPlayer.vue b/src/components/MessagesList/MessagesGroup/Message/MessagePart/AudioPlayer.vue
index 6518cb0756b..753b285303a 100644
--- a/src/components/MessagesList/MessagesGroup/Message/MessagePart/AudioPlayer.vue
+++ b/src/components/MessagesList/MessagesGroup/Message/MessagePart/AudioPlayer.vue
@@ -13,8 +13,8 @@
 			@ended="handleEnded">
 			{{ t('spreed', 'Your browser does not support playing audio files') }}
 		</audio>
-		<span v-if="showFileName" class="audio-player__name" :title="name">
-			{{ name }}
+		<span v-if="showFileName" class="audio-player__name" :title="sanitizedFileName">
+			<span class="audio-player__basename">{{ fileNameWithoutExtension }}</span><span v-if="fileExtension">{{ fileExtension }}</span>
 		</span>
 	</div>
 </template>
@@ -26,6 +26,7 @@ import { generateRemoteUrl } from '@nextcloud/router'
 import { inject } from 'vue'
 import { EventBus } from '../../../../../services/EventBus.ts'
 import { useActorStore } from '../../../../../stores/actor.ts'
+import { getFileExtension, sanitizeFileName } from '../../../../../utils/fileUpload.ts'
 
 export default {
 	name: 'AudioPlayer',
@@ -84,6 +85,18 @@ export default {
 	},
 
 	computed: {
+		sanitizedFileName() {
+			return sanitizeFileName(this.name)
+		},
+
+		fileNameWithoutExtension() {
+			return this.name.slice(0, this.name.length - getFileExtension(this.name).length)
+		},
+
+		fileExtension() {
+			return getFileExtension(this.name)
+		},
+
 		internalAbsolutePath() {
 			if (this.path.startsWith('/')) {
 				return this.path
@@ -155,6 +168,10 @@ export default {
 		font-weight: bold;
 	}
 
+	&__basename {
+		unicode-bidi: isolate;
+	}
+
 	&__audio {
 		display: block;
 	}
diff --git a/src/components/MessagesList/MessagesGroup/Message/MessagePart/FilePreview.spec.js b/src/components/MessagesList/MessagesGroup/Message/MessagePart/FilePreview.spec.js
index 746e685dfbd..28b150bce99 100644
--- a/src/components/MessagesList/MessagesGroup/Message/MessagePart/FilePreview.spec.js
+++ b/src/components/MessagesList/MessagesGroup/Message/MessagePart/FilePreview.spec.js
@@ -136,16 +136,17 @@ describe('FilePreview.vue', () => {
 			expect(imageUrl.searchParams.get('y')).toBe('576')
 		})
 
-		test('renders small previews when requested', async () => {
-			props.smallPreview = true
+		test('renders a mime icon instead of a scaled preview in row layout', async () => {
+			props.rowLayout = true
+			OC.MimeType.getIconUrl.mockReturnValueOnce(imagePath('core', 'image/jpeg'))
 
 			const wrapper = mountFilePreview()
 
 			await wrapper.find('img').trigger('load')
 
 			expect(wrapper.element.tagName).toBe('A')
-			const imageUrl = parseRelativeUrl(wrapper.find('img').attributes('src'))
-			expect(imageUrl.searchParams.get('y')).toBe('24')
+			const imageUrl = wrapper.find('img').attributes('src')
+			expect(imageUrl).toBe(imagePath('core', 'image/jpeg'))
 		})
 
 		describe('uploading', () => {
@@ -412,8 +413,8 @@ describe('FilePreview.vue', () => {
 					await testPlayButtonVisible(true)
 				})
 
-				test('does not render play icon for small previews', async () => {
-					props.smallPreview = true
+				test('does not render play icon in row layout', async () => {
+					props.rowLayout = true
 					await testPlayButtonVisible(false)
 				})
 
diff --git a/src/components/MessagesList/MessagesGroup/Message/MessagePart/FilePreview.vue b/src/components/MessagesList/MessagesGroup/Message/MessagePart/FilePreview.vue
index 448c91b2c06..edeaa5c52a8 100644
--- a/src/components/MessagesList/MessagesGroup/Message/MessagePart/FilePreview.vue
+++ b/src/components/MessagesList/MessagesGroup/Message/MessagePart/FilePreview.vue
@@ -19,7 +19,7 @@
 		@click.exact="handleClick"
 		@keydown.enter="handleClick">
 		<span
-			:title="file.name"
+			:title="sanitizedFileName"
 			class="image-container"
 			:class="{ playable: isPlayable }"
 			:style="imageContainerStyle">
@@ -36,10 +36,10 @@
 					v-else
 					class="file-preview__image"
 					:class="previewImageClass"
-					:alt="file.name"
+					:alt="sanitizedFileName"
 					:src="defaultIconUrl">
 				<!-- Indicator that preview is intentionally hidden, not failed -->
-				<span v-if="!smallPreview" class="classified-preview-button">
+				<span v-if="!rowLayout" class="classified-preview-button">
 					<IconEyeOutline :size="20" fillColor="#ffffff" />
 				</span>
 			</template>
@@ -47,12 +47,12 @@
 				<img
 					class="file-preview__image"
 					:class="previewImageClass"
-					:alt="file.name"
+					:alt="sanitizedFileName"
 					:src="failed ? defaultIconUrl : previewUrl"
 					@load="onLoad"
 					@error="onError">
 				<template v-if="!isLoading || fallbackLocalUrl">
-					<span v-if="isPlayable && !smallPreview" class="play-video-button">
+					<span v-if="isPlayable && !rowLayout" class="play-video-button">
 						<IconPlayCircleOutline
 							:size="48"
 							fillColor="#ffffff" />
@@ -95,7 +95,8 @@
 			</template>
 		</NcButton>
 		<div v-if="shouldShowFileDetail" class="name-container">
-			{{ fileDetail }}
+			<span class="name-container__basename">{{ fileNameWithoutExtension }}</span>
+			<span v-if="fileExtension" class="name-container__extension">{{ fileExtension }}</span>
 		</div>
 	</component>
 </template>
@@ -122,6 +123,7 @@ import { useActorStore } from '../../../../../stores/actor.ts'
 import { useSharedItemsStore } from '../../../../../stores/sharedItems.ts'
 import { useUploadStore } from '../../../../../stores/upload.ts'
 import { isClassifiedConversation } from '../../../../../utils/conversation.ts'
+import { getFileExtension, sanitizeFileName } from '../../../../../utils/fileUpload.ts'
 import { canPlayAudio } from '../../../../../utils/sounds.js'
 
 const PREVIEW_TYPE = {
@@ -172,14 +174,6 @@ export default {
 			default: '',
 		},
 
-		/**
-		 * Whether to render a small preview to embed in replies
-		 */
-		smallPreview: {
-			type: Boolean,
-			default: false,
-		},
-
 		/**
 		 * Whether the container is the upload editor.
 		 * True if this component is used in the upload editor.
@@ -247,8 +241,18 @@ export default {
 			)
 		},
 
-		fileDetail() {
-			return this.file.name
+		// file.name with bidi control chars replaced by '_', for title/alt/aria-label text
+		sanitizedFileName() {
+			return sanitizeFileName(this.file.name)
+		},
+
+		fileNameWithoutExtension() {
+			return this.file.name.slice(0, this.file.name.length - getFileExtension(this.file.name).length)
+		},
+
+		// Dot included, original case
+		fileExtension() {
+			return getFileExtension(this.file.name)
 		},
 
 		fileSizeLabel() {
@@ -306,7 +310,7 @@ export default {
 
 		previewImageClass() {
 			let classes = ''
-			if (this.smallPreview) {
+			if (this.rowLayout) {
 				classes += 'preview-small '
 			} else if (this.mediumPreview) {
 				classes += 'preview-medium '
@@ -335,16 +339,21 @@ export default {
 				return {}
 			}
 
+			// Row layout always shows a small fixed-size icon, never a medium/full preview
+			if (this.rowLayout) {
+				return { width: '24px', height: '24px' }
+			}
+
 			// Fallback for loading mimeicons (preview for audio files is not provided)
 			if (this.file['preview-available'] !== 'yes' || this.file.mimetype.startsWith('audio/') || this.failed) {
 				return {
-					width: this.smallPreview ? '24px' : '128px',
-					height: this.smallPreview ? '24px' : '128px',
+					width: '128px',
+					height: '128px',
 				}
 			}
 
-			const widthConstraint = this.smallPreview ? 24 : (this.mediumPreview ? 192 : 600)
-			const heightConstraint = this.smallPreview ? 24 : (this.mediumPreview ? 192 : 384)
+			const widthConstraint = this.mediumPreview ? 192 : 600
+			const heightConstraint = this.mediumPreview ? 192 : 384
 
 			// Actual size when no metadata available
 			if (!this.file.width || !this.file.height) {
@@ -426,11 +435,7 @@ export default {
 			}
 
 			// use preview provider URL to render a smaller preview
-			let previewSize = 384
-			if (this.smallPreview) {
-				previewSize = 24
-			}
-			previewSize = Math.ceil(previewSize * window.devicePixelRatio)
+			const previewSize = Math.ceil(384 * window.devicePixelRatio)
 			if (userId === null) {
 				// guest mode: grab token from the link URL
 				// FIXME: use a cleaner way...
@@ -535,7 +540,7 @@ export default {
 		},
 
 		removeAriaLabel() {
-			return t('spreed', 'Remove {fileName}', { fileName: this.file.name })
+			return t('spreed', 'Remove {fileName}', { fileName: this.sanitizedFileName })
 		},
 	},
 
@@ -792,7 +797,19 @@ export default {
 		width: 100%;
 		overflow: hidden;
 		white-space: nowrap;
-		text-overflow: ellipsis;
+		display: inline-flex;
+
+		&__basename {
+			unicode-bidi: isolate;
+			overflow: hidden;
+			white-space: nowrap;
+			text-overflow: ellipsis;
+		}
+
+		&__extension {
+			color: var(--color-text-maxcontrast);
+			overflow: visible;
+		}
 	}
 
 	&:not(.file-preview--viewer-available) {
diff --git a/src/components/RightSidebar/SharedItems/SharedItems.vue b/src/components/RightSidebar/SharedItems/SharedItems.vue
index bca71493e93..0c0ba564c52 100644
--- a/src/components/RightSidebar/SharedItems/SharedItems.vue
+++ b/src/components/RightSidebar/SharedItems/SharedItems.vue
@@ -46,7 +46,6 @@
 			<FilePreview
 				v-else
 				:token="token"
-				:smallPreview="!isMedia"
 				:rowLayout="!isMedia"
 				:itemType="type"
 				isSharedItems
diff --git a/src/test-setup.js b/src/test-setup.js
index 3be3c32f916..9a82d3035a7 100644
--- a/src/test-setup.js
+++ b/src/test-setup.js
@@ -28,6 +28,7 @@ vi.mock('@nextcloud/dialogs', () => ({
 
 vi.mock('@nextcloud/files', () => ({
 	validateFileName: vi.fn(),
+	formatFileSize: vi.fn((size) => `${size} B`),
 }))
 
 vi.mock('@nextcloud/files/dav', () => ({
diff --git a/src/utils/fileUpload.ts b/src/utils/fileUpload.ts
index daca1d99bfc..8e03b1921ce 100644
--- a/src/utils/fileUpload.ts
+++ b/src/utils/fileUpload.ts
@@ -8,6 +8,7 @@ import type { UploadEntry } from '../types/index.ts'
 
 const extensionRegex = /\.[0-9a-z]+$/i
 const suffixRegex = / \(\d+\)$/
+const bidiControlRegex = /[\u202A-\u202E\u2066-\u2069]/g
 
 /**
  * Returns the file extension for the given path
@@ -19,6 +20,16 @@ export function getFileExtension(path: string): string {
 	return path.match(extensionRegex)?.[0] ?? ''
 }
 
+/**
+ * Returns name with bidi control characters replaced by '_'
+ *
+ * @param name file name
+ * @return sanitized file name
+ */
+export function sanitizeFileName(name: string): string {
+	return name.replace(bidiControlRegex, '_')
+}
+
 /**
  * Returns the file suffix for the given path
  *
diff --git a/src/utils/textParse.ts b/src/utils/textParse.ts
index 328251decfe..8bf6b75b902 100644
--- a/src/utils/textParse.ts
+++ b/src/utils/textParse.ts
@@ -8,6 +8,8 @@ import type { ChatMessage, Mention } from '../types/index.ts'
 import { getBaseUrl } from '@nextcloud/router'
 import { decodeHTML } from 'entities'
 import { MENTION } from '../constants.ts'
+import { sanitizeFileName } from './fileUpload.ts'
+import { getFileKeys } from './message.ts'
 
 /**
  * Parse message text to return proper formatting for mentions
@@ -61,8 +63,10 @@ function parseToSimpleMessage(text: string, parameters: ChatMessage['messagePara
 		return text.trim()
 	}
 
+	const fileKeys = getFileKeys({ messageParameters: parameters })
 	Object.entries(parameters).forEach(([key, value]) => {
-		text = text.replaceAll('{' + key + '}', value.name)
+		const name = fileKeys.includes(key) ? sanitizeFileName(value.name) : value.name
+		text = text.replaceAll('{' + key + '}', name)
 	})
 	return text.trim()
 }