Add Prison dependency to QML modules so Prison is deployed on Windows

Otherwise we get an error because the DLL isn't found.
GIT_SILENT Sync po/docbooks with svn
2025-06-01 04:03:25 +02:00 · 2025-06-01 01:44:08 +00:00 · 2025-05-30 14:43:10 +02:00 · 2025-05-30 01:42:16 +00:00 · 2025-05-29 07:39:13 -04:00 · 2025-05-29 06:04:11 -04:00
455 changed files with 182396 additions and 159756 deletions
--- a/.flatpak-manifest.json
+++ b/.flatpak-manifest.json
@@ -170,6 +170,24 @@
                }
            ]
        },
+        {
+            "name": "kunifiedpush",
+            "buildsystem": "cmake-ninja",
+            "builddir": true,
+            "sources": [
+                {
+                    "type": "archive",
+                    "url": "https://download.kde.org/stable/kunifiedpush/kunifiedpush-1.0.0.tar.xz",
+                    "sha256": "2ddeba21306d0307114ec50a2c38159ec62359f9fc6cdd58da30a369fbd550cf",
+                    "x-checker-data": {
+                        "type": "anitya",
+                        "project-id": 375055,
+                        "stable-only": true,
+                        "url-template": "https://download.kde.org/stable/kunifiedpush/kunifiedpush-$version.tar.xz"
+                    }
+                }
+            ]
+        },
        {
            "name": "neochat",
            "buildsystem": "cmake-ninja",
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -10,9 +10,9 @@ include:
      - /gitlab-templates/yaml-lint.yml
      - /gitlab-templates/android-qt6.yml
      - /gitlab-templates/linux-qt6.yml
-      # - /gitlab-templates/linux-qt6-next.yml
+      - /gitlab-templates/linux-qt6-next.yml
      - /gitlab-templates/windows-qt6.yml
-      # - /gitlab-templates/freebsd-qt6.yml
+      - /gitlab-templates/freebsd-qt6.yml
      - /gitlab-templates/flatpak.yml
      - /gitlab-templates/snap-snapcraft-lxd.yml
      - /gitlab-templates/craft-android-qt6-apks.yml
--- a/.kde-ci.yml
+++ b/.kde-ci.yml
@@ -34,6 +34,7 @@ Dependencies:
    'require':
      'frameworks/kdbusaddons': '@latest-kf6'
      'frameworks/purpose': '@latest-kf6'
+      'libraries/kunifiedpush': '@latest-kf6'

  - 'on': ['Linux']
    'require':
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,13 +8,13 @@ cmake_minimum_required(VERSION 3.16)

 # KDE Applications version, managed by release script.
 set(RELEASE_SERVICE_VERSION_MAJOR "25")
-set(RELEASE_SERVICE_VERSION_MINOR "04")
-set(RELEASE_SERVICE_VERSION_MICRO "2")
+set(RELEASE_SERVICE_VERSION_MINOR "07")
+set(RELEASE_SERVICE_VERSION_MICRO "70")
 set(RELEASE_SERVICE_VERSION "${RELEASE_SERVICE_VERSION_MAJOR}.${RELEASE_SERVICE_VERSION_MINOR}.${RELEASE_SERVICE_VERSION_MICRO}")

 project(NeoChat VERSION ${RELEASE_SERVICE_VERSION})

-set(KF_MIN_VERSION "6.6")
+set(KF_MIN_VERSION "6.12")
 set(QT_MIN_VERSION "6.5")

 find_package(ECM ${KF_MIN_VERSION} REQUIRED NO_MODULE)
@@ -56,7 +56,7 @@ ecm_setup_version(${PROJECT_VERSION}
    VERSION_HEADER ${CMAKE_CURRENT_BINARY_DIR}/neochat-version.h
 )

-find_package(Qt6 ${QT_MIN_VERSION} NO_MODULE COMPONENTS Core Quick Gui QuickControls2 Multimedia Svg WebView)
+find_package(Qt6 ${QT_MIN_VERSION} NO_MODULE COMPONENTS Core Quick Gui QuickControls2 Multimedia Svg TextToSpeech WebView)
 set_package_properties(Qt6 PROPERTIES
    TYPE REQUIRED
    PURPOSE "Basic application components"
@@ -75,7 +75,7 @@ set_package_properties(KF6Kirigami PROPERTIES
    TYPE REQUIRED
    PURPOSE "Kirigami application UI framework"
 )
-find_package(KF6KirigamiAddons 0.7.2 REQUIRED)
+find_package(KF6KirigamiAddons 1.6.0 REQUIRED)

 if (UNIX AND NOT APPLE AND NOT ANDROID AND NOT NEOCHAT_FLATPAK AND NOT NEOCHAT_APPIMAGE)
    find_package(KF6 ${KF_MIN_VERSION} REQUIRED COMPONENTS Purpose)
@@ -107,7 +107,7 @@ if (NOT ANDROID AND NOT WIN32 AND NOT APPLE AND NOT HAIKU)
    find_package(KF6DBusAddons ${KF_MIN_VERSION} REQUIRED)
 endif()

-find_package(QuotientQt6 0.9)
+find_package(QuotientQt6 0.9.1)
 set_package_properties(QuotientQt6 PROPERTIES
    TYPE REQUIRED
    DESCRIPTION "Qt wrapper around Matrix API"
@@ -147,16 +147,24 @@ set_package_properties(KF6DocTools PROPERTIES DESCRIPTION
    TYPE OPTIONAL
 )

-find_package(KUnifiedPush QUIET)
-set_package_properties(KUnifiedPush PROPERTIES
-    TYPE OPTIONAL
-    PURPOSE "Push notification support"
-    URL "https://invent.kde.org/libraries/kunifiedpush"
-)
+option(WITH_UNIFIEDPUSH "Build with KUnifiedPush support" ON)
+
+if (ANDROID OR APPLE OR WIN32 OR HAIKU)
+    set(WITH_UNIFIEDPUSH OFF)
+endif()
+
+if (WITH_UNIFIEDPUSH)
+    find_package(KUnifiedPush)
+    set_package_properties(KUnifiedPush PROPERTIES
+        TYPE REQUIRED
+        PURPOSE "Push notification support"
+        URL "https://invent.kde.org/libraries/kunifiedpush"
+    )
+endif()

 if(ANDROID)
    find_package(Sqlite3)
-    configure_file(${CMAKE_CURRENT_SOURCE_DIR}/android/version.gradle.in ${CMAKE_BINARY_DIR}/version.gradle)
+    set(BUILD_TESTING FALSE)
 endif()

 ki18n_install(po)
@@ -171,9 +179,9 @@ add_definitions(-DQT_NO_FOREACH)
 add_subdirectory(src)

 if (BUILD_TESTING)
-    find_package(Qt6 ${QT_MIN_VERSION} NO_MODULE COMPONENTS Test)
+    find_package(Qt6 ${QT_MIN_VERSION} NO_MODULE COMPONENTS Test HttpServer)
    add_subdirectory(autotests)
-    add_subdirectory(appiumtests)
+    # add_subdirectory(appiumtests)
    if (NOT ANDROID)
        add_subdirectory(memorytests)
    endif()
@@ -184,7 +192,7 @@ if(KF6DocTools_FOUND)
    add_subdirectory(doc)
 endif()

-feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES)
+feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)

 if (NOT ANDROID)
    file(GLOB_RECURSE ALL_CLANG_FORMAT_SOURCE_FILES src/*.cpp src/*.h)
--- a/REUSE.toml
+++ b/REUSE.toml
@@ -42,13 +42,13 @@ SPDX-FileCopyrightText = "2021 Carl Schwan <carlschwan@kde.org>"
 SPDX-License-Identifier = "BSD-2-Clause"

 [[annotations]]
-path = "src/neochatconfig.kcfg"
+path = "src/app/neochatconfig.kcfg"
 precedence = "aggregate"
 SPDX-FileCopyrightText = "2020-2021 Carl Schwan <carlschwan@kde.org>, Tobias Fella <tobias.fella@kde.org>"
 SPDX-License-Identifier = "BSD-2-Clause"

 [[annotations]]
-path = "src/neochat.notifyrc"
+path = "src/app/neochat.notifyrc"
 precedence = "aggregate"
 SPDX-FileCopyrightText = "2020 Tobias Fella <tobias.fella@kde.org>"
 SPDX-License-Identifier = "BSD-2-Clause"
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -23,8 +23,7 @@ repositories {


 apply plugin: 'com.android.application'
-apply from: '../version.gradle'
-def timestamp = (int)(new Date().getTime()/1000)
+apply from: '../ecm-version.gradle'

 dependencies {
    implementation fileTree(dir: 'libs', include: ['*.jar', '*.aar'])
@@ -79,9 +78,9 @@ android {
        targetSdkVersion qtTargetSdkVersion
        applicationId "org.kde.neochat"
        namespace "org.kde.neochat"
-        versionCode timestamp
-        versionName projectVersionFull
-        manifestPlaceholders = [versionName: projectVersionFull, versionCode: timestamp]
+        versionCode ecmVersionCode
+        versionName ecmVersionName
+        manifestPlaceholders = [versionName: ecmVersionName, versionCode: ecmVersionCode]
    }

    packagingOptions {
--- a/android/version.gradle.in
+++ b/android/version.gradle.in
@@ -1,6 +0,0 @@
-// SPDX-FileCopyrightText: 2021 Volker Krause <vkrause@kde.org>
-// SPDX-License-Identifier: BSD-3-Clause
-
-ext {
-    projectVersionFull = "@NEOCHAT_VERSION@"
-}
--- a/autotests/CMakeLists.txt
+++ b/autotests/CMakeLists.txt
@@ -3,6 +3,10 @@

 enable_testing()

+add_library(neochat_server STATIC server.cpp)
+
+target_link_libraries(neochat_server PUBLIC Qt::HttpServer QuotientQt6)
+
 add_definitions(-DDATA_DIR="${CMAKE_CURRENT_SOURCE_DIR}/data" )

 ecm_add_test(
@@ -11,13 +15,11 @@ ecm_add_test(
    TEST_NAME neochatroomtest
 )

-if (NOT $ENV{KDE_CI})
-    ecm_add_test(
-        texthandlertest.cpp
-        LINK_LIBRARIES neochat Qt::Test
-        TEST_NAME texthandlertest
-    )
-endif()
+ecm_add_test(
+    texthandlertest.cpp
+    LINK_LIBRARIES neochat Qt::Test
+    TEST_NAME texthandlertest
+)

 ecm_add_test(
    delegatesizehelpertest.cpp
@@ -87,6 +89,6 @@ ecm_add_test(

 ecm_add_test(
    actionstest.cpp
-    LINK_LIBRARIES neochat Qt::Test
+    LINK_LIBRARIES neochat Qt::Test neochat_server
    TEST_NAME actionstest
 )
--- a/autotests/actionstest.cpp
+++ b/autotests/actionstest.cpp
@@ -6,9 +6,11 @@
 #include <QSignalSpy>
 #include <QVariantList>

+#include "accountmanager.h"
 #include "chatbarcache.h"
 #include "models/actionsmodel.h"

+#include "server.h"
 #include "testutils.h"

 using namespace Quotient;
@@ -21,10 +23,12 @@ class ActionsTest : public QObject

 private:
    Connection *connection = nullptr;
-    TestUtils::TestRoom *room = nullptr;
+    NeoChatRoom *room = nullptr;

    void expectMessage(const QString &actionName, const QString &args, MessageType::Type type, const QString &message);

+    Server server;
+
 private Q_SLOTS:
    void initTestCase();
    void testActions();
@@ -34,8 +38,23 @@ private Q_SLOTS:

 void ActionsTest::initTestCase()
 {
-    connection = Connection::makeMockConnection(QStringLiteral("@bob:kde.org"));
-    room = new TestUtils::TestRoom(connection, QStringLiteral("#myroom:kde.org"), QLatin1String("test-min-sync.json"));
+    Connection::setRoomType<NeoChatRoom>();
+    server.start();
+    KLocalizedString::setApplicationDomain(QByteArrayLiteral("neochat"));
+    auto accountManager = new AccountManager(true);
+    QSignalSpy spy(accountManager, &AccountManager::connectionAdded);
+    connection = accountManager->accounts()->front();
+    auto roomId = server.createRoom(u"@user:localhost:1234"_s);
+    server.inviteUser(roomId, u"@invited:example.com"_s);
+    server.banUser(roomId, u"@banned:example.com"_s);
+    server.joinUser(roomId, u"@example:example.com"_s);
+
+    QSignalSpy syncSpy(connection, &Connection::syncDone);
+    // We need to wait for two syncs, as the next one won't have the changes yet
+    QVERIFY(syncSpy.wait());
+    QVERIFY(syncSpy.wait());
+    room = dynamic_cast<NeoChatRoom *>(connection->room(roomId));
+    QVERIFY(room);
 }

 void ActionsTest::testActions_data()
@@ -90,7 +109,7 @@ static ActionsModel::Action findAction(const QString &name)
 void ActionsTest::expectMessage(const QString &actionName, const QString &args, MessageType::Type type, const QString &message)
 {
    auto action = findAction(actionName);
-    QSignalSpy spy(room, &TestUtils::TestRoom::showMessage);
+    QSignalSpy spy(room, &NeoChatRoom::showMessage);
    auto result = action.handle(args, room, nullptr);
    auto expected = QVariantList {type, message};
    auto signal = spy.takeFirst();
@@ -106,14 +125,26 @@ void ActionsTest::testInvite()
    QCOMPARE(room->memberState(u"@banned:example.com"_s), Membership::Ban);
    expectMessage(u"invite"_s, connection->userId(), MessageType::Positive, u"You are already in this room."_s);
    QCOMPARE(room->memberState(connection->userId()), Membership::Join);
-    expectMessage(u"invite"_s, u"@example:example.org"_s, MessageType::Information, u"@example:example.org is already in this room."_s);
-    QCOMPARE(room->memberState(u"@example:example.org"_s), Membership::Join);
+    expectMessage(u"invite"_s, u"@example:example.com"_s, MessageType::Information, u"@example:example.com is already in this room."_s);
+    QCOMPARE(room->memberState(u"@example:example.com"_s), Membership::Join);

    QCOMPARE(room->memberState(u"@user:example.com"_s), Membership::Leave);
    expectMessage(u"invite"_s, u"@user:example.com"_s, MessageType::Positive, u"@user:example.com was invited into this room."_s);

-    //TODO mock server, wait for invite state to change
-    //TODO QCOMPARE(room->memberState(u"@user:example.com"_s), Membership::Invite);
+    QSignalSpy spy(room, &NeoChatRoom::changed);
+    QVERIFY(spy.wait());
+
+    auto tries = 0;
+
+    while (room->memberState(u"@user:example.com"_s) != Membership::Invite) {
+        QVERIFY(spy.wait());
+        tries += 1;
+        if (tries > 3) {
+            QVERIFY(false);
+        }
+    }
+
+    QCOMPARE(room->memberState(u"@user:example.com"_s), Membership::Invite);
 }

 QTEST_MAIN(ActionsTest)
--- a/autotests/data/localhost.crt
+++ b/autotests/data/localhost.crt
@@ -0,0 +1,20 @@
+-----BEGIN CERTIFICATE-----
+MIIDNTCCAh2gAwIBAgIUXbyWfTfcvVLrVB1qx36pW/7IkwMwDQYJKoZIhvcNAQEL
+BQAwQjELMAkGA1UEBhMCWFgxFTATBgNVBAcMDERlZmF1bHQgQ2l0eTEcMBoGA1UE
+CgwTRGVmYXVsdCBDb21wYW55IEx0ZDAgFw0yNDEyMjQxNTAxMDNaGA8yNTcyMDcy
+NDE1MDEwM1owQjELMAkGA1UEBhMCWFgxFTATBgNVBAcMDERlZmF1bHQgQ2l0eTEc
+MBoGA1UECgwTRGVmYXVsdCBDb21wYW55IEx0ZDCCASIwDQYJKoZIhvcNAQEBBQAD
+ggEPADCCAQoCggEBAKlxZ540TQ1uUDAR7ZJ9ue0PzcD2dPmblIIddyekvZS59V7X
+drhamclXpHE2EelR87Sexst0BaHH/jmrHwxCtwbeXHZ8ueJHkGHJ5DLZCCiwfG+Q
+gml7wlSXxXz37vie2tdlZh2yJSM8yvLAYceHb2zOskaGvul7ZITIS0JrPc3o6VZk
+MYGkYtA2JfUsv3jH4oQbxOf7RXqhWNAXbB+3hlwRBwMIdyoBNK6YS9QSrTeS9jj
+UqgO5QmaQZOVvpaPf1Y/rHHLd2Qa6+a/cCJ1sr2biagb75AihpQFsK/oy6D1PP70
+zTe7hPWn/efEpmtCV7CQ8ti4cRu0Kjy0T8grtCsCAwEAAaMhMB8wHQYDVR0OBBYE
+FIFlylzwADNLfgTDNkhFeFelaEDxMA0GCSqGSIb3DQEBCwUAA4IBAQBQ2rw4GLIU
+v+GY7Qru9LttkrQPd2bZXKxDMd/jT+wjmMVtqS4MAsCuDYwaYLjU1aWyqy0mN+lY
+A17kD0VjBNBy45sYqkZveY0ks8mCScBemtrIDmjz2tiueecBIEASwEPBOZgv5/MV
+cz864FiChF+2r8Zl8bhycGy9DEpRjzYKvIQWSDHQ3zpuh3iBnjfoieLHWX2kKCpk
+ouS3V6485rHNCWsZT5IcCwfBFQkOuWRJpIazpz4AfwZh1TK9+bgiKA5EyZjSNrKw
+xGQSpMSTRQMB0/FOCL/AixhN9unVFUViqUcdtSfoHE1VyBHv9kDT/cYms/Xl4B0t
+/ZSQJ/D/Km1+
+-----END CERTIFICATE-----
--- a/autotests/data/localhost.key
+++ b/autotests/data/localhost.key
@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCpcWeeNE0NblAw
+Ee2SfbntD83A9nT5m5SCHXcnpL2UufVe13a4WpnJV6RxNhHpUfO0nsbLdAWhx/45
+qx8MQrcG3lx2fLniR5BhyeQy2QgosHxvkIJpe8JUl8V89+74ntrXZWYdsiUjPMry
+wGHHh29szrJGhr7pe2SEyEtCaz3N6OlWZPjGBpGLQNiX1LL94x+KEG8Tn+0V6oVj
+QF2wft4ZcEQcDCHcqATSumEvUEq03kvY41KoDuUJmkGTlb6Wj39WP6xxy3dkGuvm
+v3AidbK9m4moG++QIoaUBbCv6Mug9Tz+9M03u4T1p/3nxKZrQlewkPLYuHEbtCo8
+tE/IK7QrAgMBAAECggEAH9qmeKrra2F4KLlOGNKS//qPGz4Z+ozhi95/NpA1Zb7Z
+3pUSCBFcROo5i2D3WA4kiymoRLpQjrv60puVcCggoWVvK4VCKsR6Y6/hOx/q9T9M
+fWrE4ZC3FVEc+uPfZJT0nja9TkrdyXSV0LITD8Ap1eI7yJ9vR5R/bqj64QcpLMrU
+QeoQIy1oTMR+qdjj33duyRwBZU3Yf8FRB2iW6OILZ8hzFo1jngec7dph9a1RK4e0
+mEPdc9ywsKlDM7P0Y7zdmjar5XtQn87GiwNhz23f1fzCC2axLtOW0Xm4e4Qumehb
+WrIi6Vfq8IWMglU7QrBJ7iR0Ls+XoKA5GxomV2IJZQKBgQDoIkOl5YGPQ3iGR+WK
+e5/2Ml4G/uURzYiOlzSsyfoPXyO4EI2BJd5HkH+EvfgRx4xKkxUZRJdzR7llYPl8
+BFYcFitvhO8SbD0mNAB5YW7f+3v1pgEN2umzoKd389Zx5WqTZ7YB1VG5RN/Q1JJL
+2JM0Xgamq2vNtx3roRPxDBeW7QKBgQC63R/bmACJbgIzfaVBX4Zie3NQG0/Hf+gF
+LnBwUmQDZOR7MY+kSiIUVMn3NuZRiCSCFBVwApruyK8r535JCibTVm5PWjvhFddY
+LgaPOCKGlm9TLScjoH1pErYgG3uJ4nXeRfXhg4mco6EkrC7RzQywrd0VDoqpuc1Y
+EKfEsYk8dwKBgE+mSh3nNOBKX1V73+f3aTiZqaeu2DyWkG+UtE9BclrJ40Cp9VPG
+AZH+o7KRWEgJdzqzYv7riSfWCWgesRv7hOxYMwktzLY+i3DLUQpVAy05ZhwwnJX7
+ckrfKfc/pGoqNLplUI8qecMfPciy14vMwR2r0Y5orTHFzi9mcqg35PQ1AoGAW2LX
+OLq+0HdHhk0Va8I+450CSRQCUUvhed87SANTPEG0Z/dWC3/h6NWKrGdh/k+5oxAV
+Z+EuSkdFPBCLt0bKtCKZ8h7sF+lplotz08kdQXsC2MfFU2wiySdIgK1QHp/tCxZl
+6LM+sqdnoJrAjwRcB3AQJkMlV1ox7ba/hbdZqYMCgYBS6+JUXSSASpm5ZHd32a8m
+xwryEZ7H6Hek6lvMHdxmwoKat5dCavxw64nrtyeeGZpg1W3zLLyamF9x/8kMyr6y
+KKvtBfJ5sCvAbt80o9Pbs6R3yDB3AKiD3s3PQK7lol1nhE/8IbsF2r8JEQVcYd/k
+oBzkl7MrMyLhhaCqSxwqQQ==
+-----END PRIVATE KEY-----
--- a/autotests/data/test-pollhandlerstart-sync.json
+++ b/autotests/data/test-pollhandlerstart-sync.json
@@ -8,14 +8,14 @@
                "answers": [
                    {
                        "id": "option1",
-                        "org.matrix.msc1767.text": "option1"
+                        "org.matrix.msc1767.text": "option1text"
                    },
                    {
                        "id": "option2",
-                        "org.matrix.msc1767.text": "option2"
+                        "org.matrix.msc1767.text": "option2text"
                    }
                ],
-                "kind": "org.matrix.msc3381.poll.disclosed",
+                "kind": "org.matrix.msc3381.poll.undisclosed",
                "max_selections": 1,
                "question": {
                    "body": "test",
--- a/autotests/delegatesizehelpertest.cpp
+++ b/autotests/delegatesizehelpertest.cpp
@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL

 #include <QObject>
+#include <QQuickItem>
 #include <QTest>

 #include "delegatesizehelper.h"
@@ -30,7 +31,7 @@ void DelegateSizeHelperTest::risingPercentage_data()
    QTest::addColumn<int>("currentPercentageWidth");
    QTest::addColumn<qreal>("currentWidth");

-    QTest::newRow("zero") << qreal(0) << int(0) << qreal(0);
+    QTest::newRow("zero") << qreal(0) << int(100) << qreal(0);
    QTest::newRow("one hundred") << qreal(100) << int(0) << qreal(0);
    QTest::newRow("one fifty") << qreal(150) << int(50) << qreal(75);
    QTest::newRow("two hundred") << qreal(200) << int(100) << qreal(200);
@@ -43,16 +44,18 @@ void DelegateSizeHelperTest::risingPercentage()
    QFETCH(int, currentPercentageWidth);
    QFETCH(qreal, currentWidth);

+    auto item = QQuickItem();
+    item.setWidth(parentWidth);
+
    DelegateSizeHelper delegateSizeHelper;
+    delegateSizeHelper.setParentItem(&item);
    delegateSizeHelper.setStartBreakpoint(100);
    delegateSizeHelper.setEndBreakpoint(200);
    delegateSizeHelper.setStartPercentWidth(0);
    delegateSizeHelper.setEndPercentWidth(100);

-    delegateSizeHelper.setParentWidth(parentWidth);
-
-    QCOMPARE(delegateSizeHelper.currentPercentageWidth(), currentPercentageWidth);
-    QCOMPARE(delegateSizeHelper.currentWidth(), currentWidth);
+    QCOMPARE(delegateSizeHelper.availablePercentageWidth(), currentPercentageWidth);
+    QCOMPARE(delegateSizeHelper.availableWidth(), currentWidth);
 }

 void DelegateSizeHelperTest::fallingPercentage_data()
@@ -74,16 +77,18 @@ void DelegateSizeHelperTest::fallingPercentage()
    QFETCH(int, currentPercentageWidth);
    QFETCH(qreal, currentWidth);

+    auto item = QQuickItem();
+    item.setWidth(parentWidth);
+
    DelegateSizeHelper delegateSizeHelper;
+    delegateSizeHelper.setParentItem(&item);
    delegateSizeHelper.setStartBreakpoint(100);
    delegateSizeHelper.setEndBreakpoint(200);
    delegateSizeHelper.setStartPercentWidth(100);
    delegateSizeHelper.setEndPercentWidth(0);

-    delegateSizeHelper.setParentWidth(parentWidth);
-
-    QCOMPARE(delegateSizeHelper.currentPercentageWidth(), currentPercentageWidth);
-    QCOMPARE(delegateSizeHelper.currentWidth(), currentWidth);
+    QCOMPARE(delegateSizeHelper.availablePercentageWidth(), currentPercentageWidth);
+    QCOMPARE(delegateSizeHelper.availableWidth(), currentWidth);
 }

 void DelegateSizeHelperTest::equalPercentage_data()
@@ -105,16 +110,18 @@ void DelegateSizeHelperTest::equalPercentage()
    QFETCH(int, currentPercentageWidth);
    QFETCH(qreal, currentWidth);

+    auto item = QQuickItem();
+    item.setWidth(parentWidth);
+
    DelegateSizeHelper delegateSizeHelper;
+    delegateSizeHelper.setParentItem(&item);
    delegateSizeHelper.setStartBreakpoint(100);
    delegateSizeHelper.setEndBreakpoint(200);
    delegateSizeHelper.setStartPercentWidth(50);
    delegateSizeHelper.setEndPercentWidth(50);

-    delegateSizeHelper.setParentWidth(parentWidth);
-
-    QCOMPARE(delegateSizeHelper.currentPercentageWidth(), currentPercentageWidth);
-    QCOMPARE(delegateSizeHelper.currentWidth(), currentWidth);
+    QCOMPARE(delegateSizeHelper.availablePercentageWidth(), currentPercentageWidth);
+    QCOMPARE(delegateSizeHelper.availableWidth(), currentWidth);
 }

 void DelegateSizeHelperTest::equalBreakpoint_data()
@@ -124,9 +131,9 @@ void DelegateSizeHelperTest::equalBreakpoint_data()
    QTest::addColumn<int>("currentPercentageWidth");
    QTest::addColumn<qreal>("currentWidth");

-    QTest::newRow("start higher") << int(100) << int(0) << int(-1) << qreal(0);
+    QTest::newRow("start higher") << int(100) << int(0) << int(100) << qreal(1000);
    QTest::newRow("equal") << int(50) << int(50) << int(50) << qreal(500);
-    QTest::newRow("end higher") << int(0) << int(100) << int(-1) << qreal(0);
+    QTest::newRow("end higher") << int(0) << int(100) << int(100) << qreal(1000);
 }

 /**
@@ -140,16 +147,18 @@ void DelegateSizeHelperTest::equalBreakpoint()
    QFETCH(int, currentPercentageWidth);
    QFETCH(qreal, currentWidth);

+    auto item = QQuickItem();
+    item.setWidth(1000);
+
    DelegateSizeHelper delegateSizeHelper;
+    delegateSizeHelper.setParentItem(&item);
    delegateSizeHelper.setStartBreakpoint(100);
    delegateSizeHelper.setEndBreakpoint(100);
    delegateSizeHelper.setStartPercentWidth(startPercentageWidth);
    delegateSizeHelper.setEndPercentWidth(endPercentageWidth);

-    delegateSizeHelper.setParentWidth(1000);
-
-    QCOMPARE(delegateSizeHelper.currentPercentageWidth(), currentPercentageWidth);
-    QCOMPARE(delegateSizeHelper.currentWidth(), currentWidth);
+    QCOMPARE(delegateSizeHelper.availablePercentageWidth(), currentPercentageWidth);
+    QCOMPARE(delegateSizeHelper.availableWidth(), currentWidth);
 }

 QTEST_GUILESS_MAIN(DelegateSizeHelperTest)
--- a/autotests/mediasizehelpertest.cpp
+++ b/autotests/mediasizehelpertest.cpp
@@ -25,6 +25,7 @@ private Q_SLOTS:
 void MediaSizeHelperTest::uninitialized()
 {
    MediaSizeHelper mediasizehelper;
+    mediasizehelper.setMaxSize(540, 540);
    QCOMPARE(mediasizehelper.currentSize(), QSize(540, qRound(qreal(NeoChatConfig::self()->mediaMaxWidth()) / qreal(16.0) * qreal(9.0))));
 }

@@ -60,6 +61,7 @@ void MediaSizeHelperTest::limits()
    QFETCH(QSize, currentSize);

    MediaSizeHelper mediasizehelper;
+    mediasizehelper.setMaxSize(540, 540);
    mediasizehelper.setMediaWidth(mediaWidth);
    mediasizehelper.setMediaHeight(mediaHeight);
    mediasizehelper.setContentMaxWidth(contentMaxWidth);
--- a/autotests/messagecontentmodeltest.cpp
+++ b/autotests/messagecontentmodeltest.cpp
@@ -12,6 +12,7 @@

 #include "models/messagecontentmodel.h"

+#include "neochatconnection.h"
 #include "testutils.h"

 using namespace Quotient;
@@ -32,7 +33,7 @@ private Q_SLOTS:

 void MessageContentModelTest::initTestCase()
 {
-    connection = Connection::makeMockConnection(u"@bob:kde.org"_s);
+    connection = new NeoChatConnection;
 }

 void MessageContentModelTest::missingEvent()
--- a/autotests/pollhandlertest.cpp
+++ b/autotests/pollhandlertest.cpp
@@ -41,29 +41,32 @@ void PollHandlerTest::nullObject()
    auto pollHandler = PollHandler();

    QCOMPARE(pollHandler.hasEnded(), false);
-    QCOMPARE(pollHandler.answerCount(), 0);
+    QCOMPARE(pollHandler.numAnswers(), 0);
    QCOMPARE(pollHandler.question(), QString());
-    QCOMPARE(pollHandler.options(), QJsonArray());
-    QCOMPARE(pollHandler.answers(), QJsonObject());
-    QCOMPARE(pollHandler.counts(), QJsonObject());
-    QCOMPARE(pollHandler.kind(), QString());
+    QCOMPARE(pollHandler.kind(), PollKind::Disclosed);
 }

 void PollHandlerTest::poll()
 {
    auto startEvent = eventCast<const PollStartEvent>(room->messageEvents().at(0).get());
-    auto pollHandler = PollHandler(room, startEvent);
+    auto pollHandler = PollHandler(room, startEvent->id());

-    auto options = QJsonArray{QJsonObject{{"id"_L1, "option1"_L1}, {"org.matrix.msc1767.text"_L1, "option1"_L1}},
-                              QJsonObject{{"id"_L1, "option2"_L1}, {"org.matrix.msc1767.text"_L1, "option2"_L1}}};
+    QList<Quotient::EventContent::Answer> options = {EventContent::Answer{"option1"_L1, "option1"_L1}, EventContent::Answer{"option2"_L1, "option2"_L1}};

+    const auto answer0 = pollHandler.answerAtRow(0);
+    const auto answer1 = pollHandler.answerAtRow(1);
    QCOMPARE(pollHandler.hasEnded(), false);
-    QCOMPARE(pollHandler.answerCount(), 0);
+    QCOMPARE(pollHandler.numAnswers(), 2);
    QCOMPARE(pollHandler.question(), u"test"_s);
-    QCOMPARE(pollHandler.options(), options);
-    QCOMPARE(pollHandler.answers(), QJsonObject());
-    QCOMPARE(pollHandler.counts(), QJsonObject());
-    QCOMPARE(pollHandler.kind(), u"org.matrix.msc3381.poll.disclosed"_s);
+    QCOMPARE(answer0.id, "option1"_L1);
+    QCOMPARE(answer1.id, "option2"_L1);
+    QCOMPARE(answer0.text, "option1text"_L1);
+    QCOMPARE(answer1.text, "option2text"_L1);
+    QCOMPARE(pollHandler.answerCountAtId(answer0.id), 0);
+    QCOMPARE(pollHandler.answerCountAtId(answer1.id), 0);
+    QCOMPARE(pollHandler.checkMemberSelectedId(connection->userId(), answer0.id), false);
+    QCOMPARE(pollHandler.checkMemberSelectedId(connection->userId(), answer1.id), false);
+    QCOMPARE(pollHandler.kind(), PollKind::Undisclosed);
 }

 QTEST_GUILESS_MAIN(PollHandlerTest)
--- a/autotests/reactionmodeltest.cpp
+++ b/autotests/reactionmodeltest.cpp
@@ -9,6 +9,7 @@

 #include <Quotient/events/roommessageevent.h>

+#include "models/messagecontentmodel.h"
 #include "testutils.h"

 using namespace Quotient;
--- a/autotests/server.cpp
+++ b/autotests/server.cpp
@@ -0,0 +1,235 @@
+// SPDX-FileCopyrightText: 2025 Tobias Fella <tobias.fella@kde.org>
+// SPDX-License-Identifier: LGPL-2.0-or-later
+
+#include "server.h"
+
+#include <QFile>
+#include <QHttpServer>
+#include <QHttpServerResponder>
+#include <QJsonArray>
+#include <QJsonDocument>
+#include <QJsonObject>
+#include <QNetworkReply>
+#include <QSslCertificate>
+#include <QSslKey>
+#include <QSslServer>
+#include <QUuid>
+
+#include <Quotient/networkaccessmanager.h>
+
+using namespace Qt::Literals::StringLiterals;
+
+QString generateEventId()
+{
+    return u"$"_s + QString::fromLatin1(QCryptographicHash::hash(QUuid::createUuid().toString().toLatin1(), QCryptographicHash::Sha1).toBase64());
+}
+
+QString generateRoomId()
+{
+    return u"!%1:localhost:1234"_s
+        .arg(QString::fromLatin1(QCryptographicHash::hash(QUuid::createUuid().toString().toLatin1(), QCryptographicHash::Sha1).toBase64()))
+        .replace(u'/', QChar());
+}
+
+Server::Server()
+{
+}
+
+void Server::start()
+{
+    QObject::connect(Quotient::NetworkAccessManager::instance(),
+                     &QNetworkAccessManager::sslErrors,
+                     Quotient::NetworkAccessManager::instance(),
+                     [](QNetworkReply *reply) {
+                         reply->ignoreSslErrors();
+                     });
+    m_server.route(u"/.well-known/matrix/client"_s, QHttpServerRequest::Method::Get, [](QHttpServerResponder &responder) {
+        responder.write(QJsonDocument(QJsonObject{
+                            {u"m.homeserver"_s, QJsonObject{{u"base_url"_s, u"https://localhost:1234"_s}}},
+                        }),
+                        QHttpServerResponder::StatusCode::Ok);
+    });
+    m_server.route(u"/_matrix/client/versions"_s, QHttpServerRequest::Method::Get, [](QHttpServerResponder &responder) {
+        responder.write(QJsonDocument(QJsonObject{
+                            {u"versions"_s,
+                             QJsonArray{
+                                 u"v1.0"_s,
+                                 u"v1.1"_s,
+                                 u"v1.2"_s,
+                                 u"v1.3"_s,
+                                 u"v1.4"_s,
+                                 u"v1.5"_s,
+                                 u"v1.6"_s,
+                                 u"v1.7"_s,
+                                 u"v1.8"_s,
+                                 u"v1.9"_s,
+                                 u"v1.10"_s,
+                                 u"v1.11"_s,
+                                 u"v1.12"_s,
+                                 u"v1.13"_s,
+                             }},
+                        }),
+                        QHttpServerResponder::StatusCode::Ok);
+    });
+    m_server.route(u"/_matrix/client/v3/capabilities"_s, QHttpServerRequest::Method::Get, [](QHttpServerResponder &responder) {
+        responder.write(
+            QJsonDocument(QJsonObject{{u"capabilities"_s,
+                                       QJsonObject{
+                                           {u"m.room_versions"_s, QJsonObject{{u"m.available"_s, QJsonObject{{u"1"_s, u"stable"_s}}}, {u"default"_s, u"1"_s}}},
+                                       }}}),
+            QHttpServerResponder::StatusCode::Ok);
+    });
+    m_server.route(u"/_matrix/client/v3/account/whoami"_s, QHttpServerRequest::Method::Get, [](QHttpServerResponder &responder) {
+        responder.write(QJsonDocument(QJsonObject{
+                            {u"device_id"_s, u"device_id_1234"_s},
+                            {u"user_id"_s, u"@user:localhost:1234"_s},
+                        }),
+                        QHttpServerResponder::StatusCode::Ok);
+    });
+
+    m_server.route(u"/_matrix/client/v3/login"_s, QHttpServerRequest::Method::Post, [](QHttpServerResponder &responder) {
+        // TODO
+        // if data["identifier"]["user"] != "user" or data["password"] != "1234":
+        //     abort(403)
+        responder.write(QJsonDocument(QJsonObject{
+                            {u"access_token"_s, u"token_login"_s},
+                            {u"device_id"_s, u"device_1234"_s},
+                            {u"user_id"_s, u"@user:localhost:1234"_s},
+                        }),
+                        QHttpServerResponder::StatusCode::Ok);
+    });
+
+    m_server.route(u"/_matrix/client/v3/login"_s, QHttpServerRequest::Method::Get, [](QHttpServerResponder &responder) {
+        responder.write(QJsonDocument(QJsonObject{
+                            {u"flows"_s, QJsonArray{QJsonObject{{u"type"_s, u"m.login.password"_s}}}},
+                        }),
+                        QHttpServerResponder::StatusCode::Ok);
+    });
+
+    m_server.route(u"/_matrix/client/v3/rooms/<arg>/invite"_s,
+                   QHttpServerRequest::Method::Post,
+                   [this](const QString &roomId, QHttpServerResponder &responder, const QHttpServerRequest &request) {
+                       m_invitedUsers[roomId] += QJsonDocument::fromJson(request.body()).object()[u"user_id"_s].toString();
+                       responder.write(QJsonDocument(QJsonObject{}), QHttpServerResponder::StatusCode::Ok);
+                   });
+
+    m_server.route(u"/_matrix/client/r0/sync"_s, QHttpServerRequest::Method::Get, [this](QHttpServerResponder &responder) {
+        QMap<QString, QJsonArray> stateEvents;
+
+        for (const auto &[roomId, matrixId] : m_roomsToCreate) {
+            stateEvents[roomId] += QJsonObject{
+                {u"content"_s, QJsonObject{{u"room_version"_s, u"11"_s}}},
+                {u"event_id"_s, generateEventId()},
+                {u"origin_server_ts"_s, QDateTime::currentMSecsSinceEpoch()},
+                {u"room_id"_s, roomId},
+                {u"sender"_s, matrixId},
+                {u"state_key"_s, QString()},
+                {u"type"_s, u"m.room.create"_s},
+                {u"unsigned"_s, QJsonObject{{u"age"_s, 1234}}},
+            };
+            stateEvents[roomId] += QJsonObject{
+                {u"content"_s, QJsonObject{{u"displayname"_s, u"User"_s}, {u"membership"_s, u"join"_s}}},
+                {u"event_id"_s, generateEventId()},
+                {u"origin_server_ts"_s, QDateTime::currentMSecsSinceEpoch()},
+                {u"room_id"_s, roomId},
+                {u"sender"_s, matrixId},
+                {u"state_key"_s, matrixId},
+                {u"type"_s, u"m.room.member"_s},
+                {u"unsigned"_s, QJsonObject{{u"age"_s, 1234}}},
+            };
+        }
+        m_roomsToCreate.clear();
+        for (const auto &roomId : m_invitedUsers.keys()) {
+            const auto &values = m_invitedUsers[roomId];
+            for (const auto &value : values) {
+                stateEvents[roomId] += QJsonObject{
+                    {u"content"_s, QJsonObject{{u"displayname"_s, u"User"_s}, {u"membership"_s, u"invite"_s}}},
+                    {u"event_id"_s, generateEventId()},
+                    {u"origin_server_ts"_s, QDateTime::currentMSecsSinceEpoch()},
+                    {u"room_id"_s, roomId},
+                    {u"sender"_s, u"@user:localhost:1234"_s},
+                    {u"state_key"_s, value},
+                    {u"type"_s, u"m.room.member"_s},
+                    {u"unsigned"_s, QJsonObject{{u"age"_s, 1234}}},
+                };
+            }
+        }
+        m_invitedUsers.clear();
+
+        for (const auto &roomId : m_bannedUsers.keys()) {
+            const auto &values = m_bannedUsers[roomId];
+            for (const auto &value : values) {
+                stateEvents[roomId] += QJsonObject{
+                    {u"content"_s, QJsonObject{{u"displayname"_s, u"User"_s}, {u"membership"_s, u"ban"_s}}},
+                    {u"event_id"_s, generateEventId()},
+                    {u"origin_server_ts"_s, QDateTime::currentMSecsSinceEpoch()},
+                    {u"room_id"_s, roomId},
+                    {u"sender"_s, u"@user:localhost:1234"_s},
+                    {u"state_key"_s, value},
+                    {u"type"_s, u"m.room.member"_s},
+                    {u"unsigned"_s, QJsonObject{{u"age"_s, 1234}}},
+                };
+            }
+        }
+        m_bannedUsers.clear();
+
+        for (const auto &roomId : m_joinedUsers.keys()) {
+            const auto &values = m_joinedUsers[roomId];
+            for (const auto &value : values) {
+                stateEvents[roomId] += QJsonObject{
+                    {u"content"_s, QJsonObject{{u"displayname"_s, u"User"_s}, {u"membership"_s, u"join"_s}}},
+                    {u"event_id"_s, generateEventId()},
+                    {u"origin_server_ts"_s, QDateTime::currentMSecsSinceEpoch()},
+                    {u"room_id"_s, roomId},
+                    {u"sender"_s, u"@user:localhost:1234"_s},
+                    {u"state_key"_s, value},
+                    {u"type"_s, u"m.room.member"_s},
+                    {u"unsigned"_s, QJsonObject{{u"age"_s, 1234}}},
+                };
+            }
+        }
+        m_joinedUsers.clear();
+
+        QJsonObject rooms;
+        for (const auto &roomId : stateEvents.keys()) {
+            rooms[roomId] = QJsonObject{{u"state"_s, QJsonObject{{u"events"_s, stateEvents[roomId]}}}};
+        }
+
+        responder.write(QJsonDocument(QJsonObject{{u"rooms"_s, QJsonObject{{u"join"_s, rooms}}}}), QHttpServerResponder::StatusCode::Ok);
+    });
+
+    QSslConfiguration config;
+    QFile key(QStringLiteral(DATA_DIR) + u"/localhost.key"_s);
+    key.open(QFile::ReadOnly);
+    config.setPrivateKey(QSslKey(&key, QSsl::Rsa));
+    config.setLocalCertificate(QSslCertificate::fromPath(QStringLiteral(DATA_DIR) + u"/localhost.crt"_s).front());
+    m_sslServer.setSslConfiguration(config);
+    if (!m_sslServer.listen(QHostAddress::LocalHost, 1234) || !m_server.bind(&m_sslServer)) {
+        qFatal() << "Server failed to listen on a port.";
+        return;
+    } else {
+        qWarning() << "Server listening";
+    }
+}
+
+QString Server::createRoom(const QString &matrixId)
+{
+    auto roomId = generateRoomId();
+    m_roomsToCreate += {roomId, matrixId};
+    return roomId;
+}
+
+void Server::inviteUser(const QString &roomId, const QString &matrixId)
+{
+    m_invitedUsers[roomId] += matrixId;
+}
+
+void Server::banUser(const QString &roomId, const QString &matrixId)
+{
+    m_bannedUsers[roomId] += matrixId;
+}
+
+void Server::joinUser(const QString &roomId, const QString &matrixId)
+{
+    m_joinedUsers[roomId] += matrixId;
+}
--- a/autotests/server.h
+++ b/autotests/server.h
@@ -0,0 +1,33 @@
+// SPDX-FileCopyrightText: 2025 Tobias Fella <tobias.fella@kde.org>
+// SPDX-License-Identifier: LGPL-2.0-or-later
+
+#include <QHttpServer>
+#include <QSslServer>
+
+class Server
+{
+public:
+    Server();
+
+    void start();
+
+    /**
+     * Create a room and place the user with id matrixId in it.
+     * Returns the room's id
+     */
+    QString createRoom(const QString &matrixId);
+
+    void inviteUser(const QString &roomId, const QString &matrixId);
+    void banUser(const QString &roomId, const QString &matrixId);
+    void joinUser(const QString &roomId, const QString &matrixId);
+
+private:
+    QHttpServer m_server;
+    QSslServer m_sslServer;
+
+    QHash<QString, QList<QString>> m_invitedUsers;
+    QHash<QString, QList<QString>> m_bannedUsers;
+    QHash<QString, QList<QString>> m_joinedUsers;
+
+    QList<std::pair<QString, QString>> m_roomsToCreate;
+};
--- a/autotests/texthandlertest.cpp
+++ b/autotests/texthandlertest.cpp
@@ -8,7 +8,8 @@

 #include <Quotient/quotient_common.h>
 #include <Quotient/syncdata.h>
-#include <qnamespace.h>
+
+#include <Kirigami/Platform/PlatformTheme>

 #include "enums/messagecomponenttype.h"
 #include "models/customemojimodel.h"
@@ -43,6 +44,8 @@ private Q_SLOTS:
    void sendCustomEmoji();
    void sendCustomEmojiCode_data();
    void sendCustomEmojiCode();
+    void sendCustomTags_data();
+    void sendCustomTags();

    void receiveSpacelessSelfClosingTag();
    void receiveStripReply();
@@ -249,6 +252,40 @@ void TextHandlerTest::sendCustomEmojiCode()
    QCOMPARE(testTextHandler.handleSendText(), testOutputString);
 }

