Make the show avatar in roomlist page use the correct config setting.

2022-12-27 10:04:54 +00:00
155 changed files with 31008 additions and 50801 deletions
--- a/.flatpak-manifest.json
+++ b/.flatpak-manifest.json
@@ -2,7 +2,7 @@
    "id": "org.kde.neochat",
    "branch": "master",
    "runtime": "org.kde.Platform",
-    "runtime-version": "5.15-22.08",
+    "runtime-version": "5.15-21.08",
    "sdk": "org.kde.Sdk",
    "command": "neochat",
    "tags": [
--- a/.gitignore
+++ b/.gitignore
@@ -9,4 +9,3 @@ compile_commands.json
 kate.project.ctags.*
 *.user
 .flatpak-builder/
-.idea/
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,11 +4,9 @@
 include:
  - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/reuse-lint.yml
  - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/android.yml
-  - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/android-qt6.yml
  - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/linux.yml
-  - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/linux-qt6.yml
+# TODO enable once we can have qt6 libQuotient on the CI
+#  - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/linux-qt6.yml
  - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/windows.yml
-  - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/windows-qt6.yml
  - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/freebsd.yml
-#  - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/freebsd-qt6.yml
  - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/flatpak.yml
--- a/.kde-ci.yml
+++ b/.kde-ci.yml
@@ -18,7 +18,6 @@ Dependencies:
    'third-party/libquotient': '@latest'
    'third-party/qtkeychain': '@latest'
    'third-party/cmark': '@latest'
-    'third-party/qcoro': '@latest'
 - 'on': ['Windows', 'Linux', 'FreeBSD']
  'require':
    'frameworks/qqc2-desktop-style': '@stable'
@@ -30,4 +29,4 @@ Dependencies:
    'frameworks/kdbusaddons': '@stable'

 Options:
-  require-passing-tests-on: [ 'Linux/Qt5', 'FreeBSD', 'Windows' ]
+  require-passing-tests-on: [ 'Linux', 'FreeBSD', 'Windows' ]
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,19 +6,11 @@

 cmake_minimum_required(VERSION 3.16)

-# KDE Applications version, managed by release script.
-set(RELEASE_SERVICE_VERSION_MAJOR "23")
-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})
+project(NeoChat)
+set(PROJECT_VERSION "22.11")

 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 ${KF5_MIN_VERSION} REQUIRED NO_MODULE)

@@ -130,8 +122,6 @@ set_package_properties(KF5DocTools PROPERTIES DESCRIPTION
    TYPE OPTIONAL
 )

-find_package(Sqlite3)
-
 if(NOT Quotient_VERSION_MINOR GREATER 6)
    cmake_policy(SET CMP0063 OLD)
 endif()
--- a/LICENSES/MIT.txt
+++ b/LICENSES/MIT.txt
--- a/android/AndroidManifest.xml
+++ b/android/AndroidManifest.xml
@@ -14,8 +14,7 @@
                  android:name="org.qtproject.qt5.android.bindings.QtActivity"
                  android:label="NeoChat"
                  android:windowSoftInputMode="adjustResize"
-                  android:launchMode="singleTop"
-                  android:exported="true">
+                  android:launchMode="singleTop">

            <intent-filter>
                <action android:name="android.intent.action.MAIN"/>
@@ -23,6 +22,7 @@
            </intent-filter>

            <meta-data android:name="android.app.lib_name" android:value="neochat-app"/>
+            <meta-data android:name="android.app.qt_sources_resource_id" android:resource="@array/qt_sources"/>
            <meta-data android:name="android.app.repository" android:value="default"/>
            <meta-data android:name="android.app.qt_libs_resource_id" android:resource="@array/qt_libs"/>
            <meta-data android:name="android.app.bundled_libs_resource_id" android:resource="@array/bundled_libs"/>
@@ -38,6 +38,8 @@
            <meta-data android:name="android.app.load_local_jars" android:value="-- %%INSERT_LOCAL_JARS%% --"/>
            <meta-data android:name="android.app.static_init_classes" android:value="-- %%INSERT_INIT_CLASSES%% --"/>
            <!--  Messages maps -->
+            <meta-data android:value="@string/ministro_not_found_msg" android:name="android.app.ministro_not_found_msg"/>
+            <meta-data android:value="@string/ministro_needed_msg" android:name="android.app.ministro_needed_msg"/>
            <meta-data android:value="@string/fatal_error_msg" android:name="android.app.fatal_error_msg"/>

            <!-- Splash screen -->
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -12,7 +12,7 @@ buildscript {
    }

    dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.2'
+        classpath 'com.android.tools.build:gradle:3.6.4'
    }
 }

@@ -73,10 +73,6 @@ android {
    defaultConfig {
        minSdkVersion qtMinSdkVersion
        targetSdkVersion qtTargetSdkVersion
-        applicationId "org.kde.neochat"
-        namespace "org.kde.neochat"
-        versionCode timestamp
-        versionName projectVersionFull
        manifestPlaceholders = [versionName: projectVersionFull, versionCode: timestamp]
    }

--- a/autotests/neochatroomtest.cpp
+++ b/autotests/neochatroomtest.cpp
@@ -5,7 +5,9 @@
 #include <QSignalSpy>
 #include <QTest>

+#define protected public // please don't hate me
 #include "neochatroom.h"
+#undef protected

 #include <connection.h>
 #include <quotient_common.h>
@@ -13,23 +15,12 @@

 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 NeoChatRoomTest : public QObject {
    Q_OBJECT

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

 private Q_SLOTS:
    void initTestCase();
@@ -40,7 +31,7 @@ private Q_SLOTS:
 void NeoChatRoomTest::initTestCase()
 {
    connection = Connection::makeMockConnection(QStringLiteral("@bob:kde.org"));
-    room = new TestRoom(connection, QStringLiteral("#myroom:kde.org"), JoinState::Join);
+    room = new NeoChatRoom(connection, QStringLiteral("#myroom:kde.org"), JoinState::Join);

    auto json = QJsonDocument::fromJson(R"EVENT({
  "account_data": {
@@ -130,7 +121,7 @@ void NeoChatRoomTest::initTestCase()
  }
 })EVENT");
    SyncRoomData roomData(QStringLiteral("@bob:kde.org"), JoinState::Join, json.object());
-    room->update(std::move(roomData));
+    room->updateData(std::move(roomData));
 }

 void NeoChatRoomTest::subtitleTextTest()
--- a/org.kde.neochat.appdata.xml
+++ b/org.kde.neochat.appdata.xml
@@ -16,7 +16,6 @@
  <name xml:lang="ca-valencia">NeoChat</name>
  <name xml:lang="cs">NeoChat</name>
  <name xml:lang="de">NeoChat</name>
-  <name xml:lang="el">NeoChat</name>
  <name xml:lang="en-GB">NeoChat</name>
  <name xml:lang="es">NeoChat</name>
  <name xml:lang="eu">NeoChat</name>
@@ -51,7 +50,6 @@
  <summary xml:lang="ca-valencia">Un client per a Matrix, el protocol de comunicacions descentralitzat</summary>
  <summary xml:lang="cs">Klient pro decentralizovaný komunikační protokol matrix</summary>
  <summary xml:lang="de">Ein Programm für Matrix, das dezentrale Kommunikationsprotokoll</summary>
-  <summary xml:lang="el">Ένας πελάτης για το Matrix, το αποκεντρωμένο πρωτόκολλο επικοινωνίας</summary>
  <summary xml:lang="en-GB">A client for matrix, the decentralised communication protocol</summary>
  <summary xml:lang="es">Un cliente para Matrix, el protocolo de comunicaciones descentralizado</summary>
  <summary xml:lang="eu">Matrix, deszentralizatutako komunikazio protokolorako bezero bat</summary>
@@ -85,7 +83,6 @@
    <p xml:lang="ca">El NeoChat és un client de Matrix. Permet enviar missatges de text, fitxers de vídeo i d'àudio a la família, col·legues i amics usant el protocol Matrix.</p>
    <p xml:lang="ca-valencia">NeoChat és un client de Matrix. Permet enviar missatges de text, fitxers de vídeo i d'àudio a la família, col·legues i amics utilitzant el protocol Matrix.</p>
    <p xml:lang="de">NeoChat ist ein Matrix-Client. Er ermöglicht Ihnen das Senden von Textnachrichten, Videos und Audiodateien an Ihre Familie, Kollegen und Freunde unter Verwendung des Matrix-Protokolls.</p>
-    <p xml:lang="el">Το NeoChat είναι μια εφαρμογή του Matrix. Σας επιτρέπει να στέλνετε μηνύματα κειμένου, βίντεο και ήχο στην οικογένειά σας, σε συναδέλφους και φίλους με το πρωτόκολλο Matrix.</p>
    <p xml:lang="en-GB">NeoChat is a Matrix client. It allows you to send text messages, videos and audio files to your family, colleagues and friends using the Matrix protocol.</p>
    <p xml:lang="es">NeoChat es un cliente para Matrix. Le permite enviar mensajes de texto, vídeos y archivos de sonido a su familia, compañeros de trabajo y amigos usando el protocolo Matrix.</p>
    <p xml:lang="eu">NeoChat Matrix bezero bat da. Familiari, lankideei eta lagunei testu-mezuak, bideoak eta audio-fitxategiak bidaltzeko aukera ematen du, Matrix protokoloa erabiliz.</p>
@@ -116,7 +113,6 @@
    <p xml:lang="ca">Matrix és un protocol de comunicacions descentralitzat, que retorna el control a l'usuari. Actualment el NeoChat implementa una gran part del protocol amb l'excepció dels xats encriptats i els xats de vídeo.</p>
    <p xml:lang="ca-valencia">Matrix és un protocol de comunicacions descentralitzat, que retorna el control a l'usuari. Actualment NeoChat implementa una gran part del protocol amb l'excepció dels xats encriptats i els xats de vídeo.</p>
    <p xml:lang="de">Matrix ist ein dezentralisiertes Kommunikationsprotokoll, das dem Benutzer wieder die Kontrolle zurückgibt. Derzeit implementiert NeoChat einen großen Teil des Protokolls mit der Ausnahme von verschlüsselten Chats und Video-Chat.</p>
-    <p xml:lang="el">Το Matrix είναι ένα αποκεντρωμένο πρωτόκολλο επικοινωνίας, δίνοντας πίσω στον χρήστη τον έλεγχο. Προς το παρόν το NeoChat υλοποιεί ένα μεγάλο μέρος του πρωτοκόλλου με εξαίρεση τις κρυπτογραφημένες συνομιλίες και τη συνομιλία με βίντεο.</p>
    <p xml:lang="en-GB">Matrix is a decentralised communication protocol, putting the user back in control. Currently NeoChat implements large part of the protocol with the exception of encrypted chats and video chat.</p>
    <p xml:lang="es">Matrix es un protocolo de comunicaciones descentralizado, que devuelve el control al usuario. En la actualidad, NeoChat implementa gran parte del protocolo con la excepción de chats cifrados y chats de vídeo.</p>
    <p xml:lang="eu">Matrix komunikazio-protokolo deszentralizatu bat da, erabiltzaileari kontrola itzultzen diona. Gaur egun, NeoChat-ek protokoloaren zati handi bat inplementatzen du, berriketa zifratuak eta bideo berriketak izan ezik.</p>
@@ -146,8 +142,7 @@
    <p xml:lang="az">Vahid istifadəçi interfeysi ilə təmin olunan NeoChat, həm mobil telefonda həm də kompyuterlərdə işləyir.</p>
    <p xml:lang="ca">El NeoChat funciona en els mòbils i a l'escriptori, proporcionant una experiència d'usuari coherent.</p>
    <p xml:lang="ca-valencia">NeoChat funciona en els mòbils i en l'escriptori, proporcionant una experiència d'usuari coherent.</p>
-    <p xml:lang="de">NeoChat funktioniert sowohl auf Mobilgeräten als auch auf dem PC und bietet ein einheitliches Benutzererlebnis.</p>
-    <p xml:lang="el">Το NeoChat λειτουργεί και στα κινητά και στους υπολογιστές γραφείου παρέχοντας μια αδιάλειπτη εμπειρία χρήσης.</p>
+    <p xml:lang="de">NeoChat funktioniert sowohl auf dem Mobiltelefon als auch auf dem Arbeitsfläche und bietet ein einheitliches Benutzererlebnis. </p>
    <p xml:lang="en-GB">NeoChat works both on mobile and desktop while providing a consistent user experience.</p>
    <p xml:lang="es">NeoChat funciona en móviles y en el escritorio a la vez que proporciona una experiencia de usuario consistente.</p>
    <p xml:lang="eu">NeoChat mugikorretan eta mahaigainean dabil, erabiltzaile esperientzia koherentea eskainiz.</p>
@@ -185,7 +180,6 @@
  <developer_name xml:lang="ca-valencia">La comunitat KDE</developer_name>
  <developer_name xml:lang="cs">Komunita KDE</developer_name>
  <developer_name xml:lang="de">Die KDE-Gemeinschaft</developer_name>
-  <developer_name xml:lang="el">Η Κοινότητα του KDE</developer_name>
  <developer_name xml:lang="en-GB">The KDE Community</developer_name>
  <developer_name xml:lang="es">La comunidad KDE</developer_name>
  <developer_name xml:lang="eu">KDE komunitatea</developer_name>
@@ -216,7 +210,6 @@
  <project_license>GPL-3.0</project_license>
  <custom>
    <value key="KDE::matrix">#neochat:kde.org</value>
-    <value key="KDE::windows_store">https://www.microsoft.com/store/apps/9PNXWVNRC29H</value>
  </custom>
  <launchable type="desktop-id">org.kde.neochat.desktop</launchable>
  <screenshots>
@@ -231,20 +224,6 @@
    <content_attribute id="social-chat">intense</content_attribute>
  </content_rating>
  <releases>
-    <release version="23.01" date="2023-01-30">
-      <url>https://plasma-mobile.org/2023/01/30/january-blog-post/</url>
-      <description>
-        <p>New features and bugfixes:</p>
-        <ul>
-          <li>Notifications will now be shown for all accounts, not just the active one</li>
-          <li>There is a new "compact" mode for the room list</li>
-          <li>You can now search in the room history</li>
-          <li>Emojis and Reactions have been significantly improved</li>
-          <li>Fixed several crashes around user invitations</li>
-          <li>Room permission settings can now be configured</li>
-        </ul>
-      </description>
-    </release>
    <release version="22.11" date="2022-11-30">
      <url>https://plasma-mobile.org/2022/11/30/plasma-mobile-gear-22-11/</url>
    </release>
--- a/org.kde.neochat.desktop
+++ b/org.kde.neochat.desktop
@@ -9,7 +9,6 @@ Name[ca]=NeoChat
 Name[ca@valencia]=NeoChat
 Name[cs]=NeoChat
 Name[de]=NeoChat
-Name[el]=NeoChat
 Name[en_GB]=NeoChat
 Name[es]=NeoChat
 Name[eu]=NeoChat
@@ -46,7 +45,6 @@ GenericName[ca]=Client de Matrix
 GenericName[ca@valencia]=Client de Matrix
 GenericName[cs]=Klient protokolu Matrix
 GenericName[de]=Matrix-Programm
-GenericName[el]=Εφαρμογή του Matrix
 GenericName[en_GB]=Matrix Client
 GenericName[es]=Cliente para Matrix
 GenericName[eu]=Matrix bezeroa
@@ -82,7 +80,6 @@ Comment[az]=Matrix protokolu üçün müştəri
 Comment[ca]=Client per al protocol Matrix
 Comment[ca@valencia]=Client per al protocol Matrix
 Comment[de]=Programm für das Matrix-Protokoll
-Comment[el]=Πελάτης για το πρωτόκολλο Matrix
 Comment[en_GB]=Client for the Matrix protocol
 Comment[es]=Cliente para el protocolo Matrix
 Comment[eu]=Matrix protokolorako bezeroa
--- 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/docs/neochat/man-neochat.1.docbook
+++ b/po/it/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 % Italian "INCLUDE">
-]>
-<!--
-SPDX-FileCopyrightText: 2022 Carl Schwan <carl@carlschwan.eu>
-SPDX-License-Identifier: CC-BY-SA-4.0
-->
-
-<refentry lang="&language;">
-<refentryinfo>
-<title
->Manuale utente di NeoChat</title>
-<author
-><firstname
->Carl</firstname
-><surname
->Schwan</surname
-> <contrib
->Pagina man di NeoChat.</contrib
-> <email
->carl@carlschwan.eu</email
-></author>
-<date
->1/11/2022</date>
-<releaseinfo
->22.09</releaseinfo>
-<productname
->NeoChat</productname>
-</refentryinfo>
-
-<refmeta>
-  <refentrytitle>
-    <command
->neochat</command>
-  </refentrytitle>
-  <manvolnum
->1</manvolnum>
-</refmeta>
-
-<refnamediv>
-  <refname
->neochat</refname>
-  <refpurpose
->Client per l'interazione con il protocollo di messaggistica matrix</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
->Descrizione</title>
-  <para
-><command
->neochat</command
-> è un'applicazione di chat per il protocollo Matrix che funziona sia su desktop che su dispositivi mobili. </para>
-</refsect1>
-
-<refsect1 id="options"
-><title
->Opzioni</title>
-<variablelist>
-  <varlistentry>
-  <term
-><option
->URI</option
-></term>
-  <listitem>
-    <para
->L'URI matrix per un utente o una stanza. ad esempio matrix:u/utente:esempio.org e matrix:r/stanza:esempio.org. Questo farà in modo che NeoChat provi ad aprire la stanza o la conversazione specificata. </para>
-  </listitem>
-  </varlistentry>
-</variablelist>
-</refsect1>
-
-<refsect1 id="bug">
-  <title
->Segnalazione bug</title>
-  <para
->Puoi segnalare bug e richiedere funzionalità su <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
-></para>
-</refsect1>
-
-<refsect1>
-  <title
->Vedi anche</title>
-  <simplelist>
-    <member
->Un elenco di domande frequenti su Matrix <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
->Copyright</title>
-<para
->Copyright &copy; 2020-2022 Tobias Fella </para>
-<para
->Copyright &copy; 2020-2022 Carl Schwan </para>
-<para
->Licenza: GNU General Public Version 3 o successiva &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/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/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/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
@@ -6,47 +6,46 @@
 add_library(neochat STATIC
    controller.cpp
    actionshandler.cpp
-    models/emojimodel.cpp
+    emojimodel.cpp
    emojitones.cpp
-    models/customemojimodel.cpp
+    customemojimodel.cpp
    clipboard.cpp
    matriximageprovider.cpp
-    models/messageeventmodel.cpp
-    models/messagefiltermodel.cpp
-    models/roomlistmodel.cpp
-    models/sortfilterspacelistmodel.cpp
+    messageeventmodel.cpp
+    messagefiltermodel.cpp
+    roomlistmodel.cpp
+    sortfilterspacelistmodel.cpp
    spacehierarchycache.cpp
    roommanager.cpp
    neochatroom.cpp
    neochatuser.cpp
-    models/userlistmodel.cpp
-    models/userfiltermodel.cpp
-    models/publicroomlistmodel.cpp
-    models/userdirectorylistmodel.cpp
-    models/keywordnotificationrulemodel.cpp
+    userlistmodel.cpp
+    publicroomlistmodel.cpp
+    userdirectorylistmodel.cpp
+    keywordnotificationrulemodel.cpp
    utils.cpp
    notificationsmanager.cpp
-    models/sortfilterroomlistmodel.cpp
+    sortfilterroomlistmodel.cpp
    chatdocumenthandler.cpp
-    models/devicesmodel.cpp
+    devicesmodel.cpp
    filetypesingleton.cpp
    login.cpp
    stickerevent.cpp
-    models/webshortcutmodel.cpp
+    webshortcutmodel.cpp
    blurhash.cpp
    blurhashimageprovider.cpp
    joinrulesevent.cpp
-    models/collapsestateproxymodel.cpp
+    collapsestateproxymodel.cpp
    urlhelper.cpp
    windowcontroller.cpp
    linkpreviewer.cpp
-    models/completionmodel.cpp
-    models/completionproxymodel.cpp
-    models/actionsmodel.cpp
-    models/serverlistmodel.cpp
-    models/statemodel.cpp
+    completionmodel.cpp
+    completionproxymodel.cpp
+    actionsmodel.cpp
+    serverlistmodel.cpp
+    statemodel.cpp
    filetransferpseudojob.cpp
-    models/searchmodel.cpp
+    searchmodel.cpp
 )

 add_executable(neochat-app
@@ -103,9 +102,6 @@ endif()
 if(ANDROID)
    target_sources(neochat PRIVATE notifyrc.qrc)
    target_link_libraries(neochat PRIVATE Qt::Svg OpenSSL::SSL)
-    if(SQLite3_FOUND)
-        target_link_libraries(neochat-app PRIVATE SQLite::SQLite3)
-    endif()
    target_sources(neochat-app PRIVATE notifyrc.qrc)
    target_link_libraries(neochat PUBLIC Qt::Svg OpenSSL::SSL)
    kirigami_package_breeze_icons(ICONS
@@ -162,7 +158,7 @@ if(ANDROID)
        "zoom-out"
        "image-rotate-left-symbolic"
        "image-rotate-right-symbolic"
-        "channel-secure-symbolic"
+        "channel-insecure-symbolic"
        "download"
        "smiley"
        "tools-check-spelling"
@@ -173,7 +169,6 @@ if(ANDROID)
        "favorite"
        "window-new"
        "globe"
-        "visibility"
    )
 else()
    target_link_libraries(neochat PUBLIC Qt::Widgets KF5::KIOWidgets)
--- a/src/actionshandler.cpp
+++ b/src/actionshandler.cpp
@@ -13,11 +13,10 @@
 #include <KLocalizedString>
 #include <QStringBuilder>

+#include "actionsmodel.h"
 #include "controller.h"
-#include "models/actionsmodel.h"
-#include "models/customemojimodel.h"
+#include "customemojimodel.h"
 #include "neochatconfig.h"
-#include "neochatroom.h"
 #include "neochatuser.h"
 #include "roommanager.h"

@@ -59,9 +58,9 @@ void ActionsHandler::setRoom(NeoChatRoom *room)
    Q_EMIT roomChanged();
 }

