diff --git a/src/components/NewMessage/NewMessage.vue b/src/components/NewMessage/NewMessage.vue
index 4d539213c82..caa1f9d2607 100644
--- a/src/components/NewMessage/NewMessage.vue
+++ b/src/components/NewMessage/NewMessage.vue
@@ -506,6 +506,14 @@ export default {
 				}
 			}
 
+			// FIXME upstream: https://github.com/nextcloud-libraries/nextcloud-vue/issues/4492
+			if (this.hasText) {
+				const temp = document.createElement('textarea')
+				temp.innerHTML = this.text.replace(/&/gmi, '&')
+				this.text = temp.value.replace(/&amp;/gmi, '&').replace(/&lt;/gmi, '<')
+					.replace(/&gt;/gmi, '>').replace(/&sect;/gmi, '§')
+			}
+
 			if (this.upload) {
 				// Clear input content from store
 				this.$store.dispatch('setCurrentMessageInput', { token: this.token, text: '' })
@@ -521,12 +529,6 @@ export default {
 			}
 
 			if (this.hasText) {
-				// FIXME upstream: https://github.com/nextcloud-libraries/nextcloud-vue/issues/4492
-				const temp = document.createElement('textarea')
-				temp.innerHTML = this.text.replace(/&/gmi, '&amp;')
-				this.text = temp.value.replace(/&amp;/gmi, '&').replace(/&lt;/gmi, '<')
-					.replace(/&gt;/gmi, '>').replace(/&sect;/gmi, '§')
-
 				const temporaryMessage = await this.$store.dispatch('createTemporaryMessage', {
 					text: this.text.trim(),
 					token: this.token,
diff --git a/src/components/Quote.vue b/src/components/Quote.vue
index 2e503962dd6..8e3eb56e1e3 100644
--- a/src/components/Quote.vue
+++ b/src/components/Quote.vue
@@ -41,13 +41,13 @@ components.
 					disable-menu />
 				{{ getDisplayName }}
 			</div>
-			<div v-if="isFileShareMessage"
-				class="quote__main__text">
-				<NcRichText :text="message"
-					:arguments="richParameters"
-					:autolink="true" />
-			</div>
-			<blockquote v-else
+			<!-- file preview-->
+			<NcRichText v-if="isFileShareMessage"
+				text="{file}"
+				class="quote__file-preview"
+				:arguments="richParameters" />
+			<!-- text -->
+			<blockquote v-if="!isFileShareWithoutCaption"
 				class="quote__main__text">
 				<p dir="auto">{{ shortenedQuoteMessage }}</p>
 			</blockquote>
@@ -175,6 +175,10 @@ export default {
 			return Object.keys(Object(this.messageParameters)).some(key => key.startsWith('file'))
 		},
 
+		isFileShareWithoutCaption() {
+			return this.isFileShareMessage && this.message === '{file}'
+		},
+
 		richParameters() {
 			const richParameters = {}
 			Object.keys(this.messageParameters).forEach(function(p) {
@@ -324,6 +328,9 @@ export default {
 		position: relative;
 		margin: auto;
 	}
+	&__file-preview {
+		line-height: 0.5 !important;
+	}
 }
 
 </style>