Since only 1 message can be edited instantiate just 1 instance of ChatDocumentHandler and update when a message is edited.

2023-02-14 18:33:26 +00:00
193 changed files with 27999 additions and 39958 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -10,4 +10,3 @@ kate.project.ctags.*
 *.user
 .flatpak-builder/
 .idea/
-cmake-build-*
--- a/.kde-ci.yml
+++ b/.kde-ci.yml
@@ -1,8 +1,8 @@
-# SPDX-FileCopyrightText: 2021 Tobias Fella <tobias.fella@kde.org>
+# SPDX-FileCopyrightText: 2021 Tobias Fella <fella@posteo.de>
 # SPDX-License-Identifier: BSD-2-Clause

 Dependencies:
- 'on': ['Linux/Qt5', 'Android/Qt5', 'FreeBSD/Qt5', 'Windows/Qt5']
+- 'on': ['@all']
  'require':
    'frameworks/extra-cmake-modules': '@stable'
    'frameworks/kcoreaddons': '@stable'
@@ -11,7 +11,6 @@ Dependencies:
    'frameworks/kconfig': '@stable'
    'frameworks/syntax-highlighting': '@stable'
    'frameworks/kitemmodels': '@stable'
-    'frameworks/kquickcharts': '@stable'
    'frameworks/knotifications': '@stable'
    'libraries/kquickimageeditor': '@stable'
    'frameworks/sonnet': '@stable'
@@ -20,43 +19,15 @@ Dependencies:
    'third-party/qtkeychain': '@latest'
    'third-party/cmark': '@latest'
    'third-party/qcoro': '@latest'
- 'on': ['Windows/Qt5', 'Linux/Qt5', 'FreeBSD/Qt5']
+- 'on': ['Windows', 'Linux', 'FreeBSD']
  'require':
    'frameworks/qqc2-desktop-style': '@stable'
    'frameworks/kio': '@stable'
    'frameworks/kwindowsystem': '@stable'
    'frameworks/kconfigwidgets': '@stable'
- 'on': ['Linux/Qt5', 'FreeBSD/Qt5']
+- 'on': ['Linux', 'FreeBSD']
  'require':
    'frameworks/kdbusaddons': '@stable'

- 'on': ['Linux/Qt6', 'Android/Qt6', 'FreeBSD/Qt6', 'Windows/Qt6']
-  'require':
-    'frameworks/extra-cmake-modules': '@latest-kf6'
-    'frameworks/kcoreaddons': '@latest-kf6'
-    'frameworks/kirigami': '@latest-kf6'
-    'frameworks/ki18n': '@latest-kf6'
-    'frameworks/kconfig': '@latest-kf6'
-    'frameworks/syntax-highlighting': '@latest-kf6'
-    'frameworks/kitemmodels': '@latest-kf6'
-    'frameworks/kquickcharts': '@latest-kf6'
-    'frameworks/knotifications': '@latest-kf6'
-    'libraries/kquickimageeditor': '@latest-kf6'
-    'frameworks/sonnet': '@latest-kf6'
-    'libraries/kirigami-addons': '@latest-kf6'
-    'third-party/libquotient': '@latest'
-    'third-party/qtkeychain': '@latest'
-    'third-party/cmark': '@latest'
-    'third-party/qcoro': '@latest'
- 'on': ['Windows/Qt6', 'Linux/Qt6', 'FreeBSD/Qt6']
-  'require':
-    'frameworks/qqc2-desktop-style': '@latest-kf6'
-    'frameworks/kio': '@latest-kf6'
-    'frameworks/kwindowsystem': '@latest-kf6'
-    'frameworks/kconfigwidgets': '@latest-kf6'
- 'on': ['Linux/Qt6', 'FreeBSD/Qt6']
-  'require':
-    'frameworks/kdbusaddons': '@latest-kf6'
-
 Options:
  require-passing-tests-on: [ 'Linux/Qt5', 'FreeBSD', 'Windows' ]
--- a/.reuse/dep5
+++ b/.reuse/dep5
@@ -7,7 +7,7 @@ Copyright: 2020 Carson Black <uhhadd@gmail.com>
 License: LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL

 Files: android/res/drawable/splash.xml
-Copyright: 2020 Tobias Fella <tobias.fella@kde.org>
+Copyright: 2020 Tobias Fella <fella@posteo.de>
 License: BSD-2-Clause

 Files: .gitignore
@@ -27,11 +27,11 @@ Copyright: 2021 Carl Schwan <carlschwan@kde.org>
 License: BSD-2-Clause

 Files: src/neochatconfig.kcfg
-Copyright: 2020-2021 Carl Schwan <carlschwan@kde.org>, Tobias Fella <tobias.fella@kde.org>
+Copyright: 2020-2021 Carl Schwan <carlschwan@kde.org>, Tobias Fella <fella@posteo.de>
 License: BSD-2-Clause

 Files: src/neochat.notifyrc
-Copyright: 2020 Tobias Fella <tobias.fella@kde.org>
+Copyright: 2020 Tobias Fella <fella@posteo.de>
 License: BSD-2-Clause

 Files: src/qml/Component/confetti.png src/qml/Component/glowdot.png
@@ -39,5 +39,5 @@ Copyright: 2021 Alexey Andreyev <aa13q@ya.ru>
 License: CC0-1.0

 Files: .flatpak-manifest.json
-Copyright: 2020-2022 Tobias Fella <tobias.fella@kde.org>
+Copyright: 2020-2022 Tobias Fella <fella@posteo.de>
 License: BSD-2-Clause
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,6 @@
 # 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: 2020-2021 Tobias Fella <fella@posteo.de>
 # SPDX-FileCopyrightText: 2021 Adriaan de Groot <groot@kde.org>
 # SPDX-License-Identifier: BSD-2-Clause

@@ -8,19 +8,19 @@ cmake_minimum_required(VERSION 3.16)

 # KDE Applications version, managed by release script.
 set(RELEASE_SERVICE_VERSION_MAJOR "23")
-set(RELEASE_SERVICE_VERSION_MINOR "07")
+set(RELEASE_SERVICE_VERSION_MINOR "03")
 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 "5.91.0")
+set(KF5_MIN_VERSION "5.91.0")
 set(QT_MIN_VERSION "5.15.2")
 if (ANDROID)
    set(QT_MIN_VERSION "5.15.8")
 endif()

-find_package(ECM ${KF_MIN_VERSION} REQUIRED NO_MODULE)
+find_package(ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE)

 set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake)

@@ -57,16 +57,22 @@ set_package_properties(Qt${QT_MAJOR_VERSION} PROPERTIES
    TYPE REQUIRED
    PURPOSE "Basic application components"
 )
-find_package(KF${QT_MAJOR_VERSION} ${KF_MIN_VERSION} COMPONENTS Kirigami2 I18n Notifications Config CoreAddons Sonnet ItemModels)
-set_package_properties(KF${QT_MAJOR_VERSION} PROPERTIES
+find_package(KF5 ${KF5_MIN_VERSION} COMPONENTS Kirigami2 I18n Notifications Config CoreAddons Sonnet ItemModels)
+set_package_properties(KF5 PROPERTIES
    TYPE REQUIRED
    PURPOSE "Basic application components"
 )
-set_package_properties(KF${QT_MAJOR_VERSION}Kirigami2 PROPERTIES
-        TYPE REQUIRED
-        PURPOSE "Kirigami application UI framework"
-        )
-find_package(KF${QT_MAJOR_VERSION}KirigamiAddons 0.7.2 REQUIRED)
+set_package_properties(KF5Kirigami2 PROPERTIES
+    TYPE REQUIRED
+    PURPOSE "Kirigami application UI framework"
+)
+find_package(KF5KirigamiAddons 0.6 REQUIRED)
+
+find_package(Qt${QT_MAJOR_VERSION}Keychain)
+set_package_properties(Qt${QT_MAJOR_VERSION}Keychain PROPERTIES
+    TYPE REQUIRED
+    PURPOSE "Secure storage of account secrets"
+)

 if(ANDROID)
    find_package(OpenSSL)
@@ -76,18 +82,18 @@ if(ANDROID)
    )
 else()
    find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} COMPONENTS Widgets)
-    find_package(KF${QT_MAJOR_VERSION} ${KF_MIN_VERSION} REQUIRED COMPONENTS QQC2DesktopStyle ConfigWidgets KIO WindowSystem)
-    set_package_properties(KF${QT_MAJOR_VERSION}QQC2DesktopStyle PROPERTIES
+    find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS QQC2DesktopStyle ConfigWidgets KIO WindowSystem)
+    set_package_properties(KF5QQC2DesktopStyle PROPERTIES
        TYPE RUNTIME
    )
    ecm_find_qmlmodule(org.kde.syntaxhighlighting 1.0)
 endif()

 if (NOT ANDROID AND NOT WIN32 AND NOT APPLE)
-    find_package(KF${QT_MAJOR_VERSION}DBusAddons ${KF_MIN_VERSION} REQUIRED)
+    find_package(KF5DBusAddons ${KF5_MIN_VERSION} REQUIRED)
 endif()

