GIT_SILENT Update Appstream for new release

GIT_SILENT Upgrade release service version to 23.08.2.
GIT_SILENT Sync po/docbooks with svn
2023-10-07 18:01:35 +02:00 · 2023-10-07 17:05:08 +02:00 · 2023-10-01 03:38:21 +00:00 · 2023-09-30 03:10:36 +00:00 · 2023-09-26 03:21:35 +00:00 · 2023-09-20 03:07:35 +00:00
101 changed files with 8606 additions and 9884 deletions
--- a/.kde-ci.yml
+++ b/.kde-ci.yml
@@ -58,9 +58,5 @@ Dependencies:
  'require':
    'frameworks/kdbusaddons': '@latest-kf6'

- 'on': ['Linux/Qt6', 'Linux/Qt5']
-  'require':
-    'sdk/selenium-webdriver-at-spi': '@latest-kf6'
-
 Options:
-  require-passing-tests-on: [ 'Linux/Qt5', 'FreeBSD', 'Windows' ]
+  require-passing-tests-on: [ 'Linux/Qt5', 'FreeBSD' ]
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,8 +8,8 @@ cmake_minimum_required(VERSION 3.16)

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

 project(NeoChat VERSION ${RELEASE_SERVICE_VERSION})
@@ -93,6 +93,12 @@ set_package_properties(KF${QT_MAJOR_VERSION}Kirigami2 PROPERTIES
        )
 find_package(KF${QT_MAJOR_VERSION}KirigamiAddons 0.7.2 REQUIRED)

