diff --git a/src/app/qml/UnlockSSSSDialog.qml b/src/app/qml/UnlockSSSSDialog.qml
index e8b2b0908..891d2a269 100644
--- a/src/app/qml/UnlockSSSSDialog.qml
+++ b/src/app/qml/UnlockSSSSDialog.qml
@@ -5,6 +5,7 @@ import QtQuick
 
 import org.kde.kirigami as Kirigami
 import org.kde.kirigamiaddons.formcard as FormCard
+import io.github.quotient_im.libquotient
 
 import org.kde.neochat
 
diff --git a/src/app/qml/VerificationCanceled.qml b/src/app/qml/VerificationCanceled.qml
index 0b22e37e8..e823b0baa 100644
--- a/src/app/qml/VerificationCanceled.qml
+++ b/src/app/qml/VerificationCanceled.qml
@@ -5,6 +5,7 @@ import QtQuick
 import QtQml
 
 import org.kde.neochat
+import io.github.quotient_im.libquotient
 
 VerificationMessage {
     id: root
diff --git a/src/messagecontent/CMakeLists.txt b/src/messagecontent/CMakeLists.txt
index ebb56633c..76f05b0ac 100644
--- a/src/messagecontent/CMakeLists.txt
+++ b/src/messagecontent/CMakeLists.txt
@@ -43,6 +43,7 @@ ecm_add_qml_module(MessageContent GENERATE_PLUGIN_SOURCE
         ThreadBodyComponent.qml
         VideoComponent.qml
     SOURCES
+        messageattached.cpp
         contentprovider.cpp
         mediasizehelper.cpp
         pollhandler.cpp
@@ -53,6 +54,7 @@ ecm_add_qml_module(MessageContent GENERATE_PLUGIN_SOURCE
         models/reactionmodel.cpp
         models/threadmodel.cpp
         models/eventmessagecontentmodel.cpp
+        models/messagecontentfiltermodel.cpp
     RESOURCES
         images/bike.svg
         images/bus.svg
@@ -81,6 +83,9 @@ ecm_add_qml_module(MessageContent GENERATE_PLUGIN_SOURCE
         images/walk.svg
     DEPENDENCIES
         QtQuick
+    IMPORTS
+        org.kde.neochat.libneochat
+        io.github.quotient_im.libquotient
 )
 
 configure_file(config-neochat.h.in ${CMAKE_CURRENT_BINARY_DIR}/config-neochat.h)
diff --git a/src/timeline/messageattached.cpp b/src/messagecontent/messageattached.cpp
similarity index 100%
rename from src/timeline/messageattached.cpp
rename to src/messagecontent/messageattached.cpp
diff --git a/src/timeline/messageattached.h b/src/messagecontent/messageattached.h
similarity index 100%
rename from src/timeline/messageattached.h
rename to src/messagecontent/messageattached.h
diff --git a/src/timeline/models/messagecontentfiltermodel.cpp b/src/messagecontent/models/messagecontentfiltermodel.cpp
similarity index 100%
rename from src/timeline/models/messagecontentfiltermodel.cpp
rename to src/messagecontent/models/messagecontentfiltermodel.cpp
diff --git a/src/timeline/models/messagecontentfiltermodel.h b/src/messagecontent/models/messagecontentfiltermodel.h
similarity index 100%
rename from src/timeline/models/messagecontentfiltermodel.h
rename to src/messagecontent/models/messagecontentfiltermodel.h
diff --git a/src/timeline/CMakeLists.txt b/src/timeline/CMakeLists.txt
index beaf084b0..5f95514ce 100644
--- a/src/timeline/CMakeLists.txt
+++ b/src/timeline/CMakeLists.txt
@@ -23,12 +23,10 @@ ecm_add_qml_module(Timeline GENERATE_PLUGIN_SOURCE
         TypingPane.qml
         DelegateContextMenu.qml
     SOURCES
-        messageattached.cpp
         messagedelegate.cpp
         timelinedelegate.cpp
         enums/delegatetype.h
         models/mediamessagefiltermodel.cpp
-        models/messagecontentfiltermodel.cpp
         models/messagefiltermodel.cpp
         models/messagemodel.cpp
         models/pinnedmessagemodel.cpp
@@ -39,6 +37,8 @@ ecm_add_qml_module(Timeline GENERATE_PLUGIN_SOURCE
         models/webshortcutmodel.cpp
     DEPENDENCIES
         QtQuick
+        org.kde.neochat.libneochat
+        io.github.quotient_im.libquotient
 )
 
 target_include_directories(Timeline PRIVATE ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/enums ${CMAKE_CURRENT_SOURCE_DIR}/models)
diff --git a/src/timeline/MessageDelegate.qml b/src/timeline/MessageDelegate.qml
index 046102e01..2e3220944 100644
--- a/src/timeline/MessageDelegate.qml
+++ b/src/timeline/MessageDelegate.qml
@@ -1,16 +1,15 @@
 // SPDX-FileCopyrightText: 2020 Black Hat <bhat@encom.eu.org>
 // SPDX-License-Identifier: GPL-3.0-only
 
+pragma ComponentBehavior: Bound
+
 import QtQuick
 import QtQuick.Controls as QQC2
-import QtQuick.Layouts
-import Qt.labs.qmlmodels
 
 import org.kde.kirigami as Kirigami
 import org.kde.kirigamiaddons.components as KirigamiComponents
 
 import org.kde.neochat
-import org.kde.neochat.libneochat as LibNeoChat
 
 /**
  * @brief The base delegate for all messages in the timeline.