diff --git a/src/components/AvatarWrapper/AvatarWrapper.spec.js b/src/components/AvatarWrapper/AvatarWrapper.spec.js
index de838d96b50..be1f71c08e2 100644
--- a/src/components/AvatarWrapper/AvatarWrapper.spec.js
+++ b/src/components/AvatarWrapper/AvatarWrapper.spec.js
@@ -98,6 +98,7 @@ describe('AvatarWrapper.vue', () => {
 			[null, 'guest/id', '', ATTENDEE.ACTOR_TYPE.GUESTS, 'icon-user'],
 			[null, 'guest/id', t('spreed', 'Guest'), ATTENDEE.ACTOR_TYPE.GUESTS, 'icon-user'],
 			[null, 'guest/id', t('spreed', 'Guest'), ATTENDEE.ACTOR_TYPE.EMAILS, 'icon-user'],
+			[null, 'deleted_users', '', ATTENDEE.ACTOR_TYPE.DELETED_USERS, 'icon-user'],
 			['new', 'guest/id', 'test@mail.com', ATTENDEE.ACTOR_TYPE.EMAILS, 'icon-mail'],
 			[null, 'sha-phone', '+12345...', ATTENDEE.ACTOR_TYPE.PHONES, 'icon-phone'],
 			[null, 'team/id', 'Team', ATTENDEE.ACTOR_TYPE.CIRCLES, 'icon-team'],
@@ -119,7 +120,6 @@ describe('AvatarWrapper.vue', () => {
 		const testCases = [
 			['guest/id', USER_NAME, ATTENDEE.ACTOR_TYPE.GUESTS, USER_NAME.charAt(0)],
 			['guest/id', USER_NAME, ATTENDEE.ACTOR_TYPE.EMAILS, USER_NAME.charAt(0)],
-			['deleted_users', USER_NAME, ATTENDEE.ACTOR_TYPE.DELETED_USERS, 'X'],
 			['bot-id', USER_NAME, ATTENDEE.ACTOR_TYPE.BOTS, '>_'],
 		]
 
diff --git a/src/components/AvatarWrapper/AvatarWrapper.vue b/src/components/AvatarWrapper/AvatarWrapper.vue
index 034468273d8..74675c928cd 100644
--- a/src/components/AvatarWrapper/AvatarWrapper.vue
+++ b/src/components/AvatarWrapper/AvatarWrapper.vue
@@ -6,7 +6,7 @@
 <template>
 	<div class="avatar-wrapper" :class="avatarClass" :style="avatarStyle">
 		<div v-if="iconClass" class="avatar icon" :class="[iconClass]" />
-		<div v-else-if="isGuestOrDeletedUser" class="avatar guest">
+		<div v-else-if="isGuestUser" class="avatar guest">
 			{{ firstLetterOfGuestName }}
 		</div>
 		<div v-else-if="isBot" class="avatar bot">
@@ -150,7 +150,6 @@ export default {
 			switch (this.source) {
 			case ATTENDEE.ACTOR_TYPE.USERS:
 			case ATTENDEE.ACTOR_TYPE.BRIDGED:
-			case ATTENDEE.ACTOR_TYPE.DELETED_USERS:
 				return ''
 			case ATTENDEE.ACTOR_TYPE.FEDERATED_USERS:
 				return this.token ? '' : 'icon-user'
@@ -158,6 +157,8 @@ export default {
 				return this.token === 'new' ? 'icon-mail' : (this.hasCustomName ? '' : 'icon-user')
 			case ATTENDEE.ACTOR_TYPE.GUESTS:
 				return this.hasCustomName ? '' : 'icon-user'
+			case ATTENDEE.ACTOR_TYPE.DELETED_USERS:
+				return 'icon-user'
 			case ATTENDEE.ACTOR_TYPE.PHONES:
 				return 'icon-phone'
 			case ATTENDEE.ACTOR_TYPE.BOTS:
@@ -189,19 +190,14 @@ export default {
 		isBot() {
 			return this.source === ATTENDEE.ACTOR_TYPE.BOTS && this.id !== ATTENDEE.CHANGELOG_BOT_ID
 		},
-		isGuestOrDeletedUser() {
-			return [ATTENDEE.ACTOR_TYPE.GUESTS, ATTENDEE.ACTOR_TYPE.EMAILS, ATTENDEE.ACTOR_TYPE.DELETED_USERS]
-				.includes(this.source)
+		isGuestUser() {
+			return [ATTENDEE.ACTOR_TYPE.GUESTS, ATTENDEE.ACTOR_TYPE.EMAILS].includes(this.source)
 		},
 		hasCustomName() {
 			return this.name?.trim() && this.name !== t('spreed', 'Guest')
 		},
 		firstLetterOfGuestName() {
-			if (this.source === ATTENDEE.ACTOR_TYPE.DELETED_USERS) {
-				return 'X'
-			} else {
-				return this.name.toUpperCase().charAt(0)
-			}
+			return this.name?.trim()?.toUpperCase()?.charAt(0) ?? '?'
 		},
 		avatarUrl() {
 			return getUserProxyAvatarOcsUrl(this.token, this.id, this.isDarkTheme, this.size > AVATAR.SIZE.MEDIUM ? 512 : 64)
diff --git a/src/components/CallView/shared/VideoVue.vue b/src/components/CallView/shared/VideoVue.vue
index 51e9a7b757e..be90f3114d2 100644
--- a/src/components/CallView/shared/VideoVue.vue
+++ b/src/components/CallView/shared/VideoVue.vue
@@ -49,10 +49,10 @@
 			<div v-if="showBackgroundAndAvatar"
 				:key="'backgroundAvatar'"
 				class="avatar-container">
-				<VideoBackground :display-name="participantName" :user="participantUserId" />
+				<VideoBackground :display-name="displayName" :user="participantUserId" />
 				<AvatarWrapper :id="participantUserId"
 					:token="token"
-					:name="participantName"
+					:name="displayName"
 					:source="participantActorType"
 					:size="avatarSize"
 					:loading="isLoading"
@@ -104,6 +104,7 @@ import { EventBus } from '../../../services/EventBus.ts'
 import { useCallViewStore } from '../../../stores/callView.js'
 import { useGuestNameStore } from '../../../stores/guestName.js'
 import attachMediaStream from '../../../utils/attachmediastream.js'
+import { getDisplayNameWithFallback } from '../../../utils/getDisplayName.ts'
 import { ConnectionState } from '../../../utils/webrtc/models/CallParticipantModel.js'
 import { placeholderImage } from '../Grid/gridPlaceholders.ts'
 
@@ -411,7 +412,7 @@ export default {
 			return null
 		},
 
-		participantName() {
+		displayName() {
 			if (this.model.attributes.name) {
 				return this.model.attributes.name
 			}
@@ -434,12 +435,13 @@ export default {
 
 			if (!participantName) {
 				participantName = this.peerData.displayName
-				if (!participantName && this.peerData.actorType === ATTENDEE.ACTOR_TYPE.GUESTS) {
-					participantName = t('spreed', 'Guest')
-				}
 			}
 
-			return participantName
+			return participantName?.trim() ?? ''
+		},
+
+		participantName() {
+			return getDisplayNameWithFallback(this.displayName, this.participantActorType)
 		},
 
 		isSpeaking() {
diff --git a/src/components/MessagesList/MessagesGroup/Message/MessagePart/Reactions.vue b/src/components/MessagesList/MessagesGroup/Message/MessagePart/Reactions.vue
index 64e4c8f798b..f07f2c6d016 100644
--- a/src/components/MessagesList/MessagesGroup/Message/MessagePart/Reactions.vue
+++ b/src/components/MessagesList/MessagesGroup/Message/MessagePart/Reactions.vue
@@ -91,6 +91,7 @@ import ReactionsList from './ReactionsList.vue'
 import { ATTENDEE } from '../../../../../constants.js'
 import { useGuestNameStore } from '../../../../../stores/guestName.js'
 import { useReactionsStore } from '../../../../../stores/reactions.js'
+import { getDisplayNameWithFallback } from '../../../../../utils/getDisplayName.ts'
 
 export default {
 	name: 'Reactions',
@@ -230,12 +231,7 @@ export default {
 				return this.guestNameStore.getGuestNameWithGuestSuffix(this.token, reactingParticipant.actorId)
 			}
 
-			const displayName = reactingParticipant.actorDisplayName.trim()
-			if (displayName === '') {
-				return t('spreed', 'Deleted user')
-			}
-
-			return displayName
+			return getDisplayNameWithFallback(reactingParticipant.actorDisplayName, reactingParticipant.actorType)
 		},
 
 		reactionsCount(reaction) {
diff --git a/src/components/MessagesList/MessagesGroup/Message/MessagePart/ReactionsList.vue b/src/components/MessagesList/MessagesGroup/Message/MessagePart/ReactionsList.vue
index 6ecfc0ce387..cddde86f074 100644
--- a/src/components/MessagesList/MessagesGroup/Message/MessagePart/ReactionsList.vue
+++ b/src/components/MessagesList/MessagesGroup/Message/MessagePart/ReactionsList.vue
@@ -32,7 +32,7 @@
 							:source="item.actorType"
 							:size="AVATAR.SIZE.SMALL"
 							disable-menu />
-						<span class="reactions-item__name">{{ item.actorDisplayName }}</span>
+						<span class="reactions-item__name">{{ item.actorDisplayNameWithFallback }}</span>
 						<span class="reactions-item__emojis">
 							{{ item.reaction?.join('') ?? reactionFilter }}
 						</span>
@@ -57,6 +57,7 @@ import AvatarWrapper from '../../../../AvatarWrapper/AvatarWrapper.vue'
 
 import { ATTENDEE, AVATAR } from '../../../../../constants.js'
 import { useGuestNameStore } from '../../../../../stores/guestName.js'
+import { getDisplayNameWithFallback } from '../../../../../utils/getDisplayName.ts'
 
 export default {
 
@@ -112,10 +113,12 @@ export default {
 				actors.forEach(actor => {
 					const key = `${actor.actorId}-${actor.actorType}`
 					const actorDisplayName = this.getDisplayNameForReaction(actor)
+					const actorDisplayNameWithFallback = getDisplayNameWithFallback(actorDisplayName, actor.actorType)
 
 					modifiedDetailedReactions[reaction].push({
 						...actor,
-						actorDisplayName
+						actorDisplayName,
+						actorDisplayNameWithFallback,
 					})
 
 					if (mergedReactionsMap[key]) {
@@ -123,6 +126,7 @@ export default {
 					} else {
 						mergedReactionsMap[key] = {
 							actorDisplayName,
+							actorDisplayNameWithFallback,
 							actorId: actor.actorId,
 							actorType: actor.actorType,
 							reaction: [reaction]
@@ -150,12 +154,7 @@ export default {
 				return this.guestNameStore.getGuestNameWithGuestSuffix(this.token, reactingParticipant.actorId)
 			}
 
-			const displayName = reactingParticipant.actorDisplayName.trim()
-			if (displayName === '') {
-				return t('spreed', 'Deleted user')
-			}
-
-			return displayName
+			return reactingParticipant.actorDisplayName.trim()
 		},
 
 		handleTabClick(reaction) {
diff --git a/src/components/MessagesList/MessagesGroup/MessagesGroup.spec.js b/src/components/MessagesList/MessagesGroup/MessagesGroup.spec.js
index 0401b123008..b80ef29ffda 100644
--- a/src/components/MessagesList/MessagesGroup/MessagesGroup.spec.js
+++ b/src/components/MessagesList/MessagesGroup/MessagesGroup.spec.js
@@ -5,106 +5,115 @@
 import { createLocalVue, shallowMount } from '@vue/test-utils'
 import { cloneDeep } from 'lodash'
 import { createPinia, setActivePinia } from 'pinia'
-import { computed } from 'vue'
 import Vuex from 'vuex'
 
 import MessagesGroup from './MessagesGroup.vue'
 
-import * as useMessageInfoModule from '../../../composables/useMessageInfo.js'
 import { ATTENDEE } from '../../../constants.js'
 import storeConfig from '../../../store/storeConfig.js'
+import { useGuestNameStore } from '../../../stores/guestName.js'
 
 describe('MessagesGroup.vue', () => {
 	const TOKEN = 'XXTOKENXX'
 	let store
+	let guestNameStore
 	let localVue
 	let testStoreConfig
-	let useMessageInfoSpy
 
 	beforeEach(() => {
 		localVue = createLocalVue()
 		localVue.use(Vuex)
 		setActivePinia(createPinia())
+		guestNameStore = useGuestNameStore()
 
 		testStoreConfig = cloneDeep(storeConfig)
-		// eslint-disable-next-line import/no-named-as-default-member
+		testStoreConfig.modules.conversationsStore.getters.conversation = () => () => ({})
+		testStoreConfig.modules.actorStore.getters.getActorId = () => () => 'actor-1'
+		testStoreConfig.modules.actorStore.getters.getActorType = () => () => ATTENDEE.ACTOR_TYPE.USERS
 		store = new Vuex.Store(testStoreConfig)
-		useMessageInfoSpy = jest.spyOn(useMessageInfoModule, 'useMessageInfo')
 	})
 
 	afterEach(() => {
 		jest.clearAllMocks()
-		useMessageInfoSpy.mockRestore()
 	})
 
-	test('renders grouped messages', () => {
-		useMessageInfoSpy.mockReturnValue({
-			actorDisplayName: computed(() => 'actor one'),
-			remoteServer: computed(() => ''),
-			lastEditor: computed(() => ''),
-		})
+	/**
+	 * Test avatar, actor name and grouped messages
+	 * @param {object} payload test case
+	 * @param {boolean} withTemp Whether to include temporary message in group
+	 */
+	function testMessagesGroup(payload, withTemp = false) {
+		// Arrange
+		const messages = [{
+			id: 100,
+			token: TOKEN,
+			actorId: payload.actorId,
+			actorDisplayName: payload.actorDisplayName,
+			actorType: payload.actorType,
+			message: 'first',
+			messageType: 'comment',
+			messageParameters: {},
+			systemMessage: '',
+			timestamp: 100,
+			isReplyable: true,
+		}, {
+			id: 110,
+			token: TOKEN,
+			actorId: payload.actorId,
+			actorDisplayName: payload.actorDisplayName,
+			actorType: payload.actorType,
+			message: 'second',
+			messageType: 'comment',
+			messageParameters: {},
+			systemMessage: '',
+			timestamp: 200,
+			isReplyable: true,
+		}]
+		if (withTemp) {
+			messages.push({
+				id: 120,
+				token: TOKEN,
+				actorId: payload.actorId,
+				actorDisplayName: payload.actorDisplayName,
+				actorType: payload.actorType,
+				message: 'third',
+				messageType: 'comment',
+				messageParameters: {},
+				systemMessage: '',
+				timestamp: 0, // temporary
+				isReplyable: true,
+			})
+		}
+		const actorInfo = payload.actorDisplayNameWithFallback
+			+ (payload.remoteServer ? ` (${payload.remoteServer})` : '')
+			+ (payload.lastEditor ? ` (${payload.lastEditor})` : '')
+
+		// Act
 		const wrapper = shallowMount(MessagesGroup, {
 			localVue,
 			store,
 			propsData: {
-				id: 123,
 				token: TOKEN,
 				previousMessageId: 90,
 				nextMessageId: 200,
-				messages: [{
-					id: 100,
-					token: TOKEN,
-					actorId: 'actor-1',
-					actorDisplayName: 'actor one',
-					actorType: ATTENDEE.ACTOR_TYPE.USERS,
-					message: 'first',
-					messageType: 'comment',
-					messageParameters: {},
-					systemMessage: '',
-					timestamp: 100,
-					isReplyable: true,
-				}, {
-					id: 110,
-					token: TOKEN,
-					actorId: 'actor-1',
-					actorDisplayName: 'actor one',
-					actorType: ATTENDEE.ACTOR_TYPE.USERS,
-					message: 'second',
-					messageType: 'comment',
-					messageParameters: {},
-					systemMessage: '',
-					timestamp: 200,
-					isReplyable: true,
-				}, {
-					id: 120,
-					token: TOKEN,
-					actorId: 'actor-1',
-					actorDisplayName: 'actor one',
-					actorType: ATTENDEE.ACTOR_TYPE.USERS,
-					message: 'third',
-					messageType: 'comment',
-					messageParameters: {},
-					systemMessage: '',
-					timestamp: 0, // temporary
-					isReplyable: true,
-				}],
+				messages,
 			},
 		})
 
+		// Assert
 		const avatarEl = wrapper.findComponent({ name: 'AvatarWrapper' })
-		expect(avatarEl.attributes('source')).toBe(ATTENDEE.ACTOR_TYPE.USERS)
-		expect(avatarEl.attributes('id')).toBe('actor-1')
-		expect(avatarEl.attributes('name')).toBe('actor one')
+		expect(avatarEl.attributes('source')).toBe(payload.actorType)
+		expect(avatarEl.attributes('id')).toBe(payload.actorId)
+		expect(avatarEl.attributes('name')).toBe(payload.actorDisplayName)
 
 		const authorEl = wrapper.find('.messages__author')
-		expect(authorEl.text()).toBe('actor one')
+		expect(authorEl.text()).toBe(actorInfo)
 
 		const messagesEl = wrapper.findAllComponents({ name: 'Message' })
 		expect(messagesEl.at(0).props()).toMatchObject({
 			message: {
 				id: 100,
 				message: 'first',
-				actorId: 'actor-1',
 			},
 			previousMessageId: 90,
 			nextMessageId: 110,
@@ -113,153 +122,75 @@ describe('MessagesGroup.vue', () => {
 			message: {
 				id: 110,
 				message: 'second',
-				actorId: 'actor-1',
 			},
 			previousMessageId: 100,
-			nextMessageId: 120,
+			nextMessageId: withTemp ? 120 : 200,
 		})
-		expect(messagesEl.at(2).props()).toMatchObject({
-			message: {
-				id: 120,
-				message: 'third',
-				actorId: 'actor-1',
-			},
-			previousMessageId: 110,
-			nextMessageId: 200,
+		if (withTemp) {
+			expect(messagesEl.at(2).props()).toMatchObject({
+				message: {
+					id: 120,
+					message: 'third',
+				},
+				previousMessageId: 110,
+				nextMessageId: 200,
+			})
+		}
+	}
+
+	test('renders grouped messages for user', () => {
+		testMessagesGroup({
+			actorId: 'actor-1',
+			actorType: ATTENDEE.ACTOR_TYPE.USERS,
+			actorDisplayName: 'Actor One',
+			actorDisplayNameWithFallback: 'Actor One',
 		})
 	})
 
-	test('renders guest display name', () => {
-		// Arrange
-		useMessageInfoSpy.mockReturnValue({
-			actorDisplayName: computed(() => 'guest-one-display-name'),
-			remoteServer: computed(() => ''),
-			lastEditor: computed(() => ''),
-		})
+	test('renders grouped messages for user (with temporary)', () => {
+		testMessagesGroup({
+			actorId: 'actor-1',
+			actorType: ATTENDEE.ACTOR_TYPE.USERS,
+			actorDisplayName: 'Actor One',
+			actorDisplayNameWithFallback: 'Actor One',
+		}, true)
+	})
 
-		const wrapper = shallowMount(MessagesGroup, {
-			localVue,
-			store,
-			propsData: {
-				id: 123,
-				token: TOKEN,
-				previousMessageId: 90,
-				nextMessageId: 200,
-				messages: [{
-					id: 100,
-					token: TOKEN,
-					actorId: 'actor-1',
-					actorDisplayName: 'actor one',
-					actorType: ATTENDEE.ACTOR_TYPE.GUESTS,
-					message: 'first',
-					messageType: 'comment',
-					messageParameters: {},
-					systemMessage: '',
-					timestamp: 100,
-					isReplyable: true,
-				}, {
-					id: 110,
-					token: TOKEN,
-					actorId: 'actor-1',
-					actorDisplayName: 'actor one',
-					actorType: ATTENDEE.ACTOR_TYPE.GUESTS,
-					message: 'second',
-					messageType: 'comment',
-					messageParameters: {},
-					systemMessage: '',
-					timestamp: 200,
-					isReplyable: true,
-				}],
-			},
+	test('renders grouped messages for guest with custom name', () => {
+		guestNameStore.addGuestName({ token: TOKEN, actorId: 'guest/id', actorDisplayName: 'Custom Guest' }, {})
+		testMessagesGroup({
+			actorId: 'guest/id',
+			actorType: ATTENDEE.ACTOR_TYPE.GUESTS,
+			actorDisplayName: 'Custom Guest',
+			actorDisplayNameWithFallback: 'Custom Guest',
 		})
+	})
 
-		const avatarEl = wrapper.findComponent({ name: 'AvatarWrapper' })
-		expect(avatarEl.attributes('source')).toBe(ATTENDEE.ACTOR_TYPE.GUESTS)
-		expect(avatarEl.attributes('id')).toBe('actor-1')
-		expect(avatarEl.attributes('name')).toBe('guest-one-display-name')
-
-		const authorEl = wrapper.find('.messages__author')
-		expect(authorEl.text()).toBe('guest-one-display-name')
-
-		const messagesEl = wrapper.findAllComponents({ name: 'Message' })
-		expect(messagesEl.at(0).props()).toMatchObject({
-			message: {
-				id: 100,
-				actorId: 'actor-1',
-			},
-		})
-		expect(messagesEl.at(1).props()).toMatchObject({
-			message: {
-				id: 110,
-				actorId: 'actor-1',
-			},
+	test('renders grouped messages for guest with default name', () => {
+		testMessagesGroup({
+			actorId: 'guest/id',
+			actorType: ATTENDEE.ACTOR_TYPE.EMAILS,
+			actorDisplayName: 'Guest',
+			actorDisplayNameWithFallback: 'Guest',
 		})
 	})
 
-	test('renders deleted guest display name', () => {
-		// Arrange
-		useMessageInfoSpy.mockReturnValue({
-			actorDisplayName: computed(() => 'Deleted user'),
-			remoteServer: computed(() => ''),
-			lastEditor: computed(() => ''),
-	   })
-
-		const wrapper = shallowMount(MessagesGroup, {
-			localVue,
-			store,
-			propsData: {
-				id: 123,
-				token: TOKEN,
-				previousMessageId: 90,
-				nextMessageId: 200,
-				messages: [{
-					id: 100,
-					token: TOKEN,
-					actorId: 'actor-1',
-					actorDisplayName: '',
-					actorType: ATTENDEE.ACTOR_TYPE.USERS,
-					message: 'first',
-					messageType: 'comment',
-					messageParameters: {},
-					systemMessage: '',
-					timestamp: 100,
-					isReplyable: true,
-				}, {
-					id: 110,
-					token: TOKEN,
-					actorId: 'actor-1',
-					actorDisplayName: '',
-					actorType: ATTENDEE.ACTOR_TYPE.USERS,
-					message: 'second',
-					messageType: 'comment',
-					messageParameters: {},
-					systemMessage: '',
-					timestamp: 200,
-					isReplyable: true,
-				}],
-			},
+	test('renders grouped messages for deleted user', () => {
+		testMessagesGroup({
+			actorId: 'deleted_users',
+			actorType: ATTENDEE.ACTOR_TYPE.DELETED_USERS,
+			actorDisplayName: '',
+			actorDisplayNameWithFallback: 'Deleted user',
 		})
+	})
 
-		const avatarEl = wrapper.findComponent({ name: 'AvatarWrapper' })
-		expect(avatarEl.attributes('source')).toBe(ATTENDEE.ACTOR_TYPE.USERS)
-		expect(avatarEl.attributes('id')).toBe('actor-1')
-		expect(avatarEl.attributes('name')).toBe('Deleted user')
-
-		const authorEl = wrapper.find('.messages__author')
-		expect(authorEl.text()).toBe('Deleted user')
-
-		const messagesEl = wrapper.findAllComponents({ name: 'Message' })
-		expect(messagesEl.at(0).props()).toMatchObject({
-			message: {
-				id: 100,
-				actorId: 'actor-1',
-			},
-		})
-		expect(messagesEl.at(1).props()).toMatchObject({
-			message: {
-				id: 110,
-				actorId: 'actor-1',
-			},
+	test('renders grouped messages for federated user', () => {
+		testMessagesGroup({
+			actorId: 'actor@nextcloud.local',
+			remoteServer: 'nextcloud.local',
+			actorType: ATTENDEE.ACTOR_TYPE.FEDERATED_USERS,
+			actorDisplayName: 'Federated Actor',
+			actorDisplayNameWithFallback: 'Federated Actor',
 		})
 	})
 })
diff --git a/src/components/MessagesList/MessagesGroup/MessagesGroup.vue b/src/components/MessagesList/MessagesGroup/MessagesGroup.vue
index 3cb34325e80..1add8fd65b1 100644
--- a/src/components/MessagesList/MessagesGroup/MessagesGroup.vue
+++ b/src/components/MessagesList/MessagesGroup/MessagesGroup.vue
@@ -83,10 +83,11 @@ export default {
 			remoteServer,
 			lastEditor,
 			actorDisplayName,
+			actorDisplayNameWithFallback,
 		} = useMessageInfo(firstMessage)
 
 		const actorInfo = computed(() => {
-			return [actorDisplayName.value, remoteServer.value, lastEditor.value]
+			return [actorDisplayNameWithFallback.value, remoteServer.value, lastEditor.value]
 				.filter(value => value).join(' ')
 		})
 
diff --git a/src/components/PollViewer/PollVotersDetails.vue b/src/components/PollViewer/PollVotersDetails.vue
index 6dc27ff54fe..924e8d16dee 100644
--- a/src/components/PollViewer/PollVotersDetails.vue
+++ b/src/components/PollViewer/PollVotersDetails.vue
@@ -29,7 +29,7 @@
 				class="poll-voters-details__list-item">
 				<AvatarWrapper :id="item.actorId"
 					:token="token"
-					:name="getDisplayName(item)"
+					:name="item.actorDisplayName.trim()"
 					:source="item.actorType"
 					:size="AVATAR.SIZE.EXTRA_SMALL"
 					disable-menu />
@@ -49,7 +49,8 @@ import NcPopover from '@nextcloud/vue/dist/Components/NcPopover.js'
 
 import AvatarWrapper from '../AvatarWrapper/AvatarWrapper.vue'
 
-import { ATTENDEE, AVATAR } from '../../constants.js'
+import { AVATAR } from '../../constants.js'
+import { getDisplayNameWithFallback } from '../../utils/getDisplayName.ts'
 
 export default {
 
@@ -80,15 +81,7 @@ export default {
 	methods: {
 		t,
 		getDisplayName(item) {
-			if (item.actorDisplayName === '' && item.actorType === ATTENDEE.ACTOR_TYPE.GUESTS) {
-				return t('spreed', 'Guest')
-			}
-
-			if (item.actorType === 'deleted_users') {
-				return t('spreed', 'Deleted user')
-			}
-
-			return item.actorDisplayName
+			return getDisplayNameWithFallback(item.actorDisplayName, item.actorType)
 		},
 	},
 }
diff --git a/src/components/Quote.vue b/src/components/Quote.vue
index f15a0906d2b..0ab4257f852 100644
--- a/src/components/Quote.vue
+++ b/src/components/Quote.vue
@@ -113,10 +113,11 @@ export default {
 			remoteServer,
 			lastEditor,
 			actorDisplayName,
+			actorDisplayNameWithFallback,
 		} = useMessageInfo(message)
 
 		const actorInfo = computed(() => {
-			return [actorDisplayName.value, remoteServer.value, lastEditor.value]
+			return [actorDisplayNameWithFallback.value, remoteServer.value, lastEditor.value]
 				.filter(value => value).join(' ')
 		})
 
diff --git a/src/components/RightSidebar/Participants/Participant.spec.js b/src/components/RightSidebar/Participants/Participant.spec.js
index 6802f2ef45c..7bec438e37b 100644
--- a/src/components/RightSidebar/Participants/Participant.spec.js
+++ b/src/components/RightSidebar/Participants/Participant.spec.js
@@ -145,7 +145,7 @@ describe('Participant.vue', () => {
 			const avatarEl = wrapper.findComponent(AvatarWrapper)
 			expect(avatarEl.exists()).toBe(true)
 
-			expect(avatarEl.props('name')).toBe('Guest')
+			expect(avatarEl.props('name')).toBe('')
 		})
 
 		test('renders avatar with unknown name when empty', () => {
@@ -154,7 +154,7 @@ describe('Participant.vue', () => {
 			const avatarEl = wrapper.findComponent(AvatarWrapper)
 			expect(avatarEl.exists()).toBe(true)
 
-			expect(avatarEl.props('name')).toBe('Deleted user')
+			expect(avatarEl.props('name')).toBe('')
 		})
 
 		test('renders offline avatar when no sessions exist', () => {
diff --git a/src/components/RightSidebar/Participants/Participant.vue b/src/components/RightSidebar/Participants/Participant.vue
index 3dd10c18489..61ad730433a 100644
--- a/src/components/RightSidebar/Participants/Participant.vue
+++ b/src/components/RightSidebar/Participants/Participant.vue
@@ -17,7 +17,7 @@
 		<template #icon>
 			<AvatarWrapper :id="participant.actorId"
 				:token="token"
-				:name="computedName"
+				:name="displayName"
 				:source="participant.actorType"
 				disable-tooltip
 				:show-user-status="showUserStatus"
@@ -358,6 +358,7 @@ import {
 } from '../../../services/callsService.js'
 import { hasTalkFeature } from '../../../services/CapabilitiesManager.ts'
 import { formattedTime } from '../../../utils/formattedTime.ts'
+import { getDisplayNameWithFallback } from '../../../utils/getDisplayName.ts'
 import { readableNumber } from '../../../utils/readableNumber.ts'
 import { getPreloadedUserStatus, getStatusMessage } from '../../../utils/userStatus.ts'
 
@@ -548,18 +549,12 @@ export default {
 				&& this.participant.inCall === PARTICIPANT.CALL_FLAG.DISCONNECTED
 		},
 
-		computedName() {
-			const displayName = this.participant.displayName.trim()
-
-			if (displayName === '' && (this.isGuestActor || this.isEmailActor)) {
-				return t('spreed', 'Guest')
-			}
-
-			if (displayName === '') {
-				return t('spreed', 'Deleted user')
-			}
+		displayName() {
+			return this.participant.displayName.trim()
+		},
 
-			return displayName
+		computedName() {
+			return getDisplayNameWithFallback(this.participant.displayName, this.participant.actorType)
 		},
 
 		attendeeId() {
@@ -695,14 +690,14 @@ export default {
 			switch (this.participant.actorType) {
 			case ATTENDEE.ACTOR_TYPE.GROUPS:
 				return t('spreed', 'Do you really want to remove group "{displayName}" and its members from this conversation?',
-					this.participant, undefined, { escape: false, sanitize: false })
+					{ displayName: this.computedName }, undefined, { escape: false, sanitize: false })
 			case ATTENDEE.ACTOR_TYPE.CIRCLES:
 				return t('spreed', 'Do you really want to remove team "{displayName}" and its members from this conversation?',
-					this.participant, undefined, { escape: false, sanitize: false })
+					{ displayName: this.computedName }, undefined, { escape: false, sanitize: false })
 			case ATTENDEE.ACTOR_TYPE.USERS:
 			default:
 				return t('spreed', 'Do you really want to remove {displayName} from this conversation?',
-					this.participant, undefined, { escape: false, sanitize: false })
+					{ displayName: this.computedName }, undefined, { escape: false, sanitize: false })
 			}
 		},
 
@@ -832,10 +827,10 @@ export default {
 					token: this.token,
 					attendeeId: this.attendeeId,
 				})
-				showSuccess(t('spreed', 'Notification was sent to {displayName}', { displayName: this.participant.displayName }))
+				showSuccess(t('spreed', 'Notification was sent to {displayName}', { displayName: this.computedName }))
 			} catch (error) {
 				console.error(error)
-				showError(t('spreed', 'Could not send notification to {displayName}', { displayName: this.participant.displayName }))
+				showError(t('spreed', 'Could not send notification to {displayName}', { displayName: this.computedName }))
 			}
 		},
 
diff --git a/src/composables/__tests__/useMessageInfo.spec.js b/src/composables/__tests__/useMessageInfo.spec.js
index f0cbb45d7a8..f54f1ea82be 100644
--- a/src/composables/__tests__/useMessageInfo.spec.js
+++ b/src/composables/__tests__/useMessageInfo.spec.js
@@ -352,13 +352,14 @@ describe('message actions', () => {
 		expect(result.actorDisplayName.value).toBe('guest name')
 	})
 
-	test('return "deleted user" for messages from deleted users without display name', () => {
+	test('return "Deleted user" as a fallback for messages from deleted users without display name', () => {
 		// Arrange
 		message.value.actorDisplayName = ''
 		// Act
 		const result = useMessageInfo(message)
 		// Assert
-		expect(result.actorDisplayName.value).toBe('Deleted user')
+		expect(result.actorDisplayName.value).toBe('')
+		expect(result.actorDisplayNameWithFallback.value).toBe('Deleted user')
 	})
 
 	describe('edited messages', () => {
diff --git a/src/composables/useMessageInfo.js b/src/composables/useMessageInfo.js
index 442e567c7ed..b5df227b506 100644
--- a/src/composables/useMessageInfo.js
+++ b/src/composables/useMessageInfo.js
@@ -13,6 +13,7 @@ import { useStore } from './useStore.js'
 import { ATTENDEE, CONVERSATION } from '../constants.js'
 import { hasTalkFeature } from '../services/CapabilitiesManager.ts'
 import { useGuestNameStore } from '../stores/guestName.js'
+import { getDisplayNameWithFallback } from '../utils/getDisplayName.ts'
 
 /**
  * Check whether the user can edit the message or not
@@ -37,6 +38,10 @@ export function useMessageInfo(message = ref({})) {
 			isConversationReadOnly: computed(() => false),
 			isFileShareWithoutCaption: computed(() => false),
 			isFileShare: computed(() => false),
+			remoteServer: computed(() => ''),
+			lastEditor: computed(() => ''),
+			actorDisplayName: computed(() => ''),
+			actorDisplayNameWithFallback: computed(() => ''),
 		}
 	}
 
@@ -101,14 +106,16 @@ export function useMessageInfo(message = ref({})) {
 	})
 
 	const actorDisplayName = computed(() => {
-		if (message.value.actorType === ATTENDEE.ACTOR_TYPE.GUESTS) {
+		if ([ATTENDEE.ACTOR_TYPE.GUESTS, ATTENDEE.ACTOR_TYPE.EMAILS].includes(message.value.actorType)) {
 			const guestNameStore = useGuestNameStore()
 			return guestNameStore.getGuestName(message.value.token, message.value.actorId)
 		} else {
-			const displayName = message.value.actorDisplayName.trim()
-			return displayName === '' ? t('spreed', 'Deleted user') : displayName
+			return message.value.actorDisplayName.trim()
 		}
+	})
 
+	const actorDisplayNameWithFallback = computed(() => {
+		return getDisplayNameWithFallback(actorDisplayName.value, message.value.actorType)
 	})
 
 	return {
@@ -123,6 +130,6 @@ export function useMessageInfo(message = ref({})) {
 		remoteServer,
 		lastEditor,
 		actorDisplayName,
+		actorDisplayNameWithFallback,
 	}
-
 }
diff --git a/src/utils/getDisplayName.ts b/src/utils/getDisplayName.ts
new file mode 100644
index 00000000000..fb1f2c330eb
--- /dev/null
+++ b/src/utils/getDisplayName.ts
@@ -0,0 +1,22 @@
+/**
+ * SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+import { t } from '@nextcloud/l10n'
+
+import { ATTENDEE } from '../constants.js'
+
+export const getDisplayNameWithFallback = function(displayName: string, source: string): string {
+	if (displayName?.trim()) {
+		return displayName.trim()
+	}
+
+	if ([ATTENDEE.ACTOR_TYPE.GUESTS, ATTENDEE.ACTOR_TYPE.EMAILS].includes(source)) {
+		return t('spreed', 'Guest')
+	}
+
+	// Fallback to 'Deleted user':
+	// - for matching type: `source === ATTENDEE.ACTOR_TYPE.DELETED_USERS`
+	// - in other cases: should not happen, but can not be empty either
+	return t('spreed', 'Deleted user')
+}