+void TextHandlerTest::sendCustomTags_data()
+{
+    QTest::addColumn<QString>("testInputString");
+    QTest::addColumn<QString>("testOutputString");
+
+    // spoiler
+    QTest::newRow("incomplete spoiler") << u"||test"_s << u"||test"_s;
+    QTest::newRow("complete spoiler") << u"||test||"_s << u"<span data-mx-spoiler>test</span>"_s;
+    QTest::newRow("multiple spoiler") << u"||apple||banana||pear||"_s << u"<span data-mx-spoiler>apple</span>banana<span data-mx-spoiler>pear</span>"_s;
+    QTest::newRow("inside code block spoiler") << u"```||apple||```"_s << u"<code>||apple||</code>"_s;
+    QTest::newRow("outside code block spoiler") << u"||apple|| ```||banana||``` ||pear||"_s
+                                                << u"<span data-mx-spoiler>apple</span> <code>||banana||</code> <span data-mx-spoiler>pear</span>"_s;
+    QTest::newRow("complex spoiler") << u"Between `formFactor == Horizontal||Vertical` and `location == top||left||bottom||right`"_s
+                                     << u"Between <code>formFactor == Horizontal||Vertical</code> and <code>location == top||left||bottom||right</code>"_s;
+
+    // strikethrough
+    QTest::newRow("incomplete strikethrough") << u"~~test"_s << u"~~test"_s;
+    QTest::newRow("complete strikethrough") << u"~~test~~"_s << u"<del>test</del>"_s;
+    QTest::newRow("inside code block strikethrough") << u"```~~apple~~```"_s << u"<code>~~apple~~</code>"_s;
+    QTest::newRow("outside code block strikethrough") << u"~~apple~~ ```~~banana~~``` ~~pear~~"_s
+                                                      << u"<del>apple</del> <code>~~banana~~</code> <del>pear</del>"_s;
+}
+
+void TextHandlerTest::sendCustomTags()
+{
+    QFETCH(QString, testInputString);
+    QFETCH(QString, testOutputString);
+
+    TextHandler testTextHandler;
+    testTextHandler.setData(testInputString);
+
+    QCOMPARE(testTextHandler.handleSendText(), testOutputString);
+}
+
 void TextHandlerTest::receiveSpacelessSelfClosingTag()
 {
    const QString testInputString = u"Test...<br/>...ing"_s;
@@ -468,9 +505,12 @@ void TextHandlerTest::receiveRichEdited_data()
    QTest::addColumn<QString>("testInputString");
    QTest::addColumn<QString>("testOutputString");

-    QTest::newRow("basic") << u"Edited"_s << u"Edited <span style=\"color:#000000\">(edited)</span>"_s;
+    auto theme = static_cast<Kirigami::Platform::PlatformTheme *>(qmlAttachedPropertiesObject<Kirigami::Platform::PlatformTheme>(this, true));
+
+    QTest::newRow("basic") << u"Edited"_s << u"Edited <span style=\"color:%1\">(edited)</span>"_s.arg(theme ? theme->disabledTextColor().name() : u"#000000"_s);
    QTest::newRow("multiple paragraphs") << u"<p>Edited</p>\n<p>Edited</p>"_s
-                                         << u"<p>Edited</p>\n<p>Edited <span style=\"color:#000000\">(edited)</span></p>"_s;
+                                         << u"<p>Edited</p>\n<p>Edited <span style=\"color:%1\">(edited)</span></p>"_s.arg(
+                                                theme ? theme->disabledTextColor().name() : u"#000000"_s);
 }

 void TextHandlerTest::receiveRichEdited()