+find_package(Qt${QT_MAJOR_VERSION}Keychain)
+set_package_properties(Qt${QT_MAJOR_VERSION}Keychain PROPERTIES
+    TYPE REQUIRED
+    PURPOSE "Secure storage of account secrets"
+)
+
 if(ANDROID)
    find_package(OpenSSL)
    set_package_properties(OpenSSL PROPERTIES
@@ -124,11 +130,6 @@ set_package_properties(Quotient${QUOTIENT_SUFFIX} PROPERTIES
    PURPOSE "Talk with matrix server"
 )

-if (NOT TARGET Olm::Olm)
-    message(FATAL_ERROR "NeoChat requires Quotient with the E2EE feature enabled")
-endif()
-
-
 find_package(cmark)
 set_package_properties(cmark PROPERTIES
    TYPE REQUIRED
@@ -140,6 +141,7 @@ set_package_properties(cmark PROPERTIES
 ecm_find_qmlmodule(org.kde.kquickimageeditor 1.0)
 ecm_find_qmlmodule(org.kde.kitemmodels 1.0)
 ecm_find_qmlmodule(org.kde.quickcharts 1.0)
+ecm_find_qmlmodule(QtLocation ${QTLOCATION_MODULE_QML_VERSION})

 find_package(KQuickImageEditor COMPONENTS)
 set_package_properties(KQuickImageEditor PROPERTIES
@@ -159,6 +161,10 @@ set_package_properties(KF${QT_MAJOR_VERSION}DocTools PROPERTIES DESCRIPTION
    TYPE OPTIONAL
 )

+if(NOT Quotient${QUOTIENT_SUFFIX}_VERSION_MINOR GREATER 6)
+    cmake_policy(SET CMP0063 OLD)
+endif()
+
 if(ANDROID)
    find_package(Sqlite3)
    configure_file(${CMAKE_CURRENT_SOURCE_DIR}/android/version.gradle.in ${CMAKE_BINARY_DIR}/version.gradle)
@@ -174,11 +180,9 @@ install(FILES org.kde.neochat.tray.svg DESTINATION ${KDE_INSTALL_FULL_ICONDIR}/h
 add_definitions(-DQT_NO_FOREACH)

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

 if(KF${QT_MAJOR_VERSION}DocTools_FOUND)
--- a/appiumtests/CMakeLists.txt
+++ b/appiumtests/CMakeLists.txt
@@ -1,23 +0,0 @@
-# SPDX-License-Identifier: BSD-3-Clause
-# SPDX-FileCopyrightText: 2022 Harald Sitter <sitter@kde.org>
-
-
-if(NOT BUILD_TESTING OR NOT CMAKE_SYSTEM_NAME MATCHES "Linux")
-    return()
-endif()
-
-find_package(SeleniumWebDriverATSPI)
-set_package_properties(SeleniumWebDriverATSPI PROPERTIES
-    DESCRIPTION "Server component for selenium tests using Linux accessibility infrastructure"
-    PURPOSE "Needed for GUI tests"
-    URL "https://invent.kde.org/sdk/selenium-webdriver-at-spi"
-    TYPE OPTIONAL
-)
-if(NOT SeleniumWebDriverATSPI_FOUND)
-    return()
-endif()
-
-add_test(
-    NAME logintest
-    COMMAND selenium-webdriver-at-spi-run ${CMAKE_CURRENT_SOURCE_DIR}/logintest.py
-)
--- a/appiumtests/login-server.py
+++ b/appiumtests/login-server.py
@@ -1,42 +0,0 @@
-# SPDX-License-Identifier: MIT
-# SPDX-FileCopyrightText: 2023 Tobias Fella <tobias.fella@kde.org>
-
-
-from flask import Flask, request, abort
-app = Flask(__name__)
-
-@app.route("/_matrix/client/v3/login", methods=["GET"])
-def login_get():
-    result = dict()
-    result["flows"] = [dict()]
-    result["flows"][0]["type"] = "m.login.password"
-    return result
-
-@app.route("/_matrix/client/v3/login", methods=["POST"])
-def login_post():
-    data = request.get_json()
-    if data["identifier"]["user"] != "user" or data["password"] != "1234":
-        abort(403)
-    print(data)
-    result = dict()
-    result["access_token"] = "token_1234"
-    result["device_id"] = "device_1234"
-    result["user_id"] = "@user:localhost:1234"
-    return result
-
-@app.route("/_matrix/client/r0/sync")
-def sync():
-    result = dict()
-    result["next_batch"] = "batch1234"
-    return result
-
-@app.route("/.well-known/matrix/client")
-def well_known():
-    reply = dict()
-    reply["m.homeserver"] = dict()
-    reply["m.homeserver"]["base_url"] = "https://localhost:1234"
-    return reply
-
-
-if __name__ == "__main__":
-    app.run(ssl_context='adhoc', port=1234)
--- a/appiumtests/logintest.py
+++ b/appiumtests/logintest.py
@@ -1,44 +0,0 @@
-#!/usr/bin/env python3
-
-# SPDX-License-Identifier: MIT
-# SPDX-FileCopyrightText: 2021-2022 Harald Sitter <sitter@kde.org>
-# SPDX-FileCopyrightText: 2023 Tobias Fella <tobias.fella@kde.org>
-
-import unittest
-from appium import webdriver
-from appium.webdriver.common.appiumby import AppiumBy
-from selenium.webdriver.support.ui import WebDriverWait
-import time
-import subprocess
-
-class LoginTest(unittest.TestCase):
-    @classmethod
-    def setUpClass(self):
-        desired_caps = {}
-        desired_caps["app"] = "neochat --ignore-ssl-errors"
-        desired_caps["timeouts"] = {'implicit': 10000}
-        self.driver = webdriver.Remote(
-            command_executor='http://127.0.0.1:4723',
-            desired_capabilities=desired_caps)
-        subprocess.Popen(["python","login-server.py"])
-
-    def setUp(self):
-        pass
-
-    def tearDown(self):
-        if not self._outcome.result.wasSuccessful():
-            self.driver.get_screenshot_as_file("failed_test_shot_{}.png".format(self.id()))
-
-    @classmethod
-    def tearDownClass(self):
-        self.driver.quit()
-
-    def test_login(self):
-        self.driver.find_element(by=AppiumBy.NAME, value="Matrix ID").send_keys("@user:localhost:1234")
-        self.driver.find_element(by=AppiumBy.NAME, value="Continue").click()
-        self.driver.find_element(by=AppiumBy.NAME, value="Password").send_keys("1234")
-        self.driver.find_element(by=AppiumBy.NAME, value="Login").click()
-        self.driver.find_element(by=AppiumBy.NAME, value="Join some rooms to get started").click()
-
-if __name__ == '__main__':
-    unittest.main()
--- a/autotests/texthandlertest.cpp
+++ b/autotests/texthandlertest.cpp
@@ -10,8 +10,6 @@
 #include <Quotient/syncdata.h>
 #include <qnamespace.h>

-#include "utils.h"
-
 using namespace Quotient;

 class TestRoom : public NeoChatRoom
@@ -557,10 +555,10 @@ void TextHandlerTest::receiveRichPlainUrl()
 void TextHandlerTest::receiveRichEmote()
 {
    auto event = room->messageEvents().at(1).get();
-    auto author = room->user(event->senderId());
+    auto author = static_cast<NeoChatUser *>(room->user(event->senderId()));
    const QString testInputString = QStringLiteral("This is an emote.");
-    const QString testOutputString = QStringLiteral("* <a href=\"https://matrix.to/#/@example:example.org\" style=\"color:")
-        + Utils::getUserColor(author->hueF()).name() + QStringLiteral("\">@example:example.org</a> This is an emote.");
+    const QString testOutputString = QStringLiteral("* <a href=\"https://matrix.to/#/@example:example.org\" style=\"color:") + author->color().name()
+        + QStringLiteral("\">@example:example.org</a> This is an emote.");

    TextHandler testTextHandler;
    testTextHandler.setData(testInputString);
@@ -646,5 +644,5 @@ void TextHandlerTest::linkPreviewsReject()
    QCOMPARE(testTextHandler.getLinkPreviews(), testOutputLinks);
 }

-QTEST_MAIN(TextHandlerTest)
+QTEST_GUILESS_MAIN(TextHandlerTest)
 #include "texthandlertest.moc"
--- a/org.kde.neochat.appdata.xml
+++ b/org.kde.neochat.appdata.xml
@@ -46,21 +46,43 @@
  <name xml:lang="uk">NeoChat</name>
  <name xml:lang="x-test">xxNeoChatxx</name>
  <name xml:lang="zh-CN">NeoChat</name>
-  <summary>Chat with your friends on matrix</summary>
-  <summary xml:lang="ca">Xategeu amb els vostres amics a Matrix</summary>
-  <summary xml:lang="ca-valencia">Xategeu amb els vostres amics a Matrix</summary>
-  <summary xml:lang="eo">Babilu kun viaj amikoj sur matrix</summary>
-  <summary xml:lang="eu">Berriketan jardun zure lagunekin «Matrix»en</summary>
-  <summary xml:lang="gl">Charle coas súas amizades en Matrix.</summary>
-  <summary xml:lang="ka">ესაუბრეთ მეგობრებს Matrix-ზე</summary>
-  <summary xml:lang="nl">Met uw vrienden chatten op matrix</summary>
-  <summary xml:lang="nn">Prat med vennar på Matrix</summary>
-  <summary xml:lang="sl">Klepet z vašimi prijatelji na matrixu</summary>
-  <summary xml:lang="sv">Chatta med dina vänner på Matrix</summary>
-  <summary xml:lang="ta">மேட்ரிக்ஸு மூலம் உங்கள் நண்பர்களிடம் பேசலாம்</summary>
-  <summary xml:lang="tr">Matrix'te arkadaşlarınızla sohbet edin</summary>
-  <summary xml:lang="uk">Спілкуйтеся з вашими друзями у matrix</summary>
-  <summary xml:lang="x-test">xxChat with your friends on matrixxx</summary>
+  <summary>A client for matrix, the decentralized communication protocol</summary>
+  <summary xml:lang="ar">عميل لماتركس، ميفاق الاتصال اللامركزي</summary>
+  <summary xml:lang="az">Matrix üçün müştəri, mərkəzləşməmiş kommunikasiya protokolu</summary>
+  <summary xml:lang="ca">Un client de Matrix, el protocol de comunicacions descentralitzat</summary>
+  <summary xml:lang="ca-valencia">Un client de 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="eo">Kliento por matrix, la malcentra komunikprotokolo</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>
+  <summary xml:lang="fi">Asiakas Matrixille, hajautetulle viestintäyhteyskäytännölle</summary>
+  <summary xml:lang="fr">Un client pour « Matrix », le protocole décentralisé de communications.</summary>
+  <summary xml:lang="gl">Un cliente para Matrix, o protocolo de comunicación descentralizada.</summary>
+  <summary xml:lang="hu">Kliens a matrixhoz, a decentralizált kommunikációs protokollhoz</summary>
+  <summary xml:lang="ia">Un cliente per Matrix, le protocollo de communication decentralisate</summary>
+  <summary xml:lang="id">Klien untuk matrix, protokol komunikasi terdesentralisasi</summary>
+  <summary xml:lang="ie">Un cliente de Matrix, li protocol de communication decentralisat</summary>
+  <summary xml:lang="it">Un client per matrix, il protocollo di comunicazione decentralizzato</summary>
+  <summary xml:lang="ka">კლიენტი Matrix-სთვის, დეცენტრალიზებული კომუნიკაციის პროტოკოლისთვის</summary>
+  <summary xml:lang="ko">Matrix, 분산 대화 프로토콜 클라이언트</summary>
+  <summary xml:lang="nl">Een client voor matrix, het gedecentraliseerde communicatieprotocol</summary>
+  <summary xml:lang="nn">Ein klient for Matrix – protokollen for desentralisert kommunikasjon</summary>
+  <summary xml:lang="pa">ਮੈਟਰਿਕਸ, ਸਰਬ-ਸਾਂਝੇ ਸੰਚਾਰ ਪਰੋਟੋਕਾਲ, ਲਈ ਕਲਾਈਂਟ ਹੈ</summary>
+  <summary xml:lang="pl">Program do obsługi matriksa, rozproszonego protokołu porozumiewania się</summary>
+  <summary xml:lang="pt">Um cliente para o Matrix, o protocolo de comunicação descentralizado</summary>
+  <summary xml:lang="pt-BR">Um cliente do Matrix, o protocolo de comunicação descentralizado</summary>
+  <summary xml:lang="ru">Клиент для Matrix — децентрализованного коммуникационного протокола</summary>
+  <summary xml:lang="sk">Klient pre matrix, decentralizovaný komunikačný protokol</summary>
+  <summary xml:lang="sl">Odjemalec za matrix, decentralizirani komunikacijski protokol</summary>
+  <summary xml:lang="sv">En klient för Matrix, det decentraliserade kommunikationsprotokollet</summary>
+  <summary xml:lang="ta">மையமில்லா தகவல் பரிமாற்ற நெறிமுறையான மேட்ரிக்ஸுக்கான செயலி</summary>
+  <summary xml:lang="tr">Merkezi olmayan iletişim protokolü Matrix için bir istemci</summary>
+  <summary xml:lang="uk">Клієнт matrix, децентралізованого протоколу обміну даними</summary>
+  <summary xml:lang="x-test">xxA client for matrix, the decentralized communication protocolxx</summary>
+  <summary xml:lang="zh-CN">分布式通讯协议 Matrix 的客户端</summary>
  <description>
    <p>NeoChat is a client for Matrix, the decentralized communication protocol for instant messaging. It allows you to send text messages, videos and audio files to your family, colleagues and friends. It uses KDE frameworks and most notably Kirigami
 to provide a convergent experience across multiple platforms.</p>
@@ -92,7 +114,6 @@ to provide a convergent experience across multiple platforms.</p>
    <p xml:lang="ca">NeoChat pretén ser una aplicació amb totes les característiques per a l'especificació de Matrix. Com a tal, s'ha implementat tota l'especificació actual estable amb les notables excepcions de la VoIP, fils i alguns aspectes de l'encriptatge d'extrem a extrem. Hi ha algunes altres omissions més petites a causa del fet que l'especificació de Matrix està evolucionant constantment, però l'objectiu segueix sent proporcionar suport eventual per a tota l'especificació.</p>
    <p xml:lang="ca-valencia">NeoChat pretén ser una aplicació amb totes les característiques per a l'especificació de Matrix. Com a tal, s'ha implementat tota l'especificació actual estable amb les notables excepcions de VoIP, fils i alguns aspectes de l'encriptació d'extrem a extrem. Hi ha algunes altres omissions més xicotetes a causa del fet que l'especificació de Matrix està evolucionant constantment, però l'objectiu seguix sent proporcionar suport eventual per a tota l'especificació.</p>
    <p xml:lang="en-GB">NeoChat aims to be a fully featured application for the Matrix specification. As such everything in the current stable specification with the notable exceptions of VoIP, threads and some aspects of End-to-End Encryption are supported. There are a few other smaller omissions due to the fact that the Matrix spec is constantly evolving but the aim remains to provide eventual support for the entire spec.</p>
-    <p xml:lang="eo">NeoChat celas esti plene kapabla aplikaĵo por la Matrix-specifo. Kiel tia, ĉio en la nuna stabila specifo kun la rimarkindaj esceptoj de VoIP, fadenoj kaj kelkaj aspektoj de Fin-al-Fina Ĉifrado estas subtenataj. Estas kelkaj aliaj pli malgrandaj preterlasoj pro la fakto, ke la Matrix-speco konstante evoluas, sed la celo restas provizi finfine subtenon por la tuta specifaĵo.</p>
    <p xml:lang="es">NeoChat pretende ser una aplicación con todas las funciones para la especificación de Matrix. Como tal, admite todo en la especificación estable actual, con las notables excepciones de VoIP, subprocesos y algunas funciones de cifrado de extremo a extremo. Existen algunas omisiones menos importantes debido al hecho de que la especificación de Matrix está en constante evolución, pero el objetivo sigue siendo brindar compatibilidad final con toda la especificación.</p>
    <p xml:lang="eu">«NeoChat»ek «Matrix» zehaztapenaren ezaugarri guztiak eskaintzen dituen aplikazio bat izan nahi du. Beraz, egungo zehaztapen egonkorrean dagoen guztiaren euskarria du, VoIP, hariak eta muturren artean zifratzeko salbuespen nabarmenekin. Badira beste ez-betetze txikiago batzuk, «Matrix»en zehaztapena etengabe eboluzioan dagoelako, baina azken helburua zehaztapen osoaren euskarria ematea izaten jarraitzen du.</p>
    <p xml:lang="fi">NeoChat pyrkii olemaan Matrix-määritelmän täysominaisuuksinen sovellus, joten se tukee kaikkea nykyisessä vakaassa määritelmässä muutamaa huomattavaa poikkeusta lukuun ottamatta (VoIP, säikeet ja jotkin piirteet päästä päähän -salauksessa). Joitakin pienempiäkin puutteita on Matrix-määritelmän jatkuvan kehityksen vuoksi, mutta lopputavoitteena on tarjota määritelmän täysi tuki.</p>
@@ -116,7 +137,6 @@ to provide a convergent experience across multiple platforms.</p>
    <p xml:lang="ca">A causa de la naturalesa del desenvolupament de l'especificació de Matrix, el NeoChat també implementa nombroses característiques inestables. Actualment són:</p>
    <p xml:lang="ca-valencia">A causa de la naturalea del desenvolupament de l'especificació de Matrix, NeoChat també implementa nombroses característiques inestables. Actualment són:</p>
    <p xml:lang="en-GB">Due to the nature of the Matrix specification development NeoChat also supports numerous unstable features. Currently these are:</p>
-    <p xml:lang="eo">Pro la naturo de la Matrix-specifevoluo NeoChat ankaŭ subtenas multajn malstabilajn funkciojn. Nuntempe ĉi tiuj estas:</p>
    <p xml:lang="es">Debido a la naturaleza del desarrollo de la especificación de Matrix, NeoChat también permite numerosas funciones no estables, como:</p>
    <p xml:lang="eu">«Matrix» zehaztapenaren garapenaren izaeragatik, «Neo¢hat»ek ezaugarri ezegonkor ugari ere onartzen ditu. Gaur egun hauek:</p>
    <p xml:lang="fi">Matrix-määritelmän kehittyessä NeoChat tukee myös monia epävakaita ominaisuuksia. Tällä hetkellä näitä ovat:</p>
@@ -142,7 +162,6 @@ to provide a convergent experience across multiple platforms.</p>
      <li xml:lang="ca">Enquestes - MSC3381</li>
      <li xml:lang="ca-valencia">Enquestes - MSC3381</li>
      <li xml:lang="en-GB">Polls - MSC3381</li>
-      <li xml:lang="eo">Enketoj - MSC3381</li>
      <li xml:lang="es">Encuestas - MSC3381</li>
      <li xml:lang="eu">Polls - MSC3381</li>
      <li xml:lang="fi">Kyselyt – MSC3381</li>
@@ -154,6 +173,7 @@ to provide a convergent experience across multiple platforms.</p>
      <li xml:lang="ko">투표 - MSC3381</li>
      <li xml:lang="nl">Polls - MSC3381</li>
      <li xml:lang="nn">Avstemmingar – MSC3381</li>
+      <li xml:lang="pl">Ankiety - MSC3381</li>
      <li xml:lang="pt">Inquéritos - MSC3381</li>
      <li xml:lang="sl">Polls - MSC3381</li>
      <li xml:lang="sv">Polls - MSC3381</li>
@@ -166,7 +186,6 @@ to provide a convergent experience across multiple platforms.</p>
      <li xml:lang="ca">Paquets d'adhesius - MSC2545</li>
      <li xml:lang="ca-valencia">Paquets d'adhesius - MSC2545</li>
      <li xml:lang="en-GB">Sticker Packs - MSC2545</li>
-      <li xml:lang="eo">Glumark-Pakoj - MSC2545</li>
      <li xml:lang="es">Paquetes de pegatinas - MSC2545</li>
      <li xml:lang="eu">Eranskailu paketeak - MSC2545</li>
      <li xml:lang="fi">Tarrapakkaukset – MSC2545</li>
@@ -178,6 +197,7 @@ to provide a convergent experience across multiple platforms.</p>
      <li xml:lang="ko">스티커 팩 - MSC2545</li>
      <li xml:lang="nl">Sticker Packs - MSC2545</li>
      <li xml:lang="nn">Klistremerke-pakkar – MSC2545</li>
+      <li xml:lang="pl">Paczki naklejek - MSC2545</li>
      <li xml:lang="pt">Pacotes de Autocolantes - MSC2545</li>
      <li xml:lang="sl">Sticker Packs - MSC2545</li>
      <li xml:lang="sv">Sticker Packs - MSC2545</li>
@@ -190,7 +210,6 @@ to provide a convergent experience across multiple platforms.</p>
      <li xml:lang="ca">Esdeveniments d'ubicació - MSC3488</li>
      <li xml:lang="ca-valencia">Esdeveniments d'ubicació - MSC3488</li>
      <li xml:lang="en-GB">Location Events - MSC3488</li>
-      <li xml:lang="eo">Lokaj Eventoj - MSC3488</li>
      <li xml:lang="es">Eventos de ubicación - MSC3488</li>
      <li xml:lang="eu">Kokaleku-gertaerak - MSC3488</li>
      <li xml:lang="fi">Sijaintitapahtumat – MSC3488</li>
@@ -202,6 +221,7 @@ to provide a convergent experience across multiple platforms.</p>
      <li xml:lang="ko">위치 이벤트 - MSC3488</li>
      <li xml:lang="nl">Locatie gebeurtenissen - MSC3488</li>
      <li xml:lang="nn">Posisjonshendingar – MSC3488</li>
+      <li xml:lang="pl">Wydarzenia w miejscach - MSC3488</li>
      <li xml:lang="pt">Eventos com Localizações - MSC3488</li>
      <li xml:lang="sl">Location Events - MSC3488</li>
      <li xml:lang="sv">Location Events - MSC3488</li>
@@ -263,48 +283,6 @@ to provide a convergent experience across multiple platforms.</p>
    <value key="KDE::windows_store::StoreLogoSquare">https://invent.kde.org/network/neochat/-/raw/master/icons/windows/storelogo-1080x1080.png</value>
    <value key="KDE::windows_store::Icon">https://invent.kde.org/network/neochat/-/raw/master/icons/300-apps-neochat.png</value>
    <value key="KDE::windows_store::PromotionalArt16x9">https://invent.kde.org/network/neochat/-/raw/master/icons/windows/promoimage-1920x1080.png</value>
-    <value key="KDE::windows_store::screenshots::1::image">https://cdn.kde.org/screenshots/neochat/NeoChat-Windows-Timeline.png</value>
-    <value key="KDE::windows_store::screenshots::1::caption">Main view with room list, chat, and room information</value>
-    <value key="KDE::windows_store::screenshots::1::caption" xml:lang="ca">Vista principal amb la llista de sales, xats i informació de les sales</value>
-    <value key="KDE::windows_store::screenshots::1::caption" xml:lang="ca-valencia">Vista principal amb la llista de sales, xats i informació de les sales</value>
-    <value key="KDE::windows_store::screenshots::1::caption" xml:lang="eo">Ĉefa vido kun ĉambra listo, babilejo kaj ĉambra informo</value>
-    <value key="KDE::windows_store::screenshots::1::caption" xml:lang="es">Vista principal con la lista de salas, chat e información de la sala</value>
-    <value key="KDE::windows_store::screenshots::1::caption" xml:lang="eu">Ikuspegi nagusia gela-zerrenda, berriketa, eta gelako informazioarekin</value>
-    <value key="KDE::windows_store::screenshots::1::caption" xml:lang="fr">Vue principale avec la liste des salons ainsi que des informations sur les salons et forums de discussions</value>
-    <value key="KDE::windows_store::screenshots::1::caption" xml:lang="gl">Vista principal coa lista de salas, a charla, e información da sala.</value>
-    <value key="KDE::windows_store::screenshots::1::caption" xml:lang="it">Vista principale con elenco delle stanze, chat e informazioni sulla stanza</value>
-    <value key="KDE::windows_store::screenshots::1::caption" xml:lang="ka">მთავარი ხედი სურათების სიით, ჩატით და ოთახის ინფორმაციით</value>
-    <value key="KDE::windows_store::screenshots::1::caption" xml:lang="ko">대화방 목록, 채팅, 대화방 정보가 표시된 주 보기</value>
-    <value key="KDE::windows_store::screenshots::1::caption" xml:lang="nl">Hoofdweergave met lijst met rooms, chat en roominformatie</value>
-    <value key="KDE::windows_store::screenshots::1::caption" xml:lang="nn">Hovudvising med romliste, pratevindauge og rominformasjon</value>
-    <value key="KDE::windows_store::screenshots::1::caption" xml:lang="pt">A área principal com a lista de salas e com informações sobre a conversa e a sala</value>
-    <value key="KDE::windows_store::screenshots::1::caption" xml:lang="sl">Glavni pogled s seznamom sob, klepetom in informacijami o sobah</value>
-    <value key="KDE::windows_store::screenshots::1::caption" xml:lang="sv">Huvudvy med rumslista, chatt, och rumsinformation</value>
-    <value key="KDE::windows_store::screenshots::1::caption" xml:lang="ta">அரங்குப்பட்டியல், உரையாடல், மற்றும் அரங்குவிவரங்களைக் கொண்டுள்ள பிரதான காட்சி</value>
-    <value key="KDE::windows_store::screenshots::1::caption" xml:lang="tr">Oda listesini, sohbet penceresini ve oda bilgisini gösteren ana görünüm</value>
-    <value key="KDE::windows_store::screenshots::1::caption" xml:lang="uk">Головна панель із списком кімнат, спілкуванням та даними щодо кімнати</value>
-    <value key="KDE::windows_store::screenshots::1::caption" xml:lang="x-test">xxMain view with room list, chat, and room informationxx</value>
-    <value key="KDE::windows_store::screenshots::2::image">https://cdn.kde.org/screenshots/neochat/NeoChat-Windows-Login.png</value>
-    <value key="KDE::windows_store::screenshots::2::caption">Login screen</value>
-    <value key="KDE::windows_store::screenshots::2::caption" xml:lang="ca">Pantalla d'inici de sessió</value>
-    <value key="KDE::windows_store::screenshots::2::caption" xml:lang="ca-valencia">Pantalla d'inici de sessió</value>
-    <value key="KDE::windows_store::screenshots::2::caption" xml:lang="eo">Ensaluta ekrano</value>
-    <value key="KDE::windows_store::screenshots::2::caption" xml:lang="es">Pantalla de inicio de sesión</value>
-    <value key="KDE::windows_store::screenshots::2::caption" xml:lang="eu">Saio-hasteko pantaila</value>
-    <value key="KDE::windows_store::screenshots::2::caption" xml:lang="fr">Écran de connexion</value>
-    <value key="KDE::windows_store::screenshots::2::caption" xml:lang="gl">Pantalla de identificación.</value>
-    <value key="KDE::windows_store::screenshots::2::caption" xml:lang="it">Schermata di accesso</value>
-    <value key="KDE::windows_store::screenshots::2::caption" xml:lang="ka">შესვლის ეკრანი</value>
-    <value key="KDE::windows_store::screenshots::2::caption" xml:lang="ko">로그인 화면</value>
-    <value key="KDE::windows_store::screenshots::2::caption" xml:lang="nl">Aanmeldscherm</value>
-    <value key="KDE::windows_store::screenshots::2::caption" xml:lang="nn">Innloggingsbilete</value>
-    <value key="KDE::windows_store::screenshots::2::caption" xml:lang="pt">Ecrã de autenticação</value>
-    <value key="KDE::windows_store::screenshots::2::caption" xml:lang="sl">Prijavni zaslon</value>
-    <value key="KDE::windows_store::screenshots::2::caption" xml:lang="sv">Inloggningsfönster</value>
-    <value key="KDE::windows_store::screenshots::2::caption" xml:lang="ta">நுழைவுத் திரை</value>
-    <value key="KDE::windows_store::screenshots::2::caption" xml:lang="tr">Oturum açma ekranı</value>
-    <value key="KDE::windows_store::screenshots::2::caption" xml:lang="uk">Вікно входу</value>
-    <value key="KDE::windows_store::screenshots::2::caption" xml:lang="x-test">xxLogin screenxx</value>
  </custom>
  <launchable type="desktop-id">org.kde.neochat.desktop</launchable>
  <screenshots>
@@ -314,15 +292,80 @@ to provide a convergent experience across multiple platforms.</p>
    <screenshot type="default">
      <image>https://cdn.kde.org/screenshots/neochat/application.png</image>
    </screenshot>
+    <screenshot x-kde-os="windows">
+      <image>https://cdn.kde.org/screenshots/neochat/NeoChat-Windows-Timeline.png</image>
+      <caption>Main view with room list, chat, and room information</caption>
+      <caption xml:lang="ar">العرض الرئيسة مع قائمة الغرف والدردشات و معلومات الغرفة</caption>
+      <caption xml:lang="ca">Vista principal amb la llista de sales, xats i informació de les sales</caption>
+      <caption xml:lang="ca-valencia">Vista principal amb la llista de sales, xats i informació de les sales</caption>
+      <caption xml:lang="es">Vista principal con la lista de salas, chat e información de la sala</caption>
+      <caption xml:lang="eu">Ikuspegi nagusia gela-zerrenda, berriketa, eta gelako informazioarekin</caption>
+      <caption xml:lang="fi">Päänäkymä, jossa huoneluettelo, keskustelu ja huoneen tiedot</caption>
+      <caption xml:lang="fr">Vue principale avec la liste des salons ainsi que des informations sur les salons et forums de discussions</caption>
+      <caption xml:lang="gl">Vista principal coa lista de salas, a charla, e información da sala.</caption>
+      <caption xml:lang="ia">Vista principal con lista de sala, chat e information de sala</caption>
+      <caption xml:lang="it">Vista principale con elenco delle stanze, chat e informazioni sulla stanza</caption>
+      <caption xml:lang="ka">მთავარი ხედი სურათების სიით, ჩატით და ოთახის ინფორმაციით</caption>
+      <caption xml:lang="ko">대화방 목록, 채팅, 대화방 정보가 표시된 주 보기</caption>
+      <caption xml:lang="nl">Hoofdweergave met lijst met rooms, chat en roominformatie</caption>
+      <caption xml:lang="nn">Hovudvising med romliste, pratevindauge og rominformasjon</caption>
+      <caption xml:lang="pl">Główny widok z wykazem pokojów, rozmowami i szczegółami pokojów</caption>
+      <caption xml:lang="pt">A área principal com a lista de salas e com informações sobre a conversa e a sala</caption>
+      <caption xml:lang="sl">Glavni pogled s seznamom sob, klepetom in informacijami o sobah</caption>
+      <caption xml:lang="sv">Huvudvy med rumslista, chatt, och rumsinformation</caption>
+      <caption xml:lang="ta">அரங்குப்பட்டியல், உரையாடல், மற்றும் அரங்குவிவரங்களைக் கொண்டுள்ள பிரதான காட்சி</caption>
+      <caption xml:lang="tr">Oda listesini, sohbet penceresini ve oda bilgisini gösteren ana görünüm</caption>
+      <caption xml:lang="uk">Головна панель із списком кімнат, спілкуванням та даними щодо кімнати</caption>
+      <caption xml:lang="x-test">xxMain view with room list, chat, and room informationxx</caption>
+    </screenshot>
+    <screenshot x-kde-os="windows">
+      <image>https://cdn.kde.org/screenshots/neochat/NeoChat-Windows-Login.png</image>
+      <caption>Login screen</caption>
+      <caption xml:lang="ar">شاشة الدخول</caption>
+      <caption xml:lang="ca">Pantalla d'inici de sessió</caption>
+      <caption xml:lang="ca-valencia">Pantalla d'inici de sessió</caption>
+      <caption xml:lang="es">Pantalla de inicio de sesión</caption>
+      <caption xml:lang="eu">Saio-hasteko pantaila</caption>
+      <caption xml:lang="fi">Kirjautumisnäkymä</caption>
+      <caption xml:lang="fr">Écran de connexion</caption>
+      <caption xml:lang="gl">Pantalla de identificación.</caption>
+      <caption xml:lang="ia">Schermo de accesso</caption>
+      <caption xml:lang="it">Schermata di accesso</caption>
+      <caption xml:lang="ka">შესვლის ეკრანი</caption>
+      <caption xml:lang="ko">로그인 화면</caption>
+      <caption xml:lang="nl">Aanmeldscherm</caption>
+      <caption xml:lang="nn">Innloggingsbilete</caption>
+      <caption xml:lang="pl">Ekran logowania</caption>
+      <caption xml:lang="pt">Ecrã de autenticação</caption>
+      <caption xml:lang="sl">Prijavni zaslon</caption>
+      <caption xml:lang="sv">Inloggningsfönster</caption>
+      <caption xml:lang="ta">நுழைவுத் திரை</caption>
+      <caption xml:lang="tr">Oturum açma ekranı</caption>
+      <caption xml:lang="uk">Вікно входу</caption>
+      <caption xml:lang="x-test">xxLogin screenxx</caption>
+    </screenshot>
  </screenshots>
  <content_rating type="oars-1.1">
    <content_attribute id="social-chat">intense</content_attribute>
  </content_rating>
  <releases>
+    <release version="23.08.2" date="2023-10-12"/>
+    <release version="23.08.0" date="2023-08-24">
+      <url>https://kde.org/announcements/gear/23.08.0/#neochathttpsappskdeorgneochat</url>
+      <description>
+        <p>Apart from a visual overhaul, NeoChat can now display location events and also a map with the location of all the users currently broadcasting their location using Itineray's Matrix integration. Great for locating where your friends are.</p>
+      </description>
+    </release>
    <release version="23.04.3" date="2023-07-06"/>
    <release version="23.04.2" date="2023-06-08"/>
    <release version="23.04.1" date="2023-05-11"/>
    <release version="23.04.0" date="2023-04-20">
+      <url>https://kde.org/announcements/gear/23.04.0/#neochathttpsappskdeorgneochat</url>
+      <description>
+        <p>NeoChat improves its design with tweaks that provide a more compact layout and a simpler menu which works better for the collapsed room list.</p>
+        <p>We have also improved the video controls, added a new command /knock &lt;room-id&gt; to send a knock event to a room, and you can now edit a prior message inline, within the chat pane.</p>
+        <p>Other usability improvements include an overhaul of the keyboard navigation and shortcuts like Ctrl+PgUp/PgDn that allow you to skip from room to room.</p>
+      </description>
      <artifacts>
        <artifact type="binary" platform="x86_64-windows-msvc">
          <location>https://download.kde.org/stable/release-service/23.04.0/windows/neochat-23.04.0-512-windows-cl-msvc2019-x86_64.exe</location>
--- a/po/ar/neochat.po
+++ b/po/ar/neochat.po
--- a/po/az/neochat.po
+++ b/po/az/neochat.po
--- a/po/ca/neochat.po
+++ b/po/ca/neochat.po
--- a/po/ca@valencia/neochat.po
+++ b/po/ca@valencia/neochat.po
--- a/po/cs/neochat.po
+++ b/po/cs/neochat.po
--- a/po/da/neochat.po
+++ b/po/da/neochat.po
--- a/po/de/neochat.po
+++ b/po/de/neochat.po
--- a/po/el/neochat.po
+++ b/po/el/neochat.po
--- a/po/en_GB/neochat.po
+++ b/po/en_GB/neochat.po
--- a/po/es/neochat.po
+++ b/po/es/neochat.po
--- a/po/eu/neochat.po
+++ b/po/eu/neochat.po
--- a/po/fi/neochat.po
+++ b/po/fi/neochat.po
--- a/po/fr/neochat.po
+++ b/po/fr/neochat.po
--- a/po/hu/neochat.po
+++ b/po/hu/neochat.po
--- a/po/ia/neochat.po
+++ b/po/ia/neochat.po
--- a/po/id/neochat.po
+++ b/po/id/neochat.po
--- a/po/ie/neochat.po
+++ b/po/ie/neochat.po
--- a/po/it/neochat.po
+++ b/po/it/neochat.po
--- a/po/ja/neochat.po
+++ b/po/ja/neochat.po
--- a/po/ka/neochat.po
+++ b/po/ka/neochat.po
--- a/po/ko/neochat.po
+++ b/po/ko/neochat.po
--- a/po/lt/neochat.po
+++ b/po/lt/neochat.po
--- a/po/nl/neochat.po
+++ b/po/nl/neochat.po
--- a/po/nn/neochat.po
+++ b/po/nn/neochat.po
--- a/po/pa/neochat.po
+++ b/po/pa/neochat.po
--- a/po/pl/neochat.po
+++ b/po/pl/neochat.po
--- a/po/pt/neochat.po
+++ b/po/pt/neochat.po
--- a/po/pt_BR/neochat.po
+++ b/po/pt_BR/neochat.po
--- a/po/ru/neochat.po
+++ b/po/ru/neochat.po
--- a/po/sk/neochat.po
+++ b/po/sk/neochat.po
--- a/po/sl/neochat.po
+++ b/po/sl/neochat.po
--- a/po/sv/docs/neochat/man-neochat.1.docbook
+++ b/po/sv/docs/neochat/man-neochat.1.docbook
@@ -0,0 +1,122 @@
+<?xml version="1.0" ?>
+<!DOCTYPE refentry PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [
+<!ENTITY % Swedish "INCLUDE">
+]>
+<!--
+SPDX-FileCopyrightText: 2022 Carl Schwan <carl@carlschwan.eu>
+SPDX-License-Identifier: CC-BY-SA-4.0
+-->
+
+<refentry lang="&language;">
+<refentryinfo>
+<title
+>NeoChat användarmanual</title>
+<author
+><firstname
+>Carl</firstname
+><surname
+>Schwan</surname
+> <contrib
+>NeoChat manualsida.</contrib
+> <email
+>carl@carlschwan.eu</email
+></author>
+<date
+>2022-11-01</date>
+<releaseinfo
+>22.09</releaseinfo>
+<productname
+>NeoChat</productname>
+</refentryinfo>
+
+<refmeta>
+  <refentrytitle>
+    <command
+>neochat</command>
+  </refentrytitle>
+  <manvolnum
+>1</manvolnum>
+</refmeta>
+
+<refnamediv>
+  <refname
+>neochat</refname>
+  <refpurpose
+>Klient för att interagera med meddelandeprotokollet 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
+>Beskrivning</title>
+  <para
+><command
+>neochat</command
+> är ett chattprogram för protokollet matrix som fungerar både på skrivbord och mobil. </para>
+</refsect1>
+
+<refsect1 id="options"
+><title
+>Väljare</title>
+<variablelist>
+  <varlistentry>
+  <term
+><option
+>URI</option
+></term>
+  <listitem>
+    <para
+>Matrix webbadress för en användare eller ett rum, t.ex. matrix:u/användare:exempel.org. Det gör att NeoChat försöker öppna det angivna rummet eller konversationen. </para>
+  </listitem>
+  </varlistentry>
+</variablelist>
+</refsect1>
+
+<refsect1 id="bug">
+  <title
+>Rapportera fel</title>
+  <para
+>Rapportera fel och funktionsönskemål på <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
+>Se också</title>
+  <simplelist>
+    <member
+>En lista över vanliga frågor om 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
+>Licens: GNU General Public Version 3 eller senare &lt;<ulink url="https://wwwgnuorg/licenses/gpl-html"
+>http://www.gnu.org/licenses/gpl-3.0.html</ulink
+>&gt;</para>
+</refsect1>
+</refentry>
--- 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
@@ -5,6 +5,7 @@

 configure_file(qml/Page/RoomList/RoomDelegate.qml ${CMAKE_CURRENT_BINARY_DIR}/qml/Page/RoomList/RoomDelegate.qml)
 configure_file(qml/Component/QuickSwitcher.qml ${CMAKE_CURRENT_BINARY_DIR}/qml/Component/QuickSwitcher.qml)
+configure_file(qml/Dialog/UserDetailDialog.qml ${CMAKE_CURRENT_BINARY_DIR}/qml/Dialog/UserDetailDialog.qml)
 configure_file(qml/Dialog/PowerLevelDialog.qml ${CMAKE_CURRENT_BINARY_DIR}/qml/Dialog/PowerLevelDialog.qml)
 configure_file(qml/Component/Timeline/AudioDelegate.qml ${CMAKE_CURRENT_BINARY_DIR}/qml/Component/Timeline/AudioDelegate.qml)
 configure_file(qml/Component/Timeline/VideoDelegate.qml ${CMAKE_CURRENT_BINARY_DIR}/qml/Component/Timeline/VideoDelegate.qml)
@@ -43,6 +44,8 @@ add_library(neochat STATIC
    roommanager.h
    neochatroom.cpp
    neochatroom.h
+    neochatuser.cpp
+    neochatuser.h
    models/userlistmodel.cpp
    models/userlistmodel.h
    models/userfiltermodel.cpp
@@ -124,7 +127,6 @@ add_library(neochat STATIC
    locationhelper.h
    events/pollevent.cpp
    pollhandler.cpp
-    utils.h
 )

 ecm_qt_declare_logging_category(neochat
@@ -173,7 +175,7 @@ else()
 endif()

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

 if(NEOCHAT_FLATPAK)
--- a/src/controller.cpp
+++ b/src/controller.cpp
@@ -35,15 +35,15 @@
 #include <Quotient/connection.h>
 #include <Quotient/csapi/content-repo.h>
 #include <Quotient/csapi/logout.h>
-#include <Quotient/csapi/notifications.h>
 #include <Quotient/csapi/profile.h>
-#include <Quotient/eventstats.h>
 #include <Quotient/jobs/downloadfilejob.h>
 #include <Quotient/qt_connection_util.h>
-#include <Quotient/user.h>
+#include <Quotient/csapi/notifications.h>
+#include <Quotient/eventstats.h>

 #include "neochatconfig.h"
 #include "neochatroom.h"
+#include "neochatuser.h"
 #include "notificationsmanager.h"
 #include "roommanager.h"
 #include "windowcontroller.h"
@@ -60,6 +60,7 @@ Controller::Controller(QObject *parent)
    : QObject(parent)
 {
    Connection::setRoomType<NeoChatRoom>();
+    Connection::setUserType<NeoChatUser>();

    setApplicationProxy();

@@ -531,7 +532,7 @@ void Controller::joinRoom(const QString &alias)
    RoomManager::instance().joinRoom(m_connection, alias, QStringList{knownServer});
 }

-void Controller::openOrCreateDirectChat(User *user)
+void Controller::openOrCreateDirectChat(NeoChatUser *user)
 {
    const auto existing = activeConnection()->directChats();

--- a/src/controller.h
+++ b/src/controller.h
@@ -14,6 +14,7 @@
 #include <Quotient/settings.h>

 class NeoChatRoom;
+class NeoChatUser;
 class TrayIcon;
 class QWindow;
 class QQuickTextDocument;
@@ -22,7 +23,6 @@ namespace Quotient
 {
 class Connection;
 class Room;
-class User;
 }

 namespace QKeychain
@@ -183,7 +183,7 @@ public:
     *
     * If a direct chat with the user doesn't exist one is created and then joined.
     */
-    Q_INVOKABLE void openOrCreateDirectChat(Quotient::User *user);
+    Q_INVOKABLE void openOrCreateDirectChat(NeoChatUser *user);

    [[nodiscard]] bool supportSystemTray() const;

--- a/src/main.cpp
+++ b/src/main.cpp
@@ -4,7 +4,6 @@
 #include <QCommandLineParser>
 #include <QIcon>
 #include <QNetworkProxyFactory>
-#include <QObject>
 #include <QQmlApplicationEngine>
 #include <QQmlContext>
 #include <QQmlNetworkAccessManagerFactory>
@@ -29,11 +28,10 @@

 #include "neochat-version.h"

-#include <Quotient/accountregistry.h>
 #include <Quotient/keyverificationsession.h>
+#include <Quotient/accountregistry.h>
 #include <Quotient/networkaccessmanager.h>
 #include <Quotient/room.h>
-#include <Quotient/user.h>
 #include <Quotient/util.h>

 #include "actionshandler.h"
@@ -77,6 +75,7 @@
 #include "models/webshortcutmodel.h"
 #include "neochatconfig.h"
 #include "neochatroom.h"
+#include "neochatuser.h"
 #include "notificationsmanager.h"
 #include "pollhandler.h"
 #include "roommanager.h"
@@ -89,6 +88,7 @@
 #endif
 #include "models/completionmodel.h"
 #include "models/statemodel.h"
+#include "neochatuser.h"

 #ifdef HAVE_RUNNER
 #include "runner.h"
@@ -185,8 +185,10 @@ int main(int argc, char *argv[])
    initLogging();

 #if Quotient_VERSION_MINOR == 8
+#ifdef Quotient_E2EE_ENABLED
    Connection::setEncryptionDefault(true);
 #endif
+#endif

 #ifdef NEOCHAT_FLATPAK
    // Copy over the included FontConfig configuration to the
@@ -259,7 +261,7 @@ int main(int argc, char *argv[])
    qmlRegisterUncreatableType<PushNotificationState>("org.kde.neochat", 1, 0, "PushNotificationState", "ENUM");
    qmlRegisterUncreatableType<PushNotificationAction>("org.kde.neochat", 1, 0, "PushNotificationAction", "ENUM");
    qmlRegisterUncreatableType<NeoChatRoomType>("org.kde.neochat", 1, 0, "NeoChatRoomType", "ENUM");
-    qmlRegisterUncreatableType<User>("org.kde.neochat", 1, 0, "User", {});
+    qmlRegisterUncreatableType<NeoChatUser>("org.kde.neochat", 1, 0, "NeoChatUser", {});
    qmlRegisterUncreatableType<NeoChatRoom>("org.kde.neochat", 1, 0, "NeoChatRoom", {});

    qRegisterMetaType<User *>("User*");
@@ -269,7 +271,7 @@ int main(int argc, char *argv[])
    qRegisterMetaType<Connection *>("Connection*");
    qRegisterMetaType<MessageEventType>("MessageEventType");
    qRegisterMetaType<NeoChatRoom *>("NeoChatRoom*");
-    qRegisterMetaType<User *>("User*");
+    qRegisterMetaType<NeoChatUser *>("NeoChatUser*");
    qRegisterMetaType<GetRoomEventsJob *>("GetRoomEventsJob*");
    qRegisterMetaType<QMimeType>("QMimeType");
 #ifdef Quotient_E2EE_ENABLED
@@ -323,18 +325,11 @@ int main(int argc, char *argv[])
    QCommandLineParser parser;
    parser.setApplicationDescription(i18n("Client for the matrix communication protocol"));
    parser.addPositionalArgument(QStringLiteral("urls"), i18n("Supports matrix: url scheme"));
-    parser.addOption(QCommandLineOption("ignore-ssl-errors", i18n("Ignore all SSL Errors, e.g., unsigned certificates.")));

    about.setupCommandLine(&parser);
    parser.process(app);
    about.processCommandLine(&parser);

-    if (parser.isSet("ignore-ssl-errors")) {
-        QObject::connect(NetworkAccessManager::instance(), &QNetworkAccessManager::sslErrors, NetworkAccessManager::instance(), [](QNetworkReply *reply) {
-            reply->ignoreSslErrors();
-        });
-    }
-
    engine.addImageProvider(QLatin1String("mxc"), new MatrixImageProvider);
    engine.addImageProvider(QLatin1String("blurhash"), new BlurhashImageProvider);

--- a/src/models/devicesmodel.cpp
+++ b/src/models/devicesmodel.cpp
@@ -65,6 +65,7 @@ QVariant DevicesModel::data(const QModelIndex &index, int role) const
        if (device.deviceId == m_connection->deviceId()) {
            return This;
        }
+#ifdef Quotient_E2EE_ENABLED
        if (!m_connection->isKnownE2eeCapableDevice(m_connection->userId(), device.deviceId)) {
            return Unencrypted;
        }
@@ -73,6 +74,9 @@ QVariant DevicesModel::data(const QModelIndex &index, int role) const
        } else {
            return Unverified;
        }
+#else
+        return Unverified;
+#endif
    }
    return {};
 }
@@ -157,6 +161,7 @@ void DevicesModel::setConnection(Connection *connection)
    Q_EMIT connectionChanged();
    fetchDevices();

+#ifdef Quotient_E2EE_ENABLED
    connect(m_connection, &Connection::sessionVerified, this, [this](const QString &userId, const QString &deviceId) {
        Q_UNUSED(deviceId);
        if (userId == Controller::instance().activeConnection()->userId()) {
@@ -166,6 +171,7 @@ void DevicesModel::setConnection(Connection *connection)
    connect(m_connection, &Connection::finishedQueryingKeys, this, [this]() {
        fetchDevices();
    });
+#endif
 }

 #include "moc_devicesmodel.cpp"
--- a/src/models/livelocationsmodel.cpp
+++ b/src/models/livelocationsmodel.cpp
@@ -8,8 +8,6 @@

 #include <QDebug>

-#include <cmath>
-
 using namespace Quotient;

 bool operator<(const LiveLocationData &lhs, const LiveLocationData &rhs)
@@ -90,11 +88,6 @@ QVariant LiveLocationsModel::data(const QModelIndex &index, int roleName) const
        const auto timeout = data.beaconInfo.value("timeout"_ls).toDouble(600000);
        return lastTs + timeout >= QDateTime::currentDateTime().toMSecsSinceEpoch();
    }
-    case HeadingRole: {
-        bool success = false;
-        const auto heading = data.beacon["org.matrix.msc3488.location"_ls].toObject()["org.kde.itinerary.heading"_ls].toString().toDouble(&success);
-        return success ? heading : NAN;
-    }
    }

    return {};
@@ -108,7 +101,6 @@ QHash<int, QByteArray> LiveLocationsModel::roleNames() const
    r.insert(AssetRole, "asset");
    r.insert(AuthorRole, "author");
    r.insert(IsLiveRole, "isLive");
-    r.insert(HeadingRole, "heading");
    return r;
 }

--- a/src/models/livelocationsmodel.h
+++ b/src/models/livelocationsmodel.h
@@ -49,7 +49,6 @@ public:
        AssetRole, /**< Type of location event, e.g. self pin of the user location. */
        AuthorRole, /**< The author of the event. */
        IsLiveRole, /**< Boolean that indicates whether a live location beacon is still live. */
-        HeadingRole, /**< Heading in degree (not part of any MSC yet, using an Itinerary extension). */
    };
    Q_ENUM(Roles)

--- a/src/models/locationsmodel.cpp
+++ b/src/models/locationsmodel.cpp
@@ -3,8 +3,6 @@

 #include "locationsmodel.h"

-#include <QGuiApplication>
-
 using namespace Quotient;

 LocationsModel::LocationsModel(QObject *parent)
@@ -45,10 +43,6 @@ LocationsModel::LocationsModel(QObject *parent)
    });

    connect(this, &LocationsModel::rowsInserted, this, &LocationsModel::boundingBoxChanged);
-
-    connect(static_cast<QGuiApplication *>(QGuiApplication::instance()), &QGuiApplication::paletteChanged, this, [this] {
-        Q_EMIT dataChanged(index(0, 0), index(rowCount() - 1, 0), {AuthorRole});
-    });
 }

 void LocationsModel::addLocation(const RoomMessageEvent *event)
