diff --git a/src/components/CallView/shared/EmptyCallView.vue b/src/components/CallView/shared/EmptyCallView.vue
index f30615fa335..f7efd3f932b 100644
--- a/src/components/CallView/shared/EmptyCallView.vue
+++ b/src/components/CallView/shared/EmptyCallView.vue
@@ -78,7 +78,8 @@ export default {
 		},
 
 		isOneToOneConversation() {
-			return this.conversation && this.conversation.type === CONVERSATION.TYPE.ONE_TO_ONE
+			return this.conversation?.type === CONVERSATION.TYPE.ONE_TO_ONE
+				|| this.conversation?.type === CONVERSATION.TYPE.ONE_TO_ONE_FORMER
 		},
 
 		isPasswordRequestConversation() {
diff --git a/src/components/ConversationIcon.vue b/src/components/ConversationIcon.vue
index e935594c7c6..04f1ed20901 100644
--- a/src/components/ConversationIcon.vue
+++ b/src/components/ConversationIcon.vue
@@ -213,6 +213,7 @@ export default {
 
 		isOneToOne() {
 			return this.item.type === CONVERSATION.TYPE.ONE_TO_ONE
+				|| this.item.type === CONVERSATION.TYPE.ONE_TO_ONE_FORMER
 		},
 
 		conversationType() {
diff --git a/src/components/MessagesList/MessagesGroup/Message/Message.spec.js b/src/components/MessagesList/MessagesGroup/Message/Message.spec.js
index 08b5b3f4fcc..2dcad1167a3 100644
--- a/src/components/MessagesList/MessagesGroup/Message/Message.spec.js
+++ b/src/components/MessagesList/MessagesGroup/Message/Message.spec.js
@@ -320,6 +320,7 @@ describe('Message.vue', () => {
 			function renderRichObject(message, messageParameters, expectedRichParameters) {
 				messageProps.message = message
 				messageProps.messageParameters = messageParameters
+				store.dispatch('processMessage', { token: TOKEN, message: messageProps })
 				const wrapper = shallowMount(Message, {
 					localVue,
 					store,
@@ -744,7 +745,6 @@ describe('Message.vue', () => {
 				propsData: messageProps,
 				provide: injected,
 			})
-
 			const message = wrapper.findComponent({ name: 'NcRichText' })
 			expect(message.attributes('text')).toBe('test message')
 
diff --git a/src/components/MessagesList/MessagesGroup/Message/Message.vue b/src/components/MessagesList/MessagesGroup/Message/Message.vue
index 2bb91125453..d6f1c226eca 100644
--- a/src/components/MessagesList/MessagesGroup/Message/Message.vue
+++ b/src/components/MessagesList/MessagesGroup/Message/Message.vue
@@ -446,10 +446,6 @@ export default {
 				&& this.messageType !== 'command'
 				&& this.messageType !== 'comment_deleted'
 		},
-
-		isFileShareOnly() {
-			return Object.keys(Object(this.messageParameters)).some(key => key.startsWith('file')) && this.message === '{file}'
-		},
 	},
 
 	mounted() {
diff --git a/src/components/MessagesList/MessagesGroup/Message/MessageButtonsBar/MessageButtonsBar.spec.js b/src/components/MessagesList/MessagesGroup/Message/MessageButtonsBar/MessageButtonsBar.spec.js
index 391112074b1..2538a5dae37 100644
--- a/src/components/MessagesList/MessagesGroup/Message/MessageButtonsBar/MessageButtonsBar.spec.js
+++ b/src/components/MessagesList/MessagesGroup/Message/MessageButtonsBar/MessageButtonsBar.spec.js
@@ -13,6 +13,7 @@ import NcButton from '@nextcloud/vue/dist/Components/NcButton.js'
 
 import MessageButtonsBar from './../MessageButtonsBar/MessageButtonsBar.vue'
 
+import * as useMessageInfoModule from '../../../../../composables/useMessageInfo.js'
 import { CONVERSATION, PARTICIPANT, ATTENDEE } from '../../../../../constants.js'
 import storeConfig from '../../../../../store/storeConfig.js'
 import { useIntegrationsStore } from '../../../../../stores/integrations.js'
@@ -96,6 +97,7 @@ describe('MessageButtonsBar.vue', () => {
 	})
 
 	describe('actions', () => {
+		let useMessageInfoSpy
 
 		beforeEach(() => {
 			store = new Store(testStoreConfig)
@@ -103,6 +105,12 @@ describe('MessageButtonsBar.vue', () => {
 			injected = {
 				getMessagesListScroller: jest.fn(),
 			}
+
+			useMessageInfoSpy = jest.spyOn(useMessageInfoModule, 'useMessageInfo')
+		})
+
+		afterEach(() => {
+			useMessageInfoSpy.mockRestore()
 		})
 
 		describe('reply action', () => {
@@ -212,6 +220,9 @@ describe('MessageButtonsBar.vue', () => {
 			}
 
 			test('hides private reply action for own messages', async () => {
+				useMessageInfoSpy.mockReturnValue({
+					isCurrentUserOwnMessage: () => true,
+			   })
 				// using default message props which have the
 				// actor id set to the current user
 				testPrivateReplyActionVisible(false)
@@ -244,6 +255,9 @@ describe('MessageButtonsBar.vue', () => {
 				const mockDate = new Date('2020-05-07 10:00:00')
 				jest.spyOn(global.Date, 'now')
 					.mockImplementation(() => mockDate)
+				useMessageInfoSpy.mockReturnValue({
+					isDeleteable: () => true,
+				})
 				const wrapper = shallowMount(MessageButtonsBar, {
 					localVue,
 					store,
@@ -264,19 +278,8 @@ describe('MessageButtonsBar.vue', () => {
 
 			/**
 			 * @param {boolean} visible Whether or not the delete action is visible
-			 * @param {Date} mockDate The message date (deletion only works within 6h)
 			 */
-			function testDeleteMessageVisible(visible, mockDate) {
-				store = new Store(testStoreConfig)
-
-				// need to mock the date to be within 6h
-				if (!mockDate) {
-					mockDate = new Date('2020-05-07 10:00:00')
-				}
-
-				jest.spyOn(global.Date, 'now')
-					.mockImplementation(() => mockDate)
-
+			function testDeleteMessageVisible(visible) {
 				const wrapper = shallowMount(MessageButtonsBar, {
 					localVue,
 					store,
@@ -291,53 +294,16 @@ describe('MessageButtonsBar.vue', () => {
 				expect(actionButton.exists()).toBe(visible)
 			}
 
-			test('hides delete action when message is older than 6 hours', () => {
-				testDeleteMessageVisible(false, new Date('2020-05-07 15:24:00'))
-			})
-
-			test('hides delete action when the conversation is read-only', () => {
-				conversationProps.readOnly = CONVERSATION.STATE.READ_ONLY
+			test('hides delete action when it cannot be deleted', async () => {
 				testDeleteMessageVisible(false)
 			})
 
-			test('show delete action for file messages', () => {
-				messageProps.message = '{file}'
-				messageProps.messageParameters.file = {}
+			test('show delete action when it can be deleted', () => {
+				useMessageInfoSpy.mockReturnValue({
+					isDeleteable: () => true,
+				})
 				testDeleteMessageVisible(true)
 			})
-
-			test('hides delete action on other people messages for non-moderators', () => {
-				messageProps.actorId = 'another-user'
-				conversationProps.type = CONVERSATION.TYPE.GROUP
-				testDeleteMessageVisible(false)
-			})
-
-			test('shows delete action on other people messages for moderators', () => {
-				messageProps.actorId = 'another-user'
-				conversationProps.type = CONVERSATION.TYPE.GROUP
-				conversationProps.participantType = PARTICIPANT.TYPE.MODERATOR
-				testDeleteMessageVisible(true, null)
-			})
-
-			test('shows delete action on other people messages for owner', () => {
-				messageProps.actorId = 'another-user'
-				conversationProps.type = CONVERSATION.TYPE.PUBLIC
-				conversationProps.participantType = PARTICIPANT.TYPE.OWNER
-				testDeleteMessageVisible(true, null)
-			})
-
-			test('does not show delete action even for guest moderators', () => {
-				messageProps.actorId = 'another-user'
-				conversationProps.type = CONVERSATION.TYPE.PUBLIC
-				conversationProps.participantType = PARTICIPANT.TYPE.GUEST_MODERATOR
-				testDeleteMessageVisible(false, null)
-			})
-
-			test('does not show delete action on other people messages in one to one conversations', () => {
-				messageProps.actorId = 'another-user'
-				conversationProps.type = CONVERSATION.TYPE.ONE_TO_ONE
-				testDeleteMessageVisible(false)
-			})
 		})
 
 		test('marks message as unread', async () => {
diff --git a/src/components/MessagesList/MessagesGroup/Message/MessageButtonsBar/MessageButtonsBar.vue b/src/components/MessagesList/MessagesGroup/Message/MessageButtonsBar/MessageButtonsBar.vue
index 0ad7ce7e1ee..535db7157fc 100644
--- a/src/components/MessagesList/MessagesGroup/Message/MessageButtonsBar/MessageButtonsBar.vue
+++ b/src/components/MessagesList/MessagesGroup/Message/MessageButtonsBar/MessageButtonsBar.vue
@@ -85,7 +85,7 @@
 						</template>
 						{{ t('spreed', 'Edit message') }}
 					</NcActionButton>
-					<NcActionButton v-if="!isFileShareOnly"
+					<NcActionButton v-if="!isFileShareWithoutCaption"
 						close-after-click
 						@click.stop="handleCopyMessageText">
 						<template #icon>
@@ -250,6 +250,7 @@
 <script>
 import { frequently, EmojiIndex as EmojiIndexFactory } from 'emoji-mart-vue-fast'
 import data from 'emoji-mart-vue-fast/data/all.json'
+import { toRefs } from 'vue'
 
 import AccountIcon from 'vue-material-design-icons/Account.vue'
 import AlarmIcon from 'vue-material-design-icons/Alarm.vue'
@@ -286,7 +287,8 @@ import NcActionText from '@nextcloud/vue/dist/Components/NcActionText.js'
 import NcButton from '@nextcloud/vue/dist/Components/NcButton.js'
 import NcEmojiPicker from '@nextcloud/vue/dist/Components/NcEmojiPicker.js'
 
-import { PARTICIPANT, CONVERSATION, ATTENDEE } from '../../../../../constants.js'
+import { useMessageInfo } from '../../../../../composables/useMessageInfo.js'
+import { CONVERSATION, ATTENDEE } from '../../../../../constants.js'
 import { getMessageReminder, removeMessageReminder, setMessageReminder } from '../../../../../services/remindersService.js'
 import { useIntegrationsStore } from '../../../../../stores/integrations.js'
 import { useReactionsStore } from '../../../../../stores/reactions.js'
@@ -295,8 +297,6 @@ import { parseMentions } from '../../../../../utils/textParse.ts'
 
 const EmojiIndex = new EmojiIndexFactory(data)
 const supportReminders = getCapabilities()?.spreed?.features?.includes('remind-me-later')
-const canEditMessage = getCapabilities()?.spreed?.features?.includes('edit-messages')
-const canDeleteMessageUnlimited = getCapabilities()?.spreed?.features?.includes('delete-messages-unlimited')
 
 export default {
 	name: 'MessageButtonsBar',
@@ -462,14 +462,31 @@ export default {
 
 	emits: ['delete', 'update:isActionMenuOpen', 'update:isEmojiPickerOpen', 'update:isReactionsMenuOpen', 'update:isForwarderOpen', 'show-translate-dialog', 'reply', 'edit'],
 
-	setup() {
+	setup(props) {
+		const { token, id } = toRefs(props)
 		const reactionsStore = useReactionsStore()
 		const { messageActions } = useIntegrationsStore()
+		const {
+			isEditable,
+			isDeleteable,
+			isCurrentUserOwnMessage,
+			isFileShare,
+			isFileShareWithoutCaption,
+			isConversationReadOnly,
+			isConversationModifiable,
+		} = useMessageInfo(token, id)
 
 		return {
 			messageActions,
 			supportReminders,
 			reactionsStore,
+			isEditable,
+			isCurrentUserOwnMessage,
+			isFileShare,
+			isFileShareWithoutCaption,
+			isDeleteable,
+			isConversationReadOnly,
+			isConversationModifiable,
 		}
 	},
 
@@ -499,44 +516,11 @@ export default {
 			return this.getMessagesListScroller()
 		},
 
-		isModifiable() {
-			return !this.isConversationReadOnly && this.conversation.participantType !== PARTICIPANT.TYPE.GUEST
-		},
-
-		isOneToOne() {
-			return this.conversation.type === CONVERSATION.TYPE.ONE_TO_ONE
-				|| this.conversation.type === CONVERSATION.TYPE.ONE_TO_ONE_FORMER
-		},
-
-		isEditable() {
-			if (!canEditMessage || !this.isModifiable || this.isObjectShare
-					|| ((!this.$store.getters.isModerator || this.isOneToOne) && !this.isMyMsg)) {
-				return false
-			}
-
-			return (moment(this.timestamp * 1000).add(1, 'd')) > moment()
-		},
-
-		isDeleteable() {
-			if (!this.isModifiable) {
-				return false
-			}
-
-			return (canDeleteMessageUnlimited || (moment(this.timestamp * 1000).add(6, 'h')) > moment())
-				&& (this.messageType === 'comment' || this.messageType === 'voice-message')
-				&& !this.isDeleting
-				&& (this.isMyMsg
-					|| (this.conversation.type !== CONVERSATION.TYPE.ONE_TO_ONE
-						&& this.conversation.type !== CONVERSATION.TYPE.ONE_TO_ONE_FORMER
-						&& (this.conversation.participantType === PARTICIPANT.TYPE.OWNER
-							|| this.conversation.participantType === PARTICIPANT.TYPE.MODERATOR)))
-		},
-
 		isPrivateReplyable() {
 			return this.isReplyable
 				&& (this.conversation.type === CONVERSATION.TYPE.PUBLIC
 					|| this.conversation.type === CONVERSATION.TYPE.GROUP)
-				&& !this.isMyMsg
+				&& !this.isCurrentUserOwnMessage
 				&& this.actorType === ATTENDEE.ACTOR_TYPE.USERS
 				&& this.$store.getters.isActorUser()
 		},
@@ -550,31 +534,10 @@ export default {
 			}
 		},
 
-		isFileShare() {
-			return Object.keys(Object(this.messageParameters)).some(key => key.startsWith('file'))
-		},
-
-		isFileShareOnly() {
-			return this.isFileShare && this.message === '{file}'
-		},
-
-		isObjectShare() {
-			return Object.keys(Object(this.messageParameters)).some(key => key.startsWith('object'))
-		},
-
 		isCurrentGuest() {
 			return this.$store.getters.isActorGuest()
 		},
 
-		isMyMsg() {
-			return this.actorId === this.$store.getters.getActorId()
-				&& this.actorType === this.$store.getters.getActorType()
-		},
-
-		isConversationReadOnly() {
-			return this.conversation.readOnly === CONVERSATION.STATE.READ_ONLY
-		},
-
 		isDeletedMessage() {
 			return this.messageType === 'comment_deleted'
 		},
@@ -845,7 +808,7 @@ export default {
 		},
 
 		editMessage() {
-			if (!canEditMessage) {
+			if (!this.isEditable) {
 				return
 			}
 			this.$emit('edit')
diff --git a/src/components/MessagesList/MessagesGroup/Message/MessagePart/MessageBody.vue b/src/components/MessagesList/MessagesGroup/Message/MessagePart/MessageBody.vue
index 1490910b6e7..7990c5b4c0b 100644
--- a/src/components/MessagesList/MessagesGroup/Message/MessagePart/MessageBody.vue
+++ b/src/components/MessagesList/MessagesGroup/Message/MessagePart/MessageBody.vue
@@ -110,6 +110,7 @@
 
 <script>
 import emojiRegex from 'emoji-regex'
+import { toRefs } from 'vue'
 
 import AlertCircleIcon from 'vue-material-design-icons/AlertCircle.vue'
 import CancelIcon from 'vue-material-design-icons/Cancel.vue'
@@ -130,11 +131,10 @@ import Quote from '../../../../Quote.vue'
 import CallButton from '../../../../TopBar/CallButton.vue'
 
 import { useIsInCall } from '../../../../../composables/useIsInCall.js'
-import { CONVERSATION, PARTICIPANT } from '../../../../../constants.js'
+import { useMessageInfo } from '../../../../../composables/useMessageInfo.js'
 import { EventBus } from '../../../../../services/EventBus.js'
 import { parseSpecialSymbols, parseMentions } from '../../../../../utils/textParse.ts'
 
-const canEditMessage = getCapabilities()?.spreed?.features?.includes('edit-messages')
 // Regular expression to check for Unicode emojis in message text
 const regex = emojiRegex()
 
@@ -245,9 +245,16 @@ export default {
 		},
 	},
 
-	setup() {
+	setup(props) {
+		const { token, id } = toRefs(props)
+		const {
+			isEditable,
+			isFileShare,
+		} = useMessageInfo(token, id)
 		return {
 			isInCall: useIsInCall(),
+			isEditable,
+			isFileShare,
 		}
 	},
 
@@ -262,7 +269,7 @@ export default {
 
 	computed: {
 		renderedMessage() {
-			if (this.isFileShareMessage && this.message !== '{file}') {
+			if (this.isFileShare && this.message !== '{file}') {
 				// Add a new line after file to split content into different paragraphs
 				return '{file}' + '\n\n' + this.message
 			} else {
@@ -278,10 +285,6 @@ export default {
 			return this.messageType === 'comment_deleted'
 		},
 
-		isFileShareMessage() {
-			return this.messageParameters?.file
-		},
-
 		isNewPollMessage() {
 			if (this.messageParameters?.object?.type !== 'talk-poll') {
 				return false
@@ -290,41 +293,6 @@ export default {
 			return this.isInCall && !!this.$store.getters.getNewPolls[this.messageParameters.object.id]
 		},
 
-		conversation() {
-			return this.$store.getters.conversation(this.token)
-		},
-
-		isConversationReadOnly() {
-			return this.conversation.readOnly === CONVERSATION.STATE.READ_ONLY
-		},
-
-		isModifiable() {
-			return !this.isConversationReadOnly && this.conversation.participantType !== PARTICIPANT.TYPE.GUEST
-		},
-
-		isObjectShare() {
-			return Object.keys(Object(this.messageParameters)).some(key => key.startsWith('object'))
-		},
-
-		isMyMsg() {
-			return this.actorId === this.$store.getters.getActorId()
-				&& this.actorType === this.$store.getters.getActorType()
-		},
-
-		isOneToOne() {
-			return this.conversation.type === CONVERSATION.TYPE.ONE_TO_ONE
-				|| this.conversation.type === CONVERSATION.TYPE.ONE_TO_ONE_FORMER
-		},
-
-		isEditable() {
-			if (!canEditMessage || !this.isModifiable || this.isObjectShare
-				|| ((!this.$store.getters.isModerator || this.isOneToOne) && !this.isMyMsg)) {
-				return false
-			}
-
-			return (moment(this.timestamp * 1000).add(1, 'd')) > moment()
-		},
-
 		hideDate() {
 			return this.isTemporary || this.isDeleting || !!this.sendingFailure
 		},
@@ -366,7 +334,7 @@ export default {
 		},
 
 		showLoadingIcon() {
-			return (this.isTemporary && !this.isFileShareMessage) || this.isDeleting
+			return (this.isTemporary && !this.isFileShare) || this.isDeleting
 		},
 
 		loadingIconTooltip() {
diff --git a/src/components/NewMessage/NewMessage.vue b/src/components/NewMessage/NewMessage.vue
index 5eebf933999..062fb20cff1 100644
--- a/src/components/NewMessage/NewMessage.vue
+++ b/src/components/NewMessage/NewMessage.vue
@@ -183,6 +183,7 @@ import SendIcon from 'vue-material-design-icons/Send.vue'
 import { getCapabilities } from '@nextcloud/capabilities'
 import { showError, showWarning } from '@nextcloud/dialogs'
 import { FilePickerVue } from '@nextcloud/dialogs/filepicker.js'
+import moment from '@nextcloud/moment'
 import { generateUrl } from '@nextcloud/router'
 
 import NcActionButton from '@nextcloud/vue/dist/Components/NcActionButton.js'
@@ -332,10 +333,6 @@ export default {
 			return this.conversation.readOnly === CONVERSATION.STATE.READ_ONLY
 		},
 
-		isOneToOneConversation() {
-			return this.conversation.type === CONVERSATION.TYPE.ONE_TO_ONE
-		},
-
 		noChatPermission() {
 			return (this.conversation.permissions & PARTICIPANT.PERMISSIONS.CHAT) === 0
 		},
@@ -966,10 +963,13 @@ export default {
 			if (!canEditMessage || this.text || this.upload || this.broadcast || this.isRecordingAudio) {
 				return
 			}
+
+			// last message within 24 hours
 			const lastMessageByCurrentUser = this.$store.getters.messagesList(this.token).findLast(message => {
 				return message.actorId === this.$store.getters.getUserId()
 					&& message.actorType === this.$store.getters.getActorType()
 					&& !message.isTemporary && !message.systemMessage
+					&& (moment(message.timestamp * 1000).add(1, 'd')) > moment()
 			})
 
 			if (!lastMessageByCurrentUser) {
@@ -986,7 +986,7 @@ export default {
 		},
 
 		async checkAbsenceStatus() {
-			if (!this.isOneToOneConversation) {
+			if (!this.isOneToOne) {
 				return
 			}
 
diff --git a/src/components/Quote.vue b/src/components/Quote.vue
index d89cd051838..4dc7774cd00 100644
--- a/src/components/Quote.vue
+++ b/src/components/Quote.vue
@@ -31,7 +31,7 @@ components.
 				</div>
 			</div>
 			<!-- file preview-->
-			<NcRichText v-if="isFileShareMessage"
+			<NcRichText v-if="isFileShare"
 				text="{file}"
 				:arguments="richParameters" />
 			<!-- text -->
@@ -54,6 +54,8 @@ components.
 </template>
 
 <script>
+import { toRefs } from 'vue'
+
 import Close from 'vue-material-design-icons/Close.vue'
 import PencilIcon from 'vue-material-design-icons/Pencil.vue'
 
@@ -64,6 +66,7 @@ import AvatarWrapper from './AvatarWrapper/AvatarWrapper.vue'
 import DefaultParameter from './MessagesList/MessagesGroup/Message/MessagePart/DefaultParameter.vue'
 import FilePreview from './MessagesList/MessagesGroup/Message/MessagePart/FilePreview.vue'
 
+import { useMessageInfo } from '../composables/useMessageInfo.js'
 import { ATTENDEE, AVATAR } from '../constants.js'
 import { EventBus } from '../services/EventBus.js'
 import { useChatExtrasStore } from '../stores/chatExtras.js'
@@ -139,12 +142,19 @@ export default {
 		},
 	},
 
-	setup() {
+	setup(props) {
+		const { token, id } = toRefs(props)
 		const chatExtrasStore = useChatExtrasStore()
+		const {
+			isFileShare,
+			isFileShareWithoutCaption,
+		} = useMessageInfo(token, id)
 
 		return {
 			AVATAR,
 			chatExtrasStore,
+			isFileShare,
+			isFileShareWithoutCaption,
 		}
 	},
 
@@ -173,14 +183,6 @@ export default {
 				&& this.actorType === this.$store.getters.getActorType()
 		},
 
-		isFileShareMessage() {
-			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) {
diff --git a/src/components/RightSidebar/BreakoutRooms/BreakoutRoomsActions.vue b/src/components/RightSidebar/BreakoutRooms/BreakoutRoomsActions.vue
index b91a40d0d69..28694ee3a58 100644
--- a/src/components/RightSidebar/BreakoutRooms/BreakoutRoomsActions.vue
+++ b/src/components/RightSidebar/BreakoutRooms/BreakoutRoomsActions.vue
@@ -193,6 +193,11 @@ export default {
 			return this.mainConversation.participantType === PARTICIPANT.TYPE.OWNER || this.mainConversation.participantType === PARTICIPANT.TYPE.MODERATOR
 		},
 
+		isOneToOne() {
+			return this.mainConversation.type === CONVERSATION.TYPE.ONE_TO_ONE
+				|| this.mainConversation.type === CONVERSATION.TYPE.ONE_TO_ONE_FORMER
+		},
+
 		canModerate() {
 			return !this.isOneToOne && (this.canFullModerate || this.mainConversation.participantType === PARTICIPANT.TYPE.GUEST_MODERATOR)
 		},
diff --git a/src/components/RightSidebar/BreakoutRooms/BreakoutRoomsTab.vue b/src/components/RightSidebar/BreakoutRooms/BreakoutRoomsTab.vue
index 5b4411200e2..139878a87ae 100644
--- a/src/components/RightSidebar/BreakoutRooms/BreakoutRoomsTab.vue
+++ b/src/components/RightSidebar/BreakoutRooms/BreakoutRoomsTab.vue
@@ -95,6 +95,11 @@ export default {
 			return !this.isOneToOne && (this.canFullModerate || this.mainConversation.participantType === PARTICIPANT.TYPE.GUEST_MODERATOR)
 		},
 
+		isOneToOne() {
+			return this.mainConversation.type === CONVERSATION.TYPE.ONE_TO_ONE
+				|| this.mainConversation.type === CONVERSATION.TYPE.ONE_TO_ONE_FORMER
+		},
+
 		showBreakoutRoomsList() {
 			return this.breakoutRoomsConfigured
 				&& (this.canModerate || this.mainConversation.breakoutRoomStatus === CONVERSATION.BREAKOUT_ROOM_STATUS.STARTED)
diff --git a/src/components/TopBar/TopBar.vue b/src/components/TopBar/TopBar.vue
index a57c79c5f5e..0988b932177 100644
--- a/src/components/TopBar/TopBar.vue
+++ b/src/components/TopBar/TopBar.vue
@@ -214,6 +214,7 @@ export default {
 
 		isOneToOneConversation() {
 			return this.conversation.type === CONVERSATION.TYPE.ONE_TO_ONE
+				|| this.conversation.type === CONVERSATION.TYPE.ONE_TO_ONE_FORMER
 		},
 
 		isModeratorOrUser() {
diff --git a/src/composables/__tests__/useMessageInfo.spec.js b/src/composables/__tests__/useMessageInfo.spec.js
new file mode 100644
index 00000000000..9549b55f588
--- /dev/null
+++ b/src/composables/__tests__/useMessageInfo.spec.js
@@ -0,0 +1,273 @@
+/**
+ * SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+import { computed } from 'vue'
+
+import { ATTENDEE, CONVERSATION, PARTICIPANT } from '../../constants.js'
+import { useConversationInfo } from '../useConversationInfo.js'
+import { useMessageInfo } from '../useMessageInfo.js'
+import { useStore } from '../useStore.js'
+
+jest.mock('@nextcloud/capabilities', () => ({
+	getCapabilities: jest.fn(() => ({
+		spreed: {
+			features: ['edit-messages'],
+		},
+	}))
+}))
+jest.mock('../useStore.js')
+jest.mock('../useConversationInfo.js')
+
+describe('message actions', () => {
+	let messageProps
+	let conversationProps
+	let mockConversationInfo
+	const TOKEN = 'XXTOKENXX'
+
+	jest.useFakeTimers().setSystemTime(new Date('2024-05-01 17:00:00'))
+
+	beforeEach(() => {
+		messageProps = {
+			message: 'test message',
+			actorType: ATTENDEE.ACTOR_TYPE.USERS,
+			actorId: 'user-id-1',
+			actorDisplayName: 'user-display-name-1',
+			messageParameters: {},
+			id: 123,
+			isTemporary: false,
+			isFirstMessage: true,
+			isReplyable: true,
+			isTranslationAvailable: false,
+			canReact: true,
+			isReactionsMenuOpen: false,
+			isActionMenuOpen: false,
+			isEmojiPickerOpen: false,
+			isLastRead: false,
+			isForwarderOpen: false,
+			timestamp: new Date('2024-05-01 16:15:00').getTime() / 1000,
+			token: TOKEN,
+			systemMessage: '',
+			messageType: 'comment',
+			previousMessageId: 100,
+			participant: {
+				actorId: 'user-id-1',
+				actorType: ATTENDEE.ACTOR_TYPE.USERS,
+				participantType: PARTICIPANT.TYPE.USER,
+			},
+			showCommonReadIcon: true,
+			showSentIcon: true,
+			commonReadIconTooltip: '',
+			sentIconTooltip: '',
+		}
+		conversationProps = {
+			token: TOKEN,
+			lastCommonReadMessage: 0,
+			type: CONVERSATION.TYPE.GROUP,
+			readOnly: CONVERSATION.STATE.READ_WRITE,
+		}
+		useStore.mockReturnValue({
+			getters: {
+				message: () => messageProps,
+				conversation: () => conversationProps,
+				getActorId: () => 'user-id-1',
+				getActorType: () => ATTENDEE.ACTOR_TYPE.USERS,
+				isModerator: false,
+			},
+		})
+
+		mockConversationInfo = {
+			isOneToOneConversation: computed(() => false),
+			isConversationReadOnly: computed(() => false),
+			isConversationModifiable: computed(() => true),
+		}
+
+		useConversationInfo.mockReturnValue(mockConversationInfo)
+	})
+
+	test('message is not deleteable when it is older than 6 hours and unlimited capability is disabled', () => {
+		// Arrange
+		messageProps.timestamp = new Date('2024-05-01 7:20:00').getTime() / 1000
+		// Act
+		const result = useMessageInfo(messageProps.token, messageProps.id)
+		// Assert
+		expect(result.isDeleteable.value).toBe(false)
+	})
+
+	test('message is not deleteable when the conversation is read-only', () => {
+		// Arrange
+		mockConversationInfo = {
+			isOneToOneConversation: computed(() => false),
+			isConversationReadOnly: computed(() => true),
+			isConversationModifiable: computed(() => false),
+		}
+		useConversationInfo.mockReturnValue(mockConversationInfo)
+		// Act
+		const result = useMessageInfo(messageProps.token, messageProps.id)
+		// Assert
+		expect(result.isDeleteable.value).toBe(false)
+	})
+
+	test('file message is deleteable', () => {
+		// Arrange
+		messageProps.message = '{file}'
+		messageProps.messageParameters.file = {}
+		// Act
+		const result = useMessageInfo(messageProps.token, messageProps.id)
+		// Assert
+		expect(result.isFileShare.value).toBe(true)
+		expect(result.isFileShareWithoutCaption.value).toBe(true)
+		expect(result.isDeleteable.value).toBe(true)
+	})
+
+	test('other people messages are not deleteable for non-moderators', () => {
+		// Arrange
+		messageProps.actorId = 'another-user'
+		conversationProps.type = CONVERSATION.TYPE.GROUP
+		// Act
+		const result = useMessageInfo(messageProps.token, messageProps.id)
+		// Assert
+		expect(result.isCurrentUserOwnMessage.value).toBe(false)
+		expect(result.isDeleteable.value).toBe(false)
+	})
+
+	test('other people messages are deleteable for moderators', () => {
+		// Arrange
+		messageProps.actorId = 'another-user'
+		conversationProps.type = CONVERSATION.TYPE.GROUP
+		useStore.mockReturnValue({
+			getters: {
+				message: () => messageProps,
+				conversation: () => conversationProps,
+				getActorId: () => 'user-id-1',
+				getActorType: () => ATTENDEE.ACTOR_TYPE.MODERATOR,
+				isModerator: true,
+			},
+		})
+		// Act
+		const result = useMessageInfo(messageProps.token, messageProps.id)
+		// Assert
+		expect(result.isCurrentUserOwnMessage.value).toBe(false)
+		expect(result.isDeleteable.value).toBe(true)
+	})
+
+	test('other people message is not deleteable in one to one conversations', () => {
+		// Arrange
+		messageProps.actorId = 'another-user'
+		conversationProps.type = CONVERSATION.TYPE.ONE_TO_ONE
+		useStore.mockReturnValue({
+			getters: {
+				message: () => messageProps,
+				conversation: () => conversationProps,
+				getActorId: () => 'user-id-1',
+				getActorType: () => ATTENDEE.ACTOR_TYPE.USER,
+				isModerator: false,
+			},
+		})
+		// Act
+		const result = useMessageInfo(messageProps.token, messageProps.id)
+		// Assert
+		expect(result.isCurrentUserOwnMessage.value).toBe(false)
+		expect(result.isDeleteable.value).toBe(false)
+
+	})
+
+	test('can edit own message', () => {
+		// Arrange
+		// capabilities are set
+		// the message is owned by the current user
+		// the conversation is modifiable (not read-only and user is not a guest or guest moderator)
+		// the message is not a object share (e.g. poll)
+
+		// Act
+		const result = useMessageInfo(messageProps.token, messageProps.id)
+		// Assert
+		expect(result.isCurrentUserOwnMessage.value).toBe(true)
+		expect(result.isEditable.value).toBe(true)
+	})
+
+	test('moderator can edit other people messages', () => {
+		// Arrange
+		messageProps.actorId = 'another-user'
+		conversationProps.type = CONVERSATION.TYPE.GROUP
+		useStore.mockReturnValue({
+			getters: {
+				message: () => messageProps,
+				conversation: () => conversationProps,
+				getActorId: () => 'user-id-1',
+				getActorType: () => ATTENDEE.ACTOR_TYPE.MODERATOR,
+				isModerator: true,
+			},
+		})
+		// Act
+		const result = useMessageInfo(messageProps.token, messageProps.id)
+		// Assert
+		expect(result.isCurrentUserOwnMessage.value).toBe(false)
+		expect(result.isEditable.value).toBe(true)
+	})
+
+	test('user can not edit other people messages', () => {
+		// Arrange
+		messageProps.actorId = 'another-user'
+		conversationProps.type = CONVERSATION.TYPE.GROUP
+		useStore.mockReturnValue({
+			getters: {
+				message: () => messageProps,
+				conversation: () => conversationProps,
+				getActorId: () => 'user-id-1',
+				getActorType: () => ATTENDEE.ACTOR_TYPE.USERS,
+				isModerator: false,
+			},
+		})
+		// Act
+		const result = useMessageInfo(messageProps.token, messageProps.id)
+		// Assert
+		expect(result.isCurrentUserOwnMessage.value).toBe(false)
+		expect(result.isEditable.value).toBe(false)
+	})
+
+	test('system message is not editable', () => {
+		// Arrange
+		messageProps.systemMessage = 'system-message'
+		// Act
+		const result = useMessageInfo(messageProps.token, messageProps.id)
+		// Assert
+		expect(result.isEditable.value).toBe(false)
+	})
+
+	test('message is not editable when the conversation is not modifiable', () => {
+		// Arrange
+		mockConversationInfo = {
+			isOneToOneConversation: computed(() => false),
+			isConversationReadOnly: computed(() => false),
+			isConversationModifiable: computed(() => false),
+		}
+		useConversationInfo.mockReturnValue(mockConversationInfo)
+		// Act
+		const result = useMessageInfo(messageProps.token, messageProps.id)
+		// Assert
+		expect(result.isEditable.value).toBe(false)
+	})
+
+	test('error handling, return false when conversation or message is not available', () => {
+		// Arrange
+		useStore.mockReturnValue({
+			getters: {
+				conversation: () => null,
+				message: () => null,
+			},
+		})
+		// Act
+		const result = useMessageInfo(messageProps.token, messageProps.id)
+		// Assert
+		expect(result.isEditable.value).toBe(false)
+		expect(result.isDeleteable.value).toBe(false)
+		expect(result.isCurrentUserOwnMessage.value).toBe(false)
+		expect(result.isObjectShare.value).toBe(false)
+		expect(result.isConversationModifiable.value).toBe(false)
+		expect(result.isConversationReadOnly.value).toBe(false)
+		expect(result.isFileShareWithoutCaption.value).toBe(false)
+		expect(result.isFileShare.value).toBe(false)
+	})
+
+})
diff --git a/src/composables/useConversationInfo.js b/src/composables/useConversationInfo.js
index 1379a5eb22d..4026fa1bc1c 100644
--- a/src/composables/useConversationInfo.js
+++ b/src/composables/useConversationInfo.js
@@ -5,7 +5,7 @@
 
 import { computed, ref } from 'vue'
 
-import { ATTENDEE, CONVERSATION } from '../constants.js'
+import { ATTENDEE, CONVERSATION, PARTICIPANT } from '../constants.js'
 
 /**
  * Reusable properties for Conversation... items
@@ -121,8 +121,24 @@ export function useConversationInfo({
 		})
 	})
 
+	const isOneToOneConversation = computed(() => {
+		return [CONVERSATION.TYPE.ONE_TO_ONE, CONVERSATION.TYPE.ONE_TO_ONE_FORMER].includes(item.value.type)
+	})
+
+	const isConversationReadOnly = computed(() => {
+		return item.value.readOnly === CONVERSATION.STATE.READ_ONLY
+	})
+
+	const isConversationModifiable = computed(() =>
+		!isConversationReadOnly.value
+		&& item.value.participantType !== PARTICIPANT.TYPE.GUEST
+		&& item.value.participantType !== PARTICIPANT.TYPE.GUEST_MODERATOR)
+
 	return {
 		counterType,
 		conversationInformation,
+		isOneToOneConversation,
+		isConversationReadOnly,
+		isConversationModifiable,
 	}
 }
diff --git a/src/composables/useGetParticipants.js b/src/composables/useGetParticipants.js
index f02327d3718..8e1b6cb5e1b 100644
--- a/src/composables/useGetParticipants.js
+++ b/src/composables/useGetParticipants.js
@@ -23,7 +23,8 @@ export function useGetParticipants(isActive = ref(true), isTopBar = true) {
 	const token = computed(() => store.getters.getToken())
 	const conversation = computed(() => store.getters.conversation(token.value))
 	const isInCall = useIsInCall()
-	const isOneToOneConversation = computed(() => conversation.value?.type === CONVERSATION.TYPE.ONE_TO_ONE)
+	const isOneToOneConversation = computed(() => conversation.value?.type === CONVERSATION.TYPE.ONE_TO_ONE
+		|| conversation.value?.type === CONVERSATION.TYPE.ONE_TO_ONE_FORMER)
 	let fetchingParticipants = false
 	let pendingChanges = true
 
diff --git a/src/composables/useMessageInfo.js b/src/composables/useMessageInfo.js
new file mode 100644
index 00000000000..c7508a59584
--- /dev/null
+++ b/src/composables/useMessageInfo.js
@@ -0,0 +1,90 @@
+/**
+ * SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+import { computed, unref, ref } from 'vue'
+
+import { getCapabilities } from '@nextcloud/capabilities'
+import moment from '@nextcloud/moment'
+
+import { useConversationInfo } from './useConversationInfo.js'
+import { useStore } from './useStore.js'
+
+const canDeleteMessageUnlimited = getCapabilities()?.spreed?.features?.includes('delete-messages-unlimited')
+const canEditMessage = getCapabilities()?.spreed?.features?.includes('edit-messages')
+
+/**
+ * Check whether the user can edit the message or not
+ *
+ * @param {import('vue').Ref} tokenRef conversation token
+ * @param {import('vue').Ref} messageIdRef message id to edit
+ * @return {import('vue').ComputedRef<boolean>}
+ */
+export function useMessageInfo(tokenRef = ref(null), messageIdRef = ref(null)) {
+	const token = unref(tokenRef)
+	const messageId = unref(messageIdRef)
+	const store = useStore()
+
+	// Get the conversation and message
+	const conversation = computed(() => store.getters.conversation(token))
+	const message = computed(() => store.getters.message(token, messageId))
+
+	// If the conversation or message is not available, return false
+	if (!conversation.value || !message.value) {
+		return {
+			isEditable: computed(() => false),
+			isDeleteable: computed(() => false),
+			isCurrentUserOwnMessage: computed(() => false),
+			isObjectShare: computed(() => false),
+			isConversationModifiable: computed(() => false),
+			isConversationReadOnly: computed(() => false),
+			isFileShareWithoutCaption: computed(() => false),
+			isFileShare: computed(() => false),
+		}
+	}
+
+	const {
+		isOneToOneConversation,
+		isConversationReadOnly,
+		isConversationModifiable,
+	} = useConversationInfo({ item: conversation })
+
+	const isObjectShare = computed(() => Object.keys(Object(message.value.messageParameters)).some(key => key.startsWith('object')))
+
+	const isCurrentUserOwnMessage = computed(() =>
+		message.value.actorId === store.getters.getActorId()
+		&& message.value.actorType === store.getters.getActorType()
+	)
+
+	const isEditable = computed(() => {
+		if (!canEditMessage || !isConversationModifiable.value || isObjectShare.value || message.value.systemMessage
+			|| ((!store.getters.isModerator || isOneToOneConversation.value) && !isCurrentUserOwnMessage.value)) {
+			return false
+		}
+
+		return (moment(message.value.timestamp * 1000).add(1, 'd')) > moment()
+	})
+
+	const isFileShare = computed(() => Object.keys(Object(message.value.messageParameters)).some(key => key.startsWith('file')))
+
+	const isFileShareWithoutCaption = computed(() => message.value.message === '{file}' && isFileShare.value)
+
+	const isDeleteable = computed(() =>
+		(canDeleteMessageUnlimited || (moment(message.value.timestamp * 1000).add(6, 'h')) > moment())
+		&& (message.value.messageType === 'comment' || message.value.messageType === 'voice-message')
+		&& (isCurrentUserOwnMessage.value || (!isOneToOneConversation.value && store.getters.isModerator))
+		&& isConversationModifiable.value)
+
+	return {
+		isEditable,
+		isDeleteable,
+		isCurrentUserOwnMessage,
+		isObjectShare,
+		isConversationModifiable,
+		isConversationReadOnly,
+		isFileShareWithoutCaption,
+		isFileShare,
+	}
+
+}