@@ -511,8 +551,6 @@ void TextHandlerTest::receiveRichColor()
    TextHandler testTextHandler;
    testTextHandler.setData(testInputString);

-    qInfo() << testTextHandler.handleRecieveRichText();
-
    QCOMPARE(testTextHandler.handleRecieveRichText(), testOutputString);
 }

--- a/memorytests/CMakeLists.txt
+++ b/memorytests/CMakeLists.txt
@@ -7,16 +7,19 @@ qt_add_executable(timeline-memtest
    main.cpp
 )

-target_link_libraries(timeline-memtest PRIVATE neochatplugin timelineplugin)
+target_link_libraries(timeline-memtest PRIVATE neochatplugin Timelineplugin)
 target_link_libraries(timeline-memtest PUBLIC
    Qt::Core
    Qt::Quick
    Qt::Qml
    Qt::Gui
    Qt::QuickControls2
+    Qt::Widgets
+    KF6::I18nQml
    KF6::Kirigami
    QuotientQt6
-    neochat
+    LibNeoChat
+    Timeline
 )

 ecm_add_qml_module(timeline-memtest URI org.kde.neochat.timeline-memtest GENERATE_PLUGIN_SOURCE
@@ -30,5 +33,5 @@ ecm_add_qml_module(timeline-memtest URI org.kde.neochat.timeline-memtest GENERAT
        QtCore
        QtQuick
    IMPORTS
-        org.kde.neochat
+        org.kde.neochat.timeline
 )
--- a/memorytests/Main.qml
+++ b/memorytests/Main.qml
@@ -23,6 +23,7 @@ QQC2.ApplicationWindow {
        height: root.height

        contentItem: ListView {
+            cacheBuffer: 1000000
            model: messageFilterModel

            delegate: EventDelegate {
--- a/memorytests/main.cpp
+++ b/memorytests/main.cpp
@@ -5,6 +5,7 @@
 #include <QQmlApplicationEngine>
 #include <QQmlContext>

+#include <KLocalizedQmlContext>
 #include <KLocalizedString>

 #include "memtesttimelinemodel.h"
@@ -19,12 +20,15 @@ int main(int argc, char **argv)
    KLocalizedString::setApplicationDomain(QByteArrayLiteral("neochat"));

    QQmlApplicationEngine engine;
-    engine.loadFromModule("org.kde.neochat.timeline-memtest", "Main");
+
+    KLocalization::setupLocalizedContext(&engine);

    MemTestTimelineModel *memTestTimelineModel = new MemTestTimelineModel;
    MessageFilterModel *messageFilterModel = new MessageFilterModel(nullptr, memTestTimelineModel);
    engine.rootContext()->setContextProperty(u"memTestTimelineModel"_s, memTestTimelineModel);
    engine.rootContext()->setContextProperty(u"messageFilterModel"_s, messageFilterModel);

+    engine.loadFromModule("org.kde.neochat.timeline-memtest", "Main");
+
    return app.exec();
 }
--- a/memorytests/memtest-sync.json
+++ b/memorytests/memtest-sync.json
@@ -241,7 +241,7 @@
          "formatted_body": "This is an example<br>text message",
          "msgtype": "m.text"
        },
-        "event_id": "$1000000000000:example.org",
+        "event_id": 0,
        "origin_server_ts": 1000000000000,
        "room_id": "!jEsUZKDJdhlrceRyVU:example.org",
        "sender": "@example:example.org",
@@ -255,7 +255,7 @@
          "body": "This is a highlight @bob:example.org",
          "msgtype": "m.text"
        },
-        "event_id": "$1000000000001:example.org",
+        "event_id": 1,
        "origin_server_ts": 1000000000001,
        "room_id": "!jEsUZKDJdhlrceRyVU:example.org",
        "sender": "@example:example.org",
@@ -266,11 +266,11 @@
      },
      {
        "content": {
-            "m.relates_to": {
-            "event_id": "$1000000000001:example.org",
+          "m.relates_to": {
+            "event_id": 1,
            "key": "👍",
            "rel_type": "m.annotation"
-            }
+          }
        },
        "origin_server_ts": 1000000000002,
        "room_id": "!jEsUZKDJdhlrceRyVU:example.org",
@@ -279,7 +279,7 @@
        "unsigned": {
            "age": 390159120
        },
-        "event_id": "$1000000000002:example.org",
+        "event_id": 2,
        "age": 390159120
      },
      {
@@ -289,7 +289,7 @@
            "formatted_body": "reply",
            "m.relates_to": {
                "m.in_reply_to": {
-                    "event_id": "$1000000000000:example.org"
+                    "event_id": 0
                }
            },
            "msgtype": "m.text"
@@ -300,7 +300,7 @@
        "unsigned": {
            "age": 98
        },
-        "event_id": "$1000000000003:example.org",
+        "event_id": 3,
        "room_id": "!jEsUZKDJdhlrceRyVU:example.org"
      },
      {
@@ -317,7 +317,7 @@
                "uri": "geo:51.7035,-1.14394"
            }
        },
