diff --git a/src/components/MessagesList/MessagesGroup/Message/Message.vue b/src/components/MessagesList/MessagesGroup/Message/Message.vue
index 9cb6b1cf935..41497f55caf 100644
--- a/src/components/MessagesList/MessagesGroup/Message/Message.vue
+++ b/src/components/MessagesList/MessagesGroup/Message/Message.vue
@@ -174,6 +174,7 @@ the main body of the message as well as a quote.
 			:is-action-menu-open.sync="isActionMenuOpen"
 			:is-emoji-picker-open.sync="isEmojiPickerOpen"
 			:is-reactions-menu-open.sync="isReactionsMenuOpen"
+			:is-forwarder-open.sync="isForwarderOpen"
 			:message-api-data="messageApiData"
 			:message-object="messageObject"
 			:is-last-read="isLastReadMessage"
@@ -400,6 +401,7 @@ export default {
 			isActionMenuOpen: false,
 			isEmojiPickerOpen: false,
 			isReactionsMenuOpen: false,
+			isForwarderOpen: false,
 			detailedReactionsLoading: false,
 		}
 	},
@@ -566,7 +568,7 @@ export default {
 		},
 
 		showMessageButtonsBar() {
-			return !this.isSystemMessage && !this.isTemporary && (this.isHovered || this.isActionMenuOpen || this.isEmojiPickerOpen || this.isReactionsMenuOpen)
+			return !this.isSystemMessage && !this.isTemporary && (this.isHovered || this.isActionMenuOpen || this.isEmojiPickerOpen || this.isReactionsMenuOpen || this.isForwarderOpen)
 		},
 
 		isTemporaryUpload() {
diff --git a/src/components/MessagesList/MessagesGroup/Message/MessageButtonsBar/Forwarder.vue b/src/components/MessagesList/MessagesGroup/Message/MessageButtonsBar/Forwarder.vue
index ca5dc99b63b..2366e21bf52 100644
--- a/src/components/MessagesList/MessagesGroup/Message/MessageButtonsBar/Forwarder.vue
+++ b/src/components/MessagesList/MessagesGroup/Message/MessageButtonsBar/Forwarder.vue
@@ -118,7 +118,7 @@ export default {
 		},
 
 		selectedConversationName() {
-			return this.$store.getters?.conversation(this.selectedConversationToken).name
+			return this.$store.getters?.conversation(this.selectedConversationToken).displayName
 		},
 
 		/**
diff --git a/src/components/MessagesList/MessagesGroup/Message/MessageButtonsBar/MessageButtonsBar.vue b/src/components/MessagesList/MessagesGroup/Message/MessageButtonsBar/MessageButtonsBar.vue
index 81bdd8ea9f4..de1967658d8 100644
--- a/src/components/MessagesList/MessagesGroup/Message/MessageButtonsBar/MessageButtonsBar.vue
+++ b/src/components/MessagesList/MessagesGroup/Message/MessageButtonsBar/MessageButtonsBar.vue
@@ -72,9 +72,10 @@
 				</NcActionLink>
 				<NcActionButton v-if="!isCurrentGuest && !isFileShare && !isDeletedMessage"
 					:close-after-click="true"
-					@click.stop="showForwarder = true">
-					<Share slot="icon"
-						:size="16" />
+					@click.stop="openForwarder">
+					<template #icon>
+						<Share :size="16" />
+					</template>
 					{{ t('spreed', 'Forward message') }}
 				</NcActionButton>
 				<NcActionSeparator v-if="messageActions.length > 0" />
@@ -131,9 +132,9 @@
 				</NcButton>
 			</NcEmojiPicker>
 		</template>
-		<Forwarder v-if="showForwarder"
+		<Forwarder v-if="isForwarderOpen"
 			:message-object="messageObject"
-			@close="showForwarder = false" />
+			@close="closeForwarder" />
 	</div>
 </template>
 
@@ -294,6 +295,11 @@ export default {
 			required: true,
 		},
 
+		isForwarderOpen: {
+			type: Boolean,
+			required: true,
+		},
+
 		canReact: {
 			type: Boolean,
 			required: true,
@@ -310,13 +316,6 @@ export default {
 		},
 	},
 
-	data() {
-		return {
-			// Shows/hides the message forwarder component
-			showForwarder: false,
-		}
-	},
-
 	computed: {
 		conversation() {
 			return this.$store.getters.conversation(this.token)
@@ -474,6 +473,14 @@ export default {
 			this.$emit('update:isReactionsMenuOpen', true)
 		},
 
+		openForwarder() {
+			this.$emit('update:isForwarderOpen', true)
+		},
+
+		closeForwarder() {
+			this.$emit('update:isForwarderOpen', false)
+		},
+
 		// Making sure that the click is outside the MessageButtonsBar
 		handleClickOutside(event) {
 			if (event.composedPath().indexOf(this.$el) !== -1) {