2 files changed, 4 insertions, 1 deletions
diff --git a/src/main.cpp b/src/main.cpp
index 3984f4ba..25191968 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -21,7 +21,6 @@
 #include <QTranslator>
 
 #include "ChatPage.h"
-#include "Config.h"
 #include "Logging.h"
 #include "MainWindow.h"
 #include "MatrixClient.h"
diff --git a/src/timeline/EventDelegateChooser.cpp b/src/timeline/EventDelegateChooser.cpp
index 19a5357a..2b143b0f 100644
--- a/src/timeline/EventDelegateChooser.cpp
+++ b/src/timeline/EventDelegateChooser.cpp
@@ -303,6 +303,8 @@ EventDelegateChooser::updatePolish()
 
     auto layoutItem = [this](QQuickItem *item, int inset) {
         if (item) {
+            QObject::disconnect(item, &QQuickItem::implicitWidthChanged, this, &QQuickItem::polish);
+
             auto attached = qobject_cast<EventDelegateChooserAttachedType *>(
               qmlAttachedPropertiesObject<EventDelegateChooser>(item));
             Q_ASSERT(attached != nullptr);
@@ -336,6 +338,8 @@ EventDelegateChooser::updatePolish()
 
             item->setWidth(width);
             item->ensurePolished();
+
+            QObject::connect(item, &QQuickItem::implicitWidthChanged, this, &QQuickItem::polish);
         }
     };