diff --git a/imports/NeoChat/Component/Timeline/AudioDelegate.qml b/imports/NeoChat/Component/Timeline/AudioDelegate.qml
index 73ac5fd08..204caa644 100644
--- a/imports/NeoChat/Component/Timeline/AudioDelegate.qml
+++ b/imports/NeoChat/Component/Timeline/AudioDelegate.qml
@@ -17,7 +17,6 @@ import NeoChat.Menu.Timeline 1.0
 TimelineContainer {
     id: audioDelegate
 
-    width: ListView.view.width
     onReplyClicked: ListView.view.goToEvent(eventID)
     hoverComponent: hoverActions
     innerObject: Control {
diff --git a/imports/NeoChat/Component/Timeline/EncryptedDelegate.qml b/imports/NeoChat/Component/Timeline/EncryptedDelegate.qml
index f429da589..514cc9b8e 100644
--- a/imports/NeoChat/Component/Timeline/EncryptedDelegate.qml
+++ b/imports/NeoChat/Component/Timeline/EncryptedDelegate.qml
@@ -10,7 +10,6 @@ import org.kde.neochat 1.0
 
 TimelineContainer {
     id: encryptedDelegate
-    width: ListView.view.width
 
     innerObject: TextEdit {
         text: i18n("This message is encrypted and the sender has not shared the key with this device.")
diff --git a/imports/NeoChat/Component/Timeline/FileDelegate.qml b/imports/NeoChat/Component/Timeline/FileDelegate.qml
index c4311a6f2..6aaa73b16 100644
--- a/imports/NeoChat/Component/Timeline/FileDelegate.qml
+++ b/imports/NeoChat/Component/Timeline/FileDelegate.qml
@@ -15,7 +15,6 @@ import NeoChat.Menu.Timeline 1.0
 
 TimelineContainer {
     id: fileDelegate
-    width: ListView.view.width
 
     onReplyClicked: ListView.view.goToEvent(eventID)
     hoverComponent: hoverActions
diff --git a/imports/NeoChat/Component/Timeline/ImageDelegate.qml b/imports/NeoChat/Component/Timeline/ImageDelegate.qml
index 42958ea61..124442256 100644
--- a/imports/NeoChat/Component/Timeline/ImageDelegate.qml
+++ b/imports/NeoChat/Component/Timeline/ImageDelegate.qml
@@ -15,8 +15,6 @@ import NeoChat.Menu.Timeline 1.0
 TimelineContainer {
     id: imageDelegate
 
-    width: ListView.view.width
-
     onReplyClicked: ListView.view.goToEvent(eventID)
     hoverComponent: hoverActions
 
diff --git a/imports/NeoChat/Component/Timeline/MessageDelegate.qml b/imports/NeoChat/Component/Timeline/MessageDelegate.qml
index 625e38f77..083233f12 100644
--- a/imports/NeoChat/Component/Timeline/MessageDelegate.qml
+++ b/imports/NeoChat/Component/Timeline/MessageDelegate.qml
@@ -13,7 +13,6 @@ import org.kde.neochat 1.0
 TimelineContainer {
     id: messageDelegate
 
-    width: ListView.view.width
     property bool isEmote: false
 
     onReplyClicked: ListView.view.goToEvent(eventID)
diff --git a/imports/NeoChat/Component/Timeline/TimelineContainer.qml b/imports/NeoChat/Component/Timeline/TimelineContainer.qml
index e4f66a156..b633807ee 100644
--- a/imports/NeoChat/Component/Timeline/TimelineContainer.qml
+++ b/imports/NeoChat/Component/Timeline/TimelineContainer.qml
@@ -19,12 +19,11 @@ QQC2.ItemDelegate {
     property bool isEmote: false
     property bool cardBackground: true
 
+    readonly property int delegateMaxWidth: Math.min(messageListView.width, Kirigami.Units.gridUnit * 40)
     readonly property int bubbleMaxWidth: Config.compactLayout && !Config.showAvatarInTimeline ? width - Kirigami.Units.largeSpacing * 4 : (Config.compactLayout ? width - Kirigami.Units.gridUnit * 2 - Kirigami.Units.largeSpacing * 4 : Math.min(width - Kirigami.Units.gridUnit * 2 - Kirigami.Units.largeSpacing * 6, Kirigami.Units.gridUnit * 20))
 
     property bool showUserMessageOnRight: Config.showLocalMessagesOnRight &&
-        model.author.isLocalUser &&
-        !applicationWindow().wideScreen &&
-        !Config.compactLayout
+        model.author.isLocalUser && !Config.compactLayout
 
     signal openExternally()
     signal replyClicked(string eventID)
@@ -37,6 +36,7 @@ QQC2.ItemDelegate {
 
     topPadding: 0
     bottomPadding: 0
+    width: delegateMaxWidth
     background: null
     property Item hoverComponent
 
diff --git a/imports/NeoChat/Component/Timeline/VideoDelegate.qml b/imports/NeoChat/Component/Timeline/VideoDelegate.qml
index e67c2081b..a1d2ef9ff 100644
--- a/imports/NeoChat/Component/Timeline/VideoDelegate.qml
+++ b/imports/NeoChat/Component/Timeline/VideoDelegate.qml
@@ -17,8 +17,6 @@ import NeoChat.Menu.Timeline 1.0
 TimelineContainer {
     id: videoDelegate
 
-    width: ListView.view.width
-
     onReplyClicked: ListView.view.goToEvent(eventID)
     hoverComponent: hoverActions