diff --git a/resources/qml/MessageView.qml b/resources/qml/MessageView.qml
index b0498c4e..09dc4e36 100644
--- a/resources/qml/MessageView.qml
+++ b/resources/qml/MessageView.qml
@@ -13,7 +13,6 @@ ListView {
 
     Layout.fillWidth: true
     Layout.fillHeight: true
-    cacheBuffer: 400
     model: TimelineManager.timeline
     boundsBehavior: Flickable.StopAtBounds
     pixelAligned: true
diff --git a/src/timeline/DelegateChooser.cpp b/src/timeline/DelegateChooser.cpp
index 1f5fae7e..8598fa77 100644
--- a/src/timeline/DelegateChooser.cpp
+++ b/src/timeline/DelegateChooser.cpp
@@ -123,10 +123,6 @@ DelegateChooser::DelegateIncubator::statusChanged(QQmlIncubator::Status status)
                 }
 
                 chooser.child_->setParentItem(&chooser);
-                connect(chooser.child_, &QQuickItem::heightChanged, &chooser, [this]() {
-                        chooser.setHeight(chooser.child_->height());
-                });
-                chooser.setHeight(chooser.child_->height());
                 QQmlEngine::setObjectOwnership(chooser.child_,
                                                QQmlEngine::ObjectOwnership::JavaScriptOwnership);
                 emit chooser.childChanged();