diff --git a/src/backend/user_files.py b/src/backend/user_files.py
index 9c7f2188..fe996fc6 100644
--- a/src/backend/user_files.py
+++ b/src/backend/user_files.py
@@ -239,6 +239,7 @@ class UISettings(JSONDataFile):
             "hideMembershipEvents": False,
             "hideUnknownEvents": False,
             "maxMessageCharactersPerLine": 65,
+            "ownMessagesOnLeftAboveWidth": 895,
             "theme": "Midnight.qpl",
             "writeAliases": {},
             "media": {
diff --git a/src/gui/Pages/Chat/Timeline/EventDelegate.qml b/src/gui/Pages/Chat/Timeline/EventDelegate.qml
index e406e379..e50e1b5f 100644
--- a/src/gui/Pages/Chat/Timeline/EventDelegate.qml
+++ b/src/gui/Pages/Chat/Timeline/EventDelegate.qml
@@ -25,7 +25,7 @@ HColumnLayout {
     property bool checked: model.id in eventList.checked
     property bool compact: window.settings.compactMode
     property bool isOwn: chat.userId === model.sender_id
-    property bool onRight: eventList.ownEventsOnRight && isOwn
+    property bool onRight: ! eventList.ownEventsOnLeft && isOwn
     property bool combine: eventList.canCombine(previousModel, model)
     property bool talkBreak: eventList.canTalkBreak(previousModel, model)
     property bool dayBreak: eventList.canDayBreak(previousModel, model)
diff --git a/src/gui/Pages/Chat/Timeline/EventList.qml b/src/gui/Pages/Chat/Timeline/EventList.qml
index 08b8cdbd..c0c7d6ba 100644
--- a/src/gui/Pages/Chat/Timeline/EventList.qml
+++ b/src/gui/Pages/Chat/Timeline/EventList.qml
@@ -180,8 +180,10 @@ Rectangle {
         property bool canLoad: true
         property bool loading: false
 
-        property bool ownEventsOnRight:
-            width < theme.chat.eventList.ownEventsOnRightUnderWidth
+        property bool ownEventsOnLeft:
+            window.settings.ownMessagesOnLeftAboveWidth < 0 ?
+            false :
+            width > window.settings.ownMessagesOnLeftAboveWidth * theme.uiScale
 
         property string delegateWithSelectedText: ""
         property string selectedText: ""
diff --git a/src/themes/Glass.qpl b/src/themes/Glass.qpl
index 2eb1b620..9e41363f 100644
--- a/src/themes/Glass.qpl
+++ b/src/themes/Glass.qpl
@@ -356,8 +356,7 @@ chat:
                 color background: "transparent"
 
     eventList:
-        int ownEventsOnRightUnderWidth: 896 * theme.uiScale
-        color background:               "transparent"
+        color background: "transparent"
 
     message:
         int avatarSize:          56 * uiScale
diff --git a/src/themes/Midnight.qpl b/src/themes/Midnight.qpl
index 5d9136d0..022c488f 100644
--- a/src/themes/Midnight.qpl
+++ b/src/themes/Midnight.qpl
@@ -365,8 +365,7 @@ chat:
                 color background: "transparent"
 
     eventList:
-        int ownEventsOnRightUnderWidth: 896 * theme.uiScale
-        color background:               "transparent"
+        color background: "transparent"
 
     message:
         int avatarSize:          56 * uiScale