-find_package(Quotient 0.7)
+find_package(Quotient 0.6)
 set_package_properties(Quotient PROPERTIES
    TYPE REQUIRED
    DESCRIPTION "Qt wrapper around Matrix API"
@@ -105,7 +111,6 @@ set_package_properties(cmark PROPERTIES

 ecm_find_qmlmodule(org.kde.kquickimageeditor 1.0)
 ecm_find_qmlmodule(org.kde.kitemmodels 1.0)
-ecm_find_qmlmodule(org.kde.quickcharts 1.0)

 find_package(KQuickImageEditor COMPONENTS)
 set_package_properties(KQuickImageEditor PROPERTIES
@@ -119,15 +124,19 @@ find_package(QCoro${QT_MAJOR_VERSION} 0.4 COMPONENTS Core REQUIRED)

 qcoro_enable_coroutines()

-find_package(KF${QT_MAJOR_VERSION}DocTools ${KF_MIN_VERSION})
-set_package_properties(KF${QT_MAJOR_VERSION}DocTools PROPERTIES DESCRIPTION
+find_package(KF5DocTools ${KF5_MIN_VERSION})
+set_package_properties(KF5DocTools PROPERTIES DESCRIPTION
    "Tools to generate documentation"
    TYPE OPTIONAL
 )

+find_package(Sqlite3)
+
+if(NOT Quotient_VERSION_MINOR GREATER 6)
+    cmake_policy(SET CMP0063 OLD)
+endif()

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

@@ -141,12 +150,12 @@ install(FILES org.kde.neochat.tray.svg DESTINATION ${KDE_INSTALL_FULL_ICONDIR}/h
 add_definitions(-DQT_NO_FOREACH)

 add_subdirectory(src)
-if (BUILD_TESTING)
+if (BUILD_TESTING AND Quotient_VERSION_MINOR GREATER 6)
    find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} NO_MODULE COMPONENTS Test)
    add_subdirectory(autotests)
 endif()

-if(KF${QT_MAJOR_VERSION}DocTools_FOUND)
+if(KF5DocTools_FOUND)
    kdoctools_install(po)
    add_subdirectory(doc)
 endif()
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 <!--
    SPDX-FileCopyrightText: 2020-2021 Carl Schwan <carlschwan@kde.org>
-    SPDX-FileCopyrightText: 2020-2021 Tobias Fella <tobias.fella@kde.org>
+    SPDX-FileCopyrightText: 2020-2021 Tobias Fella <fella@posteo.de>
    SPDX-License-Identifier: CC0-1.0
 -->
 # NeoChat
--- a/autotests/CMakeLists.txt
+++ b/autotests/CMakeLists.txt
@@ -8,9 +8,3 @@ ecm_add_test(
    LINK_LIBRARIES neochat Qt::Test Quotient
    TEST_NAME neochatroomtest
 )
-
-ecm_add_test(
-    texthandlertest.cpp
-    LINK_LIBRARIES neochat Qt::Test
-    TEST_NAME texthandlertest
-)
--- a/autotests/neochatroomtest.cpp
+++ b/autotests/neochatroomtest.cpp
@@ -136,7 +136,7 @@ void NeoChatRoomTest::initTestCase()
 void NeoChatRoomTest::subtitleTextTest()
 {
    QCOMPARE(room->timelineSize(), 1);
-    QCOMPARE(room->lastEventToString(), QStringLiteral("@example:example.org: This is an example text message"));
+    QCOMPARE(room->subtitleText(), QStringLiteral("@example:example.org: This is an example text message"));
 }

 void NeoChatRoomTest::eventTest()
--- a/autotests/texthandlertest.cpp
+++ b/autotests/texthandlertest.cpp
@@ -1,587 +0,0 @@
-// SPDX-FileCopyrightText: 2023 James Graham <james.h.graham@protonmail.com>
-// SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
-
-#include <QObject>
-#include <QTest>
-
-#include "texthandler.h"
-
-#include <qnamespace.h>
-#include <quotient_common.h>
-#include <syncdata.h>
-
-using namespace Quotient;
-
-class TestRoom : public NeoChatRoom
-{
-public:
-    using NeoChatRoom::NeoChatRoom;
-
-    void update(SyncRoomData &&data, bool fromCache = false)
-    {
-        Room::updateData(std::move(data), fromCache);
-    }
-};
-
-class TextHandlerTest : public QObject
-{
-    Q_OBJECT
-
-private:
-    Connection *connection = nullptr;
-    TestRoom *room = nullptr;
-
-private Q_SLOTS:
-    void initTestCase();
-
-    void allowedAttributes();
-    void stripDisallowedTags();
-    void stripDisallowedAttributes();
-    void emptyCodeTags();
-
-    void sendSimpleStringCase();
-    void sendSingleParaMarkup();
-    void sendMultipleSectionMarkup();
-    void sendBadLinks();
-    void sendEscapeCode();
-    void sendCodeClass();
-
-    void receiveStripReply();
-    void receivePlainTextIn();
-
-    void receiveRichInPlainOut_data();
-    void receiveRichInPlainOut();
-    void receivePlainStripHtml();
-    void receivePlainStripMarkup();
-    void receiveStripNewlines();
-
-    void receiveRichUserPill();
-    void receiveRichStrikethrough();
-    void receiveRichtextIn();
-    void receiveRichMxcUrl();
-    void receiveRichPlainUrl();
-    void receiveRichEmote();
-    void receiveRichEdited_data();
-    void receiveRichEdited();
-};
-
-void TextHandlerTest::initTestCase()
-{
-    connection = Connection::makeMockConnection(QStringLiteral("@bob:kde.org"));
-    room = new TestRoom(connection, QStringLiteral("#myroom:kde.org"), JoinState::Join);
-
-    const auto json = QJsonDocument::fromJson(R"EVENT({
-  "account_data": {
-    "events": [
-      {
-        "content": {
-          "tags": {
-            "u.work": {
-              "order": 0.9
-            }
-          }
-        },
-        "type": "m.tag"
-      },
-      {
-        "content": {
-          "custom_config_key": "custom_config_value"
-        },
-        "type": "org.example.custom.room.config"
-      }
-    ]
-  },
-  "ephemeral": {
-    "events": [
-      {
-        "content": {
-          "user_ids": [
-            "@alice:matrix.org",
-            "@bob:example.com"
-          ]
-        },
-        "room_id": "!jEsUZKDJdhlrceRyVU:example.org",
-        "type": "m.typing"
-      }
-    ]
-  },
-  "state": {
-    "events": [
-      {
-        "content": {
-          "avatar_url": "mxc://example.org/SEsfnsuifSDFSSEF",
-          "displayname": "Alice Margatroid",
-          "membership": "join",
-          "reason": "Looking for support"
-        },
-        "event_id": "$143273582443PhrSn:example.org",
-        "origin_server_ts": 1432735824653,
-        "room_id": "!jEsUZKDJdhlrceRyVU:example.org",
-        "sender": "@example:example.org",
-        "state_key": "@alice:example.org",
-        "type": "m.room.member",
-        "unsigned": {
-          "age": 1234
-        }
-      }
-    ]
-  },
-  "summary": {
-    "m.heroes": [
-      "@alice:example.com",
-      "@bob:example.com"
-    ],
-    "m.invited_member_count": 0,
-    "m.joined_member_count": 2
-  },
-  "timeline": {
-    "events": [
-      {
-        "content": {
-          "body": "This is an **example** text message",
-          "format": "org.matrix.custom.html",
-          "formatted_body": "<b>This is an example text message</b>",
-          "msgtype": "m.text"
-        },
-        "event_id": "$143273582443PhrSn:example.org",
-        "origin_server_ts": 1432735824654,
-        "room_id": "!jEsUZKDJdhlrceRyVU:example.org",
-        "sender": "@example:example.org",
-        "type": "m.room.message",
-        "unsigned": {
-          "age": 1232
-        }
-      },
-      {
-        "content": {
-          "body": "/me This is an emote.",
-          "format": "org.matrix.custom.html",
-          "formatted_body": "This is an emote.",
-          "msgtype": "m.emote"
-        },
-        "event_id": "$153273582443PhrSn:example.org",
-        "origin_server_ts": 1532735824654,
-        "room_id": "!jEsUZKDJdhlrceRyVU:example.org",
-        "sender": "@example:example.org",
-        "type": "m.room.message",
-        "unsigned": {
-          "age": 1231
-        }
-      },
-      {
-        "content": {
-            "body": "tested",
-            "msgtype": "m.text"
-        },
-        "event_id": "$zrCiBxBnqqTn0Z5FY78qSZAszno_w8nJJXzfBULG-3E",
-        "origin_server_ts": 1680948575928,
-        "room_id": "!jEsUZKDJdhlrceRyVU:example.org",
-        "sender": "@example:example.org",
-        "type": "m.room.message",
-        "unsigned": {
-            "age": 1747776,
-            "m.relations": {
-                "m.replace": {
-                    "event_id": "$UX0PlpyI7vYO32iHMuuYEP7ECMh4sX3XLGiB2SwM4mQ",
-                    "origin_server_ts": 1680948580992,
-                    "sender": "@example:example.org"
-                }
-            }
-        }
-      }
-    ],
-    "limited": true,
-    "prev_batch": "t34-23535_0_0"
-  }
-})EVENT");
-    SyncRoomData roomData(QStringLiteral("@bob:kde.org"), JoinState::Join, json.object());
-    room->update(std::move(roomData));
-}
-
-void TextHandlerTest::allowedAttributes()
-{
-    const QString testInputString1 = QStringLiteral("<p><span data-mx-spoiler><font color=#FFFFFF>Test</font><span></p>");
-    const QString testOutputString1 = QStringLiteral("<p><span data-mx-spoiler><font color=#FFFFFF>Test</font><span></p>");
-    // Handle urls where the href has either single (') or double (") quotes.
-    const QString testInputString2 = QStringLiteral("<p><a href=\"https://kde.org\">link</a><a href='https://kde.org'>link</a></p>");
-    const QString testOutputString2 = QStringLiteral("<p><a href=\"https://kde.org\">link</a><a href='https://kde.org'>link</a></p>");
-
-    TextHandler testTextHandler;
-    testTextHandler.setData(testInputString1);
-
-    QCOMPARE(testTextHandler.handleSendText(), testOutputString1);
-    QCOMPARE(testTextHandler.handleRecieveRichText(), testOutputString1);
-
-    testTextHandler.setData(testInputString2);
-    QCOMPARE(testTextHandler.handleSendText(), testOutputString2);
-    QCOMPARE(testTextHandler.handleRecieveRichText(), testOutputString2);
-}
-
-void TextHandlerTest::stripDisallowedTags()
-{
-    const QString testInputString = QStringLiteral("<p>Allowed</p> <span>Allowed</span> <body>Disallowed</body>");
-    const QString testOutputString = QStringLiteral("<p>Allowed</p> <span>Allowed</span> Disallowed");
-
-    TextHandler testTextHandler;
-    testTextHandler.setData(testInputString);
-
-    QCOMPARE(testTextHandler.handleSendText(), testOutputString);
-    QCOMPARE(testTextHandler.handleRecieveRichText(), testOutputString);
-}
-
-void TextHandlerTest::stripDisallowedAttributes()
-{
-    const QString testInputString = QStringLiteral("<p style=\"font-size:50px;\" color=#FFFFFF>Test</p>");
-    const QString testOutputString = QStringLiteral("<p>Test</p>");
-
-    TextHandler testTextHandler;
-    testTextHandler.setData(testInputString);
-
-    QCOMPARE(testTextHandler.handleSendText(), testOutputString);
-    QCOMPARE(testTextHandler.handleRecieveRichText(), testOutputString);
-}
-
-/**
- * Make sure that empty code tags are handled.
- * (this was a bug during development hence the test)
- */
-void TextHandlerTest::emptyCodeTags()
-{
-    const QString testInputString = QStringLiteral("<pre><code></code></pre>");
-    const QString testOutputString = QStringLiteral("<pre><code></code></pre>");
-
-    TextHandler testTextHandler;
-    testTextHandler.setData(testInputString);
-
-    QCOMPARE(testTextHandler.handleSendText(), testOutputString);
-    QCOMPARE(testTextHandler.handleRecieveRichText(), testOutputString);
-}
-
-void TextHandlerTest::sendSimpleStringCase()
-{
-    const QString testInputString = QStringLiteral("This data should just be put in a paragraph.");
-    const QString testOutputString = QStringLiteral("<p>This data should just be put in a paragraph.</p>");
-
-    TextHandler testTextHandler;
-    testTextHandler.setData(testInputString);
-
-    QCOMPARE(testTextHandler.handleSendText(), testOutputString);
-}
-
-void TextHandlerTest::sendSingleParaMarkup()
-{
-    const QString testInputString = QStringLiteral(
-        "Text para with **bold**, *italic*, [link](https://kde.org), ![image](mxc://kde.org/aebd3ffd40503e1ef0525bf8f0d60282fec6183e), `inline code`.");
-    const QString testOutputString = QStringLiteral(
-        "<p>Text para with <strong>bold</strong>, <em>italic</em>, <a href=\"https://kde.org\">link</a>, <img "
-        "src=\"mxc://kde.org/aebd3ffd40503e1ef0525bf8f0d60282fec6183e\" alt=\"image\">, <code>inline code</code>.</p>");
-
-    TextHandler testTextHandler;
-    testTextHandler.setData(testInputString);
-
-    QCOMPARE(testTextHandler.handleSendText(), testOutputString);
-}
-
-void TextHandlerTest::sendMultipleSectionMarkup()
-{
-    const QString testInputString =
-        QStringLiteral("Text para\n> blockquote\n* List 1\n* List 2\n1. one\n2. two\n# Heading 1\n## Heading 2\nhorizontal rule\n\n---\n```\ncodeblock\n```");
-    const QString testOutputString = QStringLiteral(
-        "<p>Text para</p>\n<blockquote>\n<p>blockquote</p>\n</blockquote>\n<ul>\n<li>List 1</li>\n<li>List "
-        "2</li>\n</ul>\n<ol>\n<li>one</li>\n<li>two</li>\n</ol>\n<h1>Heading 1</h1>\n<h2>Heading 2</h2>\n<p>horizontal "
-        "rule</p>\n<hr>\n<pre><code>codeblock\n</code></pre>");
-
-    TextHandler testTextHandler;
-    testTextHandler.setData(testInputString);
-
-    QCOMPARE(testTextHandler.handleSendText(), testOutputString);
-}
-
-void TextHandlerTest::sendBadLinks()
-{
-    const QString testInputString = QStringLiteral("[link](kde.org), ![image](https://kde.org/aebd3ffd40503e1ef0525bf8f0d60282fec6183e)");
-    const QString testOutputString = QStringLiteral("<p><a>link</a>, <img alt=\"image\"></p>");
-
-    TextHandler testTextHandler;
-    testTextHandler.setData(testInputString);
-
-    QCOMPARE(testTextHandler.handleSendText(), testOutputString);
-}
-
-/**
- * All text between code tags is treated as plain so it should get escaped.
- */
-void TextHandlerTest::sendEscapeCode()
-{
-    const QString testInputString = QStringLiteral("```\n<p>Test <span style=\"font-size:50px;\">some</span> code</p>\n```");
-    const QString testOutputString =
-        QStringLiteral("<pre><code>&lt;p&gt;Test &lt;span style=&quot;font-size:50px;&quot;&gt;some&lt;/span&gt; code&lt;/p&gt;\n</code></pre>");
-
-    TextHandler testTextHandler;
-    testTextHandler.setData(testInputString);
-
-    QCOMPARE(testTextHandler.handleSendText(), testOutputString);
-}
-
-void TextHandlerTest::sendCodeClass()
-{
-    const QString testInputString = QStringLiteral("```html\nsome code\n```\n<pre><code class=\"code-underline\">some more code</code></pre>");
-    const QString testOutputString = QStringLiteral("<pre><code class=\"language-html\">some code\n</code></pre>\n<pre><code>some more code</code></pre>");
-
-    TextHandler testTextHandler;
-    testTextHandler.setData(testInputString);
-
-    QCOMPARE(testTextHandler.handleSendText(), testOutputString);
-}
-
-void TextHandlerTest::receiveStripReply()
-{
-    const QString testInputString = QStringLiteral(
-        "<mx-reply><blockquote><a href=\"https://matrix.to/#/!somewhere:example.org/$event:example.org\">In reply to</a><a "
-        "href=\"https://matrix.to/#/@alice:example.org\">@alice:example.org</a><br />Message replied to.</blockquote></mx-reply>Reply message.");
-    const QString testOutputString = QStringLiteral("Reply message.");
-
-    TextHandler testTextHandler;
-    testTextHandler.setData(testInputString);
-
-    QCOMPARE(testTextHandler.handleRecieveRichText(), testOutputString);
-    QCOMPARE(testTextHandler.handleRecievePlainText(), testOutputString);
-}
-
-void TextHandlerTest::receiveRichInPlainOut_data()
-{
-    QTest::addColumn<QString>("testInputString");
-    QTest::addColumn<QString>("testOutputString");
-
-    QTest::newRow("ampersand") << QStringLiteral("a &amp; b") << QStringLiteral("a & b");
-    QTest::newRow("quote") << QStringLiteral("&quot;a and b&quot;") << QStringLiteral("\"a and b\"");
-}
-
-void TextHandlerTest::receiveRichInPlainOut()
-{
-    QFETCH(QString, testInputString);
-    QFETCH(QString, testOutputString);
-
-    TextHandler testTextHandler;
-    testTextHandler.setData(testInputString);
-
-    QCOMPARE(testTextHandler.handleRecievePlainText(Qt::RichText), testOutputString);
-}
-
-void TextHandlerTest::receivePlainTextIn()
-{
-    const QString testInputString = QStringLiteral("<plain text in tag bracket>\nTest link https://kde.org.");
-    const QString testOutputStringRich = QStringLiteral("&lt;plain text in tag bracket&gt;<br>Test link <a href=\"https://kde.org\">https://kde.org</a>.");
-    QString testOutputStringPlain = QStringLiteral("<plain text in tag bracket>\nTest link https://kde.org.");
-
-    // Make sure quotes are maintained in a plain string.
-    const QString testInputString2 = QStringLiteral("last line is \"Time to switch to a new topic.\"");
-    const QString testOutputString2 = QStringLiteral("last line is \"Time to switch to a new topic.\"");
-
-    TextHandler testTextHandler;
-    testTextHandler.setData(testInputString);
-
-    QCOMPARE(testTextHandler.handleRecieveRichText(Qt::PlainText), testOutputStringRich);
-    QCOMPARE(testTextHandler.handleRecievePlainText(), testOutputStringPlain);
-
-    testTextHandler.setData(testInputString2);
-    QCOMPARE(testTextHandler.handleRecieveRichText(Qt::PlainText), testOutputString2);
-    QCOMPARE(testTextHandler.handleRecievePlainText(), testOutputString2);
-}
-
-void TextHandlerTest::receiveStripNewlines()
-{
-    const QString testInputStringPlain = QStringLiteral("Test\nmany\nnew\nlines.");
-    const QString testInputStringRich = QStringLiteral("Test<br>many<br />new<br>lines.");
-    const QString testOutputString = QStringLiteral("Test many new lines.");
-
-    const QString testInputStringPlain2 = QStringLiteral("* List\n* Items");
-    const QString testOutputString2 = QStringLiteral("List Items");
-
-    TextHandler testTextHandler;
-    testTextHandler.setData(testInputStringPlain);
-
-    QCOMPARE(testTextHandler.handleRecievePlainText(Qt::PlainText, true), testOutputString);
-    QCOMPARE(testTextHandler.handleRecieveRichText(Qt::PlainText, nullptr, nullptr, true), testOutputString);
-
-    testTextHandler.setData(testInputStringRich);
-    QCOMPARE(testTextHandler.handleRecievePlainText(Qt::RichText, true), testOutputString);
-    QCOMPARE(testTextHandler.handleRecieveRichText(Qt::RichText, nullptr, nullptr, true), testOutputString);
-
-    testTextHandler.setData(testInputStringPlain2);
-    QCOMPARE(testTextHandler.handleRecievePlainText(Qt::RichText, true), testOutputString2);
-}
-
-/**
- * For a plain text output of a received string all html is stripped except for
- * code which is unescaped if it's html.
- */
-void TextHandlerTest::receivePlainStripHtml()
-{
-    const QString testInputString = QStringLiteral("<p>Test</p> <pre><code>Some code <strong>with tags</strong></code></pre>");
-    const QString testOutputString = QStringLiteral("Test Some code <strong>with tags</strong>");
-
-    TextHandler testTextHandler;
-    testTextHandler.setData(testInputString);
-
-    QCOMPARE(testTextHandler.handleRecievePlainText(Qt::RichText), testOutputString);
-}
-
-void TextHandlerTest::receivePlainStripMarkup()
-{
-    const QString testInputString = QStringLiteral("**bold** `<p>inline code</p>` *italic*");
-    const QString testOutputString = QStringLiteral("bold <p>inline code</p> italic");
-
-    TextHandler testTextHandler;
-    testTextHandler.setData(testInputString);
-
-    QCOMPARE(testTextHandler.handleRecievePlainText(), testOutputString);
-}
-
-void TextHandlerTest::receiveRichUserPill()
-{
-    const QString testInputString = QStringLiteral("<p><a href=\"https://matrix.to/#/@alice:example.org\">@alice:example.org</a></p>");
-    const QString testOutputString = QStringLiteral("<p><b><a href=\"https://matrix.to/#/@alice:example.org\">@alice:example.org</a></b></p>");
-
-    TextHandler testTextHandler;
-    testTextHandler.setData(testInputString);
-
-    QCOMPARE(testTextHandler.handleRecieveRichText(), testOutputString);
-}
-
-void TextHandlerTest::receiveRichStrikethrough()
-{
-    const QString testInputString = QStringLiteral("<p><del>Test</del></p>");
-    const QString testOutputString = QStringLiteral("<p><s>Test</s></p>");
-
-    TextHandler testTextHandler;
-    testTextHandler.setData(testInputString);
-
-    QCOMPARE(testTextHandler.handleRecieveRichText(), testOutputString);
-}
-
-void TextHandlerTest::receiveRichtextIn()
-{
-    const QString testInputString = QStringLiteral("<p>Test</p> <pre><code>Some code <strong>with tags</strong></code></pre>");
-    const QString testOutputString = QStringLiteral("<p>Test</p> <pre><code>Some code &lt;strong&gt;with tags&lt;/strong&gt;</code></pre>");
-
-    TextHandler testTextHandler;
-    testTextHandler.setData(testInputString);
-
-    QCOMPARE(testTextHandler.handleRecieveRichText(), testOutputString);
-}
-
-void TextHandlerTest::receiveRichMxcUrl()
-{
-    const QString testInputString = QStringLiteral(
-        "<img src=\"mxc://kde.org/aebd3ffd40503e1ef0525bf8f0d60282fec6183e\" alt=\"image\"><img src=\"mxc://kde.org/34c3464b3a1bd7f55af2d559e07d2c773c430e73\" "
-        "alt=\"image\">");
-    const QString testOutputString = QStringLiteral(
-        "<img "
-        "src=\"mxc://kde.org/aebd3ffd40503e1ef0525bf8f0d60282fec6183e?user_id=@bob:kde.org&room_id=%23myroom:kde.org&event_id=$143273582443PhrSn:example.org\" "
-        "alt=\"image\"><img "
-        "src=\"mxc://kde.org/34c3464b3a1bd7f55af2d559e07d2c773c430e73?user_id=@bob:kde.org&room_id=%23myroom:kde.org&event_id=$143273582443PhrSn:example.org\" "
-        "alt=\"image\">");
-
-    TextHandler testTextHandler;
-    testTextHandler.setData(testInputString);
-
-    QCOMPARE(testTextHandler.handleRecieveRichText(Qt::RichText, room, room->messageEvents().at(0).get()), testOutputString);
-}
-
-/**
- * For when your rich input string has a plain text url left in.
- *
- * This test is to show that a url that is already rich will be left alone but a
- * plain one will be linkified.
- */
-void TextHandlerTest::receiveRichPlainUrl()
-{
-    // This is an actual link that caused trouble which is why it's so long. Keeping
-    // so we can confirm consistent behaviour for complex urls.
-    const QString testInputStringLink1 = QStringLiteral(
-        "https://matrix.to/#/!RvzunyTWZGfNxJVQqv:matrix.org/$-9TJVTh5PvW6MvIhFDwteiyLBVGriinueO5eeIazQS8?via=libera.chat&amp;via=matrix.org&amp;via=fedora.im "
-        "<a "
-        "href=\"https://matrix.to/#/!RvzunyTWZGfNxJVQqv:matrix.org/"
-        "$-9TJVTh5PvW6MvIhFDwteiyLBVGriinueO5eeIazQS8?via=libera.chat&amp;via=matrix.org&amp;via=fedora.im\">Link already rich</a>");
-    const QString testOutputStringLink1 = QStringLiteral(
-        "<a "
-        "href=\"https://matrix.to/#/!RvzunyTWZGfNxJVQqv:matrix.org/"
-        "$-9TJVTh5PvW6MvIhFDwteiyLBVGriinueO5eeIazQS8?via=libera.chat&amp;via=matrix.org&amp;via=fedora.im\">https://matrix.to/#/"
-        "!RvzunyTWZGfNxJVQqv:matrix.org/$-9TJVTh5PvW6MvIhFDwteiyLBVGriinueO5eeIazQS8?via=libera.chat&amp;via=matrix.org&amp;via=fedora.im</a> <a "
-        "href=\"https://matrix.to/#/!RvzunyTWZGfNxJVQqv:matrix.org/"
-        "$-9TJVTh5PvW6MvIhFDwteiyLBVGriinueO5eeIazQS8?via=libera.chat&amp;via=matrix.org&amp;via=fedora.im\">Link already rich</a>");
-
-    // Another real case. The linkification wasn't handling it when a single link
-    // contains what looks like and email. It was been broken into 3 but needs to
-    // be just single link.
-    const QString testInputStringLink2 = QStringLiteral("https://lore.kernel.org/lkml/CAHk-=wio46vC4t6xXD-sFqjoPwFm_u515jm3suzmkGxQTeA1_A@mail.gmail.com/");
-    const QString testOutputStringLink2 = QStringLiteral(
-        "<a "
-        "href=\"https://lore.kernel.org/lkml/CAHk-=wio46vC4t6xXD-sFqjoPwFm_u515jm3suzmkGxQTeA1_A@mail.gmail.com/\">https://lore.kernel.org/lkml/"
-        "CAHk-=wio46vC4t6xXD-sFqjoPwFm_u515jm3suzmkGxQTeA1_A@mail.gmail.com/</a>");
-
-    QString testInputStringEmail = QStringLiteral(R"(email@example.com <a href="mailto:email@example.com">Link already rich</a>)");
-    QString testOutputStringEmail =
-        QStringLiteral(R"(<a href="mailto:email@example.com">email@example.com</a> <a href="mailto:email@example.com">Link already rich</a>)");
-
-    QString testInputStringMxId = QStringLiteral("@user:kde.org <a href=\"https://matrix.to/#/@user:kde.org\">Link already rich</a>");
-    QString testOutputStringMxId = QStringLiteral(
-        "<b><a href=\"https://matrix.to/#/@user:kde.org\">@user:kde.org</a></b> <b><a href=\"https://matrix.to/#/@user:kde.org\">Link already rich</a></b>");
-
-    TextHandler testTextHandler;
-    testTextHandler.setData(testInputStringLink1);
-
-    QCOMPARE(testTextHandler.handleRecieveRichText(Qt::RichText), testOutputStringLink1);
-
-    testTextHandler.setData(testInputStringLink2);
-    QCOMPARE(testTextHandler.handleRecieveRichText(Qt::RichText), testOutputStringLink2);
-
-    testTextHandler.setData(testInputStringEmail);
-    QCOMPARE(testTextHandler.handleRecieveRichText(Qt::RichText), testOutputStringEmail);
-
-    testTextHandler.setData(testInputStringMxId);
-    QCOMPARE(testTextHandler.handleRecieveRichText(Qt::RichText), testOutputStringMxId);
-}
-
-// Test that user pill is add to an emote message.
-// N.B. The second message in the test timeline is marked as an emote.
-void TextHandlerTest::receiveRichEmote()
-{
-    auto event = room->messageEvents().at(1).get();
-    auto author = static_cast<NeoChatUser *>(room->user(event->senderId()));
-    const QString testInputString = QStringLiteral("This is an emote.");
-    const QString testOutputString = QStringLiteral("* <a href=\"https://matrix.to/#/@example:example.org\" style=\"color:") + author->color().name()
-        + QStringLiteral("\">@example:example.org</a> This is an emote.");
-
-    TextHandler testTextHandler;
-    testTextHandler.setData(testInputString);
-
-    QCOMPARE(testTextHandler.handleRecieveRichText(Qt::RichText, room, event), testOutputString);
-}
-
-void TextHandlerTest::receiveRichEdited_data()
-{
-    QTest::addColumn<QString>("testInputString");
-    QTest::addColumn<QString>("testOutputString");
-
-    QTest::newRow("basic") << QStringLiteral("Edited") << QStringLiteral("Edited <span style=\"color:#000000\">(edited)</span>");
-    QTest::newRow("multiple paragraphs") << QStringLiteral("<p>Edited</p>\n<p>Edited</p>")
-                                         << QStringLiteral("<p>Edited</p>\n<p>Edited <span style=\"color:#000000\">(edited)</span></p>");
-    QTest::newRow("blockquote") << QStringLiteral("<blockquote>Edited</blockquote>")
-                                << QStringLiteral("<blockquote>Edited</blockquote><p> <span style=\"color:#000000\">(edited)</span></p>");
-}
-
-void TextHandlerTest::receiveRichEdited()
-{
-    QFETCH(QString, testInputString);
-    QFETCH(QString, testOutputString);
-
-    TextHandler testTextHandler;
-    testTextHandler.setData(testInputString);
-
-    QCOMPARE(testTextHandler.handleRecieveRichText(Qt::RichText, room, room->messageEvents().at(2).get()), testOutputString);
-}
-
-QTEST_MAIN(TextHandlerTest)
-#include "texthandlertest.moc"
--- a/org.kde.neochat.appdata.xml
+++ b/org.kde.neochat.appdata.xml
@@ -2,7 +2,7 @@
 <!--
  - SPDX-License-Identifier: CC0-1.0
  - SPDX-FileCopyrightText: 2020-2021 Carl Schwan <carlschwan@kde.org>
-  - SPDX-FileCopyrightText: 2020-2021 Tobias Fella <tobias.fella@kde.org>
+  - SPDX-FileCopyrightText: 2020-2021 Tobias Fella <fella@posteo.de>
 -->
 <component type="desktop">
  <id>org.kde.neochat</id>
@@ -179,7 +179,7 @@
    <category>Network</category>
  </categories>
  <developer_name>The KDE Community</developer_name>
-  <developer_name xml:lang="ar">مجتمع كِيدِي</developer_name>
+  <developer_name xml:lang="ar">مجتمع كدي</developer_name>
  <developer_name xml:lang="az">KDE Cəmiyyəti</developer_name>
  <developer_name xml:lang="ca">La comunitat KDE</developer_name>
  <developer_name xml:lang="ca-valencia">La comunitat KDE</developer_name>
--- a/org.kde.neochat.desktop
+++ b/org.kde.neochat.desktop
@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: CC0-1.0
-# SPDX-FileCopyrightText: 2020 Tobias Fella <tobias.fella@kde.org>
+# SPDX-FileCopyrightText: 2020 Tobias Fella <fella@posteo.de>
 [Desktop Entry]
 Version=1.5
 Name=NeoChat
--- a/po/ar/neochat.po
+++ b/po/ar/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/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/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/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/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/docs/neochat/CMakeLists.txt
+++ b/po/tr/docs/neochat/CMakeLists.txt
@@ -1,5 +0,0 @@
-# SPDX-FileCopyrightText: 2022 Carl Schwan <carl@carlschwan.eu>
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-kdoctools_create_manpage(man-neochat.1.docbook 1 INSTALL_DESTINATION ${MAN_INSTALL_DIR})
--- a/po/tr/docs/neochat/man-neochat.1.docbook
+++ b/po/tr/docs/neochat/man-neochat.1.docbook
@@ -1,122 +0,0 @@
-<?xml version="1.0" ?>
-<!DOCTYPE refentry PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [
-<!ENTITY % Turkish "INCLUDE">
-]>
-<!--
-SPDX-FileCopyrightText: 2022 Carl Schwan <carl@carlschwan.eu>
-SPDX-License-Identifier: CC-BY-SA-4.0
-->
-
-<refentry lang="&language;">
-<refentryinfo>
-<title
->NeoChat Kullanıcı Kılavuzu</title>
-<author
-><firstname
->Carl</firstname
-><surname
->Schwan</surname
-> <contrib
->NeoChat man page.</contrib
-> <email
->carl@carlschwan.eu</email
-></author>
-<date
->2022-11-01</date>
-<releaseinfo
->22.09</releaseinfo>
-<productname
->NeoChat</productname>
-</refentryinfo>
-
-<refmeta>
-  <refentrytitle>
-    <command
->neochat</command>
-  </refentrytitle>
-  <manvolnum
->1</manvolnum>
-</refmeta>
-
-<refnamediv>
-  <refname
->neochat</refname>
-  <refpurpose
->Matrix iletileşme protokolü ile etkileşim için istemci</refpurpose>
-  </refnamediv>
-  <!-- body begins here -->
-  <refsynopsisdiv id='synopsis'>
-  <cmdsynopsis
-><command
->neochat</command
-> <arg choice="opt"
-><replaceable
->URI</replaceable
-></arg
-> </cmdsynopsis>
-</refsynopsisdiv>
-
-
-<refsect1 id="description">
-  <title
->Açıklama</title>
-  <para
-><command
->neochat</command
->, Matrix protokolü için hem masaüstünde hem de taşınabilir aygıtlarda çalışan bir sohbet uygulamasıdır. </para>
-</refsect1>
-
-<refsect1 id="options"
-><title
->Seçenekler</title>
-<variablelist>
-  <varlistentry>
-  <term
-><option
->URI</option
-></term>
-  <listitem>
-    <para
->Bir kullanıcı veya oda için matrix URI'si; örneğin, matrix:u/kullanıcı:örnek.org ve matrix:r/kök:örnek.org. Bu, NeoChat'in verilen odayı veya konuşmayı açmayı denemesini sağlar. </para>
-  </listitem>
-  </varlistentry>
-</variablelist>
-</refsect1>
-
-<refsect1 id="bug">
-  <title
->Hata Bildirme</title>
-  <para
->Hataları veya özellik isteklerini <ulink url="https://bugs.kde.org/enter_bug.cgi?product=NeoChat&amp;component=General"
->https://bugs.kde.org/enter_bug.cgi?product=NeoChat&amp;component=General</ulink
-> bağlantısından bildirebilirsiniz</para>
-</refsect1>
-
-<refsect1>
-  <title
->Ayrıca</title>
-  <simplelist>
-    <member
->Matrix üzerine sıkça sorulan soruların bir listesi: <ulink url="https://matrix.org/faq/"
->https://matrix.org/faq/</ulink
-> </member>
-    <member
->kf5options(7)</member>
-    <member
->qt5options(7)</member>
-  </simplelist>
-</refsect1>
-
-<refsect1 id="copyright"
-><title
->Telif Hakkı</title>
-<para
->Telif hakkı &copy; 2020-2022 Tobias Fella </para>
-<para
->Telif hakkı &copy; 2020-2022 Carl Schwan </para>
-<para
->Lisans: GNU Genel Kamu Lisansa, 3. sürüm veya sonrası &lt;<ulink url="https://www.gnu.org/licenses/gpl-3.0.html"
->https://www.gnu.org/licenses/gpl-3.0.html</ulink
->&gt;</para>
-</refsect1>
-</refentry>
--- 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/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,6 +1,6 @@
 # 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: 2020-2021 Tobias Fella <fella@posteo.de>
 # SPDX-License-Identifier: BSD-2-Clause

 add_library(neochat STATIC
@@ -24,12 +24,14 @@ add_library(neochat STATIC
    models/publicroomlistmodel.cpp
    models/userdirectorylistmodel.cpp
    models/keywordnotificationrulemodel.cpp
+    utils.cpp
    notificationsmanager.cpp
    models/sortfilterroomlistmodel.cpp
    chatdocumenthandler.cpp
    models/devicesmodel.cpp
    filetypesingleton.cpp
    login.cpp
+    stickerevent.cpp
    models/webshortcutmodel.cpp
    blurhash.cpp
    blurhashimageprovider.cpp
@@ -45,13 +47,8 @@ add_library(neochat STATIC
    models/statemodel.cpp
    filetransferpseudojob.cpp
    models/searchmodel.cpp
-    texthandler.cpp
-    pollevent.cpp
-    pollhandler.cpp
 )

-target_compile_definitions(neochat PUBLIC "-DQT_NO_KEYWORDS")
-
 add_executable(neochat-app
    main.cpp
    res.qrc
@@ -63,6 +60,14 @@ target_link_libraries(neochat-app PRIVATE
    neochat
 )

+if(Quotient_VERSION_MINOR GREATER 6)
+    target_compile_definitions(neochat PUBLIC QUOTIENT_07)
+    target_sources(neochat PRIVATE pollevent.cpp pollhandler.cpp)
+else()
+    target_compile_definitions(neochat PUBLIC QUOTIENT_VERSION=\"${Quotient_VERSION}\")
+    target_sources(neochat PRIVATE neochataccountregistry.cpp)
+endif()
+
 ecm_add_app_icon(NEOCHAT_ICON ICONS ${CMAKE_SOURCE_DIR}/128-logo.png)

 target_sources(neochat-app PRIVATE ${NEOCHAT_ICON})
@@ -74,7 +79,7 @@ if(NOT ANDROID)
    else()
        target_sources(neochat PRIVATE trayicon.cpp)
    endif()
-    target_link_libraries(neochat PUBLIC KF${QT_MAJOR_VERSION}::ConfigWidgets KF${QT_MAJOR_VERSION}::WindowSystem)
+    target_link_libraries(neochat PUBLIC KF5::ConfigWidgets KF5::WindowSystem)
    target_compile_definitions(neochat PUBLIC -DHAVE_COLORSCHEME)
    target_compile_definitions(neochat PUBLIC -DHAVE_WINDOWSYSTEM)
 endif()
@@ -82,15 +87,13 @@ endif()
 if (NOT ANDROID AND NOT WIN32 AND NOT APPLE)
    target_sources(neochat-app PRIVATE res_desktop.qrc)
    target_compile_definitions(neochat PUBLIC -DHAVE_RUNNER)
-    target_compile_definitions(neochat PUBLIC -DHAVE_X11)
    target_sources(neochat PRIVATE runner.cpp)
 else()
    target_sources(neochat-app PRIVATE res_android.qrc)
 endif()

 target_include_directories(neochat PRIVATE ${CMAKE_BINARY_DIR})
-target_link_libraries(neochat PUBLIC Qt::Core Qt::Quick Qt::Qml Qt::Gui Qt::Multimedia Qt::Network Qt::QuickControls2 KF${QT_MAJOR_VERSION}::I18n KF${QT_MAJOR_VERSION}::Kirigami2 KF${QT_MAJOR_VERSION}::Notifications KF${QT_MAJOR_VERSION}::ConfigCore KF${QT_MAJOR_VERSION}::ConfigGui KF${QT_MAJOR_VERSION}::CoreAddons KF${QT_MAJOR_VERSION}::SonnetCore  KF${QT_MAJOR_VERSION}::ItemModels Quotient cmark::cmark ${QTKEYCHAIN_LIBRARIES} QCoro::Core)
-
+target_link_libraries(neochat PUBLIC Qt::Core Qt::Quick Qt::Qml Qt::Gui Qt::Multimedia Qt::Network Qt::QuickControls2 KF5::I18n KF5::Kirigami2 KF5::Notifications KF5::ConfigCore KF5::ConfigGui KF5::CoreAddons KF5::SonnetCore  KF5::ItemModels Quotient cmark::cmark ${QTKEYCHAIN_LIBRARIES} QCoro::Core)
 kconfig_add_kcfg_files(neochat GENERATE_MOC neochatconfig.kcfgc)

 if(NEOCHAT_FLATPAK)
@@ -171,13 +174,9 @@ if(ANDROID)
        "window-new"
        "globe"
        "visibility"
-        "home"
-        "preferences-desktop-notification"
-        "computer-symbolic"
-        "gps"
    )
 else()
-    target_link_libraries(neochat PUBLIC Qt::Widgets KF${QT_MAJOR_VERSION}::KIOWidgets)
+    target_link_libraries(neochat PUBLIC Qt::Widgets KF5::KIOWidgets)
    install(FILES neochat.notifyrc DESTINATION ${KDE_INSTALL_KNOTIFYRCDIR})
 endif()

@@ -185,12 +184,12 @@ if(NOT ANDROID)
    set_target_properties(neochat-app PROPERTIES OUTPUT_NAME "neochat")
 endif()

-if(TARGET KF${QT_MAJOR_VERSION}::DBusAddons)
-    target_link_libraries(neochat PUBLIC KF${QT_MAJOR_VERSION}::DBusAddons)
+if(TARGET KF5::DBusAddons)
+    target_link_libraries(neochat PUBLIC KF5::DBusAddons)
    target_compile_definitions(neochat PUBLIC -DHAVE_KDBUSADDONS)
 endif()

-if (TARGET KF${QT_MAJOR_VERSION}::KIOWidgets)
+if (TARGET KF5::KIOWidgets)
    target_compile_definitions(neochat PUBLIC -DHAVE_KIO)
 endif()

--- a/src/actionshandler.cpp
+++ b/src/actionshandler.cpp
@@ -20,10 +20,25 @@
 #include "neochatroom.h"
 #include "neochatuser.h"
 #include "roommanager.h"
-#include "texthandler.h"

 using namespace Quotient;

+QString markdownToHTML(const QString &markdown)
+{
+    const auto str = markdown.toUtf8();
+    char *tmp_buf = cmark_markdown_to_html(str.constData(), str.size(), CMARK_OPT_HARDBREAKS | CMARK_OPT_UNSAFE);
+
+    const std::string html(tmp_buf);
+
+    free(tmp_buf);
+
+    auto result = QString::fromStdString(html).trimmed();
+
+    result.replace("<!-- raw HTML omitted -->", "");
+
+    return result;
+}
+
 ActionsHandler::ActionsHandler(QObject *parent)
    : QObject(parent)
 {
@@ -154,10 +169,7 @@ void ActionsHandler::handleMessage(const QString &text, QString handledText, con
    }

    handledText = CustomEmojiModel::instance().preprocessText(handledText);
-    TextHandler textHandler;
-    textHandler.setData(handledText);
-    handledText = textHandler.handleSendText();
-
+    handledText = markdownToHTML(handledText);
    if (handledText.count("<p>") == 1 && handledText.count("</p>") == 1) {
        handledText.remove("<p>");
        handledText.remove("</p>");
--- a/src/actionshandler.h
+++ b/src/actionshandler.h
@@ -50,3 +50,5 @@ private:
    QString handleMentions(QString handledText, const bool &isEdit = false);
    void handleMessage(const QString &text, QString handledText, const bool &isEdit = false);
 };
+
+QString markdownToHTML(const QString &markdown);
--- a/src/blurhashimageprovider.cpp
+++ b/src/blurhashimageprovider.cpp
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2021 Tobias Fella <tobias.fella@kde.org>
+// SPDX-FileCopyrightText: 2021 Tobias Fella <fella@posteo.de>
 // SPDX-License-Identifier: LGPL-2.0-or-later

 #include "blurhashimageprovider.h"
--- a/src/blurhashimageprovider.h
+++ b/src/blurhashimageprovider.h
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2021 Tobias Fella <tobias.fella@kde.org>
+// SPDX-FileCopyrightText: 2021 Tobias Fella <fella@posteo.de>
 // SPDX-License-Identifier: LGPL-2.0-or-later

 #pragma once
--- a/src/chatdocumenthandler.cpp
+++ b/src/chatdocumenthandler.cpp
@@ -138,13 +138,12 @@ int ChatDocumentHandler::completionStartIndex() const
        return 0;
    }

-#if !defined(Q_OS_ANDROID) && QT_VERSION > QT_VERSION_CHECK(6, 0, 0)
+#if QT_VERSION > QT_VERSION_CHECK(6, 0, 0)
    const long long cursor = cursorPosition();
 #else
    const auto cursor = cursorPosition();
 #endif
    const auto &text = getText();
-
    auto start = std::min(cursor, text.size()) - 1;
    while (start > -1) {
        if (text.at(start) == QLatin1Char(' ')) {
@@ -325,35 +324,3 @@ void ChatDocumentHandler::pushMention(const Mention mention) const
        m_room->mentions()->push_back(mention);
    }
 }
-
-QColor ChatDocumentHandler::mentionColor() const
-{
-    return m_mentionColor;
-}
-
-void ChatDocumentHandler::setMentionColor(const QColor &color)
-{
-    if (m_mentionColor == color) {
-        return;
-    }
-    m_mentionColor = color;
-    m_highlighter->mentionFormat.setForeground(m_mentionColor);
-    m_highlighter->rehighlight();
-    Q_EMIT mentionColorChanged();
-}
-
-QColor ChatDocumentHandler::errorColor() const
-{
-    return m_errorColor;
-}
-
-void ChatDocumentHandler::setErrorColor(const QColor &color)
-{
-    if (m_errorColor == color) {
-        return;
-    }
-    m_errorColor = color;
-    m_highlighter->errorFormat.setForeground(m_errorColor);
-    m_highlighter->rehighlight();
-    Q_EMIT errorColorChanged();
-}
--- a/src/chatdocumenthandler.h
+++ b/src/chatdocumenthandler.h
@@ -35,9 +35,6 @@ class ChatDocumentHandler : public QObject

    Q_PROPERTY(NeoChatRoom *room READ room WRITE setRoom NOTIFY roomChanged)

-    Q_PROPERTY(QColor mentionColor READ mentionColor WRITE setMentionColor NOTIFY mentionColorChanged);
-    Q_PROPERTY(QColor errorColor READ errorColor WRITE setErrorColor NOTIFY errorColorChanged);
-
 public:
    explicit ChatDocumentHandler(QObject *parent = nullptr);

@@ -63,13 +60,6 @@ public:

    void updateCompletions();
    CompletionModel *completionModel() const;
-
-    [[nodiscard]] QColor mentionColor() const;
-    void setMentionColor(const QColor &color);
-
-    [[nodiscard]] QColor errorColor() const;
-    void setErrorColor(const QColor &color);
-
 Q_SIGNALS:
    void isEditChanged();
    void documentChanged();
@@ -78,8 +68,6 @@ Q_SIGNALS:
    void completionModelChanged();
    void selectionStartChanged();
    void selectionEndChanged();
-    void errorColorChanged();
-    void mentionColorChanged();

 private:
    int completionStartIndex() const;
@@ -91,9 +79,6 @@ private:
    NeoChatRoom *m_room = nullptr;
    bool completionVisible = false;

-    QColor m_mentionColor;
-    QColor m_errorColor;
-
    int m_cursorPosition;
    int m_selectionStart;
    int m_selectionEnd;
--- a/src/clipboard.cpp
+++ b/src/clipboard.cpp
@@ -61,21 +61,9 @@ QString Clipboard::saveImage(QString localPath) const

 void Clipboard::saveText(QString message)
 {
-    static QRegularExpression re(QStringLiteral("<[^>]*>"));
+    QRegularExpression re("<[^>]*>");
    auto *mineData = new QMimeData; // ownership is transferred to clipboard
    mineData->setHtml(message);
-    mineData->setText(message.replace(re, QString()));
+    mineData->setText(message.replace(re, ""));
    m_clipboard->setMimeData(mineData);
 }
-
-void Clipboard::setImage(const QUrl &url)
-{
-    if (url.isLocalFile()) {
-        QImage img(url.path());
-        auto *mimeData = new QMimeData;
-        mimeData->setImageData(img);
-        if (!img.isNull()) {
-            m_clipboard->setMimeData(mimeData);
-        }
-    }
-}
--- a/src/clipboard.h
+++ b/src/clipboard.h
@@ -26,7 +26,6 @@ public:
    Q_INVOKABLE QString saveImage(QString localPath = {}) const;

    Q_INVOKABLE void saveText(QString message);
-    Q_INVOKABLE void setImage(const QUrl &image);

 private:
    QClipboard *m_clipboard;
--- a/src/controller.cpp
+++ b/src/controller.cpp
@@ -1,5 +1,5 @@
 // SPDX-FileCopyrightText: 2018-2019 Black Hat <bhat@encom.eu.org>
-// SPDX-FileCopyrightText: 2020 Tobias Fella <tobias.fella@kde.org>
+// SPDX-FileCopyrightText: 2020 Tobias Fella <fella@posteo.de>
 // SPDX-License-Identifier: GPL-3.0-only

 #include "controller.h"
@@ -31,16 +31,22 @@

 #include <signal.h>

-#include <accountregistry.h>
+#ifdef QUOTIENT_07
+#include "accountregistry.h"
+#else
+#include "neochataccountregistry.h"
+#endif

 #include <connection.h>
 #include <csapi/content-repo.h>
 #include <csapi/logout.h>
 #include <csapi/profile.h>
-#include <jobs/downloadfilejob.h>
 #include <qt_connection_util.h>
+
+#ifdef QUOTIENT_07
 #include <csapi/notifications.h>
 #include <eventstats.h>
+#endif

 #include "neochatconfig.h"
 #include "neochatroom.h"
@@ -49,8 +55,6 @@
 #include "roommanager.h"
 #include "windowcontroller.h"

-#include <accountregistry.h>
-
 #if defined(Q_OS_WIN) || defined(Q_OS_MAC)
 #include "trayicon.h"
 #elif !defined(Q_OS_ANDROID)
@@ -88,28 +92,10 @@ Controller::Controller(QObject *parent)
    });
 #endif

-    connectUntil(&Accounts, &AccountRegistry::rowsInserted, this, [this]() {
-        if (auto *connection = Accounts.get(NeoChatConfig::self()->activeConnection())) {
-            connectSingleShot(connection, &Connection::loadedRoomState, this, [this, connection]() {
-                setActiveConnection(connection);
-            });
-            return true;
-        }
-        return false;
+    QTimer::singleShot(0, this, [this] {
+        invokeLogin();
    });

-    connect(&Accounts, &AccountRegistry::rowsRemoved, this, [this]() {
-        if (!Accounts.isLoggedIn(NeoChatConfig::self()->activeConnection())) {
-            if (Accounts.size() > 0) {
-                setActiveConnection(Accounts.accounts().at(0));
-            } else {
-                setActiveConnection(nullptr);
-            }
-        }
-    });
-
-    QMetaObject::invokeMethod(&Accounts, &AccountRegistry::invokeLogin);
-
    QObject::connect(QGuiApplication::instance(), &QCoreApplication::aboutToQuit, QGuiApplication::instance(), [] {
        NeoChatConfig::self()->save();
    });
@@ -138,29 +124,23 @@ Controller::Controller(QObject *parent)
    }
 #endif

-    connect(&Accounts, &AccountRegistry::accountCountChanged, this, &Controller::activeConnectionIndexChanged);
+    connect(&AccountRegistry::instance(), &AccountRegistry::accountCountChanged, this, &Controller::activeConnectionIndexChanged);

+#ifdef QUOTIENT_07
    static int oldAccountCount = 0;
-    connect(&Accounts, &AccountRegistry::accountCountChanged, this, [this]() {
-        if (Accounts.size() > oldAccountCount) {
-            auto connection = Accounts.accounts()[Accounts.size() - 1];
-            connect(connection, &Connection::syncDone, this, [this, connection]() {
-                bool changes = false;
-                for (const auto &room : connection->allRooms()) {
-                    if (m_notificationCounts[room] != room->unreadStats().notableCount) {
-                        m_notificationCounts[room] = room->unreadStats().notableCount;
-                        changes = true;
-                    }
-                }
-                if (changes) {
-                    handleNotifications(connection);
-                }
+    connect(&AccountRegistry::instance(), &AccountRegistry::accountCountChanged, this, [=]() {
+        if (AccountRegistry::instance().size() > oldAccountCount) {
+            auto connection = AccountRegistry::instance().accounts()[AccountRegistry::instance().size() - 1];
+            connect(connection, &Connection::syncDone, this, [=]() {
+                handleNotifications(connection);
            });
        }
-        oldAccountCount = Accounts.size();
+        oldAccountCount = AccountRegistry::instance().size();
    });
+#endif
 }

+#ifdef QUOTIENT_07
 void Controller::handleNotifications(QPointer<Quotient::Connection> connection)
 {
    static QStringList initial;
@@ -189,9 +169,7 @@ void Controller::handleNotifications(QPointer<Quotient::Connection> connection)
            auto room = connection->room(notification["room_id"].toString());

            // If room exists, room is NOT active OR the application is NOT active, show notification
-            if (room
-                && !(RoomManager::instance().currentRoom() && room->id() == RoomManager::instance().currentRoom()->id()
-                     && QGuiApplication::applicationState() == Qt::ApplicationActive)) {
+            if (room && !(room->id() == RoomManager::instance().currentRoom()->id() && QGuiApplication::applicationState() == Qt::ApplicationActive)) {
                // The room might have been deleted (for example rejected invitation).
                auto sender = room->user(notification["event"].toObject()["sender"].toString());

@@ -234,6 +212,7 @@ void Controller::handleNotifications(QPointer<Quotient::Connection> connection)
        }
    });
 }
+#endif

 Controller &Controller::instance()
 {
@@ -246,10 +225,239 @@ void Controller::showWindow()
    WindowController::instance().showAndRaiseWindow(QString());
 }

+void Controller::loginWithAccessToken(const QString &serverAddr, const QString &user, const QString &token, const QString &deviceName)
+{
+    if (user.isEmpty() || token.isEmpty()) {
+        return;
+    }
+
+    QUrl serverUrl(serverAddr);
+
+    auto conn = new Connection();
+    if (serverUrl.isValid()) {
+        conn->setHomeserver(serverUrl);
+    }
+
+    connect(conn, &Connection::connected, this, [this, conn, deviceName] {
+        AccountSettings account(conn->userId());
+        account.setKeepLoggedIn(true);
+        account.setHomeserver(conn->homeserver());
+        account.setDeviceId(conn->deviceId());
+        account.setDeviceName(deviceName);
+        if (!saveAccessTokenToKeyChain(account, conn->accessToken())) {
+            qWarning() << "Couldn't save access token";
+        }
+        account.sync();
+        addConnection(conn);
+        setActiveConnection(conn);
+    });
+    connect(conn, &Connection::networkError, this, [this](QString error, const QString &, int, int) {
+        Q_EMIT errorOccured(i18n("Network Error: %1", error));
+    });
+    conn->assumeIdentity(user, token, deviceName);
+}
+
+void Controller::logout(Connection *conn, bool serverSideLogout)
+{
+    if (!conn) {
+        qCritical() << "Attempt to logout null connection";
+        return;
+    }
+
+    SettingsGroup("Accounts").remove(conn->userId());
+
+    QKeychain::DeletePasswordJob job(qAppName());
+    job.setAutoDelete(true);
+    job.setKey(conn->userId());
+    QEventLoop loop;
+    QKeychain::DeletePasswordJob::connect(&job, &QKeychain::Job::finished, &loop, &QEventLoop::quit);
+    job.start();
+    loop.exec();
+
+    if (AccountRegistry::instance().count() > 1) {
+        // Only set the connection if the the account being logged out is currently active
+        if (conn == activeConnection()) {
+            setActiveConnection(AccountRegistry::instance().accounts()[0]);
+        }
+    } else {
+        setActiveConnection(nullptr);
+    }
+    if (!serverSideLogout) {
+        return;
+    }
+    conn->logout();
+}
+
+void Controller::addConnection(Connection *c)
+{
+    Q_ASSERT_X(c, __FUNCTION__, "Attempt to add a null connection");
+
+#ifndef QUOTIENT_07
+    AccountRegistry::instance().add(c);
+#endif
+
+    c->setLazyLoading(true);
+
+    connect(c, &Connection::syncDone, this, [this, c] {
+        setBusy(false);
+
+        Q_EMIT syncDone();
+
+        c->sync(30000);
+        c->saveState();
+    });
+    connect(c, &Connection::loggedOut, this, [this, c] {
+        dropConnection(c);
+    });
+
+    connect(c, &Connection::requestFailed, this, [this](BaseJob *job) {
+        if (job->error() == BaseJob::UserConsentRequiredError) {
+            Q_EMIT userConsentRequired(job->errorUrl());
+        }
+    });
+
+    setBusy(true);
+
+    c->sync();
+
+    Q_EMIT connectionAdded(c);
+    Q_EMIT accountCountChanged();
+}
+
+void Controller::dropConnection(Connection *c)
+{
+    Q_ASSERT_X(c, __FUNCTION__, "Attempt to drop a null connection");
+
+#ifndef QUOTIENT_07
+    AccountRegistry::instance().drop(c);
+#endif
+
+    Q_EMIT connectionDropped(c);
+    Q_EMIT accountCountChanged();
+#ifndef QUOTIENT_07
+    c->deleteLater();
+#endif
+}
+
+void Controller::invokeLogin()
+{
+    const auto accounts = SettingsGroup("Accounts").childGroups();
+    QString id = NeoChatConfig::self()->activeConnection();
+    for (const auto &accountId : accounts) {
+        AccountSettings account{accountId};
+        if (id.isEmpty()) {
+            // handle case where the account config is empty
+            id = accountId;
+        }
+        if (!account.homeserver().isEmpty()) {
+            auto accessTokenLoadingJob = loadAccessTokenFromKeyChain(account);
+            connect(accessTokenLoadingJob, &QKeychain::Job::finished, this, [accountId, id, this, accessTokenLoadingJob](QKeychain::Job *) {
+                AccountSettings account{accountId};
+                QString accessToken;
+                if (accessTokenLoadingJob->error() == QKeychain::Error::NoError) {
+                    accessToken = accessTokenLoadingJob->binaryData();
+                } else {
+                    return;
+                }
+
+                auto connection = new Connection(account.homeserver());
+                connect(connection, &Connection::connected, this, [this, connection, id] {
+                    connection->loadState();
+                    addConnection(connection);
+                    if (connection->userId() == id) {
+                        setActiveConnection(connection);
+                        connectSingleShot(connection, &Connection::syncDone, this, &Controller::initiated);
+                    }
+                });
+                connect(connection, &Connection::loginError, this, [this, connection](const QString &error, const QString &) {
+                    if (error == "Unrecognised access token") {
+                        Q_EMIT errorOccured(i18n("Login Failed: Access Token invalid or revoked"));
+                        logout(connection, false);
+                    } else if (error == "Connection closed") {
+                        Q_EMIT errorOccured(i18n("Login Failed: %1", error));
+                        // Failed due to network connection issue. This might happen when the homeserver is
+                        // temporary down, or the user trying to re-launch NeoChat in a network that cannot
+                        // connect to the homeserver. In this case, we don't want to do logout().
+                    } else {
+                        Q_EMIT errorOccured(i18n("Login Failed: %1", error));
+                        logout(connection, true);
+                    }
+                    Q_EMIT initiated();
+                });
+                connect(connection, &Connection::networkError, this, [this](const QString &error, const QString &, int, int) {
+                    Q_EMIT errorOccured(i18n("Network Error: %1", error));
+                });
+                connection->assumeIdentity(account.userId(), accessToken, account.deviceId());
+            });
+        }
+    }
+    if (accounts.isEmpty()) {
+        Q_EMIT initiated();
+    }
+}
+
+QKeychain::ReadPasswordJob *Controller::loadAccessTokenFromKeyChain(const AccountSettings &account)
+{
+    qDebug() << "Reading access token from the keychain for" << account.userId();
+    auto job = new QKeychain::ReadPasswordJob(qAppName(), this);
+    job->setKey(account.userId());
+
+    // Handling of errors
+    connect(job, &QKeychain::Job::finished, this, [this, &account, job]() {
+        if (job->error() == QKeychain::Error::NoError) {
+            return;
+        }
+
+        switch (job->error()) {
+        case QKeychain::EntryNotFound:
+            Q_EMIT globalErrorOccured(i18n("Access token wasn't found"), i18n("Maybe it was deleted?"));
+            break;
+        case QKeychain::AccessDeniedByUser:
+        case QKeychain::AccessDenied:
+            Q_EMIT globalErrorOccured(i18n("Access to keychain was denied."), i18n("Please allow NeoChat to read the access token"));
+            break;
+        case QKeychain::NoBackendAvailable:
+            Q_EMIT globalErrorOccured(i18n("No keychain available."), i18n("Please install a keychain, e.g. KWallet or GNOME keyring on Linux"));
+            break;
+        case QKeychain::OtherError:
+            Q_EMIT globalErrorOccured(i18n("Unable to read access token"), job->errorString());
+            break;
+        default:
+            break;
+        }
+    });
+    job->start();
+
+    return job;
+}
+
+bool Controller::saveAccessTokenToKeyChain(const AccountSettings &account, const QByteArray &accessToken)
+{
+    qDebug() << "Save the access token to the keychain for " << account.userId();
+    QKeychain::WritePasswordJob job(qAppName());
+    job.setAutoDelete(false);
+    job.setKey(account.userId());
+    job.setBinaryData(accessToken);
+    QEventLoop loop;
+    QKeychain::WritePasswordJob::connect(&job, &QKeychain::Job::finished, &loop, &QEventLoop::quit);
+    job.start();
+    loop.exec();
+
+    if (job.error()) {
+        qWarning() << "Could not save access token to the keychain: " << qPrintable(job.errorString());
+        return false;
+    }
+    return true;
+}
+
 void Controller::changeAvatar(Connection *conn, const QUrl &localFile)
 {
    auto job = conn->uploadFile(localFile.toLocalFile());
+#ifdef QUOTIENT_07
    if (isJobPending(job)) {
+#else
+    if (isJobRunning(job)) {
+#endif
        connect(job, &BaseJob::success, this, [conn, job] {
            conn->callApi<SetAvatarUrlJob>(conn->userId(), job->contentUri());
        });
@@ -276,7 +484,7 @@ bool Controller::supportSystemTray() const

 void Controller::changePassword(Connection *connection, const QString &currentPassword, const QString &newPassword)
 {
-    auto *job = connection->callApi<NeochatChangePasswordJob>(newPassword, false);
+    NeochatChangePasswordJob *job = connection->callApi<NeochatChangePasswordJob>(newPassword, false);
    connect(job, &BaseJob::result, this, [this, job, currentPassword, newPassword, connection] {
        if (job->error() == 103) {
            QJsonObject replyData = job->jsonData();
@@ -287,7 +495,7 @@ void Controller::changePassword(Connection *connection, const QString &currentPa
            authData["user"] = connection->user()->id();
            QJsonObject identifier = {{"type", "m.id.user"}, {"user", connection->user()->id()}};
            authData["identifier"] = identifier;
-            auto *innerJob = connection->callApi<NeochatChangePasswordJob>(newPassword, false, authData);
+            NeochatChangePasswordJob *innerJob = connection->callApi<NeochatChangePasswordJob>(newPassword, false, authData);
            connect(innerJob, &BaseJob::success, this, [this]() {
                Q_EMIT passwordStatus(PasswordStatus::Success);
            });
@@ -307,7 +515,11 @@ bool Controller::setAvatar(Connection *connection, const QUrl &avatarSource)
    User *localUser = connection->user();
    QString decoded = avatarSource.path();
    if (decoded.isEmpty()) {
+#ifdef QUOTIENT_07
        connection->callApi<SetAvatarUrlJob>(localUser->id(), avatarSource);
+#else
+        connection->callApi<SetAvatarUrlJob>(localUser->id(), QString());
+#endif
        return true;
    }
    if (QImageReader(decoded).read().isNull()) {
@@ -318,7 +530,11 @@ bool Controller::setAvatar(Connection *connection, const QUrl &avatarSource)
 }

 NeochatChangePasswordJob::NeochatChangePasswordJob(const QString &newPassword, bool logoutDevices, const Omittable<QJsonObject> &auth)
+#ifdef QUOTIENT_07
    : BaseJob(HttpVerb::Post, QStringLiteral("ChangePasswordJob"), "/_matrix/client/r0/account/password")
+#else
+    : BaseJob(HttpVerb::Post, QStringLiteral("ChangePasswordJob"), QStringLiteral("/_matrix/client/r0/account/password"))
+#endif
 {
    QJsonObject _data;
    addParam<>(_data, QStringLiteral("new_password"), newPassword);
@@ -327,12 +543,9 @@ NeochatChangePasswordJob::NeochatChangePasswordJob(const QString &newPassword, b
    setRequestData(_data);
 }

-NeochatDeleteDeviceJob::NeochatDeleteDeviceJob(const QString &deviceId, const Omittable<QJsonObject> &auth)
-    : Quotient::BaseJob(HttpVerb::Delete, QStringLiteral("DeleteDeviceJob"), QStringLiteral("/matrix/client/r0/devices/%1").arg(deviceId).toLatin1())
+int Controller::accountCount() const
 {
-    QJsonObject _data;
-    addParam<IfNotEmpty>(_data, QStringLiteral("auth"), auth);
-    setRequestData(std::move(_data));
+    return AccountRegistry::instance().count();
 }

 bool Controller::quitOnLastWindowClosed()
@@ -395,11 +608,6 @@ void Controller::setActiveConnection(Connection *connection)
            m_isOnline = true;
            Q_EMIT isOnlineChanged(true);
        });
-        connect(connection, &Connection::requestFailed, this, [=](BaseJob *job) {
-            if (dynamic_cast<DownloadFileJob *>(job) && job->jsonData()["errcode"].toString() == "M_TOO_LARGE"_ls) {
-                RoomManager::instance().warning(i18n("File too large to download."), i18n("Contact your matrix server administrator for support."));
-            }
-        });
    } else {
        NeoChatConfig::self()->setActiveConnection(QString());
    }
@@ -413,20 +621,24 @@ void Controller::saveWindowGeometry()
    WindowController::instance().saveGeometry();
 }

+NeochatDeleteDeviceJob::NeochatDeleteDeviceJob(const QString &deviceId, const Omittable<QJsonObject> &auth)
+#ifdef QUOTIENT_07
+    : Quotient::BaseJob(HttpVerb::Delete, QStringLiteral("DeleteDeviceJob"), QStringLiteral("/_matrix/client/r0/devices/%1").arg(deviceId).toLatin1())
+#else
+    : Quotient::BaseJob(HttpVerb::Delete, QStringLiteral("DeleteDeviceJob"), QStringLiteral("/_matrix/client/r0/devices/%1").arg(deviceId))
+#endif
+{
+    QJsonObject _data;
+    addParam<IfNotEmpty>(_data, QStringLiteral("auth"), auth);
+    setRequestData(std::move(_data));
+}
+
 void Controller::createRoom(const QString &name, const QString &topic)
 {
    auto createRoomJob = m_connection->createRoom(Connection::PublishRoom, "", name, topic, QStringList());
-    connect(createRoomJob, &CreateRoomJob::failure, this, [this, createRoomJob] {
+    Quotient::CreateRoomJob::connect(createRoomJob, &CreateRoomJob::failure, [this, createRoomJob] {
        Q_EMIT errorOccured(i18n("Room creation failed: \"%1\"", createRoomJob->errorString()));
    });
-    connectSingleShot(
-        this,
-        &Controller::roomAdded,
-        this,
-        [](NeoChatRoom *room) {
-            RoomManager::instance().enterRoom(room);
-        },
-        Qt::QueuedConnection);
 }

 bool Controller::isOnline() const
@@ -503,7 +715,11 @@ QString Controller::plainText(QQuickTextDocument *document) const

 bool Controller::encryptionSupported() const
 {
+#ifdef QUOTIENT_07
    return Quotient::encryptionSupported();
+#else
+    return false;
+#endif
 }

 void Controller::forceRefreshTextDocument(QQuickTextDocument *textDocument, QQuickItem *item)
@@ -544,10 +760,29 @@ void Controller::setApplicationProxy()

 int Controller::activeConnectionIndex() const
 {
+#ifdef QUOTIENT_07
    auto result = std::find_if(Accounts.accounts().begin(), Accounts.accounts().end(), [this](const auto &it) {
        return it == m_connection;
    });
    return result - Accounts.accounts().begin();
+#else
+    for (int i = 0; i < AccountRegistry::instance().rowCount(); i++) {
+        if (AccountRegistry::instance().data(AccountRegistry::instance().index(i, 0), AccountRegistry::UserIdRole).toString() == m_connection->userId()) {
+            return i;
+        }
+    }
+    return 0;
+#endif
+}
+
+int Controller::quotientMinorVersion() const
+{
+// TODO libQuotient 0.7: Replace with version function from libQuotient
+#ifdef QUOTIENT_07
+    return 7;
+#else
+    return 6;
+#endif
 }

 bool Controller::isFlatpak() const
--- a/src/controller.h
+++ b/src/controller.h
@@ -23,9 +23,15 @@ class Connection;
 class Room;
 }

+namespace QKeychain
+{
+class ReadPasswordJob;
+}
+
 class Controller : public QObject
 {
    Q_OBJECT
+    Q_PROPERTY(int accountCount READ accountCount NOTIFY accountCountChanged)
    Q_PROPERTY(bool quitOnLastWindowClosed READ quitOnLastWindowClosed WRITE setQuitOnLastWindowClosed NOTIFY quitOnLastWindowClosedChanged)
    Q_PROPERTY(Quotient::Connection *activeConnection READ activeConnection WRITE setActiveConnection NOTIFY activeConnectionChanged)
    Q_PROPERTY(bool busy READ busy WRITE setBusy NOTIFY busyChanged)
@@ -34,6 +40,7 @@ class Controller : public QObject
    Q_PROPERTY(bool isOnline READ isOnline NOTIFY isOnlineChanged)
    Q_PROPERTY(bool encryptionSupported READ encryptionSupported CONSTANT)
    Q_PROPERTY(int activeConnectionIndex READ activeConnectionIndex NOTIFY activeConnectionIndexChanged)
+    Q_PROPERTY(int quotientMinorVersion READ quotientMinorVersion CONSTANT)
    Q_PROPERTY(bool isFlatpak READ isFlatpak CONSTANT)

 public:
@@ -42,10 +49,17 @@ public:
    void setActiveConnection(Quotient::Connection *connection);
    [[nodiscard]] Quotient::Connection *activeConnection() const;

+    void addConnection(Quotient::Connection *c);
+    void dropConnection(Quotient::Connection *c);
+
+    Q_INVOKABLE void loginWithAccessToken(const QString &, const QString &, const QString &, const QString &);
+
    Q_INVOKABLE void changePassword(Quotient::Connection *connection, const QString &currentPassword, const QString &newPassword);

    Q_INVOKABLE bool setAvatar(Quotient::Connection *connection, const QUrl &avatarSource);

+    [[nodiscard]] int accountCount() const;
+
    [[nodiscard]] static bool quitOnLastWindowClosed();
    void setQuitOnLastWindowClosed(bool value);

@@ -54,6 +68,8 @@ public:

    [[nodiscard]] bool supportSystemTray() const;

+    bool saveAccessTokenToKeyChain(const Quotient::AccountSettings &account, const QByteArray &accessToken);
+
    int activeConnectionIndex() const;

    enum PasswordStatus {
@@ -84,6 +100,7 @@ public:

    Q_INVOKABLE void setApplicationProxy();

+    int quotientMinorVersion() const;
    bool isFlatpak() const;

 private:
@@ -93,15 +110,20 @@ private:
    bool m_busy = false;
    TrayIcon *m_trayIcon = nullptr;

+    QKeychain::ReadPasswordJob *loadAccessTokenFromKeyChain(const Quotient::AccountSettings &account);
+
    void loadSettings();
    void saveSettings() const;
    bool m_isOnline = true;
    QMap<Quotient::Room *, int> m_notificationCounts;

    bool hasWindowSystem() const;
+#ifdef QUOTIENT_07
    void handleNotifications(QPointer<Quotient::Connection> connection);
+#endif

 private Q_SLOTS:
+    void invokeLogin();
    void showWindow();

 Q_SIGNALS:
@@ -114,6 +136,7 @@ Q_SIGNALS:
    void syncDone();
    void connectionAdded(Quotient::Connection *_t1);
    void connectionDropped(Quotient::Connection *_t1);
+    void accountCountChanged();
    void initiated();
    void notificationClicked(const QString &_t1, const QString &_t2);
    void quitOnLastWindowClosedChanged();
@@ -128,15 +151,15 @@ Q_SIGNALS:
    void keyVerificationAccept(const QString &commitment);
    void keyVerificationKey(const QString &sas);
    void activeConnectionIndexChanged();
-    void roomAdded(NeoChatRoom *room);

 public Q_SLOTS:
+    void logout(Quotient::Connection *conn, bool serverSideLogout);
    void changeAvatar(Quotient::Connection *conn, const QUrl &localFile);
    static void markAllMessagesAsRead(Quotient::Connection *conn);
    void saveWindowGeometry();
 };

-// TODO libQuotient 0.?: Drop
+// TODO libQuotient 0.7: Drop
 class NeochatChangePasswordJob : public Quotient::BaseJob
 {
 public:
--- a/src/filetransferpseudojob.cpp
+++ b/src/filetransferpseudojob.cpp
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2022 Tobias Fella <tobias.fella@kde.org>
+// SPDX-FileCopyrightText: 2022 Tobias Fella <fella@posteo.de>
 // SPDX-License-Identifier: GPL-2.0-or-later

 #include "filetransferpseudojob.h"
@@ -25,7 +25,6 @@ void FileTransferPseudoJob::fileTransferProgress(QString id, qint64 progress, qi

 void FileTransferPseudoJob::fileTransferCompleted(QString id, QUrl localFile)
 {
-    Q_UNUSED(localFile);
    if (id != m_eventId) {
        return;
    }
--- a/src/filetransferpseudojob.h
+++ b/src/filetransferpseudojob.h
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2022 Tobias Fella <tobias.fella@kde.org>
+// SPDX-FileCopyrightText: 2022 Tobias Fella <fella@posteo.de>
 // SPDX-License-Identifier: GPL-2.0-or-later

 #pragma once
--- a/src/joinrulesevent.h
+++ b/src/joinrulesevent.h
@@ -7,17 +7,30 @@

 namespace Quotient
 {
+#ifdef QUOTIENT_07
 class JoinRulesEvent : public StateEvent
+#else
+class JoinRulesEvent : public StateEventBase
+#endif
 {
 public:
+#ifdef QUOTIENT_07
    QUO_EVENT(JoinRulesEvent, "m.room.join_rules")
+#else
+    DEFINE_EVENT_TYPEID("m.room.join_rules", JoinRulesEvent)
+#endif

    explicit JoinRulesEvent(const QJsonObject &obj)
+#ifdef QUOTIENT_07
        : StateEvent(obj)
+#else
+        : StateEventBase(typeId(), obj)
+#endif
    {
    }

    QString joinRule() const;
    QJsonArray allow() const;
 };
+REGISTER_EVENT_TYPE(JoinRulesEvent)
 }
--- a/src/login.cpp
+++ b/src/login.cpp
@@ -1,15 +1,18 @@
-// SPDX-FileCopyrightText: 2020 Tobias Fella <tobias.fella@kde.org>
+// SPDX-FileCopyrightText: 2020 Tobias Fella <fella@posteo.de>
 // SPDX-License-Identifier: GPL-2.0-or-later

 #include "login.h"

+#ifdef QUOTIENT_07
 #include <accountregistry.h>
+#else
+#include "neochataccountregistry.h"
+#endif

 #include <connection.h>
 #include <qt_connection_util.h>

 #include "controller.h"
-#include "neochatroom.h"

 #include <KLocalizedString>

@@ -40,7 +43,7 @@ void Login::init()
            return;
        }

-        m_isLoggedIn = Accounts.isLoggedIn(m_matrixId);
+        m_isLoggedIn = AccountRegistry::instance().isLoggedIn(m_matrixId);
        Q_EMIT isLoggedInChanged();
        if (m_isLoggedIn) {
            return;
@@ -71,7 +74,11 @@ void Login::init()
        account.setHomeserver(m_connection->homeserver());
        account.setDeviceId(m_connection->deviceId());
        account.setDeviceName(m_deviceName);
+        if (!Controller::instance().saveAccessTokenToKeyChain(account, m_connection->accessToken())) {
+            qWarning() << "Couldn't save access token";
+        }
        account.sync();
+        Controller::instance().addConnection(m_connection);
        Controller::instance().setActiveConnection(m_connection);
        m_connection = nullptr;
    });
@@ -90,9 +97,8 @@ void Login::init()
        Q_EMIT Controller::instance().globalErrorOccured(i18n("Network Error"), std::move(error));
    });

-    connectSingleShot(m_connection, &Connection::loadedRoomState, this, [this]() {
-        Controller::instance().setActiveConnection(m_connection);
-        // TODO close settings window
+    connectSingleShot(m_connection, &Connection::syncDone, this, [this]() {
+        Q_EMIT Controller::instance().initiated();
    });
 }

--- a/src/login.h
+++ b/src/login.h
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2020 Tobias Fella <tobias.fella@kde.org>
+// SPDX-FileCopyrightText: 2020 Tobias Fella <fella@posteo.de>
 // SPDX-License-Identifier: GPL-2.0-or-later

 #pragma once
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -28,14 +28,15 @@

 #include "neochat-version.h"

+#ifdef QUOTIENT_07
 #include <accountregistry.h>
+#else
+#include "neochataccountregistry.h"
+#endif
+
 #include <networkaccessmanager.h>
 #include <room.h>
 #include <util.h>
-#include <keyverificationsession.h>
-#include <accountregistry.h>
-#include <room.h>
-#include <networkaccessmanager.h>

 #include "actionshandler.h"
 #include "blurhashimageprovider.h"
@@ -43,6 +44,7 @@
 #include "clipboard.h"
 #include "controller.h"
 #include "filetypesingleton.h"
+#include "joinrulesevent.h"
 #include "linkpreviewer.h"
 #include "login.h"
 #include "matriximageprovider.h"
@@ -67,11 +69,16 @@
 #include "neochatroom.h"
 #include "neochatuser.h"
 #include "notificationsmanager.h"
+#ifdef QUOTIENT_07
 #include "pollhandler.h"
+#endif
 #include "roommanager.h"
 #include "spacehierarchycache.h"
 #include "urlhelper.h"
 #include "windowcontroller.h"
+#ifdef QUOTIENT_07
+#include <keyverificationsession.h>
+#endif
 #ifdef HAVE_COLORSCHEME
 #include "colorschemer.h"
 #endif
@@ -79,7 +86,6 @@
 #include "models/statemodel.h"
 #include "neochatuser.h"

-
 #ifdef HAVE_RUNNER
 #include "runner.h"
 #include <QDBusConnection>
@@ -151,7 +157,7 @@ int main(int argc, char *argv[])
                     KAboutLicense::GPL_V3,
                     i18n("© 2018-2020 Black Hat, 2020-2022 KDE Community"));
    about.addAuthor(i18n("Carl Schwan"), i18n("Maintainer"), QStringLiteral("carl@carlschwan.eu"), QStringLiteral("https://carlschwan.eu"));
-    about.addAuthor(i18n("Tobias Fella"), i18n("Maintainer"), QStringLiteral("tobias.fella@kde.org"), QStringLiteral("https://tobiasfella.de"));
+    about.addAuthor(i18n("Tobias Fella"), i18n("Maintainer"), QStringLiteral("fella@posteo.de"), QStringLiteral("https://tobiasfella.de"));
    about.addAuthor(i18n("James Graham"), i18n("Maintainer"), QStringLiteral("james.h.graham@protonmail.com"));
    about.addCredit(i18n("Black Hat"), i18n("Original author of Spectral"), QStringLiteral("bhat@encom.eu.org"));
    about.addCredit(i18n("Alexey Rusakov"), i18n("Maintainer of Quotient"), QStringLiteral("Kitsune-Ral@users.sf.net"));
@@ -160,10 +166,14 @@ int main(int argc, char *argv[])

    about.addComponent(QStringLiteral("libQuotient"),
                       i18n("A Qt5 library to write cross-platform clients for Matrix"),
+#ifdef QUOTIENT_07
                       i18nc("<version number> (built against <possibly different version number>)",
                             "%1 (built against %2)",
                             Quotient::versionString(),
                             QStringLiteral(Quotient_VERSION_STRING)),
+#else
+                       QStringLiteral(QUOTIENT_VERSION),
+#endif
                       QStringLiteral("https://github.com/quotient-im/libquotient"),
                       KAboutLicense::LGPL_V2_1);

@@ -200,8 +210,11 @@ int main(int argc, char *argv[])
    qmlRegisterSingletonInstance("org.kde.neochat", 1, 0, "LoginHelper", login);
    qmlRegisterSingletonInstance("org.kde.neochat", 1, 0, "UrlHelper", &urlHelper);
    qmlRegisterSingletonInstance("org.kde.neochat", 1, 0, "EmojiModel", &EmojiModel::instance());
-    qmlRegisterSingletonInstance("org.kde.neochat", 1, 0, "Accounts", &Quotient::Accounts);
-    qmlRegisterSingletonInstance("org.kde.neochat", 1, 0, "Accounts", &Quotient::Accounts);
+#ifdef QUOTIENT_07
+    qmlRegisterSingletonInstance("org.kde.neochat", 1, 0, "AccountRegistry", &Quotient::Accounts);
+#else
+    qmlRegisterSingletonInstance("org.kde.neochat", 1, 0, "AccountRegistry", &Quotient::AccountRegistry::instance());
+#endif
    qmlRegisterSingletonInstance("org.kde.neochat", 1, 0, "SpaceHierarchyCache", &SpaceHierarchyCache::instance());
    qmlRegisterSingletonInstance("org.kde.neochat", 1, 0, "CustomEmojiModel", &CustomEmojiModel::instance());
    qmlRegisterType<ActionsHandler>("org.kde.neochat", 1, 0, "ActionsHandler");
@@ -223,7 +236,9 @@ int main(int argc, char *argv[])
    qmlRegisterType<CompletionModel>("org.kde.neochat", 1, 0, "CompletionModel");
    qmlRegisterType<StateModel>("org.kde.neochat", 1, 0, "StateModel");
    qmlRegisterType<SearchModel>("org.kde.neochat", 1, 0, "SearchModel");
+#ifdef QUOTIENT_07
    qmlRegisterType<PollHandler>("org.kde.neochat", 1, 0, "PollHandler");
+#endif
    qmlRegisterType<KeywordNotificationRuleModel>("org.kde.neochat", 1, 0, "KeywordNotificationRuleModel");
    qmlRegisterUncreatableType<RoomMessageEvent>("org.kde.neochat", 1, 0, "RoomMessageEvent", "ENUM");
    qmlRegisterUncreatableType<PushNotificationState>("org.kde.neochat", 1, 0, "PushNotificationState", "ENUM");
@@ -242,10 +257,12 @@ int main(int argc, char *argv[])
    qRegisterMetaType<NeoChatUser *>("NeoChatUser*");
    qRegisterMetaType<GetRoomEventsJob *>("GetRoomEventsJob*");
    qRegisterMetaType<QMimeType>("QMimeType");
+#ifdef QUOTIENT_07
 #ifdef Quotient_E2EE_ENABLED
    qRegisterMetaType<KeyVerificationSession *>("KeyVerificationSession*");
    qmlRegisterUncreatableType<KeyVerificationSession>("org.kde.neochat", 1, 0, "KeyVerificationSession", {});
    qRegisterMetaType<QVector<EmojiEntry>>("QVector<EmojiEntry>");
+#endif
 #endif
    qmlRegisterSingletonType("org.kde.neochat", 1, 0, "About", [](QQmlEngine *engine, QJSEngine *) -> QJSValue {
        return engine->toScriptValue(KAboutData::applicationData());
--- a/src/models/actionsmodel.cpp
+++ b/src/models/actionsmodel.cpp
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2022 Tobias Fella <tobias.fella@kde.org>
+// SPDX-FileCopyrightText: 2022 Tobias Fella <fella@posteo.de>
 // SPDX-License-Identifier: LGPL-2.0-or-later

 #include "actionsmodel.h"
@@ -19,41 +19,6 @@ QStringList rainbowColors{"#ff2b00", "#ff5500", "#ff8000", "#ffaa00", "#ffd500",
                          "#00ff2b", "#00ff55", "#00ff80", "#00ffaa", "#00ffd5", "#00ffff", "#00d4ff", "#00aaff", "#007fff", "#0055ff", "#002bff", "#0000ff",
                          "#2a00ff", "#5500ff", "#7f00ff", "#aa00ff", "#d400ff", "#ff00ff", "#ff00d4", "#ff00aa", "#ff0080", "#ff0055", "#ff002b", "#ff0000"};

-auto leaveRoomLambda = [](const QString &text, NeoChatRoom *room) {
-    if (text.isEmpty()) {
-        Q_EMIT room->showMessage(NeoChatRoom::Info, i18n("Leaving this room."));
-        room->connection()->leaveRoom(room);
-    } else {
-        QRegularExpression roomRegex(QStringLiteral(R"(^[#!][^:]+:\w(?:\w|\.|-)*\.\w+(?::\d{1,5})?)"));
-        auto regexMatch = roomRegex.match(text);
-        if (!regexMatch.hasMatch()) {
-            Q_EMIT room->showMessage(NeoChatRoom::Error,
-                                     i18nc("'<text>' does not look like a room id or alias.", "'%1' does not look like a room id or alias.", text));
-            return QString();
-        }
-        auto leaving = room->connection()->room(text);
-        if (!leaving) {
-            leaving = room->connection()->roomByAlias(text);
-        }
-        if (leaving) {
-            Q_EMIT room->showMessage(NeoChatRoom::Info, i18nc("Leaving room <roomname>.", "Leaving room %1.", text));
-            room->connection()->leaveRoom(leaving);
-        } else {
-            Q_EMIT room->showMessage(NeoChatRoom::Info, i18nc("Room <roomname> not found", "Room %1 not found.", text));
-        }
-    }
-    return QString();
-};
-
-auto roomNickLambda = [](const QString &text, NeoChatRoom *room) {
-    if (text.isEmpty()) {
-        Q_EMIT room->showMessage(NeoChatRoom::Error, i18n("No new nickname provided, no changes will happen."));
-    } else {
-        room->connection()->user()->rename(text, room);
-    }
-    return QString();
-};
-
 QVector<ActionsModel::Action> actions{
    Action{
        QStringLiteral("shrug"),
@@ -150,7 +115,7 @@ QVector<ActionsModel::Action> actions{
        QStringLiteral("spoiler"),
        [](const QString &text, NeoChatRoom *room) {
            // Ideally, we would just return rainbowText and let that do the rest, but the colors don't survive markdownToHTML.
-            room->postMessage(QStringLiteral("/spoiler %1").arg(text),
+            room->postMessage(QStringLiteral("/rainbow %1").arg(text),
                              QStringLiteral("<span data-mx-spoiler>%1</span>").arg(text),
                              RoomMessageEvent::MsgType::Text,
                              room->chatBoxReplyId(),
@@ -192,6 +157,7 @@ QVector<ActionsModel::Action> actions{
                Q_EMIT room->showMessage(NeoChatRoom::Error, i18nc("'<text>' does not look like a matrix id.", "'%1' does not look like a matrix id.", text));
                return QString();
            }
+#ifdef QUOTIENT_07
            const RoomMemberEvent *roomMemberEvent = room->currentState().get<RoomMemberEvent>(text);
            if (roomMemberEvent && roomMemberEvent->membership() == Membership::Invite) {
                Q_EMIT room->showMessage(NeoChatRoom::Info, i18nc("<user> is already invited to this room.", "%1 is already invited to this room.", text));
@@ -201,6 +167,7 @@ QVector<ActionsModel::Action> actions{
                Q_EMIT room->showMessage(NeoChatRoom::Info, i18nc("<user> is banned from this room.", "%1 is banned from this room.", text));
                return QString();
            }
+#endif
            if (room->localUser()->id() == text) {
                Q_EMIT room->showMessage(NeoChatRoom::Positive, i18n("You are already in this room."));
                return QString();
@@ -242,38 +209,6 @@ QVector<ActionsModel::Action> actions{
        kli18n("<room alias or id>"),
        kli18n("Joins the given room"),
    },
-    Action{
-        QStringLiteral("knock"),
-        [](const QString &text, NeoChatRoom *room) {
-            auto parts = text.split(QLatin1String(" "));
-            QString roomName = parts[0];
-            QRegularExpression roomRegex(QStringLiteral(R"(^[#!][^:]+:\w(?:\w|\.|-)*\.\w+(?::\d{1,5})?)"));
-            auto regexMatch = roomRegex.match(roomName);
-            if (!regexMatch.hasMatch()) {
-                Q_EMIT room->showMessage(NeoChatRoom::Error,
-                                         i18nc("'<text>' does not look like a room id or alias.", "'%1' does not look like a room id or alias.", text));
-                return QString();
-            }
-            auto targetRoom = text.startsWith(QLatin1Char('!')) ? room->connection()->room(text) : room->connection()->roomByAlias(text);
-            if (targetRoom) {
-                RoomManager::instance().enterRoom(dynamic_cast<NeoChatRoom *>(targetRoom));
-                return QString();
-            }
-            Q_EMIT room->showMessage(NeoChatRoom::Info, i18nc("Knocking room <roomname>.", "Knocking room %1.", text));
-            auto connection = Controller::instance().activeConnection();
-            const auto knownServer = roomName.mid(roomName.indexOf(":") + 1);
-            if (parts.length() >= 2) {
-                RoomManager::instance().knockRoom(connection, roomName, parts[1], QStringList{knownServer});
-            } else {
-                RoomManager::instance().knockRoom(connection, roomName, QString(), QStringList{knownServer});
-            }
-            return QString();
-        },
-        false,
-        std::nullopt,
-        kli18n("<room alias or id> [<reason>]"),
-        kli18n("Requests to join the given room"),
-    },
    Action{
        QStringLiteral("j"),
        [](const QString &text, NeoChatRoom *room) {
@@ -299,7 +234,31 @@ QVector<ActionsModel::Action> actions{
    },
    Action{
        QStringLiteral("part"),
-        leaveRoomLambda,
+        [](const QString &text, NeoChatRoom *room) {
+            if (text.isEmpty()) {
+                Q_EMIT room->showMessage(NeoChatRoom::Info, i18n("Leaving this room."));
+                room->connection()->leaveRoom(room);
+            } else {
+                QRegularExpression roomRegex(QStringLiteral(R"(^[#!][^:]+:\w(?:\w|\.|-)*\.\w+(?::\d{1,5})?)"));
+                auto regexMatch = roomRegex.match(text);
+                if (!regexMatch.hasMatch()) {
+                    Q_EMIT room->showMessage(NeoChatRoom::Error,
+                                             i18nc("'<text>' does not look like a room id or alias.", "'%1' does not look like a room id or alias.", text));
+                    return QString();
+                }
+                auto leaving = room->connection()->room(text);
+                if (!leaving) {
+                    leaving = room->connection()->roomByAlias(text);
+                }
+                if (leaving) {
+                    Q_EMIT room->showMessage(NeoChatRoom::Info, i18nc("Leaving room <roomname>.", "Leaving room %1.", text));
+                    room->connection()->leaveRoom(leaving);
+                } else {
+                    Q_EMIT room->showMessage(NeoChatRoom::Info, i18nc("Room <roomname> not found", "Room %1 not found.", text));
+                }
+            }
+            return QString();
+        },
        false,
        std::nullopt,
        kli18n("[<room alias or id>]"),
@@ -307,7 +266,31 @@ QVector<ActionsModel::Action> actions{
    },
    Action{
        QStringLiteral("leave"),
-        leaveRoomLambda,
+        [](const QString &text, NeoChatRoom *room) {
+            if (text.isEmpty()) {
+                Q_EMIT room->showMessage(NeoChatRoom::Info, i18n("Leaving this room."));
+                room->connection()->leaveRoom(room);
+            } else {
+                QRegularExpression roomRegex(QStringLiteral(R"(^[#!][^:]+:\w(?:\w|\.|-)*\.\w+(?::\d{1,5})?)"));
+                auto regexMatch = roomRegex.match(text);
+                if (!regexMatch.hasMatch()) {
+                    Q_EMIT room->showMessage(NeoChatRoom::Error,
+                                             i18nc("'<text>' does not look like a room id or alias.", "'%1' does not look like a room id or alias.", text));
+                    return QString();
+                }
+                auto leaving = room->connection()->room(text);
+                if (!leaving) {
+                    leaving = room->connection()->roomByAlias(text);
+                }
+                if (leaving) {
+                    Q_EMIT room->showMessage(NeoChatRoom::Info, i18nc("Leaving room <roomname>.", "Leaving room %1.", text));
+                    room->connection()->leaveRoom(leaving);
+                } else {
+                    Q_EMIT room->showMessage(NeoChatRoom::Info, i18nc("Room <roomname> not found", "Room %1 not found.", text));
+                }
+            }
+            return QString();
+        },
        false,
        std::nullopt,
        kli18n("[<room alias or id>]"),
@@ -330,15 +313,14 @@ QVector<ActionsModel::Action> actions{
    },
    Action{
        QStringLiteral("roomnick"),
-        roomNickLambda,
-        false,
-        std::nullopt,
-        kli18n("<display name>"),
-        kli18n("Changes your display name in this room"),
-    },
-    Action{
-        QStringLiteral("myroomnick"),
-        roomNickLambda,
+        [](const QString &text, NeoChatRoom *room) {
+            if (text.isEmpty()) {
+                Q_EMIT room->showMessage(NeoChatRoom::Error, i18n("No new nickname provided, no changes will happen."));
+            } else {
+                room->connection()->user()->rename(text, room);
+            }
+            return QString();
+        },
        false,
        std::nullopt,
        kli18n("<display name>"),
@@ -432,12 +414,14 @@ QVector<ActionsModel::Action> actions{
                Q_EMIT room->showMessage(NeoChatRoom::Error, i18nc("'<text>' does not look like a matrix id.", "'%1' does not look like a matrix id.", text));
                return QString();
            }
+#ifdef QUOTIENT_07
            auto state = room->currentState().get<RoomMemberEvent>(parts[0]);
            if (state && state->membership() == Membership::Ban) {
                Q_EMIT room->showMessage(NeoChatRoom::Info, i18nc("<user> is already banned from this room.", "%1 is already banned from this room.", text));
                return QString();
            }
-            auto plEvent = room->currentState().get<RoomPowerLevelsEvent>();
+#endif
+            auto plEvent = room->getCurrentState<RoomPowerLevelsEvent>();
            if (plEvent->ban() > plEvent->powerLevelForUser(room->localUser()->id())) {
                Q_EMIT room->showMessage(NeoChatRoom::Error, i18n("You are not allowed to ban users from this room."));
                return QString();
@@ -467,16 +451,18 @@ QVector<ActionsModel::Action> actions{
                Q_EMIT room->showMessage(NeoChatRoom::Error, i18nc("'<text>' does not look like a matrix id.", "'%1' does not look like a matrix id.", text));
                return QString();
            }
-            auto plEvent = room->currentState().get<RoomPowerLevelsEvent>();
+            auto plEvent = room->getCurrentState<RoomPowerLevelsEvent>();
            if (plEvent->ban() > plEvent->powerLevelForUser(room->localUser()->id())) {
                Q_EMIT room->showMessage(NeoChatRoom::Error, i18n("You are not allowed to unban users from this room."));
                return QString();
            }
+#ifdef QUOTIENT_07
            auto state = room->currentState().get<RoomMemberEvent>(text);
            if (state && state->membership() != Membership::Ban) {
                Q_EMIT room->showMessage(NeoChatRoom::Info, i18nc("<user> is not banned from this room.", "%1 is not banned from this room.", text));
                return QString();
            }
+#endif
            room->unban(text);
            Q_EMIT room->showMessage(NeoChatRoom::Positive, i18nc("<username> was unbanned from this room.", "%1 was unbanned from this room.", text));

@@ -503,11 +489,13 @@ QVector<ActionsModel::Action> actions{
                Q_EMIT room->showMessage(NeoChatRoom::Error, i18n("You cannot kick yourself from the room."));
                return QString();
            }
+#ifdef QUOTIENT_07
            if (!room->isMember(parts[0])) {
                Q_EMIT room->showMessage(NeoChatRoom::Error, i18nc("<username> is not in this room", "%1 is not in this room.", parts[0]));
                return QString();
            }
-            auto plEvent = room->currentState().get<RoomPowerLevelsEvent>();
+#endif
+            auto plEvent = room->getCurrentState<RoomPowerLevelsEvent>();
            auto kick = plEvent->kick();
            if (plEvent->powerLevelForUser(room->localUser()->id()) < kick) {
                Q_EMIT room->showMessage(NeoChatRoom::Error, i18n("You are not allowed to kick users from this room."));
--- a/src/models/actionsmodel.h
+++ b/src/models/actionsmodel.h
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2022 Tobias Fella <tobias.fella@kde.org>
+// SPDX-FileCopyrightText: 2022 Tobias Fella <fella@posteo.de>
 // SPDX-License-Identifier: LGPL-2.0-or-later

 #pragma once
--- a/src/models/collapsestateproxymodel.cpp
+++ b/src/models/collapsestateproxymodel.cpp
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2022 Tobias Fella <tobias.fella@kde.org>
+// SPDX-FileCopyrightText: 2022 Tobias Fella <fella@posteo.de>
 // SPDX-License-Identifier: LGPL-2.0-or-later

 #include "collapsestateproxymodel.h"
@@ -9,9 +9,9 @@
 bool CollapseStateProxyModel::filterAcceptsRow(int source_row, const QModelIndex &source_parent) const
 {
    Q_UNUSED(source_parent);
-    return sourceModel()->data(sourceModel()->index(source_row, 0), MessageEventModel::DelegateTypeRole)
+    return sourceModel()->data(sourceModel()->index(source_row, 0), MessageEventModel::EventTypeRole)
        != MessageEventModel::DelegateType::State // If this is not a state, show it
-        || sourceModel()->data(sourceModel()->index(source_row + 1, 0), MessageEventModel::DelegateTypeRole)
+        || sourceModel()->data(sourceModel()->index(source_row + 1, 0), MessageEventModel::EventTypeRole)
        != MessageEventModel::DelegateType::State // If this is the first state in a block, show it. TODO hidden events?
        || sourceModel()->data(sourceModel()->index(source_row, 0), MessageEventModel::ShowSectionRole).toBool(); // If it's a new day, show it
 }
@@ -47,7 +47,7 @@ QString CollapseStateProxyModel::aggregateEventToString(int sourceRow) const
        if (!uniqueAuthors.contains(nextAuthor)) {
            uniqueAuthors.append(nextAuthor);
        }
-        if (sourceModel()->data(sourceModel()->index(i - 1, 0), MessageEventModel::DelegateTypeRole)
+        if (sourceModel()->data(sourceModel()->index(i - 1, 0), MessageEventModel::EventTypeRole)
                != MessageEventModel::DelegateType::State // If it's not a state event
            || sourceModel()->data(sourceModel()->index(i - 1, 0), MessageEventModel::ShowSectionRole).toBool() // or the section needs to be visible
        ) {
@@ -105,7 +105,7 @@ QVariantList CollapseStateProxyModel::stateEventsList(int sourceRow) const
            {"text", sourceModel()->data(sourceModel()->index(i, 0), Qt::DisplayRole).toString()},
        };
        stateEvents.append(nextState);
-        if (sourceModel()->data(sourceModel()->index(i - 1, 0), MessageEventModel::DelegateTypeRole)
+        if (sourceModel()->data(sourceModel()->index(i - 1, 0), MessageEventModel::EventTypeRole)
                != MessageEventModel::DelegateType::State // If it's not a state event
            || sourceModel()->data(sourceModel()->index(i - 1, 0), MessageEventModel::ShowSectionRole).toBool() // or the section needs to be visible
        ) {
@@ -123,7 +123,7 @@ QVariantList CollapseStateProxyModel::authorList(int sourceRow) const
        if (!uniqueAuthors.contains(nextAvatar)) {
            uniqueAuthors.append(nextAvatar);
        }
-        if (sourceModel()->data(sourceModel()->index(i - 1, 0), MessageEventModel::DelegateTypeRole)
+        if (sourceModel()->data(sourceModel()->index(i - 1, 0), MessageEventModel::EventTypeRole)
                != MessageEventModel::DelegateType::State // If it's not a state event
            || sourceModel()->data(sourceModel()->index(i - 1, 0), MessageEventModel::ShowSectionRole).toBool() // or the section needs to be visible
        ) {
--- a/src/models/collapsestateproxymodel.h
+++ b/src/models/collapsestateproxymodel.h
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2022 Tobias Fella <tobias.fella@kde.org>
+// SPDX-FileCopyrightText: 2022 Tobias Fella <fella@posteo.de>
 // SPDX-License-Identifier: LGPL-2.0-or-later

 #pragma once
--- a/src/models/completionmodel.cpp
+++ b/src/models/completionmodel.cpp
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2022 Tobias Fella <tobias.fella@kde.org>
+// SPDX-FileCopyrightText: 2022 Tobias Fella <fella@posteo.de>
 // SPDX-License-Identifier: LGPL-2.0-or-later

 #include "completionmodel.h"
@@ -145,7 +145,7 @@ void CompletionModel::updateCompletion()
        m_filterModel->setFullText(m_fullText);
        m_filterModel->setFilterText(m_text);
        m_filterModel->invalidate();
-    } else if (text().startsWith(QLatin1Char(':')) && !text()[1].isUpper()
+    } else if (text().startsWith(QLatin1Char(':'))
               && (m_fullText.indexOf(QLatin1Char(':'), 1) == -1
                   || (m_fullText.indexOf(QLatin1Char(' ')) != -1 && m_fullText.indexOf(QLatin1Char(':'), 1) > m_fullText.indexOf(QLatin1Char(' '), 1)))) {
        m_filterModel->setSourceModel(m_emojiModel);
--- a/src/models/completionmodel.h
+++ b/src/models/completionmodel.h
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2022 Tobias Fella <tobias.fella@kde.org>
+// SPDX-FileCopyrightText: 2022 Tobias Fella <fella@posteo.de>
 // SPDX-License-Identifier: LGPL-2.0-or-later

 #pragma once
--- a/src/models/completionproxymodel.cpp
+++ b/src/models/completionproxymodel.cpp
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2022 Tobias Fella <tobias.fella@kde.org>
+// SPDX-FileCopyrightText: 2022 Tobias Fella <fella@posteo.de>
 // SPDX-License-Identifier: LGPL-2.0-or-later

 #include "completionproxymodel.h"
--- a/src/models/completionproxymodel.h
+++ b/src/models/completionproxymodel.h
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2022 Tobias Fella <tobias.fella@kde.org>
+// SPDX-FileCopyrightText: 2022 Tobias Fella <fella@posteo.de>
 // SPDX-License-Identifier: LGPL-2.0-or-later

 #pragma once
--- a/src/models/customemojimodel.cpp
+++ b/src/models/customemojimodel.cpp
@@ -11,6 +11,12 @@

 using namespace Quotient;

+#ifdef QUOTIENT_07
+#define running isJobPending
+#else
+#define running isJobRunning
+#endif
+
 void CustomEmojiModel::fetchEmojis()
 {
    if (!Controller::instance().activeConnection()) {
@@ -51,12 +57,18 @@ void CustomEmojiModel::addEmoji(const QString &name, const QUrl &location)

    auto job = Controller::instance().activeConnection()->uploadFile(location.toLocalFile());

-    if (isJobPending(job)) {
-        connect(job, &BaseJob::success, this, [name, job] {
+    if (running(job)) {
+        connect(job, &BaseJob::success, this, [this, name, job] {
            const auto &data = Controller::instance().activeConnection()->accountData("im.ponies.user_emotes");
            auto json = data != nullptr ? data->contentJson() : QJsonObject();
            auto emojiData = json["images"].toObject();
-            emojiData[QStringLiteral("%1").arg(name)] = QJsonObject({{QStringLiteral("url"), job->contentUri().toString()}});
+            emojiData[QStringLiteral("%1").arg(name)] = QJsonObject({
+#ifdef QUOTIENT_07
+                {QStringLiteral("url"), job->contentUri().toString()}
+#else
+          {QStringLiteral("url"), job->contentUri()}
+#endif
+            });
            json["images"] = emojiData;
            Controller::instance().activeConnection()->setAccountData("im.ponies.user_emotes", json);
        });
@@ -129,9 +141,8 @@ QVariant CustomEmojiModel::data(const QModelIndex &idx, int role) const
        return QUrl(QStringLiteral("image://mxc/") + data.url.mid(6));
    case Roles::MxcUrl:
        return data.url.mid(6);
-    default:
-        return {};
    }
+
    return QVariant();
 }

--- a/src/models/devicesmodel.cpp
+++ b/src/models/devicesmodel.cpp
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Tobias Fella <tobias.fella@kde.org>
+// SPDX-FileCopyrightText: Tobias Fella <fella@posteo.de>
 // SPDX-License-Identifier: GPL-2.0-or-later

 #include "devicesmodel.h"
@@ -67,7 +67,7 @@ QHash<int, QByteArray> DevicesModel::roleNames() const

 void DevicesModel::logout(int index, const QString &password)
 {
-    auto job = Controller::instance().activeConnection()->callApi<DeleteDeviceJob>(m_devices[index].deviceId);
+    auto job = Controller::instance().activeConnection()->callApi<NeochatDeleteDeviceJob>(m_devices[index].deviceId);

    connect(job, &BaseJob::result, this, [this, job, password, index] {
        auto onSuccess = [this, index]() {
--- a/src/models/devicesmodel.h
+++ b/src/models/devicesmodel.h
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Tobias Fella <tobias.fella@kde.org>
+// SPDX-FileCopyrightText: Tobias Fella <fella@posteo.de>
 // SPDX-License-Identifier: GPL-2.0-or-later

 #pragma once
--- a/src/models/messageeventmodel.cpp
+++ b/src/models/messageeventmodel.cpp
@@ -11,10 +11,12 @@
 #include <events/roomavatarevent.h>
 #include <events/roommemberevent.h>
 #include <events/simplestateevents.h>
-#include <events/stickerevent.h>
 #include <user.h>

+#ifdef QUOTIENT_07
 #include "pollevent.h"
+#endif
+#include "stickerevent.h"

 #include <QDebug>
 #include <QGuiApplication>
@@ -25,13 +27,14 @@
 #include <KLocalizedString>

 #include "neochatuser.h"
+#include "utils.h"

 using namespace Quotient;

 QHash<int, QByteArray> MessageEventModel::roleNames() const
 {
    QHash<int, QByteArray> roles = QAbstractItemModel::roleNames();
-    roles[DelegateTypeRole] = "delegateType";
+    roles[EventTypeRole] = "eventType";
    roles[MessageRole] = "message";
    roles[EventIdRole] = "eventId";
    roles[TimeRole] = "time";
@@ -43,16 +46,16 @@ QHash<int, QByteArray> MessageEventModel::roleNames() const
    roles[SpecialMarksRole] = "marks";
    roles[LongOperationRole] = "progressInfo";
    roles[FileMimetypeIcon] = "fileMimetypeIcon";
+    roles[AnnotationRole] = "annotation";
    roles[EventResolvedTypeRole] = "eventResolvedType";
    roles[IsReplyRole] = "isReply";
    roles[ReplyRole] = "reply";
    roles[ReplyIdRole] = "replyId";
+    roles[UserMarkerRole] = "userMarker";
    roles[ShowAuthorRole] = "showAuthor";
    roles[ShowSectionRole] = "showSection";
-    roles[ReadMarkersRole] = "readMarkers";
-    roles[ReadMarkersStringRole] = "readMarkersString";
-    roles[ShowReadMarkersRole] = "showReadMarkers";
    roles[ReactionRole] = "reaction";
+    roles[IsEditedRole] = "isEdited";
    roles[SourceRole] = "source";
    roles[MimeTypeRole] = "mimeType";
    roles[FormattedBodyRole] = "formattedBody";
@@ -61,17 +64,16 @@ QHash<int, QByteArray> MessageEventModel::roleNames() const
    roles[VerifiedRole] = "verified";
    roles[DisplayNameForInitialsRole] = "displayNameForInitials";
    roles[AuthorDisplayNameRole] = "authorDisplayName";
+    roles[IsNameChangeRole] = "isNameChange";
+    roles[IsAvatarChangeRole] = "isAvatarChange";
    roles[IsRedactedRole] = "isRedacted";
    roles[GenericDisplayRole] = "genericDisplay";
-    roles[IsPendingRole] = "isPending";
-    roles[LatitudeRole] = "latitude";
-    roles[LongitudeRole] = "longitude";
-    roles[AssetRole] = "asset";
    return roles;
 }

 MessageEventModel::MessageEventModel(QObject *parent)
    : QAbstractListModel(parent)
+    , m_currentRoom(nullptr)
 {
    using namespace Quotient;
    qmlRegisterAnonymousType<FileTransferInfo>("org.kde.neochat", 1);
@@ -84,11 +86,6 @@ MessageEventModel::MessageEventModel(QObject *parent)

 MessageEventModel::~MessageEventModel() = default;

-NeoChatRoom *MessageEventModel::room() const
-{
-    return m_currentRoom;
-}
-
 void MessageEventModel::setRoom(NeoChatRoom *room)
 {
    if (room == m_currentRoom) {
@@ -107,7 +104,11 @@ void MessageEventModel::setRoom(NeoChatRoom *room)
        if (m_currentRoom->timelineSize() < 10 && !room->allHistoryLoaded()) {
            room->getPreviousContent(50);
        }
+#ifdef QUOTIENT_07
        lastReadEventId = room->lastFullyReadEventId();
+#else
+        lastReadEventId = room->readMarkerEventId();
+#endif

        using namespace Quotient;
        connect(m_currentRoom, &Room::aboutToAddNewMessages, this, [this](RoomEventsRange events) {
@@ -156,7 +157,11 @@ void MessageEventModel::setRoom(NeoChatRoom *room)
            endInsertRows();
            if (!m_lastReadEventIndex.isValid()) {
                // no read marker, so see if we need to create one.
+#ifdef QUOTIENT_07
                moveReadMarker(m_currentRoom->lastFullyReadEventId());
+#else
+                moveReadMarker(m_currentRoom->readMarkerEventId());
+#endif
            }
            if (biggest < m_currentRoom->maxTimelineIndex()) {
                auto rowBelowInserted = m_currentRoom->maxTimelineIndex() - biggest + timelineBaseIndex() - 1;
@@ -171,7 +176,6 @@ void MessageEventModel::setRoom(NeoChatRoom *room)
        });
        connect(m_currentRoom, &Room::pendingEventAdded, this, &MessageEventModel::endInsertRows);
        connect(m_currentRoom, &Room::pendingEventAboutToMerge, this, [this](RoomEvent *, int i) {
-            Q_EMIT dataChanged(index(i, 0), index(i, 0), {IsPendingRole});
            if (i == 0) {
                return; // No need to move anything, just refresh
            }
@@ -197,7 +201,7 @@ void MessageEventModel::setRoom(NeoChatRoom *room)
            beginRemoveRows({}, i, i);
        });
        connect(m_currentRoom, &Room::pendingEventDiscarded, this, &MessageEventModel::endRemoveRows);
-        connect(m_currentRoom, &Room::fullyReadMarkerMoved, this, [this](const QString &fromEventId, const QString &toEventId) {
+        connect(m_currentRoom, &Room::readMarkerMoved, this, [this](const QString &fromEventId, const QString &toEventId) {
            Q_UNUSED(fromEventId);
            moveReadMarker(toEventId);
        });
@@ -210,16 +214,13 @@ void MessageEventModel::setRoom(NeoChatRoom *room)
            }
            refreshEventRoles(eventId, {ReactionRole, Qt::DisplayRole});
        });
-        connect(m_currentRoom, &Room::changed, this, [this]() {
-            for (auto it = m_currentRoom->messageEvents().rbegin(); it != m_currentRoom->messageEvents().rend(); ++it) {
-                auto event = it->event();
-                refreshEventRoles(event->id(), {ReadMarkersRole, ReadMarkersStringRole});
-            }
-        });
        connect(m_currentRoom, &Room::newFileTransfer, this, &MessageEventModel::refreshEvent);
        connect(m_currentRoom, &Room::fileTransferProgress, this, &MessageEventModel::refreshEvent);
        connect(m_currentRoom, &Room::fileTransferCompleted, this, &MessageEventModel::refreshEvent);
        connect(m_currentRoom, &Room::fileTransferFailed, this, &MessageEventModel::refreshEvent);
+#ifndef QUOTIENT_07
+        connect(m_currentRoom, &Room::fileTransferCancelled, this, &MessageEventModel::refreshEvent);
+#endif
        connect(m_currentRoom->connection(), &Connection::ignoredUsersListChanged, this, [this] {
            beginResetModel();
            endResetModel();
@@ -305,7 +306,7 @@ int MessageEventModel::refreshEventRoles(const QString &id, const QVector<int> &
            return -1;
        }
        row = int(timelineIt - m_currentRoom->messageEvents().rbegin()) + timelineBaseIndex();
-        if (data(index(row, 0), DelegateTypeRole).toInt() == ReadMarker || data(index(row, 0), DelegateTypeRole).toInt() == Other) {
+        if (data(index(row, 0), EventTypeRole).toInt() == ReadMarker || data(index(row, 0), EventTypeRole).toInt() == Other) {
            row++;
        }
    }
@@ -436,7 +437,7 @@ QVariant MessageEventModel::data(const QModelIndex &idx, int role) const

    if (m_lastReadEventIndex.row() == row) {
        switch (role) {
-        case DelegateTypeRole:
+        case EventTypeRole:
            return DelegateType::ReadMarker;
        case TimeRole: {
            const QDateTime eventDate = data(index(m_lastReadEventIndex.row() + 1, 0), TimeRole).toDateTime().toLocalTime();
@@ -485,10 +486,10 @@ QVariant MessageEventModel::data(const QModelIndex &idx, int role) const
    }

    if (role == SourceRole) {
-        return QJsonDocument(evt.fullJson()).toJson();
+        return evt.originalJson();
    }

-    if (role == DelegateTypeRole) {
+    if (role == EventTypeRole) {
        if (auto e = eventCast<const RoomMessageEvent>(&evt)) {
            switch (e->msgtype()) {
            case MessageEventType::Emote:
@@ -501,8 +502,6 @@ QVariant MessageEventModel::data(const QModelIndex &idx, int role) const
                return DelegateType::Audio;
            case MessageEventType::Video:
                return DelegateType::Video;
-            case MessageEventType::Location:
-                return DelegateType::Location;
            default:
                break;
            }
@@ -521,18 +520,20 @@ QVariant MessageEventModel::data(const QModelIndex &idx, int role) const
        if (is<const EncryptedEvent>(evt)) {
            return DelegateType::Encrypted;
        }
+#ifdef QUOTIENT_07
        if (is<PollStartEvent>(evt)) {
            if (evt.isRedacted()) {
                return DelegateType::Message;
            }
            return DelegateType::Poll;
        }
+#endif

        return DelegateType::Other;
    }

    if (role == EventResolvedTypeRole) {
-        return evt.type();
+        return EventTypeRegistry::getMatrixType(evt.type());
    }

    if (role == AuthorRole) {
@@ -555,9 +556,6 @@ QVariant MessageEventModel::data(const QModelIndex &idx, int role) const
        }

        if (auto e = eventCast<const RoomMessageEvent>(&evt)) {
-            if (e->msgtype() == Quotient::MessageEventType::Location) {
-                return e->contentJson();
-            }
            // Cannot use e.contentJson() here because some
            // EventContent classes inject values into the copy of the
            // content JSON stored in EventContent::Base
@@ -571,7 +569,7 @@ QVariant MessageEventModel::data(const QModelIndex &idx, int role) const
    }

    if (role == HighlightRole) {
-        return !m_currentRoom->isDirectChat() && m_currentRoom->isEventHighlighted(&evt);
+        return m_currentRoom->isEventHighlighted(&evt);
    }

    if (role == FileMimetypeIcon) {
@@ -599,25 +597,12 @@ QVariant MessageEventModel::data(const QModelIndex &idx, int role) const

    if (role == SpecialMarksRole) {
        if (isPending) {
-            // A pending event with an m.new_content key will be merged into the
-            // original event so don't show.
-            if (evt.contentJson().contains("m.new_content")) {
-                return EventStatus::Hidden;
-            }
            return pendingIt->deliveryStatus();
        }

-        if (evt.isStateEvent() && !NeoChatConfig::self()->showStateEvent()) {
-            return EventStatus::Hidden;
-        }
-
-        if (auto roomMemberEvent = eventCast<const RoomMemberEvent>(&evt)) {
-            if ((roomMemberEvent->isJoin() || roomMemberEvent->isLeave()) && !NeoChatConfig::self()->showLeaveJoinEvent()) {
-                return EventStatus::Hidden;
-            } else if (roomMemberEvent->isRename() && !roomMemberEvent->isJoin() && !roomMemberEvent->isLeave() && !NeoChatConfig::self()->showRename()) {
-                return EventStatus::Hidden;
-            } else if (roomMemberEvent->isAvatarUpdate() && !roomMemberEvent->isJoin() && !roomMemberEvent->isLeave()
-                       && !NeoChatConfig::self()->showAvatarUpdate()) {
+        auto *memberEvent = timelineIt->viewAs<RoomMemberEvent>();
+        if (memberEvent) {
+            if ((memberEvent->isJoin() || memberEvent->isLeave()) && !NeoChatConfig::self()->showLeaveJoinEvent()) {
                return EventStatus::Hidden;
            }
        }
@@ -631,7 +616,7 @@ QVariant MessageEventModel::data(const QModelIndex &idx, int role) const
            return EventStatus::Hidden;
        }

-        if (evt.isStateEvent() && static_cast<const StateEvent &>(evt).repeatsState()) {
+        if (evt.isStateEvent() && static_cast<const StateEventBase &>(evt).repeatsState()) {
            return EventStatus::Hidden;
        }

@@ -648,6 +633,14 @@ QVariant MessageEventModel::data(const QModelIndex &idx, int role) const
        return EventStatus::Normal;
    }

+    if (role == IsEditedRole) {
+        if (auto e = eventCast<const RoomMessageEvent>(&evt)) {
+            return !e->unsignedJson().isEmpty() && e->unsignedJson().contains("m.relations")
+                && e->unsignedJson()["m.relations"].toObject().contains("m.replace");
+        }
+        return false;
+    }
+
    if (role == EventIdRole) {
        return !evt.id().isEmpty() ? evt.id() : evt.transactionId();
    }
@@ -663,11 +656,29 @@ QVariant MessageEventModel::data(const QModelIndex &idx, int role) const
        }
    }

+    if (role == AnnotationRole) {
+        if (isPending) {
+            return pendingIt->annotation();
+        }
+    }
+
    if (role == TimeRole || role == SectionRole) {
        auto ts = isPending ? pendingIt->lastUpdated() : makeMessageTimestamp(timelineIt);
        return role == TimeRole ? QVariant(ts) : renderDate(ts);
    }

+    if (role == UserMarkerRole) {
+        QVariantList variantList;
+        const auto users = m_currentRoom->usersAtEventId(evt.id());
+        for (User *user : users) {
+            if (user == m_currentRoom->localUser()) {
+                continue;
+            }
+            variantList.append(QVariant::fromValue(user));
+        }
+        return variantList;
+    }
+
    if (role == IsReplyRole) {
        return !evt.contentJson()["m.relates_to"].toObject()["m.in_reply_to"].toObject()["event_id"].toString().isEmpty();
    }
@@ -753,7 +764,7 @@ QVariant MessageEventModel::data(const QModelIndex &idx, int role) const
            // While the row is removed the subsequent row indexes are not changed so we need to skip over the removed index.
            // See - https://doc.qt.io/qt-5/qabstractitemmodel.html#beginRemoveRows
            if (data(i, SpecialMarksRole) != EventStatus::Hidden && !itemData(i).empty()) {
-                return data(i, AuthorRole) != data(idx, AuthorRole) || data(i, DelegateTypeRole) == MessageEventModel::State
+                return data(i, AuthorRole) != data(idx, AuthorRole) || data(i, EventTypeRole) == MessageEventModel::State
                    || data(i, TimeRole).toDateTime().msecsTo(data(idx, TimeRole).toDateTime()) > 600000
                    || data(i, TimeRole).toDateTime().toLocalTime().date().day() != data(idx, TimeRole).toDateTime().toLocalTime().date().day();
            }
@@ -778,70 +789,8 @@ QVariant MessageEventModel::data(const QModelIndex &idx, int role) const
        return false;
    }

-    if (role == LatitudeRole) {
-        const auto geoUri = evt.contentJson()["geo_uri"_ls].toString();
-        if (geoUri.isEmpty()) {
-            return {};
-        }
-        const auto latitude = geoUri.split(u';')[0].split(u':')[1].split(u',')[0];
-        return latitude.toFloat();
-    }
-
-    if (role == LongitudeRole) {
-        const auto geoUri = evt.contentJson()["geo_uri"_ls].toString();
-        if (geoUri.isEmpty()) {
-            return {};
-        }
-        const auto latitude = geoUri.split(u';')[0].split(u':')[1].split(u',')[1];
-        return latitude.toFloat();
-    }
-
-    if (role == AssetRole) {
-        const auto assetType = evt.contentJson()["org.matrix.msc3488.asset"].toObject()["type"].toString();
-        if (assetType.isEmpty()) {
-            return {};
-        }
-        return assetType;
-    }
-
-    if (role == ReadMarkersRole) {
-        auto userIds = room()->userIdsAtEvent(evt.id());
-        userIds.remove(m_currentRoom->localUser()->id());
-
-        QVariantList users;
-        users.reserve(userIds.size());
-        for (const auto &userId : userIds) {
-            auto user = static_cast<NeoChatUser *>(m_currentRoom->user(userId));
-            users += userAtEvent(user, m_currentRoom, evt);
-        }
-
-        return users;
-    }
-
-    if (role == ReadMarkersStringRole) {
-        auto userIds = room()->userIdsAtEvent(evt.id());
-        userIds.remove(m_currentRoom->localUser()->id());
-        /**
-         * The string ends up in the form
-         * "x users: user1DisplayName, user2DisplayName, etc."
-         */
-        QString readMarkersString = i18np("1 user: ", "%1 users: ", userIds.size());
-        for (const auto &userId : userIds) {
-            auto user = static_cast<NeoChatUser *>(m_currentRoom->user(userId));
-            readMarkersString += user->displayname(m_currentRoom) + i18nc("list separator", ", ");
-        }
-        readMarkersString.chop(2);
-        return readMarkersString;
-    }
-
-    if (role == ShowReadMarkersRole) {
-        auto userIds = room()->userIdsAtEvent(evt.id());
-        userIds.remove(m_currentRoom->localUser()->id());
-        return userIds.size() > 0;
-    }
-
    if (role == ReactionRole) {
-        const auto &annotations = m_currentRoom->relatedEvents(evt, EventRelation::AnnotationType);
+        const auto &annotations = m_currentRoom->relatedEvents(evt, EventRelation::Annotation());
        if (annotations.isEmpty()) {
            return {};
        };
@@ -851,7 +800,7 @@ QVariant MessageEventModel::data(const QModelIndex &idx, int role) const
                continue;
            }
            if (auto e = eventCast<const ReactionEvent>(a)) {
-                reactions[e->eventId()].append(static_cast<NeoChatUser *>(m_currentRoom->user(e->senderId())));
+                reactions[e->relation().key].append(static_cast<NeoChatUser *>(m_currentRoom->user(e->senderId())));
            }
        }

@@ -878,6 +827,7 @@ QVariant MessageEventModel::data(const QModelIndex &idx, int role) const
    }

    if (role == MediaUrlRole) {
+#ifdef QUOTIENT_07
        if (auto e = eventCast<const RoomMessageEvent>(&evt)) {
            if (!e->hasFileContent()) {
                return QVariant();
@@ -894,6 +844,7 @@ QVariant MessageEventModel::data(const QModelIndex &idx, int role) const
        // if (auto e = eventCast<const StickerEvent>(&evt)) {
        //     return m_currentRoom->makeMediaUrl(e->id(), e->url());
        // }
+#endif

        // Construct link in the same form as urlToDownload as that function doesn't work for stickers
        if (auto e = eventCast<const StickerEvent>(&evt)) {
@@ -908,12 +859,14 @@ QVariant MessageEventModel::data(const QModelIndex &idx, int role) const
    }

    if (role == VerifiedRole) {
+#ifdef QUOTIENT_07
 #ifdef Quotient_E2EE_ENABLED
        if (evt.originalEvent()) {
            auto encrypted = dynamic_cast<const EncryptedEvent *>(evt.originalEvent());
            Q_ASSERT(encrypted);
            return m_currentRoom->connection()->isVerifiedSession(encrypted->sessionId().toLatin1());
        }
+#endif
 #endif
        return false;
    }
@@ -936,18 +889,29 @@ QVariant MessageEventModel::data(const QModelIndex &idx, int role) const
        }
    }

-    if (role == IsRedactedRole) {
-        return evt.isRedacted();
+    if (role == IsNameChangeRole) {
+        auto roomMemberEvent = eventCast<const RoomMemberEvent>(&evt);
+        if (roomMemberEvent) {
+            return roomMemberEvent->isRename();
+        }
+        return false;
    }

-    if (role == IsPendingRole) {
-        return row < static_cast<int>(m_currentRoom->pendingEvents().size());
+    if (role == IsAvatarChangeRole) {
+        auto roomMemberEvent = eventCast<const RoomMemberEvent>(&evt);
+        if (roomMemberEvent) {
+            return roomMemberEvent->isAvatarUpdate();
+        }
+        return false;
+    }
+    if (role == IsRedactedRole) {
+        return evt.isRedacted();
    }

    return {};
 }

-int MessageEventModel::eventIdToRow(const QString &eventID) const
+int MessageEventModel::eventIDToIndex(const QString &eventID) const
 {
    const auto it = m_currentRoom->findInTimeline(eventID);
    if (it == m_currentRoom->historyEdge()) {
@@ -989,7 +953,7 @@ QVariant MessageEventModel::getLastLocalUserMessageEventId()
                targetMessage.insert("event_id", eventId);
                targetMessage.insert("formattedBody", content["formatted_body"].toString());
                // Need to get the message from the original eventId or body will have * on the front
-                QModelIndex idx = index(eventIdToRow(eventId), 0);
+                QModelIndex idx = index(eventIDToIndex(eventId), 0);
                targetMessage.insert("message", idx.data(Qt::UserRole + 2));

                return targetMessage;
@@ -999,21 +963,18 @@ QVariant MessageEventModel::getLastLocalUserMessageEventId()
    return targetMessage;
 }

-QVariant MessageEventModel::getLatestMessageFromRow(const int startRow)
+QVariant MessageEventModel::getLatestMessageFromIndex(const int baseline)
 {
    QVariantMap replyResponse;
-    const auto &timelineBottom = m_currentRoom->messageEvents().rbegin() + startRow;
+    const auto &timelineBottom = m_currentRoom->messageEvents().rbegin() + baseline;

-    // set a cap limit of startRow + 35 messages, to prevent loading a lot of messages
+    // set a cap limit of baseline + 35 messages, to prevent loading a lot of messages
    // in rooms where the user has not sent many messages
-    const auto limit = timelineBottom + std::min(startRow + 35, m_currentRoom->timelineSize());
+    const auto limit = timelineBottom + std::min(baseline + 35, m_currentRoom->timelineSize());

    for (auto it = timelineBottom; it != limit; ++it) {
        auto evt = it->event();
        auto e = eventCast<const RoomMessageEvent>(evt);
-        if (!e) {
-            continue;
-        }

        auto content = (*it)->contentJson();

@@ -1028,7 +989,7 @@ QVariant MessageEventModel::getLatestMessageFromRow(const int startRow)
            }
            replyResponse.insert("event_id", eventId);
            // Need to get the message from the original eventId or body will have * on the front
-            QModelIndex idx = index(eventIdToRow(eventId), 0);
+            QModelIndex idx = index(eventIDToIndex(eventId), 0);
            replyResponse.insert("message", idx.data(Qt::UserRole + 2));
            replyResponse.insert("sender_id", QVariant::fromValue(m_currentRoom->getUser((*it)->senderId())));
            replyResponse.insert("at", -it->index());
--- a/src/models/messageeventmodel.h
+++ b/src/models/messageeventmodel.h
@@ -7,99 +7,72 @@

 #include "neochatroom.h"

-/**
- * @class MessageEventModel
- *
- * This class defines the model for visualising the room timeline.
- *
- * This model covers all event types in the timeline with many of the roles being
- * specific to a subset of events. This means the user needs to understand which
- * roles will return useful information for a given event type.
- *
- * @sa NeoChatRoom
- */
 class MessageEventModel : public QAbstractListModel
 {
    Q_OBJECT
-
-    /**
-     * @brief The current room that the model is getting its messages from.
-     */
    Q_PROPERTY(NeoChatRoom *room READ room WRITE setRoom NOTIFY roomChanged)

 public:
-    /**
-     * @brief The type of delegate that is needed for the event.
-     *
-     * @note While similar this is not the matrix event or message type. This is
-     *       to tell a QML ListView what delegate to show for each event. So while
-     *       similar to the spec it is not the same.
-     */
    enum DelegateType {
-        Emote, /**< A message that begins with /me. */
-        Notice, /**< A notice event. */
-        Image, /**< A message that is an image. */
-        Audio, /**< A message that is an audio recording. */
-        Video, /**< A message that is a video. */
-        File, /**< A message that is a file. */
-        Message, /**< A text message. */
-        Sticker, /**< A message that is a sticker. */
-        State, /**< A state event in the room. */
-        Encrypted, /**< An encrypted message that cannot be decrypted. */
-        ReadMarker, /**< The local user read marker. */
-        Poll, /**< The initial event for a poll. */
-        Location, /**< A location event. */
-        Other, /**< Anything that cannot be classified as another type. */
+        Emote,
+        Notice,
+        Image,
+        Audio,
+        Video,
+        File,
+        Message,
+        Sticker,
+        State,
+        Encrypted,
+        ReadMarker,
+        Poll,
+        Other,
    };
    Q_ENUM(DelegateType);

-    /**
-     * @brief Defines the model roles.
-     */
    enum EventRoles {
-        DelegateTypeRole = Qt::UserRole + 1, /**< The delegate type of the message. */
-        MessageRole, /**< Plain text representation of the message. */
-        EventIdRole, /**< The matrix event ID of the event. */
-        TimeRole, /**< The timestamp for when the event was sent. */
-        SectionRole, /**< The date of the event as a string. */
-        AuthorRole, /**< The author of the event. */
-        ContentRole, /**< The full message content. */
-        ContentTypeRole, /**< The content mime type. */
-        HighlightRole, /**< Whether the event should be highlighted. */
-        SpecialMarksRole, /**< Whether the event is hidden or not. */
-        LongOperationRole, /**< Progress info when downloading files. */
-        FormattedBodyRole, /**< The formatted body of a rich message. */
-        GenericDisplayRole, /**< A generic string based upon the message type. */
+        EventTypeRole = Qt::UserRole + 1,
+        MessageRole,
+        EventIdRole,
+        TimeRole,
+        SectionRole,
+        AuthorRole,
+        ContentRole,
+        ContentTypeRole,
+        HighlightRole,
+        SpecialMarksRole,
+        LongOperationRole,
+        AnnotationRole,
+        UserMarkerRole,
+        FormattedBodyRole,
+        GenericDisplayRole,

-        MimeTypeRole, /**< The mime type of the message's file or media. */
-        FileMimetypeIcon, /**< The icon name for the mime type of a file. */
+        MimeTypeRole,
+        FileMimetypeIcon,

-        IsReplyRole, /**< Is the message a reply to another event. */
-        ReplyRole, /**< The content data of the message that was replied to. */
-        ReplyIdRole, /**< The matrix ID of the message that was replied to. */
+        IsReplyRole,
+        ReplyRole,
+        ReplyIdRole,

-        ShowAuthorRole, /**< Whether the author's name should be shown. */
-        ShowSectionRole, /**< Whether the section header should be shown. */
+        ShowAuthorRole,
+        ShowSectionRole,

-        ReadMarkersRole, /**< Other users at the event for read marker tracking. */
-        ReadMarkersStringRole, /**< String with the display name and mxID of the users at the event. */
-        ShowReadMarkersRole, /**< Whether there are any other user read markers to be shown. */
-        ReactionRole, /**< List of reactions to this event. */
-        SourceRole, /**< The full message source JSON. */
-        MediaUrlRole, /**< The source URL for any media in the message. */
+        ReactionRole,

+        IsEditedRole,
+        SourceRole,
+        MediaUrlRole,
        // For debugging
-        EventResolvedTypeRole, /**< The event type the message. */
-        AuthorIdRole, /**< Matrix ID of the message author. */
-
-        VerifiedRole, /**< Whether an encrypted message is sent in a verified session. */
-        DisplayNameForInitialsRole, /**< Sender's displayname, always without the matrix id. */
-        AuthorDisplayNameRole, /**< The displayname for the event's sender; for name change events, the old displayname. */
-        IsRedactedRole, /**< Whether an event has been deleted. */
-        IsPendingRole, /**< Whether an event is waiting to be accepted by the server. */
-        LatitudeRole, /**< Latitude for a location event. */
-        LongitudeRole, /**< Longitude for a location event. */
-        AssetRole, /**< Type of location event, e.g. self pin of the user location. */
+        EventResolvedTypeRole,
+        AuthorIdRole,
+        VerifiedRole,
+        // Sender's displayname, always without the matrix id
+        DisplayNameForInitialsRole,
+        // The displayname for the event's sender; for name change events, the old displayname
+        AuthorDisplayNameRole,
+        IsNameChangeRole,
+        IsAvatarChangeRole,
+        IsRedactedRole,
        LastRole, // Keep this last
    };
    Q_ENUM(EventRoles)
@@ -107,67 +80,20 @@ public:
    explicit MessageEventModel(QObject *parent = nullptr);
    ~MessageEventModel() override;

-    [[nodiscard]] NeoChatRoom *room() const;
+    [[nodiscard]] NeoChatRoom *room() const
+    {
+        return m_currentRoom;
+    }
    void setRoom(NeoChatRoom *room);

-    /**
-     * @brief Get the given role value at the given index.
-     *
-     * @sa QAbstractItemModel::data
-     */
-    [[nodiscard]] QVariant data(const QModelIndex &idx, int role = Qt::DisplayRole) const override;
-
-    /**
-     * @brief Number of rows in the model.
-     *
-     * @sa  QAbstractItemModel::rowCount
-     */
    [[nodiscard]] int rowCount(const QModelIndex &parent = QModelIndex()) const override;
-
-    /**
-     * @brief Returns a mapping from Role enum values to role names.
-     *
-     * @sa EventRoles, QAbstractItemModel::roleNames()
-     */
+    [[nodiscard]] QVariant data(const QModelIndex &idx, int role = Qt::DisplayRole) const override;
    [[nodiscard]] QHash<int, QByteArray> roleNames() const override;

-    /**
-     * @brief Get the row number of the given event ID in the model.
-     */
-    Q_INVOKABLE [[nodiscard]] int eventIdToRow(const QString &eventID) const;
-
-    /**
-     * @brief Get the last message sent by the local user.
-     *
-     * @note This checks a maximum of the previous 35 message for performance reasons.
-     *
-     * @return a QVariantMap for the event with the following parameters:
-     *  - eventId - The event ID.
-     *  - formattedBody - The message text formatted as Qt::RichText.
-     *  - message - The message text formatted as Qt::PlainText.
-     */
+    Q_INVOKABLE [[nodiscard]] int eventIDToIndex(const QString &eventID) const;
    Q_INVOKABLE [[nodiscard]] QVariant getLastLocalUserMessageEventId();
-
-    /**
-     * @brief Get the last message sent earlier than the given row.
-     *
-     * @note This checks a maximum of the previous 35 message for performance reasons.
-     *
-     * @return a QVariantMap for the event with the following parameters:
-     *  - eventId - The event ID.
-     *  - message - The message text formatted as Qt::PlainText.
-     *  - sender_id - The matrix ID of the sender.
-     *  - at - The QModelIndex of the message.
-     */
-    Q_INVOKABLE [[nodiscard]] QVariant getLatestMessageFromRow(const int startRow);
-
-    /**
-     * @brief Load the event that the item at the given index replied to.
-     *
-     * This is used to ensure that the reply data is available when the message that
-     * was replied to is outside the currently loaded timeline.
-     */
-    Q_INVOKABLE void loadReply(const QModelIndex &index);
+    Q_INVOKABLE [[nodiscard]] QVariant getLatestMessageFromIndex(const int baseline);
+    Q_INVOKABLE void loadReply(const QModelIndex &row);

 private Q_SLOTS:
    int refreshEvent(const QString &eventId);
--- a/src/models/messagefiltermodel.cpp
+++ b/src/models/messagefiltermodel.cpp
@@ -11,20 +11,23 @@ using namespace Quotient;
 MessageFilterModel::MessageFilterModel(QObject *parent)
    : QSortFilterProxyModel(parent)
 {
-    connect(NeoChatConfig::self(), &NeoChatConfig::ShowStateEventChanged, this, [this] {
-        invalidateFilter();
-    });
    connect(NeoChatConfig::self(), &NeoChatConfig::ShowLeaveJoinEventChanged, this, [this] {
-        invalidateFilter();
+        beginResetModel();
+        endResetModel();
    });
+
    connect(NeoChatConfig::self(), &NeoChatConfig::ShowRenameChanged, this, [this] {
-        invalidateFilter();
+        beginResetModel();
+        endResetModel();
    });
+
    connect(NeoChatConfig::self(), &NeoChatConfig::ShowAvatarUpdateChanged, this, [this] {
-        invalidateFilter();
+        beginResetModel();
+        endResetModel();
    });
    connect(NeoChatConfig::self(), &NeoChatConfig::ShowDeletedMessagesChanged, this, [this] {
-        invalidateFilter();
+        beginResetModel();
+        endResetModel();
    });
 }

@@ -32,20 +35,31 @@ bool MessageFilterModel::filterAcceptsRow(int sourceRow, const QModelIndex &sour
 {
    const QModelIndex index = sourceModel()->index(sourceRow, 0, sourceParent);

+    const int specialMarks = index.data(MessageEventModel::SpecialMarksRole).toInt();
+    if (index.data(MessageEventModel::IsNameChangeRole).toBool() && !NeoChatConfig::self()->showRename()) {
+        return false;
+    }
+
+    if (index.data(MessageEventModel::IsAvatarChangeRole).toBool() && !NeoChatConfig::self()->showAvatarUpdate()) {
+        return false;
+    }
    if (index.data(MessageEventModel::IsRedactedRole).toBool() && !NeoChatConfig::self()->showDeletedMessages()) {
        return false;
    }

-    const int specialMarks = index.data(MessageEventModel::SpecialMarksRole).toInt();
    if (specialMarks == EventStatus::Hidden || specialMarks == EventStatus::Replaced) {
        return false;
    }

-    const auto eventType = index.data(MessageEventModel::DelegateTypeRole).toInt();
+    const auto eventType = index.data(MessageEventModel::EventTypeRole).toInt();

    if (eventType == MessageEventModel::Other) {
        return false;
    }

+    if (!NeoChatConfig::self()->showLeaveJoinEvent() && eventType == MessageEventModel::State) {
+        return false;
+    }
+
    return true;
 }
--- a/src/models/publicroomlistmodel.cpp
+++ b/src/models/publicroomlistmodel.cpp
@@ -117,7 +117,11 @@ void PublicRoomListModel::next(int count)
        return;
    }

+#ifdef QUOTIENT_07
    job = m_connection->callApi<QueryPublicRoomsJob>(m_server, count, nextBatch, QueryPublicRoomsJob::Filter{m_keyword, {}});
+#else
+    job = m_connection->callApi<QueryPublicRoomsJob>(m_server, count, nextBatch, QueryPublicRoomsJob::Filter{m_keyword});
+#endif

    connect(job, &BaseJob::finished, this, [this] {
        attempted = true;
@@ -173,7 +177,11 @@ QVariant PublicRoomListModel::data(const QModelIndex &index, int role) const
        if (avatarUrl.isEmpty()) {
            return "";
        }
+#ifdef QUOTIENT_07
        return avatarUrl.url().remove(0, 6);
+#else
+        return avatarUrl.remove(0, 6);
+#endif
    }
    if (role == TopicRole) {
        return room.topic;
--- a/src/models/roomlistmodel.cpp
+++ b/src/models/roomlistmodel.cpp
@@ -3,30 +3,40 @@

 #include "roomlistmodel.h"

-#include "controller.h"
 #include "neochatconfig.h"
 #include "neochatroom.h"
 #include "roommanager.h"
 #include "user.h"
-#include <eventstats.h>

 #include <QDebug>
-#if QT_VERSION < QT_VERSION_CHECK(6, 6, 0)
 #ifndef Q_OS_ANDROID
 #include <QDBusConnection>
 #include <QDBusInterface>
 #include <QDBusMessage>
 #endif
-#endif

 #include <KLocalizedString>
 #include <QGuiApplication>
 #include <utility>

+#ifndef QUOTIENT_07
+#include "notificationsmanager.h"
+#include <csapi/notifications.h>
+#endif
+
 using namespace Quotient;

 Q_DECLARE_METATYPE(Quotient::JoinState)

+#ifndef Q_OS_ANDROID
+bool useUnityCounter()
+{
+    static const auto Result = QDBusInterface("com.canonical.Unity", "/").isValid();
+
+    return Result;
+}
+#endif
+
 RoomListModel::RoomListModel(QObject *parent)
    : QAbstractListModel(parent)
 {
@@ -35,32 +45,30 @@ RoomListModel::RoomListModel(QObject *parent)
        m_categoryVisibility[collapsedSection] = false;
    }

-    connect(this, &RoomListModel::notificationCountChanged, this, [this]() {
-#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";
-        // Gnome requires that count is a 64bit integer
-        const qint64 counterSlice = std::min(m_notificationCount, 9999);
-        QVariantMap dbusUnityProperties;
+    connect(this, &RoomListModel::notificationCountChanged, this, [this]() {
+        if (useUnityCounter()) {
+            // copied from Telegram desktop
+            const auto launcherUrl = "application://org.kde.neochat.desktop";
+            // Gnome requires that count is a 64bit integer
+            const qint64 counterSlice = std::min(m_notificationCount, 9999);
+            QVariantMap dbusUnityProperties;

-        if (counterSlice > 0) {
-            dbusUnityProperties["count"] = counterSlice;
-            dbusUnityProperties["count-visible"] = true;
-        } else {
-            dbusUnityProperties["count-visible"] = false;
+            if (counterSlice > 0) {
+                dbusUnityProperties["count"] = counterSlice;
+                dbusUnityProperties["count-visible"] = true;
+            } else {
+                dbusUnityProperties["count-visible"] = false;
+            }
+
+            auto signal = QDBusMessage::createSignal("/com/canonical/unity/launcherentry/neochat", "com.canonical.Unity.LauncherEntry", "Update");
+
+            signal.setArguments({launcherUrl, dbusUnityProperties});
+
+            QDBusConnection::sessionBus().send(signal);
        }
-
-        auto signal = QDBusMessage::createSignal("/com/canonical/unity/launcherentry/neochat", "com.canonical.Unity.LauncherEntry", "Update");
-
-        signal.setArguments({launcherUrl, dbusUnityProperties});
-
-        QDBusConnection::sessionBus().send(signal);
-#endif // Q_OS_ANDROID
-#else
-        qGuiApp->setBadgeNumber(m_notificationCount);
-#endif // QT_VERSION_CHECK(6, 6, 0)
    });
+#endif
 }

 RoomListModel::~RoomListModel() = default;
@@ -135,7 +143,6 @@ void RoomListModel::doAddRoom(Room *r)
        m_rooms.append(room);
        connectRoomSignals(room);
        Q_EMIT roomAdded(room);
-        Q_EMIT Controller::instance().roomAdded(room);
    } else {
        qCritical() << "Attempt to add nullptr to the room list";
        Q_ASSERT(false);
@@ -145,10 +152,10 @@ void RoomListModel::doAddRoom(Room *r)
 void RoomListModel::connectRoomSignals(NeoChatRoom *room)
 {
    connect(room, &Room::displaynameChanged, this, [this, room] {
-        refresh(room, {DisplayNameRole, NameRole});
+        refresh(room);
    });
-    connect(room, &Room::unreadStatsChanged, this, [this, room] {
-        refresh(room, {UnreadCountRole, NotificationCountRole, HighlightCountRole});
+    connect(room, &Room::unreadMessagesChanged, this, [this, room] {
+        refresh(room);
    });
    connect(room, &Room::notificationCountChanged, this, [this, room] {
        refresh(room);
@@ -163,14 +170,90 @@ void RoomListModel::connectRoomSignals(NeoChatRoom *room)
        refresh(room);
    });
    connect(room, &Room::addedMessages, this, [this, room] {
-        refresh(room, {LastEventRole, SubtitleTextRole, LastActiveTimeRole});
+        refresh(room, {LastEventRole, SubtitleTextRole});
    });
    connect(room, &Room::pendingEventMerged, this, [this, room] {
        refresh(room, {LastEventRole, SubtitleTextRole});
    });
-    connect(room, &Room::unreadStatsChanged, this, &RoomListModel::refreshNotificationCount);
+#ifndef QUOTIENT_07
+    connect(room, &Room::notificationCountChanged, this, &RoomListModel::handleNotifications);
+#endif
+    connect(room, &Room::highlightCountChanged, this, [this, room] {
+        if (room->highlightCount() == 0) {
+            return;
+        }
+        if (room->timelineSize() == 0) {
+            return;
+        }
+        auto *lastEvent = room->lastEvent();
+
+        if (!lastEvent) {
+            return;
+        }
+
+        if (!lastEvent->isStateEvent()) {
+            return;
+        }
+        User *sender = room->user(lastEvent->senderId());
+        if (sender == room->localUser()) {
+            return;
+        }
+        Q_EMIT newHighlight(room->id(), lastEvent->id(), room->displayName(), sender->displayname(), room->eventToString(*lastEvent), room->avatar(128));
+    });
+    connect(room, &Room::notificationCountChanged, this, &RoomListModel::refreshNotificationCount);
 }

+#ifndef QUOTIENT_07
+void RoomListModel::handleNotifications()
+{
+    static bool initial = true;
+    static QStringList oldNotifications;
+    auto job = m_connection->callApi<GetNotificationsJob>();
+
+    connect(job, &BaseJob::success, this, [this, job]() {
+        const auto notifications = job->jsonData()["notifications"].toArray();
+        if (initial) {
+            initial = false;
+            for (const auto &n : notifications) {
+                oldNotifications += n.toObject()["event"].toObject()["event_id"].toString();
+            }
+            return;
+        }
+        for (const auto &n : notifications) {
+            const auto notification = n.toObject();
+            if (notification["read"].toBool()) {
+                oldNotifications.removeOne(notification["event"].toObject()["event_id"].toString());
+                continue;
+            }
+            if (oldNotifications.contains(notification["event"].toObject()["event_id"].toString())) {
+                continue;
+            }
+            oldNotifications += notification["event"].toObject()["event_id"].toString();
+            auto room = m_connection->room(notification["room_id"].toString());
+
+            // If room exists, room is NOT active OR the application is NOT active, show notification
+            if (room && !(room->id() == RoomManager::instance().currentRoom()->id() && QGuiApplication::applicationState() == Qt::ApplicationActive)) {
+                // The room might have been deleted (for example rejected invitation).
+                auto sender = room->user(notification["event"].toObject()["sender"].toString());
+
+                QImage avatar_image;
+                if (!sender->avatarUrl(room).isEmpty()) {
+                    avatar_image = sender->avatar(128, room);
+                } else {
+                    avatar_image = room->avatar(128);
+                }
+                NotificationsManager::instance().postNotification(dynamic_cast<NeoChatRoom *>(room),
+                                                                  sender->displayname(room),
+                                                                  notification["event"].toObject()["content"].toObject()["body"].toString(),
+                                                                  avatar_image,
+                                                                  notification["event"].toObject()["event_id"].toString(),
+                                                                  true);
+            }
+        }
+    });
+}
+#endif
+
 void RoomListModel::refreshNotificationCount()
 {
    int count = 0;
@@ -295,7 +378,7 @@ QVariant RoomListModel::data(const QModelIndex &index, int role) const
        return NeoChatRoomType::Normal;
    }
    if (role == UnreadCountRole) {
-        return room->unreadStats().notableCount;
+        return room->unreadCount();
    }
    if (role == NotificationCountRole) {
        return room->notificationCount();
@@ -325,7 +408,7 @@ QVariant RoomListModel::data(const QModelIndex &index, int role) const
        return m_categoryVisibility.value(data(index, CategoryRole).toInt(), true);
    }
    if (role == SubtitleTextRole) {
-        return room->lastEventToString(Qt::PlainText, true);
+        return room->subtitleText();
    }
    if (role == AvatarImageRole) {
        return room->avatar(128);
--- a/src/models/roomlistmodel.h
+++ b/src/models/roomlistmodel.h
@@ -107,10 +107,14 @@ private:
    QString m_activeSpaceId = "";

    void connectRoomSignals(NeoChatRoom *room);
+#ifndef QUOTIENT_07
+    void handleNotifications();
+#endif

 Q_SIGNALS:
    void connectionChanged();
    void notificationCountChanged();

    void roomAdded(NeoChatRoom *_t1);
+    void newHighlight(const QString &_t1, const QString &_t2, const QString &_t3, const QString &_t4, const QString &_t5, const QImage &_t6);
 };
--- a/src/models/searchmodel.cpp
+++ b/src/models/searchmodel.cpp
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2022 Tobias Fella <tobias.fella@kde.org>
+// SPDX-FileCopyrightText: 2022 Tobias Fella <fella@posteo.de>
 // SPDX-License-Identifier: LGPL-2.0-or-later

 #include "searchmodel.h"
@@ -8,7 +8,9 @@
 #include <KLocalizedString>
 #include <connection.h>

+#ifdef QUOTIENT_07
 #include <csapi/search.h>
+#endif

 using namespace Quotient;

@@ -32,6 +34,7 @@ void SearchModel::setSearchText(const QString &searchText)

 void SearchModel::search()
 {
+#ifdef QUOTIENT_07
    Q_ASSERT(m_connection);
    setSearching(true);
    if (m_job) {
@@ -40,26 +43,20 @@ void SearchModel::search()
    }

    SearchJob::RoomEventsCriteria criteria{
-        .searchTerm = m_searchText,
-        .keys = {},
-        .filter =
-            RoomEventFilter{
-                .unreadThreadNotifications = none,
-                .lazyLoadMembers = true,
-                .includeRedundantMembers = false,
-                .notRooms = {},
-                .rooms = {m_room->id()},
-                .containsUrl = false,
-            },
-        .orderBy = "recent",
-        .eventContext = SearchJob::IncludeEventContext{3, 3, true},
-        .includeState = false,
-        .groupings = none,
+        m_searchText,
+        {},
+        RoomEventFilter{
+            .rooms = {m_room->id()},
+        },
+        "recent",
+        SearchJob::IncludeEventContext{3, 3, true},
+        false,
+        none,
    };

    auto job = m_connection->callApi<SearchJob>(SearchJob::Categories{criteria});
    m_job = job;
-    connect(job, &BaseJob::finished, this, [this, job] {
+    connect(job, &BaseJob::finished, this, [=] {
        beginResetModel();
        m_result = job->searchCategories().roomEvents;
        endResetModel();
@@ -67,6 +64,7 @@ void SearchModel::search()
        m_job = nullptr;
        // TODO error handling
    });
+#endif
 }

 Connection *SearchModel::connection() const
@@ -82,6 +80,7 @@ void SearchModel::setConnection(Connection *connection)

 QVariant SearchModel::data(const QModelIndex &index, int role) const
 {
+#ifdef QUOTIENT_07
    auto row = index.row();
    const auto &event = *m_result->results[row].result;
    switch (role) {
@@ -111,14 +110,17 @@ QVariant SearchModel::data(const QModelIndex &index, int role) const
        return event.originTimestamp();
    }
    return MessageEventModel::DelegateType::Message;
+#endif
+    return {};
 }

 int SearchModel::rowCount(const QModelIndex &parent) const
 {
-    Q_UNUSED(parent);
+#ifdef QUOTIENT_07
    if (m_result.has_value()) {
        return m_result->results.size();
    }
+#endif
    return 0;
 }

--- a/src/models/searchmodel.h
+++ b/src/models/searchmodel.h
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2022 Tobias Fella <tobias.fella@kde.org>
+// SPDX-FileCopyrightText: 2022 Tobias Fella <fella@posteo.de>
 // SPDX-License-Identifier: LGPL-2.0-or-later

 #pragma once
@@ -6,7 +6,9 @@
 #include <QAbstractListModel>
 #include <QString>

+#ifdef QUOTIENT_07
 #include <csapi/search.h>
+#endif

 namespace Quotient
 {
@@ -66,8 +68,10 @@ private:
    QString m_searchText;
    Quotient::Connection *m_connection = nullptr;
    NeoChatRoom *m_room = nullptr;
+#ifdef QUOTIENT_07
    Quotient::Omittable<Quotient::SearchJob::ResultRoomEvents> m_result = Quotient::none;
    Quotient::SearchJob *m_job = nullptr;
+#endif
    bool m_searching = false;
 };

--- a/src/models/serverlistmodel.cpp
+++ b/src/models/serverlistmodel.cpp
@@ -95,7 +95,11 @@ void ServerListModel::checkServer(const QString &url)
    KConfigGroup serverGroup(&dataResource, "Servers");

    if (!serverGroup.hasKey(url)) {
+#ifdef QUOTIENT_07
        if (Quotient::isJobPending(m_checkServerJob)) {
+#else
+        if (Quotient::isJobRunning(m_checkServerJob)) {
+#endif
            m_checkServerJob->abandon();
        }

--- a/src/models/sortfilterroomlistmodel.cpp
+++ b/src/models/sortfilterroomlistmodel.cpp
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2020 Tobias Fella <tobias.fella@kde.org>
+// SPDX-FileCopyrightText: 2020 Tobias Fella <fella@posteo.de>
 // SPDX-License-Identifier: GPL-2.0-or-later

 #include "sortfilterroomlistmodel.h"
--- a/src/models/sortfilterroomlistmodel.h
+++ b/src/models/sortfilterroomlistmodel.h
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2020 Tobias Fella <tobias.fella@kde.org>
+// SPDX-FileCopyrightText: 2020 Tobias Fella <fella@posteo.de>
 // SPDX-License-Identifier: GPL-2.0-or-later

 #pragma once
--- a/src/models/statemodel.cpp
+++ b/src/models/statemodel.cpp
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2022 Tobias Fella <tobias.fella@kde.org>
+// SPDX-FileCopyrightText: 2022 Tobias Fella <fella@posteo.de>
 // SPDX-License-Identifier: LGPL-2.0-or-later

 #include "statemodel.h"
@@ -14,6 +14,7 @@ QHash<int, QByteArray> StateModel::roleNames() const
 }
 QVariant StateModel::data(const QModelIndex &index, int role) const
 {
+#ifdef QUOTIENT_07
    auto row = index.row();
    switch (role) {
    case TypeRole:
@@ -23,13 +24,18 @@ QVariant StateModel::data(const QModelIndex &index, int role) const
    case SourceRole:
        return QJsonDocument(m_room->currentState().events()[m_room->currentState().events().keys()[row]]->fullJson()).toJson();
    }
+#endif
    return {};
 }

 int StateModel::rowCount(const QModelIndex &parent) const
 {
    Q_UNUSED(parent);
+#ifdef QUOTIENT_07
    return m_room->currentState().events().size();
+#else
+    return 0;
+#endif
 }

 NeoChatRoom *StateModel::room() const
@@ -43,7 +49,7 @@ void StateModel::setRoom(NeoChatRoom *room)
    Q_EMIT roomChanged();
    beginResetModel();
    endResetModel();
-    connect(room, &NeoChatRoom::changed, this, [this] {
+    connect(room, &NeoChatRoom::changed, this, [=] {
        beginResetModel();
        endResetModel();
    });
--- a/src/models/statemodel.h
+++ b/src/models/statemodel.h
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2022 Tobias Fella <tobias.fella@kde.org>
+// SPDX-FileCopyrightText: 2022 Tobias Fella <fella@posteo.de>
 // SPDX-License-Identifier: LGPL-2.0-or-later

 #pragma once
--- a/src/models/userdirectorylistmodel.cpp
+++ b/src/models/userdirectorylistmodel.cpp
@@ -131,7 +131,11 @@ QVariant UserDirectoryListModel::data(const QModelIndex &index, int role) const
        if (avatarUrl.isEmpty()) {
            return "";
        }
+#ifdef QUOTIENT_07
        return avatarUrl.url().remove(0, 6);
+#else
+        return avatarUrl.remove(0, 6);
+#endif
    }
    if (role == UserIDRole) {
        return user.userId;
--- a/src/models/userlistmodel.cpp
+++ b/src/models/userlistmodel.cpp
@@ -44,9 +44,13 @@ void UserListModel::setRoom(NeoChatRoom *room)
            std::sort(m_users.begin(), m_users.end(), room->memberSorter());
        }
        for (User *user : std::as_const(m_users)) {
+#ifdef QUOTIENT_07
            connect(user, &User::defaultAvatarChanged, this, [this, user]() {
                avatarChanged(user, m_currentRoom);
            });
+#else
+            connect(user, &User::avatarChanged, this, &UserListModel::avatarChanged);
+#endif
        }
        connect(m_currentRoom->connection(), &Connection::loggedOut, this, [this]() {
            setRoom(nullptr);
@@ -92,14 +96,15 @@ QVariant UserListModel::data(const QModelIndex &index, int role) const
        return QVariant::fromValue(user);
    }
    if (role == PowerLevelRole) {
-        auto pl = m_currentRoom->currentState().get<RoomPowerLevelsEvent>();
-        if (!pl) {
-            return 0;
-        }
+        auto pl = m_currentRoom->getCurrentState<RoomPowerLevelsEvent>();
        return pl->powerLevelForUser(user->id());
    }
    if (role == PowerLevelStringRole) {
+#ifdef QUOTIENT_07
        auto pl = m_currentRoom->currentState().get<RoomPowerLevelsEvent>();
+#else
+        auto pl = m_currentRoom->getCurrentState<RoomPowerLevelsEvent>();
+#endif
        // User might not in the room yet, in this case pl can be nullptr.
        // e.g. When invited but user not accepted or denied the invitation.
        if (!pl) {
@@ -138,9 +143,13 @@ void UserListModel::userAdded(Quotient::User *user)
    beginInsertRows(QModelIndex(), pos, pos);
    m_users.insert(pos, user);
    endInsertRows();
+#ifdef QUOTIENT_07
    connect(user, &User::defaultAvatarChanged, this, [this, user]() {
        avatarChanged(user, m_currentRoom);
    });
+#else
+    connect(user, &Quotient::User::avatarChanged, this, &UserListModel::avatarChanged);
+#endif
 }

 void UserListModel::userRemoved(Quotient::User *user)
@@ -179,9 +188,13 @@ void UserListModel::refreshAll()
        std::sort(m_users.begin(), m_users.end(), m_currentRoom->memberSorter());
    }
    for (User *user : std::as_const(m_users)) {
+#ifdef QUOTIENT_07
        connect(user, &User::defaultAvatarChanged, this, [this, user]() {
            avatarChanged(user, m_currentRoom);
        });
+#else
+        connect(user, &User::avatarChanged, this, &UserListModel::avatarChanged);
+#endif
    }
    connect(m_currentRoom->connection(), &Connection::loggedOut, this, [this]() {
        setRoom(nullptr);
@@ -204,9 +217,6 @@ int UserListModel::findUserPos(Quotient::User *user) const

 int UserListModel::findUserPos(const QString &username) const
 {
-    if (!m_currentRoom) {
-        return 0;
-    }
    return m_currentRoom->memberSorter().lowerBoundIndex(m_users, username);
 }

--- a/src/neochataccountregistry.cpp
+++ b/src/neochataccountregistry.cpp
@@ -0,0 +1,105 @@
+// SPDX-FileCopyrightText: Kitsune Ral <Kitsune-Ral@users.sf.net>
+// SPDX-FileCopyrightText: Tobias Fella <fella@posteo.de>
+// SPDX-License-Identifier: LGPL-2.1-or-later
+
+#include "neochataccountregistry.h"
+
+#include <connection.h>
+
+using namespace Quotient;
+
+void AccountRegistry::add(Connection *c)
+{
+    if (m_accounts.contains(c))
+        return;
+    beginInsertRows(QModelIndex(), m_accounts.size(), m_accounts.size());
+    m_accounts += c;
+    endInsertRows();
+    emit accountCountChanged();
+}
+
+void AccountRegistry::drop(Connection *c)
+{
+    beginRemoveRows(QModelIndex(), m_accounts.indexOf(c), m_accounts.indexOf(c));
+    m_accounts.removeOne(c);
+    endRemoveRows();
+    Q_ASSERT(!m_accounts.contains(c));
+    emit accountCountChanged();
+}
+
+bool AccountRegistry::isLoggedIn(const QString &userId) const
+{
+    return std::any_of(m_accounts.cbegin(), m_accounts.cend(), [&userId](Connection *a) {
+        return a->userId() == userId;
+    });
+}
+
+bool AccountRegistry::contains(Connection *c) const
+{
+    return m_accounts.contains(c);
+}
+
+AccountRegistry::AccountRegistry() = default;
+
+QVariant AccountRegistry::data(const QModelIndex &index, int role) const
+{
+    if (!index.isValid()) {
+        return {};
+    }
+
+    if (index.row() >= m_accounts.count()) {
+        return {};
+    }
+
+    const auto account = m_accounts[index.row()];
+
+    switch (role) {
+        case ConnectionRole:
+            return QVariant::fromValue(account);
+        case UserIdRole:
+            return QVariant::fromValue(account->userId());
+        default:
+            return {};
+    }
+
+    return {};
+}
+
+int AccountRegistry::rowCount(const QModelIndex &parent) const
+{
+    if (parent.isValid()) {
+        return 0;
+    }
+
+    return m_accounts.count();
+}
+
+QHash<int, QByteArray> AccountRegistry::roleNames() const
+{
+    return {{ConnectionRole, "connection"}, {UserIdRole, "userId"}};
+}
+
+bool AccountRegistry::isEmpty() const
+{
+    return m_accounts.isEmpty();
+}
+
+int AccountRegistry::count() const
+{
+    return m_accounts.count();
+}
+
+const QVector<Connection *> AccountRegistry::accounts() const
+{
+    return m_accounts;
+}
+
+Connection *AccountRegistry::get(const QString &userId)
+{
+    for (const auto &connection : m_accounts) {
+        if (connection->userId() == userId) {
+            return connection;
+        }
+    }
+    return nullptr;
+}
--- a/src/neochataccountregistry.h
+++ b/src/neochataccountregistry.h
@@ -0,0 +1,54 @@
+// SPDX-FileCopyrightText: 2020 Kitsune Ral <Kitsune-Ral@users.sf.net>
+// SPDX-FileCopyrightText: Tobias Fella <fella@posteo.de>
+// SPDX-License-Identifier: LGPL-2.1-or-later
+
+#pragma once
+
+#include <QAbstractListModel>
+#include <QList>
+#include <QObject>
+
+namespace Quotient
+{
+class Connection;
+
+class AccountRegistry : public QAbstractListModel
+{
+    Q_OBJECT
+    Q_PROPERTY(int accountCount READ count NOTIFY accountCountChanged);
+
+public:
+    enum EventRoles {
+        ConnectionRole = Qt::UserRole + 1,
+        UserIdRole = Qt::DisplayRole,
+    };
+
+    static AccountRegistry &instance()
+    {
+        static AccountRegistry _instance;
+        return _instance;
+    }
+
+    const QVector<Connection *> accounts() const;
+    void add(Connection *a);
+    void drop(Connection *a);
+    bool isLoggedIn(const QString &userId) const;
+    bool isEmpty() const;
+    int count() const;
+    bool contains(Connection *) const;
+    Connection *get(const QString &userId);
+
+    [[nodiscard]] QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
+    [[nodiscard]] int rowCount(const QModelIndex &parent = QModelIndex()) const override;
+
+    [[nodiscard]] QHash<int, QByteArray> roleNames() const override;
+
+Q_SIGNALS:
+    void accountCountChanged();
+
+private:
+    AccountRegistry();
+
+    QVector<Connection *> m_accounts;
+};
+}
--- a/src/neochatconfig.kcfg
+++ b/src/neochatconfig.kcfg
@@ -29,6 +29,10 @@
      <label>Merge Room Lists</label>
      <default>false</default>
    </entry>
+    <entry name="ShowLeaveJoinEvent" type="bool">
+      <label>Show leave and join events in the timeline</label>
+      <default>true</default>
+    </entry>
    <entry name="AllowQuickEdit" type="bool">
      <label>Use s/text/replacement syntax to edit your last message.</label>
      <default>false</default>
@@ -37,6 +41,9 @@
      <label>"Show your messages on the right</label>
      <default>true</default>
    </entry>
+    <entry name="RoomListPageWidth" type="int">
+      <default>-1</default>
+    </entry>
    <entry name="RoomDrawerWidth" type="int">
      <default>-1</default>
    </entry>
@@ -68,14 +75,6 @@
      <label>Use a compact room list layout</label>
      <default>false</default>
    </entry>
-    <entry name="ShowStateEvent" type="bool">
-      <label>Show state events in the timeline</label>
-      <default>true</default>
-    </entry>
-    <entry name="ShowLeaveJoinEvent" type="bool">
-      <label>Show leave and join events in the timeline</label>
-      <default>true</default>
-    </entry>
    <entry name="ShowRename" type="bool">
      <label>Show rename events in the timeline</label>
      <default>true</default>
@@ -109,10 +108,6 @@
      <label>Show avatar in the room drawer</label>
      <default>true</default>
    </entry>
-    <entry name="Collapsed" type="bool">
-      <label>Save the collapsed state of the room list</label>
-      <default>false</default>
-    </entry>
  </group>
  <group name="NetworkProxy">
    <entry name="ProxyType" type="Enum">
--- a/src/neochatroom.cpp
+++ b/src/neochatroom.cpp
@@ -8,15 +8,14 @@
 #include <QMimeDatabase>
 #include <QTemporaryFile>
 #include <QTextDocument>
+#include <functional>

 #include <QMediaMetaData>
 #include <QMediaPlayer>

-#include <jobs/basejob.h>
 #include <qcoro/qcorosignal.h>

 #include <connection.h>
-#include <csapi/account-data.h>
 #include <csapi/directory.h>
 #include <csapi/pushrules.h>
 #include <csapi/redaction.h>
@@ -24,7 +23,6 @@
 #include <csapi/room_state.h>
 #include <csapi/typing.h>
 #include <events/encryptionevent.h>
-#include <events/eventrelation.h>
 #include <events/reactionevent.h>
 #include <events/redactionevent.h>
 #include <events/roomavatarevent.h>
@@ -32,20 +30,24 @@
 #include <events/roommemberevent.h>
 #include <events/roompowerlevelsevent.h>
 #include <events/simplestateevents.h>
-#include <events/stickerevent.h>
-#include <eventstats.h>
 #include <jobs/downloadfilejob.h>
+#ifndef QUOTIENT_07
+#include <joinstate.h>
+#endif
 #include <qt_connection_util.h>

 #include "controller.h"
-#include "filetransferpseudojob.h"
 #include "joinrulesevent.h"
 #include "neochatconfig.h"
 #include "neochatuser.h"
 #include "notificationsmanager.h"
+#ifdef QUOTIENT_07
 #include "pollevent.h"
 #include "pollhandler.h"
-#include "texthandler.h"
+#endif
+#include "filetransferpseudojob.h"
+#include "stickerevent.h"
+#include "utils.h"

 #ifndef Q_OS_ANDROID
 #include <KIO/Job>
@@ -82,7 +84,7 @@ NeoChatRoom::NeoChatRoom(Connection *connection, QString roomId, JoinState joinS
        if (this->joinState() != JoinState::Invite) {
            return;
        }
-        const QString senderId = currentState().get<RoomMemberEvent>(localUser()->id())->senderId();
+        const QString senderId = getCurrentState<RoomMemberEvent>(localUser()->id())->senderId();
        QImage avatar_image;
        if (!user(senderId)->avatarUrl(this).isEmpty()) {
            avatar_image = user(senderId)->avatar(128, this);
@@ -96,42 +98,6 @@ NeoChatRoom::NeoChatRoom(Connection *connection, QString roomId, JoinState joinS
        Q_EMIT canEncryptRoomChanged();
    });
    connect(connection, &Connection::capabilitiesLoaded, this, &NeoChatRoom::maxRoomVersionChanged);
-    connect(this, &Room::changed, this, [this]() {
-        Q_EMIT defaultUrlPreviewStateChanged();
-    });
-    connect(this, &Room::accountDataChanged, this, [this](QString type) {
-        if (type == "org.matrix.room.preview_urls") {
-            Q_EMIT urlPreviewEnabledChanged();
-        }
-    });
-}
-
-bool NeoChatRoom::hasFileUploading() const
-{
-    return m_hasFileUploading;
-}
-
-void NeoChatRoom::setHasFileUploading(bool value)
-{
-    if (value == m_hasFileUploading) {
-        return;
-    }
-    m_hasFileUploading = value;
-    Q_EMIT hasFileUploadingChanged();
-}
-
-int NeoChatRoom::fileUploadingProgress() const
-{
-    return m_fileUploadingProgress;
-}
-
-void NeoChatRoom::setFileUploadingProgress(int value)
-{
-    if (m_fileUploadingProgress == value) {
-        return;
-    }
-    m_fileUploadingProgress = value;
-    Q_EMIT fileUploadingProgressChanged();
 }

 void NeoChatRoom::uploadFile(const QUrl &url, const QString &body)
@@ -171,9 +137,17 @@ QCoro::Task<void> NeoChatRoom::doUploadFile(QUrl url, QString body)
    } else {
        content = new EventContent::FileContent(url, fileInfo.size(), mime, fileInfo.fileName());
    }
+#ifdef QUOTIENT_07
    QString txnId = postFile(body.isEmpty() ? url.fileName() : body, content);
+#else
+    QString txnId = postFile(body.isEmpty() ? url.fileName() : body, url, false);
+#endif
    setHasFileUploading(true);
+#ifdef QUOTIENT_07
    connect(this, &Room::fileTransferCompleted, [this, txnId](const QString &id, FileSourceInfo) {
+#else
+    connect(this, &Room::fileTransferCompleted, [this, txnId](const QString &id, const QUrl & /*localFile*/, const QUrl & /*mxcUrl*/) {
+#endif
        if (id == txnId) {
            setFileUploadingProgress(0);
            setHasFileUploading(false);
@@ -231,7 +205,7 @@ void NeoChatRoom::sendTypingNotification(bool isTyping)
    connection()->callApi<SetTypingJob>(BackgroundRequest, localUser()->id(), id(), isTyping, 10000);
 }

-const RoomEvent *NeoChatRoom::lastEvent() const
+const RoomEvent *NeoChatRoom::lastEvent(bool ignoreStateEvent) const
 {
    for (auto timelineItem = messageEvents().rbegin(); timelineItem < messageEvents().rend(); timelineItem++) {
        const RoomEvent *event = timelineItem->get();
@@ -243,20 +217,8 @@ const RoomEvent *NeoChatRoom::lastEvent() const
            continue;
        }

-        if (event->isStateEvent() && !NeoChatConfig::showStateEvent()) {
-            continue;
-        }
-
-        if (auto roomMemberEvent = eventCast<const RoomMemberEvent>(event)) {
-            if ((roomMemberEvent->isJoin() || roomMemberEvent->isLeave()) && !NeoChatConfig::showLeaveJoinEvent()) {
-                continue;
-            } else if (roomMemberEvent->isRename() && !roomMemberEvent->isJoin() && !roomMemberEvent->isLeave() && !NeoChatConfig::showRename()) {
-                continue;
-            } else if (roomMemberEvent->isAvatarUpdate() && !roomMemberEvent->isJoin() && !roomMemberEvent->isLeave() && !NeoChatConfig::showAvatarUpdate()) {
-                continue;
-            }
-        }
-        if (event->isStateEvent() && static_cast<const StateEvent &>(*event).repeatsState()) {
+        if (event->isStateEvent()
+            && (ignoreStateEvent || !NeoChatConfig::self()->showLeaveJoinEvent() || static_cast<const StateEventBase &>(*event).repeatsState())) {
            continue;
        }

@@ -270,20 +232,14 @@ const RoomEvent *NeoChatRoom::lastEvent() const
            continue;
        }

-#ifdef QUOTIENT_07
-        if (auto lastEvent = eventCast<const StateEvent>(event)) {
-#else
-        if (auto lastEvent = eventCast<const StateEventBase>(event)) {
-#endif
-            return lastEvent;
-        }
-
        if (auto lastEvent = eventCast<const RoomMessageEvent>(event)) {
            return lastEvent;
        }
+#ifdef QUOTIENT_07
        if (auto lastEvent = eventCast<const PollStartEvent>(event)) {
            return lastEvent;
        }
+#endif
    }
    return nullptr;
 }
@@ -301,12 +257,12 @@ bool NeoChatRoom::lastEventIsSpoiler() const
    return false;
 }

-QString NeoChatRoom::lastEventToString(Qt::TextFormat format, bool stripNewlines) const
+QString NeoChatRoom::lastEventToString() const
 {
    if (auto event = lastEvent()) {
-        return safeMemberName(event->senderId()) + (event->isStateEvent() ? " " : ": ") + eventToString(*event, format, stripNewlines);
+        return roomMembername(event->senderId()) + (event->isStateEvent() ? " " : ": ") + eventToString(*event);
    }
-    return {};
+    return QLatin1String("");
 }

 bool NeoChatRoom::isEventHighlighted(const RoomEvent *e) const
@@ -322,7 +278,7 @@ void NeoChatRoom::checkForHighlights(const Quotient::TimelineItem &ti)
    }
    if (auto *e = ti.viewAs<RoomMessageEvent>()) {
        const auto &text = e->plainBody();
-        if (text.contains(localUserId) || text.contains(safeMemberName(localUserId))) {
+        if (text.contains(localUserId) || text.contains(roomMembername(localUserId))) {
            highlights.insert(e);
        }
    }
@@ -345,7 +301,7 @@ void NeoChatRoom::onAddHistoricalTimelineEvents(rev_iter_t from)
 void NeoChatRoom::onRedaction(const RoomEvent &prevEvent, const RoomEvent & /*after*/)
 {
    if (const auto &e = eventCast<const ReactionEvent>(&prevEvent)) {
-        if (auto relatedEventId = e->eventId(); !relatedEventId.isEmpty()) {
+        if (auto relatedEventId = e->relation().eventId; !relatedEventId.isEmpty()) {
            Q_EMIT updatedEvent(relatedEventId);
        }
    }
@@ -353,8 +309,9 @@ void NeoChatRoom::onRedaction(const RoomEvent &prevEvent, const RoomEvent & /*af

 void NeoChatRoom::countChanged()
 {
-    if (displayed() && unreadStats().empty()) {
-        setReadReceipt(lastEvent()->id());
+    if (displayed() && !hasUnreadMessages()) {
+        resetNotificationCount();
+        resetHighlightCount();
    }
 }

@@ -364,7 +321,7 @@ QDateTime NeoChatRoom::lastActiveTime()
        return QDateTime();
    }

-    if (auto event = lastEvent()) {
+    if (auto event = lastEvent(true)) {
        return event->originTimestamp();
    }

@@ -372,6 +329,69 @@ QDateTime NeoChatRoom::lastActiveTime()
    return messageEvents().rbegin()->get()->originTimestamp();
 }

+QString NeoChatRoom::subtitleText()
+{
+    static const QRegularExpression blockquote("(\r\n\t|\n|\r\t|)> ");
+    static const QRegularExpression heading("(\r\n\t|\n|\r\t|)\\#{1,6} ");
+    static const QRegularExpression newlines("(\r\n\t|\n|\r\t|\r\n)");
+    static const QRegularExpression bold1("(\\*\\*|__)(?=\\S)([^\\r]*\\S)\\1");
+    static const QRegularExpression bold2("(\\*|_)(?=\\S)([^\\r]*\\S)\\1");
+    static const QRegularExpression strike1("~~(.*)~~");
+    static const QRegularExpression strike2("~(.*)~");
+    static const QRegularExpression del("<del>(.*)</del>");
+    static const QRegularExpression multileLineCode("```([^```]+)```");
+    static const QRegularExpression singleLinecode("`([^`]+)`");
+    QString subtitle = lastEventToString().size() == 0 ? topic() : lastEventToString();
+
+    subtitle
+        // replace blockquote, i.e. '> text'
+        .replace(blockquote, " ")
+        // replace headings, i.e. "# text"
+        .replace(heading, " ")
+        // replace newlines
+        .replace(newlines, " ")
+        // replace '**text**' and '__text__'
+        .replace(bold1, "\\2")
+        // replace '*text*' and '_text_'
+        .replace(bold2, "\\2")
+        // replace '~~text~~'
+        .replace(strike1, "\\1")
+        // replace '~text~'
+        .replace(strike2, "\\1")
+        // replace '<del>text</del>'
+        .replace(del, "\\1")
+        // replace '```code```'
+        .replace(multileLineCode, "\\1")
+        // replace '`code`'
+        .replace(singleLinecode, "\\1");
+
+    return subtitle.size() > 0 ? subtitle : QStringLiteral(" ");
+}
+
+int NeoChatRoom::savedTopVisibleIndex() const
+{
+    return firstDisplayedMarker() == historyEdge() ? 0 : int(firstDisplayedMarker() - messageEvents().rbegin());
+}
+
+int NeoChatRoom::savedBottomVisibleIndex() const
+{
+    return lastDisplayedMarker() == historyEdge() ? 0 : int(lastDisplayedMarker() - messageEvents().rbegin());
+}
+
+void NeoChatRoom::saveViewport(int topIndex, int bottomIndex)
+{
+    if (topIndex == -1 || bottomIndex == -1 || (bottomIndex == savedBottomVisibleIndex() && (bottomIndex == 0 || topIndex == savedTopVisibleIndex()))) {
+        return;
+    }
+    if (bottomIndex == 0) {
+        setFirstDisplayedEventId({});
+        setLastDisplayedEventId({});
+        return;
+    }
+    setFirstDisplayedEvent(maxTimelineIndex() - topIndex);
+    setLastDisplayedEvent(maxTimelineIndex() - bottomIndex);
+}
+
 QVariantList NeoChatRoom::getUsers(const QString &keyword, int limit) const
 {
    const auto userList = users();
@@ -405,6 +425,15 @@ QVariantMap NeoChatRoom::getUser(const QString &userID) const
                       {QStringLiteral("color"), user.color()}};
 }

+QUrl NeoChatRoom::urlToMxcUrl(const QUrl &mxcUrl)
+{
+#ifdef QUOTIENT_07
+    return connection()->makeMediaUrl(mxcUrl);
+#else
+    return DownloadFileJob::makeRequestUrl(connection()->homeserver(), mxcUrl);
+#endif
+}
+
 QString NeoChatRoom::avatarMediaId() const
 {
    if (const auto avatar = Room::avatarMediaId(); !avatar.isEmpty()) {
@@ -422,71 +451,87 @@ QString NeoChatRoom::avatarMediaId() const
    return {};
 }

-QString NeoChatRoom::eventToString(const RoomEvent &evt, Qt::TextFormat format, bool stripNewlines) const
+QString NeoChatRoom::eventToString(const RoomEvent &evt, Qt::TextFormat format, bool removeReply) const
 {
    const bool prettyPrint = (format == Qt::RichText);

    using namespace Quotient;
+#ifdef QUOTIENT_07
    return switchOnType(
+#else
+    return visit(
+#endif
        evt,
-        [this, format, stripNewlines](const RoomMessageEvent &e) {
+        [this, prettyPrint, removeReply](const RoomMessageEvent &e) {
            using namespace MessageEventContent;

-            TextHandler textHandler;
+            // 1. prettyPrint/HTML
+            if (prettyPrint && e.hasTextContent() && e.mimeType().name() != "text/plain") {
+                auto htmlBody = static_cast<const TextContent *>(e.content())->body;
+                if (removeReply) {
+                    htmlBody.remove(utils::removeRichReplyRegex);
+                }
+                htmlBody.replace(utils::userPillRegExp, R"(<b class="user-pill">\1</b>)");
+                htmlBody.replace(utils::strikethroughRegExp, "<s>\\1</s>");
+
+                auto url = connection()->homeserver();
+                auto base = url.scheme() + QStringLiteral("://") + url.host() + (url.port() != -1 ? ':' + QString::number(url.port()) : QString());
+                htmlBody.replace(utils::mxcImageRegExp, QStringLiteral(R"(<img \1 src="%1/_matrix/media/r0/download/\2/\3" \4 > )").arg(base));
+
+                return htmlBody;
+            }

            if (e.hasFileContent()) {
-                auto fileCaption = e.content()->fileInfo()->originalName;
+                auto fileCaption = e.content()->fileInfo()->originalName.toHtmlEscaped();
                if (fileCaption.isEmpty()) {
-                    fileCaption = e.plainBody();
+                    fileCaption = prettyPrint ? Quotient::prettyPrint(e.plainBody()) : e.plainBody();
                } else if (e.content()->fileInfo()->originalName != e.plainBody()) {
                    fileCaption = e.plainBody() + " | " + fileCaption;
                }
-                textHandler.setData(fileCaption);
-                return !fileCaption.isEmpty() ? textHandler.handleRecievePlainText(Qt::PlainText, stripNewlines) : i18n("a file");
+                return !fileCaption.isEmpty() ? fileCaption : i18n("a file");
            }

-            QString body;
-            if (e.hasTextContent() && e.content()) {
-                body = static_cast<const TextContent *>(e.content())->body;
-            } else {
-                body = e.plainBody();
+            // 2. prettyPrint/text 3. plainText/HTML 4. plainText/text
+            QString plainBody;
+            if (e.hasTextContent() && e.content() && e.mimeType().name() == "text/plain") { // 2/4
+                plainBody = static_cast<const TextContent *>(e.content())->body;
+            } else { // 3
+                plainBody = e.plainBody();
            }

-            textHandler.setData(body);
-
-            Qt::TextFormat inputFormat;
-            if (e.mimeType().name() == "text/plain") {
-                inputFormat = Qt::PlainText;
-            } else {
-                inputFormat = Qt::RichText;
+            if (prettyPrint) {
+                if (removeReply) {
+                    plainBody.remove(utils::removeReplyRegex);
+                }
+                return Quotient::prettyPrint(plainBody);
            }
-
-            if (format == Qt::RichText) {
-                return textHandler.handleRecieveRichText(inputFormat, this, &e, stripNewlines);
-            } else {
-                return textHandler.handleRecievePlainText(inputFormat, stripNewlines);
+            if (removeReply) {
+                return plainBody.remove(utils::removeReplyRegex);
            }
+            return plainBody;
        },
        [](const StickerEvent &e) {
            return e.body();
        },
-        [this, prettyPrint](const RoomMemberEvent &e) {
+        [this](const RoomMemberEvent &e) {
            // FIXME: Rewind to the name that was at the time of this event
            auto subjectName = this->htmlSafeMemberName(e.userId());
-            if (e.membership() == Membership::Leave) {
+            if (e.membership() == MembershipType::Leave) {
+#ifdef QUOTIENT_07
                if (e.prevContent() && e.prevContent()->displayName) {
                    subjectName = sanitized(*e.prevContent()->displayName).toHtmlEscaped();
+#else
+                if (e.prevContent() && e.prevContent()->displayName.isEmpty()) {
+                    subjectName = sanitized(e.prevContent()->displayName).toHtmlEscaped();
+#endif
                }
            }
-
-            if (prettyPrint) {
-                subjectName = QStringLiteral("<a href=\"https://matrix.to/#/%1\" style=\"color: %2\">%3</a>")
-                                  .arg(e.userId(), static_cast<NeoChatUser *>(user(e.userId()))->color().name(), subjectName);
-            }
+            subjectName = QStringLiteral("<a href=\"https://matrix.to/#/%1\" style=\"color: %2\">%3</a>")
+                              .arg(e.userId(), static_cast<NeoChatUser *>(user(e.userId()))->color().name(), subjectName);

            // The below code assumes senderName output in AuthorRole
            switch (e.membership()) {
-            case Membership::Invite:
+            case MembershipType::Invite:
                if (e.repeatsState()) {
                    auto text = i18n("reinvited %1 to the room", subjectName);
                    if (!e.reason().isEmpty()) {
@@ -495,13 +540,13 @@ QString NeoChatRoom::eventToString(const RoomEvent &evt, Qt::TextFormat format,
                    return text;
                }
                Q_FALLTHROUGH();
-            case Membership::Join: {
+            case MembershipType::Join: {
                QString text{};
                // Part 1: invites and joins
                if (e.repeatsState()) {
                    text = i18n("joined the room (repeated)");
                } else if (e.changesMembership()) {
-                    text = e.membership() == Membership::Invite ? i18n("invited %1 to the room", subjectName) : i18n("joined the room");
+                    text = e.membership() == MembershipType::Invite ? i18n("invited %1 to the room", subjectName) : i18n("joined the room");
                }
                if (!text.isEmpty()) {
                    if (!e.reason().isEmpty()) {
@@ -511,19 +556,23 @@ QString NeoChatRoom::eventToString(const RoomEvent &evt, Qt::TextFormat format,
                }
                // Part 2: profile changes of joined members
                if (e.isRename()) {
-                    if (e.newDisplayName()) {
+                    if (e.displayName().isEmpty()) {
                        text = i18nc("their refers to a singular user", "cleared their display name");
                    } else {
-                        text = i18nc("their refers to a singular user", "changed their display name to %1", e.newDisplayName()->toHtmlEscaped());
+                        text = i18nc("their refers to a singular user", "changed their display name to %1", e.displayName().toHtmlEscaped());
                    }
                }
                if (e.isAvatarUpdate()) {
                    if (!text.isEmpty()) {
                        text += i18n(" and ");
                    }
-                    if (e.newAvatarUrl()) {
+                    if (e.avatarUrl().isEmpty()) {
                        text += i18nc("their refers to a singular user", "cleared their avatar");
+#ifdef QUOTIENT_07
                    } else if (!e.prevContent()->avatarUrl) {
+#else
+                    } else if (e.prevContent()->avatarUrl.isEmpty()) {
+#endif
                        text += i18n("set an avatar");
                    } else {
                        text += i18nc("their refers to a singular user", "updated their avatar");
@@ -534,18 +583,18 @@ QString NeoChatRoom::eventToString(const RoomEvent &evt, Qt::TextFormat format,
                }
                return text;
            }
-            case Membership::Leave:
-                if (e.prevContent() && e.prevContent()->membership == Membership::Invite) {
+            case MembershipType::Leave:
+                if (e.prevContent() && e.prevContent()->membership == MembershipType::Invite) {
                    return (e.senderId() != e.userId()) ? i18n("withdrew %1's invitation", subjectName) : i18n("rejected the invitation");
                }

-                if (e.prevContent() && e.prevContent()->membership == Membership::Ban) {
+                if (e.prevContent() && e.prevContent()->membership == MembershipType::Ban) {
                    return (e.senderId() != e.userId()) ? i18n("unbanned %1", subjectName) : i18n("self-unbanned");
                }
                return (e.senderId() != e.userId())
                    ? i18n("has put %1 out of the room: %2", subjectName, e.contentJson()["reason"_ls].toString().toHtmlEscaped())
                    : i18n("left the room");
-            case Membership::Ban:
+            case MembershipType::Ban:
                if (e.senderId() != e.userId()) {
                    if (e.reason().isEmpty()) {
                        return i18n("banned %1 from the room", subjectName);
@@ -555,7 +604,7 @@ QString NeoChatRoom::eventToString(const RoomEvent &evt, Qt::TextFormat format,
                } else {
                    return i18n("self-banned from the room");
                }
-            case Membership::Knock: {
+            case MembershipType::Knock: {
                QString reason(e.contentJson()["reason"_ls].toString().toHtmlEscaped());
                return reason.isEmpty() ? i18n("requested an invite") : i18n("requested an invite with reason: %1", reason);
            }
@@ -569,12 +618,8 @@ QString NeoChatRoom::eventToString(const RoomEvent &evt, Qt::TextFormat format,
        [](const RoomNameEvent &e) {
            return (e.name().isEmpty()) ? i18n("cleared the room name") : i18n("set the room name to: %1", e.name().toHtmlEscaped());
        },
-        [prettyPrint, stripNewlines](const RoomTopicEvent &e) {
-            return (e.topic().isEmpty()) ? i18n("cleared the topic")
-                                         : i18n("set the topic to: %1",
-                                                prettyPrint         ? Quotient::prettyPrint(e.topic())
-                                                    : stripNewlines ? e.topic().replace(u'\n', u' ')
-                                                                    : e.topic());
+        [prettyPrint](const RoomTopicEvent &e) {
+            return (e.topic().isEmpty()) ? i18n("cleared the topic") : i18n("set the topic to: %1", prettyPrint ? Quotient::prettyPrint(e.topic()) : e.topic());
        },
        [](const RoomAvatarEvent &) {
            return i18n("changed the room avatar");
@@ -589,7 +634,7 @@ QString NeoChatRoom::eventToString(const RoomEvent &evt, Qt::TextFormat format,
        [](const RoomPowerLevelsEvent &) {
            return i18nc("'power level' means permission level", "changed the power levels for this room");
        },
-        [](const StateEvent &e) {
+        [](const StateEventBase &e) {
            if (e.matrixType() == QLatin1String("m.room.server_acl")) {
                return i18n("changed the server access control lists for this room");
            }
@@ -605,15 +650,21 @@ QString NeoChatRoom::eventToString(const RoomEvent &evt, Qt::TextFormat format,
            return e.stateKey().isEmpty() ? i18n("updated %1 state", e.matrixType())
                                          : i18n("updated %1 state for %2", e.matrixType(), e.stateKey().toHtmlEscaped());
        },
+#ifdef QUOTIENT_07
        [](const PollStartEvent &e) {
            return e.question();
        },
+#endif
        i18n("Unknown event"));
 }

 QString NeoChatRoom::eventToGenericString(const RoomEvent &evt) const
 {
+#ifdef QUOTIENT_07
    return switchOnType(
+#else
+    return visit(
+#endif
        evt,
        [](const RoomMessageEvent &e) {
            Q_UNUSED(e)
@@ -625,25 +676,25 @@ QString NeoChatRoom::eventToGenericString(const RoomEvent &evt) const
        },
        [](const RoomMemberEvent &e) {
            switch (e.membership()) {
-            case Membership::Invite:
+            case MembershipType::Invite:
                if (e.repeatsState()) {
                    return i18n("reinvited someone to the room");
                }
                Q_FALLTHROUGH();
-            case Membership::Join: {
+            case MembershipType::Join: {
                QString text{};
                // Part 1: invites and joins
                if (e.repeatsState()) {
                    text = i18n("joined the room (repeated)");
                } else if (e.changesMembership()) {
-                    text = e.membership() == Membership::Invite ? i18n("invited someone to the room") : i18n("joined the room");
+                    text = e.membership() == MembershipType::Invite ? i18n("invited someone to the room") : i18n("joined the room");
                }
                if (!text.isEmpty()) {
                    return text;
                }
                // Part 2: profile changes of joined members
                if (e.isRename()) {
-                    if (e.newDisplayName()) {
+                    if (e.displayName().isEmpty()) {
                        text = i18nc("their refers to a singular user", "cleared their display name");
                    } else {
                        text = i18nc("their refers to a singular user", "changed their display name");
@@ -653,9 +704,13 @@ QString NeoChatRoom::eventToGenericString(const RoomEvent &evt) const
                    if (!text.isEmpty()) {
                        text += i18n(" and ");
                    }
-                    if (e.newAvatarUrl()) {
+                    if (e.avatarUrl().isEmpty()) {
                        text += i18nc("their refers to a singular user", "cleared their avatar");
+#ifdef QUOTIENT_07
                    } else if (!e.prevContent()->avatarUrl) {
+#else
+                    } else if (e.prevContent()->avatarUrl.isEmpty()) {
+#endif
                        text += i18n("set an avatar");
                    } else {
                        text += i18nc("their refers to a singular user", "updated their avatar");
@@ -666,22 +721,22 @@ QString NeoChatRoom::eventToGenericString(const RoomEvent &evt) const
                }
                return text;
            }
-            case Membership::Leave:
-                if (e.prevContent() && e.prevContent()->membership == Membership::Invite) {
+            case MembershipType::Leave:
+                if (e.prevContent() && e.prevContent()->membership == MembershipType::Invite) {
                    return (e.senderId() != e.userId()) ? i18n("withdrew a user's invitation") : i18n("rejected the invitation");
                }

-                if (e.prevContent() && e.prevContent()->membership == Membership::Ban) {
+                if (e.prevContent() && e.prevContent()->membership == MembershipType::Ban) {
                    return (e.senderId() != e.userId()) ? i18n("unbanned a user") : i18n("self-unbanned");
                }
                return (e.senderId() != e.userId()) ? i18n("put a user out of the room") : i18n("left the room");
-            case Membership::Ban:
+            case MembershipType::Ban:
                if (e.senderId() != e.userId()) {
                    return i18n("banned a user from the room");
                } else {
                    return i18n("self-banned from the room");
                }
-            case Membership::Knock: {
+            case MembershipType::Knock: {
                return i18n("requested an invite");
            }
            default:;
@@ -709,7 +764,7 @@ QString NeoChatRoom::eventToGenericString(const RoomEvent &evt) const
        [](const RoomPowerLevelsEvent &) {
            return i18nc("'power level' means permission level", "changed the power levels for this room");
        },
-        [](const StateEvent &e) {
+        [](const StateEventBase &e) {
            if (e.matrixType() == QLatin1String("m.room.server_acl")) {
                return i18n("changed the server access control lists for this room");
            }
@@ -724,23 +779,56 @@ QString NeoChatRoom::eventToGenericString(const RoomEvent &evt) const
            }
            return i18n("updated the state");
        },
+#ifdef QUOTIENT_07
        [](const PollStartEvent &e) {
-            Q_UNUSED(e);
            return i18n("started a poll");
        },
+#endif
        i18n("Unknown event"));
 }

 void NeoChatRoom::changeAvatar(const QUrl &localFile)
 {
    const auto job = connection()->uploadFile(localFile.toLocalFile());
+#ifdef QUOTIENT_07
    if (isJobPending(job)) {
+#else
+    if (isJobRunning(job)) {
+#endif
        connect(job, &BaseJob::success, this, [this, job] {
+#ifdef QUOTIENT_07
            connection()->callApi<SetRoomStateWithKeyJob>(id(), "m.room.avatar", QString(), QJsonObject{{"url", job->contentUri().toString()}});
+#else
+            connection()->callApi<SetRoomStateWithKeyJob>(id(), "m.room.avatar", QString(), QJsonObject{{"url", job->contentUri()}});
+#endif
        });
    }
 }

+void NeoChatRoom::addLocalAlias(const QString &alias)
+{
+    auto a = aliases();
+    if (a.contains(alias)) {
+        return;
+    }
+
+    a += alias;
+
+    setLocalAliases(a);
+}
+
+void NeoChatRoom::removeLocalAlias(const QString &alias)
+{
+    auto a = aliases();
+    if (!a.contains(alias)) {
+        return;
+    }
+
+    a.removeAll(alias);
+
+    setLocalAliases(a);
+}
+
 QString msgTypeToString(MessageEventType msgType)
 {
    switch (msgType) {
@@ -845,11 +933,11 @@ void NeoChatRoom::toggleReaction(const QString &eventId, const QString &reaction

    QStringList redactEventIds; // What if there are multiple reaction events?

-    const auto &annotations = relatedEvents(evt, EventRelation::AnnotationType);
+    const auto &annotations = relatedEvents(evt, EventRelation::Annotation());
    if (!annotations.isEmpty()) {
        for (const auto &a : annotations) {
            if (auto e = eventCast<const ReactionEvent>(a)) {
-                if (e->key() != reaction) {
+                if (e->relation().key != reaction) {
                    continue;
                }

@@ -872,15 +960,18 @@ void NeoChatRoom::toggleReaction(const QString &eventId, const QString &reaction

 bool NeoChatRoom::containsUser(const QString &userID) const
 {
-    return !isMember(userID);
+    auto u = Room::user(userID);
+
+    if (!u) {
+        return false;
+    }
+
+    return Room::memberJoinState(u) != JoinState::Leave;
 }

 bool NeoChatRoom::canSendEvent(const QString &eventType) const
 {
-    auto plEvent = currentState().get<RoomPowerLevelsEvent>();
-    if (!plEvent) {
-        return true;
-    }
+    auto plEvent = getCurrentState<RoomPowerLevelsEvent>();
    auto pl = plEvent->powerLevelForEvent(eventType);
    auto currentPl = plEvent->powerLevelForUser(localUser()->id());

@@ -889,19 +980,28 @@ bool NeoChatRoom::canSendEvent(const QString &eventType) const

 bool NeoChatRoom::canSendState(const QString &eventType) const
 {
-    auto plEvent = currentState().get<RoomPowerLevelsEvent>();
-    if (!plEvent) {
-        return false;
-    }
+    auto plEvent = getCurrentState<RoomPowerLevelsEvent>();
    auto pl = plEvent->powerLevelForState(eventType);
    auto currentPl = plEvent->powerLevelForUser(localUser()->id());

+#ifndef QUOTIENT_07
+    if (eventType == "m.room.history_visibility") {
+        return false;
+    } else {
+        return currentPl >= pl;
+    }
+#else
    return currentPl >= pl;
+#endif
 }

 bool NeoChatRoom::readMarkerLoaded() const
 {
+#ifdef QUOTIENT_07
    const auto it = findInTimeline(lastFullyReadEventId());
+#else
+    const auto it = findInTimeline(readMarkerEventId());
+#endif
    return it != historyEdge();
 }

@@ -912,7 +1012,12 @@ bool NeoChatRoom::isInvite() const

 bool NeoChatRoom::isUserBanned(const QString &user) const
 {
-    return currentState().get<RoomMemberEvent>(user)->membership() == Membership::Ban;
+    return getCurrentState<RoomMemberEvent>(user)->membership() == MembershipType::Ban;
+}
+
+QString NeoChatRoom::htmlSafeName() const
+{
+    return name().toHtmlEscaped();
 }

 QString NeoChatRoom::htmlSafeDisplayName() const
@@ -927,7 +1032,7 @@ void NeoChatRoom::deleteMessagesByUser(const QString &user, const QString &reaso

 QString NeoChatRoom::joinRule() const
 {
-    return currentState().get<JoinRulesEvent>()->joinRule();
+    return getCurrentState<JoinRulesEvent>()->joinRule();
 }

 void NeoChatRoom::setJoinRule(const QString &joinRule)
@@ -936,13 +1041,21 @@ void NeoChatRoom::setJoinRule(const QString &joinRule)
        qWarning() << "Power level too low to set join rules";
        return;
    }
+#ifdef QUOTIENT_07
    setState("m.room.join_rules", "", QJsonObject{{"join_rule", joinRule}});
+#else
+    setState<JoinRulesEvent>(QJsonObject{{"type", "m.room.join_rules"}, {"state_key", ""}, {"content", QJsonObject{{"join_rule", joinRule}}}});
+#endif
    // Not emitting joinRuleChanged() here, since that would override the change in the UI with the *current* value, which is not the *new* value.
 }

 QString NeoChatRoom::historyVisibility() const
 {
+#ifdef QUOTIENT_07
    return currentState().get("m.room.history_visibility")->contentJson()["history_visibility"_ls].toString();
+#else
+    return getCurrentState("m.room.history_visibility")->contentJson()["history_visibility"_ls].toString();
+#endif
 }

 void NeoChatRoom::setHistoryVisibility(const QString &historyVisibilityRule)
@@ -952,87 +1065,16 @@ void NeoChatRoom::setHistoryVisibility(const QString &historyVisibilityRule)
        return;
    }

+#ifdef QUOTIENT_07
    setState("m.room.history_visibility", "", QJsonObject{{"history_visibility", historyVisibilityRule}});
+#else
+    qWarning() << "Quotient 0.7 required to set history visibility";
+    return;
+#endif

    // Not emitting historyVisibilityChanged() here, since that would override the change in the UI with the *current* value, which is not the *new* value.
 }

-bool NeoChatRoom::defaultUrlPreviewState() const
-{
-    auto urlPreviewsDisabled = currentState().get("org.matrix.room.preview_urls");
-
-    // Some rooms will not have this state event set so check for a nullptr return.
-    if (urlPreviewsDisabled != nullptr) {
-        return !urlPreviewsDisabled->contentJson()["disable"].toBool();
-    } else {
-        return false;
-    }
-}
-
-void NeoChatRoom::setDefaultUrlPreviewState(const bool &defaultUrlPreviewState)
-{
-    if (!canSendState("org.matrix.room.preview_urls")) {
-        qWarning() << "Power level too low to set the default URL preview state for the room";
-        return;
-    }
-
-    /**
-     * Note the org.matrix.room.preview_urls room state event is completely undocumented
-     * so here it is because I'm nice.
-     *
-     * Also note this is a different event to org.matrix.room.preview_urls for room
-     * account data, because even though it has the same name and content it's totally different.
-     *
-     * {
-     *  "content": {
-     *      "disable": false
-     *  },
-     *  "origin_server_ts": 1673115224071,
-     *  "sender": "@bob:kde.org",
-     *  "state_key": "",
-     *  "type": "org.matrix.room.preview_urls",
-     *  "unsigned": {
-     *      "replaces_state": "replaced_event_id",
-     *      "prev_content": {
-     *          "disable": true
-     *      },
-     *      "prev_sender": "@jeff:kde.org",
-     *      "age": 99
-     *  },
-     *  "event_id": "$event_id",
-     *  "room_id": "!room_id:kde.org"
-     * }
-     *
-     * You just have to set disable to true to disable URL previews by default.
-     */
-    setState("org.matrix.room.preview_urls", "", QJsonObject{{"disable", !defaultUrlPreviewState}});
-}
-
-bool NeoChatRoom::urlPreviewEnabled() const
-{
-    if (hasAccountData("org.matrix.room.preview_urls")) {
-        return !accountData("org.matrix.room.preview_urls")->contentJson()["disable"].toBool();
-    } else {
-        return defaultUrlPreviewState();
-    }
-}
-
-void NeoChatRoom::setUrlPreviewEnabled(const bool &urlPreviewEnabled)
-{
-    /**
-     * Once again this is undocumented and even though the name and content are the
-     * same this is a different event to the org.matrix.room.preview_urls room state event.
-     *
-     * {
-     *  "content": {
-     *      "disable": true
-     *  }
-     *  "type": "org.matrix.room.preview_urls",
-     * }
-     */
-    connection()->callApi<SetAccountDataPerRoomJob>(localUser()->id(), id(), "org.matrix.room.preview_urls", QJsonObject{{"disable", !urlPreviewEnabled}});
-}
-
 void NeoChatRoom::setUserPowerLevel(const QString &userID, const int &powerLevel)
 {
    if (joinedCount() <= 1) {
@@ -1043,32 +1085,42 @@ void NeoChatRoom::setUserPowerLevel(const QString &userID, const int &powerLevel
        qWarning() << "Power level too low to set user power levels";
        return;
    }
+#ifdef QUOTIENT_07
    if (!isMember(userID)) {
+#else
+    if (memberJoinState(user(userID)) == JoinState::Join) {
+#endif
        qWarning() << "User is not a member of this room so power level cannot be set";
        return;
    }
    int clampPowerLevel = std::clamp(powerLevel, 0, 100);

+#ifdef QUOTIENT_07
    auto powerLevelContent = currentState().get("m.room.power_levels")->contentJson();
+#else
+    auto powerLevelContent = getCurrentState<RoomPowerLevelsEvent>()->contentJson();
+#endif
    auto powerLevelUserOverrides = powerLevelContent["users"].toObject();

    if (powerLevelUserOverrides[userID] != clampPowerLevel) {
        powerLevelUserOverrides[userID] = clampPowerLevel;
        powerLevelContent["users"] = powerLevelUserOverrides;

+#ifdef QUOTIENT_07
        setState("m.room.power_levels", "", powerLevelContent);
+#else
+        setState<RoomPowerLevelsEvent>(QJsonObject{{"type", "m.room.power_levels"}, {"state_key", ""}, {"content", powerLevelContent}});
+#endif
    }
 }

-int NeoChatRoom::getUserPowerLevel(const QString &userId) const
-{
-    auto powerLevelEvent = getCurrentState<RoomPowerLevelsEvent>();
-    return powerLevelEvent->powerLevelForUser(userId);
-}
-
 int NeoChatRoom::powerLevel(const QString &eventName, const bool &isStateEvent) const
 {
+#ifdef QUOTIENT_07
    const auto powerLevelEvent = currentState().get<RoomPowerLevelsEvent>();
+#else
+    const auto powerLevelEvent = getCurrentState<RoomPowerLevelsEvent>();
+#endif
    if (eventName == "ban") {
        return powerLevelEvent->ban();
    } else if (eventName == "kick") {
@@ -1092,7 +1144,11 @@ int NeoChatRoom::powerLevel(const QString &eventName, const bool &isStateEvent)

 void NeoChatRoom::setPowerLevel(const QString &eventName, const int &newPowerLevel, const bool &isStateEvent)
 {
+#ifdef QUOTIENT_07
    auto powerLevelContent = currentState().get("m.room.power_levels")->contentJson();
+#else
+    auto powerLevelContent = getCurrentState<RoomPowerLevelsEvent>()->contentJson();
+#endif
    int clampPowerLevel = std::clamp(newPowerLevel, 0, 100);
    int powerLevel = 0;

@@ -1121,7 +1177,11 @@ void NeoChatRoom::setPowerLevel(const QString &eventName, const int &newPowerLev
        }
    }

+#ifdef QUOTIENT_07
    setState("m.room.power_levels", "", powerLevelContent);
+#else
+    setState<RoomPowerLevelsEvent>(QJsonObject{{"type", "m.room.power_levels"}, {"state_key", ""}, {"content", powerLevelContent}});
+#endif
 }

 int NeoChatRoom::defaultUserPowerLevel() const
@@ -1344,12 +1404,11 @@ bool NeoChatRoom::isSpace()
        return false;
    }

+#ifdef QUOTIENT_07
    return creationEvent->roomType() == RoomType::Space;
-}
-
-PushNotificationState::State NeoChatRoom::pushNotificationState() const
-{
-    return m_currentPushNotificationState;
+#else
+    return false;
+#endif
 }

 void NeoChatRoom::setPushNotificationState(PushNotificationState::State state)
@@ -1671,9 +1730,15 @@ void NeoChatRoom::setSavedText(const QString &savedText)

 bool NeoChatRoom::canEncryptRoom() const
 {
+#ifdef QUOTIENT_07
+#ifdef Quotient_E2EE_ENABLED
    return !usesEncryption() && canSendState("m.room.encryption");
+#endif
+#endif
+    return false;
 }

+#ifdef QUOTIENT_07
 PollHandler *NeoChatRoom::poll(const QString &eventId)
 {
    if (!m_polls.contains(eventId)) {
@@ -1684,6 +1749,7 @@ PollHandler *NeoChatRoom::poll(const QString &eventId)
    }
    return m_polls[eventId];
 }
+#endif

 bool NeoChatRoom::downloadTempFile(const QString &eventId)
 {
@@ -1763,7 +1829,3 @@ int NeoChatRoom::maxRoomVersion() const
    }
    return maxVersion;
 }
-NeoChatUser *NeoChatRoom::directChatRemoteUser() const
-{
-    return dynamic_cast<NeoChatUser *>(connection()->directChatUsers(this)[0]);
-}
--- a/src/neochatroom.h
+++ b/src/neochatroom.h
@@ -3,13 +3,14 @@

 #pragma once

+#include <qobjectdefs.h>
 #include <room.h>

 #include <QCache>
 #include <QObject>
 #include <QTextCursor>

-#include <QCoroTask>
+#include <qcoro/task.h>

 #include "neochatuser.h"
 #include "pollhandler.h"
@@ -19,128 +20,78 @@ class PushNotificationState : public QObject
    Q_OBJECT

 public:
-    /**
-     * @brief Describes the push notification state for the room.
-     */
    enum State {
-        Unknown, /**< The state has not yet been obtained from the server. */
-        Default, /**< The room follows the globally configured rules for the local user. */
-        Mute, /**< No notifications for messages in the room. */
-        MentionKeyword, /**< Notifications only for local user mentions and keywords. */
-        All, /**< Notifications for all messages. */
+        Unknown,
+        Default,
+        Mute,
+        MentionKeyword,
+        All,
    };
    Q_ENUM(State);
 };

-/**
- * @brief Defines a user mention in the current chat or edit text.
- */
 struct Mention {
-    QTextCursor cursor; /**< Contains the mention's text and position in the text.  */
-    QString text; /**< The inserted text of the mention. */
-    int start = 0; /**< Start position of the mention. */
-    int position = 0; /**< End position of the mention. */
-    QString id; /**< The id the mention (used to create link when sending the message). */
+    QTextCursor cursor;
+    QString text;
+    int start = 0;
+    int position = 0;
+    QString id;
 };

-/**
- * @class NeoChatRoom
- *
- * This class is designed to act as a wrapper over Quotient::Room to provide API and
- * functionality not available in Quotient::Room.
- *
- * The functions fall into two main categories:
- *  - Helper functions to make functionality easily accessible in QML.
- *  - Implement functions not yet available in Quotient::Room.
- *
- * @sa Quotient::Room
- */
 class NeoChatRoom : public Quotient::Room
 {
    Q_OBJECT
-
-    /**
-     * @brief A list of users currently typing in the room.
-     *
-     * The list does not include the local user.
-     *
-     * This is different to getting a list of NeoChatUser objects or Quotient::User objects
-     * as neither of those can provide details like the displayName or avatarMediaId
-     * without the room context as these can vary from room to room. This function
-     * provides the room context and puts the result as a list of QVariantMap objects.
-     *
-     * @return a QVariantMap for the user with the following
-     * parameters:
-     *  - id - User ID.
-     *  - avatarMediaId - Avatar id in the context of this room.
-     *  - displayName - Display name in the context of this room.
-     *  - display - Name in the context of this room.
-     *
-     * @sa Quotient::User, NeoChatUser
-     */
    Q_PROPERTY(QVariantList usersTyping READ getUsersTyping NOTIFY typingChanged)
-
-    /**
-     * @brief Convenience function to get the QDateTime of the last event.
-     *
-     * @sa lastEvent()
-     */
-    Q_PROPERTY(QDateTime lastActiveTime READ lastActiveTime NOTIFY lastActiveTimeChanged)
-
-    /**
-     * @brief Whether a file is being uploaded to the server.
-     */
    Q_PROPERTY(bool hasFileUploading READ hasFileUploading WRITE setHasFileUploading NOTIFY hasFileUploadingChanged)
-
-    /**
-     * @brief Progress of a file upload as a percentage 0 - 100%.
-     *
-     * The value will be 0 if no file is uploading.
-     *
-     * @sa hasFileUploading
-     */
    Q_PROPERTY(int fileUploadingProgress READ fileUploadingProgress NOTIFY fileUploadingProgressChanged)
-
-    /**
-     * @brief Whether the read marker should be shown.
-     */
-    Q_PROPERTY(bool readMarkerLoaded READ readMarkerLoaded NOTIFY readMarkerLoadedChanged)
-
-    /**
-     * @brief Display name with any html special characters escaped.
-     */
-    Q_PROPERTY(QString htmlSafeDisplayName READ htmlSafeDisplayName NOTIFY displayNameChanged)
-
-    /**
-     * @brief The avatar image to be used for the room.
-     */
    Q_PROPERTY(QString avatarMediaId READ avatarMediaId NOTIFY avatarChanged STORED false)
-
-    /**
-     * @brief Get a user object for the other person in a direct chat.
-     */
-    Q_PROPERTY(NeoChatUser *directChatRemoteUser READ directChatRemoteUser CONSTANT)
-
-    /**
-     * @brief If the room is a space.
-     */
+    Q_PROPERTY(bool readMarkerLoaded READ readMarkerLoaded NOTIFY readMarkerLoadedChanged)
+    Q_PROPERTY(QDateTime lastActiveTime READ lastActiveTime NOTIFY lastActiveTimeChanged)
    Q_PROPERTY(bool isSpace READ isSpace CONSTANT)
-
-    /**
-     * @brief Whether the local user has an invite to the room.
-     *
-     * False for any other state including if the local user is a member.
-     */
    Q_PROPERTY(bool isInvite READ isInvite NOTIFY isInviteChanged)
+    Q_PROPERTY(QString joinRule READ joinRule WRITE setJoinRule NOTIFY joinRuleChanged)
+    Q_PROPERTY(QString historyVisibility READ historyVisibility WRITE setHistoryVisibility NOTIFY historyVisibilityChanged)
+
+    // Properties for the various permission levels for the room
+    Q_PROPERTY(int defaultUserPowerLevel READ defaultUserPowerLevel WRITE setDefaultUserPowerLevel NOTIFY defaultUserPowerLevelChanged)
+    Q_PROPERTY(int invitePowerLevel READ invitePowerLevel WRITE setInvitePowerLevel NOTIFY invitePowerLevelChanged)
+    Q_PROPERTY(int kickPowerLevel READ kickPowerLevel WRITE setKickPowerLevel NOTIFY kickPowerLevelChanged)
+    Q_PROPERTY(int banPowerLevel READ banPowerLevel WRITE setBanPowerLevel NOTIFY banPowerLevelChanged)
+    Q_PROPERTY(int redactPowerLevel READ redactPowerLevel WRITE setRedactPowerLevel NOTIFY redactPowerLevelChanged)
+    Q_PROPERTY(int statePowerLevel READ statePowerLevel WRITE setStatePowerLevel NOTIFY statePowerLevelChanged)
+    Q_PROPERTY(int defaultEventPowerLevel READ defaultEventPowerLevel WRITE setDefaultEventPowerLevel NOTIFY defaultEventPowerLevelChanged)
+    Q_PROPERTY(int powerLevelPowerLevel READ powerLevelPowerLevel WRITE setPowerLevelPowerLevel NOTIFY powerLevelPowerLevelChanged)
+    Q_PROPERTY(int namePowerLevel READ namePowerLevel WRITE setNamePowerLevel NOTIFY namePowerLevelChanged)
+    Q_PROPERTY(int avatarPowerLevel READ avatarPowerLevel WRITE setAvatarPowerLevel NOTIFY avatarPowerLevelChanged)
+    Q_PROPERTY(int canonicalAliasPowerLevel READ canonicalAliasPowerLevel WRITE setCanonicalAliasPowerLevel NOTIFY canonicalAliasPowerLevelChanged)
+    Q_PROPERTY(int topicPowerLevel READ topicPowerLevel WRITE setTopicPowerLevel NOTIFY topicPowerLevelChanged)
+    Q_PROPERTY(int encryptionPowerLevel READ encryptionPowerLevel WRITE setEncryptionPowerLevel NOTIFY encryptionPowerLevelChanged)
+    Q_PROPERTY(int historyVisibilityPowerLevel READ historyVisibilityPowerLevel WRITE setHistoryVisibilityPowerLevel NOTIFY historyVisibilityPowerLevelChanged)
+    Q_PROPERTY(int pinnedEventsPowerLevel READ pinnedEventsPowerLevel WRITE setPinnedEventsPowerLevel NOTIFY pinnedEventsPowerLevelChanged)
+    Q_PROPERTY(int tombstonePowerLevel READ tombstonePowerLevel WRITE setTombstonePowerLevel NOTIFY tombstonePowerLevelChanged)
+    Q_PROPERTY(int serverAclPowerLevel READ serverAclPowerLevel WRITE setServerAclPowerLevel NOTIFY serverAclPowerLevelChanged)
+    Q_PROPERTY(int spaceChildPowerLevel READ spaceChildPowerLevel WRITE setSpaceChildPowerLevel NOTIFY spaceChildPowerLevelChanged)
+    Q_PROPERTY(int spaceParentPowerLevel READ spaceParentPowerLevel WRITE setSpaceParentPowerLevel NOTIFY spaceParentPowerLevelChanged)
+
+    Q_PROPERTY(QString htmlSafeDisplayName READ htmlSafeDisplayName NOTIFY displayNameChanged)
+    Q_PROPERTY(PushNotificationState::State pushNotificationState MEMBER m_currentPushNotificationState WRITE setPushNotificationState NOTIFY
+                   pushNotificationStateChanged)
+
+    // Due to problems with QTextDocument, unlike the other properties here, chatBoxText is *not* used to store the text when switching rooms
+    Q_PROPERTY(QString chatBoxText READ chatBoxText WRITE setChatBoxText NOTIFY chatBoxTextChanged)

    /**
-     * @brief The current join rule for the room as a QString.
-     *
-     * Possible values are [public, knock, invite, private, restricted].
-     *
-     * @sa https://spec.matrix.org/v1.5/client-server-api/#mroomjoin_rules
+     * @brief The text for any message currently being edited in the room.
     */
-    Q_PROPERTY(QString joinRule READ joinRule WRITE setJoinRule NOTIFY joinRuleChanged)
+    Q_PROPERTY(QString editText READ editText WRITE setEditText NOTIFY editTextChanged)
+    Q_PROPERTY(QString chatBoxReplyId READ chatBoxReplyId WRITE setChatBoxReplyId NOTIFY chatBoxReplyIdChanged)
+    Q_PROPERTY(QString chatBoxEditId READ chatBoxEditId WRITE setChatBoxEditId NOTIFY chatBoxEditIdChanged)
+    Q_PROPERTY(NeoChatUser *chatBoxReplyUser READ chatBoxReplyUser NOTIFY chatBoxReplyIdChanged)
+    Q_PROPERTY(QString chatBoxReplyMessage READ chatBoxReplyMessage NOTIFY chatBoxReplyIdChanged)
+    Q_PROPERTY(NeoChatUser *chatBoxEditUser READ chatBoxEditUser NOTIFY chatBoxEditIdChanged)
+    Q_PROPERTY(QString chatBoxEditMessage READ chatBoxEditMessage NOTIFY chatBoxEditIdChanged)
+    Q_PROPERTY(QString chatBoxAttachmentPath READ chatBoxAttachmentPath WRITE setChatBoxAttachmentPath NOTIFY chatBoxAttachmentPathChanged)
+    Q_PROPERTY(bool canEncryptRoom READ canEncryptRoom NOTIFY canEncryptRoomChanged)

    /**
     * @brief Get the maximum room version that the server supports.
@@ -149,489 +100,58 @@ class NeoChatRoom : public Quotient::Room
     */
    Q_PROPERTY(int maxRoomVersion READ maxRoomVersion NOTIFY maxRoomVersionChanged)

-    /**
-     * @brief The rule for which messages should generate notifications for the room.
-     *
-     * @sa PushNotificationState::State
-     */
-    Q_PROPERTY(PushNotificationState::State pushNotificationState READ pushNotificationState WRITE setPushNotificationState NOTIFY pushNotificationStateChanged)
-
-    /**
-     * @brief The current history visibilty setting for the room.
-     *
-     * Possible values are [invited, joined, shared, world_readable].
-     *
-     * @sa https://spec.matrix.org/v1.5/client-server-api/#room-history-visibility
-     */
-    Q_PROPERTY(QString historyVisibility READ historyVisibility WRITE setHistoryVisibility NOTIFY historyVisibilityChanged)
-
-    /**
-     * @brief Set the default URL preview state for room members.
-     *
-     * Assumed false if the org.matrix.room.preview_urls state message has never been
-     * set. Can only be set if the calling user has a high enough power level.
-     */
-    Q_PROPERTY(bool defaultUrlPreviewState READ defaultUrlPreviewState WRITE setDefaultUrlPreviewState NOTIFY defaultUrlPreviewStateChanged)
-
-    /**
-     * @brief Enable URL previews for the local user.
-     */
-    Q_PROPERTY(bool urlPreviewEnabled READ urlPreviewEnabled WRITE setUrlPreviewEnabled NOTIFY urlPreviewEnabledChanged)
-
-    /**
-     * @brief Whether the local user can encrypt the room.
-     *
-     * Requires libQuotient 0.7 compiled with the Quotient_E2EE_ENABLED parameter to
-     * be able to return true.
-     *
-     * A local user can encrypt a room if they have permission to send the m.room.encryption
-     * state event.
-     *
-     * @sa https://spec.matrix.org/v1.5/client-server-api/#mroomencryption
-     */
-    Q_PROPERTY(bool canEncryptRoom READ canEncryptRoom NOTIFY canEncryptRoomChanged)
-
-    /**
-     * @brief The default power level in the room for new users.
-     */
-    Q_PROPERTY(int defaultUserPowerLevel READ defaultUserPowerLevel WRITE setDefaultUserPowerLevel NOTIFY defaultUserPowerLevelChanged)
-
-    /**
-     * @brief The power level required to invite users to the room.
-     */
-    Q_PROPERTY(int invitePowerLevel READ invitePowerLevel WRITE setInvitePowerLevel NOTIFY invitePowerLevelChanged)
-
-    /**
-     * @brief The power level required to kick users from the room.
-     */
-    Q_PROPERTY(int kickPowerLevel READ kickPowerLevel WRITE setKickPowerLevel NOTIFY kickPowerLevelChanged)
-
-    /**
-     * @brief The power level required to ban users from the room.
-     */
-    Q_PROPERTY(int banPowerLevel READ banPowerLevel WRITE setBanPowerLevel NOTIFY banPowerLevelChanged)
-
-    /**
-     * @brief The power level required to delete other user messages.
-     */
-    Q_PROPERTY(int redactPowerLevel READ redactPowerLevel WRITE setRedactPowerLevel NOTIFY redactPowerLevelChanged)
-
-    /**
-     * @brief The default power level for state events that are not explicitly specified.
-     */
-    Q_PROPERTY(int statePowerLevel READ statePowerLevel WRITE setStatePowerLevel NOTIFY statePowerLevelChanged)
-
-    /**
-     * @brief The default power level for event that are not explicitly specified.
-     */
-    Q_PROPERTY(int defaultEventPowerLevel READ defaultEventPowerLevel WRITE setDefaultEventPowerLevel NOTIFY defaultEventPowerLevelChanged)
-
-    /**
-     * @brief The power level required to change power levels for the room.
-     */
-    Q_PROPERTY(int powerLevelPowerLevel READ powerLevelPowerLevel WRITE setPowerLevelPowerLevel NOTIFY powerLevelPowerLevelChanged)
-
-    /**
-     * @brief The power level required to change the room name.
-     */
-    Q_PROPERTY(int namePowerLevel READ namePowerLevel WRITE setNamePowerLevel NOTIFY namePowerLevelChanged)
-
-    /**
-     * @brief The power level required to change the room avatar.
-     */
-    Q_PROPERTY(int avatarPowerLevel READ avatarPowerLevel WRITE setAvatarPowerLevel NOTIFY avatarPowerLevelChanged)
-
-    /**
-     * @brief The power level required to change the room aliases.
-     */
-    Q_PROPERTY(int canonicalAliasPowerLevel READ canonicalAliasPowerLevel WRITE setCanonicalAliasPowerLevel NOTIFY canonicalAliasPowerLevelChanged)
-
-    /**
-     * @brief The power level required to change the room topic.
-     */
-    Q_PROPERTY(int topicPowerLevel READ topicPowerLevel WRITE setTopicPowerLevel NOTIFY topicPowerLevelChanged)
-
-    /**
-     * @brief The power level required to encrypt the room.
-     */
-    Q_PROPERTY(int encryptionPowerLevel READ encryptionPowerLevel WRITE setEncryptionPowerLevel NOTIFY encryptionPowerLevelChanged)
-
-    /**
-     * @brief The power level required to change the room history visibility.
-     */
-    Q_PROPERTY(int historyVisibilityPowerLevel READ historyVisibilityPowerLevel WRITE setHistoryVisibilityPowerLevel NOTIFY historyVisibilityPowerLevelChanged)
-
-    /**
-     * @brief The power level required to pin events in the room.
-     */
-    Q_PROPERTY(int pinnedEventsPowerLevel READ pinnedEventsPowerLevel WRITE setPinnedEventsPowerLevel NOTIFY pinnedEventsPowerLevelChanged)
-
-    /**
-     * @brief The power level required to upgrade the room.
-     */
-    Q_PROPERTY(int tombstonePowerLevel READ tombstonePowerLevel WRITE setTombstonePowerLevel NOTIFY tombstonePowerLevelChanged)
-
-    /**
-     * @brief The power level required to set the room server access control list (ACL).
-     */
-    Q_PROPERTY(int serverAclPowerLevel READ serverAclPowerLevel WRITE setServerAclPowerLevel NOTIFY serverAclPowerLevelChanged)
-
-    /**
-     * @brief The power level required to add children to a space.
-     */
-    Q_PROPERTY(int spaceChildPowerLevel READ spaceChildPowerLevel WRITE setSpaceChildPowerLevel NOTIFY spaceChildPowerLevelChanged)
-
-    /**
-     * @brief The power level required to set the room parent space.
-     */
-    Q_PROPERTY(int spaceParentPowerLevel READ spaceParentPowerLevel WRITE setSpaceParentPowerLevel NOTIFY spaceParentPowerLevelChanged)
-
-    /**
-     * @brief The current text in the chatbox for the room.
-     *
-     * Due to problems with QTextDocument, unlike the other properties here,
-     * chatBoxText is *not* used to store the text when switching rooms.
-     */
-    Q_PROPERTY(QString chatBoxText READ chatBoxText WRITE setChatBoxText NOTIFY chatBoxTextChanged)
-
-    /**
-     * @brief The text for any message currently being edited in the room.
-     */
-    Q_PROPERTY(QString editText READ editText WRITE setEditText NOTIFY editTextChanged)
-
-    /**
-     * @brief The event id of a message being replied to.
-     *
-     * Will be QString() if not replying to a message.
-     */
-    Q_PROPERTY(QString chatBoxReplyId READ chatBoxReplyId WRITE setChatBoxReplyId NOTIFY chatBoxReplyIdChanged)
-
-    /**
-     * @brief The event id of a message being edited.
-     *
-     * Will be QString() if not editing to a message.
-     */
-    Q_PROPERTY(QString chatBoxEditId READ chatBoxEditId WRITE setChatBoxEditId NOTIFY chatBoxEditIdChanged)
-
-    /**
-     * @brief Get the user object for the message being replied to.
-     *
-     * Returns a nullptr if not replying to a message.
-     */
-    Q_PROPERTY(NeoChatUser *chatBoxReplyUser READ chatBoxReplyUser NOTIFY chatBoxReplyIdChanged)
-
-    /**
-     * @brief The content of the message being replied to.
-     *
-     * Will be QString() if not replying to a message.
-     */
-    Q_PROPERTY(QString chatBoxReplyMessage READ chatBoxReplyMessage NOTIFY chatBoxReplyIdChanged)
-
-    /**
-     * @brief Get the user object for the message being edited.
-     *
-     * Returns a nullptr if not editing a message.
-     */
-    Q_PROPERTY(NeoChatUser *chatBoxEditUser READ chatBoxEditUser NOTIFY chatBoxEditIdChanged)
-
-    /**
-     * @brief The content of the message being edited.
-     *
-     * Will be QString() if not editing a message.
-     */
-    Q_PROPERTY(QString chatBoxEditMessage READ chatBoxEditMessage NOTIFY chatBoxEditIdChanged)
-
-    /**
-     * @brief The file path of the attachment to be sent.
-     */
-    Q_PROPERTY(QString chatBoxAttachmentPath READ chatBoxAttachmentPath WRITE setChatBoxAttachmentPath NOTIFY chatBoxAttachmentPathChanged)
-
 public:
-    /**
-     * @brief Define the types on inline messages that can be shown.
-     */
    enum MessageType {
-        Positive, /**< Positive message, typically green. */
-        Info, /**< Info message, typically highlight color. */
-        Error, /**< Error message, typically red. */
+        Positive,
+        Info,
+        Error,
    };
    Q_ENUM(MessageType);

    explicit NeoChatRoom(Quotient::Connection *connection, QString roomId, Quotient::JoinState joinState = {});

-    /**
-     * @brief Get a list of users in the context of this room.
-     *
-     * This is different to getting a list of NeoChatUser objects or Quotient::User objects
-     * as neither of those can provide details like the displayName or avatarMediaId
-     * without the room context as these can vary from room to room. This function
-     * provides the room context and returns the result as a list of QVariantMap objects.
-     *
-     * @param keyword filters the users based on the displayname containing keyword.
-     * @param limit max number of user returned, -1 is infinite.
-     *
-     * @return a QVariantList containing a QVariantMap for each user with the following
-     * properties:
-     *  - id - User ID.
-     *  - displayName - Display name in the context of this room.
-     *  - avatarMediaId - Avatar id in the context of this room.
-     *  - color - Color for the user.
-     *
-     * @sa Quotient::User, NeoChatUser
-     */
-    Q_INVOKABLE [[nodiscard]] QVariantList getUsers(const QString &keyword, int limit = -1) const;
-
-    /**
-     * @brief Get a user in the context of this room.
-     *
-     * This is different to getting a NeoChatUser object or Quotient::User object
-     * as neither of those can provide details like the displayName or avatarMediaId
-     * without the room context as these can vary from room to room. This function
-     * provides the room context and outputs the result as QVariantMap.
-     *
-     * @param userID the ID of the user to output.
-     *
-     * @return a QVariantMap for the user with the following properties:
-     *  - id - User ID.
-     *  - displayName - Display name in the context of this room.
-     *  - avatarMediaId - Avatar id in the context of this room.
-     *  - color - Color for the user.
-     *
-     * @sa Quotient::User, NeoChatUser
-     */
-    Q_INVOKABLE [[nodiscard]] QVariantMap getUser(const QString &userID) const;
-
    [[nodiscard]] QVariantList getUsersTyping() const;

-    [[nodiscard]] QDateTime lastActiveTime();
+    /// Get the interesting last event.
+    ///
+    /// This function respect the showLeaveJoinEvent setting and discard
+    /// other not interesting events. This function can return an empty pointer
+    /// when the room is empty of RoomMessageEvent.
+    [[nodiscard]] const Quotient::RoomEvent *lastEvent(bool ignoreStateEvent = false) const;

-    /**
-     * @brief Get the last interesting event.
-     *
-     * This function respects the user's state event setting and discards
-     * other not interesting events.
-     *
-     * @warning This function can return an empty pointer if the room does not have
-     *          any RoomMessageEvents loaded.
-     */
-    [[nodiscard]] const Quotient::RoomEvent *lastEvent() const;
+    /// Convenient way to get the last event but in a string format.
+    ///
+    /// \see lastEvent
+    /// \see lastEventIsSpoiler
+    [[nodiscard]] QString lastEventToString() const;

-    /**
-     * @brief Output a string for the message content ready for display.
-     *
-     * The output string is dependant upon the event type and the desired output format.
-     *
-     * For most messages this is the body content of the message. For media messages
-     * This will be the caption and for state events it will be a string specific
-     * to that event with some dynamic details about the event added.
-     *
-     * E.g. For a room topic state event the text will be:
-     *      "set the topic to: <new topic text>"
-     *
-     * @param evt the event for which a string is desired.
-     * @param format the output format, usually Qt::PlainText or Qt::RichText.
-     * @param stripNewlines whether the output should have new lines in it.
-     */
-    [[nodiscard]] QString eventToString(const Quotient::RoomEvent &evt, Qt::TextFormat format = Qt::PlainText, bool stripNewlines = false) const;
-
-    /**
-     * @brief Output a generic string for the message content ready for display.
-     *
-     * The output string is dependant upon the event type.
-     *
-     * Unlike NeoChatRoom::eventToString the string is the same for all events of
-     * the same type
-     *
-     * E.g. For a message the text will be:
-     *      "sent a message"
-     *
-     * @sa eventToString()
-     */
-    [[nodiscard]] QString eventToGenericString(const Quotient::RoomEvent &evt) const;
-
-    /**
-     * @brief Convenient way to call eventToString on the last event.
-     *
-     * @sa lastEvent()
-     * @sa eventToString()
-     */
-    [[nodiscard]] QString lastEventToString(Qt::TextFormat format = Qt::PlainText, bool stripNewlines = false) const;
-
-    /**
-     * @brief Convenient way to check if the last event looks like it has spoilers.
-     *
-     * This does a basic check to see if the message contains a data-mx-spoiler
-     * attribute within the text which makes it likely that the message has a spoiler
-     * section. However this is not 100% reliable as during parsing it may be
-     * removed if used within an illegal tag or on a tag for which data-mx-spoiler
-     * is not a valid attribute.
-     *
-     * @sa lastEvent()
-     */
+    /// Convenient way to check if the last event looks like it has spoilers.
+    ///
+    /// \see lastEvent
+    /// \see lastEventToString
    [[nodiscard]] bool lastEventIsSpoiler() const;

-    [[nodiscard]] bool hasFileUploading() const;
-    void setHasFileUploading(bool value);
+    /// Convenient way to get the QDateTime of the last event.
+    ///
+    /// \see lastEvent
+    [[nodiscard]] QDateTime lastActiveTime();

-    [[nodiscard]] int fileUploadingProgress() const;
-    void setFileUploadingProgress(int value);
-
-    /**
-     * @brief Download a file for the given event to a local file location.
-     */
-    Q_INVOKABLE void download(const QString &eventId, const QUrl &localFilename = {});
-
-    /**
-     * @brief Download a file for the given event as a temporary file.
-     */
-    Q_INVOKABLE bool downloadTempFile(const QString &eventId);
-
-    /**
-     * @brief Check if the given event is highlighted.
-     *
-     * An event is highlighted if it contains the local user's id but was not sent by the
-     * local user.
-     */
-    bool isEventHighlighted(const Quotient::RoomEvent *e) const;
-
-    /**
-     * @brief Convenience function to find out if the room contains the given user.
-     *
-     * A room contains the user if the user can be found and their JoinState is
-     * not JoinState::Leave.
-     */
-    Q_INVOKABLE [[nodiscard]] bool containsUser(const QString &userID) const;
-
-    /**
-     * @brief True if the given user ID is banned from the room.
-     */
-    Q_INVOKABLE [[nodiscard]] bool isUserBanned(const QString &user) const;
-
-    /**
-     * @brief True if the local user can send the given event type.
-     */
-    Q_INVOKABLE [[nodiscard]] bool canSendEvent(const QString &eventType) const;
-
-    /**
-     * @brief True if the local user can send the given state event type.
-     */
-    Q_INVOKABLE [[nodiscard]] bool canSendState(const QString &eventType) const;
-
-    /**
-     * @brief Send a report to the server for an event.
-     *
-     * @param eventId the ID of the event being reported.
-     * @param reason the reason given for reporting the event.
-     */
-    Q_INVOKABLE void reportEvent(const QString &eventId, const QString &reason);
-
-    [[nodiscard]] bool readMarkerLoaded() const;
-
-    QString htmlSafeDisplayName() const;
-
-#ifndef QUOTIENT_07
-    /**
-     * @brief Get a display name for the user with html escaped.
-     */
-    Q_INVOKABLE QString htmlSafeMemberName(const QString &userId) const
-    {
-        return safeMemberName(userId).toHtmlEscaped();
-    }
-#endif
-
-    /**
-     * @brief Get subtitle text for room
-     *
-     * Fetches last event and removes markdown formatting
-     *
-     * @see lastEventToString()
-     */
+    /// Get subtitle text for room
+    ///
+    /// Fetches last event and removes markdown formatting
+    /// \see lastEventToString
    [[nodiscard]] QString subtitleText();

-    [[nodiscard]] QString avatarMediaId() const;
-
-    NeoChatUser *directChatRemoteUser() const;
-
    [[nodiscard]] bool isSpace();

-    bool isInvite() const;
-
-    Q_INVOKABLE void clearInvitationNotification();
+    bool isEventHighlighted(const Quotient::RoomEvent *e) const;

    [[nodiscard]] QString joinRule() const;
    void setJoinRule(const QString &joinRule);

-    int maxRoomVersion() const;
-
-    /**
-     * @brief Map an alias to the room and publish.
-     *
-     * The alias is first mapped to the room and then published as an
-     * alternate alias. Publishing the alias will fail if the user does not have
-     * permission to send m.room.canonical_alias event messages.
-     *
-     * @note This is different to Quotient::Room::setLocalAliases() as that can only
-     * get the room to publish an alias that is already mapped.
-     *
-     * @property alias QString in the form #new_alias:server.org
-     *
-     * @sa Quotient::Room::setLocalAliases()
-     */
-    Q_INVOKABLE void mapAlias(const QString &alias);
-
-    /**
-     * @brief Unmap an alias from the room.
-     *
-     * An unmapped alias is also removed as either the canonical alias or an alternate
-     * alias.
-     *
-     * @note This is different to Quotient::Room::setLocalAliases() as that can only
-     * get the room to un-publish an alias, while the mapping still exists.
-     *
-     * @property alias QString in the form #mapped_alias:server.org
-     *
-     * @sa Quotient::Room::setLocalAliases()
-     */
-    Q_INVOKABLE void unmapAlias(const QString &alias);
-
-    /**
-     * @brief Set the canonical alias of the room to an available mapped alias.
-     *
-     * If the new alias was already published as an alternate alias it will be removed
-     * from that list.
-     *
-     * @note This is an overload of the function Quotient::Room::setCanonicalAlias().
-     * This is to provide the functionality to remove the new canonical alias as a
-     * published alt alias when set.
-     *
-     * @property newAlias QString in the form #new_alias:server.org
-     *
-     * @sa Quotient::Room::setCanonicalAlias()
-     * */
-    Q_INVOKABLE void setCanonicalAlias(const QString &newAlias);
-
-    PushNotificationState::State pushNotificationState() const;
-    void setPushNotificationState(PushNotificationState::State state);
-
    [[nodiscard]] QString historyVisibility() const;
    void setHistoryVisibility(const QString &historyVisibilityRule);

-    [[nodiscard]] bool defaultUrlPreviewState() const;
-    void setDefaultUrlPreviewState(const bool &defaultUrlPreviewState);
-
-    [[nodiscard]] bool urlPreviewEnabled() const;
-    void setUrlPreviewEnabled(const bool &urlPreviewEnabled);
-
-    bool canEncryptRoom() const;
-
-    /**
-     * @brief Get the power level for the given user ID in the room.
-     *
-     * Returns the default value for a user in the room if they have no escalated
-     * privileges or if they are not a member so membership should be known before using.
-     */
-    Q_INVOKABLE [[nodiscard]] int getUserPowerLevel(const QString &userId) const;
-
    Q_INVOKABLE void setUserPowerLevel(const QString &userID, const int &powerLevel);

    [[nodiscard]] int powerLevel(const QString &eventName, const bool &isStateEvent = false) const;
@@ -694,6 +214,65 @@ public:
    [[nodiscard]] int spaceParentPowerLevel() const;
    void setSpaceParentPowerLevel(const int &newPowerLevel);

+    [[nodiscard]] bool hasFileUploading() const
+    {
+        return m_hasFileUploading;
+    }
+    void setHasFileUploading(bool value)
+    {
+        if (value == m_hasFileUploading) {
+            return;
+        }
+        m_hasFileUploading = value;
+        Q_EMIT hasFileUploadingChanged();
+    }
+
+    [[nodiscard]] int fileUploadingProgress() const
+    {
+        return m_fileUploadingProgress;
+    }
+    void setFileUploadingProgress(int value)
+    {
+        if (m_fileUploadingProgress == value) {
+            return;
+        }
+        m_fileUploadingProgress = value;
+        Q_EMIT fileUploadingProgressChanged();
+    }
+
+    [[nodiscard]] bool readMarkerLoaded() const;
+
+    Q_INVOKABLE [[nodiscard]] int savedTopVisibleIndex() const;
+    Q_INVOKABLE [[nodiscard]] int savedBottomVisibleIndex() const;
+    Q_INVOKABLE void saveViewport(int topIndex, int bottomIndex);
+
+    Q_INVOKABLE [[nodiscard]] QVariantList getUsers(const QString &keyword, int limit = -1) const;
+    Q_INVOKABLE [[nodiscard]] QVariantMap getUser(const QString &userID) const;
+
+    Q_INVOKABLE QUrl urlToMxcUrl(const QUrl &mxcUrl);
+
+    [[nodiscard]] QString avatarMediaId() const;
+
+    [[nodiscard]] QString eventToString(const Quotient::RoomEvent &evt, Qt::TextFormat format = Qt::PlainText, bool removeReply = true) const;
+    [[nodiscard]] QString eventToGenericString(const Quotient::RoomEvent &evt) const;
+
+    Q_INVOKABLE [[nodiscard]] bool containsUser(const QString &userID) const;
+    Q_INVOKABLE [[nodiscard]] bool isUserBanned(const QString &user) const;
+
+    Q_INVOKABLE [[nodiscard]] bool canSendEvent(const QString &eventType) const;
+    Q_INVOKABLE [[nodiscard]] bool canSendState(const QString &eventType) const;
+
+    bool isInvite() const;
+
+    Q_INVOKABLE QString htmlSafeName() const;
+    Q_INVOKABLE QString htmlSafeDisplayName() const;
+    Q_INVOKABLE void clearInvitationNotification();
+    Q_INVOKABLE void reportEvent(const QString &eventId, const QString &reason);
+
+    Q_INVOKABLE void setPushNotificationState(PushNotificationState::State state);
+
+    Q_INVOKABLE void download(const QString &eventId, const QUrl &localFilename = {});
+
    QString chatBoxText() const;
    void setChatBoxText(const QString &text);

@@ -715,37 +294,42 @@ public:
    QString chatBoxAttachmentPath() const;
    void setChatBoxAttachmentPath(const QString &attachmentPath);

-    /**
-     * @brief Retrieve the mentions for the current chatbox text.
-     */
    QVector<Mention> *mentions();

    /**
-     * @brief Retrieve the mentions for the current edit text.
+     * @brief Vector of mentions in the current edit text.
     */
    QVector<Mention> *editMentions();

-    /**
-     * @brief Get the saved chatbox text for the room.
-     */
    QString savedText() const;
-
-    /**
-     * @brief Save the chatbox text for the room.
-     */
    void setSavedText(const QString &savedText);

-    /**
-     * @brief Get a PollHandler object for the given event Id.
+    bool canEncryptRoom() const;
+
+    Q_INVOKABLE bool downloadTempFile(const QString &eventId);
+
+    /*
+     * Map an alias to the room
     *
-     * Will return an existing PollHandler if one already exists for the event ID.
-     * A new PollHandler will be created if one doesn't exist.
-     *
-     * @note Requires libQuotient 0.7.
-     *
-     * @sa PollHandler
+     * Note: this is different to setLocalAliases as that can only
+     * get the room to publish and alias that is already mapped.
     */
+    Q_INVOKABLE void mapAlias(const QString &alias);
+    Q_INVOKABLE void unmapAlias(const QString &alias);
+    Q_INVOKABLE void setCanonicalAlias(const QString &newAlias);
+
+#ifdef QUOTIENT_07
    Q_INVOKABLE PollHandler *poll(const QString &eventId);
+#endif
+
+#ifndef QUOTIENT_07
+    Q_INVOKABLE QString htmlSafeMemberName(const QString &userId) const
+    {
+        return safeMemberName(userId).toHtmlEscaped();
+    }
+#endif
+
+    int maxRoomVersion() const;

 private:
    QSet<const Quotient::RoomEvent *> highlights;
@@ -773,7 +357,9 @@ private:
    QVector<Mention> m_mentions;
    QVector<Mention> m_editMentions;
    QString m_savedText;
+#ifdef QUOTIENT_07
    QCache<QString, PollHandler> m_polls;
+#endif

 private Q_SLOTS:
    void countChanged();
@@ -799,8 +385,6 @@ Q_SIGNALS:
    void canEncryptRoomChanged();
    void joinRuleChanged();
    void historyVisibilityChanged();
-    void defaultUrlPreviewStateChanged();
-    void urlPreviewEnabledChanged();
    void maxRoomVersionChanged();
    void defaultUserPowerLevelChanged();
    void invitePowerLevelChanged();
@@ -823,78 +407,26 @@ Q_SIGNALS:
    void spaceParentPowerLevelChanged();

 public Q_SLOTS:
-    /**
-     * @brief Upload a file to the matrix server and post the file to the room.
-     *
-     * @param url the location of the file to be uploaded.
-     * @param body the caption that is to be given to the file.
-     */
    void uploadFile(const QUrl &url, const QString &body = QString());
-
-    /**
-     * @brief Accept an invitation for the local user to join the room.
-     */
    void acceptInvitation();
-
-    /**
-     * @brief Leave and forget the room for the local user.
-     *
-     * @note This means that not only will the user no longer receive events in
-     *       the room but the will forget any history up to this point.
-     *
-     * @sa https://spec.matrix.org/latest/client-server-api/#leaving-rooms
-     */
    void forget();
-
-    /**
-     * @brief Set the typing notification state on the room for the local user.
-     */
    void sendTypingNotification(bool isTyping);

-    /**
-     * @brief Send a message to the room.
-     *
-     * @param rawText the text as it was typed.
-     * @param cleanedText the text marked up as html.
-     * @param type the type of message being sent.
-     * @param replyEventId the id of the message being replied to if a reply.
-     * @param relateToEventId the id of the message being edited if an edit.
-     */
+    /// @param rawText The text as it was typed.
+    /// @param cleanedText The text with link to the users.
    void postMessage(const QString &rawText,
                     const QString &cleanedText,
                     Quotient::MessageEventType type = Quotient::MessageEventType::Text,
                     const QString &replyEventId = QString(),
                     const QString &relateToEventId = QString());
-
-    /**
-     * @brief Send an html message to the room.
-     *
-     * @param text the text as it was typed.
-     * @param html the text marked up as html.
-     * @param type the type of message being sent.
-     * @param replyEventId the id of the message being replied to if a reply.
-     * @param relateToEventId the id of the message being edited if an edit.
-     */
    void postHtmlMessage(const QString &text,
                         const QString &html,
                         Quotient::MessageEventType type = Quotient::MessageEventType::Text,
                         const QString &replyEventId = QString(),
                         const QString &relateToEventId = QString());
-
-    /**
-     * @brief Set the room avatar.
-     */
    void changeAvatar(const QUrl &localFile);
-
-    /**
-     * @brief Toggle the reaction state of the given reaction for the local user.
-     */
+    void addLocalAlias(const QString &alias);
+    void removeLocalAlias(const QString &alias);
    void toggleReaction(const QString &eventId, const QString &reaction);
-
-    /**
-     * @brief Delete recent messages by the given user.
-     *
-     * This will delete all messages by that user in this room that are currently loaded.
-     */
    void deleteMessagesByUser(const QString &user, const QString &reason);
 };
--- a/src/notificationsmanager.cpp
+++ b/src/notificationsmanager.cpp
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2020 Tobias Fella <tobias.fella@kde.org>
+// SPDX-FileCopyrightText: 2020 Tobias Fella <fella@posteo.de>
 // SPDX-License-Identifier: GPL-2.0-or-later

 #include "notificationsmanager.h"
@@ -11,18 +11,22 @@
 #include <KNotification>
 #include <KNotificationReplyAction>

+#ifdef QUOTIENT_07
 #include <accountregistry.h>
+#else
+#include "neochataccountregistry.h"
+#endif

 #include <connection.h>
 #include <csapi/pushrules.h>
 #include <jobs/basejob.h>
 #include <user.h>

+#include "actionshandler.h"
 #include "controller.h"
 #include "neochatconfig.h"
 #include "neochatroom.h"
 #include "roommanager.h"
-#include "texthandler.h"
 #include "windowcontroller.h"

 using namespace Quotient;
@@ -68,7 +72,11 @@ void NotificationsManager::postNotification(NeoChatRoom *room,
    connect(notification, &KNotification::defaultActivated, this, [=]() {
        WindowController::instance().showAndRaiseWindow(notification->xdgActivationToken());
        if (room->localUser()->id() != Controller::instance().activeConnection()->userId()) {
+#ifdef QUOTIENT_07
            Controller::instance().setActiveConnection(Accounts.get(room->localUser()->id()));
+#else
+            Controller::instance().setActiveConnection(AccountRegistry::instance().get(room->localUser()->id()));
+#endif
        }
        RoomManager::instance().enterRoom(room);
    });
@@ -77,9 +85,7 @@ void NotificationsManager::postNotification(NeoChatRoom *room,
        std::unique_ptr<KNotificationReplyAction> replyAction(new KNotificationReplyAction(i18n("Reply")));
        replyAction->setPlaceholderText(i18n("Reply..."));
        connect(replyAction.get(), &KNotificationReplyAction::replied, this, [room, replyEventId](const QString &text) {
-            TextHandler textHandler;
-            textHandler.setData(text);
-            room->postMessage(text, textHandler.handleSendText(), RoomMessageEvent::MsgType::Text, replyEventId, QString());
+            room->postMessage(text, markdownToHTML(text), RoomMessageEvent::MsgType::Text, replyEventId, QString());
        });
        notification->setReplyAction(std::move(replyAction));
    }
--- a/src/notificationsmanager.h
+++ b/src/notificationsmanager.h
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2020 Tobias Fella <tobias.fella@kde.org>
+// SPDX-FileCopyrightText: 2020 Tobias Fella <fella@posteo.de>
 // SPDX-License-Identifier: GPL-2.0-or-later

 #pragma once
--- a/Show More
+++ b/Show More