-        "event_id": "$1000000000004:example.org",
+        "event_id": 4,
        "origin_server_ts": 1000000000004,
        "room_id": "!jEsUZKDJdhlrceRyVU:example.org",
        "sender": "@example:example.org",
@@ -333,7 +333,7 @@
          "formatted_body": "<pre><code class=\"language-cpp\">int main(int argc, char **argv)\n{\n    QApplication app(argc, argv);\n\n    KLocalizedString::setApplicationDomain(QByteArrayLiteral(&quot;neochat&quot;));\n\n    QQmlApplicationEngine engine;\n    engine.loadFromModule(&quot;org.kde.neochat.timeline-memtest&quot;, &quot;Main&quot;);\n\n    return app.exec();\n}\n</code></pre>",
          "msgtype": "m.text"
        },
-        "event_id": "$1000000000005:example.org",
+        "event_id": 5,
        "origin_server_ts": 1000000000005,
        "room_id": "!jEsUZKDJdhlrceRyVU:example.org",
        "sender": "@bob:example.org",
@@ -347,7 +347,7 @@
          "body": "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam sed fringilla risus, eget lacinia risus. Suspendisse at magna id justo sagittis suscipit. Maecenas eros quam, pulvinar a consequat sed, varius vitae risus. Cras congue est eget felis porttitor lobortis. Nam cursus, nulla ut finibus suscipit, tellus eros tincidunt ante, a volutpat velit lectus sit amet turpis. Morbi leo justo, fringilla sed rutrum a, suscipit a quam. Proin rhoncus neque eget ligula ullamcorper pellentesque. Mauris volutpat malesuada nunc. Nullam finibus enim eu nibh placerat imperdiet. Nullam in mi in diam luctus scelerisque dignissim non erat. ",
          "msgtype": "m.text"
        },
-        "event_id": "$1000000000006:example.org",
+        "event_id": 6,
        "origin_server_ts": 1000000000006,
        "room_id": "!jEsUZKDJdhlrceRyVU:example.org",
        "sender": "@example:example.org",
@@ -363,7 +363,7 @@
          "formatted_body": "<blockquote>\n<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam sed fringilla risus, eget lacinia risus. Suspendisse at magna id justo sagittis suscipit. Maecenas eros quam, pulvinar a consequat sed, varius vitae risus. Cras congue est eget felis porttitor lobortis. Nam cursus, nulla ut finibus suscipit, tellus eros tincidunt ante, a volutpat velit lectus sit amet turpis. Morbi leo justo, fringilla sed rutrum a, suscipit a quam. Proin rhoncus neque eget ligula ullamcorper pellentesque. Mauris volutpat malesuada nunc. Nullam finibus enim eu nibh placerat imperdiet. Nullam in mi in diam luctus scelerisque dignissim non erat.</p>\n</blockquote>",
          "msgtype": "m.text"
        },
-        "event_id": "$1000000000007:example.org",
+        "event_id": 7,
        "origin_server_ts": 1000000000007,
        "room_id": "!jEsUZKDJdhlrceRyVU:example.org",
        "sender": "@example:example.org",
@@ -371,282 +371,6 @@
        "unsigned": {
          "age": 1232
        }
-      },
-      {
-        "content": {
-          "body": "This is an example text message",
-          "format": "org.matrix.custom.html",
-          "formatted_body": "This is an example<br>text message",
-          "msgtype": "m.text"
-        },
-        "event_id": "$1000000000008:example.org",
-        "origin_server_ts": 1000000000008,
-        "room_id": "!jEsUZKDJdhlrceRyVU:example.org",
-        "sender": "@example:example.org",
-        "type": "m.room.message",
-        "unsigned": {
-          "age": 1232
-        }
-      },
-      {
-        "content": {
-          "body": "This is a highlight @bob:example.org",
-          "msgtype": "m.text"
-        },
-        "event_id": "$1000000000009:example.org",
-        "origin_server_ts": 1000000000009,
-        "room_id": "!jEsUZKDJdhlrceRyVU:example.org",
-        "sender": "@example:example.org",
-        "type": "m.room.message",
-        "unsigned": {
-          "age": 1233
-        }
-      },
-      {
-        "content": {
-            "m.relates_to": {
-            "event_id": "$1000000000009:example.org",
-            "key": "👍",
-            "rel_type": "m.annotation"
-            }
-        },
-        "origin_server_ts": 1000000000010,
-        "room_id": "!jEsUZKDJdhlrceRyVU:example.org",
-        "sender": "@alice:example.org",
-        "type": "m.reaction",
-        "unsigned": {
-            "age": 390159120
-        },
-        "event_id": "$1000000000010:example.org",
-        "age": 390159120
-      },
-      {
-        "content": {
-            "body": "reply",
-            "format": "org.matrix.custom.html",
-            "formatted_body": "reply",
-            "m.relates_to": {
-                "m.in_reply_to": {
-                    "event_id": "$1000000000008:example.org"
-                }
-            },
-            "msgtype": "m.text"
-        },
-        "origin_server_ts": 1000000000011,
-        "sender": "@alice:example.org",
-        "type": "m.room.message",
-        "unsigned": {
-            "age": 98
-        },
-        "event_id": "$1000000000011:example.org",
-        "room_id": "!jEsUZKDJdhlrceRyVU:example.org"
-      },
-      {
-        "age": 96845207,
-        "content": {
-            "body": "Lat: 51.7035, Lon: -1.14394",
-            "geo_uri": "geo:51.7035,-1.14394",
-            "msgtype": "m.location",
-            "org.matrix.msc1767.text": "Lat: 51.7035, Lon: -1.14394",
-            "org.matrix.msc3488.asset": {
-                "type": "m.pin"
-            },
-            "org.matrix.msc3488.location": {
-                "uri": "geo:51.7035,-1.14394"
-            }
-        },
-        "event_id": "$1000000000012:example.org",
-        "origin_server_ts": 1000000000012,
-        "room_id": "!jEsUZKDJdhlrceRyVU:example.org",
-        "sender": "@example:example.org",
-        "type": "m.room.message",
-        "unsigned": {
-            "age": 96845207
-        }
-      },
-      {
-        "content": {
-          "body": "```cpp\nint main(int argc, char **argv)\n{\n    QApplication app(argc, argv);\n\n    KLocalizedString::setApplicationDomain(QByteArrayLiteral(\"neochat\"));\n\n    QQmlApplicationEngine engine;\n    engine.loadFromModule(\"org.kde.neochat.timeline-memtest\", \"Main\");\n\n    return app.exec();\n}\n```",
-          "format": "org.matrix.custom.html",
-          "formatted_body": "<pre><code class=\"language-cpp\">int main(int argc, char **argv)\n{\n    QApplication app(argc, argv);\n\n    KLocalizedString::setApplicationDomain(QByteArrayLiteral(&quot;neochat&quot;));\n\n    QQmlApplicationEngine engine;\n    engine.loadFromModule(&quot;org.kde.neochat.timeline-memtest&quot;, &quot;Main&quot;);\n\n    return app.exec();\n}\n</code></pre>",
-          "msgtype": "m.text"
-        },
-        "event_id": "$1000000000013:example.org",
-        "origin_server_ts": 1000000000013,
-        "room_id": "!jEsUZKDJdhlrceRyVU:example.org",
-        "sender": "@bob:example.org",
-        "type": "m.room.message",
-        "unsigned": {
-          "age": 1233
-        }
-      },
-      {
-        "content": {
-          "body": "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam sed fringilla risus, eget lacinia risus. Suspendisse at magna id justo sagittis suscipit. Maecenas eros quam, pulvinar a consequat sed, varius vitae risus. Cras congue est eget felis porttitor lobortis. Nam cursus, nulla ut finibus suscipit, tellus eros tincidunt ante, a volutpat velit lectus sit amet turpis. Morbi leo justo, fringilla sed rutrum a, suscipit a quam. Proin rhoncus neque eget ligula ullamcorper pellentesque. Mauris volutpat malesuada nunc. Nullam finibus enim eu nibh placerat imperdiet. Nullam in mi in diam luctus scelerisque dignissim non erat. ",
-          "msgtype": "m.text"
-        },
-        "event_id": "$1000000000014:example.org",
-        "origin_server_ts": 1000000000014,
-        "room_id": "!jEsUZKDJdhlrceRyVU:example.org",
-        "sender": "@example:example.org",
-        "type": "m.room.message",
-        "unsigned": {
-          "age": 1232
-        }
-      },
-      {
-        "content": {
-          "body": "> Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam sed fringilla risus, eget lacinia risus. Suspendisse at magna id justo sagittis suscipit. Maecenas eros quam, pulvinar a consequat sed, varius vitae risus. Cras congue est eget felis porttitor lobortis. Nam cursus, nulla ut finibus suscipit, tellus eros tincidunt ante, a volutpat velit lectus sit amet turpis. Morbi leo justo, fringilla sed rutrum a, suscipit a quam. Proin rhoncus neque eget ligula ullamcorper pellentesque. Mauris volutpat malesuada nunc. Nullam finibus enim eu nibh placerat imperdiet. Nullam in mi in diam luctus scelerisque dignissim non erat. ",
-          "format": "org.matrix.custom.html",
-          "formatted_body": "<blockquote>\n<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam sed fringilla risus, eget lacinia risus. Suspendisse at magna id justo sagittis suscipit. Maecenas eros quam, pulvinar a consequat sed, varius vitae risus. Cras congue est eget felis porttitor lobortis. Nam cursus, nulla ut finibus suscipit, tellus eros tincidunt ante, a volutpat velit lectus sit amet turpis. Morbi leo justo, fringilla sed rutrum a, suscipit a quam. Proin rhoncus neque eget ligula ullamcorper pellentesque. Mauris volutpat malesuada nunc. Nullam finibus enim eu nibh placerat imperdiet. Nullam in mi in diam luctus scelerisque dignissim non erat.</p>\n</blockquote>",
-          "msgtype": "m.text"
-        },
-        "event_id": "$1000000000015:example.org",
-        "origin_server_ts": 1000000000015,
-        "room_id": "!jEsUZKDJdhlrceRyVU:example.org",
-        "sender": "@example:example.org",
-        "type": "m.room.message",
-        "unsigned": {
-          "age": 1232
-        }
-      },
-      {
-        "content": {
-          "body": "This is an example text message",
-          "format": "org.matrix.custom.html",
-          "formatted_body": "This is an example<br>text message",
-          "msgtype": "m.text"
-        },
-        "event_id": "$1000000000016:example.org",
-        "origin_server_ts": 1000000000016,
-        "room_id": "!jEsUZKDJdhlrceRyVU:example.org",
-        "sender": "@example:example.org",
-        "type": "m.room.message",
-        "unsigned": {
-          "age": 1232
-        }
-      },
-      {
-        "content": {
-          "body": "This is a highlight @bob:example.org",
-          "msgtype": "m.text"
-        },
-        "event_id": "$1000000000017:example.org",
-        "origin_server_ts": 1000000000017,
-        "room_id": "!jEsUZKDJdhlrceRyVU:example.org",
-        "sender": "@example:example.org",
-        "type": "m.room.message",
-        "unsigned": {
-          "age": 1233
-        }
-      },
-      {
-        "content": {
-            "m.relates_to": {
-            "event_id": "$1000000000017:example.org",
-            "key": "👍",
-            "rel_type": "m.annotation"
-            }
-        },
-        "origin_server_ts": 1000000000018,
-        "room_id": "!jEsUZKDJdhlrceRyVU:example.org",
-        "sender": "@alice:example.org",
-        "type": "m.reaction",
-        "unsigned": {
-            "age": 390159120
-        },
-        "event_id": "$1000000000018:example.org",
-        "age": 390159120
-      },
-      {
-        "content": {
-            "body": "reply",
-            "format": "org.matrix.custom.html",
-            "formatted_body": "reply",
-            "m.relates_to": {
-                "m.in_reply_to": {
-                    "event_id": "$1000000000016:example.org"
-                }
-            },
-            "msgtype": "m.text"
-        },
-        "origin_server_ts": 1000000000019,
-        "sender": "@alice:example.org",
-        "type": "m.room.message",
-        "unsigned": {
-            "age": 98
-        },
-        "event_id": "$1000000000019:example.org",
-        "room_id": "!jEsUZKDJdhlrceRyVU:example.org"
-      },
-      {
-        "age": 96845207,
-        "content": {
-            "body": "Lat: 51.7035, Lon: -1.14394",
-            "geo_uri": "geo:51.7035,-1.14394",
-            "msgtype": "m.location",
-            "org.matrix.msc1767.text": "Lat: 51.7035, Lon: -1.14394",
-            "org.matrix.msc3488.asset": {
-                "type": "m.pin"
-            },
-            "org.matrix.msc3488.location": {
-                "uri": "geo:51.7035,-1.14394"
-            }
-        },
-        "event_id": "$1000000000020:example.org",
-        "origin_server_ts": 1000000000020,
-        "room_id": "!jEsUZKDJdhlrceRyVU:example.org",
-        "sender": "@example:example.org",
-        "type": "m.room.message",
-        "unsigned": {
-            "age": 96845207
-        }
-      },
-      {
-        "content": {
-          "body": "```cpp\nint main(int argc, char **argv)\n{\n    QApplication app(argc, argv);\n\n    KLocalizedString::setApplicationDomain(QByteArrayLiteral(\"neochat\"));\n\n    QQmlApplicationEngine engine;\n    engine.loadFromModule(\"org.kde.neochat.timeline-memtest\", \"Main\");\n\n    return app.exec();\n}\n```",
-          "format": "org.matrix.custom.html",
-          "formatted_body": "<pre><code class=\"language-cpp\">int main(int argc, char **argv)\n{\n    QApplication app(argc, argv);\n\n    KLocalizedString::setApplicationDomain(QByteArrayLiteral(&quot;neochat&quot;));\n\n    QQmlApplicationEngine engine;\n    engine.loadFromModule(&quot;org.kde.neochat.timeline-memtest&quot;, &quot;Main&quot;);\n\n    return app.exec();\n}\n</code></pre>",
-          "msgtype": "m.text"
-        },
-        "event_id": "$1000000000021:example.org",
-        "origin_server_ts": 1000000000021,
-        "room_id": "!jEsUZKDJdhlrceRyVU:example.org",
-        "sender": "@bob:example.org",
-        "type": "m.room.message",
-        "unsigned": {
-          "age": 1233
-        }
-      },
-      {
-        "content": {
-          "body": "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam sed fringilla risus, eget lacinia risus. Suspendisse at magna id justo sagittis suscipit. Maecenas eros quam, pulvinar a consequat sed, varius vitae risus. Cras congue est eget felis porttitor lobortis. Nam cursus, nulla ut finibus suscipit, tellus eros tincidunt ante, a volutpat velit lectus sit amet turpis. Morbi leo justo, fringilla sed rutrum a, suscipit a quam. Proin rhoncus neque eget ligula ullamcorper pellentesque. Mauris volutpat malesuada nunc. Nullam finibus enim eu nibh placerat imperdiet. Nullam in mi in diam luctus scelerisque dignissim non erat. ",
-          "msgtype": "m.text"
-        },
-        "event_id": "$1000000000022:example.org",
-        "origin_server_ts": 1000000000022,
-        "room_id": "!jEsUZKDJdhlrceRyVU:example.org",
-        "sender": "@example:example.org",
-        "type": "m.room.message",
-        "unsigned": {
-          "age": 1232
-        }
-      },
-      {
-        "content": {
-          "body": "> Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam sed fringilla risus, eget lacinia risus. Suspendisse at magna id justo sagittis suscipit. Maecenas eros quam, pulvinar a consequat sed, varius vitae risus. Cras congue est eget felis porttitor lobortis. Nam cursus, nulla ut finibus suscipit, tellus eros tincidunt ante, a volutpat velit lectus sit amet turpis. Morbi leo justo, fringilla sed rutrum a, suscipit a quam. Proin rhoncus neque eget ligula ullamcorper pellentesque. Mauris volutpat malesuada nunc. Nullam finibus enim eu nibh placerat imperdiet. Nullam in mi in diam luctus scelerisque dignissim non erat. ",
-          "format": "org.matrix.custom.html",
-          "formatted_body": "<blockquote>\n<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam sed fringilla risus, eget lacinia risus. Suspendisse at magna id justo sagittis suscipit. Maecenas eros quam, pulvinar a consequat sed, varius vitae risus. Cras congue est eget felis porttitor lobortis. Nam cursus, nulla ut finibus suscipit, tellus eros tincidunt ante, a volutpat velit lectus sit amet turpis. Morbi leo justo, fringilla sed rutrum a, suscipit a quam. Proin rhoncus neque eget ligula ullamcorper pellentesque. Mauris volutpat malesuada nunc. Nullam finibus enim eu nibh placerat imperdiet. Nullam in mi in diam luctus scelerisque dignissim non erat.</p>\n</blockquote>",
-          "msgtype": "m.text"
-        },
-        "event_id": "$1000000000023:example.org",
-        "origin_server_ts": 1000000000023,
-        "room_id": "!jEsUZKDJdhlrceRyVU:example.org",
-        "sender": "@example:example.org",
-        "type": "m.room.message",
-        "unsigned": {
-          "age": 1232
-        }
      }
    ],
    "limited": true,
