diff --git a/resources/qml/MessageView.qml b/resources/qml/MessageView.qml
index e5c6b4ec..6446e61b 100644
--- a/resources/qml/MessageView.qml
+++ b/resources/qml/MessageView.qml
@@ -33,7 +33,7 @@ ScrollView {
         verticalLayoutDirection: ListView.BottomToTop
         onCountChanged: {
             // Mark timeline as read
-            if (atYEnd)
+            if (atYEnd && room)
                 model.currentIndex = 0;
 
         }
@@ -233,8 +233,8 @@ ScrollView {
                     id: dateBubble
 
                     anchors.horizontalCenter: parent ? parent.horizontalCenter : undefined
-                    visible: previousMessageDay !== day
-                    text: chat.model.formatDateSeparator(timestamp)
+                    visible: room && previousMessageDay !== day
+                    text: room ? room.formatDateSeparator(timestamp) : ""
                     color: Nheko.colors.text
                     height: Math.round(fontMetrics.height * 1.4)
                     width: contentWidth * 1.2
@@ -257,10 +257,10 @@ ScrollView {
 
                         width: Nheko.avatarSize
                         height: Nheko.avatarSize
-                        url: chat.model.avatarUrl(userId).replace("mxc://", "image://MxcImage/")
+                        url: !room ? "" : room.avatarUrl(userId).replace("mxc://", "image://MxcImage/")
                         displayName: userName
                         userid: userId
-                        onClicked: chat.model.openUserProfile(userId)
+                        onClicked: room.openUserProfile(userId)
                         ToolTip.visible: avatarHover.hovered
                         ToolTip.text: userid
 
diff --git a/resources/qml/TimelineView.qml b/resources/qml/TimelineView.qml
index 5a8b5381..9bc4bef0 100644
--- a/resources/qml/TimelineView.qml
+++ b/resources/qml/TimelineView.qml
@@ -84,11 +84,10 @@ Item {
                         target: timelineView
                     }
 
-
-                        MessageView {
-                            implicitHeight: msgView.height - typingIndicator.height
-                            Layout.fillWidth: true
-                        }
+                    MessageView {
+                        implicitHeight: msgView.height - typingIndicator.height
+                        Layout.fillWidth: true
+                    }
 
                     Loader {
                         source: CallManager.isOnCall && CallManager.callType != CallType.VOICE ? "voip/VideoCall.qml" : ""
diff --git a/resources/qml/dialogs/ImagePackEditorDialog.qml b/resources/qml/dialogs/ImagePackEditorDialog.qml
index dda2c1ad..e78213e0 100644
--- a/resources/qml/dialogs/ImagePackEditorDialog.qml
+++ b/resources/qml/dialogs/ImagePackEditorDialog.qml
@@ -279,7 +279,6 @@ ApplicationWindow {
                         Layout.alignment: Qt.AlignRight
                     }
 
-
                     Item {
                         Layout.columnSpan: 2
                         Layout.fillHeight: true