@@ -67,7 +61,7 @@ void LocationsModel::addLocation(const RoomMessageEvent *event)
        .latitude = latitude,
        .longitude = longitude,
        .content = event->contentJson(),
-        .author = m_room->user(event->senderId()),
+        .author = dynamic_cast<NeoChatUser *>(m_room->user(event->senderId())),
    };
    endInsertRows();
 }
--- a/src/models/locationsmodel.h
+++ b/src/models/locationsmodel.h
@@ -10,7 +10,6 @@
 #include "neochatroom.h"

 #include <Quotient/events/roommessageevent.h>
-#include <Quotient/user.h>

 class LocationsModel : public QAbstractListModel
 {
@@ -52,7 +51,7 @@ private:
        float latitude;
        float longitude;
        QJsonObject content;
-        Quotient::User *author;
+        NeoChatUser *author;
    };
    QList<LocationData> m_locations;
    void addLocation(const Quotient::RoomMessageEvent *event);
--- a/src/models/messageeventmodel.cpp
+++ b/src/models/messageeventmodel.cpp
@@ -25,6 +25,7 @@
 #include <KLocalizedString>

 #include "models/reactionmodel.h"
+#include "neochatuser.h"
 #include "texthandler.h"

 using namespace Quotient;
@@ -77,7 +78,7 @@ MessageEventModel::MessageEventModel(QObject *parent)
    : QAbstractListModel(parent)
 {
    connect(static_cast<QGuiApplication *>(QGuiApplication::instance()), &QGuiApplication::paletteChanged, this, [this] {
-        Q_EMIT dataChanged(index(0, 0), index(rowCount() - 1, 0), {AuthorRole, ReplyAuthor, ReadMarkersRole});
+        Q_EMIT dataChanged(index(0, 0), index(rowCount() - 1, 0), {AuthorRole, ReplyRole});
    });
 }