--- a/memorytests/memtesttimelinemodel.h
+++ b/memorytests/memtesttimelinemodel.h
@@ -39,10 +39,52 @@ public:
            testSyncFile.setFileName(QStringLiteral(DATA_DIR) + u'/' + syncFileName);
            testSyncFile.open(QIODevice::ReadOnly);
            auto testSyncJson = QJsonDocument::fromJson(testSyncFile.readAll()).object();
+            auto timelineJson = testSyncJson["timeline"_L1].toObject();
+            timelineJson["events"_L1] = multiplyEvents(timelineJson["events"_L1].toArray(), 100);
+            testSyncJson["timeline"_L1] = timelineJson;
            Quotient::SyncRoomData roomData(id(), Quotient::JoinState::Join, testSyncJson);
            update(std::move(roomData));
        }
    }
+
+    QJsonArray multiplyEvents(QJsonArray events, int factor)
+    {
+        QJsonArray newArray;
+        int eventNum = 0;
+        int ts = 0;
+
+        for (int i = 0; i < factor; ++i) {
+            for (const auto &event : events) {
+                auto eventObject = event.toObject();
+                auto contentJson = eventObject["content"_L1].toObject();
+                if (contentJson.contains("m.relates_to"_L1)) {
+                    auto relatesToJson = contentJson["m.relates_to"_L1].toObject();
+                    if (relatesToJson.contains("m.in_reply_to"_L1)) {
+                        auto replyJson = relatesToJson["m.in_reply_to"_L1].toObject();
+                        const auto currentId = eventObject["event_id"_L1].toInt();
+                        const auto currentReplyId = replyJson["event_id"_L1].toInt();
+                        replyJson["event_id"_L1] = "$%1:example.org"_L1.arg(QString::number(eventNum - (currentId - currentReplyId)));
+                        relatesToJson["m.in_reply_to"_L1] = replyJson;
+                    } else if (relatesToJson.contains("event_id"_L1)) {
+                        const auto currentId = eventObject["event_id"_L1].toInt();
+                        const auto currentRelationId = relatesToJson["event_id"_L1].toInt();
+                        relatesToJson["event_id"_L1] = "$%1:example.org"_L1.arg(QString::number(eventNum - (currentId - currentRelationId)));
+                    }
+                    contentJson["m.relates_to"_L1] = relatesToJson;
+                    eventObject["content"_L1] = contentJson;
+                }
+                eventObject["event_id"_L1] = "$%1:example.org"_L1.arg(QString::number(eventNum));
+                eventObject["origin_server_ts"_L1] = ts;
+                auto unsignedJson = eventObject["unsigned"_L1].toObject();
+                unsignedJson["age"_L1] = ts;
+                eventObject["unsigned"_L1] = unsignedJson;
+                newArray.append(eventObject);
+                ++eventNum;
+                ++ts;
+            }
+        }
+        return newArray;
+    }
 };

 /**
--- a/org.kde.neochat.appdata.xml
+++ b/org.kde.neochat.appdata.xml
@@ -477,7 +477,6 @@
    <content_attribute id="social-chat">intense</content_attribute>
  </content_rating>
  <releases>
-    <release version="25.04.2" date="2025-06-05"/>
    <release version="25.04.1" date="2025-05-08"/>
    <release version="25.04.0" date="2025-04-17"/>
    <release version="24.12.3" date="2025-03-06"/>
--- a/po/ar/neochat.po
+++ b/po/ar/neochat.po
--- a/po/ast/neochat.po
+++ b/po/ast/neochat.po
--- a/po/az/neochat.po
+++ b/po/az/neochat.po
--- a/po/ca/neochat.po
+++ b/po/ca/neochat.po
--- a/po/ca@valencia/neochat.po
+++ b/po/ca@valencia/neochat.po
--- a/po/cs/neochat.po
+++ b/po/cs/neochat.po
--- a/po/da/neochat.po
+++ b/po/da/neochat.po
--- a/po/de/neochat.po
+++ b/po/de/neochat.po
--- a/po/el/neochat.po
+++ b/po/el/neochat.po
--- a/po/en_GB/neochat.po
+++ b/po/en_GB/neochat.po
--- a/po/eo/neochat.po
+++ b/po/eo/neochat.po
--- a/po/es/neochat.po
+++ b/po/es/neochat.po
--- a/po/eu/neochat.po
+++ b/po/eu/neochat.po
--- a/po/fi/neochat.po
+++ b/po/fi/neochat.po
--- a/po/fr/neochat.po
+++ b/po/fr/neochat.po
--- a/po/gl/neochat.po
+++ b/po/gl/neochat.po
--- a/po/he/neochat.po
+++ b/po/he/neochat.po
--- a/po/hi/neochat.po
+++ b/po/hi/neochat.po
--- a/po/hu/neochat.po
+++ b/po/hu/neochat.po
--- a/po/ia/neochat.po
+++ b/po/ia/neochat.po
--- a/po/id/neochat.po
+++ b/po/id/neochat.po
--- a/po/ie/neochat.po
+++ b/po/ie/neochat.po
--- a/po/it/neochat.po
+++ b/po/it/neochat.po
--- a/po/ja/neochat.po
+++ b/po/ja/neochat.po
--- a/po/ka/neochat.po
+++ b/po/ka/neochat.po
--- a/po/ko/neochat.po
+++ b/po/ko/neochat.po
--- a/po/lt/neochat.po
+++ b/po/lt/neochat.po
--- a/po/lv/neochat.po
+++ b/po/lv/neochat.po
--- a/po/nl/neochat.po
+++ b/po/nl/neochat.po
--- a/po/nn/neochat.po
+++ b/po/nn/neochat.po
--- a/po/pa/neochat.po
+++ b/po/pa/neochat.po
--- a/po/pl/neochat.po
+++ b/po/pl/neochat.po
--- a/po/pt/neochat.po
+++ b/po/pt/neochat.po
--- a/po/pt_BR/neochat.po
+++ b/po/pt_BR/neochat.po
--- a/po/ru/neochat.po
+++ b/po/ru/neochat.po
--- a/po/sa/neochat.po
+++ b/po/sa/neochat.po
--- a/po/sk/neochat.po
+++ b/po/sk/neochat.po
--- a/po/sl/neochat.po
+++ b/po/sl/neochat.po
--- a/po/sv/neochat.po
+++ b/po/sv/neochat.po
--- a/po/ta/neochat.po
+++ b/po/ta/neochat.po
--- a/po/tok/neochat.po
+++ b/po/tok/neochat.po
--- a/po/tr/neochat.po
+++ b/po/tr/neochat.po
--- a/po/uk/neochat.po
+++ b/po/uk/neochat.po
--- a/po/zh_CN/neochat.po
+++ b/po/zh_CN/neochat.po
--- a/po/zh_TW/neochat.po
+++ b/po/zh_TW/neochat.po
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -101,7 +101,7 @@ parts:
      - olm
      - qtkeychain
    source: https://github.com/quotient-im/libQuotient.git
-    source-tag: 0.9.1
+    source-tag: 0.9.2
    source-depth: 1
    plugin: cmake
    build-environment:
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,586 +1,17 @@
-# SPDX-FileCopyrightText: 2020-2021 Carl Schwan <carl@carlschwan.eu>
-# SPDX-FileCopyrightText: 2020-2021 Nicolas Fella <nicolas.fella@gmx.de>
-# SPDX-FileCopyrightText: 2020-2021 Tobias Fella <tobias.fella@kde.org>
+# SPDX-FileCopyrightText: 2025 James Graham <james.h.graham@protonmail.com>
 # SPDX-License-Identifier: BSD-2-Clause

 if (NOT ANDROID AND NOT WIN32 AND NOT APPLE AND NOT NEOCHAT_FLATPAK AND NOT NEOCHAT_APPIMAGE)
    add_subdirectory(purpose)
 endif()

-add_library(neochat STATIC
-    controller.cpp
-    controller.h
-    models/emojimodel.cpp
-    models/emojimodel.h
-    emojitones.cpp
-    emojitones.h
-    models/customemojimodel.cpp
-    models/customemojimodel.h
-    clipboard.cpp
-    clipboard.h
-    models/timelinemessagemodel.cpp
-    models/timelinemessagemodel.h
-    models/messagefiltermodel.cpp
-    models/messagefiltermodel.h
-    models/roomlistmodel.cpp
-    models/roomlistmodel.h
-    models/sortfilterspacelistmodel.cpp
-    models/sortfilterspacelistmodel.h
-    models/accountemoticonmodel.cpp
-    models/accountemoticonmodel.h
-    spacehierarchycache.cpp
-    spacehierarchycache.h
-    roommanager.cpp
-    roommanager.h
-    neochatroom.cpp
-    neochatroom.h
-    models/userlistmodel.cpp
-    models/userlistmodel.h
-    models/userfiltermodel.cpp
-    models/userfiltermodel.h
-    models/publicroomlistmodel.cpp
-    models/publicroomlistmodel.h
-    models/spacechildrenmodel.cpp
-    models/spacechildrenmodel.h
-    models/spacechildsortfiltermodel.cpp
-    models/spacechildsortfiltermodel.h
-    models/spacetreeitem.cpp
-    models/spacetreeitem.h
-    models/userdirectorylistmodel.cpp
-    models/userdirectorylistmodel.h
-    models/pushrulemodel.cpp
-    models/pushrulemodel.h
-    models/emoticonfiltermodel.cpp
-    models/emoticonfiltermodel.h
-    notificationsmanager.cpp
-    notificationsmanager.h
-    models/sortfilterroomlistmodel.cpp
-    models/sortfilterroomlistmodel.h
-    models/roomtreemodel.cpp
-    models/roomtreemodel.h
-    chatdocumenthandler.cpp
-    chatdocumenthandler.h
-    models/devicesmodel.cpp
-    models/devicesmodel.h
-    models/devicesproxymodel.cpp
-    filetype.cpp
-    filetype.h
-    login.cpp
-    login.h
-    models/webshortcutmodel.cpp
-    models/webshortcutmodel.h
-    blurhash.cpp
-    blurhash.h
-    blurhashimageprovider.cpp
-    blurhashimageprovider.h
-    models/mediamessagefiltermodel.cpp
-    models/mediamessagefiltermodel.h
-    urlhelper.cpp
-    urlhelper.h
-    windowcontroller.cpp
-    windowcontroller.h
-    linkpreviewer.cpp
-    linkpreviewer.h
-    models/completionmodel.cpp
-    models/completionmodel.h
-    models/completionproxymodel.cpp
-    models/completionproxymodel.h
-    models/actionsmodel.cpp
-    models/actionsmodel.h
-    models/serverlistmodel.cpp
-    models/serverlistmodel.h
-    models/statemodel.cpp
-    models/statemodel.h
-    models/statefiltermodel.cpp
-    models/statefiltermodel.h
-    filetransferpseudojob.cpp
-    filetransferpseudojob.h
-    models/searchmodel.cpp
-    models/searchmodel.h
-    texthandler.cpp
-    texthandler.h
-    logger.cpp
-    logger.h
-    models/stickermodel.cpp
-    models/stickermodel.h
-    models/imagepacksmodel.cpp
-    models/imagepacksmodel.h
-    events/imagepackevent.cpp
-    events/imagepackevent.h
-    models/reactionmodel.cpp
-    models/reactionmodel.h
-    delegatesizehelper.cpp
-    delegatesizehelper.h
-    models/livelocationsmodel.cpp
-    models/livelocationsmodel.h
-    models/locationsmodel.cpp
-    models/locationsmodel.h
-    locationhelper.cpp
-    locationhelper.h
-    events/pollevent.cpp
-    pollhandler.cpp
-    utils.h
-    utils.cpp
-    registration.cpp
-    neochatconnection.cpp
-    neochatconnection.h
-    jobs/neochatgetcommonroomsjob.cpp
-    jobs/neochatgetcommonroomsjob.h
-    mediasizehelper.cpp
-    mediasizehelper.h
-    eventhandler.cpp
-    enums/delegatetype.h
-    roomlastmessageprovider.cpp
-    roomlastmessageprovider.h
-    chatbarcache.cpp
-    chatbarcache.h
-    colorschemer.cpp
-    colorschemer.h
-    models/notificationsmodel.cpp
-    models/notificationsmodel.h
-    models/timelinemodel.cpp
-    models/timelinemodel.h
-    enums/pushrule.h
-    models/itinerarymodel.cpp
-    models/itinerarymodel.h
-    proxycontroller.cpp
-    proxycontroller.h
-    models/linemodel.cpp
-    models/linemodel.h
-    events/locationbeaconevent.h
-    events/widgetevent.h
-    enums/messagecomponenttype.h
-    models/messagecontentmodel.cpp
-    models/messagecontentmodel.h
-    enums/neochatroomtype.h
-    models/sortfilterroomtreemodel.cpp
-    models/sortfilterroomtreemodel.h
-    mediamanager.cpp
-    mediamanager.h
-    models/statekeysmodel.cpp
-    models/statekeysmodel.h
-    sharehandler.cpp
-    sharehandler.h
-    models/roomtreeitem.cpp
-    models/roomtreeitem.h
-    foreigntypes.h
-    models/threepidmodel.cpp
-    models/threepidmodel.h
-    threepidaddhelper.cpp
-    threepidaddhelper.h
-    identityserverhelper.cpp
-    identityserverhelper.h
-    enums/powerlevel.cpp
-    enums/powerlevel.h
-    models/permissionsmodel.cpp
-    models/permissionsmodel.h
-    threepidbindhelper.cpp
-    threepidbindhelper.h
-    models/readmarkermodel.cpp
-    models/readmarkermodel.h
-    neochatroommember.cpp
-    neochatroommember.h
-    models/threadmodel.cpp
-    models/threadmodel.h
-    enums/messagetype.h
-    messagecomponent.h
-    enums/roomsortparameter.cpp
-    enums/roomsortparameter.h
-    models/roomsortparametermodel.cpp
-    models/roomsortparametermodel.h
-    models/messagemodel.cpp
-    models/messagemodel.h
-    models/messagecontentfiltermodel.cpp
-    models/messagecontentfiltermodel.h
-    models/pinnedmessagemodel.cpp
-    models/pinnedmessagemodel.h
-    models/commonroomsmodel.cpp
-    models/commonroomsmodel.h
-)
-
-set_source_files_properties(qml/OsmLocationPlugin.qml PROPERTIES
-    QT_QML_SINGLETON_TYPE TRUE
-)
-
-if(ANDROID OR WIN32)
-    set_source_files_properties(qml/ShareActionStub.qml PROPERTIES
-        QT_QML_SOURCE_TYPENAME ShareAction
-    )
-    set_source_files_properties(qml/GlobalMenuStub.qml PROPERTIES
-            QT_QML_SOURCE_TYPENAME GlobalMenu
-    )
-endif()
-
-ecm_add_qml_module(neochat URI org.kde.neochat GENERATE_PLUGIN_SOURCE
-    OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/src/org/kde/neochat
-    QML_FILES
-        qml/Main.qml
-        qml/AccountMenu.qml
-        qml/ExploreComponent.qml
-        qml/ExploreComponentMobile.qml
-        qml/RoomContextMenu.qml
-        qml/CollapsedRoomDelegate.qml
-        qml/RoomDelegate.qml
-        qml/RoomListPage.qml
-        qml/SpaceListContextMenu.qml
-        qml/UserInfo.qml
-        qml/UserInfoDesktop.qml
-        qml/RoomPage.qml
-        qml/ExploreRoomsPage.qml
-        qml/ManualRoomDialog.qml
-        qml/ExplorerDelegate.qml
-        qml/InviteUserPage.qml
-        qml/ImageEditorPage.qml
-        qml/NeochatMaximizeComponent.qml
-        qml/TypingPane.qml
-        qml/QuickSwitcher.qml
-        qml/HoverActions.qml
-        qml/AttachmentPane.qml
-        qml/QuickFormatBar.qml
-        qml/UserDetailDialog.qml
-        qml/CreateRoomDialog.qml
-        qml/OpenFileDialog.qml
-        qml/KeyVerificationDialog.qml
-        qml/ConfirmLogoutDialog.qml
-        qml/PowerLevelDialog.qml
-        qml/Message.qml
-        qml/EmojiItem.qml
-        qml/EmojiRow.qml
-        qml/EmojiSas.qml
-        qml/ConfirmDeactivateAccountDialog.qml
-        qml/VerificationCanceled.qml
-        qml/MessageDelegateContextMenu.qml
-        qml/FileDelegateContextMenu.qml
-        qml/MessageSourceSheet.qml
-        qml/ConfirmEncryptionDialog.qml
-        qml/RoomSearchPage.qml
-        qml/RoomPinnedMessagesPage.qml
-        qml/LocationChooser.qml
-        qml/TimelineView.qml
-        qml/InvitationView.qml
-        qml/AvatarTabButton.qml
-        qml/SpaceDrawer.qml
-        qml/OsmLocationPlugin.qml
-        qml/FullScreenMap.qml
-        qml/LocationsPage.qml
-        qml/LocationMapItem.qml
-        qml/RoomDrawer.qml
-        qml/RoomDrawerPage.qml
-        qml/DirectChatDrawerHeader.qml
-        qml/GroupChatDrawerHeader.qml
-        qml/RoomInformation.qml
-        qml/RoomMedia.qml
-        qml/ChooseRoomDialog.qml
-        qml/SpaceHomePage.qml
-        qml/SpaceHierarchyDelegate.qml
-        qml/RemoveChildDialog.qml
-        qml/SelectParentDialog.qml
-        qml/QrCodeMaximizeComponent.qml
-        qml/SelectSpacesDialog.qml
-        qml/NotificationsView.qml
-        qml/SearchPage.qml
-        qml/ServerComboBox.qml
-        qml/UserSearchPage.qml
-        qml/ManualUserDialog.qml
-        qml/RecommendedSpaceDialog.qml
-        qml/RoomTreeSection.qml
-        qml/DelegateContextMenu.qml
-        qml/ShareDialog.qml
-        qml/UnlockSSSSDialog.qml
-        qml/QrScannerPage.qml
-        qml/JoinRoomDialog.qml
-        qml/ConfirmUrlDialog.qml
-        qml/AccountSwitchDialog.qml
-        qml/ConfirmLeaveDialog.qml
-        qml/CodeMaximizeComponent.qml
-        qml/EditStateDialog.qml
-        qml/ConsentDialog.qml
-        qml/AskDirectChatConfirmation.qml
-        qml/HoverLinkIndicator.qml
-        qml/AvatarNotification.qml
-        qml/ReasonDialog.qml
-    DEPENDENCIES
-        QtCore
-        QtQuick
-    IMPORTS
-        org.kde.neochat.timeline
-        org.kde.neochat.settings
-        org.kde.neochat.devtools
-        org.kde.neochat.login
-        org.kde.neochat.chatbar
-)
-
-add_subdirectory(settings)
-add_subdirectory(timeline)
-add_subdirectory(devtools)
+add_subdirectory(libneochat)
 add_subdirectory(login)
+add_subdirectory(rooms)
+add_subdirectory(roominfo)
+add_subdirectory(timeline)
+add_subdirectory(spaces)
 add_subdirectory(chatbar)
-
-if(NOT ANDROID AND NOT WIN32)
-    qt_target_qml_sources(neochat QML_FILES
-        qml/ShareAction.qml
-        qml/GlobalMenu.qml
-        qml/EditMenu.qml
-    )
-else()
-    qt_target_qml_sources(neochat QML_FILES
-            qml/ShareActionStub.qml
-            qml/GlobalMenuStub.qml
-    )
-endif()
-
-configure_file(config-neochat.h.in ${CMAKE_CURRENT_BINARY_DIR}/config-neochat.h)
-
-if(WIN32)
-    set_target_properties(neochat PROPERTIES OUTPUT_NAME "neochatlib")
-endif()
-
-ecm_qt_declare_logging_category(neochat
-    HEADER "messagemodel_logging.h"
-    IDENTIFIER "Message"
-    CATEGORY_NAME "org.kde.neochat.messagemodel"
-    DESCRIPTION "Neochat: messagemodel"
-    DEFAULT_SEVERITY Info
-    EXPORT NEOCHAT
-)
-
-ecm_qt_declare_logging_category(neochat
-    HEADER "publicroomlist_logging.h"
-    IDENTIFIER "PublicRoomList"
-    CATEGORY_NAME "org.kde.neochat.publicroomlistmodel"
-    DESCRIPTION "Neochat: publicroomlistmodel"
-    DEFAULT_SEVERITY Info
-    EXPORT NEOCHAT
-)
-
-ecm_qt_declare_logging_category(neochat
-    HEADER "eventhandler_logging.h"
-    IDENTIFIER "EventHandling"
-    CATEGORY_NAME "org.kde.neochat.eventhandler"
-    DEFAULT_SEVERITY Info
-)
-
-ecm_qt_declare_logging_category(neochat
-    HEADER "chatdocumenthandler_logging.h"
-    IDENTIFIER "ChatDocumentHandling"
-    CATEGORY_NAME "org.kde.neochat.chatdocumenthandler"
-    DEFAULT_SEVERITY Info
-)
-
-add_executable(neochat-app
-    main.cpp
-)
-
-if(TARGET Qt::WebView)
-    target_link_libraries(neochat-app PUBLIC Qt::WebView)
-    target_compile_definitions(neochat-app PUBLIC -DHAVE_WEBVIEW)
-endif()
-
-target_include_directories(neochat-app PRIVATE ${CMAKE_BINARY_DIR})
-
-target_link_libraries(neochat-app PRIVATE
-    neochat
-)
-
-ecm_add_app_icon(NEOCHAT_ICON ICONS ${CMAKE_SOURCE_DIR}/128-logo.png)
-
-target_sources(neochat-app PRIVATE ${NEOCHAT_ICON})
-
-if(NOT ANDROID)
-    if (NOT WIN32 AND NOT APPLE)
-        target_sources(neochat PRIVATE trayicon_sni.cpp trayicon_sni.h)
-        target_link_libraries(neochat PRIVATE KF6::StatusNotifierItem)
-    else()
-        target_sources(neochat PRIVATE trayicon.cpp trayicon.h)
-    endif()
-    target_link_libraries(neochat PUBLIC KF6::WindowSystem ICU::uc)
-    target_compile_definitions(neochat PUBLIC -DHAVE_WINDOWSYSTEM)
-    target_compile_definitions(neochat PUBLIC -DHAVE_ICU)
-endif()
-
-if (NOT ANDROID AND NOT WIN32 AND NOT APPLE AND NOT HAIKU)
-    target_compile_definitions(neochat PUBLIC -DHAVE_RUNNER)
-    target_compile_definitions(neochat PUBLIC -DHAVE_X11=1)
-    target_sources(neochat PRIVATE runner.cpp)
-
-    if (TARGET KUnifiedPush)
-        target_sources(neochat PRIVATE fakerunner.cpp)
-    endif()
-else()
-    target_compile_definitions(neochat PUBLIC -DHAVE_X11=0)
-endif()
-
-target_include_directories(neochat PRIVATE ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/models ${CMAKE_CURRENT_SOURCE_DIR}/enums)
-target_link_libraries(neochat PRIVATE settingsplugin timelineplugin devtoolsplugin loginplugin chatbarplugin)
-target_link_libraries(neochat PUBLIC
-    Qt::Core
-    Qt::Quick
-    Qt::Qml
-    Qt::Gui
-    Qt::Multimedia
-    Qt::Network
-    Qt::QuickControls2
-    KF6::I18n
-    KF6::Kirigami
-    KF6::Notifications
-    KF6::ConfigCore
-    KF6::ConfigGui
-    KF6::CoreAddons
-    KF6::SonnetCore
-    KF6::IconThemes
-    KF6::ColorScheme
-    KF6::ItemModels
-    QuotientQt6
-    cmark::cmark
-    QCoro::Core
-    QCoro::Network
-)
-
-if (TARGET KF6::Crash)
-    target_link_libraries(neochat PUBLIC KF6::Crash)
-endif()
-
-kconfig_target_kcfg_file(neochat FILE neochatconfig.kcfg CLASS_NAME NeoChatConfig MUTATORS GENERATE_PROPERTIES DEFAULT_VALUE_GETTERS PARENT_IN_CONSTRUCTOR SINGLETON GENERATE_MOC QML_REGISTRATION)
-
-if(NEOCHAT_FLATPAK)
-    target_compile_definitions(neochat PUBLIC NEOCHAT_FLATPAK)
-endif()
-
-if(ANDROID)
-    target_sources(neochat PRIVATE notifyrc.qrc)
-    target_link_libraries(neochat PRIVATE Qt::Svg OpenSSL::SSL)
-    if(SQLite3_FOUND)
-        target_link_libraries(neochat-app PRIVATE SQLite::SQLite3)
-    endif()
-    target_sources(neochat-app PRIVATE notifyrc.qrc)
-    target_link_libraries(neochat PUBLIC Qt::Svg OpenSSL::SSL)
-    kirigami_package_breeze_icons(ICONS
-        "arrow-down-symbolic"
-        "arrow-up-symbolic"
-        "arrow-up-double-symbolic"
-        "arrow-left-symbolic"
-        "arrow-right-symbolic"
-        "checkmark"
-        "help-about"
-        "im-user"
-        "im-invisible-user"
-        "im-kick-user"
-        "mail-attachment"
-        "dialog-cancel"
-        "preferences-desktop-emoticons"
-        "preferences-security"
-        "document-open"
-        "document-save"
-        "document-send"
-        "dialog-close"
-        "edit-delete-remove"
-        "code-context"
-        "document-edit"
-        "list-user-add"
-        "list-add-user"
-        "user-others"
-        "media-playback-pause"
-        "media-playback-start"
-        "media-playback-stop"
-        "go-previous"
-        "go-up"
-        "go-down"
-        "list-add"
-        "irc-join-channel"
-        "settings-configure"
-        "configure"
-        "rating"
-        "rating-unrated"
-        "search"
-        "mail-replied-symbolic"
-        "edit-clear"
-        "edit-copy"
-        "gtk-quit"
-        "compass"
-        "computer"
-        "network-connect"
-        "list-remove-user"
-        "org.kde.neochat"
-        "org.kde.neochat.tray"
-        "preferences-system-users"
-        "preferences-desktop-theme-global"
-        "notifications"
-        "notifications-disabled"
-        "audio-volume-high"
-        "audio-volume-muted"
-        "draw-highlight"
-        "zoom-in"
-        "zoom-out"
-        "image-rotate-left-symbolic"
-        "image-rotate-right-symbolic"
-        "channel-secure-symbolic"
-        "download"
-        "smiley"
-        "tools-check-spelling"
-        "username-copy"
-        "system-switch-user"
-        "bookmark-new"
-        "bookmark-remove"
-        "favorite"
-        "window-new"
-        "globe"
-        "visibility"
-        "home"
-        "preferences-desktop-notification"
-        "computer-symbolic"
-        "gps"
-        "system-users-symbolic"
-        "map-flat"
-        "documentinfo"
-        "view-list-details"
-        "go-previous"
-        "mail-forward-symbolic"
-        "dialog-warning-symbolic"
-        "object-rotate-left"
-        "object-rotate-right"
-        "add-subtitle"
-        "security-high"
-        "security-low"
-        "security-low-symbolic"
-        "kde"
-        "list-remove-symbolic"
-        "edit-delete"
-        "user-home-symbolic"
-        "pin-symbolic"
-        "kt-restore-defaults-symbolic"
-        "user-symbolic"
-    )
-    ecm_add_android_apk(neochat-app ANDROID_DIR ${CMAKE_SOURCE_DIR}/android)
-else()
-    target_link_libraries(neochat PUBLIC Qt::Widgets KF6::KIOWidgets KF6::SyntaxHighlighting)
-    install(FILES neochat.notifyrc DESTINATION ${KDE_INSTALL_KNOTIFYRCDIR})
-endif()
-
-if(NOT ANDROID)
-    set_target_properties(neochat-app PROPERTIES OUTPUT_NAME "neochat")
-endif()
-
-if(TARGET KF6::DBusAddons AND NOT WIN32)
-    target_link_libraries(neochat PUBLIC KF6::DBusAddons)
-    target_compile_definitions(neochat PUBLIC -DHAVE_KDBUSADDONS)
-endif()
-
-if (TARGET KF6::KIOWidgets)
-    target_compile_definitions(neochat PUBLIC -DHAVE_KIO)
-endif()
-
-if (TARGET KUnifiedPush)
-    target_compile_definitions(neochat PUBLIC -DHAVE_KUNIFIEDPUSH)
-    target_link_libraries(neochat PUBLIC KUnifiedPush)
-
-    if (NOT ANDROID)
-        configure_file(org.kde.neochat.service.in ${CMAKE_CURRENT_BINARY_DIR}/org.kde.neochat.service)
-        install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.kde.neochat.service DESTINATION ${KDE_INSTALL_DBUSSERVICEDIR})
-    endif()
-endif()
-
-install(TARGETS neochat-app ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
-
-if (NOT ANDROID AND NOT WIN32 AND NOT APPLE)
-    install(FILES plasma-runner-neochat.desktop DESTINATION ${KDE_INSTALL_DATAROOTDIR}/krunner/dbusplugins)
-endif()
+add_subdirectory(settings)
+add_subdirectory(devtools)
+add_subdirectory(app)
--- a/src/app/CMakeLists.txt
+++ b/src/app/CMakeLists.txt
@@ -0,0 +1,363 @@
+# SPDX-FileCopyrightText: 2020-2021 Carl Schwan <carl@carlschwan.eu>
+# SPDX-FileCopyrightText: 2020-2021 Nicolas Fella <nicolas.fella@gmx.de>
+# SPDX-FileCopyrightText: 2020-2021 Tobias Fella <tobias.fella@kde.org>
+# SPDX-License-Identifier: BSD-2-Clause
+
+add_library(neochat STATIC
+    controller.cpp
+    controller.h
+    roommanager.cpp
+    roommanager.h
+    models/userdirectorylistmodel.cpp
+    models/userdirectorylistmodel.h
+    notificationsmanager.cpp
+    notificationsmanager.h
+    blurhash.cpp
+    blurhash.h
+    blurhashimageprovider.cpp
+    blurhashimageprovider.h
+    windowcontroller.cpp
+    windowcontroller.h
+    models/serverlistmodel.cpp
+    models/serverlistmodel.h
+    logger.cpp
+    logger.h
+    models/notificationsmodel.cpp
+    models/notificationsmodel.h
+    proxycontroller.cpp
+    proxycontroller.h
+    mediamanager.cpp
+    mediamanager.h
+    sharehandler.cpp
+    sharehandler.h
+    foreigntypes.h
+    identityserverhelper.cpp
+    identityserverhelper.h
+    models/commonroomsmodel.cpp
+    models/commonroomsmodel.h
+    texttospeechhelper.h
+    texttospeechhelper.cpp
+)
+
+set_source_files_properties(qml/OsmLocationPlugin.qml PROPERTIES
+    QT_QML_SINGLETON_TYPE TRUE
+)
+
+if(ANDROID OR WIN32)
+    set_source_files_properties(qml/ShareActionStub.qml PROPERTIES
+        QT_QML_SOURCE_TYPENAME ShareAction
+    )
+    set_source_files_properties(qml/GlobalMenuStub.qml PROPERTIES
+            QT_QML_SOURCE_TYPENAME GlobalMenu
+    )
+endif()
+
+ecm_add_qml_module(neochat URI org.kde.neochat GENERATE_PLUGIN_SOURCE
+    OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/src/org/kde/neochat
+    QML_FILES
+        qml/Main.qml
+        qml/AccountMenu.qml
+        qml/CollapsedRoomDelegate.qml
+        qml/RoomPage.qml
+        qml/ManualRoomDialog.qml
+        qml/ExplorerDelegate.qml
+        qml/ImageEditorPage.qml
+        qml/NeochatMaximizeComponent.qml
+        qml/TypingPane.qml
+        qml/QuickSwitcher.qml
+        qml/AttachmentPane.qml
+        qml/QuickFormatBar.qml
+        qml/UserDetailDialog.qml
+        qml/OpenFileDialog.qml
+        qml/KeyVerificationDialog.qml
+        qml/ConfirmLogoutDialog.qml
+        qml/VerificationMessage.qml
+        qml/EmojiItem.qml
+        qml/EmojiRow.qml
+        qml/EmojiSas.qml
+        qml/VerificationCanceled.qml
+        qml/MessageSourceSheet.qml
+        qml/LocationChooser.qml
+        qml/InvitationView.qml
+        qml/AvatarTabButton.qml
+        qml/OsmLocationPlugin.qml
+        qml/FullScreenMap.qml
+        qml/ChooseRoomDialog.qml
+        qml/QrCodeMaximizeComponent.qml
+        qml/NotificationsView.qml
+        qml/ServerComboBox.qml
+        qml/UserSearchPage.qml
+        qml/ManualUserDialog.qml
+        qml/RecommendedSpaceDialog.qml
+        qml/ShareDialog.qml
+        qml/UnlockSSSSDialog.qml
+        qml/QrScannerPage.qml
+        qml/JoinRoomDialog.qml
+        qml/ConfirmUrlDialog.qml
+        qml/AccountSwitchDialog.qml
+        qml/ConfirmLeaveDialog.qml
+        qml/CodeMaximizeComponent.qml
+        qml/EditStateDialog.qml
+        qml/ConsentDialog.qml
+        qml/AskDirectChatConfirmation.qml
+        qml/HoverLinkIndicator.qml
+        qml/AvatarNotification.qml
+        qml/ReasonDialog.qml
+        qml/NewPollDialog.qml
+        qml/UserMenu.qml
+    DEPENDENCIES
+        QtCore
+        QtQuick
+        org.kde.prison
+        org.kde.prison.scanner
+    IMPORTS
+        org.kde.neochat.libneochat
+        org.kde.neochat.rooms
+        org.kde.neochat.roominfo
+        org.kde.neochat.timeline
+        org.kde.neochat.spaces
+        org.kde.neochat.settings
+        org.kde.neochat.devtools
+        org.kde.neochat.login
+        org.kde.neochat.chatbar
+)
+
+if(NOT ANDROID AND NOT WIN32)
+    qt_target_qml_sources(neochat QML_FILES
+        qml/ShareAction.qml
+        qml/GlobalMenu.qml
+        qml/EditMenu.qml
+    )
+else()
+    qt_target_qml_sources(neochat QML_FILES
+            qml/ShareActionStub.qml
+            qml/GlobalMenuStub.qml
+    )
+endif()
+
+if(WIN32)
+    set_target_properties(neochat PROPERTIES OUTPUT_NAME "neochatlib")
+endif()
+
+add_executable(neochat-app
+    main.cpp
+)
+
+if(TARGET Qt::WebView)
+    target_link_libraries(neochat-app PUBLIC Qt::WebView)
+    target_compile_definitions(neochat-app PUBLIC -DHAVE_WEBVIEW)
+endif()
+
+target_include_directories(neochat-app PRIVATE ${CMAKE_BINARY_DIR})
+
+target_link_libraries(neochat-app PRIVATE
+    neochat
+)
+
+ecm_add_app_icon(NEOCHAT_ICON ICONS ${CMAKE_SOURCE_DIR}/128-logo.png)
+
+target_sources(neochat-app PRIVATE ${NEOCHAT_ICON})
+
+if(NOT ANDROID)
+    if (NOT WIN32 AND NOT APPLE)
+        target_sources(neochat PRIVATE trayicon_sni.cpp trayicon_sni.h)
+        target_link_libraries(neochat PRIVATE KF6::StatusNotifierItem)
+    else()
+        target_sources(neochat PRIVATE trayicon.cpp trayicon.h)
+    endif()
+    target_link_libraries(neochat PUBLIC KF6::WindowSystem)
+    target_compile_definitions(neochat PUBLIC -DHAVE_WINDOWSYSTEM)
+endif()
+
+if (NOT ANDROID AND NOT WIN32 AND NOT APPLE AND NOT HAIKU)
+    target_compile_definitions(neochat PUBLIC -DHAVE_RUNNER)
+    target_compile_definitions(neochat PUBLIC -DHAVE_X11=1)
+    target_sources(neochat PRIVATE runner.cpp)
+
+    if (TARGET KUnifiedPush)
+        target_sources(neochat PRIVATE fakerunner.cpp)
+    endif()
+else()
+    target_compile_definitions(neochat PUBLIC -DHAVE_X11=0)
+endif()
+
+target_include_directories(neochat PRIVATE ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/models)
+target_link_libraries(neochat PRIVATE Loginplugin Roomsplugin RoomInfoplugin Timelineplugin Spacesplugin Chatbarplugin Settingsplugin Devtoolsplugin)
+target_link_libraries(neochat PUBLIC
+    LibNeoChat
+    Timeline
+    Settings
+    Qt::Core
+    Qt::Quick
+    Qt::Qml
+    Qt::Gui
+    Qt::Multimedia
+    Qt::Network
+    Qt::QuickControls2
+    Qt::TextToSpeech
+    KF6::I18n
+    KF6::Kirigami
+    KF6::Notifications
+    KF6::ConfigCore
+    KF6::ConfigGui
+    KF6::CoreAddons
+    KF6::SonnetCore
+    KF6::IconThemes
+    KF6::ItemModels
+    QuotientQt6
+    Login
+    Rooms
+    Spaces
+)
+
+if (TARGET KF6::Crash)
+    target_link_libraries(neochat PUBLIC KF6::Crash)
+endif()
+
+kconfig_target_kcfg_file(neochat FILE neochatconfig.kcfg CLASS_NAME NeoChatConfig MUTATORS GENERATE_PROPERTIES DEFAULT_VALUE_GETTERS PARENT_IN_CONSTRUCTOR SINGLETON GENERATE_MOC QML_REGISTRATION)
+
+if(NEOCHAT_FLATPAK)
+    target_compile_definitions(neochat PUBLIC NEOCHAT_FLATPAK)
+endif()
+
+if(ANDROID)
+    target_sources(neochat PRIVATE notifyrc.qrc)
+    target_link_libraries(neochat PRIVATE Qt::Svg OpenSSL::SSL)
+    if(SQLite3_FOUND)
+        target_link_libraries(neochat-app PRIVATE SQLite::SQLite3)
+    endif()
+    target_sources(neochat-app PRIVATE notifyrc.qrc)
+    target_link_libraries(neochat PUBLIC Qt::Svg OpenSSL::SSL)
+    kirigami_package_breeze_icons(ICONS
+        "arrow-down-symbolic"
+        "arrow-up-symbolic"
+        "arrow-up-double-symbolic"
+        "arrow-left-symbolic"
+        "arrow-right-symbolic"
+        "checkmark"
+        "help-about"
+        "im-user"
+        "im-invisible-user"
+        "im-kick-user"
+        "mail-attachment"
+        "dialog-cancel"
+        "preferences-desktop-emoticons"
+        "preferences-security"
+        "document-open"
+        "document-save"
+        "document-send"
+        "dialog-close"
+        "edit-delete-remove"
+        "code-context"
+        "document-edit"
+        "list-user-add"
+        "list-add-user"
+        "user-others"
+        "media-playback-pause"
+        "media-playback-start"
+        "media-playback-stop"
+        "go-previous"
+        "go-up"
+        "go-down"
+        "list-add"
+        "irc-join-channel"
+        "settings-configure"
+        "configure"
+        "rating"
+        "rating-unrated"
+        "search"
+        "mail-replied-symbolic"
+        "edit-clear"
+        "edit-copy"
+        "gtk-quit"
+        "compass"
+        "computer"
+        "network-connect"
+        "list-remove-user"
+        "org.kde.neochat"
+        "org.kde.neochat.tray"
+        "preferences-system-users"
+        "preferences-desktop-theme-global"
+        "notifications"
+        "notifications-disabled"
+        "audio-volume-high"
+        "audio-volume-muted"
+        "draw-highlight"
+        "zoom-in"
+        "zoom-out"
+        "image-rotate-left-symbolic"
+        "image-rotate-right-symbolic"
+        "channel-secure-symbolic"
+        "download"
+        "smiley"
+        "tools-check-spelling"
+        "username-copy"
+        "system-switch-user"
+        "bookmark-new"
+        "bookmark-remove"
+        "favorite"
+        "window-new"
+        "globe"
+        "visibility"
+        "home"
+        "preferences-desktop-notification"
+        "computer-symbolic"
+        "gps"
+        "system-users-symbolic"
+        "map-flat"
+        "documentinfo"
+        "view-list-details"
+        "go-previous"
+        "mail-forward-symbolic"
+        "dialog-warning-symbolic"
+        "object-rotate-left"
+        "object-rotate-right"
+        "add-subtitle"
+        "security-high"
+        "security-low"
+        "security-low-symbolic"
+        "kde"
+        "list-remove-symbolic"
+        "edit-delete"
+        "user-home-symbolic"
+        "pin-symbolic"
+        "kt-restore-defaults-symbolic"
+        "user-symbolic"
+        "mark-location-symbolic"
+
+        ${KIRIGAMI_ADDONS_ICONS}
+    )
+    ecm_add_android_apk(neochat-app ANDROID_DIR ${CMAKE_SOURCE_DIR}/android)
+else()
+    target_link_libraries(neochat PUBLIC Qt::Widgets KF6::KIOWidgets)
+    install(FILES neochat.notifyrc DESTINATION ${KDE_INSTALL_KNOTIFYRCDIR})
+endif()
+
+if(NOT ANDROID)
+    set_target_properties(neochat-app PROPERTIES OUTPUT_NAME "neochat")
+endif()
+
+if(TARGET KF6::DBusAddons AND NOT WIN32)
+    target_link_libraries(neochat PUBLIC KF6::DBusAddons)
+    target_compile_definitions(neochat PUBLIC -DHAVE_KDBUSADDONS)
+endif()
+
+if (TARGET KF6::KIOWidgets)
+    target_compile_definitions(neochat PUBLIC -DHAVE_KIO)
+endif()
+
+if (TARGET KUnifiedPush)
+    target_compile_definitions(neochat PUBLIC -DHAVE_KUNIFIEDPUSH)
+    target_link_libraries(neochat PUBLIC KUnifiedPush)
+
+    if (NOT ANDROID)
+        configure_file(org.kde.neochat.service.in ${CMAKE_CURRENT_BINARY_DIR}/org.kde.neochat.service)
+        install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.kde.neochat.service DESTINATION ${KDE_INSTALL_DBUSSERVICEDIR})
+    endif()
+endif()
+
+install(TARGETS neochat-app ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
+
+if (NOT ANDROID AND NOT WIN32 AND NOT APPLE)
+    install(FILES plasma-runner-neochat.desktop DESTINATION ${KDE_INSTALL_DATAROOTDIR}/krunner/dbusplugins)
+endif()
--- a/src/app/blurhash.cpp
+++ b/src/app/blurhash.cpp
--- a/src/app/blurhash.h
+++ b/src/app/blurhash.h
--- a/src/app/blurhashimageprovider.cpp
+++ b/src/app/blurhashimageprovider.cpp
--- a/src/app/blurhashimageprovider.h
+++ b/src/app/blurhashimageprovider.h
--- a/src/app/controller.cpp
+++ b/src/app/controller.cpp
@@ -0,0 +1,410 @@
+// SPDX-FileCopyrightText: 2018-2019 Black Hat <bhat@encom.eu.org>
+// SPDX-FileCopyrightText: 2020 Tobias Fella <tobias.fella@kde.org>
+// SPDX-License-Identifier: GPL-3.0-only
+
+#include "controller.h"
+
+#include <Quotient/connection.h>
+#include <qt6keychain/keychain.h>
+
+#include <KLocalizedString>
+
+#include <QGuiApplication>
+#include <QTimer>
+
+#include <signal.h>
+
+#include <Quotient/csapi/notifications.h>
+#include <Quotient/events/roommemberevent.h>
+#include <Quotient/qt_connection_util.h>
+#include <Quotient/settings.h>
+
+#include "accountmanager.h"
+#include "enums/roomsortparameter.h"
+#include "mediasizehelper.h"
+#include "models/actionsmodel.h"
+#include "models/messagemodel.h"
+#include "models/pushrulemodel.h"
+#include "models/roomlistmodel.h"
+#include "models/roomtreemodel.h"
+#include "neochatconfig.h"
+#include "neochatconnection.h"
+#include "neochatroom.h"
+#include "notificationsmanager.h"
+#include "proxycontroller.h"
+#include "roommanager.h"
+
+#if defined(Q_OS_WIN) || defined(Q_OS_MAC)
+#include "trayicon.h"
+#elif !defined(Q_OS_ANDROID)
+#include "trayicon_sni.h"
+#endif
+
+#if QT_VERSION < QT_VERSION_CHECK(6, 6, 0)
+#ifndef Q_OS_ANDROID
+#include <QDBusConnection>
+#include <QDBusInterface>
+#include <QDBusMessage>
+#endif
+#endif
+
+#ifdef HAVE_KUNIFIEDPUSH
+#include <kunifiedpush/connector.h>
+#endif
+
+using namespace Quotient;
+
+static std::function<bool(const Quotient::RoomEvent *)> hiddenEventFilter = [](const RoomEvent *event) -> bool {
+    if (event->isStateEvent() && !NeoChatConfig::showStateEvent()) {
+        return true;
+    }
+    if (auto roomMemberEvent = eventCast<const RoomMemberEvent>(event)) {
+        if ((roomMemberEvent->isJoin() || roomMemberEvent->isLeave()) && !NeoChatConfig::showLeaveJoinEvent()) {
+            return true;
+        } else if (roomMemberEvent->isRename() && !roomMemberEvent->isJoin() && !roomMemberEvent->isLeave() && !NeoChatConfig::showRename()) {
+            return true;
+        } else if (roomMemberEvent->isAvatarUpdate() && !roomMemberEvent->isJoin() && !roomMemberEvent->isLeave() && !NeoChatConfig::showAvatarUpdate()) {
+            return true;
+        }
+    }
+    return false;
+};
+
+Controller::Controller(QObject *parent)
+    : QObject(parent)
+{
+    Connection::setRoomType<NeoChatRoom>();
+
+    Connection::setDirectChatEncryptionDefault(NeoChatConfig::preferUsingEncryption());
+    connect(NeoChatConfig::self(), &NeoChatConfig::PreferUsingEncryptionChanged, this, [] {
+        Connection::setDirectChatEncryptionDefault(NeoChatConfig::preferUsingEncryption());
+    });
+
+    NeoChatConnection::setGlobalUrlPreviewDefault(NeoChatConfig::showLinkPreview());
+    connect(NeoChatConfig::self(), &NeoChatConfig::ShowLinkPreviewChanged, this, [this] {
+        NeoChatConnection::setGlobalUrlPreviewDefault(NeoChatConfig::showLinkPreview());
+        Q_EMIT globalUrlPreviewDefaultChanged();
+    });
+
+    NeoChatConnection::setKeywordPushRuleDefault(static_cast<PushRuleAction::Action>(NeoChatConfig::keywordPushRuleDefault()));
+    connect(NeoChatConfig::self(), &NeoChatConfig::KeywordPushRuleDefaultChanged, this, [] {
+        NeoChatConnection::setKeywordPushRuleDefault(static_cast<PushRuleAction::Action>(NeoChatConfig::keywordPushRuleDefault()));
+    });
+
+    ActionsModel::setAllowQuickEdit(NeoChatConfig::allowQuickEdit());
+    connect(NeoChatConfig::self(), &NeoChatConfig::AllowQuickEditChanged, this, []() {
+        ActionsModel::setAllowQuickEdit(NeoChatConfig::allowQuickEdit());
+    });
+
+    MessageModel::setHiddenFilter(hiddenEventFilter);
+    RoomListModel::setHiddenFilter(hiddenEventFilter);
+    RoomTreeModel::setHiddenFilter(hiddenEventFilter);
+    NeoChatRoom::setHiddenFilter(hiddenEventFilter);
+
+    MediaSizeHelper::setMaxSize(NeoChatConfig::mediaMaxWidth(), NeoChatConfig::mediaMaxHeight());
+    connect(NeoChatConfig::self(), &NeoChatConfig::MediaMaxWidthChanged, this, []() {
+        MediaSizeHelper::setMaxSize(NeoChatConfig::mediaMaxWidth(), NeoChatConfig::mediaMaxHeight());
+    });
+    connect(NeoChatConfig::self(), &NeoChatConfig::MediaMaxHeightChanged, this, []() {
+        MediaSizeHelper::setMaxSize(NeoChatConfig::mediaMaxWidth(), NeoChatConfig::mediaMaxHeight());
+    });
+
+    RoomSortParameter::setSortOrder(static_cast<RoomSortOrder::Order>(NeoChatConfig::sortOrder()));
+    connect(NeoChatConfig::self(), &NeoChatConfig::SortOrderChanged, this, []() {
+        RoomSortParameter::setSortOrder(static_cast<RoomSortOrder::Order>(NeoChatConfig::sortOrder()));
+    });
+
+    QList<RoomSortParameter::Parameter> configParamList;
+    const auto intList = NeoChatConfig::customSortOrder();
+    std::transform(intList.constBegin(), intList.constEnd(), std::back_inserter(configParamList), [](int param) {
+        return static_cast<RoomSortParameter::Parameter>(param);
+    });
+    RoomSortParameter::setCustomSortOrder(configParamList);
+    connect(NeoChatConfig::self(), &NeoChatConfig::CustomSortOrderChanged, this, []() {
+        QList<RoomSortParameter::Parameter> configParamList;
+        const auto intList = NeoChatConfig::customSortOrder();
+        std::transform(intList.constBegin(), intList.constEnd(), std::back_inserter(configParamList), [](int param) {
+            return static_cast<RoomSortParameter::Parameter>(param);
+        });
+        RoomSortParameter::setCustomSortOrder(configParamList);
+    });
+
+    ProxyController::instance().setApplicationProxy();
+
+#ifndef Q_OS_ANDROID
+    setQuitOnLastWindowClosed();
+    connect(NeoChatConfig::self(), &NeoChatConfig::SystemTrayChanged, this, &Controller::setQuitOnLastWindowClosed);
+#endif
+
+    QObject::connect(QGuiApplication::instance(), &QCoreApplication::aboutToQuit, QGuiApplication::instance(), [this] {
+        delete m_trayIcon;
+        NeoChatConfig::self()->save();
+    });
+
+#ifndef Q_OS_WINDOWS
+    const auto unixExitHandler = [](int) -> void {
+        QCoreApplication::quit();
+    };
+
+    const int quitSignals[] = {SIGQUIT, SIGINT, SIGTERM, SIGHUP};
+
+    sigset_t blockingMask;
+    sigemptyset(&blockingMask);
+    for (const auto sig : quitSignals) {
+        sigaddset(&blockingMask, sig);
+    }
+
+    struct sigaction sa;
+    sa.sa_handler = unixExitHandler;
+    sa.sa_mask = blockingMask;
+    sa.sa_flags = 0;
+
+    for (auto sig : quitSignals) {
+        sigaction(sig, &sa, nullptr);
+    }
+#endif
+
+#ifdef HAVE_KUNIFIEDPUSH
+    auto connector = new KUnifiedPush::Connector(u"org.kde.neochat"_s);
+    connect(connector, &KUnifiedPush::Connector::endpointChanged, this, [this](const QString &endpoint) {
+        if (!m_accountManager) {
+            return;
+        }
+
+        m_endpoint = endpoint;
+        for (auto &quotientConnection : m_accountManager->accounts()->accounts()) {
+            auto connection = dynamic_cast<NeoChatConnection *>(quotientConnection);
+            connection->setupPushNotifications(endpoint);
+        }
+    });
+
+    connector->registerClient(
+        i18nc("The reason for using push notifications, as in: '[Push notifications are used for] Receiving notifications for new messages'",
+              "Receiving notifications for new messages"));
+
+#endif
+}
+
+Controller &Controller::instance()
+{
+    static Controller _instance;
+    return _instance;
+}
+
+void Controller::setAccountManager(AccountManager *manager)
+{
+    if (manager == m_accountManager) {
+        return;
+    }
+
+    if (m_accountManager) {
+        m_accountManager->disconnect(this);
+    }
+
+    m_accountManager = manager;
+
+    if (m_accountManager) {
+        connect(m_accountManager, &AccountManager::errorOccured, this, &Controller::errorOccured);
+        connect(m_accountManager, &AccountManager::accountsLoadingChanged, this, &Controller::accountsLoadingChanged);
+        connect(m_accountManager, &AccountManager::connectionAdded, this, &Controller::initConnection);
+        connect(m_accountManager, &AccountManager::connectionDropped, this, &Controller::teardownConnection);
+        connect(m_accountManager, &AccountManager::activeConnectionChanged, this, &Controller::initActiveConnection);
+    }
+}
+
+void Controller::initConnection(NeoChatConnection *connection)
+{
+    if (!connection) {
+        return;
+    }
+
+    connect(
+        connection,
+        &NeoChatConnection::syncDone,
+        this,
+        [this, connection] {
+            if (!m_endpoint.isEmpty()) {
+                connection->setupPushNotifications(m_endpoint);
+            }
+        },
+        Qt::SingleShotConnection);
+    connect(connection, &NeoChatConnection::syncDone, this, [this, connection]() {
+        m_notificationsManager.handleNotifications(connection);
+    });
+    connect(this, &Controller::globalUrlPreviewDefaultChanged, connection, &NeoChatConnection::globalUrlPreviewEnabledChanged);
+    connect(connection, &NeoChatConnection::roomAboutToBeLeft, &RoomManager::instance(), &RoomManager::roomLeft);
+    Q_EMIT connectionAdded(connection);
+}
+
+void Controller::teardownConnection(NeoChatConnection *connection)
+{
+    if (!connection) {
+        return;
+    }
+
+    connection->disconnect(this);
+    Q_EMIT connectionDropped(connection);
+}
+
+void Controller::initActiveConnection(NeoChatConnection *oldConnection, NeoChatConnection *newConnection)
+{
+    if (oldConnection) {
+        oldConnection->disconnect(this);
+    }
+
+    if (newConnection) {
+        connect(newConnection, &NeoChatConnection::errorOccured, this, &Controller::errorOccured);
+        connect(newConnection, &NeoChatConnection::badgeNotificationCountChanged, this, &Controller::updateBadgeNotificationCount);
+        newConnection->refreshBadgeNotificationCount();
+    }
+    Q_EMIT activeConnectionChanged(newConnection);
+}
+
+bool Controller::supportSystemTray() const
+{
+#ifdef Q_OS_ANDROID
+    return false;
+#else
+    auto de = QString::fromLatin1(qgetenv("XDG_CURRENT_DESKTOP"));
+    return de != u"GNOME"_s && de != u"Pantheon"_s;
+#endif
+}
+
+void Controller::setQuitOnLastWindowClosed()
+{
+#ifndef Q_OS_ANDROID
+    if (supportSystemTray() && NeoChatConfig::self()->systemTray()) {
+        m_trayIcon = new TrayIcon(this);
+        m_trayIcon->show();
+    } else {
+        if (m_trayIcon) {
+            delete m_trayIcon;
+            m_trayIcon = nullptr;
+        }
+    }
+#endif
+}
+
+NeoChatConnection *Controller::activeConnection() const
+{
+    if (!m_accountManager) {
+        return nullptr;
+    }
+    return m_accountManager->activeConnection();
+}
+
+void Controller::setActiveConnection(NeoChatConnection *connection)
+{
+    if (!m_accountManager) {
+        return;
+    }
+    m_accountManager->setActiveConnection(connection);
+}
+
+QStringList Controller::accountsLoading() const
+{
+    if (!m_accountManager) {
+        return {};
+    }
+    return m_accountManager->accountsLoading();
+}
+
+void Controller::listenForNotifications()
+{
+#ifdef HAVE_KUNIFIEDPUSH
+    auto connector = new KUnifiedPush::Connector(u"org.kde.neochat"_s);
+
+    auto timer = new QTimer();
+    connect(timer, &QTimer::timeout, qGuiApp, &QGuiApplication::quit);
+
+    connect(connector, &KUnifiedPush::Connector::messageReceived, [timer](const QByteArray &data) {
+        instance().m_notificationsManager.postPushNotification(data);
+        timer->stop();
+    });
+
+    // Wait five seconds to see if we received any messages or this happened to be an erroneous activation.
+    // Otherwise, messageReceived is never activated, and this daemon could stick around forever.
+    timer->start(5000);
+
+    connector->registerClient(i18n("Receiving push notifications"));
+#endif
+}
+
+void Controller::clearInvitationNotification(const QString &roomId)
+{
+    m_notificationsManager.clearInvitationNotification(roomId);
+}
+
+void Controller::updateBadgeNotificationCount(int count)
+{
+#if QT_VERSION < QT_VERSION_CHECK(6, 6, 0)
+#ifndef Q_OS_ANDROID
+    // copied from Telegram desktop
+    const auto launcherUrl = "application://org.kde.neochat.desktop"_L1;
+    // Gnome requires that count is a 64bit integer
+    const qint64 counterSlice = std::min(count, 9999);
+    QVariantMap dbusUnityProperties;
+
+    if (counterSlice > 0) {
+        dbusUnityProperties["count"_L1] = counterSlice;
+        dbusUnityProperties["count-visible"_L1] = true;
+    } else {
+        dbusUnityProperties["count-visible"_L1] = false;
+    }
+
+    auto signal = QDBusMessage::createSignal("/com/canonical/unity/launcherentry/neochat"_L1, "com.canonical.Unity.LauncherEntry"_L1, "Update"_L1);
+
+    signal.setArguments({launcherUrl, dbusUnityProperties});
+
+    QDBusConnection::sessionBus().send(signal);
+#endif // Q_OS_ANDROID
+#else
+    qGuiApp->setBadgeNumber(count);
+#endif // QT_VERSION_CHECK(6, 6, 0)
+}
+
+bool Controller::isFlatpak() const
+{
+#ifdef NEOCHAT_FLATPAK
+    return true;
+#else
+    return false;
+#endif
+}
+
+AccountRegistry *Controller::accounts()
+{
+    return m_accountManager->accounts();
+}
+
+QString Controller::loadFileContent(const QString &path) const
+{
+    QUrl url(path);
+    QFile file(url.isLocalFile() ? url.toLocalFile() : url.toString());
+    file.open(QFile::ReadOnly);
+    return QString::fromLatin1(file.readAll());
+}
+
+void Controller::removeConnection(const QString &userId)
+{
+    m_accountManager->dropConnection(userId);
+}
+
+void Controller::revertToDefaultConfig()
+{
+    const auto config = NeoChatConfig::self();
+    config->setDefaults();
+    config->save();
+}
+
+bool Controller::isImageShown(const QString &eventId)
+{
+    return m_shownImages.contains(eventId);
+}
+
+void Controller::markImageShown(const QString &eventId)
+{
+    m_shownImages.append(eventId);
+}
+
+#include "moc_controller.cpp"
--- a/src/app/controller.h
+++ b/src/app/controller.h
@@ -6,6 +6,7 @@
 #include <QObject>
 #include <QQmlEngine>

+#include "accountmanager.h"
 #include "neochatconnection.h"
 #include "notificationsmanager.h"
 #include <Quotient/accountregistry.h>
@@ -48,9 +49,7 @@ class Controller : public QObject
     */
    Q_PROPERTY(bool isFlatpak READ isFlatpak CONSTANT)