-void ActionsHandler::handleNewMessage()
+void ActionsHandler::handleMessage()
 {
-    checkEffects(m_room->chatBoxText());
+    checkEffects();
    if (!m_room->chatBoxAttachmentPath().isEmpty()) {
        QUrl url(m_room->chatBoxAttachmentPath());
        auto path = url.isLocalFile() ? url.toLocalFile() : url.toString();
@@ -70,39 +69,13 @@ void ActionsHandler::handleNewMessage()
        m_room->setChatBoxText({});
        return;
    }
-
    QString handledText = m_room->chatBoxText();
-    handledText = handleMentions(handledText);
-    handleMessage(m_room->chatBoxText(), handledText);
-}

-void ActionsHandler::handleEdit()
-{
-    checkEffects(m_room->editText());
-
-    QString handledText = m_room->editText();
-    handledText = handleMentions(handledText, true);
-    handleMessage(m_room->editText(), handledText, true);
-}
-
-QString ActionsHandler::handleMentions(QString handledText, const bool &isEdit)
-{
-    if (!m_room) {
-        return QString();
-    }
-
-    QVector<Mention> *mentions;
-    if (isEdit) {
-        mentions = m_room->editMentions();
-    } else {
-        mentions = m_room->mentions();
-    }
-
-    std::sort(mentions->begin(), mentions->end(), [](const auto &a, const auto &b) -> bool {
+    std::sort(m_room->mentions()->begin(), m_room->mentions()->end(), [](const auto &a, const auto &b) -> bool {
        return a.cursor.anchor() > b.cursor.anchor();
    });

-    for (const auto &mention : *mentions) {
+    for (const auto &mention : *m_room->mentions()) {
        if (mention.text.isEmpty() || mention.id.isEmpty()) {
            continue;
        }
@@ -110,16 +83,11 @@ QString ActionsHandler::handleMentions(QString handledText, const bool &isEdit)
                                          mention.cursor.position() - mention.cursor.anchor(),
                                          QStringLiteral("[%1](https://matrix.to/#/%2)").arg(mention.text, mention.id));
    }
-    mentions->clear();
+    m_room->mentions()->clear();

-    return handledText;
-}
-
-void ActionsHandler::handleMessage(const QString &text, QString handledText, const bool &isEdit)
-{
    if (NeoChatConfig::allowQuickEdit()) {
        QRegularExpression sed("^s/([^/]*)/([^/]*)(/g)?$");
-        auto match = sed.match(text);
+        auto match = sed.match(m_room->chatBoxText());
        if (match.hasMatch()) {
            const QString regex = match.captured(1);
            const QString replacement = match.captured(2).toHtmlEscaped();
@@ -178,13 +146,13 @@ void ActionsHandler::handleMessage(const QString &text, QString handledText, con
    if (handledText.length() == 0) {
        return;
    }
-
-    m_room->postMessage(text, handledText, messageType, m_room->chatBoxReplyId(), isEdit ? m_room->chatBoxEditId() : "");
+    m_room->postMessage(m_room->chatBoxText(), handledText, messageType, m_room->chatBoxReplyId(), m_room->chatBoxEditId());
 }

-void ActionsHandler::checkEffects(const QString &text)
+void ActionsHandler::checkEffects()
 {
    std::optional<QString> effect = std::nullopt;
+    const auto &text = m_room->chatBoxText();
    if (text.contains("\u2744")) {
        effect = QLatin1String("snowflake");
    } else if (text.contains("\u1F386")) {
--- a/src/actionshandler.h
+++ b/src/actionshandler.h
@@ -33,22 +33,14 @@ Q_SIGNALS:

 public Q_SLOTS:

-    /**
-     * @brief Pre-process text and send message.
-     */
-    void handleNewMessage();
-
-    /**
-     * @brief Pre-process text and send edit.
-     */
-    void handleEdit();
+    /// \brief Post a message.
+    ///
+    /// This also interprets commands if any.
+    void handleMessage();

 private:
    NeoChatRoom *m_room = nullptr;
-    void checkEffects(const QString &text);
-
-    QString handleMentions(QString handledText, const bool &isEdit = false);
-    void handleMessage(const QString &text, QString handledText, const bool &isEdit = false);
+    void checkEffects();
 };

 QString markdownToHTML(const QString &markdown);
--- a/src/models/actionsmodel.cpp
+++ b/src/models/actionsmodel.cpp
@@ -158,12 +158,11 @@ QVector<ActionsModel::Action> actions{
                return QString();
            }
 #ifdef QUOTIENT_07
-            const RoomMemberEvent *roomMemberEvent = room->currentState().get<RoomMemberEvent>(text);
-            if (roomMemberEvent && roomMemberEvent->membership() == Membership::Invite) {
+            if (room->currentState().get<RoomMemberEvent>(text)->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));
                return QString();
            }
-            if (roomMemberEvent && roomMemberEvent->membership() == Membership::Ban) {
+            if (room->currentState().get<RoomMemberEvent>(text)->membership() == Membership::Ban) {
                Q_EMIT room->showMessage(NeoChatRoom::Info, i18nc("<user> is banned from this room.", "%1 is banned from this room.", text));
                return QString();
            }
@@ -209,40 +208,6 @@ QVector<ActionsModel::Action> actions{
        kli18n("<room alias or id>"),
        kli18n("Joins the given room"),
    },
-#ifdef QUOTIENT_07
-    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"),
-    },
-#endif
    Action{
        QStringLiteral("j"),
        [](const QString &text, NeoChatRoom *room) {
--- a/src/models/actionsmodel.h
+++ b/src/models/actionsmodel.h
--- a/src/chatdocumenthandler.cpp
+++ b/src/chatdocumenthandler.cpp
@@ -14,9 +14,9 @@
 #include <Sonnet/BackgroundChecker>
 #include <Sonnet/Settings>

-#include "models/actionsmodel.h"
-#include "models/roomlistmodel.h"
+#include "actionsmodel.h"
 #include "neochatroom.h"
+#include "roomlistmodel.h"

 class SyntaxHighlighter : public QSyntaxHighlighter
 {
@@ -105,19 +105,14 @@ ChatDocumentHandler::ChatDocumentHandler(QObject *parent)
 {
    connect(this, &ChatDocumentHandler::roomChanged, this, [this]() {
        m_completionModel->setRoom(m_room);
-        static QPointer<NeoChatRoom> previousRoom = nullptr;
+        static NeoChatRoom *previousRoom = nullptr;
        if (previousRoom) {
            disconnect(previousRoom, &NeoChatRoom::chatBoxTextChanged, this, nullptr);
-            disconnect(previousRoom, &NeoChatRoom::editTextChanged, this, nullptr);
        }
        previousRoom = m_room;
        connect(m_room, &NeoChatRoom::chatBoxTextChanged, this, [this]() {
            int start = completionStartIndex();
-            m_completionModel->setText(getText().mid(start, cursorPosition() - start), getText().mid(start));
-        });
-        connect(m_room, &NeoChatRoom::editTextChanged, this, [this]() {
-            int start = completionStartIndex();
-            m_completionModel->setText(getText().mid(start, cursorPosition() - start), getText().mid(start));
+            m_completionModel->setText(m_room->chatBoxText().mid(start, cursorPosition() - start), m_room->chatBoxText().mid(start));
        });
    });
    connect(this, &ChatDocumentHandler::documentChanged, this, [this]() {
@@ -128,7 +123,7 @@ ChatDocumentHandler::ChatDocumentHandler(QObject *parent)
            return;
        }
        int start = completionStartIndex();
-        m_completionModel->setText(getText().mid(start, cursorPosition() - start), getText().mid(start));
+        m_completionModel->setText(m_room->chatBoxText().mid(start, cursorPosition() - start), m_room->chatBoxText().mid(start));
    });
 }

@@ -143,7 +138,7 @@ int ChatDocumentHandler::completionStartIndex() const
 #else
    const auto cursor = cursorPosition();
 #endif
-    const auto &text = getText();
+    const auto &text = m_room->chatBoxText();
    auto start = std::min(cursor, text.size()) - 1;
    while (start > -1) {
        if (text.at(start) == QLatin1Char(' ')) {
@@ -155,20 +150,6 @@ int ChatDocumentHandler::completionStartIndex() const
    return start;
 }

-bool ChatDocumentHandler::isEdit() const
-{
-    return m_isEdit;
-}
-
-void ChatDocumentHandler::setIsEdit(bool edit)
-{
-    if (edit == m_isEdit) {
-        return;
-    }
-    m_isEdit = edit;
-    Q_EMIT isEditChanged();
-}
-
 QQuickTextDocument *ChatDocumentHandler::document() const
 {
    return m_document;
@@ -223,7 +204,7 @@ void ChatDocumentHandler::complete(int index)
    if (m_completionModel->autoCompletionType() == CompletionModel::User) {
        auto name = m_completionModel->data(m_completionModel->index(index, 0), CompletionModel::Text).toString();
        auto id = m_completionModel->data(m_completionModel->index(index, 0), CompletionModel::Subtitle).toString();
-        auto text = getText();
+        auto text = m_room->chatBoxText();
        auto at = text.lastIndexOf(QLatin1Char('@'), cursorPosition() - 1);
        QTextCursor cursor(document()->textDocument());
        cursor.setPosition(at);
@@ -232,11 +213,11 @@ void ChatDocumentHandler::complete(int index)
        cursor.setPosition(at);
        cursor.setPosition(cursor.position() + name.size(), QTextCursor::KeepAnchor);
        cursor.setKeepPositionOnInsert(true);
-        pushMention({cursor, name, 0, 0, id});
+        m_room->mentions()->push_back({cursor, name, 0, 0, id});
        m_highlighter->rehighlight();
    } else if (m_completionModel->autoCompletionType() == CompletionModel::Command) {
        auto command = m_completionModel->data(m_completionModel->index(index, 0), CompletionModel::ReplacedText).toString();
-        auto text = getText();
+        auto text = m_room->chatBoxText();
        auto at = text.lastIndexOf(QLatin1Char('/'));
        QTextCursor cursor(document()->textDocument());
        cursor.setPosition(at);
@@ -244,7 +225,7 @@ void ChatDocumentHandler::complete(int index)
        cursor.insertText(QStringLiteral("/%1 ").arg(command));
    } else if (m_completionModel->autoCompletionType() == CompletionModel::Room) {
        auto alias = m_completionModel->data(m_completionModel->index(index, 0), CompletionModel::Subtitle).toString();
-        auto text = getText();
+        auto text = m_room->chatBoxText();
        auto at = text.lastIndexOf(QLatin1Char('#'), cursorPosition() - 1);
        QTextCursor cursor(document()->textDocument());
        cursor.setPosition(at);
@@ -253,11 +234,11 @@ void ChatDocumentHandler::complete(int index)
        cursor.setPosition(at);
        cursor.setPosition(cursor.position() + alias.size(), QTextCursor::KeepAnchor);
        cursor.setKeepPositionOnInsert(true);
-        pushMention({cursor, alias, 0, 0, alias});
+        m_room->mentions()->push_back({cursor, alias, 0, 0, alias});
        m_highlighter->rehighlight();
    } else if (m_completionModel->autoCompletionType() == CompletionModel::Emoji) {
        auto shortcode = m_completionModel->data(m_completionModel->index(index, 0), CompletionModel::ReplacedText).toString();
-        auto text = getText();
+        auto text = m_room->chatBoxText();
        auto at = text.lastIndexOf(QLatin1Char(':'));
        QTextCursor cursor(document()->textDocument());
        cursor.setPosition(at);
@@ -300,27 +281,3 @@ void ChatDocumentHandler::setSelectionEnd(int position)
    m_selectionEnd = position;
    Q_EMIT selectionEndChanged();
 }
-
-QString ChatDocumentHandler::getText() const
-{
-    if (!m_room) {
-        return QString();
-    }
-    if (m_isEdit) {
-        return m_room->editText();
-    } else {
-        return m_room->chatBoxText();
-    }
-}
-
-void ChatDocumentHandler::pushMention(const Mention mention) const
-{
-    if (!m_room) {
-        return;
-    }
-    if (m_isEdit) {
-        m_room->editMentions()->push_back(mention);
-    } else {
-        m_room->mentions()->push_back(mention);
-    }
-}
--- a/src/chatdocumenthandler.h
+++ b/src/chatdocumenthandler.h
@@ -7,9 +7,8 @@
 #include <QQuickTextDocument>
 #include <QTextCursor>

-#include "models/completionmodel.h"
-#include "models/userlistmodel.h"
-#include "neochatroom.h"
+#include "completionmodel.h"
+#include "userlistmodel.h"

 class QTextDocument;
 class NeoChatRoom;
@@ -18,14 +17,6 @@ class SyntaxHighlighter;
 class ChatDocumentHandler : public QObject
 {
    Q_OBJECT
-
-    /**
-     * @brief Is the instance being used to handle an edit message.
-     *
-     * This is needed to ensure that the text and mentions are saved and retrieved
-     * from the correct parameters in the assigned room.
-     */
-    Q_PROPERTY(bool isEdit READ isEdit WRITE setIsEdit NOTIFY isEditChanged)
    Q_PROPERTY(QQuickTextDocument *document READ document WRITE setDocument NOTIFY documentChanged)
    Q_PROPERTY(int cursorPosition READ cursorPosition WRITE setCursorPosition NOTIFY cursorPositionChanged)
    Q_PROPERTY(int selectionStart READ selectionStart WRITE setSelectionStart NOTIFY selectionStartChanged)
@@ -33,14 +24,11 @@ class ChatDocumentHandler : public QObject

    Q_PROPERTY(CompletionModel *completionModel READ completionModel NOTIFY completionModelChanged)

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

 public:
    explicit ChatDocumentHandler(QObject *parent = nullptr);

-    [[nodiscard]] bool isEdit() const;
-    void setIsEdit(bool edit);
-
    [[nodiscard]] QQuickTextDocument *document() const;
    void setDocument(QQuickTextDocument *document);

@@ -61,7 +49,6 @@ public:
    void updateCompletions();
    CompletionModel *completionModel() const;
 Q_SIGNALS:
-    void isEditChanged();
    void documentChanged();
    void cursorPositionChanged();
    void roomChanged();
@@ -72,8 +59,6 @@ Q_SIGNALS:
 private:
    int completionStartIndex() const;

-    bool m_isEdit;
-
    QQuickTextDocument *m_document;

    NeoChatRoom *m_room = nullptr;
@@ -83,9 +68,6 @@ private:
    int m_selectionStart;
    int m_selectionEnd;

-    QString getText() const;
-    void pushMention(const Mention mention) const;
-
    SyntaxHighlighter *m_highlighter = nullptr;

    CompletionModel::AutoCompletionType m_completionType = CompletionModel::None;
--- a/src/clipboard.cpp
+++ b/src/clipboard.cpp
@@ -33,14 +33,13 @@ QImage Clipboard::image() const

 QString Clipboard::saveImage(QString localPath) const
 {
-    QString imageDir(QStringLiteral("%1/screenshots").arg(QStandardPaths::writableLocation(QStandardPaths::CacheLocation)));
-
-    if (!QDir().exists(imageDir)) {
-        QDir().mkdir(imageDir);
+    if (!QDir().exists(QStringLiteral("%1/screenshots").arg(QStandardPaths::writableLocation(QStandardPaths::CacheLocation)))) {
+        QDir().mkdir(QStringLiteral("%1/screenshots").arg(QStandardPaths::writableLocation(QStandardPaths::CacheLocation)));
    }
-
    if (localPath.isEmpty()) {
-        localPath = QStringLiteral("file://%1/%2.png").arg(imageDir, QDateTime::currentDateTime().toString(QStringLiteral("yyyy-MM-dd-hh-mm-ss")));
+        localPath = QStringLiteral("file://%1/screenshots/%2.png")
+                        .arg(QStandardPaths::writableLocation(QStandardPaths::CacheLocation),
+                             QDateTime::currentDateTime().toString(QStringLiteral("yyyy-MM-dd-hh-mm-ss")));
    }
    QUrl url(localPath);
    if (!url.isLocalFile()) {
@@ -52,11 +51,14 @@ QString Clipboard::saveImage(QString localPath) const
        return {};
    }

-    if (image.save(url.toLocalFile())) {
-        return localPath;
-    } else {
-        return {};
+    QDir dir;
+    if (!dir.exists(localPath)) {
+        dir.mkpath(localPath);
    }
+
+    image.save(url.toLocalFile());
+
+    return localPath;
 }

 void Clipboard::saveText(QString message)
--- a/src/collapsestateproxymodel.cpp
+++ b/src/collapsestateproxymodel.cpp
@@ -0,0 +1,85 @@
+// SPDX-FileCopyrightText: 2022 Tobias Fella <fella@posteo.de>
+// SPDX-License-Identifier: LGPL-2.0-or-later
+
+#include "collapsestateproxymodel.h"
+
+#include <KLocalizedString>
+
+bool CollapseStateProxyModel::filterAcceptsRow(int source_row, const QModelIndex &source_parent) const
+{
+    Q_UNUSED(source_parent);
+    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::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
+        || sourceModel()->data(sourceModel()->index(source_row, 0), MessageEventModel::EventResolvedTypeRole)
+        != sourceModel()->data(sourceModel()->index(source_row + 1, 0),
+                               MessageEventModel::EventResolvedTypeRole) // Also show it if it's of a different type than the one before TODO improve in
+        || sourceModel()->data(sourceModel()->index(source_row, 0), MessageEventModel::AuthorIdRole)
+        != sourceModel()->data(sourceModel()->index(source_row + 1, 0), MessageEventModel::AuthorIdRole); // Also show it if it's a different author
+}
+
+QVariant CollapseStateProxyModel::data(const QModelIndex &index, int role) const
+{
+    if (role == AggregateDisplayRole) {
+        return aggregateEventToString(mapToSource(index).row());
+    }
+    return sourceModel()->data(mapToSource(index), role);
+}
+
+QHash<int, QByteArray> CollapseStateProxyModel::roleNames() const
+{
+    auto roles = sourceModel()->roleNames();
+    roles[AggregateDisplayRole] = "aggregateDisplay";
+    return roles;
+}
+
+QString CollapseStateProxyModel::aggregateEventToString(int sourceRow) const
+{
+    QStringList parts;
+    for (int i = sourceRow; i >= 0; i--) {
+        parts += sourceModel()->data(sourceModel()->index(i, 0), Qt::DisplayRole).toString();
+        if (sourceModel()->data(sourceModel()->index(i, 0), MessageEventModel::EventTypeRole)
+                != MessageEventModel::DelegateType::State // If it's not a state event
+            || (i > 0
+                && sourceModel()->data(sourceModel()->index(i, 0), MessageEventModel::EventResolvedTypeRole)
+                    != sourceModel()->data(sourceModel()->index(i - 1, 0), MessageEventModel::EventResolvedTypeRole)) // or of a different type
+            || (i > 0
+                && sourceModel()->data(sourceModel()->index(i, 0), MessageEventModel::AuthorIdRole)
+                    != sourceModel()->data(sourceModel()->index(i - 1, 0), MessageEventModel::AuthorIdRole)) // or by a different author
+            || sourceModel()->data(sourceModel()->index(i - 1, 0), MessageEventModel::ShowSectionRole).toBool() // or the section needs to be visible
+        ) {
+            break;
+        }
+    }
+    if (!parts.isEmpty()) {
+        QStringList chunks;
+        while (!parts.isEmpty()) {
+            chunks += QString();
+            int count = 1;
+            auto part = parts.takeFirst();
+            chunks.last() += part;
+            while (!parts.isEmpty() && parts.first() == part) {
+                parts.removeFirst();
+                count++;
+            }
+            if (count > 1) {
+                chunks.last() += i18ncp("[user did something] n times", " %1 time", " %1 times", count);
+            }
+        }
+        QString text = chunks.takeFirst();
+
+        if (chunks.size() > 0) {
+            while (chunks.size() > 1) {
+                text += i18nc("[action 1], [action 2 and action 3]", ", ");
+                text += chunks.takeFirst();
+            }
+            text += i18nc("[action 1, action 2] and [action 3]", " and ");
+            text += chunks.takeFirst();
+        }
+        return text;
+    } else {
+        return {};
+    }
+}
--- a/src/models/collapsestateproxymodel.h
+++ b/src/models/collapsestateproxymodel.h
@@ -12,29 +12,10 @@ class CollapseStateProxyModel : public QSortFilterProxyModel
 public:
    enum Roles {
        AggregateDisplayRole = MessageEventModel::LastRole + 1,
-        StateEventsRole,
-        AuthorListRole,
    };
    [[nodiscard]] bool filterAcceptsRow(int source_row, const QModelIndex &source_parent) const override;
    [[nodiscard]] QHash<int, QByteArray> roleNames() const override;
    [[nodiscard]] QVariant data(const QModelIndex &idx, int role = Qt::DisplayRole) const override;

-    /**
-     * @brief QString aggregating the text of consecutive state events starting at row.
-     *
-     * If state events happen on different days they will be split into two aggregate
-     * events.
-     */
    [[nodiscard]] QString aggregateEventToString(int row) const;
-    /**
-     * @brief Return a list of consecutive state events starting at row.
-     *
-     * If state events happen on different days they will be split into two aggregate
-     * events.
-     */
-    [[nodiscard]] QVariantList stateEventsList(int row) const;
-    /**
-     * @brief List of unique authors for the aggregate state events starting at row.
-     */
-    [[nodiscard]] QVariantList authorList(int row) const;
 };
--- a/src/models/completionmodel.cpp
+++ b/src/models/completionmodel.cpp
@@ -16,7 +16,7 @@ CompletionModel::CompletionModel(QObject *parent)
    : QAbstractListModel(parent)
    , m_filterModel(new CompletionProxyModel())
    , m_userListModel(new UserListModel(this))
-    , m_emojiModel(new QConcatenateTablesProxyModel(this))
+    , m_emojiModel(new KConcatenateRowsProxyModel(this))
 {
    connect(this, &CompletionModel::textChanged, this, &CompletionModel::updateCompletion);
    connect(this, &CompletionModel::roomChanged, this, [this]() {
@@ -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
@@ -3,9 +3,10 @@

 #pragma once

-#include <QConcatenateTablesProxyModel>
 #include <QSortFilterProxyModel>

+#include <KConcatenateRowsProxyModel>
+
 #include "roomlistmodel.h"

 class CompletionProxyModel;
@@ -74,6 +75,6 @@ private:

    UserListModel *m_userListModel;
    RoomListModel *m_roomListModel;
-    QConcatenateTablesProxyModel *m_emojiModel;
+    KConcatenateRowsProxyModel *m_emojiModel;
 };
 Q_DECLARE_METATYPE(CompletionModel::AutoCompletionType);
--- a/src/models/completionproxymodel.cpp
+++ b/src/models/completionproxymodel.cpp
--- a/src/models/completionproxymodel.h
+++ b/src/models/completionproxymodel.h
--- a/src/controller.cpp
+++ b/src/controller.cpp
@@ -4,11 +4,7 @@

 #include "controller.h"

-#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
 #include <qt5keychain/keychain.h>
-#else
-#include <qt6keychain/keychain.h>
-#endif

 #include <KConfig>
 #include <KConfigGroup>
@@ -132,7 +128,16 @@ Controller::Controller(QObject *parent)
        if (AccountRegistry::instance().size() > oldAccountCount) {
            auto connection = AccountRegistry::instance().accounts()[AccountRegistry::instance().size() - 1];
            connect(connection, &Connection::syncDone, this, [=]() {
-                handleNotifications(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();
+                }
            });
        }
        oldAccountCount = AccountRegistry::instance().size();
@@ -141,16 +146,19 @@ Controller::Controller(QObject *parent)
 }

 #ifdef QUOTIENT_07
-void Controller::handleNotifications(QPointer<Quotient::Connection> connection)
+void Controller::handleNotifications()
 {
-    static QStringList initial;
+    static bool initial = true;
    static QStringList oldNotifications;
-    auto job = connection->callApi<GetNotificationsJob>();
+    if (!m_connection) {
+        return;
+    }
+    auto job = m_connection->callApi<GetNotificationsJob>();

-    connect(job, &BaseJob::success, this, [job, connection]() {
+    connect(job, &BaseJob::success, this, [this, job]() {
        const auto notifications = job->jsonData()["notifications"].toArray();
-        if (!initial.contains(connection->user()->id())) {
-            initial.append(connection->user()->id());
+        if (initial) {
+            initial = false;
            for (const auto &n : notifications) {
                oldNotifications += n.toObject()["event"].toObject()["event_id"].toString();
            }
@@ -166,12 +174,10 @@ void Controller::handleNotifications(QPointer<Quotient::Connection> connection)
                continue;
            }
            oldNotifications += notification["event"].toObject()["event_id"].toString();
-            auto room = connection->room(notification["room_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
-                && !(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());

@@ -190,7 +196,7 @@ void Controller::handleNotifications(QPointer<Quotient::Connection> connection)

                if (notification["event"]["type"] == "m.room.encrypted") {
 #ifdef Quotient_E2EE_ENABLED
-                    auto decrypted = connection->decryptNotification(notification);
+                    auto decrypted = m_connection->decryptNotification(notification);
                    body = decrypted["content"].toObject()["body"].toString();
 #endif
                    if (body.isEmpty()) {
@@ -375,11 +381,6 @@ void Controller::invokeLogin()
                    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);
--- a/src/controller.h
+++ b/src/controller.h
@@ -119,7 +119,7 @@ private:

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

 private Q_SLOTS:
--- a/src/models/customemojimodel.cpp
+++ b/src/models/customemojimodel.cpp
--- a/src/models/customemojimodel.h
+++ b/src/models/customemojimodel.h
@@ -4,8 +4,8 @@
 #pragma once

 #include <QAbstractListModel>
-#include <QRegularExpression>
 #include <memory>
+#include <QRegularExpression>

 struct CustomEmoji {
    QString name; // with :semicolons:
--- a/src/models/customemojimodel_p.h
+++ b/src/models/customemojimodel_p.h
--- a/src/models/devicesmodel.cpp
+++ b/src/models/devicesmodel.cpp
@@ -70,12 +70,7 @@ void DevicesModel::logout(int index, const QString &password)
    auto job = Controller::instance().activeConnection()->callApi<NeochatDeleteDeviceJob>(m_devices[index].deviceId);

    connect(job, &BaseJob::result, this, [this, job, password, index] {
-        auto onSuccess = [this, index]() {
-            beginRemoveRows(QModelIndex(), index, index);
-            m_devices.remove(index);
-            endRemoveRows();
-        };
-        if (job->error() != BaseJob::Success) {
+        if (job->error() != 0) {
            QJsonObject replyData = job->jsonData();
            QJsonObject authData;
            authData["session"] = replyData["session"];
@@ -84,9 +79,11 @@ void DevicesModel::logout(int index, const QString &password)
            QJsonObject identifier = {{"type", "m.id.user"}, {"user", Controller::instance().activeConnection()->user()->id()}};
            authData["identifier"] = identifier;
            auto *innerJob = Controller::instance().activeConnection()->callApi<NeochatDeleteDeviceJob>(m_devices[index].deviceId, authData);
-            connect(innerJob, &BaseJob::success, this, onSuccess);
-        } else {
-            onSuccess();
+            connect(innerJob, &BaseJob::success, this, [this, index]() {
+                beginRemoveRows(QModelIndex(), index, index);
+                m_devices.remove(index);
+                endRemoveRows();
+            });
        }
    });
 }
--- a/src/models/devicesmodel.h
+++ b/src/models/devicesmodel.h
--- a/src/models/emojimodel.cpp
+++ b/src/models/emojimodel.cpp
--- a/src/models/emojimodel.h
+++ b/src/models/emojimodel.h
--- a/src/emojitones.cpp
+++ b/src/emojitones.cpp
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: LGPL-2.0-or-later

 #include "emojitones.h"
-#include "models/emojimodel.h"
+#include "emojimodel.h"

 QMultiHash<QString, QVariant> EmojiTones::_tones = {
 #include "emojitones_data.h"
--- a/src/models/keywordnotificationrulemodel.cpp
+++ b/src/models/keywordnotificationrulemodel.cpp
--- a/src/models/keywordnotificationrulemodel.h
+++ b/src/models/keywordnotificationrulemodel.h
--- a/src/login.cpp
+++ b/src/login.cpp
@@ -181,8 +181,8 @@ void Login::loginWithSso()
    connectSingleShot(m_connection, &Connection::loginFlowsChanged, this, [this]() {
        SsoSession *session = m_connection->prepareForSso(m_deviceName);
        m_ssoUrl = session->ssoUrl();
-        Q_EMIT ssoUrlChanged();
    });
+    Q_EMIT ssoUrlChanged();
 }

 bool Login::testing() const
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -42,39 +42,38 @@
 #include "blurhashimageprovider.h"
 #include "chatdocumenthandler.h"
 #include "clipboard.h"
+#include "collapsestateproxymodel.h"
 #include "controller.h"
+#include "customemojimodel.h"
+#include "devicesmodel.h"
+#include "emojimodel.h"
 #include "filetypesingleton.h"
 #include "joinrulesevent.h"
 #include "linkpreviewer.h"
+#include "keywordnotificationrulemodel.h"
 #include "login.h"
 #include "matriximageprovider.h"
-#include "models/collapsestateproxymodel.h"
-#include "models/customemojimodel.h"
-#include "models/devicesmodel.h"
-#include "models/emojimodel.h"
-#include "models/keywordnotificationrulemodel.h"
-#include "models/messageeventmodel.h"
-#include "models/messagefiltermodel.h"
-#include "models/publicroomlistmodel.h"
-#include "models/roomlistmodel.h"
-#include "models/searchmodel.h"
-#include "models/serverlistmodel.h"
-#include "models/sortfilterroomlistmodel.h"
-#include "models/sortfilterspacelistmodel.h"
-#include "models/userdirectorylistmodel.h"
-#include "models/userfiltermodel.h"
-#include "models/userlistmodel.h"
-#include "models/webshortcutmodel.h"
+#include "messageeventmodel.h"
+#include "messagefiltermodel.h"
 #include "neochatconfig.h"
 #include "neochatroom.h"
 #include "neochatuser.h"
 #include "notificationsmanager.h"
+#include "searchmodel.h"
 #ifdef QUOTIENT_07
 #include "pollhandler.h"
 #endif
+#include "publicroomlistmodel.h"
+#include "roomlistmodel.h"
 #include "roommanager.h"
+#include "serverlistmodel.h"
+#include "sortfilterroomlistmodel.h"
+#include "sortfilterspacelistmodel.h"
 #include "spacehierarchycache.h"
 #include "urlhelper.h"
+#include "userdirectorylistmodel.h"
+#include "userlistmodel.h"
+#include "webshortcutmodel.h"
 #include "windowcontroller.h"
 #ifdef QUOTIENT_07
 #include <keyverificationsession.h>
@@ -82,19 +81,15 @@
 #ifdef HAVE_COLORSCHEME
 #include "colorschemer.h"
 #endif
-#include "models/completionmodel.h"
-#include "models/statemodel.h"
+#include "completionmodel.h"
 #include "neochatuser.h"
+#include "statemodel.h"

 #ifdef HAVE_RUNNER
 #include "runner.h"
 #include <QDBusConnection>
 #endif

-#ifdef Q_OS_WINDOWS
-#include <Windows.h>
-#endif
-
 using namespace Quotient;

 class NetworkAccessManagerFactory : public QQmlNetworkAccessManagerFactory
@@ -225,7 +220,6 @@ int main(int argc, char *argv[])
    qmlRegisterType<MessageEventModel>("org.kde.neochat", 1, 0, "MessageEventModel");
    qmlRegisterType<CollapseStateProxyModel>("org.kde.neochat", 1, 0, "CollapseStateProxyModel");
    qmlRegisterType<MessageFilterModel>("org.kde.neochat", 1, 0, "MessageFilterModel");
-    qmlRegisterType<UserFilterModel>("org.kde.neochat", 1, 0, "UserFilterModel");
    qmlRegisterType<PublicRoomListModel>("org.kde.neochat", 1, 0, "PublicRoomListModel");
    qmlRegisterType<UserDirectoryListModel>("org.kde.neochat", 1, 0, "UserDirectoryListModel");
    qmlRegisterType<ServerListModel>("org.kde.neochat", 1, 0, "ServerListModel");
--- a/src/models/messageeventmodel.cpp
+++ b/src/models/messageeventmodel.cpp
@@ -67,7 +67,6 @@ QHash<int, QByteArray> MessageEventModel::roleNames() const
    roles[IsNameChangeRole] = "isNameChange";
    roles[IsAvatarChangeRole] = "isAvatarChange";
    roles[IsRedactedRole] = "isRedacted";
-    roles[GenericDisplayRole] = "genericDisplay";
    return roles;
 }

@@ -440,7 +439,7 @@ QVariant MessageEventModel::data(const QModelIndex &idx, int role) const
        case EventTypeRole:
            return DelegateType::ReadMarker;
        case TimeRole: {
-            const QDateTime eventDate = data(index(m_lastReadEventIndex.row() + 1, 0), TimeRole).toDateTime().toLocalTime();
+            const QDateTime eventDate = data(index(m_lastReadEventIndex.row() + 1, 0), TimeRole).toDateTime();
            const KFormat format;
            return format.formatRelativeDateTime(eventDate, QLocale::ShortFormat);
        }
@@ -463,14 +462,6 @@ QVariant MessageEventModel::data(const QModelIndex &idx, int role) const
        return m_currentRoom->eventToString(evt, Qt::RichText);
    }

-    if (role == GenericDisplayRole) {
-        if (evt.isRedacted()) {
-            return i18n("<i>[This message was deleted]</i>");
-        }
-
-        return m_currentRoom->eventToGenericString(evt);
-    }
-
    if (role == FormattedBodyRole) {
        if (auto e = eventCast<const RoomMessageEvent>(&evt)) {
            if (e->hasTextContent() && e->mimeType().name() != "text/plain") {
--- a/src/models/messageeventmodel.h
+++ b/src/models/messageeventmodel.h
@@ -45,7 +45,6 @@ public:
        AnnotationRole,
        UserMarkerRole,
        FormattedBodyRole,
-        GenericDisplayRole,

        MimeTypeRole,
        FileMimetypeIcon,
--- a/src/models/messagefiltermodel.cpp
+++ b/src/models/messagefiltermodel.cpp
--- a/src/models/messagefiltermodel.h
+++ b/src/models/messagefiltermodel.h
--- a/src/models/collapsestateproxymodel.cpp
+++ b/src/models/collapsestateproxymodel.cpp
@@ -1,134 +0,0 @@
-// SPDX-FileCopyrightText: 2022 Tobias Fella <fella@posteo.de>
-// SPDX-License-Identifier: LGPL-2.0-or-later
-
-#include "collapsestateproxymodel.h"
-#include "messageeventmodel.h"
-
-#include <KLocalizedString>
-
-bool CollapseStateProxyModel::filterAcceptsRow(int source_row, const QModelIndex &source_parent) const
-{
-    Q_UNUSED(source_parent);
-    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::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
-}
-
-QVariant CollapseStateProxyModel::data(const QModelIndex &index, int role) const
-{
-    if (role == AggregateDisplayRole) {
-        return aggregateEventToString(mapToSource(index).row());
-    } else if (role == StateEventsRole) {
-        return stateEventsList(mapToSource(index).row());
-    } else if (role == AuthorListRole) {
-        return authorList(mapToSource(index).row());
-    }
-    return sourceModel()->data(mapToSource(index), role);
-}
-
-QHash<int, QByteArray> CollapseStateProxyModel::roleNames() const
-{
-    auto roles = sourceModel()->roleNames();
-    roles[AggregateDisplayRole] = "aggregateDisplay";
-    roles[StateEventsRole] = "stateEvents";
-    roles[AuthorListRole] = "authorList";
-    return roles;
-}
-
-QString CollapseStateProxyModel::aggregateEventToString(int sourceRow) const
-{
-    QStringList parts;
-    QVariantList uniqueAuthors;
-    for (int i = sourceRow; i >= 0; i--) {
-        parts += sourceModel()->data(sourceModel()->index(i, 0), MessageEventModel::GenericDisplayRole).toString();
-        QVariant nextAuthor = sourceModel()->data(sourceModel()->index(i, 0), MessageEventModel::AuthorRole);
-        if (!uniqueAuthors.contains(nextAuthor)) {
-            uniqueAuthors.append(nextAuthor);
-        }
-        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
-        ) {
-            break;
-        }
-    }
-    parts.sort(); // Sort them so that all identical events can be collected.
-    if (!parts.isEmpty()) {
-        QStringList chunks;
-        while (!parts.isEmpty()) {
-            chunks += QString();
-            int count = 1;
-            auto part = parts.takeFirst();
-            chunks.last() += part;
-            while (!parts.isEmpty() && parts.first() == part) {
-                parts.removeFirst();
-                count++;
-            }
-            if (count > 1 && uniqueAuthors.length() == 1) {
-                chunks.last() += i18ncp("n times", " %1 time ", " %1 times ", count);
-            }
-        }
-        chunks.removeDuplicates();
-        QString text = "<style>a {text-decoration: none;}</style>"; // There can be links in the event text so make sure all are styled.
-        // The author text is either "n users" if > 1 user or the matrix.to link to a single user.
-        QString userText = uniqueAuthors.length() > 1 ? i18ncp("n users", " %1 user ", " %1 users ", uniqueAuthors.length())
-                                                      : QStringLiteral("<a href=\"https://matrix.to/#/%1\" style=\"color: %2\">%3</a> ")
-                                                            .arg(uniqueAuthors[0].toMap()["id"].toString(),
-                                                                 uniqueAuthors[0].toMap()["color"].toString(),
-                                                                 uniqueAuthors[0].toMap()["displayName"].toString());
-        text += userText;
-        text += chunks.takeFirst();
-
-        if (chunks.size() > 0) {
-            while (chunks.size() > 1) {
-                text += i18nc("[action 1], [action 2 and/or action 3]", ", ");
-                text += chunks.takeFirst();
-            }
-            text += uniqueAuthors.length() > 1 ? i18nc("[action 1, action 2] or [action 3]", " or ") : i18nc("[action 1, action 2] and [action 3]", " and ");
-            text += chunks.takeFirst();
-        }
-        return text;
-    } else {
-        return {};
-    }
-}
-
-QVariantList CollapseStateProxyModel::stateEventsList(int sourceRow) const
-{
-    QVariantList stateEvents;
-    for (int i = sourceRow; i >= 0; i--) {
-        auto nextState = QVariantMap{
-            {"author", sourceModel()->data(sourceModel()->index(i, 0), MessageEventModel::AuthorRole)},
-            {"authorDisplayName", sourceModel()->data(sourceModel()->index(i, 0), MessageEventModel::AuthorDisplayNameRole).toString()},
-            {"text", sourceModel()->data(sourceModel()->index(i, 0), Qt::DisplayRole).toString()},
-        };
-        stateEvents.append(nextState);
-        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
-        ) {
-            break;
-        }
-    }
-    return stateEvents;
-}
-
-QVariantList CollapseStateProxyModel::authorList(int sourceRow) const
-{
-    QVariantList uniqueAuthors;
-    for (int i = sourceRow; i >= 0; i--) {
-        QVariant nextAvatar = sourceModel()->data(sourceModel()->index(i, 0), MessageEventModel::AuthorRole);
-        if (!uniqueAuthors.contains(nextAvatar)) {
-            uniqueAuthors.append(nextAvatar);
-        }
-        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
-        ) {
-            break;
-        }
-    }
-    return uniqueAuthors;
-}
--- a/src/models/userfiltermodel.cpp
+++ b/src/models/userfiltermodel.cpp
@@ -1,28 +0,0 @@
-// SPDX-FileCopyrightText: 2022 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 "userfiltermodel.h"
-
-#include "userlistmodel.h"
-
-bool UserFilterModel::filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const
-{
-    Q_UNUSED(sourceParent);
-    if (m_filterText.length() < 1) {
-        return false;
-    }
-    return sourceModel()->data(sourceModel()->index(sourceRow, 0), UserListModel::NameRole).toString().contains(m_filterText, Qt::CaseInsensitive)
-        || sourceModel()->data(sourceModel()->index(sourceRow, 0), UserListModel::UserIdRole).toString().contains(m_filterText, Qt::CaseInsensitive);
-}
-
-QString UserFilterModel::filterText() const
-{
-    return m_filterText;
-}
-
-void UserFilterModel::setFilterText(const QString &filterText)
-{
-    m_filterText = filterText;
-    Q_EMIT filterTextChanged();
-    invalidateFilter();
-}
--- a/src/models/userfiltermodel.h
+++ b/src/models/userfiltermodel.h
@@ -1,42 +0,0 @@
-// SPDX-FileCopyrightText: 2022 James Graham <james.h.graham@protonmail.com>
-// SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
-
-#pragma once
-
-#include <QSortFilterProxyModel>
-
-/**
- * @class UserFilterModel
- *
- * This class creates a custom QSortFilterProxyModel for filtering a users by either
- * display name or matrix ID. The filter can accept a full matrix id i.e. example:kde.org
- * to separate between accounts on different servers with similar names.
- */
-class UserFilterModel : public QSortFilterProxyModel
-{
-    Q_OBJECT
-
-    /**
-     * @brief This property hold the text of the filter.
-     *
-     * The text is either a desired display name or matrix id.
-     */
-    Q_PROPERTY(QString filterText READ filterText WRITE setFilterText NOTIFY filterTextChanged)
-
-public:
-    /**
-     * @brief Custom filter function checking boith the display name and matrix ID.
-     *
-     * @note The filter cannot be modified and will always use the same filter properties.
-     */
-    bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const override;
-
-    QString filterText() const;
-    void setFilterText(const QString &filterText);
-
-Q_SIGNALS:
-    void filterTextChanged();
-
-private:
-    QString m_filterText;
-};
--- a/src/neochat.notifyrc
+++ b/src/neochat.notifyrc
@@ -7,7 +7,6 @@ Name[ca]=NeoChat
 Name[ca@valencia]=NeoChat
 Name[cs]=NeoChat
 Name[de]=NeoChat
-Name[el]=NeoChat
 Name[en_GB]=NeoChat
 Name[es]=NeoChat
 Name[eu]=NeoChat
@@ -45,7 +44,6 @@ Comment[ca]=Un client per a Matrix, el protocol de comunicacions descentralitzat
 Comment[ca@valencia]=Un client per a Matrix, el protocol de comunicacions descentralitzat
 Comment[cs]=Klient pro decentralizovaný komunikační protokol matrix
 Comment[de]=Ein Programm für Matrix, das dezentrale Kommunikationsprotokoll
-Comment[el]=Ένας πελάτης για το Matrix, το αποκεντρωμένο πρωτόκολλο επικοινωνίας
 Comment[en_GB]=A client for matrix, the decentralised communication protocol
 Comment[es]=Un cliente para Matrix, el protocolo de comunicaciones descentralizado
 Comment[eu]=Matrix, deszentralizatutako komunikazio protokolorako, bezero bat
@@ -84,7 +82,6 @@ Name[ca]=Missatge nou
 Name[ca@valencia]=Missatge nou
 Name[cs]=Nová zpráva
 Name[de]=Neue Nachricht
-Name[el]=Νέο μήνυμα
 Name[en_GB]=New message
 Name[es]=Nuevo mensaje
 Name[eu]=Mezu berria
@@ -119,8 +116,7 @@ Comment[ar]=توجد رسالة جديدة
 Comment[az]=Yeni ismarıc var
 Comment[ca]=Hi ha un missatge nou
 Comment[ca@valencia]=Hi ha un missatge nou
-Comment[de]=Es gibt eine neue Nachricht
-Comment[el]=Υπάρχει ένα νέο μήνυμα
+Comment[de]=Es ist eine neue Nachricht vorhanden
 Comment[en_GB]=There is a new message
 Comment[es]=Hay un mensaje nuevo
 Comment[eu]=Mezu berri bat dago
@@ -160,7 +156,6 @@ Name[ca]=Invitació nova
 Name[ca@valencia]=Invitació nova
 Name[cs]=Nová pozvánka
 Name[de]=Neue Einladung
-Name[el]=Νέα πρόσκληση
 Name[en_GB]=New Invitation
 Name[es]=Nueva invitación
 Name[eu]=Gonbidapen berria
@@ -191,7 +186,6 @@ Comment[ca]=Hi ha una invitació nova a una sala
 Comment[ca@valencia]=Hi ha una invitació nova a una sala
 Comment[cs]=Máte novou pozvánku do místnosti
 Comment[de]=Es gibt eine neue Einladung zu einem Raum
-Comment[el]=Υπάρχει μια νέα πρόσκληση σε μια αίθουσα
 Comment[en_GB]=There is a new invitation to a room
 Comment[es]=Hay una nueva invitación a una sala
 Comment[eu]=Gela baterako gonbidapen berri bat dago
--- a/src/neochatconfig.kcfg
+++ b/src/neochatconfig.kcfg
@@ -4,7 +4,6 @@
      xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0
                          http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" >
  <kcfgfile name="neochatrc" />
-  <include>Kirigami/PlatformTheme</include>
  <group name="General">
    <entry name="CollapsedSections" type="IntList">
      <label>Collapsed sections in the room list</label>
@@ -26,6 +25,10 @@
      <label>Background transparency value</label>
      <default>0.3</default>
    </entry>
+    <entry name="ShowNotifications" type="bool">
+      <label>Show notifications</label>
+      <default>true</default>
+    </entry>
    <entry name="MergeRoomList" type="bool">
      <label>Merge Room Lists</label>
      <default>false</default>
@@ -69,11 +72,7 @@
      <default>true</default>
    </entry>
    <entry name="CompactLayout" type="bool">
-      <label>Use a compact chat layout</label>
-      <default>false</default>
-    </entry>
-    <entry name="CompactRoomList" type="bool">
-      <label>Use a compact room list layout</label>
+      <label>Use a compact layout</label>
      <default>false</default>
    </entry>
    <entry name="ShowRename" type="bool">
@@ -103,13 +102,6 @@
      <label>Show Fancy Effects</label>
      <default>true</default>
    </entry>
-    <entry name="defaultFont" type="Font">
-      <label>Default font</label>
-      <code>
-        Kirigami::PlatformTheme theme;
-      </code>
-      <default code="true">theme.defaultFont()</default>
-    </entry>
  </group>
  <group name="RoomDrawer">
    <entry name="ShowAvatarInRoomDrawer" type="bool">
--- a/src/neochatroom.cpp
+++ b/src/neochatroom.cpp
@@ -31,9 +31,6 @@
 #include <events/roompowerlevelsevent.h>
 #include <events/simplestateevents.h>
 #include <jobs/downloadfilejob.h>
-#ifndef QUOTIENT_07
-#include <joinstate.h>
-#endif
 #include <qt_connection_util.h>

 #include "controller.h"
@@ -97,7 +94,6 @@ NeoChatRoom::NeoChatRoom(Connection *connection, QString roomId, JoinState joinS
    connect(this, &Room::changed, this, [this] {
        Q_EMIT canEncryptRoomChanged();
    });
-    connect(connection, &Connection::capabilitiesLoaded, this, &NeoChatRoom::maxRoomVersionChanged);
 }

 void NeoChatRoom::uploadFile(const QUrl &url, const QString &body)
@@ -604,10 +600,8 @@ QString NeoChatRoom::eventToString(const RoomEvent &evt, Qt::TextFormat format,
                } else {
                    return i18n("self-banned from the room");
                }
-            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);
-            }
+            case MembershipType::Knock:
+                return i18n("requested an invite");
            default:;
            }
            return i18n("made something unknown");
@@ -658,135 +652,6 @@ QString NeoChatRoom::eventToString(const RoomEvent &evt, Qt::TextFormat format,
        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)
-            return i18n("sent a message");
-        },
-        [](const StickerEvent &e) {
-            Q_UNUSED(e)
-            return i18n("sent a sticker");
-        },
-        [](const RoomMemberEvent &e) {
-            switch (e.membership()) {
-            case MembershipType::Invite:
-                if (e.repeatsState()) {
-                    return i18n("reinvited someone to the room");
-                }
-                Q_FALLTHROUGH();
-            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() == 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.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");
-                    }
-                }
-                if (e.isAvatarUpdate()) {
-                    if (!text.isEmpty()) {
-                        text += i18n(" and ");
-                    }
-                    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");
-                    }
-                }
-                if (text.isEmpty()) {
-                    text = i18nc("<user> changed nothing", "changed nothing");
-                }
-                return text;
-            }
-            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 == 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 MembershipType::Ban:
-                if (e.senderId() != e.userId()) {
-                    return i18n("banned a user from the room");
-                } else {
-                    return i18n("self-banned from the room");
-                }
-            case MembershipType::Knock: {
-                return i18n("requested an invite");
-            }
-            default:;
-            }
-            return i18n("made something unknown");
-        },
-        [](const RoomCanonicalAliasEvent &e) {
-            return (e.alias().isEmpty()) ? i18n("cleared the room main alias") : i18n("set the room main alias");
-        },
-        [](const RoomNameEvent &e) {
-            return (e.name().isEmpty()) ? i18n("cleared the room name") : i18n("set the room name");
-        },
-        [](const RoomTopicEvent &e) {
-            return (e.topic().isEmpty()) ? i18n("cleared the topic") : i18n("set the topic");
-        },
-        [](const RoomAvatarEvent &) {
-            return i18n("changed the room avatar");
-        },
-        [](const EncryptionEvent &) {
-            return i18n("activated End-to-End Encryption");
-        },
-        [](const RoomCreateEvent &e) {
-            return e.isUpgrade() ? i18n("upgraded the room version") : i18n("created the room");
-        },
-        [](const RoomPowerLevelsEvent &) {
-            return i18nc("'power level' means permission level", "changed the power levels for this room");
-        },
-        [](const StateEventBase &e) {
-            if (e.matrixType() == QLatin1String("m.room.server_acl")) {
-                return i18n("changed the server access control lists for this room");
-            }
-            if (e.matrixType() == QLatin1String("im.vector.modular.widgets")) {
-                if (e.fullJson()["unsigned"]["prev_content"].toObject().isEmpty()) {
-                    return i18n("added a widget");
-                }
-                if (e.contentJson().isEmpty()) {
-                    return i18n("removed a widget");
-                }
-                return i18n("configured a widget");
-            }
-            return i18n("updated the state");
-        },
-#ifdef QUOTIENT_07
-        [](const PollStartEvent &e) {
-            return i18n("started a poll");
-        },
-#endif
-        i18n("Unknown event"));
-}
-
 void NeoChatRoom::changeAvatar(const QUrl &localFile)
 {
    const auto job = connection()->uploadFile(localFile.toLocalFile());
@@ -1075,305 +940,6 @@ void NeoChatRoom::setHistoryVisibility(const QString &historyVisibilityRule)
    // Not emitting historyVisibilityChanged() here, since that would override the change in the UI with the *current* value, which is not the *new* value.
 }

-void NeoChatRoom::setUserPowerLevel(const QString &userID, const int &powerLevel)
-{
-    if (joinedCount() <= 1) {
-        qWarning() << "Cannot modify the power level of the only user";
-        return;
-    }
-    if (!canSendState("m.room.power_levels")) {
-        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::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") {
-        return powerLevelEvent->kick();
-    } else if (eventName == "invite") {
-        return powerLevelEvent->invite();
-    } else if (eventName == "redact") {
-        return powerLevelEvent->redact();
-    } else if (eventName == "users_default") {
-        return powerLevelEvent->usersDefault();
-    } else if (eventName == "state_default") {
-        return powerLevelEvent->stateDefault();
-    } else if (eventName == "events_default") {
-        return powerLevelEvent->eventsDefault();
-    } else if (isStateEvent) {
-        return powerLevelEvent->powerLevelForState(eventName);
-    } else {
-        return powerLevelEvent->powerLevelForEvent(eventName);
-    }
-}
-
-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;
-
-    if (powerLevelContent.contains(eventName)) {
-        powerLevel = powerLevelContent[eventName].toInt();
-
-        if (powerLevel != clampPowerLevel) {
-            powerLevelContent[eventName] = clampPowerLevel;
-        }
-    } else {
-        auto eventPowerLevels = powerLevelContent["events"].toObject();
-
-        if (eventPowerLevels.contains(eventName)) {
-            powerLevel = eventPowerLevels[eventName].toInt();
-        } else {
-            if (isStateEvent) {
-                powerLevel = powerLevelContent["state_default"].toInt();
-            } else {
-                powerLevel = powerLevelContent["events_default"].toInt();
-            }
-        }
-
-        if (powerLevel != clampPowerLevel) {
-            eventPowerLevels[eventName] = clampPowerLevel;
-            powerLevelContent["events"] = eventPowerLevels;
-        }
-    }
-
-#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
-{
-    return powerLevel("users_default");
-}
-
-void NeoChatRoom::setDefaultUserPowerLevel(const int &newPowerLevel)
-{
-    setPowerLevel("users_default", newPowerLevel);
-}
-
-int NeoChatRoom::invitePowerLevel() const
-{
-    return powerLevel("invite");
-}
-
-void NeoChatRoom::setInvitePowerLevel(const int &newPowerLevel)
-{
-    setPowerLevel("invite", newPowerLevel);
-}
-
-int NeoChatRoom::kickPowerLevel() const
-{
-    return powerLevel("kick");
-}
-
-void NeoChatRoom::setKickPowerLevel(const int &newPowerLevel)
-{
-    setPowerLevel("kick", newPowerLevel);
-}
-
-int NeoChatRoom::banPowerLevel() const
-{
-    return powerLevel("ban");
-}
-
-void NeoChatRoom::setBanPowerLevel(const int &newPowerLevel)
-{
-    setPowerLevel("ban", newPowerLevel);
-}
-
-int NeoChatRoom::redactPowerLevel() const
-{
-    return powerLevel("redact");
-}
-
-void NeoChatRoom::setRedactPowerLevel(const int &newPowerLevel)
-{
-    setPowerLevel("redact", newPowerLevel);
-}
-
-int NeoChatRoom::statePowerLevel() const
-{
-    return powerLevel("state_default");
-}
-
-void NeoChatRoom::setStatePowerLevel(const int &newPowerLevel)
-{
-    setPowerLevel("state_default", newPowerLevel);
-}
-
-int NeoChatRoom::defaultEventPowerLevel() const
-{
-    return powerLevel("events_default");
-}
-
-void NeoChatRoom::setDefaultEventPowerLevel(const int &newPowerLevel)
-{
-    setPowerLevel("events_default", newPowerLevel);
-}
-
-int NeoChatRoom::powerLevelPowerLevel() const
-{
-    return powerLevel("m.room.power_levels", true);
-}
-
-void NeoChatRoom::setPowerLevelPowerLevel(const int &newPowerLevel)
-{
-    setPowerLevel("m.room.power_levels", newPowerLevel, true);
-}
-
-int NeoChatRoom::namePowerLevel() const
-{
-    return powerLevel("m.room.name", true);
-}
-
-void NeoChatRoom::setNamePowerLevel(const int &newPowerLevel)
-{
-    setPowerLevel("m.room.name", newPowerLevel, true);
-}
-
-int NeoChatRoom::avatarPowerLevel() const
-{
-    return powerLevel("m.room.avatar", true);
-}
-
-void NeoChatRoom::setAvatarPowerLevel(const int &newPowerLevel)
-{
-    setPowerLevel("m.room.avatar", newPowerLevel, true);
-}
-
-int NeoChatRoom::canonicalAliasPowerLevel() const
-{
-    return powerLevel("m.room.canonical_alias", true);
-}
-
-void NeoChatRoom::setCanonicalAliasPowerLevel(const int &newPowerLevel)
-{
-    setPowerLevel("m.room.canonical_alias", newPowerLevel, true);
-}
-
-int NeoChatRoom::topicPowerLevel() const
-{
-    return powerLevel("m.room.topic", true);
-}
-
-void NeoChatRoom::setTopicPowerLevel(const int &newPowerLevel)
-{
-    setPowerLevel("m.room.topic", newPowerLevel, true);
-}
-
-int NeoChatRoom::encryptionPowerLevel() const
-{
-    return powerLevel("m.room.encryption", true);
-}
-
-void NeoChatRoom::setEncryptionPowerLevel(const int &newPowerLevel)
-{
-    setPowerLevel("m.room.encryption", newPowerLevel, true);
-}
-
-int NeoChatRoom::historyVisibilityPowerLevel() const
-{
-    return powerLevel("m.room.history_visibility", true);
-}
-
-void NeoChatRoom::setHistoryVisibilityPowerLevel(const int &newPowerLevel)
-{
-    setPowerLevel("m.room.history_visibility", newPowerLevel, true);
-}
-
-int NeoChatRoom::pinnedEventsPowerLevel() const
-{
-    return powerLevel("m.room.pinned_events", true);
-}
-
-void NeoChatRoom::setPinnedEventsPowerLevel(const int &newPowerLevel)
-{
-    setPowerLevel("m.room.pinned_events", newPowerLevel, true);
-}
-
-int NeoChatRoom::tombstonePowerLevel() const
-{
-    return powerLevel("m.room.tombstone", true);
-}
-
-void NeoChatRoom::setTombstonePowerLevel(const int &newPowerLevel)
-{
-    setPowerLevel("m.room.tombstone", newPowerLevel, true);
-}
-
-int NeoChatRoom::serverAclPowerLevel() const
-{
-    return powerLevel("m.room.server_acl", true);
-}
-
-void NeoChatRoom::setServerAclPowerLevel(const int &newPowerLevel)
-{
-    setPowerLevel("m.room.server_acl", newPowerLevel, true);
-}
-
-int NeoChatRoom::spaceChildPowerLevel() const
-{
-    return powerLevel("m.space.child", true);
-}
-
-void NeoChatRoom::setSpaceChildPowerLevel(const int &newPowerLevel)
-{
-    setPowerLevel("m.space.child", newPowerLevel, true);
-}
-
-int NeoChatRoom::spaceParentPowerLevel() const
-{
-    return powerLevel("m.space.parent", true);
-}
-
-void NeoChatRoom::setSpaceParentPowerLevel(const int &newPowerLevel)
-{
-    setPowerLevel("m.space.parent", newPowerLevel, true);
-}
-
 QCoro::Task<void> NeoChatRoom::doDeleteMessagesByUser(const QString &user, QString reason)
 {
    QStringList events;
@@ -1626,17 +1192,6 @@ void NeoChatRoom::setChatBoxText(const QString &text)
    Q_EMIT chatBoxTextChanged();
 }

-QString NeoChatRoom::editText() const
-{
-    return m_editText;
-}
-
-void NeoChatRoom::setEditText(const QString &text)
-{
-    m_editText = text;
-    Q_EMIT editTextChanged();
-}
-
 QString NeoChatRoom::chatBoxReplyId() const
 {
    return m_chatBoxReplyId;
@@ -1713,11 +1268,6 @@ QVector<Mention> *NeoChatRoom::mentions()
    return &m_mentions;
 }

-QVector<Mention> *NeoChatRoom::editMentions()
-{
-    return &m_editMentions;
-}
-
 QString NeoChatRoom::savedText() const
 {
    return m_savedText;
@@ -1818,14 +1368,3 @@ void NeoChatRoom::setCanonicalAlias(const QString &newAlias)
        }
    });
 }
-
-int NeoChatRoom::maxRoomVersion() const
-{
-    int maxVersion = 0;
-    for (auto roomVersion : connection()->availableRoomVersions()) {
-        if (roomVersion.id.toInt() > maxVersion) {
-            maxVersion = roomVersion.id.toInt();
-        }
-    }
-    return maxVersion;
-}
--- a/src/neochatroom.h
+++ b/src/neochatroom.h
@@ -12,8 +12,8 @@

 #include <qcoro/task.h>

-#include "neochatuser.h"
-#include "pollhandler.h"
+class PollHandler;
+class NeoChatUser;

 class PushNotificationState : public QObject
 {
@@ -47,43 +47,15 @@ class NeoChatRoom : public Quotient::Room
    Q_PROPERTY(QString avatarMediaId READ avatarMediaId NOTIFY avatarChanged STORED false)
    Q_PROPERTY(bool readMarkerLoaded READ readMarkerLoaded NOTIFY readMarkerLoadedChanged)
    Q_PROPERTY(QDateTime lastActiveTime READ lastActiveTime NOTIFY lastActiveTimeChanged)
-    Q_PROPERTY(bool isSpace READ isSpace CONSTANT)
    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 text for any message currently being edited in the room.
-     */
-    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)
@@ -93,13 +65,6 @@ class NeoChatRoom : public Quotient::Room
    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.
-     *
-     * Only returns main integer room versions (i.e. no msc room versions).
-     */
-    Q_PROPERTY(int maxRoomVersion READ maxRoomVersion NOTIFY maxRoomVersionChanged)
-
 public:
    enum MessageType {
        Positive,
@@ -152,68 +117,6 @@ public:
    [[nodiscard]] QString historyVisibility() const;
    void setHistoryVisibility(const QString &historyVisibilityRule);

-    Q_INVOKABLE void setUserPowerLevel(const QString &userID, const int &powerLevel);
-
-    [[nodiscard]] int powerLevel(const QString &eventName, const bool &isStateEvent = false) const;
-    void setPowerLevel(const QString &eventName, const int &newPowerLevel, const bool &isStateEvent = false);
-
-    [[nodiscard]] int defaultUserPowerLevel() const;
-    void setDefaultUserPowerLevel(const int &newPowerLevel);
-
-    [[nodiscard]] int invitePowerLevel() const;
-    void setInvitePowerLevel(const int &newPowerLevel);
-
-    [[nodiscard]] int kickPowerLevel() const;
-    void setKickPowerLevel(const int &newPowerLevel);
-
-    [[nodiscard]] int banPowerLevel() const;
-    void setBanPowerLevel(const int &newPowerLevel);
-
-    [[nodiscard]] int redactPowerLevel() const;
-    void setRedactPowerLevel(const int &newPowerLevel);
-
-    [[nodiscard]] int statePowerLevel() const;
-    void setStatePowerLevel(const int &newPowerLevel);
-
-    [[nodiscard]] int defaultEventPowerLevel() const;
-    void setDefaultEventPowerLevel(const int &newPowerLevel);
-
-    [[nodiscard]] int powerLevelPowerLevel() const;
-    void setPowerLevelPowerLevel(const int &newPowerLevel);
-
-    [[nodiscard]] int namePowerLevel() const;
-    void setNamePowerLevel(const int &newPowerLevel);
-
-    [[nodiscard]] int avatarPowerLevel() const;
-    void setAvatarPowerLevel(const int &newPowerLevel);
-
-    [[nodiscard]] int canonicalAliasPowerLevel() const;
-    void setCanonicalAliasPowerLevel(const int &newPowerLevel);
-
-    [[nodiscard]] int topicPowerLevel() const;
-    void setTopicPowerLevel(const int &newPowerLevel);
-
-    [[nodiscard]] int encryptionPowerLevel() const;
-    void setEncryptionPowerLevel(const int &newPowerLevel);
-
-    [[nodiscard]] int historyVisibilityPowerLevel() const;
-    void setHistoryVisibilityPowerLevel(const int &newPowerLevel);
-
-    [[nodiscard]] int pinnedEventsPowerLevel() const;
-    void setPinnedEventsPowerLevel(const int &newPowerLevel);
-
-    [[nodiscard]] int tombstonePowerLevel() const;
-    void setTombstonePowerLevel(const int &newPowerLevel);
-
-    [[nodiscard]] int serverAclPowerLevel() const;
-    void setServerAclPowerLevel(const int &newPowerLevel);
-
-    [[nodiscard]] int spaceChildPowerLevel() const;
-    void setSpaceChildPowerLevel(const int &newPowerLevel);
-
-    [[nodiscard]] int spaceParentPowerLevel() const;
-    void setSpaceParentPowerLevel(const int &newPowerLevel);
-
    [[nodiscard]] bool hasFileUploading() const
    {
        return m_hasFileUploading;
@@ -254,7 +157,6 @@ public:
    [[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;
@@ -276,9 +178,6 @@ public:
    QString chatBoxText() const;
    void setChatBoxText(const QString &text);

-    QString editText() const;
-    void setEditText(const QString &text);
-
    QString chatBoxReplyId() const;
    void setChatBoxReplyId(const QString &replyId);

@@ -296,11 +195,6 @@ public:

    QVector<Mention> *mentions();

-    /**
-     * @brief Vector of mentions in the current edit text.
-     */
-    QVector<Mention> *editMentions();
-
    QString savedText() const;
    void setSavedText(const QString &savedText);

@@ -329,8 +223,6 @@ public:
    }
 #endif

-    int maxRoomVersion() const;
-
 private:
    QSet<const Quotient::RoomEvent *> highlights;

@@ -350,12 +242,10 @@ private:
    QCoro::Task<void> doUploadFile(QUrl url, QString body = QString());

    QString m_chatBoxText;
-    QString m_editText;
    QString m_chatBoxReplyId;
    QString m_chatBoxEditId;
    QString m_chatBoxAttachmentPath;
    QVector<Mention> m_mentions;
-    QVector<Mention> m_editMentions;
    QString m_savedText;
 #ifdef QUOTIENT_07
    QCache<QString, PollHandler> m_polls;
@@ -378,33 +268,12 @@ Q_SIGNALS:
    void pushNotificationStateChanged(PushNotificationState::State state);
    void showMessage(MessageType messageType, const QString &message);
    void chatBoxTextChanged();
-    void editTextChanged();
    void chatBoxReplyIdChanged();
    void chatBoxEditIdChanged();
    void chatBoxAttachmentPathChanged();
    void canEncryptRoomChanged();
    void joinRuleChanged();
    void historyVisibilityChanged();
-    void maxRoomVersionChanged();
-    void defaultUserPowerLevelChanged();
-    void invitePowerLevelChanged();
-    void kickPowerLevelChanged();
-    void banPowerLevelChanged();
-    void redactPowerLevelChanged();
-    void statePowerLevelChanged();
-    void defaultEventPowerLevelChanged();
-    void powerLevelPowerLevelChanged();
-    void namePowerLevelChanged();
-    void avatarPowerLevelChanged();
-    void canonicalAliasPowerLevelChanged();
-    void topicPowerLevelChanged();
-    void encryptionPowerLevelChanged();
-    void historyVisibilityPowerLevelChanged();
-    void pinnedEventsPowerLevelChanged();
-    void tombstonePowerLevelChanged();
-    void serverAclPowerLevelChanged();
-    void spaceChildPowerLevelChanged();
-    void spaceParentPowerLevelChanged();

 public Q_SLOTS:
    void uploadFile(const QUrl &url, const QString &body = QString());
--- a/src/notificationsmanager.cpp
+++ b/src/notificationsmanager.cpp
@@ -11,12 +11,6 @@
 #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>
@@ -55,6 +49,10 @@ void NotificationsManager::postNotification(NeoChatRoom *room,
                                            const QString &replyEventId,
                                            bool canReply)
 {
+    if (!NeoChatConfig::self()->showNotifications()) {
+        return;
+    }
+
    QPixmap img;
    img.convertFromImage(icon);
    KNotification *notification = new KNotification("message");
@@ -70,15 +68,8 @@ void NotificationsManager::postNotification(NeoChatRoom *room,

    notification->setDefaultAction(i18n("Open NeoChat in this 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);
+        WindowController::instance().showAndRaiseWindow(notification->xdgActivationToken());
    });

    if (canReply) {
@@ -99,6 +90,9 @@ void NotificationsManager::postNotification(NeoChatRoom *room,

 void NotificationsManager::postInviteNotification(NeoChatRoom *room, const QString &title, const QString &sender, const QImage &icon)
 {
+    if (!NeoChatConfig::self()->showNotifications()) {
+        return;
+    }
    QPixmap img;
    img.convertFromImage(icon);
    KNotification *notification = new KNotification("invite");
@@ -108,9 +102,9 @@ void NotificationsManager::postInviteNotification(NeoChatRoom *room, const QStri
    notification->setFlags(KNotification::Persistent);
    notification->setDefaultAction(i18n("Open this invitation in NeoChat"));
    connect(notification, &KNotification::defaultActivated, this, [=]() {
-        WindowController::instance().showAndRaiseWindow(notification->xdgActivationToken());
        notification->close();
        RoomManager::instance().enterRoom(room);
+        WindowController::instance().showAndRaiseWindow(notification->xdgActivationToken());
    });
    notification->setActions({i18n("Accept Invitation"), i18n("Reject Invitation")});
    connect(notification, &KNotification::action1Activated, this, [room, notification]() {
@@ -268,10 +262,6 @@ void NotificationsManager::updateNotificationRules(const QString &type)
        return;
    }

-    if (!Controller::instance().activeConnection()) {
-        return;
-    }
-
    const QJsonObject accountData = Controller::instance().activeConnection()->accountDataJson("m.push_rules");

    // Update override rules
@@ -281,9 +271,7 @@ void NotificationsManager::updateNotificationRules(const QString &type)
        if (overrideRule["rule_id"] == ".m.rule.master") {
            bool ruleEnabled = overrideRule["enabled"].toBool();
            m_globalNotificationsEnabled = !ruleEnabled;
-            if (!m_globalNotificationsSet) {
-                m_globalNotificationsSet = true;
-            }
+            NeoChatConfig::self()->setShowNotifications(m_globalNotificationsEnabled);
            Q_EMIT globalNotificationsEnabledChanged(m_globalNotificationsEnabled);
        }

--- a/src/notificationsmanager.h
+++ b/src/notificationsmanager.h
@@ -33,7 +33,6 @@ class NotificationsManager : public QObject
 {
    Q_OBJECT
    Q_PROPERTY(bool globalNotificationsEnabled MEMBER m_globalNotificationsEnabled WRITE setGlobalNotificationsEnabled NOTIFY globalNotificationsEnabledChanged)
-    Q_PROPERTY(bool globalNotificationsSet MEMBER m_globalNotificationsSet NOTIFY globalNotificationsSetChanged)
    Q_PROPERTY(PushNotificationAction::Action oneToOneNotificationAction MEMBER m_oneToOneNotificationAction WRITE setOneToOneNotificationAction NOTIFY
                   oneToOneNotificationActionChanged)
    Q_PROPERTY(PushNotificationAction::Action encryptedOneToOneNotificationAction MEMBER m_encryptedOneToOneNotificationAction WRITE
@@ -74,8 +73,7 @@ private:
    QMultiMap<QString, KNotification *> m_notifications;
    QHash<QString, QPointer<KNotification>> m_invitations;

-    bool m_globalNotificationsEnabled = false;
-    bool m_globalNotificationsSet = false;
+    bool m_globalNotificationsEnabled;
    PushNotificationAction::Action m_oneToOneNotificationAction = PushNotificationAction::Unknown;
    PushNotificationAction::Action m_encryptedOneToOneNotificationAction = PushNotificationAction::Unknown;
    PushNotificationAction::Action m_groupChatNotificationAction = PushNotificationAction::Unknown;
@@ -109,7 +107,6 @@ private Q_SLOTS:

 Q_SIGNALS:
    void globalNotificationsEnabledChanged(bool newState);
-    void globalNotificationsSetChanged(bool newState);
    void oneToOneNotificationActionChanged(PushNotificationAction::Action action);
    void encryptedOneToOneNotificationActionChanged(PushNotificationAction::Action action);
    void groupChatNotificationActionChanged(PushNotificationAction::Action action);
--- a/src/plasma-runner-neochat.desktop
+++ b/src/plasma-runner-neochat.desktop
@@ -8,7 +8,6 @@ Name[ca]=NeoChat
 Name[ca@valencia]=NeoChat
 Name[cs]=NeoChat
 Name[de]=NeoChat
-Name[el]=NeoChat
 Name[en_GB]=NeoChat
 Name[es]=NeoChat
 Name[eu]=NeoChat
@@ -43,8 +42,6 @@ Comment[ar]=اعثر على غرف في نيوتشات
 Comment[az]=NeoChat-da otaqları tapın
 Comment[ca]=Cerca sales en el NeoChat
 Comment[ca@valencia]=Busca sales en NeoChat
-Comment[de]=Räume in NeoChat finden
-Comment[el]=Εύρεση αιθουσών στο NeoChat
 Comment[en_GB]=Find rooms in NeoChat
 Comment[es]=Buscar salas en NeoChat
 Comment[eu]=Bilatu gelak NeoChat-en
@@ -60,7 +57,7 @@ Comment[nl]=Rooms zoeken in NeoChat
 Comment[pl]=Znajdź pokoje w NeoChat
 Comment[pt]=Procurar salas no NeoChat
 Comment[pt_BR]=Encontrar salas no NeoChat
-Comment[ru]=Поиск комнат NeoChat
+Comment[ru]=Поиск комнаты NeoChat
 Comment[sl]=Najdi sobe v NeoChatu
 Comment[sv]=Sök efter rum i NeoChat
 Comment[ta]=நியோச்சாட்டில் அரங்குகளை கண்டுபிடிக்கும்
--- a/src/models/publicroomlistmodel.cpp
+++ b/src/models/publicroomlistmodel.cpp
--- a/src/models/publicroomlistmodel.h
+++ b/src/models/publicroomlistmodel.h
--- a/src/qml/Component/ChatBox/AttachmentPane.qml
+++ b/src/qml/Component/ChatBox/AttachmentPane.qml
@@ -10,115 +10,188 @@ import org.kde.kirigami 2.15 as Kirigami

 import org.kde.neochat 1.0

-ColumnLayout {
-    id: root
+Loader {
+    id: attachmentPaneLoader

-    signal attachmentCancelled()
-
-    property string attachmentPath
-
-    readonly property var attachmentMimetype: FileType.mimeTypeForUrl(attachmentPath)
+    readonly property var attachmentMimetype: FileType.mimeTypeForUrl(attachmentPaneLoader.attachmentPath)
    readonly property bool hasImage: attachmentMimetype.valid && FileType.supportedImageFormats.includes(attachmentMimetype.preferredSuffix)
+    readonly property string attachmentPath: currentRoom.chatBoxAttachmentPath
    readonly property string baseFileName: attachmentPath.substring(attachmentPath.lastIndexOf('/') + 1, attachmentPath.length)

-    RowLayout {
-        spacing: Kirigami.Units.smallSpacing
+    active: visible
+    sourceComponent: Component {
+        QQC2.Pane {
+            id: attachmentPane
+            Kirigami.Theme.colorSet: Kirigami.Theme.View

-        QQC2.Label {
-            Layout.fillWidth: true
-            Layout.alignment: Qt.AlignLeft
-            text: i18n("Attachment:")
-            horizontalAlignment: Text.AlignLeft
-            verticalAlignment: Text.AlignVCenter
-        }
-        QQC2.ToolButton {
-            id: editImageButton
-            visible: hasImage
-            icon.name: "document-edit"
-            text: i18n("Edit")
-            display: QQC2.AbstractButton.IconOnly
+            contentItem: Item {
+                property real spacing: attachmentPane.spacing > 0 ? attachmentPane.spacing : toolBar.spacing
+                implicitWidth: Math.max(image.implicitWidth, imageBusyIndicator.implicitWidth, fileInfoLayout.implicitWidth, toolBar.implicitWidth)
+                implicitHeight: Math.max(
+                    (hasImage ? Math.max(image.preferredHeight, imageBusyIndicator.implicitHeight) + spacing : 0)
+                        + fileInfoLayout.implicitHeight,
+                    toolBar.implicitHeight
+                )

-            Component {
-                id: imageEditorPage
-                ImageEditorPage {
-                    imagePath: root.attachmentPath
+                Image {
+                    id: image
+                    property real preferredHeight: Math.min(implicitHeight, Kirigami.Units.gridUnit * 8)
+                    height: preferredHeight
+                    anchors {
+                        horizontalCenter: parent.horizontalCenter
+                        bottom: fileInfoLayout.top
+                        bottomMargin: parent.spacing
+                    }
+                    width: Math.min(implicitWidth, attachmentPane.availableWidth)
+                    asynchronous: true
+                    cache: false // Cache is not needed. Images will rarely be shown repeatedly.
+                    smooth: height === preferredHeight && parent.height === parent.implicitHeight // Don't smooth until height animation stops
+                    source: hasImage ? attachmentPaneLoader.attachmentPath : ""
+                    visible: hasImage
+                    fillMode: Image.PreserveAspectFit
+
+                    onSourceChanged: {
+                        // Reset source size height, which affect implicitHeight
+                        sourceSize.height = -1
+                    }
+
+                    onSourceSizeChanged: {
+                        if (implicitHeight > Kirigami.Units.gridUnit * 8) {
+                            // This can save a lot of RAM when loading large images.
+                            // It also improves visual quality for large images.
+                            sourceSize.height = Kirigami.Units.gridUnit * 8
+                        }
+                    }
+
+                    Behavior on height {
+                        NumberAnimation {
+                            property: "height"
+                            duration: Kirigami.Units.shortDuration
+                            easing.type: Easing.OutCubic
+                        }
+                    }
+                }
+
+                QQC2.BusyIndicator {
+                    id: imageBusyIndicator
+                    anchors {
+                        horizontalCenter: parent.horizontalCenter
+                        top: parent.top
+                        bottom: fileInfoLayout.top
+                        bottomMargin: parent.spacing
+                    }
+                    visible: running
+                    running: image.visible && image.progress < 1
+                }
+
+                RowLayout {
+                    id: fileInfoLayout
+                    anchors.horizontalCenter: parent.horizontalCenter
+                    anchors.verticalCenter: undefined
+                    anchors.bottom: parent.bottom
+                    spacing: parent.spacing
+
+                    Kirigami.Icon {
+                        id: mimetypeIcon
+                        implicitHeight: Kirigami.Units.fontMetrics.roundedIconSize(fileLabel.implicitHeight)
+                        implicitWidth: implicitHeight
+                        source: attachmentMimetype.iconName
+                    }
+
+                    QQC2.Label {
+                        id: fileLabel
+                        text: baseFileName
+                    }
+
+                    states: State {
+                        when: !hasImage
+                        AnchorChanges {
+                            target: fileInfoLayout
+                            anchors.bottom: undefined
+                            anchors.verticalCenter: parent.verticalCenter
+                        }
+                    }
+                }
+
+                // Using a toolbar to get a button spacing consistent with what the QQC2 style normally has
+                // Also has some accessibility info
+                QQC2.ToolBar {
+                    id: toolBar
+                    width: parent.width
+                    anchors.top: parent.top
+
+                    leftPadding: 0
+                    rightPadding: 0
+                    topPadding: 0
+                    bottomPadding: 0
+
+                    Kirigami.Theme.inherit: true
+                    Kirigami.Theme.colorSet: Kirigami.Theme.View
+
+                    contentItem: RowLayout {
+                        spacing: parent.spacing
+                        QQC2.Label {
+                            Layout.leftMargin: -attachmentPane.leftPadding
+                            Layout.topMargin: -attachmentPane.topPadding
+                            leftPadding: cancelAttachmentButton.leftPadding + 1 + attachmentPane.leftPadding
+                            rightPadding: cancelAttachmentButton.rightPadding + 1
+                            topPadding: cancelAttachmentButton.topPadding + attachmentPane.topPadding
+                            bottomPadding: cancelAttachmentButton.bottomPadding
+                            text: i18n("Attachment:")
+                            horizontalAlignment: Text.AlignLeft
+                            verticalAlignment: Text.AlignVCenter
+                            background: Kirigami.ShadowedRectangle {
+                                property real cornerRadius: cancelAttachmentButton.background.hasOwnProperty("radius") ?
+                                    Math.min(cancelAttachmentButton.background.radius, height/2) : 0
+                                corners.bottomLeftRadius: toolBar.mirrored ? cornerRadius : 0
+                                corners.bottomRightRadius: toolBar.mirrored ? 0 : cornerRadius
+                                color: Kirigami.Theme.backgroundColor
+                                opacity: 0.75
+                            }
+                        }
+                        Item {
+                            Layout.fillWidth: true
+                        }
+                        QQC2.ToolButton {
+                            id: editImageButton
+                            visible: hasImage
+                            icon.name: "document-edit"
+                            text: i18n("Edit")
+                            display: QQC2.AbstractButton.IconOnly
+
+                            Component {
+                                id: imageEditorPage
+                                ImageEditorPage {
+                                    imagePath: attachmentPaneLoader.attachmentPath
+                                }
+                            }
+                            onClicked: {
+                                let imageEditor = applicationWindow().pageStack.layers.push(imageEditorPage);
+                                imageEditor.newPathChanged.connect(function(newPath) {
+                                    applicationWindow().pageStack.layers.pop();
+                                    attachmentPaneLoader.attachmentPath = newPath;
+                                });
+                            }
+                            QQC2.ToolTip.text: text
+                            QQC2.ToolTip.visible: hovered
+                        }
+                        QQC2.ToolButton {
+                            id: cancelAttachmentButton
+                            icon.name: "dialog-close"
+                            text: i18n("Cancel sending Image")
+                            display: QQC2.AbstractButton.IconOnly
+                            onClicked: currentRoom.chatBoxAttachmentPath = "";
+                            QQC2.ToolTip.text: text
+                            QQC2.ToolTip.visible: hovered
+                        }
+                    }
+                    background: null
                }
            }

-            onClicked: {
-                let imageEditor = applicationWindow().pageStack.layers.push(imageEditorPage);
-                imageEditor.newPathChanged.connect(function(newPath) {
-                    applicationWindow().pageStack.layers.pop();
-                    root.attachmentPath = newPath;
-                });
+            background: Rectangle {
+                color: Kirigami.Theme.backgroundColor
            }
-            QQC2.ToolTip.text: text
-            QQC2.ToolTip.visible: hovered
-        }
-        QQC2.ToolButton {
-            id: cancelAttachmentButton
-            display: QQC2.AbstractButton.IconOnly
-            action: Kirigami.Action {
-                text: i18n("Cancel sending attachment")
-                icon.name: "dialog-close"
-                onTriggered: attachmentCancelled();
-                shortcut: "Escape"
-            }
-            QQC2.ToolTip.text: text
-            QQC2.ToolTip.visible: hovered
-        }
-    }
-
-    Image {
-        id: image
-        Layout.alignment: Qt.AlignHCenter
-
-        asynchronous: true
-        cache: false // Cache is not needed. Images will rarely be shown repeatedly.
-        source: hasImage ? root.attachmentPath : ""
-        visible: hasImage
-        fillMode: Image.PreserveAspectFit
-
-        onSourceChanged: {
-            // Reset source size height, which affect implicitHeight
-            sourceSize.height = -1
-        }
-
-        onSourceSizeChanged: {
-            if (implicitHeight > Kirigami.Units.gridUnit * 8) {
-                // This can save a lot of RAM when loading large images.
-                // It also improves visual quality for large images.
-                sourceSize.height = Kirigami.Units.gridUnit * 8
-            }
-        }
-
-        Behavior on height {
-            NumberAnimation {
-                duration: Kirigami.Units.shortDuration
-                easing.type: Easing.OutCubic
-            }
-        }
-    }
-    QQC2.BusyIndicator {
-        id: imageBusyIndicator
-
-        visible: running
-        running: image.visible && image.progress < 1
-    }
-    RowLayout {
-        id: fileInfoLayout
-        Layout.alignment: Qt.AlignHCenter
-        spacing: parent.spacing
-
-        Kirigami.Icon {
-            id: mimetypeIcon
-            implicitWidth: Kirigami.Units.iconSizes.smallMedium
-            implicitHeight: Kirigami.Units.iconSizes.smallMedium
-            source: attachmentMimetype.iconName
-        }
-        QQC2.Label {
-            id: fileLabel
-            text: baseFileName
        }
    }
 }
--- a/src/qml/Component/ChatBox/ChatBar.qml
+++ b/src/qml/Component/ChatBox/ChatBar.qml
@@ -5,60 +5,205 @@
 import QtQuick 2.15
 import QtQuick.Layouts 1.15
 import QtQuick.Controls 2.15 as QQC2
+import QtQuick.Window 2.15

 import org.kde.kirigami 2.18 as Kirigami
 import org.kde.neochat 1.0

-QQC2.Control {
-    id: root
-
-    property alias textField: textField
-    property bool isReplying: currentRoom.chatBoxReplyId.length > 0
-    property NeoChatUser replyUser: currentRoom.chatBoxReplyUser
-    property bool attachmentPaneVisible: currentRoom.chatBoxAttachmentPath.length > 0
+QQC2.ToolBar {
+    id: chatBar
+    property alias inputFieldText: inputField.text
+    property alias textField: inputField
+    property alias cursorPosition: inputField.cursorPosition

+    signal inputFieldForceActiveFocusTriggered()
    signal messageSent()

-    property list<Kirigami.Action> actions : [
-        Kirigami.Action {
-            id: attachmentAction
+    onInputFieldForceActiveFocusTriggered: {
+        inputField.forceActiveFocus();
+        // set the cursor to the end of the text
+        inputField.cursorPosition = inputField.length;
+    }

-            property bool isBusy: currentRoom && currentRoom.hasFileUploading
+    position: QQC2.ToolBar.Footer

-            // Matrix does not allow sending attachments in replies
-            visible: currentRoom.chatBoxReplyId.length === 0  && currentRoom.chatBoxAttachmentPath.length === 0
-            icon.name: "mail-attachment"
-            text: i18n("Attach an image or file")
-            displayHint: Kirigami.DisplayHint.IconOnly
+    Kirigami.Theme.colorSet: Kirigami.Theme.View

-            onTriggered: {
-                if (Clipboard.hasImage) {
-                    attachDialog.open()
-                } else {
-                    var fileDialog = openFileDialog.createObject(QQC2.ApplicationWindow.overlay)
-                    fileDialog.chosen.connect((path) => {
-                        if (!path) {
-                            return;
-                        }
-                        currentRoom.chatBoxAttachmentPath = path;
-                    })
-                    fileDialog.open()
-                }
+    // Using a custom background because some styles like Material
+    // or Fusion might have ugly colors for a TextArea placed inside
+    // of a toolbar. ToolBar is otherwise the closest QQC2 component
+    // to what we want because of the padding and spacing values.
+    background: Rectangle {
+        color: Kirigami.Theme.backgroundColor
+    }
+
+    contentItem: RowLayout {
+        spacing: chatBar.spacing
+
+        QQC2.ScrollView {
+            Layout.fillHeight: true
+            Layout.fillWidth: true
+            Layout.minimumHeight: inputField.implicitHeight
+            // lineSpacing is height+leading, so subtract leading once since leading only exists between lines.
+            Layout.maximumHeight: fontMetrics.lineSpacing * 8 - fontMetrics.leading
+                                + inputField.topPadding + inputField.bottomPadding
+
+            // HACK: Hide unnecessary horizontal scrollbar (https://bugreports.qt.io/browse/QTBUG-83890)
+            QQC2.ScrollBar.horizontal.policy: QQC2.ScrollBar.AlwaysOff
+
+            FontMetrics {
+                id: fontMetrics
+                font: inputField.font
            }

-            tooltip: text
-        },
-        Kirigami.Action {
-            id: emojiAction
+            QQC2.TextArea {
+                id: inputField
+                focus: true
+                /* Some QQC2 styles will have their own predefined backgrounds for TextAreas.
+                * Make sure there is no background since we are using the ToolBar background.
+                *
+                * This could cause a problem if the QQC2 style was designed around TextArea
+                * background colors being very different from the QPalette::Base color.
+                * Luckily, none of the Qt QQC2 styles do that and neither do KDE's QQC2 styles.
+                */
+                background: MouseArea {
+                    acceptedButtons: Qt.NoButton
+                    cursorShape: Qt.IBeamCursor
+                    z: 1
+                }

-            property bool isBusy: false
+                leftPadding: mirrored ? 0 : Kirigami.Units.largeSpacing
+                rightPadding: !mirrored ? 0 : Kirigami.Units.largeSpacing
+                topPadding: 0
+                bottomPadding: 0

+                placeholderText: readOnly ? i18n("This room is encrypted. Sending encrypted messages is not yet supported.") : currentRoom.chatBoxEditId.length > 0 ? i18n("Edit Message") : currentRoom.usesEncryption ? i18n("Send an encrypted message…") : i18n("Send a message…")
+                verticalAlignment: TextEdit.AlignVCenter
+                horizontalAlignment: TextEdit.AlignLeft
+                wrapMode: Text.Wrap
+                readOnly: currentRoom.usesEncryption && !Controller.encryptionSupported
+
+                Kirigami.Theme.colorSet: Kirigami.Theme.View
+                Kirigami.Theme.inherit: false
+
+                color: Kirigami.Theme.textColor
+                selectionColor: Kirigami.Theme.highlightColor
+                selectedTextColor: Kirigami.Theme.highlightedTextColor
+                hoverEnabled: !Kirigami.Settings.tabletMode
+
+                selectByMouse: !Kirigami.Settings.tabletMode
+
+                Keys.onEnterPressed: {
+                    if (completionMenu.visible) {
+                        completionMenu.complete()
+                    } else if (event.modifiers & Qt.ShiftModifier) {
+                        inputField.insert(cursorPosition, "\n")
+                    } else {
+                        chatBar.postMessage();
+                    }
+                }
+                Keys.onReturnPressed: {
+                    if (completionMenu.visible) {
+                        completionMenu.complete()
+                    } else if (event.modifiers & Qt.ShiftModifier) {
+                        inputField.insert(cursorPosition, "\n")
+                    } else {
+                        chatBar.postMessage();
+                    }
+                }
+
+                Keys.onTabPressed: {
+                    if (completionMenu.visible) {
+                        completionMenu.complete()
+                    }
+                }
+
+                Keys.onPressed: {
+                    if (event.key === Qt.Key_V && event.modifiers & Qt.ControlModifier) {
+                        chatBar.pasteImage();
+                    } else if (event.key === Qt.Key_Up && event.modifiers & Qt.ControlModifier) {
+                        let replyEvent = messageEventModel.getLatestMessageFromIndex(0)
+                        if (replyEvent && replyEvent["event_id"]) {
+                            currentRoom.chatBoxReplyId = replyEvent["event_id"]
+                        }
+                    } else if (event.key === Qt.Key_Up && inputField.text.length === 0) {
+                        let editEvent = messageEventModel.getLastLocalUserMessageEventId()
+                        if (editEvent) {
+                            currentRoom.chatBoxEditId = editEvent["event_id"]
+                        }
+                    } else if (event.key === Qt.Key_Up && completionMenu.visible) {
+                        completionMenu.decrementIndex()
+                    } else if (event.key === Qt.Key_Down && completionMenu.visible) {
+                        completionMenu.incrementIndex()
+                    } else if (event.key === Qt.Key_Backspace && inputField.text.length <= 1) {
+                        currentRoom.sendTypingNotification(false)
+                        repeatTimer.stop()
+                    }
+                }
+
+                Timer {
+                    id: repeatTimer
+                    interval: 5000
+                }
+
+                onTextChanged: {
+                    if (!repeatTimer.running && Config.typingNotifications) {
+                        var textExists = text.length > 0
+                        currentRoom.sendTypingNotification(textExists)
+                        textExists ? repeatTimer.start() : repeatTimer.stop()
+                    }
+                    currentRoom.chatBoxText = text
+                }
+            }
+        }
+
+        Item {
+            visible: currentRoom.chatBoxReplyId.length === 0 && (currentRoom.chatBoxAttachmentPath.length === 0 || uploadingBusySpinner.running)
+            implicitWidth: uploadButton.implicitWidth
+            implicitHeight: uploadButton.implicitHeight
+            QQC2.ToolButton {
+                id: uploadButton
+                anchors.fill: parent
+                // Matrix does not allow sending attachments in replies
+                visible: currentRoom.chatBoxReplyId.length === 0  && currentRoom.chatBoxAttachmentPath.length === 0 && !uploadingBusySpinner.running
+                icon.name: "mail-attachment"
+                text: i18n("Attach an image or file")
+                display: QQC2.AbstractButton.IconOnly
+
+                onClicked: {
+                    if (Clipboard.hasImage) {
+                        attachDialog.open()
+                    } else {
+                        var fileDialog = openFileDialog.createObject(QQC2.ApplicationWindow.overlay)
+                        fileDialog.chosen.connect((path) => {
+                            if (!path) {
+                                return;
+                            }
+                            currentRoom.chatBoxAttachmentPath = path;
+                        })
+                        fileDialog.open()
+                    }
+                }
+
+                QQC2.ToolTip.text: text
+                QQC2.ToolTip.visible: hovered
+            }
+            QQC2.BusyIndicator {
+                id: uploadingBusySpinner
+                anchors.fill: parent
+                visible: running
+                running: currentRoom && currentRoom.hasFileUploading
+            }
+        }
+
+        QQC2.ToolButton {
+            id: emojiButton
            icon.name: "smiley"
            text: i18n("Add an Emoji")
-            displayHint: Kirigami.DisplayHint.IconOnly
+            display: QQC2.AbstractButton.IconOnly
            checkable: true

-            onTriggered: {
+            onClicked: {
                if (emojiDialog.visible) {
                    emojiDialog.close()
                } else {
@@ -66,264 +211,29 @@ QQC2.Control {
                }
            }

-            tooltip: text
-        },
-        Kirigami.Action {
-            id: sendAction
-
-            property bool isBusy: false
+            QQC2.ToolTip.text: text
+            QQC2.ToolTip.visible: hovered
+        }

+        QQC2.ToolButton {
+            id: sendButton
            icon.name: "document-send"
            text: i18n("Send message")
-            displayHint: Kirigami.DisplayHint.IconOnly
-            checkable: true
+            display: QQC2.AbstractButton.IconOnly

-            onTriggered: {
-                root.postMessage()
+            onClicked: {
+                chatBar.postMessage()
            }

-            tooltip: text
-        }
-    ]
-
-    leftPadding: 0
-    rightPadding: 0
-    topPadding: 0
-    bottomPadding: 0
-
-    contentItem: QQC2.ScrollView {
-        id: chatBarScrollView
-
-        property var textFieldHeight: textField.height
-
-        property var visualLeftPadding: (root.width - chatBoxMaxWidth) / 2 - (root.width > chatBoxMaxWidth ? Kirigami.Units.largeSpacing : 0)
-        property var visualRightPadding: (root.width - chatBoxMaxWidth) / 2 + (root.width > chatBoxMaxWidth ? Kirigami.Units.largeSpacing + Kirigami.Units.smallSpacing : 0)
-        leftPadding: LayoutMirroring.enabled ? visualRightPadding : visualLeftPadding
-        rightPadding: LayoutMirroring.enabled ? visualLeftPadding : visualRightPadding
-
-        // HACK: This is to stop the ScrollBar flickering on and off as the height is increased
-        QQC2.ScrollBar.vertical.policy: chatBarHeightAnimation.running && implicitHeight <= height ? QQC2.ScrollBar.AlwaysOff : QQC2.ScrollBar.AsNeeded
-
-        Behavior on implicitHeight {
-            NumberAnimation {
-                id: chatBarHeightAnimation
-                duration: Kirigami.Units.shortDuration
-                easing.type: Easing.InOutCubic
-            }
-        }
-
-        QQC2.TextArea{
-            id: textField
-
-            topPadding: Kirigami.Units.largeSpacing + (paneLoader.visible ? paneLoader.height : 0)
-            bottomPadding: Kirigami.Units.largeSpacing
-            leftPadding: LayoutMirroring.enabled ? actionsRow.width : (root.width > chatBoxMaxWidth ? 0 : Kirigami.Units.largeSpacing)
-            rightPadding: LayoutMirroring.enabled ? (root.width > chatBoxMaxWidth ? 0 : Kirigami.Units.largeSpacing) : actionsRow.width
-
-            placeholderText: readOnly ? i18n("This room is encrypted. Build libQuotient with encryption enabled to send encrypted messages.") : currentRoom.usesEncryption ? i18n("Send an encrypted message…") : currentRoom.chatBoxAttachmentPath.length > 0 ? i18n("Set an attachment caption...") : i18n("Send a message…")
-            verticalAlignment: TextEdit.AlignVCenter
-            wrapMode: Text.Wrap
-            readOnly: (currentRoom.usesEncryption && !Controller.encryptionSupported)
-
-            Timer {
-                id: repeatTimer
-                interval: 5000
-            }
-
-            onTextChanged: {
-                if (!repeatTimer.running && Config.typingNotifications) {
-                    var textExists = text.length > 0
-                    currentRoom.sendTypingNotification(textExists)
-                    textExists ? repeatTimer.start() : repeatTimer.stop()
-                }
-                currentRoom.chatBoxText = text
-            }
-            onCursorRectangleChanged: chatBarScrollView.ensureVisible(cursorRectangle)
-
-            Keys.onEnterPressed: {
-                if (completionMenu.visible) {
-                    completionMenu.complete()
-                } else if (event.modifiers & Qt.ShiftModifier) {
-                    textField.insert(cursorPosition, "\n")
-                } else {
-                    chatBar.postMessage();
-                }
-            }
-            Keys.onReturnPressed: {
-                if (completionMenu.visible) {
-                    completionMenu.complete()
-                } else if (event.modifiers & Qt.ShiftModifier) {
-                    textField.insert(cursorPosition, "\n")
-                } else {
-                    chatBar.postMessage();
-                }
-            }
-            Keys.onTabPressed: {
-                if (completionMenu.visible) {
-                    completionMenu.complete()
-                }
-            }
-            Keys.onPressed: {
-                if (event.key === Qt.Key_V && event.modifiers & Qt.ControlModifier) {
-                    chatBar.pasteImage();
-                } else if (event.key === Qt.Key_Up && event.modifiers & Qt.ControlModifier) {
-                    let replyEvent = messageEventModel.getLatestMessageFromIndex(0)
-                    if (replyEvent && replyEvent["event_id"]) {
-                        currentRoom.chatBoxReplyId = replyEvent["event_id"]
-                    }
-                } else if (event.key === Qt.Key_Up && textField.text.length === 0) {
-                    let editEvent = messageEventModel.getLastLocalUserMessageEventId()
-                    if (editEvent) {
-                        currentRoom.chatBoxEditId = editEvent["event_id"]
-                    }
-                } else if (event.key === Qt.Key_Up && completionMenu.visible) {
-                    completionMenu.decrementIndex()
-                } else if (event.key === Qt.Key_Down && completionMenu.visible) {
-                    completionMenu.incrementIndex()
-                } else if (event.key === Qt.Key_Backspace && textField.text.length <= 1) {
-                    currentRoom.sendTypingNotification(false)
-                    repeatTimer.stop()
-                }
-            }
-
-            Loader {
-                id: paneLoader
-
-                anchors.top: parent.top
-                anchors.left: parent.left
-                anchors.leftMargin: root.width > chatBoxMaxWidth ? 0 : Kirigami.Units.largeSpacing
-                anchors.right: parent.right
-                anchors.rightMargin: root.width > chatBoxMaxWidth ? 0 : (chatBarScrollView.QQC2.ScrollBar.vertical.visible ? Kirigami.Units.largeSpacing * 3.5 : Kirigami.Units.largeSpacing)
-
-                active: visible
-                visible: root.isReplying || root.attachmentPaneVisible
-                sourceComponent: root.isReplying ? replyPane : attachmentPane
-            }
-            Component {
-                id: replyPane
-                ReplyPane {
-                    userName: root.replyUser ? root.replyUser.displayName : ""
-                    userColor: root.replyUser ? root.replyUser.color : ""
-                    userAvatar: root.replyUser ? "image://mxc/" + currentRoom.getUser(root.replyUser.id).avatarMediaId : ""
-                    text: currentRoom.chatBoxReplyMessage
-                }
-            }
-            Component {
-                id: attachmentPane
-                AttachmentPane {
-                    attachmentPath: currentRoom.chatBoxAttachmentPath
-
-                    onAttachmentCancelled: {
-                        currentRoom.chatBoxAttachmentPath = "";
-                        root.forceActiveFocus()
-                    }
-                }
-            }
-
-            background: MouseArea {
-                acceptedButtons: Qt.NoButton
-                cursorShape: Qt.IBeamCursor
-                z: 1
-            }
-        }
-
-        /**
-         * Because of the paneLoader we have to manage the scroll
-         * position manually or it doesn't keep the cursor visible properly all the time.
-         */
-        function ensureVisible(r) {
-            // Find the child that is the Flickable created by ScrollView.
-            let flickable = undefined;
-            for (var index in children) {
-                if (children[index] instanceof Flickable) {
-                    flickable = children[index];
-                }
-            }
-
-            if (flickable) {
-                if (flickable.contentX >= r.x) {
-                    flickable.contentX = r.x;
-                } else if (flickable.contentX + width <= r.x + r.width) {
-                    flickable.contentX = r.x + r.width - width;
-                } if (flickable.contentY >= r.y) {
-                    flickable.contentY = r.y;
-                } else if (flickable.contentY + height <= r.y + r.height) {
-                    flickable.contentY = r.y + r.height - height + textField.bottomPadding;
-                }
-            }
-        }
-    }
-
-    QQC2.ToolButton {
-        id: cancelButton
-        anchors.top: parent.top
-        anchors.right: parent.right
-        anchors.rightMargin: (root.width - chatBoxMaxWidth) / 2 + Kirigami.Units.largeSpacing + (chatBarScrollView.QQC2.ScrollBar.vertical.visible && !(root.width > chatBoxMaxWidth) ? Kirigami.Units.largeSpacing * 2.5 : 0)
-
-        visible: root.isReplying
-        display: QQC2.AbstractButton.IconOnly
-        action: Kirigami.Action {
-            text: i18nc("@action:button", "Cancel reply")
-            icon.name: "dialog-close"
-            onTriggered: {
-                currentRoom.chatBoxReplyId = "";
-                currentRoom.chatBoxAttachmentPath = "";
-                root.forceActiveFocus()
-            }
-            shortcut: "Escape"
-        }
-        QQC2.ToolTip.text: text
-        QQC2.ToolTip.visible: hovered
-    }
-    Row {
-        id: actionsRow
-        padding: Kirigami.Units.smallSpacing
-        spacing: Kirigami.Units.smallSpacing
-        anchors.right: parent.right
-        property var requiredMargin: (root.width - chatBoxMaxWidth) / 2 + Kirigami.Units.largeSpacing + (chatBarScrollView.QQC2.ScrollBar.vertical.visible && !(root.width > chatBoxMaxWidth) ? Kirigami.Units.largeSpacing * 2.5 : 0)
-        anchors.leftMargin: layoutDirection === Qt.RightToLeft ? requiredMargin : 0
-        anchors.rightMargin: layoutDirection === Qt.RightToLeft ? 0 : requiredMargin
-        anchors.bottom: parent.bottom
-        anchors.bottomMargin: Kirigami.Units.largeSpacing - 2
-
-        Repeater {
-            model: root.actions
-            Kirigami.Icon {
-                implicitWidth: Kirigami.Units.iconSizes.smallMedium
-                implicitHeight: Kirigami.Units.iconSizes.smallMedium
-
-                source: modelData.isBusy ? "" : (modelData.icon.name.length > 0 ? modelData.icon.name : modelData.icon.source)
-                active: actionArea.containsPress
-                visible: modelData.visible
-                enabled: modelData.enabled
-                MouseArea {
-                    id: actionArea
-                    anchors.fill: parent
-                    onClicked: modelData.trigger()
-                    cursorShape: Qt.PointingHandCursor
-                }
-
-                QQC2.ToolTip.visible: modelData.tooltip !== "" && hoverHandler.hovered
-                QQC2.ToolTip.text: modelData.tooltip
-                HoverHandler { id: hoverHandler }
-
-                QQC2.BusyIndicator {
-                    anchors.fill: parent
-                    leftPadding: 0
-                    rightPadding: 0
-                    topPadding: 0
-                    bottomPadding: 0
-                    visible: running
-                    running: modelData.isBusy
-                }
-            }
+            QQC2.ToolTip.text: text
+            QQC2.ToolTip.visible: hovered
        }
    }

    EmojiDialog {
        id: emojiDialog
        x: parent.width - implicitWidth
-        y: -implicitHeight // - Kirigami.Units.smallSpacing
+        y: -implicitHeight - Kirigami.Units.smallSpacing

        modal: false
        includeCustom: true
@@ -333,10 +243,6 @@ QQC2.Control {
        onClosed: if (emojiButton.checked) emojiButton.checked = false
    }

-    background: Rectangle {
-        color: Kirigami.Theme.backgroundColor
-    }
-
    CompletionMenu {
        id: completionMenu
        height: implicitHeight
@@ -352,29 +258,26 @@ QQC2.Control {
        }
    }

+    Connections {
+        target: currentRoom
+        function onChatBoxEditIdChanged() {
+            if (currentRoom.chatBoxEditMessage.length > 0) {
+                chatBar.inputFieldText = currentRoom.chatBoxEditMessage
+            }
+        }
+    }
+
    ChatDocumentHandler {
        id: documentHandler
-        document: textField.textDocument
-        cursorPosition: textField.cursorPosition
-        selectionStart: textField.selectionStart
-        selectionEnd: textField.selectionEnd
+        document: inputField.textDocument
+        cursorPosition: inputField.cursorPosition
+        selectionStart: inputField.selectionStart
+        selectionEnd: inputField.selectionEnd
        Component.onCompleted: {
            RoomManager.chatDocumentHandler = documentHandler;
        }
    }

-    function forceActiveFocus() {
-        textField.forceActiveFocus();
-        // set the cursor to the end of the text
-        textField.cursorPosition = textField.length;
-    }
-
-    function insertText(text) {
-        let initialCursorPosition = textField.cursorPosition;
-
-        textField.text = textField.text.substr(0, initialCursorPosition) + text + textField.text.substr(initialCursorPosition)
-        textField.cursorPosition = initialCursorPosition + text.length
-    }

    function pasteImage() {
        let localPath = Clipboard.saveImage();
@@ -385,11 +288,12 @@ QQC2.Control {
    }

    function postMessage() {
-        actionsHandler.handleNewMessage();
+        actionsHandler.handleMessage();
        repeatTimer.stop()
        currentRoom.markAllMessagesAsRead();
-        textField.clear();
+        inputField.clear();
        currentRoom.chatBoxReplyId = "";
+        currentRoom.chatBoxEditId = "";
        messageSent()
    }
 }
--- a/src/qml/Component/ChatBox/ChatBox.qml
+++ b/src/qml/Component/ChatBox/ChatBox.qml
@@ -5,52 +5,108 @@
 import QtQuick 2.15
 import QtQuick.Controls 2.15 as QQC2
 import QtQuick.Layouts 1.15
-
 import org.kde.kirigami 2.15 as Kirigami
+
 import org.kde.neochat 1.0

 ColumnLayout {
    id: chatBox

+    property alias inputFieldText: chatBar.inputFieldText
+
    signal messageSent()

-    property alias chatBar: chatBar
-
-    readonly property int extraWidth: width >= Kirigami.Units.gridUnit * 47 ? Math.min((width - Kirigami.Units.gridUnit * 47), Kirigami.Units.gridUnit * 20) : 0
-    readonly property int chatBoxMaxWidth: Config.compactLayout ? width : Math.min(width, Kirigami.Units.gridUnit * 39 + extraWidth)
-
    spacing: 0

-    Kirigami.InlineMessage {
+    Kirigami.Separator {
+        id: connectionPaneSeparator
+        visible: connectionPane.visible
        Layout.fillWidth: true
-        Layout.leftMargin: 1 // So we can see the border
-        Layout.rightMargin: 1 // So we can see the border
+    }

-        text: i18n("NeoChat is offline. Please check your network connection.")
+    QQC2.Pane {
+        id: connectionPane
+        padding: fontMetrics.lineSpacing * 0.25
+        FontMetrics {
+            id: fontMetrics
+            font: networkLabel.font
+        }
+        spacing: 0
+        Kirigami.Theme.colorSet: Kirigami.Theme.View
+        background: Rectangle {
+            color: Kirigami.Theme.backgroundColor
+        }
        visible: !Controller.isOnline
+        Layout.fillWidth: true
+        QQC2.Label {
+            id: networkLabel
+            width: parent.width
+            wrapMode: Text.Wrap
+            text: i18n("NeoChat is offline. Please check your network connection.")
+        }
    }

    Kirigami.Separator {
+        id: replySeparator
+        visible: replyPane.visible
+        Layout.fillWidth: true
+    }
+
+    ReplyPane {
+        id: replyPane
+        visible: currentRoom.chatBoxReplyId.length > 0 || currentRoom.chatBoxEditId.length > 0
+        Layout.fillWidth: true
+
+        onReplyCancelled: {
+            chatBox.focusInputField()
+        }
+    }
+
+    Kirigami.Separator {
+        id: attachmentSeparator
+        visible: attachmentPane.visible
+        Layout.fillWidth: true
+    }
+
+    AttachmentPane {
+        id: attachmentPane
+        visible: currentRoom.chatBoxAttachmentPath.length > 0
+        Layout.fillWidth: true
+    }
+
+    Kirigami.Separator {
+        id: chatBarSeparator
+        visible: chatBar.visible
+
        Layout.fillWidth: true
    }

    ChatBar {
        id: chatBar
-
        visible: currentRoom.canSendEvent("m.room.message")

        Layout.fillWidth: true
-        Layout.minimumHeight: implicitHeight + Kirigami.Units.largeSpacing
-        // lineSpacing is height+leading, so subtract leading once since leading only exists between lines.
-        Layout.maximumHeight: chatBarFontMetrics.lineSpacing * 8 - chatBarFontMetrics.leading + textField.topPadding + textField.bottomPadding
-
-        FontMetrics {
-            id: chatBarFontMetrics
-            font: chatBar.textField.font
-        }

        onMessageSent: {
            chatBox.messageSent();
        }
+
+        Behavior on implicitHeight {
+            NumberAnimation {
+                property: "implicitHeight"
+                duration: Kirigami.Units.shortDuration
+                easing.type: Easing.OutCubic
+            }
+        }
+    }
+
+    function insertText(str) {
+        let index = chatBar.cursorPosition;
+        chatBox.inputFieldText = inputFieldText.substr(0, chatBar.cursorPosition) + str + inputFieldText.substr(chatBar.cursorPosition);
+        chatBar.cursorPosition = index + str.length;
+    }
+
+    function focusInputField() {
+        chatBar.inputFieldForceActiveFocusTriggered()
    }
 }
--- a/src/qml/Component/ChatBox/CompletionMenu.qml
+++ b/src/qml/Component/ChatBox/CompletionMenu.qml
@@ -22,7 +22,7 @@ QQC2.Popup {
        connection: Controller.activeConnection
    }

-    property var chatDocumentHandler
+    required property var chatDocumentHandler
    Component.onCompleted: {
        chatDocumentHandler.completionModel.roomListModel = roomListModel;
    }
--- a/src/qml/Component/ChatBox/ReplyPane.qml
+++ b/src/qml/Component/ChatBox/ReplyPane.qml
@@ -10,82 +10,108 @@ import org.kde.kirigami 2.14 as Kirigami

 import org.kde.neochat 1.0

-GridLayout {
-    id: root
-    property string userName
-    property color userColor: Kirigami.Theme.highlightColor
-    property var userAvatar: ""
-    property var text
+Loader {
+    id: replyPane
+    property NeoChatUser user: currentRoom.chatBoxReplyUser ?? currentRoom.chatBoxEditUser

-    rows: 3
-    columns: 3
-    rowSpacing: Kirigami.Units.smallSpacing
-    columnSpacing: Kirigami.Units.largeSpacing
+    signal replyCancelled()

-    QQC2.Label {
-        id: replyLabel
-        Layout.fillWidth: true
-        Layout.alignment: Qt.AlignLeft
-        Layout.columnSpan: 3
-        topPadding: Kirigami.Units.smallSpacing
+    active: visible
+    sourceComponent: QQC2.Pane {
+        id: replyPane

-        text: i18n("Replying to:")
-    }
-    Rectangle {
-        id: verticalBorder
+        Kirigami.Theme.colorSet: Kirigami.Theme.View

-        Layout.fillHeight: true
-        Layout.rowSpan: 2
+        spacing: leftPadding

-        implicitWidth: Kirigami.Units.smallSpacing
-        color: userColor
-    }
-    Kirigami.Avatar {
-        id: replyAvatar
+        contentItem: RowLayout {
+            Layout.fillWidth: true
+            spacing: replyPane.spacing

-        implicitWidth: Kirigami.Units.iconSizes.small
-        implicitHeight: Kirigami.Units.iconSizes.small
+            FontMetrics {
+                id: fontMetrics
+                font: textArea.font
+            }

-        source: userAvatar
-        name: userName
-        color: userColor
-    }
-    QQC2.Label {
-        Layout.fillWidth: true
-        Layout.alignment: Qt.AlignLeft
+            Kirigami.Avatar {
+                id: avatar
+                Layout.alignment: textContentLayout.height > avatar.height ? Qt.AlignHCenter | Qt.AlignTop : Qt.AlignCenter
+                Layout.preferredWidth: Layout.preferredHeight
+                Layout.preferredHeight: fontMetrics.lineSpacing * 2 - fontMetrics.leading
+                source: user ? "image://mxc/" + currentRoom.getUser(user.id).avatarMediaId : ""
+                name: user ? user.displayName : ""
+                color: user ? user.color : "transparent"
+                visible: Boolean(user)
+            }

-        color: userColor
-        text: userName
-        elide: Text.ElideRight
-    }
-    QQC2.TextArea {
-        id: textArea
+            ColumnLayout {
+                id: textContentLayout
+                Layout.alignment: Qt.AlignCenter
+                Layout.fillWidth: true
+                spacing: fontMetrics.leading
+                QQC2.Label {
+                    Layout.fillWidth: true
+                    textFormat: Text.StyledText
+                    elide: Text.ElideRight
+                    text: {
+                        let heading = "<b>%1</b>"
+                        let userName = user ? "<font color=\""+ user.color +"\">" + currentRoom.htmlSafeMemberName(user.id) + "</font>" : ""
+                        if (currentRoom.chatBoxEditId.length > 0) {
+                            heading = heading.arg(i18n("Editing message:")) + "<br/>"
+                        } else {
+                            heading = heading.arg(i18n("Replying to %1:", userName))
+                        }

-        Layout.fillWidth: true
-        Layout.columnSpan: 2
+                        return heading
+                    }
+                }
+                //TODO edit user mentions
+                QQC2.ScrollView {
+                    Layout.alignment: Qt.AlignLeft | Qt.AlignTop
+                    Layout.fillWidth: true
+                    Layout.maximumHeight: fontMetrics.lineSpacing * 8 - fontMetrics.leading

-        leftPadding: 0
-        rightPadding: 0
-        topPadding: 0
-        bottomPadding: 0
-        text: "<style> a{color:" + Kirigami.Theme.linkColor + ";}.user-pill{}</style>" + replyTextMetrics.elidedText
-        selectByMouse: true
-        selectByKeyboard: true
-        readOnly: true
-        wrapMode: QQC2.Label.Wrap
-        textFormat: TextEdit.RichText
-        background: Item {}
-        HoverHandler {
-            cursorShape: textArea.hoveredLink ? Qt.PointingHandCursor : Qt.IBeamCursor
+                    // HACK: Hide unnecessary horizontal scrollbar (https://bugreports.qt.io/browse/QTBUG-83890)
+                    QQC2.ScrollBar.horizontal.policy: QQC2.ScrollBar.AlwaysOff
+
+                    QQC2.TextArea {
+                        id: textArea
+                        leftPadding: 0
+                        rightPadding: 0
+                        topPadding: 0
+                        bottomPadding: 0
+                        text: "<style> a{color:" + Kirigami.Theme.linkColor + ";}.user-pill{}</style>" + (currentRoom.chatBoxEditId.length > 0 ? currentRoom.chatBoxEditMessage : currentRoom.chatBoxReplyMessage)
+                        selectByMouse: true
+                        selectByKeyboard: true
+                        readOnly: true
+                        wrapMode: QQC2.Label.Wrap
+                        textFormat: TextEdit.RichText
+                        background: Item {}
+                        HoverHandler {
+                            cursorShape: textArea.hoveredLink ? Qt.PointingHandCursor : Qt.IBeamCursor
+                        }
+                    }
+                }
+            }
+
+            QQC2.ToolButton {
+                display: QQC2.AbstractButton.IconOnly
+                action: Kirigami.Action {
+                    text: i18nc("@action:button", "Cancel reply")
+                    icon.name: "dialog-close"
+                    onTriggered: {
+                        currentRoom.chatBoxReplyId = "";
+                        currentRoom.chatBoxEditId = "";
+                    }
+                    shortcut: "Escape"
+                }
+                QQC2.ToolTip.text: text
+                QQC2.ToolTip.visible: hovered
+            }
        }

-        TextMetrics {
-            id: replyTextMetrics
-
-            text: root.text
-            font: textArea.font
-            elide: Qt.ElideRight
-            elideWidth: textArea.width * 2 - Kirigami.Units.smallSpacing * 2
+        background: Rectangle {
+            color: Kirigami.Theme.backgroundColor
        }
    }
 }
--- a/src/qml/Component/Emoji/EmojiPicker.qml
+++ b/src/qml/Component/Emoji/EmojiPicker.qml
@@ -27,10 +27,6 @@ ColumnLayout {

    signal chosen(string emoji)

-    onActiveFocusChanged: if (activeFocus) {
-        searchField.forceActiveFocus()
-    }
-
    spacing: 0

    QQC2.ScrollView {
@@ -82,12 +78,6 @@ ColumnLayout {
        id: searchField
        Layout.margins: Kirigami.Units.smallSpacing
        Layout.fillWidth: true
-
-        /**
-         * The focus is manged by the parent and we don't want to use the standard
-         * shortcut as it could block other SearchFields from using it.
-         */
-        focusSequence: ""
    }

    EmojiGrid {
--- a/src/qml/Component/Login/Loading.qml
+++ b/src/qml/Component/Login/Loading.qml
@@ -16,11 +16,4 @@ Kirigami.LoadingPlaceholder {
    QQC2.Label {
        text: i18n("Please wait. This might take a little while.")
    }
-
-    Connections {
-        target: Controller
-        function onInitiated() {
-            closeDialog()
-        }
-    }
 }
--- a/Show More
+++ b/Show More