@@ -530,7 +531,7 @@ QVariant MessageEventModel::data(const QModelIndex &idx, int role) const
    }

    if (role == AuthorRole) {
-        auto author = isPending ? m_currentRoom->localUser() : m_currentRoom->user(evt.senderId());
+        auto author = static_cast<NeoChatUser *>(isPending ? m_currentRoom->localUser() : m_currentRoom->user(evt.senderId()));
        return m_currentRoom->getUser(author);
    }

@@ -678,7 +679,7 @@ QVariant MessageEventModel::data(const QModelIndex &idx, int role) const
        auto replyPtr = m_currentRoom->getReplyForEvent(evt);

        if (replyPtr) {
-            auto replyUser = m_currentRoom->user(replyPtr->senderId());
+            auto replyUser = static_cast<NeoChatUser *>(m_currentRoom->user(replyPtr->senderId()));
            return m_currentRoom->getUser(replyUser);
        } else {
            return m_currentRoom->getUser(nullptr);
@@ -807,7 +808,7 @@ QVariant MessageEventModel::data(const QModelIndex &idx, int role) const
        QVariantList users;
        users.reserve(userIds.size());
        for (const auto &userId : userIds) {
-            auto user = m_currentRoom->user(userId);
+            auto user = static_cast<NeoChatUser *>(m_currentRoom->user(userId));
            users += m_currentRoom->getUser(user);
        }

@@ -835,7 +836,7 @@ QVariant MessageEventModel::data(const QModelIndex &idx, int role) const
         */
        QString readMarkersString = i18np("1 user: ", "%1 users: ", userIds.size());
        for (const auto &userId : userIds) {
-            auto user = m_currentRoom->user(userId);
+            auto user = static_cast<NeoChatUser *>(m_currentRoom->user(userId));
            readMarkersString += user->displayname(m_currentRoom) + i18nc("list separator", ", ");
        }
        readMarkersString.chop(2);
@@ -876,7 +877,7 @@ QVariant MessageEventModel::data(const QModelIndex &idx, int role) const
    }

    if (role == DisplayNameForInitialsRole) {
-        auto user = isPending ? m_currentRoom->localUser() : m_currentRoom->user(evt.senderId());
+        auto user = static_cast<NeoChatUser *>(isPending ? m_currentRoom->localUser() : m_currentRoom->user(evt.senderId()));
        return user->displayname(m_currentRoom).remove(QStringLiteral(" (%1)").arg(user->id()));
    }

@@ -888,7 +889,7 @@ QVariant MessageEventModel::data(const QModelIndex &idx, int role) const
            }
            return previousDisplayName;
        } else {
-            auto author = isPending ? m_currentRoom->localUser() : m_currentRoom->user(evt.senderId());
+            auto author = static_cast<NeoChatUser *>(isPending ? m_currentRoom->localUser() : m_currentRoom->user(evt.senderId()));
            return m_currentRoom->htmlSafeMemberName(author->id());
        }
    }
@@ -1061,13 +1062,13 @@ void MessageEventModel::createReactionModelForEvent(const Quotient::RoomMessageE
        return;
    };

-    QMap<QString, QList<Quotient::User *>> reactions = {};
+    QMap<QString, QList<NeoChatUser *>> reactions = {};
    for (const auto &a : annotations) {
        if (a->isRedacted()) { // Just in case?
            continue;
        }
        if (const auto &e = eventCast<const ReactionEvent>(a)) {
-            reactions[e->key()].append(m_currentRoom->user(e->senderId()));
+            reactions[e->key()].append(static_cast<NeoChatUser *>(m_currentRoom->user(e->senderId())));
        }
    }