-    Q_PROPERTY(QStringList accountsLoading MEMBER m_accountsLoading NOTIFY accountsLoadingChanged)
-
-    Q_PROPERTY(bool csSupported READ csSupported CONSTANT)
+    Q_PROPERTY(QStringList accountsLoading READ accountsLoading NOTIFY accountsLoadingChanged)

 public:
    static Controller &instance();
@@ -60,23 +59,12 @@ public:
        return &instance();
    }

-    void setActiveConnection(NeoChatConnection *connection);
+    void setAccountManager(AccountManager *manager);
+
    [[nodiscard]] NeoChatConnection *activeConnection() const;
+    void setActiveConnection(NeoChatConnection *connection);

-    /**
-     * @brief Add a new connection to the account registry.
-     */
-    void addConnection(NeoChatConnection *c);
-
-    /**
-     * @brief Drop a connection from the account registry.
-     */
-    void dropConnection(NeoChatConnection *c);
-
-    /**
-     * @brief Save an access token to the keychain for the given account.
-     */
-    void saveAccessTokenToKeyChain(const QString &userId, const QByteArray &accessToken);
+    QStringList accountsLoading() const;

    [[nodiscard]] bool supportSystemTray() const;

@@ -97,14 +85,10 @@ public:

    Q_INVOKABLE QString loadFileContent(const QString &path) const;

