diff --git a/imports/Spectral/Component/Timeline/ImageDelegate.qml b/imports/Spectral/Component/Timeline/ImageDelegate.qml
index bbfebbd2e..445c18cfb 100644
--- a/imports/Spectral/Component/Timeline/ImageDelegate.qml
+++ b/imports/Spectral/Component/Timeline/ImageDelegate.qml
@@ -77,7 +77,7 @@ RowLayout {
         Layout.minimumHeight: 64
 
         Layout.preferredWidth: info.w > maxWidth ? maxWidth : info.w
-        Layout.preferredHeight: info.w > maxWidth ? (info.h / info.w * maxWidth) : info.h
+        Layout.preferredHeight: info.w > maxWidth ? (info.h * maxWidth / info.w) : info.h
 
         id: img
 
diff --git a/imports/Spectral/Component/Timeline/MessageDelegate.qml b/imports/Spectral/Component/Timeline/MessageDelegate.qml
index 4d53f18af..a17a312f3 100644
--- a/imports/Spectral/Component/Timeline/MessageDelegate.qml
+++ b/imports/Spectral/Component/Timeline/MessageDelegate.qml
@@ -168,7 +168,7 @@ ColumnLayout {
                             Layout.fillWidth: true
 
                             color: !sentByMe ? MPalette.foreground : "white"
-                            text: "<style>a{color: " + color + ";} .user-pill{}</style>" + (replyVisible ? reply.display : "")
+                            text: "<style>pre {white-space: pre-wrap} a{color: " + color + ";} .user-pill{}</style>" + (replyVisible ? reply.display : "")
 
                             font.family: window.font.family
                             selectByMouse: true
@@ -202,7 +202,7 @@ ColumnLayout {
 
                     id: contentLabel
 
-                    text: "<style>a{color: " + color + ";} .user-pill{}</style>" + display
+                    text: "<style>pre {white-space: pre-wrap} a{color: " + color + ";} .user-pill{}</style>" + display
 
                     color: darkBackground ? "white" : MPalette.foreground
 
diff --git a/imports/Spectral/Panel/RoomPanel.qml b/imports/Spectral/Panel/RoomPanel.qml
index 3add04a3c..a25a8b7ce 100644
--- a/imports/Spectral/Panel/RoomPanel.qml
+++ b/imports/Spectral/Panel/RoomPanel.qml
@@ -253,6 +253,8 @@ Item {
 
                             if (messageListView.contentY < messageListView.originY + 10 || currentRoom.timelineSize < 20)
                                 currentRoom.getPreviousContent(50)
+
+                            messageListView.positionViewAtBeginning()
                         }
                     }
                 }