@@ -1094,7 +1095,7 @@ void MessageEventModel::createReactionModelForEvent(const Quotient::RoomMessageE
    if (m_reactionModels.contains(eventId)) {
        m_reactionModels[eventId]->setReactions(res);
    } else if (res.size() > 0) {
-        m_reactionModels[eventId] = new ReactionModel(this, res, m_currentRoom->localUser());
+        m_reactionModels[eventId] = new ReactionModel(this, res, static_cast<NeoChatUser *>(m_currentRoom->localUser()));
    } else {
        if (m_reactionModels.contains(eventId)) {
            delete m_reactionModels[eventId];
--- a/src/models/reactionmodel.cpp
+++ b/src/models/reactionmodel.cpp
@@ -7,9 +7,9 @@

 #include <KLocalizedString>

-#include <Quotient/user.h>
+#include "neochatuser.h"

-ReactionModel::ReactionModel(QObject *parent, QList<Reaction> reactions, Quotient::User *localUser)
+ReactionModel::ReactionModel(QObject *parent, QList<Reaction> reactions, NeoChatUser *localUser)
    : QAbstractListModel(parent)
    , m_localUser(localUser)
 {
--- a/src/models/reactionmodel.h
+++ b/src/models/reactionmodel.h
@@ -5,10 +5,7 @@

 #include <QAbstractListModel>

-namespace Quotient
-{
-class User;
-}
+class NeoChatUser;

 /**
 * @class ReactionModel
@@ -39,7 +36,7 @@ public:
        HasLocalUser, /**< Whether the local user is in the list of authors. */
    };

-    explicit ReactionModel(QObject *parent = nullptr, QList<Reaction> reactions = {}, Quotient::User *localUser = nullptr);
+    explicit ReactionModel(QObject *parent = nullptr, QList<Reaction> reactions = {}, NeoChatUser *localUser = nullptr);

    /**
     * @brief Get the given role value at the given index.
@@ -70,6 +67,6 @@ public:
 private:
    QList<Reaction> m_reactions;

-    Quotient::User *m_localUser;
+    NeoChatUser *m_localUser;
 };
 Q_DECLARE_METATYPE(ReactionModel *)
--- a/src/models/searchmodel.cpp
+++ b/src/models/searchmodel.cpp
@@ -5,14 +5,13 @@

 #include "messageeventmodel.h"
 #include "neochatroom.h"
-
-#include <QGuiApplication>
-
-#include <Quotient/connection.h>
+#include "neochatuser.h"
 #include <Quotient/events/stickerevent.h>

 #include <KLocalizedString>

+#include <Quotient/connection.h>
+
 using namespace Quotient;

 // TODO search only in the current room
@@ -20,9 +19,6 @@ using namespace Quotient;
 SearchModel::SearchModel(QObject *parent)
    : QAbstractListModel(parent)
 {
-    connect(static_cast<QGuiApplication *>(QGuiApplication::instance()), &QGuiApplication::paletteChanged, this, [this] {
-        Q_EMIT dataChanged(index(0, 0), index(rowCount() - 1, 0), {AuthorRole, ReadMarkersRole});
-    });
 }

 QString SearchModel::searchText() const
@@ -113,7 +109,7 @@ QVariant SearchModel::data(const QModelIndex &index, int role) const
        return false;
    case ReplyAuthorRole:
        if (const auto &replyPtr = m_room->getReplyForEvent(event)) {
-            return m_room->getUser(m_room->user(replyPtr->senderId()));
+            return m_room->getUser(static_cast<NeoChatUser *>(m_room->user(replyPtr->senderId())));
        } else {
            return m_room->getUser(nullptr);
        }
--- a/src/models/stickermodel.cpp
+++ b/src/models/stickermodel.cpp
@@ -109,7 +109,7 @@ void StickerModel::setRoom(NeoChatRoom *room)
 void StickerModel::postSticker(int index)
 {
    const auto &image = m_images[index];
-    const auto &body = image.body ? *image.body : QString();
+    const auto &body = image.body ? *image.body : image.shortcode;
    QJsonObject infoJson;
    if (image.info) {
        infoJson["w"] = image.info->imageSize.width();
--- a/src/models/userlistmodel.cpp
+++ b/src/models/userlistmodel.cpp
@@ -3,8 +3,6 @@

 #include "userlistmodel.h"

-#include <QGuiApplication>
-
 #include <Quotient/connection.h>
 #include <Quotient/events/roompowerlevelsevent.h>

@@ -16,9 +14,6 @@ UserListModel::UserListModel(QObject *parent)
    : QAbstractListModel(parent)
    , m_currentRoom(nullptr)
 {
-    connect(static_cast<QGuiApplication *>(QGuiApplication::instance()), &QGuiApplication::paletteChanged, this, [this]() {
-        refreshAllUsers();
-    });
 }

 void UserListModel::setRoom(NeoChatRoom *room)
@@ -76,7 +71,8 @@ QVariant UserListModel::data(const QModelIndex &index, int role) const
        return user->id();
    }
    if (role == AvatarRole) {
-        return m_currentRoom->avatarForMember(user);
+        auto neoChatUser = static_cast<NeoChatUser *>(user);
+        return m_currentRoom->avatarForMember(neoChatUser);
    }
    if (role == ObjectRole) {
        return QVariant::fromValue(user);
--- a/src/neochatroom.cpp
+++ b/src/neochatroom.cpp
@@ -4,10 +4,8 @@
 #include "neochatroom.h"

 #include <QFileInfo>
-#include <QGuiApplication>
 #include <QMetaObject>
 #include <QMimeDatabase>
-#include <QPalette>
 #include <QTemporaryFile>
 #include <QTextDocument>

@@ -15,7 +13,6 @@
 #include <QMediaPlayer>

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

 #include <Quotient/connection.h>
@@ -46,7 +43,6 @@
 #include "neochatconfig.h"
 #include "notificationsmanager.h"
 #include "texthandler.h"
-#include "utils.h"

 #include <KConfig>
 #include <KConfigGroup>
@@ -416,11 +412,11 @@ QVariantList NeoChatRoom::getUsers(const QString &keyword, int limit) const
    int count = 0;
    for (const auto u : userList) {
        if (u->displayname(this).contains(keyword, Qt::CaseInsensitive)) {
-            Quotient::User user(u->id(), u->connection());
+            NeoChatUser user(u->id(), u->connection());
            QVariantMap userVariant{{QStringLiteral("id"), user.id()},
                                    {QStringLiteral("displayName"), user.displayname(this)},
                                    {QStringLiteral("avatarMediaId"), user.avatarMediaId(this)},
-                                    {QStringLiteral("color"), Utils::getUserColor(user.hueF())}};
+                                    {QStringLiteral("color"), user.color()}};

            matchedList.append(QVariant::fromValue(userVariant));
            count++;
@@ -446,10 +442,11 @@ static const QVariantMap emptyUser = {

 QVariantMap NeoChatRoom::getUser(const QString &userID) const
 {
-    return getUser(user(userID));
+    NeoChatUser *userObject = static_cast<NeoChatUser *>(user(userID));
+    return getUser(userObject);
 }

-QVariantMap NeoChatRoom::getUser(User *user) const
+QVariantMap NeoChatRoom::getUser(NeoChatUser *user) const
 {
    if (user == nullptr) {
        return emptyUser;
@@ -461,7 +458,7 @@ QVariantMap NeoChatRoom::getUser(User *user) const
        {QStringLiteral("displayName"), user->displayname(this)},
        {QStringLiteral("avatarSource"), avatarForMember(user)},
        {QStringLiteral("avatarMediaId"), user->avatarMediaId(this)},
-        {QStringLiteral("color"), Utils::getUserColor(user->hueF())},
+        {QStringLiteral("color"), user->color()},
        {QStringLiteral("object"), QVariant::fromValue(user)},
    };
 }
@@ -542,7 +539,7 @@ QString NeoChatRoom::eventToString(const RoomEvent &evt, Qt::TextFormat format,

            if (prettyPrint) {
                subjectName = QStringLiteral("<a href=\"https://matrix.to/#/%1\" style=\"color: %2\">%3</a>")
-                                  .arg(e.userId(), Utils::getUserColor(user(e.userId())->hueF()).name(), subjectName);
+                                  .arg(e.userId(), static_cast<NeoChatUser *>(user(e.userId()))->color().name(), subjectName);
            }

            // The below code assumes senderName output in AuthorRole
@@ -1685,7 +1682,7 @@ QVariantMap NeoChatRoom::chatBoxReplyUser() const
    if (m_chatBoxReplyId.isEmpty()) {
        return emptyUser;
    }
-    return getUser(user((*findInTimeline(m_chatBoxReplyId))->senderId()));
+    return getUser(static_cast<NeoChatUser *>(user((*findInTimeline(m_chatBoxReplyId))->senderId())));
 }

 QString NeoChatRoom::chatBoxReplyMessage() const
@@ -1701,7 +1698,7 @@ QVariantMap NeoChatRoom::chatBoxEditUser() const
    if (m_chatBoxEditId.isEmpty()) {
        return emptyUser;
    }
-    return getUser(user((*findInTimeline(m_chatBoxEditId))->senderId()));
+    return getUser(static_cast<NeoChatUser *>(user((*findInTimeline(m_chatBoxEditId))->senderId())));
 }

 QString NeoChatRoom::chatBoxEditMessage() const
@@ -1907,10 +1904,9 @@ int NeoChatRoom::maxRoomVersion() const
    }
    return maxVersion;
 }
-
-Quotient::User *NeoChatRoom::directChatRemoteUser() const
+NeoChatUser *NeoChatRoom::directChatRemoteUser() const
 {
-    return connection()->directChatUsers(this)[0];
+    return dynamic_cast<NeoChatUser *>(connection()->directChatUsers(this)[0]);
 }

 void NeoChatRoom::sendLocation(float lat, float lon, const QString &description)
@@ -1942,7 +1938,7 @@ QByteArray NeoChatRoom::roomAcountDataJson(const QString &eventType)
    return QJsonDocument(accountData(eventType)->fullJson()).toJson();
 }

-QUrl NeoChatRoom::avatarForMember(Quotient::User *user) const
+QUrl NeoChatRoom::avatarForMember(NeoChatUser *user) const
 {
    const auto &url = memberAvatarUrl(user->id());
    if (url.isEmpty() || url.scheme() != "mxc"_ls) {
--- a/src/neochatroom.h
+++ b/src/neochatroom.h
@@ -10,15 +10,10 @@
 #include <QTextCursor>

 #include <QCoroTask>
-#include <Quotient/user.h>

+#include "neochatuser.h"
 #include "pollhandler.h"

-namespace Quotient
-{
-class User;
-}
-
 class PushNotificationState : public QObject
 {
    Q_OBJECT
@@ -69,7 +64,7 @@ class NeoChatRoom : public Quotient::Room
     *
     * The list does not include the local user.
     *
-     * This is different to getting a list of Quotient::User objects
+     * This is different to getting a list of NeoChatUser objects or Quotient::User objects
     * as neither of those can provide details like the displayName or avatarMediaId
     * without the room context as these can vary from room to room. This function
     * provides the room context and puts the result as a list of QVariantMap objects.
@@ -81,7 +76,7 @@ class NeoChatRoom : public Quotient::Room
     *  - displayName - Display name in the context of this room.
     *  - display - Name in the context of this room.
     *
-     * @sa Quotient::User
+     * @sa Quotient::User, NeoChatUser
     */
    Q_PROPERTY(QVariantList usersTyping READ getUsersTyping NOTIFY typingChanged)

@@ -124,7 +119,7 @@ class NeoChatRoom : public Quotient::Room
    /**
     * @brief Get a user object for the other person in a direct chat.
     */
-    Q_PROPERTY(Quotient::User *directChatRemoteUser READ directChatRemoteUser CONSTANT)
+    Q_PROPERTY(NeoChatUser *directChatRemoteUser READ directChatRemoteUser CONSTANT)

    /**
     * @brief If the room is a space.
@@ -321,7 +316,7 @@ class NeoChatRoom : public Quotient::Room
    /**
     * @brief Get the user for the message being replied to.
     *
-     * This is different to getting a Quotient::User object
+     * This is different to getting a NeoChatUser object or Quotient::User object
     * as neither of those can provide details like the displayName or avatarMediaId
     * without the room context as these can vary from room to room.
     *
@@ -334,9 +329,9 @@ class NeoChatRoom : public Quotient::Room
     *  - avatarSource - The mxc URL for the user's avatar in the current room.
     *  - avatarMediaId - Avatar id in the context of this room.
     *  - color - Color for the user.
-     *  - object - The Quotient::User object for the user.
+     *  - object - The NeoChatUser object for the user.
     *
-     * @sa getUser, Quotient::User
+     * @sa getUser, Quotient::User, NeoChatUser
     */
    Q_PROPERTY(QVariantMap chatBoxReplyUser READ chatBoxReplyUser NOTIFY chatBoxReplyIdChanged)

@@ -350,7 +345,7 @@ class NeoChatRoom : public Quotient::Room
    /**
     * @brief Get the user for the message being edited.
     *
-     * This is different to getting a Quotient::User object
+     * This is different to getting a NeoChatUser object or Quotient::User object
     * as neither of those can provide details like the displayName or avatarMediaId
     * without the room context as these can vary from room to room.
     *
@@ -363,9 +358,9 @@ class NeoChatRoom : public Quotient::Room
     *  - avatarSource - The mxc URL for the user's avatar in the current room.
     *  - avatarMediaId - Avatar id in the context of this room.
     *  - color - Color for the user.
-     *  - object - The Quotient::User object for the user.
+     *  - object - The NeoChatUser object for the user.
     *
-     * @sa getUser, Quotient::User
+     * @sa getUser, Quotient::User, NeoChatUser
     */
    Q_PROPERTY(QVariantMap chatBoxEditUser READ chatBoxEditUser NOTIFY chatBoxEditIdChanged)

@@ -397,7 +392,7 @@ public:
    /**
     * @brief Get a list of users in the context of this room.
     *
-     * This is different to getting a list of Quotient::User objects
+     * This is different to getting a list of NeoChatUser objects or Quotient::User objects
     * as neither of those can provide details like the displayName or avatarMediaId
     * without the room context as these can vary from room to room. This function
     * provides the room context and returns the result as a list of QVariantMap objects.
@@ -412,14 +407,14 @@ public:
     *  - avatarMediaId - Avatar id in the context of this room.
     *  - color - Color for the user.
     *
-     * @sa Quotient::User
+     * @sa Quotient::User, NeoChatUser
     */
    Q_INVOKABLE [[nodiscard]] QVariantList getUsers(const QString &keyword, int limit = -1) const;

    /**
     * @brief Get a user in the context of this room.
     *
-     * This is different to getting a Quotient::User object
+     * This is different to getting a NeoChatUser object or Quotient::User object
     * as neither of those can provide details like the displayName or avatarMediaId
     * without the room context as these can vary from room to room. This function
     * provides the room context and outputs the result as QVariantMap.
@@ -436,16 +431,16 @@ public:
     *  - avatarSource - The mxc URL for the user's avatar in the current room.
     *  - avatarMediaId - Avatar id in the context of this room.
     *  - color - Color for the user.
-     *  - object - The Quotient::User object for the user.
+     *  - object - The NeoChatUser object for the user.
     *
-     * @sa Quotient::User
+     * @sa Quotient::User, NeoChatUser
     */
    Q_INVOKABLE [[nodiscard]] QVariantMap getUser(const QString &userID) const;

    /**
     * @brief Get a user in the context of this room.
     *
-     * This is different to getting a Quotient::User object
+     * This is different to getting a NeoChatUser object or Quotient::User object
     * as neither of those can provide details like the displayName or avatarMediaId
     * without the room context as these can vary from room to room. This function
     * provides the room context and outputs the result as QVariantMap.
@@ -462,11 +457,11 @@ public:
     *  - avatarSource - The mxc URL for the user's avatar in the current room.
     *  - avatarMediaId - Avatar id in the context of this room.
     *  - color - Color for the user.
-     *  - object - The Quotient::User object for the user.
+     *  - object - The NeoChatUser object for the user.
     *
-     * @sa Quotient::User
+     * @sa Quotient::User, NeoChatUser
     */
-    Q_INVOKABLE [[nodiscard]] QVariantMap getUser(Quotient::User *user) const;
+    Q_INVOKABLE [[nodiscard]] QVariantMap getUser(NeoChatUser *user) const;

    [[nodiscard]] QVariantList getUsersTyping() const;

@@ -607,7 +602,7 @@ public:

    [[nodiscard]] QString avatarMediaId() const;

-    Quotient::User *directChatRemoteUser() const;
+    NeoChatUser *directChatRemoteUser() const;

    [[nodiscard]] bool isSpace();

@@ -823,7 +818,7 @@ public:
     */
    Q_INVOKABLE QByteArray roomAcountDataJson(const QString &eventType);

-    Q_INVOKABLE [[nodiscard]] QUrl avatarForMember(Quotient::User *user) const;
+    Q_INVOKABLE [[nodiscard]] QUrl avatarForMember(NeoChatUser *user) const;

    /**
     * @brief Returns the event that is being replied to. This includes events that were manually loaded using NeoChatRoom::loadReply.
--- a/src/neochatuser.cpp
+++ b/src/neochatuser.cpp
@@ -0,0 +1,43 @@
+// SPDX-FileCopyrightText: 2019 Black Hat <bhat@encom.eu.org>
+// SPDX-License-Identifier: GPL-3.0-only
+
+#include "neochatuser.h"
+
+#include <QGuiApplication>
+#include <QJsonObject>
+#include <QPalette>
+
+#include <Quotient/connection.h>
+
+using namespace Quotient;
+
+NeoChatUser::NeoChatUser(QString userId, Connection *connection)
+    : User(std::move(userId), connection)
+{
+    connect(static_cast<QGuiApplication *>(QGuiApplication::instance()), &QGuiApplication::paletteChanged, this, &NeoChatUser::polishColor);
+    polishColor();
+}
+
+QColor NeoChatUser::color()
+{
+    return m_color;
+}
+
+void NeoChatUser::setColor(const QColor &color)
+{
+    if (m_color == color) {
+        return;
+    }
+
+    m_color = color;
+    Q_EMIT colorChanged(m_color);
+}
+
+void NeoChatUser::polishColor()
+{
+    const auto lightness = static_cast<QGuiApplication *>(QGuiApplication::instance())->palette().color(QPalette::Active, QPalette::Window).lightnessF();
+    // https://github.com/quotient-im/libQuotient/wiki/User-color-coding-standard-draft-proposal
+    setColor(QColor::fromHslF(hueF(), 1, -0.7 * lightness + 0.9, 1));
+}
+
+#include "moc_neochatuser.cpp"
--- a/src/neochatuser.h
+++ b/src/neochatuser.h
@@ -0,0 +1,39 @@
+// SPDX-FileCopyrightText: 2018-2019 Black Hat <bhat@encom.eu.org>
+// SPDX-License-Identifier: GPL-3.0-only
+
+#pragma once
+
+#include <QObject>
+
+#include <Quotient/user.h>
+
+/**
+ * @class NeoChatUser
+ *
+ * A class inherited from Quotient::User to add a user color function.
+ *
+ * @sa Quotient::User
+ */
+class NeoChatUser : public Quotient::User
+{
+    Q_OBJECT
+
+    /**
+     * @brief The color to use for the user.
+     */
+    Q_PROPERTY(QColor color READ color WRITE setColor NOTIFY colorChanged)
+public:
+    explicit NeoChatUser(QString userId, Quotient::Connection *connection);
+
+public Q_SLOTS:
+    QColor color();
+    void setColor(const QColor &color);
+
+Q_SIGNALS:
+    void colorChanged(QColor _t1);
+
+private:
+    QColor m_color;
+
+    void polishColor();
+};
--- a/src/notificationsmanager.cpp
+++ b/src/notificationsmanager.cpp
@@ -293,7 +293,12 @@ QPixmap NotificationsManager::createNotificationImage(const QImage &icon, NeoCha
    roundedImage.fill(Qt::transparent);

    QPainter painter(&roundedImage);
-    painter.setRenderHint(QPainter::Antialiasing);
+    painter.setRenderHint(QPainter::SmoothPixmapTransform);
+    painter.setPen(Qt::NoPen);
+
+    // Fill background for transparent avatars
+    painter.setBrush(Qt::white);
+    painter.drawRoundedRect(imageRect, imageRect.width(), imageRect.height());

    QBrush brush(icon.scaledToHeight(biggestDimension));
    painter.setBrush(brush);
@@ -304,6 +309,9 @@ QPixmap NotificationsManager::createNotificationImage(const QImage &icon, NeoCha
        if (icon != roomAvatar) {
            const QRect lowerQuarter{imageRect.center(), imageRect.size() / 2};

+            painter.setBrush(Qt::white);
+            painter.drawRoundedRect(lowerQuarter, lowerQuarter.width(), lowerQuarter.height());
+
            painter.setBrush(roomAvatar.scaled(lowerQuarter.size()));
            painter.drawRoundedRect(lowerQuarter, lowerQuarter.width(), lowerQuarter.height());
        }
--- a/src/qml/Component/AvatarTabButton.qml
+++ b/src/qml/Component/AvatarTabButton.qml
@@ -28,6 +28,8 @@ Delegates.RoundedItemDelegate {
    TapHandler {
        acceptedButtons: Qt.RightButton
        acceptedDevices: PointerDevice.Mouse
+        grabPermissions: PointerHandler.TakeOverForbidden
+        gesturePolicy: TapHandler.WithinBounds
        onTapped: root.contextMenuRequested()
    }

--- a/src/qml/Component/ChatBox/ChatBar.qml
+++ b/src/qml/Component/ChatBox/ChatBar.qml
@@ -36,7 +36,7 @@ QQC2.Control {
    /**
     * @brief The current room that user is viewing.
     */
-    required property NeoChatRoom currentRoom
+    property NeoChatRoom currentRoom

    /**
     * @brief The QQC2.TextArea object.
@@ -55,10 +55,10 @@ QQC2.Control {
        Kirigami.Action {
            id: attachmentAction

-            property bool isBusy: root.currentRoom && root.currentRoom.hasFileUploading
+            property bool isBusy: currentRoom && currentRoom.hasFileUploading

            // Matrix does not allow sending attachments in replies
-            visible: root.currentRoom.chatBoxReplyId.length === 0  && root.currentRoom.chatBoxAttachmentPath.length === 0
+            visible: currentRoom.chatBoxReplyId.length === 0  && currentRoom.chatBoxAttachmentPath.length === 0
            icon.name: "mail-attachment"
            text: i18n("Attach an image or file")
            displayHint: Kirigami.DisplayHint.IconOnly
@@ -72,7 +72,7 @@ QQC2.Control {
                        if (!path) {
                            return;
                        }
-                        root.currentRoom.chatBoxAttachmentPath = path;
+                        currentRoom.chatBoxAttachmentPath = path;
                    })
                    fileDialog.open()
                }
@@ -97,6 +97,7 @@ QQC2.Control {
                    emojiDialog.open()
                }
            }
+            tooltip: text
        },
        Kirigami.Action {
            id: mapButton
@@ -106,8 +107,9 @@ QQC2.Control {
            displayHint: QQC2.AbstractButton.IconOnly

            onTriggered: {
-                locationChooserComponent.createObject(QQC2.ApplicationWindow.overlay, {room: root.currentRoom}).open()
+                locationChooserComponent.createObject(QQC2.ApplicationWindow.overlay, {room: currentRoom}).open()
            }
+            tooltip: text
        },
        Kirigami.Action {
            id: sendAction
@@ -162,12 +164,10 @@ QQC2.Control {
            leftPadding: LayoutMirroring.enabled ? actionsRow.width : Kirigami.Units.largeSpacing
            rightPadding: LayoutMirroring.enabled ? Kirigami.Units.largeSpacing : actionsRow.width + x * 2 + Kirigami.Units.largeSpacing * 2

-            placeholderText: readOnly ? i18n("This room is encrypted. Build libQuotient with encryption enabled to send encrypted messages.") : root.currentRoom.usesEncryption ? i18n("Send an encrypted message…") : root.currentRoom.chatBoxAttachmentPath.length > 0 ? i18n("Set an attachment caption...") : i18n("Send a message…")
+            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: (root.currentRoom.usesEncryption && !Controller.encryptionSupported)
-
-            Accessible.description: placeholderText
+            readOnly: (currentRoom.usesEncryption && !Controller.encryptionSupported)

            Timer {
                id: repeatTimer
@@ -177,10 +177,10 @@ QQC2.Control {
            onTextChanged: {
                if (!repeatTimer.running && Config.typingNotifications) {
                    var textExists = text.length > 0
-                    root.currentRoom.sendTypingNotification(textExists)
+                    currentRoom.sendTypingNotification(textExists)
                    textExists ? repeatTimer.start() : repeatTimer.stop()
                }
-                root.currentRoom.chatBoxText = text
+                currentRoom.chatBoxText = text
            }
            onCursorRectangleChanged: chatBarScrollView.ensureVisible(cursorRectangle)
            onSelectedTextChanged: {
@@ -207,7 +207,7 @@ QQC2.Control {
                    remove(cursorPosition, cursorPosition + 1)
                }
                if (textField.text == selectedText || textField.text.length <= 1) {
-                    root.currentRoom.sendTypingNotification(false)
+                    currentRoom.sendTypingNotification(false)
                    repeatTimer.stop()
                }
                if (quickFormatBar.visible) {
@@ -237,20 +237,20 @@ QQC2.Control {
                    completionMenu.complete()
                }
            }
-            Keys.onPressed: {
+            Keys.onPressed: (event) => {
                if (event.key === Qt.Key_V && event.modifiers & Qt.ControlModifier) {
-                    root.pasteImage();
+                    event.accepted = root.pasteImage();
                } else if (event.key === Qt.Key_Up && event.modifiers & Qt.ControlModifier) {
-                    root.currentRoom.replyLastMessage();
+                    currentRoom.replyLastMessage();
                } else if (event.key === Qt.Key_Up && textField.text.length === 0) {
-                    root.currentRoom.editLastMessage();
+                    currentRoom.editLastMessage();
                } 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) {
                    if (textField.text == selectedText || textField.text.length <= 1) {
-                        root.currentRoom.sendTypingNotification(false)
+                        currentRoom.sendTypingNotification(false)
                        repeatTimer.stop()
                    }
                    if (quickFormatBar.visible && selectedText.length > 0) {
@@ -282,19 +282,19 @@ QQC2.Control {
            Component {
                id: replyPane
                ReplyPane {
-                    userName: root.currentRoom.chatBoxReplyUser.displayName
-                    userColor: root.currentRoom.chatBoxReplyUser.color
-                    userAvatar: root.currentRoom.chatBoxReplyUser.avatarSource
-                    text: root.currentRoom.chatBoxReplyMessage
+                    userName: currentRoom.chatBoxReplyUser.displayName
+                    userColor: currentRoom.chatBoxReplyUser.color
+                    userAvatar: currentRoom.chatBoxReplyUser.avatarSource
+                    text: currentRoom.chatBoxReplyMessage
                }
            }
            Component {
                id: attachmentPane
                AttachmentPane {
-                    attachmentPath: root.currentRoom.chatBoxAttachmentPath
+                    attachmentPath: currentRoom.chatBoxAttachmentPath

                    onAttachmentCancelled: {
-                        root.currentRoom.chatBoxAttachmentPath = "";
+                        currentRoom.chatBoxAttachmentPath = "";
                        root.forceActiveFocus()
                    }
                }
@@ -346,8 +346,8 @@ QQC2.Control {
            text: i18nc("@action:button", "Cancel reply")
            icon.name: "dialog-close"
            onTriggered: {
-                root.currentRoom.chatBoxReplyId = "";
-                root.currentRoom.chatBoxAttachmentPath = "";
+                currentRoom.chatBoxReplyId = "";
+                currentRoom.chatBoxAttachmentPath = "";
                root.forceActiveFocus()
            }
        }
@@ -384,11 +384,12 @@ QQC2.Control {

                QQC2.ToolTip.visible: modelData.tooltip !== "" && hoverHandler.hovered
                QQC2.ToolTip.text: modelData.tooltip
+                QQC2.ToolTip.delay: Kirigami.Units.toolTipDelay
                HoverHandler { id: hoverHandler }

                PieProgressBar {
                    visible: modelData.isBusy
-                    progress: root.currentRoom.fileUploadingProgress
+                    progress: currentRoom.fileUploadingProgress
                }
            }
        }
@@ -403,8 +404,6 @@ QQC2.Control {
        includeCustom: true
        closeOnChosen: false

-        currentRoom: root.currentRoom
-
        onChosen: insertText(emoji)
        onClosed: if (emojiButton.checked) emojiButton.checked = false
    }
@@ -468,17 +467,18 @@ QQC2.Control {
    function pasteImage() {
        let localPath = Clipboard.saveImage();
        if (localPath.length === 0) {
-            return;
+            return false;
        }
-        root.currentRoom.chatBoxAttachmentPath = localPath
+        root.currentRoom.chatBoxAttachmentPath = localPath;
+        return true;
    }

    function postMessage() {
        actionsHandler.handleNewMessage();
        repeatTimer.stop()
-        root.currentRoom.markAllMessagesAsRead();
+        currentRoom.markAllMessagesAsRead();
        textField.clear();
-        root.currentRoom.chatBoxReplyId = "";
+        currentRoom.chatBoxReplyId = "";
        messageSent()
    }

--- a/src/qml/Component/ChatBox/ChatBox.qml
+++ b/src/qml/Component/ChatBox/ChatBox.qml
@@ -30,12 +30,12 @@ import org.kde.neochat 1.0
 * @sa ChatBar
 */
 ColumnLayout {
-    id: root
+    id: chatBox

    /**
     * @brief The current room that user is viewing.
     */
-    required property NeoChatRoom currentRoom
+    property NeoChatRoom currentRoom

    /**
     * @brief A message has been sent from the chat bar.
@@ -63,7 +63,7 @@ ColumnLayout {
    ChatBar {
        id: chatBar

-        visible: root.currentRoom.canSendEvent("m.room.message")
+        visible: currentRoom.canSendEvent("m.room.message")

        Layout.fillWidth: true
        Layout.minimumHeight: Math.max(Kirigami.Units.gridUnit * 2, implicitHeight + Kirigami.Units.largeSpacing)
@@ -78,7 +78,7 @@ ColumnLayout {
        }

        onMessageSent: {
-            root.messageSent();
+            chatBox.messageSent();
        }
    }

--- a/src/qml/Component/Emoji/EmojiPicker.qml
+++ b/src/qml/Component/Emoji/EmojiPicker.qml
@@ -10,14 +10,8 @@ import org.kde.neochat 1.0
 ColumnLayout {
    id: root

-    /**
-     * @brief The current room that user is viewing.
-     */
-    property NeoChatRoom currentRoom
-
    property bool includeCustom: false
    property bool showQuickReaction: false
-    property NeoChatRoom currentRoom

    readonly property var currentEmojiModel: {
        if (includeCustom) {
@@ -157,7 +151,7 @@ ColumnLayout {

    ImagePacksModel {
        id: stickerPackModel
-        room: root.currentRoom
+        room: currentRoom
        showStickers: true
        showEmoticons: false
    }
@@ -166,7 +160,7 @@ ColumnLayout {
        id: stickerModel
        model: stickerPackModel
        packIndex: 0
-        room: root.currentRoom
+        room: currentRoom
    }

    EmoticonFilterModel {
--- a/src/qml/Component/Emoji/EmojiTonesPicker.qml
+++ b/src/qml/Component/Emoji/EmojiTonesPicker.qml
@@ -26,14 +26,20 @@ QQC2.Popup {
    padding: 2
    modal: true
    dim: true
+    clip: false
    onOpened: x = Math.min(parent.mapFromGlobal(QQC2.Overlay.overlay.width - tones.width, 0).x, -(width - parent.width) / 2)
    background: Kirigami.ShadowedRectangle {
        color: Kirigami.Theme.backgroundColor
-        radius: Kirigami.Units.smallSpacing
-        shadow.size: Kirigami.Units.smallSpacing
-        shadow.color: Qt.rgba(0.0, 0.0, 0.0, 0.10)
-        border.color: Kirigami.ColorUtils.tintWithAlpha(color, Kirigami.Theme.textColor, 0.15)
-        border.width: 1
+        radius: Kirigami.Units.mediumSpacing
+        shadow {
+            size: Kirigami.Units.largeSpacing
+            color: Qt.rgba(0.0, 0.0, 0.0, 0.3)
+            yOffset: 2
+        }
+        border {
+            color: Kirigami.ColorUtils.tintWithAlpha(color, Kirigami.Theme.textColor, 0.15)
+            width: 1
+        }
    }

    ListView {
--- a/src/qml/Component/FullScreenMap.qml
+++ b/src/qml/Component/FullScreenMap.qml
@@ -46,7 +46,6 @@ ApplicationWindow {
            asset: root.asset
            author: root.author
            isLive: true
-            heading: NaN
            visible: !isNaN(root.latitude) && !isNaN(root.longitude)
        }
        MapItemView {
--- a/src/qml/Component/HoverActions.qml
+++ b/src/qml/Component/HoverActions.qml
@@ -6,7 +6,6 @@ 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

 /**
 * @brief A component that provides a set of actions when a message is hovered in the timeline.
@@ -17,11 +16,6 @@ import org.kde.neochat 1.0
 QQC2.Control {
    id: root

-    /**
-     * @brief The current room that user is viewing.
-     */
-    required property NeoChatRoom currentRoom
-
    /**
     * @brief Whether the actions should be shown.
     */
@@ -114,7 +108,6 @@ QQC2.Control {

            EmojiDialog {
                id: emojiDialog
-                currentRoom: root.currentRoom
                showQuickReaction: true
                onChosen: (emoji) => root.reactClicked(emoji)
            }
--- a/src/qml/Component/LocationMapItem.qml
+++ b/src/qml/Component/LocationMapItem.qml
@@ -24,14 +24,11 @@ MapQuickItem {

    required property bool isLive

-    required property real heading
-
    anchorPoint.x: sourceItem.width / 2
    anchorPoint.y: sourceItem.height
    coordinate: QtPositioning.coordinate(root.latitude, root.longitude)
    autoFadeIn: false
    sourceItem: Kirigami.Icon {
-        id: mainIcon
        width: height
        height: Kirigami.Units.iconSizes.huge
        source: "gps"
@@ -58,19 +55,5 @@ MapQuickItem {
            source: root.author.avatarSource
            color: root.author.color
        }
-
-        Kirigami.Icon {
-            id: headingIcon
-            source: "go-up-symbolic"
-            color: parent.color
-            visible: !isNaN(root.heading) && root.isLive
-            anchors.bottom: mainIcon.top
-            anchors.horizontalCenter: mainIcon.horizontalCenter
-            transform: Rotation {
-                origin.x: headingIcon.width/2
-                origin.y: headingIcon.height + mainIcon.height/2
-                angle: root.heading
-            }
-        }
    }
 }
--- a/src/qml/Component/LocationPage.qml
+++ b/src/qml/Component/LocationPage.qml
@@ -36,7 +36,6 @@ Kirigami.Page {
            }
            delegate: LocationMapItem {
                isLive: true
-                heading: NaN
            }
        }

--- a/src/qml/Component/Login/Login.qml
+++ b/src/qml/Component/Login/Login.qml
@@ -28,7 +28,6 @@ LoginStep {
            id: matrixIdField
            Kirigami.FormData.label: i18n("Matrix ID:")
            placeholderText: "@user:matrix.org"
-            Accessible.name: i18n("Matrix ID")
            onTextChanged: {
                LoginHelper.matrixId = text
            }
--- a/src/qml/Component/Login/Password.qml
+++ b/src/qml/Component/Login/Password.qml
@@ -38,7 +38,6 @@ LoginStep {
            id: passwordField
            onTextChanged: LoginHelper.password = text
            enabled: !LoginHelper.isLoggingIn
-            Accessible.name: i18n("Password")

            Component.onCompleted: {
                passwordField.forceActiveFocus()
--- a/src/qml/Component/Timeline/LocationDelegate.qml
+++ b/src/qml/Component/Timeline/LocationDelegate.qml
@@ -57,7 +57,6 @@ TimelineContainer {
                asset: root.asset
                author: root.author
                isLive: true
-                heading: NaN
            }

            TapHandler {
--- a/src/qml/Component/Timeline/MessageDelegate.qml
+++ b/src/qml/Component/Timeline/MessageDelegate.qml
@@ -50,12 +50,6 @@ TimelineContainer {
            isReply: root.isReply

            textMessage: root.display
-
-            TapHandler {
-                enabled: !label.hoveredLink
-                acceptedButtons: Qt.LeftButton
-                onLongPressed: root.openContextMenu()
-            }
        }
        Loader {
            Layout.fillWidth: true
--- a/src/qml/Component/Timeline/ReplyComponent.qml
+++ b/src/qml/Component/Timeline/ReplyComponent.qml
@@ -34,9 +34,9 @@ Item {
     *  - displayName - The display name of the reply author.
     *  - display - The name of the reply author.
     *  - color - The color for the reply author.
-     *  - object - The Quotient::User object for the reply author.
+     *  - object - The NeoChatUser object for the reply author.
     *
-     * @sa Quotient::User
+     * @sa NeoChatUser
     */
    required property var author

--- a/src/qml/Component/Timeline/RichLabel.qml
+++ b/src/qml/Component/Timeline/RichLabel.qml
@@ -27,7 +27,12 @@ TextEdit {
    /**
     * @brief Regex for detecting a message with a single emoji.
     */
-    readonly property var isEmoji: /^(<span style='.*'>)?(\u00a9|\u00ae|[\u20D0-\u2fff]|[\u3190-\u3300]|\ud83c[\ud000-\udfff]|\ud83d[\ud000-\udfff]|\ud83e[\ud000-\udfff])+(<\/span>)?$/
+    readonly property var isEmojiRegex: /^(<span style='.*'>)?(\u00a9|\u00ae|[\u20D0-\u2fff]|[\u3190-\u3300]|\ud83c[\ud000-\udfff]|\ud83d[\ud000-\udfff]|\ud83e[\ud000-\udfff])+(<\/span>)?$/
+
+    /**
+     * @brief Whether the message is an emoji
+     */
+    readonly property var isEmoji: isEmojiRegex.test(textMessage)

    /**
     * @brief Regex for detecting a message with a spoiler.
@@ -85,7 +90,10 @@ a{
    color: Kirigami.Theme.textColor
    selectedTextColor: Kirigami.Theme.highlightedTextColor
    selectionColor: Kirigami.Theme.highlightColor
-    font.pointSize: !root.isReply && isEmoji.test(textMessage) ? Kirigami.Theme.defaultFont.pointSize * 4 : Kirigami.Theme.defaultFont.pointSize
+    font {
+        pointSize: !root.isReply && root.isEmoji ? Kirigami.Theme.defaultFont.pointSize * 4 : Kirigami.Theme.defaultFont.pointSize
+        family: root.isEmoji ? 'emoji' : Kirigami.Theme.defaultFont.family
+    }
    selectByMouse: !Kirigami.Settings.isMobile
    readOnly: true
    wrapMode: Text.Wrap
--- a/src/qml/Component/Timeline/TimelineContainer.qml
+++ b/src/qml/Component/Timeline/TimelineContainer.qml
@@ -54,9 +54,9 @@ ColumnLayout {
     *  - displayName - The display name of the author.
     *  - display - The name of the author.
     *  - color - The color for the author.
-     *  - object - The Quotient::User object for the author.
+     *  - object - The NeoChatUser object for the author.
     *
-     * @sa Quotient::User
+     * @sa NeoChatUser
     */
    required property var author

@@ -137,9 +137,9 @@ ColumnLayout {
     *  - displayName - The display name of the reply author.
     *  - display - The name of the reply author.
     *  - color - The color for the reply author.
-     *  - object - The Quotient::User object for the reply author.
+     *  - object - The NeoChatUser object for the reply author.
     *
-     * @sa Quotient::User
+     * @sa NeoChatUser
     */
    required property var replyAuthor

@@ -485,7 +485,7 @@ ColumnLayout {

                        Layout.maximumWidth: contentMaxWidth

-                        active: root.isReply && root.reply
+                        active: root.isReply
                        visible: active

                        sourceComponent: ReplyComponent {
@@ -518,7 +518,8 @@ ColumnLayout {
                    visible: cardBackground && !Config.compactLayout
                    anchors.fill: parent
                    Kirigami.Theme.colorSet: Kirigami.Theme.View
-                    color:  if (root.author.isLocalUser) {
+                    Kirigami.Theme.inherit: false
+                    color: if (root.author.isLocalUser) {
                        return Kirigami.ColorUtils.tintWithAlpha(Kirigami.Theme.backgroundColor, Kirigami.Theme.highlightColor, 0.15)
                    } else if (root.showHighlight) {
                        return Kirigami.Theme.positiveBackgroundColor
--- a/src/qml/Component/TimelineView.qml
+++ b/src/qml/Component/TimelineView.qml
@@ -16,19 +16,9 @@ import org.kde.neochat 1.0
 QQC2.ScrollView {
    id: root
    required property NeoChatRoom currentRoom
-    onCurrentRoomChanged: {
-        roomChanging = true;
-        applicationWindow().hoverLinkIndicator.text = "";
-        messageListView.positionViewAtBeginning();
-        hasScrolledUpBefore = false;
-        roomChanging = true;
-    }
-    property bool roomChanging: false
+    readonly property bool isLoaded: root.width * root.height > 10
    readonly property bool atYEnd: messageListView.atYEnd

-    /// Used to determine if scrolling to the bottom should mark the message as unread
-    property bool hasScrolledUpBefore: false;
-
    signal focusChatBox()

    ListView {
@@ -48,7 +38,7 @@ QQC2.ScrollView {
        interactive: Kirigami.Settings.isMobile
        bottomMargin: Kirigami.Units.largeSpacing + Math.round(Kirigami.Theme.defaultFont.pointSize * 2)

-        model: collapseStateProxyModel
+        model: !isLoaded ? undefined : collapseStateProxyModel

        MessageEventModel {
            id: messageEventModel
@@ -80,15 +70,13 @@ QQC2.ScrollView {
            messageEventModel.fetchMore(messageEventModel.index(0, 0));
        }

-        onAtYEndChanged: if (!root.roomChanging) {
-            if (atYEnd && root.hasScrolledUpBefore) {
-                if (QQC2.ApplicationWindow.window && (QQC2.ApplicationWindow.window.visibility !== QQC2.ApplicationWindow.Hidden)) {
-                    root.currentRoom.markAllMessagesAsRead();
-                }
-                root.hasScrolledUpBefore = false;
-            } else if (!atYEnd) {
-                root.hasScrolledUpBefore = true;
+        onAtYEndChanged: if (atYEnd && hasScrolledUpBefore) {
+            if (QQC2.ApplicationWindow.window && (QQC2.ApplicationWindow.window.visibility !== QQC2.ApplicationWindow.Hidden)) {
+                root.currentRoom.markAllMessagesAsRead();
            }
+            hasScrolledUpBefore = false;
+        } else if (!atYEnd) {
+            hasScrolledUpBefore = true;
        }

        // Not rendered because the sections are part of the TimelineContainer.qml, this is only so that items have the section property available for use by sectionBanner.
@@ -322,7 +310,6 @@ QQC2.ScrollView {
            y: delegate ? delegate.mapToItem(parent, 0, 0).y + delegate.bubbleY - height + Kirigami.Units.smallSpacing : 0
            width: delegate ? delegate.bubbleWidth : Kirigami.Units.gridUnit * 4

-            currentRoom: root.currentRoom
            showActions: delegate && delegate.hovered
            verified: delegate && delegate.verified
            editable: delegate && delegate.author.isLocalUser && (delegate.delegateType === MessageEventModel.Emote || delegate.delegateType === MessageEventModel.Message)
--- a/src/qml/Dialog/EmojiDialog.qml
+++ b/src/qml/Dialog/EmojiDialog.qml
@@ -11,11 +11,6 @@ import org.kde.neochat 1.0
 QQC2.Popup {
    id: emojiPopup

-    /**
-     * @brief The current room that user is viewing.
-     */
-    property NeoChatRoom currentRoom
-
    property bool includeCustom: false
    property bool closeOnChosen: true
    property bool showQuickReaction: false
@@ -39,15 +34,21 @@ QQC2.Popup {
    background: Kirigami.ShadowedRectangle {
        Kirigami.Theme.colorSet: Kirigami.Theme.View
        color: Kirigami.Theme.backgroundColor
-        radius: Kirigami.Units.smallSpacing
-        shadow.size: Kirigami.Units.smallSpacing
-        shadow.color: Qt.rgba(0.0, 0.0, 0.0, 0.10)
-        border.color: Kirigami.ColorUtils.tintWithAlpha(color, Kirigami.Theme.textColor, 0.15)
-        border.width: 2
+        radius: Kirigami.Units.mediumSpacing
+        shadow {
+            size: Kirigami.Units.largeSpacing
+            color: Qt.rgba(0.0, 0.0, 0.0, 0.3)
+            yOffset: 2
+        }
+        border {
+            color: Kirigami.ColorUtils.tintWithAlpha(color, Kirigami.Theme.textColor, 0.15)
+            width: 2
+        }
    }

    modal: true
    focus: true
+    clip: false
    closePolicy: QQC2.Popup.CloseOnEscape | QQC2.Popup.CloseOnPressOutsideParent
    margins: 0
    padding: 2
@@ -57,10 +58,8 @@ QQC2.Popup {
    contentItem: EmojiPicker {
        id: emojiPicker
        height: 400
-        currentRoom: root.currentRoom
        includeCustom: emojiPopup.includeCustom
        showQuickReaction: emojiPopup.showQuickReaction
-        currentRoom: RoomManager.currentRoom
        onChosen: {
            emojiPopup.chosen(emoji)
            if (emojiPopup.closeOnChosen) emojiPopup.close()
--- a/src/qml/Dialog/UserDetailDialog.qml
+++ b/src/qml/Dialog/UserDetailDialog.qml
@@ -11,7 +11,7 @@ import org.kde.kirigamiaddons.labs.components 1.0 as KirigamiComponents

 import org.kde.neochat 1.0

-Kirigami.Dialog {
+Kirigami.OverlaySheet {
    id: root

    signal closed()
@@ -26,9 +26,6 @@ Kirigami.Dialog {
    topPadding: 0
    bottomPadding: 0

-    standardButtons: Kirigami.Dialog.NoButton
-
-    width: Math.min(applicationWindow().width, Kirigami.Units.gridUnit * 24)
    title: i18nc("@title:menu Account detail dialog", "Account detail")

    contentItem: ColumnLayout {
@@ -61,6 +58,7 @@ Kirigami.Dialog {
                    elide: Text.ElideRight
                    wrapMode: Text.NoWrap
                    text: user.displayName
+                    textFormat: Text.PlainText
                }

                Kirigami.SelectableLabel {
@@ -199,5 +197,10 @@ Kirigami.Dialog {
            }
        }
    }
+    @OVERLAYSHEET_OPEN@: {
+        if (!sheetOpen) {
+            closed()
+        }
+    }
 }

--- a/src/qml/Menu/GlobalMenu.qml
+++ b/src/qml/Menu/GlobalMenu.qml
@@ -24,7 +24,9 @@ Labs.MenuBar {
            text: i18nc("menu", "Configure NeoChat...")

            shortcut: StandardKey.Preferences
-            onTriggered: pageStack.pushDialogLayer("qrc:/SettingsPage.qml", {}, {
+            onTriggered: pageStack.pushDialogLayer("qrc:/SettingsPage.qml", {
+                connection: Controller.activeConnection
+            }, {
                title: i18n("Configure")
            })
        }
--- a/src/qml/Menu/Timeline/BanSheet.qml
+++ b/src/qml/Menu/Timeline/BanSheet.qml
@@ -7,6 +7,8 @@ import QtQuick.Layouts 1.15

 import org.kde.kirigami 2.20 as Kirigami

+import org.kde.neochat 1.0
+
 Kirigami.Page {
    id: banSheet

--- a/src/qml/Menu/Timeline/ReportSheet.qml
+++ b/src/qml/Menu/Timeline/ReportSheet.qml
@@ -7,6 +7,8 @@ import QtQuick.Layouts 1.15

 import org.kde.kirigami 2.20 as Kirigami

+import org.kde.neochat 1.0
+
 Kirigami.Page {
    id: reportSheet

--- a/src/qml/Page/RoomList/Page.qml
+++ b/src/qml/Page/RoomList/Page.qml
@@ -193,12 +193,6 @@ Kirigami.Page {
                                width: Kirigami.Units.iconSizes.small
                                height: Kirigami.Units.iconSizes.small
                            }
-                            text: roomListModel.categoryVisible(section) ? i18nc("Collapse <section name>", "Collapse %1", roomListModel.categoryName(section)) : i18nc("Expand <section name", "Expand %1", roomListModel.categoryName(section))
-                            display: QQC2.Button.IconOnly
-
-                            QQC2.ToolTip.text: text
-                            QQC2.ToolTip.visible: hovered
-                            QQC2.ToolTip.delay: Kirigami.Units.toolTipDelay

                            onClicked: roomListModel.setCategoryVisible(section, !roomListModel.categoryVisible(section))
                        }
--- a/src/qml/Page/RoomList/RoomDelegate.qml
+++ b/src/qml/Page/RoomList/RoomDelegate.qml
@@ -31,8 +31,6 @@ Delegates.RoundedItemDelegate {

    readonly property bool hasNotifications: notificationCount > 0

-    Accessible.name: root.displayName
-
    onPressAndHold: createRoomListContextMenu()

    TapHandler {
@@ -67,6 +65,7 @@ Delegates.RoundedItemDelegate {
                text: root.displayName
                elide: Text.ElideRight
                font.weight: root.hasNotifications ? Font.Bold : Font.Normal
+                textFormat: Text.PlainText

                Layout.fillWidth: true
                Layout.alignment: subtitle.visible ? Qt.AlignLeft | Qt.AlignBottom : Qt.AlignLeft | Qt.AlignVCenter
--- a/src/qml/Page/RoomList/SpaceDrawer.qml
+++ b/src/qml/Page/RoomList/SpaceDrawer.qml
@@ -72,7 +72,12 @@ QQC2.Control {
                                connection: Controller.activeConnection
                            }
                        }
-                        onCountChanged: root.enabled = count > 0
+                        onCountChanged: {
+                            root.enabled = count > 0
+                            if (!Controller.activeConnection.room(root.selectedSpaceId)) {
+                                root.selectedSpaceId = ""
+                            }
+                        }
                        Component.onCompleted: root.enabled = count > 0

                        delegate: AvatarTabButton {
--- a/src/qml/Page/RoomList/SpaceListContextMenu.qml
+++ b/src/qml/Page/RoomList/SpaceListContextMenu.qml
@@ -24,11 +24,13 @@ Loader {
        QQC2.Menu {
            QQC2.MenuItem {
                text: i18nc("'Space' is a matrix space", "View Space")
+                icon.name: "view-list-details"
                onTriggered: RoomManager.enterRoom(room);
            }

            QQC2.MenuItem {
                text: i18nc("@action:inmenu", "Copy Address to Clipboard")
+                icon.name: "edit-copy"
                onTriggered: if (room.canonicalAlias.length === 0) {
                    Clipboard.saveText(room.id)
                } else {
@@ -38,6 +40,7 @@ Loader {

            QQC2.MenuItem {
                text: i18nc("'Space' is a matrix space", "Space Settings")
+                icon.name: 'settings-configure'
                onTriggered: QQC2.ApplicationWindow.window.pageStack.pushDialogLayer('qrc:/Categories.qml', {room: room}, { title: i18n("Space Settings") })
            }

@@ -45,12 +48,13 @@ Loader {

            QQC2.MenuItem {
                text: i18nc("'Space' is a matrix space", "Leave Space")
+                icon.name: "go-previous"
                onTriggered: RoomManager.leaveRoom(room)
            }

            onClosed: {
                root.closed()
-                destroy()
+                regularMenu.destroy()
            }
        }
    }
--- a/src/qml/Page/RoomList/UserInfo.qml
+++ b/src/qml/Page/RoomList/UserInfo.qml
@@ -95,7 +95,7 @@ QQC2.ToolBar {
                }
            }

-            width: parent.width
+            Layout.fillWidth: true
            Layout.preferredHeight: contentHeight
            delegate: Delegates.RoundedItemDelegate {
                id: userDelegate
--- a/src/qml/Page/RoomPage.qml
+++ b/src/qml/Page/RoomPage.qml
@@ -19,17 +19,25 @@ Kirigami.Page {
    /// Not readonly because of the separate window view.
    property NeoChatRoom currentRoom: RoomManager.currentRoom
    property bool loading: !root.currentRoom || (root.currentRoom.timelineSize === 0 && !root.currentRoom.allHistoryLoaded)
+    /// Used to determine if scrolling to the bottom should mark the message as unread
+    property bool hasScrolledUpBefore: false;

    /// Disable cancel shortcut. Used by the separate window since it provides its own cancel implementation.
    property bool disableCancelShortcut: false

-    title: root.currentRoom.displayName
+    title: currentRoom.displayName
    focus: true
    padding: 0

    KeyNavigation.left: pageStack.get(0)

    onCurrentRoomChanged: {
+        if (!timelineViewLoader.item) {
+            return
+        }
+        applicationWindow().hoverLinkIndicator.text = "";
+        timelineViewLoader.item.positionViewAtBeginning();
+        hasScrolledUpBefore = false;
        if (!Kirigami.Settings.isMobile && chatBoxLoader.item) {
            chatBoxLoader.item.forceActiveFocus();
        }
@@ -38,7 +46,7 @@ Kirigami.Page {
    Connections {
        target: Controller
        function onIsOnlineChanged() {
-            if (true || !Controller.isOnline) {
+            if (!Controller.isOnline) {
                banner.text = i18n("NeoChat is offline. Please check your network connection.");
                banner.visible = true;
                banner.type = Kirigami.MessageType.Error;
@@ -58,7 +66,7 @@ Kirigami.Page {
    Loader {
        id: timelineViewLoader
        anchors.fill: parent
-        active: root.currentRoom && !root.currentRoom.isInvite && !root.loading
+        active: currentRoom && !currentRoom.isInvite && !root.loading
        sourceComponent: TimelineView {
            id: timelineView
            currentRoom: root.currentRoom
@@ -72,7 +80,7 @@ Kirigami.Page {

    Loader {
        id: invitationLoader
-        active: root.currentRoom && root.currentRoom.isInvite
+        active: currentRoom && currentRoom.isInvite
        anchors.centerIn: parent
        sourceComponent: InvitationView {
            currentRoom: root.currentRoom
@@ -98,7 +106,7 @@ Kirigami.Page {
        sourceComponent: ChatBox {
            id: chatBox
            width: parent.width
-            currentRoom: root.currentRoom
+            currentRoom: currentRoom
            onMessageSent: {
                if (!timelineViewLoader.item.atYEnd) {
                    timelineViewLoader.item.goToLastMessage();
@@ -132,9 +140,9 @@ Kirigami.Page {
    Shortcut {
        sequence: StandardKey.Cancel
        onActivated: {
-            if (!timelineViewLoader.item.atYEnd || root.currentRoom.hasUnreadMessages) {
+            if (!timelineViewLoader.item.atYEnd || currentRoom.hasUnreadMessages) {
                goToLastMessage();
-                root.currentRoom.markAllMessagesAsRead();
+                currentRoom.markAllMessagesAsRead();
            } else {
                applicationWindow().pageStack.get(0).forceActiveFocus();
            }
--- a/src/qml/Panel/GroupChatDrawerHeader.qml
+++ b/src/qml/Panel/GroupChatDrawerHeader.qml
@@ -61,6 +61,7 @@ ColumnLayout {
                Layout.fillWidth: true
                text: room ? room.displayName : i18n("No name")
                textFormat: Text.PlainText
+                wrapMode: Text.Wrap
            }

            Kirigami.SelectableLabel {
--- a/src/qml/Panel/RoomDrawer.qml
+++ b/src/qml/Panel/RoomDrawer.qml
@@ -156,7 +156,8 @@ Kirigami.OverlayDrawer {
                            Layout.fillWidth: true

                            onClicked: {
-                                applicationWindow().pageStack.pushDialogLayer("qrc:/DevtoolsPage.qml", {room: room}, {title: i18n("Developer Tools")})
+                                applicationWindow().pageStack.layers.push("qrc:/DevtoolsPage.qml", {room: room}, {title: i18n("Developer Tools")})
+                                roomDrawer.close();
                            }
                        }

@@ -228,7 +229,8 @@ Kirigami.OverlayDrawer {
                                icon.name: "list-add-user"

                                onClicked: {
-                                    applicationWindow().pageStack.pushDialogLayer("qrc:/InviteUserPage.qml", {room: roomDrawer.room}, {title: i18nc("@title", "Invite a User")})
+                                    applicationWindow().pageStack.layers.push("qrc:/InviteUserPage.qml", {room: roomDrawer.room})
+                                    roomDrawer.close();
                                }

                                QQC2.ToolTip.text: i18n("Invite user to room")
--- a/src/qml/Settings/GeneralSettingsPage.qml
+++ b/src/qml/Settings/GeneralSettingsPage.qml
@@ -30,7 +30,7 @@ Kirigami.ScrollablePage {

                MobileForm.FormCheckDelegate {
                    id: closeDelegate
-                    text: i18n("Show in System Tray")
+                    text: i18n("Close to system tray")
                    checked: Config.systemTray
                    visible: Controller.supportSystemTray
                    enabled: !Config.isSystemTrayImmutable
--- a/src/qml/main.qml
+++ b/src/qml/main.qml
@@ -390,7 +390,7 @@ Kirigami.ApplicationWindow {
    Shortcut {
        sequence: "Ctrl+Shift+,"
        onActivated: {
-            pageStack.pushDialogLayer("qrc:/SettingsPage.qml")
+            pageStack.pushDialogLayer("qrc:/SettingsPage.qml", {connection: Controller.activeConnection}, { title: i18n("Configure") })
        }
    }
 }
--- a/src/res.qrc
+++ b/src/res.qrc
@@ -74,7 +74,7 @@
        <file alias="RoomDrawer.qml">qml/Panel/RoomDrawer.qml</file>
        <file alias="DirectChatDrawerHeader.qml">qml/Panel/DirectChatDrawerHeader.qml</file>
        <file alias="GroupChatDrawerHeader.qml">qml/Panel/GroupChatDrawerHeader.qml</file>
-        <file alias="UserDetailDialog.qml">qml/Dialog/UserDetailDialog.qml</file>
+        <file alias="UserDetailDialog.qml">@CMAKE_CURRENT_BINARY_DIR@/qml/Dialog/UserDetailDialog.qml</file>
        <file alias="CreateRoomDialog.qml">qml/Dialog/CreateRoomDialog.qml</file>
        <file alias="CreateSpaceDialog.qml">qml/Dialog/CreateSpaceDialog.qml</file>
        <file alias="EmojiDialog.qml">qml/Dialog/EmojiDialog.qml</file>
--- a/src/texthandler.cpp
+++ b/src/texthandler.cpp
@@ -4,9 +4,8 @@
 #include "texthandler.h"

 #include <QDebug>
-#include <QGuiApplication>
-#include <QStringLiteral>
 #include <QUrl>
+#include <QStringLiteral>

 #include <Quotient/events/roommessageevent.h>
 #include <Quotient/util.h>
@@ -16,8 +15,6 @@

 #include <Kirigami/PlatformTheme>

-#include "utils.h"
-
 static const QStringList allowedTags = {
    QStringLiteral("font"),    QStringLiteral("del"),    QStringLiteral("h1"),         QStringLiteral("h2"),     QStringLiteral("h3"),    QStringLiteral("h4"),
    QStringLiteral("h5"),      QStringLiteral("h6"),     QStringLiteral("blockquote"), QStringLiteral("p"),      QStringLiteral("a"),     QStringLiteral("ul"),
@@ -138,9 +135,9 @@ QString TextHandler::handleRecieveRichText(Qt::TextFormat inputFormat, const Neo
    if (event != nullptr) {
        auto e = eventCast<const Quotient::RoomMessageEvent>(event);
        if (e->msgtype() == Quotient::MessageEventType::Emote) {
-            auto author = room->user(e->senderId());
+            auto author = static_cast<NeoChatUser *>(room->user(e->senderId()));
            QString emoteString = QStringLiteral("* <a href=\"https://matrix.to/#/") + e->senderId() + QStringLiteral("\" style=\"color:")
-                + Utils::getUserColor(author->hueF()).name() + QStringLiteral("\">") + author->displayname(room) + QStringLiteral("</a> ");
+                + author->color().name() + QStringLiteral("\">") + author->displayname(room) + QStringLiteral("</a> ");
            if (outputString.startsWith(QStringLiteral("<p>"))) {
                outputString.insert(3, emoteString);
            } else {
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Heiko Becker	ffbd92317e	GIT_SILENT Update Appstream for new release	2023-10-07 18:01:35 +02:00
Heiko Becker	7c9173eb65	GIT_SILENT Upgrade release service version to 23.08.2.	2023-10-07 17:05:08 +02:00
l10n daemon script	c6a5a119e8	GIT_SILENT Sync po/docbooks with svn	2023-10-01 03:38:21 +00:00
l10n daemon script	edf2da1413	GIT_SILENT Sync po/docbooks with svn	2023-09-30 03:10:36 +00:00
l10n daemon script	3cacb10b9c	GIT_SILENT Sync po/docbooks with svn	2023-09-26 03:21:35 +00:00
l10n daemon script	ce19275d8d	GIT_SILENT Sync po/docbooks with svn	2023-09-20 03:07:35 +00:00
l10n daemon script	1d050c5264	GIT_SILENT Sync po/docbooks with svn	2023-09-19 03:12:29 +00:00
l10n daemon script	5f3ab888d0	GIT_SILENT Sync po/docbooks with svn	2023-09-17 04:02:52 +00:00
l10n daemon script	a7993d7b59	GIT_SILENT Sync po/docbooks with svn	2023-09-15 03:06:42 +00:00
l10n daemon script	eb837d2435	GIT_SILENT Sync po/docbooks with svn	2023-09-13 03:19:15 +00:00
l10n daemon script	c57354f974	GIT_SILENT Sync po/docbooks with svn	2023-09-11 03:12:35 +00:00
l10n daemon script	81a3ab95c5	GIT_SILENT made messages (after extraction)	2023-09-11 02:29:47 +00:00
q234 rty	0408956364	Use shortcode as a fallback for body when sending stickers (cherry picked from commit `50551541ed`)	2023-09-10 12:32:35 +02:00
Antonio Rojas	161412cbcf	Add cmake check for qtlocation QML module So that packagers are notified that it is a dependency (cherry picked from commit `763198b2c3`)	2023-09-10 12:32:32 +02:00
l10n daemon script	fdb02bebf5	GIT_SILENT Sync po/docbooks with svn	2023-09-10 03:04:18 +00:00
l10n daemon script	a756288a07	GIT_SILENT made messages (after extraction)	2023-09-10 02:23:23 +00:00
Ingo Klöcker	4853212326	Add Windows-specific screenshots as screenshots with custom attribute Instead of using translated custom values (which are not accepted by AppStream validation) this adds the Windows-specific screenshots as normal screenshots with custom attribute x-kde-os="windows". AppStream validation accepts custom attributes (in fact, it ignores any attributes other than "type"). Upstream appstream tooling will treat those screenshots as any other extra screenshots (screenshots without type="default"). (cherry picked from commit `6f4d2c0216`)	2023-09-09 17:59:04 +02:00
Heiko Becker	3f36cbc2a4	Revert "GIT_SILENT made messages (after extraction)" And restore the mistakenly removeed appdata file. This reverts commit `fe3933c96a`.	2023-09-09 15:54:52 +02:00
Heiko Becker	ac9629258f	GIT_SILENT Upgrade release service version to 23.08.1.	2023-09-09 10:23:39 +02:00
l10n daemon script	c085a5815b	GIT_SILENT made messages (after extraction)	2023-09-09 02:24:55 +00:00
Luigi Toscano	7a25b151d4	Revert "GIT_SILENT made messages (after extraction)" Restore a file which was removed by mistake. Maybe we need to check the new ITS file. This reverts commit `fe3933c96a`.	2023-09-08 11:24:29 +02:00
l10n daemon script	fe3933c96a	GIT_SILENT made messages (after extraction)	2023-09-08 02:24:52 +00:00
l10n daemon script	3f59d988e7	GIT_SILENT Sync po/docbooks with svn	2023-09-06 03:02:15 +00:00
l10n daemon script	4355afae30	GIT_SILENT Sync po/docbooks with svn	2023-09-04 03:10:19 +00:00
l10n daemon script	99c7d0f5cc	GIT_SILENT Sync po/docbooks with svn	2023-09-03 04:04:27 +00:00
l10n daemon script	528ad54136	GIT_SILENT Sync po/docbooks with svn	2023-09-02 03:15:32 +00:00
l10n daemon script	ee18e92d12	GIT_SILENT Sync po/docbooks with svn	2023-09-01 03:05:30 +00:00
l10n daemon script	67c0bf1881	GIT_SILENT Sync po/docbooks with svn	2023-08-31 03:04:57 +00:00
l10n daemon script	4e0c0fc3e4	GIT_SILENT Sync po/docbooks with svn	2023-08-29 03:04:34 +00:00
Tobias Fella	4886f1c3b9	Deselect space when leaving it BUG: 473271 (cherry picked from commit `cc60dde62d`)	2023-08-28 11:48:40 +02:00
l10n daemon script	d1efa96b79	GIT_SILENT Sync po/docbooks with svn	2023-08-28 04:04:14 +00:00
Tobias Fella	56d7d1f313	Fix opening settings BUG: 473789 (cherry picked from commit `d11d6c74b3`)	2023-08-27 19:17:49 +02:00
Tobias Fella	04682b077a	Fix opening report sheet (cherry picked from commit `68298f038d`)	2023-08-27 14:59:43 +02:00
Tobias Fella	ed496e04bb	Force plain text user display name in user detail sheet (cherry picked from commit `5da9bba844`)	2023-08-27 14:59:29 +02:00
Tobias Fella	8439768cc3	Fix opening ban sheet (cherry picked from commit `405fd5841a`)	2023-08-27 14:59:19 +02:00
Carl Schwan	33a4d476c6	Add release note for last two version (cherry picked from commit `550d55cb1a`)	2023-08-25 15:23:53 +02:00
Carl Schwan	bb2e2fddcc	Remove debuging value Otherwise like of connectivity never disapear (cherry picked from commit `1e3c3dd1f4`)	2023-08-24 16:11:06 +02:00
l10n daemon script	0d890ce3d6	GIT_SILENT Sync po/docbooks with svn	2023-08-21 03:07:33 +00:00
l10n daemon script	081dd5f1b0	GIT_SILENT made messages (after extraction)	2023-08-21 02:26:15 +00:00
l10n daemon script	79bba63864	GIT_SILENT Sync po/docbooks with svn	2023-08-20 03:05:14 +00:00
l10n daemon script	2b131b58a9	GIT_SILENT Sync po/docbooks with svn	2023-08-17 03:05:43 +00:00
Carl Schwan	97b7047a48	Don't inherit color in TimelineContainer (cherry picked from commit `3bd93996c0`)	2023-08-16 23:45:04 +02:00
Heiko Becker	91b5573016	GIT_SILENT Update Appstream for new release	2023-08-16 23:33:42 +02:00
Heiko Becker	8e9bb8a7e4	GIT_SILENT Upgrade release service version to 23.08.0.	2023-08-16 23:33:39 +02:00
Joshua Goins	916755b4ad	Use view-list-details instead of expand icon in room drawer (cherry picked from commit `24d0082048`)	2023-08-16 16:24:13 -04:00
Joshua Goins	9ce288fe47	Destroy the correct component in space list context menu (cherry picked from commit `2980af11b0`)	2023-08-16 16:24:12 -04:00
Joshua Goins	aa461fe078	Prevent the TapHandler in AvatarTabButton from triggering clicked() This caused right-clicks on this component (for example, in the space drawer) to cause clicked() to be called on the delegate. (cherry picked from commit `91d9406c38`)	2023-08-16 16:24:12 -04:00
Joshua Goins	15d8c39185	Add icons to the space list context menu items (cherry picked from commit `280d1e38e2`)	2023-08-16 16:24:12 -04:00
Joshua Goins	4a1aa97d7b	Prevent the chat bar from pasting a local file URL if we save the bitmap There's no point in also putting the file:// URL, so catch the event if saving the bitmap from the clipboard is successful. (cherry picked from commit `7b520da4b4`)	2023-08-16 16:24:12 -04:00
Joshua Goins	e332179ac4	Ensure that the notification avatar is drawn with no pen (cherry picked from commit `419b4cea98`)	2023-08-16 16:22:38 -04:00
Joshua Goins	7534f293c5	Further notification avatar improvements The correct render hint is actually SmoothPixmapTransform, as Antialiasing only matters for primitives. Also, render a white background for potentially transparent avatars. (cherry picked from commit `38824f30ac`)	2023-08-16 16:22:38 -04:00
Joshua Goins	fc60a7c13e	Fix the account switcher width so it doesn't spill off the side (cherry picked from commit `9c4d8ef823`)	2023-08-16 16:22:38 -04:00
Joshua Goins	48b8703156	Pick a better shadow and clean up emoji popup backgrounds These shadows are now closer to how other popups look. (cherry picked from commit `fe3bf3a638`)	2023-08-16 16:22:38 -04:00
Joshua Goins	5ca85dc670	Don't clip the emoji popups as they destroy shadows (cherry picked from commit `d678a446e2`)	2023-08-16 16:22:38 -04:00
l10n daemon script	bf8ea41e6a	GIT_SILENT Sync po/docbooks with svn	2023-08-16 03:06:00 +00:00
l10n daemon script	fda4ae8735	GIT_SILENT Sync po/docbooks with svn	2023-08-15 03:08:17 +00:00
Tobias Fella	aa0e9fff15	Improve tooltips in chatbar (cherry picked from commit `4ea183b139`)	2023-08-14 09:55:08 +02:00
Tobias Fella	28391b53e5	Wrap room display name in Room Drawer (cherry picked from commit `22fd24549b`)	2023-08-14 09:51:34 +02:00
l10n daemon script	a8d7744b42	GIT_SILENT Sync po/docbooks with svn	2023-08-13 03:05:29 +00:00
l10n daemon script	9fcc858841	GIT_SILENT made messages (after extraction)	2023-08-13 02:23:56 +00:00
l10n daemon script	f7092eee69	GIT_SILENT Sync po/docbooks with svn	2023-08-12 03:11:35 +00:00
l10n daemon script	9a426f941a	GIT_SILENT Sync po/docbooks with svn	2023-08-11 03:06:07 +00:00
Albert Astals Cid	c77dee09f5	GIT_SILENT Upgrade release service version to 23.07.90.	2023-08-10 21:00:24 +02:00
l10n daemon script	26dde017d0	GIT_SILENT Sync po/docbooks with svn	2023-08-10 03:07:45 +00:00
l10n daemon script	5b27a84bcc	GIT_SILENT Sync po/docbooks with svn	2023-08-09 03:12:18 +00:00
Carl Schwan	fc3c36838c	Display big emoji correctly We already check with a regex if the message only contains emoji so it is safe to hardcode the font family as emoji for these messages. (cherry picked from commit `58213ee3e6`)	2023-08-08 15:00:29 +02:00
l10n daemon script	1fd2072cf8	GIT_SILENT Sync po/docbooks with svn	2023-08-08 03:23:23 +00:00
l10n daemon script	7770d412b3	GIT_SILENT made messages (after extraction)	2023-08-08 02:36:56 +00:00
Tobias Fella	56184920b4	Force plain text in room delegate (cherry picked from commit `3ab04583ae`)	2023-08-07 23:14:58 +02:00
l10n daemon script	b61685b151	GIT_SILENT Sync po/docbooks with svn	2023-08-07 03:49:13 +00:00
l10n daemon script	be0212a686	SVN_SILENT made messages (.desktop file) - always resolve ours In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop"	2023-08-07 03:39:29 +00:00
l10n daemon script	37ed09f957	GIT_SILENT made messages (after extraction)	2023-08-07 03:00:36 +00:00
l10n daemon script	1b7e8ae77a	GIT_SILENT Sync po/docbooks with svn	2023-08-06 03:13:44 +00:00
Tobias Fella	7571b0a9a3	Remove leftover debug statement (cherry picked from commit `88368cefaa`)	2023-08-06 00:52:20 +02:00
Tobias Fella	9477e6343f	Fix last active time in devices page (cherry picked from commit `ab4bb41979`)	2023-08-05 20:34:00 +02:00
l10n daemon script	83241ea956	GIT_SILENT Sync po/docbooks with svn	2023-08-03 04:06:32 +00:00
l10n daemon script	f054467878	GIT_SILENT made messages (after extraction)	2023-08-03 03:11:57 +00:00
l10n daemon script	fb7154b492	GIT_SILENT Sync po/docbooks with svn	2023-08-02 03:20:51 +00:00
l10n daemon script	973a75128c	SVN_SILENT made messages (.desktop file) - always resolve ours In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop"	2023-08-02 03:13:39 +00:00
l10n daemon script	9ea70d7eac	GIT_SILENT made messages (after extraction)	2023-08-02 02:35:56 +00:00
l10n daemon script	7f8285037c	GIT_SILENT Sync po/docbooks with svn	2023-08-01 03:26:38 +00:00
Carl Schwan	c5f19f12e5	Redesign timeline Remove border von bubbles and only hilight the bubble on hover (cherry picked from commit `7f459cb90f`)	2023-07-31 21:51:12 +02:00
Carl Schwan	ed6379ff85	Fix opening account menu on right click (cherry picked from commit `5f41b7b4c1`)	2023-07-31 09:03:01 +02:00
l10n daemon script	9750df90e0	GIT_SILENT Sync po/docbooks with svn	2023-07-31 04:06:19 +00:00
l10n daemon script	bd90658668	GIT_SILENT made messages (after extraction)	2023-07-31 03:12:56 +00:00
l10n daemon script	f78b634720	GIT_SILENT Sync po/docbooks with svn	2023-07-30 03:13:52 +00:00
Tobias Fella	250476f77c	Html-escape display names in state delegates (cherry picked from commit `163c1ef407`)	2023-07-29 22:31:46 +02:00
Tobias Fella	e293d1f644	Fix room list icon size in compact room list BUG: 472682 (cherry picked from commit `3bd639775a`)	2023-07-29 22:31:14 +02:00
l10n daemon script	cde50588cb	GIT_SILENT Sync po/docbooks with svn	2023-07-29 03:09:59 +00:00
l10n daemon script	3972dab7b9	GIT_SILENT made messages (after extraction)	2023-07-29 02:26:29 +00:00
Carl Schwan	7c1b43bcad	Fix compilation with e2ee disabled	2023-07-28 13:01:54 +02:00
l10n daemon script	c22c74f735	GIT_SILENT Sync po/docbooks with svn	2023-07-28 03:18:59 +00:00
l10n daemon script	9c42b3c1a7	GIT_SILENT Sync po/docbooks with svn	2023-07-27 03:12:00 +00:00
l10n daemon script	d45cd5d9c9	GIT_SILENT made messages (after extraction)	2023-07-27 02:26:28 +00:00
Joshua Goins	8c503b8258	Use prettier notification images Avatars are shown rounded in the main interface, so they should look the same in the notification tray too. On top of that, if the room is a group then show that group's icon when applicable in the bottom right. (cherry picked from commit `470418f14f`)	2023-07-26 10:31:47 +02:00
Joshua Goins	7078caac15	Fix errors preventing the avatar from being shown when uploaded (cherry picked from commit `807a9ee779`)	2023-07-26 10:29:06 +02:00
Joshua Goins	94bf65ab43	Add an obvious "upload" button in the account editor It's not obvious at first glance that you can click on the avatar in the account editor to upload an image. This adds a new button when there is no image uploaded. (cherry picked from commit `0ac3932303`)	2023-07-26 10:28:32 +02:00
Joshua Goins	244e93c926	Fix settings button tooltip (cherry picked from commit `4f32a168cd`)	2023-07-26 08:38:06 +02:00
l10n daemon script	412856e882	GIT_SILENT Sync po/docbooks with svn	2023-07-26 03:13:49 +00:00
l10n daemon script	2421f11717	GIT_SILENT Sync po/docbooks with svn	2023-07-25 03:20:17 +00:00
l10n daemon script	2d42cfedec	GIT_SILENT made messages (after extraction)	2023-07-25 02:30:45 +00:00
l10n daemon script	9308c84696	GIT_SILENT Sync po/docbooks with svn	2023-07-24 11:06:34 +00:00
l10n daemon script	72fc242364	SVN_SILENT made messages (.desktop file) - always resolve ours In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop"	2023-07-24 10:47:48 +00:00
Carl Schwan	7d3240c597	Refactor completion menu - Use new Avatar - Use required property in delegate (cherry picked from commit `75cd77facb`)	2023-07-24 10:46:57 +02:00
Carl Schwan	9906ba8b7d	Move no connection info message to the top (cherry picked from commit `f8d3e25f8e`)	2023-07-24 10:46:35 +02:00
Tobias Fella	b949092bc6	Fix clearing user search field text when switching rooms (cherry picked from commit `9ba6b2f0a5`)	2023-07-24 10:46:16 +02:00
Tobias Fella	5cce3bd692	Fix nullptr check	2023-07-23 23:12:01 +02:00
Carl Schwan	ef5d67e5bf	Add back some spacing around the avatar in the timeline (cherry picked from commit `b486cb905c`)	2023-07-22 22:32:28 +02:00
Carl Schwan	4711b954c5	Fix accessibility of StartChatPage and port to new components (cherry picked from commit `cdd5c9f484`)	2023-07-22 22:32:27 +02:00
Carl Schwan	1688b00f48	Port Avatar usage in Settings KirigamiAddons (cherry picked from commit `3e6c426397`)	2023-07-22 22:32:27 +02:00
Carl Schwan	410befa4bf	Port most Avatar usage to new KirigamiAddons Avatar (cherry picked from commit `847f41e1ad`)	2023-07-22 22:32:27 +02:00
Carl Schwan	b380c74b0e	Remove hover effect on timeline events	2023-07-22 22:32:20 +02:00
Carl Schwan	da8227931f	Remove duplicated code in QuickSwitcher for RoomDelegate	2023-07-22 22:31:42 +02:00
Carl Schwan	fdc45ec5c8	Redesign room list Use KirigamiAddons.Delegated.RoundedItemDelegate	2023-07-22 22:31:38 +02:00
Carl Schwan	94dd69ea02	Scroll to top of RoomDrawer on loading of header (cherry picked from commit `c8b4da2b96`)	2023-07-22 17:53:06 +00:00
Carl Schwan	80c3253a6e	Discard wrong avatar urls (cherry picked from commit `ed5bb270ff`)	2023-07-22 17:51:46 +00:00
l10n daemon script	c5f6a6607e	GIT_SILENT Sync po/docbooks with svn	2023-07-21 03:39:31 +00:00
l10n daemon script	a10d5cbe75	GIT_SILENT Sync po/docbooks with svn	2023-07-20 03:31:32 +00:00
l10n daemon script	584cad19b1	GIT_SILENT made messages (after extraction)	2023-07-20 02:45:39 +00:00
Carl Schwan	3745414635	Port to KirigamAddons.Banner (cherry picked from commit `3263a69880`)	2023-07-19 22:48:56 +02:00
l10n daemon script	147ce42c04	GIT_SILENT Sync po/docbooks with svn	2023-07-19 05:18:38 +00:00
l10n daemon script	928feeca82	GIT_SILENT made messages (after extraction)	2023-07-18 08:31:37 +00:00
Tobias Fella	fc04af536d	Fix opening user mentions (cherry picked from commit `646c8ba8fe`)	2023-07-18 08:06:16 +02:00
Tobias Fella	12b949d6cb	Fix image loading in room avatars (cherry picked from commit `918e805718`)	2023-07-18 05:26:04 +00:00
l10n daemon script	6aaaabf159	GIT_SILENT Sync po/docbooks with svn	2023-07-18 04:13:52 +00:00
l10n daemon script	fe45ef85a6	GIT_SILENT made messages (after extraction)	2023-07-18 02:55:30 +00:00
Albert Astals Cid	13e38ed982	GIT_SILENT Upgrade release service version to 23.07.80.	2023-07-17 11:25:34 +02:00