-    Quotient::AccountRegistry &accounts();
-
-    static void setTestMode(bool testMode);
+    Quotient::AccountRegistry *accounts();

    Q_INVOKABLE void removeConnection(const QString &userId);

-    bool csSupported() const;
-
    /**
     * @brief Revert all configuration values to their default.
     *
@@ -119,23 +103,22 @@ public:
 private:
    explicit Controller(QObject *parent = nullptr);

+    QPointer<AccountManager> m_accountManager;
+    void initConnection(NeoChatConnection *connection);
+    void teardownConnection(NeoChatConnection *connection);
+    void initActiveConnection(NeoChatConnection *oldConnection, NeoChatConnection *newConnection);
+
    QPointer<NeoChatConnection> m_connection;
    TrayIcon *m_trayIcon = nullptr;

-    QKeychain::ReadPasswordJob *loadAccessTokenFromKeyChain(const QString &account);
-
-    Quotient::AccountRegistry m_accountRegistry;
-    QStringList m_accountsLoading;
-    QMap<QString, QPointer<NeoChatConnection>> m_connectionsLoading;
    QString m_endpoint;
    QStringList m_shownImages;

    NotificationsManager m_notificationsManager;

 private Q_SLOTS:
-    void invokeLogin();
    void setQuitOnLastWindowClosed();
-    void updateBadgeNotificationCount(NeoChatConnection *connection, int count);
+    void updateBadgeNotificationCount(int count);

 Q_SIGNALS:
    /**
@@ -146,4 +129,6 @@ Q_SIGNALS:
    void connectionDropped(NeoChatConnection *connection);
    void activeConnectionChanged(NeoChatConnection *connection);
    void accountsLoadingChanged();
+
+    void globalUrlPreviewDefaultChanged();
 };
--- a/src/app/fakerunner.cpp
+++ b/src/app/fakerunner.cpp
--- a/src/app/fakerunner.h
+++ b/src/app/fakerunner.h
--- a/src/app/foreigntypes.h
+++ b/src/app/foreigntypes.h
@@ -22,8 +22,8 @@ struct ForeignAccountRegistry {
 public:
    static Quotient::AccountRegistry *create(QQmlEngine *, QJSEngine *)
    {
-        QQmlEngine::setObjectOwnership(&Controller::instance().accounts(), QQmlEngine::CppOwnership);
-        return &Controller::instance().accounts();
+        QQmlEngine::setObjectOwnership(Controller::instance().accounts(), QQmlEngine::CppOwnership);
+        return Controller::instance().accounts();
    }
 };

--- a/src/app/identityserverhelper.cpp
+++ b/src/app/identityserverhelper.cpp
--- a/src/app/identityserverhelper.h
+++ b/src/app/identityserverhelper.h
--- a/src/app/logger.cpp
+++ b/src/app/logger.cpp
--- a/src/app/logger.h
+++ b/src/app/logger.h
--- a/src/app/main.cpp
+++ b/src/app/main.cpp
@@ -45,10 +45,13 @@

 #include <Quotient/networkaccessmanager.h>

+#include "accountmanager.h"
 #include "blurhashimageprovider.h"
 #include "colorschemer.h"
 #include "controller.h"
 #include "logger.h"
+#include "login.h"
+#include "registration.h"
 #include "roommanager.h"
 #include "sharehandler.h"
 #include "windowcontroller.h"
@@ -144,7 +147,7 @@ int main(int argc, char *argv[])
                     QStringLiteral(NEOCHAT_VERSION_STRING),
                     i18n("Chat on Matrix"),
                     KAboutLicense::GPL_V3,
-                     i18n("© 2018-2020 Black Hat, 2020-2024 KDE Community"));
+                     i18n("© 2018-2020 Black Hat, 2020-2025 KDE Community"));
    about.addAuthor(i18n("Carl Schwan"), i18n("Maintainer"), u"carl@carlschwan.eu"_s, u"https://carlschwan.eu"_s, QUrl(u"https://carlschwan.eu/avatar.png"_s));
    about.addAuthor(i18n("Tobias Fella"), i18n("Maintainer"), u"tobias.fella@kde.org"_s, u"https://tobiasfella.de"_s);
    about.addAuthor(i18n("James Graham"), i18n("Maintainer"), u"james.h.graham@protonmail.com"_s);
@@ -208,7 +211,6 @@ int main(int argc, char *argv[])
    about.setupCommandLine(&parser);
    parser.process(app);
    about.processCommandLine(&parser);
-    Controller::setTestMode(parser.isSet("test"_L1));

 #ifdef HAVE_KUNIFIEDPUSH
    if (parser.isSet(dbusActivatedOption)) {
@@ -232,7 +234,13 @@ int main(int argc, char *argv[])
    KDBusService service(KDBusService::Unique);
 #endif

+    const auto accountManager = std::make_unique<AccountManager>(parser.isSet("test"_L1));
+    Controller::instance().setAccountManager(accountManager.get());
+    LoginHelper::instance().setAccountManager(accountManager.get());
+    Registration::instance().setAccountManager(accountManager.get());
+
    Q_IMPORT_QML_PLUGIN(org_kde_neochat_settingsPlugin)
+    Q_IMPORT_QML_PLUGIN(org_kde_neochat_roomsPlugin)
    Q_IMPORT_QML_PLUGIN(org_kde_neochat_timelinePlugin)
    Q_IMPORT_QML_PLUGIN(org_kde_neochat_devtoolsPlugin)
    Q_IMPORT_QML_PLUGIN(org_kde_neochat_loginPlugin)
@@ -245,32 +253,32 @@ int main(int argc, char *argv[])

 #ifdef HAVE_KDBUSADDONS
    service.connect(&service,
-        &KDBusService::activateRequested,
-        &RoomManager::instance(),
-        [&engine](const QStringList &arguments, const QString &workingDirectory) {
-            Q_UNUSED(workingDirectory);
+                    &KDBusService::activateRequested,
+                    &RoomManager::instance(),
+                    [&engine](const QStringList &arguments, const QString &workingDirectory) {
+                        Q_UNUSED(workingDirectory);

-            QWindow *window = windowFromEngine(&engine);
-            KWindowSystem::updateStartupId(window);
+                        QWindow *window = windowFromEngine(&engine);
+                        KWindowSystem::updateStartupId(window);

-            WindowController::instance().showAndRaiseWindow(QString());
+                        WindowController::instance().showAndRaiseWindow(QString());

-            // Open matrix uri
-            if (arguments.isEmpty()) {
-                return;
-            }
+                        // Open matrix uri
+                        if (arguments.isEmpty()) {
+                            return;
+                        }

-            auto args = arguments;
-            args.removeFirst();
-            if (args.length() == 2 && args[0] == "--share"_L1) {
-                ShareHandler::instance().setText(args[1]);
-                return;
-            }
+                        auto args = arguments;
+                        args.removeFirst();
+                        if (args.length() == 2 && args[0] == "--share"_L1) {
+                            ShareHandler::instance().setText(args[1]);
+                            return;
+                        }

-            for (const auto &arg : args) {
-                RoomManager::instance().resolveResource(arg);
-            }
-        });
+                        for (const auto &arg : args) {
+                            RoomManager::instance().resolveResource(arg);
+                        }
+                    });
 #endif

    engine.rootContext()->setContextObject(new KLocalizedContext(&engine));
@@ -289,9 +297,6 @@ int main(int argc, char *argv[])
    engine.addImageProvider(u"blurhash"_s, new BlurhashImageProvider);

    engine.loadFromModule("org.kde.neochat", "Main");
-    if (engine.rootObjects().isEmpty()) {
-        return -1;
-    }

    if (!parser.positionalArguments().isEmpty() && !parser.isSet("share"_L1)) {
        RoomManager::instance().setUrlArgument(parser.positionalArguments()[0]);
@@ -302,9 +307,7 @@ int main(int argc, char *argv[])
    QDBusConnection::sessionBus().registerObject("/RoomRunner"_L1, runner, QDBusConnection::ExportScriptableContents);
 #endif

-    QWindow *window = windowFromEngine(&engine);
-
-    WindowController::instance().setWindow(window);
+    WindowController::instance().setWindow(windowFromEngine(&engine));

    return app.exec();
 }
--- a/src/app/mediamanager.cpp
+++ b/src/app/mediamanager.cpp
--- a/src/app/mediamanager.h
+++ b/src/app/mediamanager.h
--- a/src/app/models/commonroomsmodel.cpp
+++ b/src/app/models/commonroomsmodel.cpp
--- a/src/app/models/commonroomsmodel.h
+++ b/src/app/models/commonroomsmodel.h
--- a/src/app/models/notificationsmodel.cpp
+++ b/src/app/models/notificationsmodel.cpp
--- a/src/app/models/notificationsmodel.h
+++ b/src/app/models/notificationsmodel.h
--- a/src/app/models/serverlistmodel.cpp
+++ b/src/app/models/serverlistmodel.cpp
--- a/src/app/models/serverlistmodel.h
+++ b/src/app/models/serverlistmodel.h
--- a/src/app/models/userdirectorylistmodel.cpp
+++ b/src/app/models/userdirectorylistmodel.cpp
--- a/src/app/models/userdirectorylistmodel.h
+++ b/src/app/models/userdirectorylistmodel.h
--- a/src/app/neochat.notifyrc
+++ b/src/app/neochat.notifyrc
--- a/src/app/neochatconfig.kcfg
+++ b/src/app/neochatconfig.kcfg
@@ -134,21 +134,8 @@
    </entry>
    <entry name="SortOrder" type="Enum">
      <label>The sort order for the rooms in the list.</label>
-      <choices>
-        <choice name="Alphabetical">
-          <label>Alphabetical</label>
-        </choice>
-        <choice name="Activity">
-          <label>Activity</label>
-        </choice>
-        <choice name="LastMessage">
-          <label>Last Message</label>
-        </choice>
-        <choice name="Custom">
-          <label>Custom</label>
-        </choice>
+      <choices name="::RoomSortOrder::Order">
      </choices>
-      <default>Activity</default>
    </entry>
    <entry name="CustomSortOrder" type="IntList">
      <label>The list of parameter in order to use for custom sorting</label>
--- a/Show More
+++ b/Show More