diff --git a/src/components/MessagesList/MessagesGroup/Message/MessagePart/MessageBody.vue b/src/components/MessagesList/MessagesGroup/Message/MessagePart/MessageBody.vue
index 99f8c0eb880..43498f17587 100644
--- a/src/components/MessagesList/MessagesGroup/Message/MessagePart/MessageBody.vue
+++ b/src/components/MessagesList/MessagesGroup/Message/MessagePart/MessageBody.vue
@@ -84,7 +84,7 @@
 		<div
 			v-if="!isDeletedMessage"
 			class="message-main__info">
-			<span v-if="isSplitViewEnabled && isOwnMessage && message.lastEditTimestamp" class="editor">
+			<span v-if="message.lastEditTimestamp" class="editor">
 				<IconPencilOutline :size="14" />
 				<AvatarWrapper
 					v-if="isEditorDifferentThenAuthor"
@@ -503,9 +503,9 @@ export default {
 
 		isEditorDifferentThenAuthor() {
 			return this.message.lastEditActorId
-				&& this.message.lastEditActorId !== this.message.actorId
 				&& this.message.lastEditActorDisplayName !== this.message.actorDisplayName
-				&& this.message.lastEditActorType !== this.message.actorType
+				&& (this.message.lastEditActorId !== this.message.actorId
+					|| this.message.lastEditActorType !== this.message.actorType)
 		},
 
 		isMessagePinned() {
@@ -617,7 +617,8 @@ export default {
 	min-height: var(--clickable-area-small);
 	min-width: 100%;
 	// Layout 1 (standard view): text and info in two columns
-	grid-template-columns: minmax(0, $messages-text-max-width) $messages-info-width;
+	// Info column grows past its minimum to fit the edited-message icon, so it never overlaps the text column
+	grid-template-columns: minmax(0, $messages-text-max-width) minmax($messages-info-width, max-content);
 	row-gap: var(--default-grid-baseline);
 
 	& .message-main__thread-title,
@@ -691,11 +692,7 @@ export default {
 			width: auto;
 
 			.editor {
-				display: inline-flex;
-				align-items: center;
 				margin-inline-end: var(--default-grid-baseline);
-				gap: calc(var(--default-grid-baseline) / 2);
-				height: 1lh;
 			}
 		}
 
@@ -805,13 +802,25 @@ export default {
 		position: relative;
 		user-select: none;
 		display: flex;
+		align-items: center;
 		justify-content: flex-end;
 		color: var(--color-text-maxcontrast);
 		font-size: var(--default-font-size);
-		width: $messages-info-width;
+		min-width: $messages-info-width;
 		gap: calc(var(--default-grid-baseline) / 2);
 		padding-inline: calc(2 * var(--default-grid-baseline));
 
+		.editor {
+			display: inline-flex;
+			align-items: center;
+			gap: calc(var(--default-grid-baseline) / 2);
+			height: 1lh;
+
+			:deep(.avatar-wrapper) {
+				line-height: 0;
+			}
+		}
+
 		.date {
 			width: 8ch;
 			text-align: end;
diff --git a/src/components/MessagesList/MessagesGroup/MessagesGroup.vue b/src/components/MessagesList/MessagesGroup/MessagesGroup.vue
index d72e4005eb8..3d99a2f93c8 100644
--- a/src/components/MessagesList/MessagesGroup/MessagesGroup.vue
+++ b/src/components/MessagesList/MessagesGroup/MessagesGroup.vue
@@ -101,14 +101,13 @@ export default {
 		const firstMessage = computed(() => messages.value[0])
 		const {
 			remoteServer,
-			lastEditor,
 			actorDisplayName,
 			actorDisplayNameWithFallback,
 		} = useMessageInfo(firstMessage)
 		const isSidebar = inject('chatView:isSidebar', false)
 
 		const actorInfo = computed(() => {
-			return [actorDisplayNameWithFallback.value, remoteServer.value, lastEditor.value]
+			return [actorDisplayNameWithFallback.value, remoteServer.value]
 				.filter((value) => value).join(' ')
 		})
 
diff --git a/src/components/MessagesList/MessagesList.vue b/src/components/MessagesList/MessagesList.vue
index 0f498ce8de8..b045182264e 100644
--- a/src/components/MessagesList/MessagesList.vue
+++ b/src/components/MessagesList/MessagesList.vue
@@ -592,10 +592,6 @@ export default {
 				return false
 			}
 
-			if (!!message1.lastEditTimestamp || !!message2.lastEditTimestamp) {
-				return false // Edited messages are not grouped
-			}
-
 			if (message1.actorType === ATTENDEE.ACTOR_TYPE.BOTS // Don't group messages of bots
 				&& message1.actorId !== ATTENDEE.CHANGELOG_BOT_ID // Apart from the changelog bot
 				&& message1.actorId !== ATTENDEE.SAMPLE_BOT_ID) { // Apart from the sample message