diff --git a/imports/Spectral/Component/Timeline/MessageDelegate.qml b/imports/Spectral/Component/Timeline/MessageDelegate.qml
index c55d7315b..e800994a8 100644
--- a/imports/Spectral/Component/Timeline/MessageDelegate.qml
+++ b/imports/Spectral/Component/Timeline/MessageDelegate.qml
@@ -90,7 +90,7 @@ RowLayout {
                 }
 
                 TextEdit {
-                    Layout.maximumWidth: parent.width
+                    Layout.fillWidth: true
 
                     text: "<style>pre {white-space: pre-wrap} a{color: " + color + ";} .user-pill{}</style>" + (replyVisible ? reply.display : "")
 
@@ -100,7 +100,7 @@ RowLayout {
 
                     selectByMouse: true
                     readOnly: true
-                    wrapMode: Text.Wrap
+                    wrapMode: Text.WrapAtWordBoundaryOrAnywhere
                     textFormat: Text.RichText
                 }
             }
diff --git a/imports/Spectral/Component/Timeline/TextDelegate.qml b/imports/Spectral/Component/Timeline/TextDelegate.qml
index a8dabadde..c9c3455fb 100644
--- a/imports/Spectral/Component/Timeline/TextDelegate.qml
+++ b/imports/Spectral/Component/Timeline/TextDelegate.qml
@@ -16,7 +16,7 @@ TextEdit {
 
     selectByMouse: true
     readOnly: true
-    wrapMode: Text.Wrap
+    wrapMode: Text.WrapAtWordBoundaryOrAnywhere
     textFormat: Text.RichText
 }
 
diff --git a/qml/main.qml b/qml/main.qml
index 78487a312..3db0ef072 100644
--- a/qml/main.qml
+++ b/qml/main.qml
@@ -48,18 +48,18 @@ Kirigami.ApplicationWindow {
         onErrorOccured: showPassiveNotification(error + ": " + detail)
     }
 
-    Binding {
-        target: imageProvider
-        property: "connection"
-        value: spectralController.connection
-    }
-
     RoomListModel {
         id: spectralRoomListModel
 
         connection: spectralController.connection
     }
 
+    Binding {
+        target: imageProvider
+        property: "connection"
+        value: spectralController.connection
+    }
+
     Component {
         id: roomPanelComponent
 
diff --git a/src/matriximageprovider.cpp b/src/matriximageprovider.cpp
index 497bf474a..0e5411101 100644
--- a/src/matriximageprovider.cpp
+++ b/src/matriximageprovider.cpp
@@ -21,9 +21,6 @@ ThumbnailResponse::ThumbnailResponse(Quotient::Connection* c,
                          QString::number(requestedSize.width()),
                          QString::number(requestedSize.height()))),
       errorStr("Image request hasn't started") {
-  if (!c) {
-    return;
-  }
   if (requestedSize.isEmpty()) {
     errorStr.clear();
     emit finished();
@@ -44,6 +41,11 @@ ThumbnailResponse::ThumbnailResponse(Quotient::Connection* c,
     return;
   }
 
+  if (!c) {
+    qWarning() << "Current connection is null";
+    return;
+  }
+
   // Execute a request on the main thread asynchronously
   moveToThread(c->thread());
   QMetaObject::invokeMethod(this, &ThumbnailResponse::startRequest,
@@ -114,5 +116,5 @@ void ThumbnailResponse::cancel() {
 QQuickImageResponse* MatrixImageProvider::requestImageResponse(
     const QString& id,
     const QSize& requestedSize) {
-  return new ThumbnailResponse(m_connection.load(), id, requestedSize);
+  return new ThumbnailResponse(m_connection.loadRelaxed(), id, requestedSize);
 }