diff --git a/resources/qml/TimelineEvent.qml b/resources/qml/TimelineEvent.qml
index 30ec27b2..3e98a2cf 100644
--- a/resources/qml/TimelineEvent.qml
+++ b/resources/qml/TimelineEvent.qml
@@ -142,6 +142,7 @@ EventDelegateChooser {
 
             Layout.fillWidth: true
             Layout.maximumWidth: tempWidth
+            Layout.maximumHeight: timelineView.height / 8
             containerHeight: timelineView.height
         }
     }
diff --git a/resources/qml/delegates/ImageMessage.qml b/resources/qml/delegates/ImageMessage.qml
index 48b7c5e4..504aba0d 100644
--- a/resources/qml/delegates/ImageMessage.qml
+++ b/resources/qml/delegates/ImageMessage.qml
@@ -117,6 +117,7 @@ AbstractButton {
         source: url != "" ? (url.replace("mxc://", "image://MxcImage/") + "?scale") : ""
         asynchronous: true
         fillMode: Image.PreserveAspectFit
+        horizontalAlignment: Image.AlignLeft
         smooth: true
         mipmap: true