Change the input field text being set after posting message to not use a Qt.binding fucntion so that the the same room in two windows doesn't get the textfields bound together.

2022-08-27 15:11:46 +01:00
121 changed files with 7310 additions and 20629 deletions
--- a/.reuse/dep5
+++ b/.reuse/dep5
@@ -31,7 +31,8 @@ Copyright: 2021 Carl Schwan <carlschwan@kde.org>
 License: BSD-2-Clause

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

 Files: src/neochat.notifyrc
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,9 +7,9 @@
 cmake_minimum_required(VERSION 3.16)

 project(NeoChat)
-set(PROJECT_VERSION "22.09")
+set(PROJECT_VERSION "22.06")

-set(KF5_MIN_VERSION "5.91.0")
+set(KF5_MIN_VERSION "5.88.0")
 set(QT_MIN_VERSION "5.15.2")

 find_package(ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE)
@@ -25,14 +25,12 @@ include(FeatureSummary)
 include(ECMSetupVersion)
 include(KDEInstallDirs)
 include(ECMFindQmlModule)
+include(KDEClangFormat)
 include(KDECMakeSettings)
 include(KDECompilerSettings NO_POLICY_SCOPE)
 include(ECMAddAppIcon)
 include(KDEGitCommitHooks)
 include(ECMCheckOutboundLicense)
-if (NOT ANDROID)
-    include(KDEClangFormat)
-endif()

 if(NEOCHAT_FLATPAK)
    include(cmake/Flatpak.cmake)
@@ -139,12 +137,11 @@ add_subdirectory(src)

 feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES)

-if (NOT ANDROID)
-    file(GLOB_RECURSE ALL_CLANG_FORMAT_SOURCE_FILES src/*.cpp src/*.h)
-    kde_clang_format(${ALL_CLANG_FORMAT_SOURCE_FILES})
+file(GLOB_RECURSE ALL_CLANG_FORMAT_SOURCE_FILES src/*.cpp src/*.h)
+kde_clang_format(${ALL_CLANG_FORMAT_SOURCE_FILES})
+
+kde_configure_git_pre_commit_hook(CHECKS CLANG_FORMAT)

-    kde_configure_git_pre_commit_hook(CHECKS CLANG_FORMAT)
-endif()
 file(GLOB_RECURSE ALL_SOURCE_FILES *.cpp *.h *.qml)
 # CI installs dependency headers to _install and _build, which break the reuse check
 # Fixes the test by excluding this directory
--- a/android/AndroidManifest.xml
+++ b/android/AndroidManifest.xml
@@ -21,7 +21,7 @@
                <category android:name="android.intent.category.LAUNCHER"/>
            </intent-filter>

-            <meta-data android:name="android.app.lib_name" android:value="neochat-app"/>
+            <meta-data android:name="android.app.lib_name" android:value="neochat"/>
            <meta-data android:name="android.app.qt_sources_resource_id" android:resource="@array/qt_sources"/>
            <meta-data android:name="android.app.repository" android:value="default"/>
            <meta-data android:name="android.app.qt_libs_resource_id" android:resource="@array/qt_libs"/>
--- a/cmake/Flatpak.cmake
+++ b/cmake/Flatpak.cmake
@@ -9,6 +9,6 @@ install(
    FILES
        ${CMAKE_CURRENT_SOURCE_DIR}/cmake/Flatpak/99-noto-mono-color-emoji.conf
    DESTINATION
-        ${CMAKE_INSTALL_SYSCONFDIR}/fonts/local.conf
+        ${CMAKE_INSTALL_SYSCONFDIR}/fonts/conf.d/
 )

--- a/imports/NeoChat/Component/ChatBox/ChatBar.qml
+++ b/imports/NeoChat/Component/ChatBox/ChatBar.qml
@@ -405,9 +405,7 @@ ToolBar {
        }
        currentRoom.markAllMessagesAsRead();
        inputField.clear();
-        inputField.text = Qt.binding(function() {
-            return currentRoom ? currentRoom.cachedInput : "";
-        });
+        inputField.text = currentRoom ? currentRoom.cachedInput : "";
        messageSent()
    }

--- a/imports/NeoChat/Component/FullScreenImage.qml
+++ b/imports/NeoChat/Component/FullScreenImage.qml
@@ -14,7 +14,6 @@ ApplicationWindow {
    property string blurhash: ""
    property int imageWidth: -1
    property int imageHeight: -1
-    property var modelData

    flags: Qt.FramelessWindowHint | Qt.WA_TranslucentBackground

@@ -53,24 +52,6 @@ ApplicationWindow {
            source: root.blurhash !== "" ? ("image://blurhash/" + root.blurhash) : ""
            visible: root.blurhash !== "" && parent.status !== Image.Ready
        }
-
-        TapHandler {
-            acceptedButtons: Qt.RightButton
-            onTapped: {
-                const contextMenu = fileDelegateContextMenu.createObject(parent, {
-                    author: modelData.author,
-                    message: modelData.message,
-                    eventId: modelData.eventId,
-                    source: modelData.source,
-                    file: root.parent,
-                    mimeType: modelData.mimeType,
-                    progressInfo: modelData.progressInfo,
-                    plainMessage: modelData.message,
-                });
-                contextMenu.closeFullscreen.connect(root.destroy)
-                contextMenu.open();
-            }
-        }
    }

    Button {
--- a/imports/NeoChat/Component/Timeline/EncryptedDelegate.qml
+++ b/imports/NeoChat/Component/Timeline/EncryptedDelegate.qml
@@ -14,8 +14,6 @@ TimelineContainer {
    innerObject: TextEdit {
        text: i18n("This message is encrypted and the sender has not shared the key with this device.")
        color: Kirigami.Theme.disabledTextColor
-        selectedTextColor: Kirigami.Theme.highlightedTextColor
-        selectionColor: Kirigami.Theme.highlightColor
        font.pointSize: Kirigami.Theme.defaultFont.pointSize
        selectByMouse: !Kirigami.Settings.isMobile
        readOnly: true
--- a/imports/NeoChat/Component/Timeline/EventDelegate.qml
+++ b/imports/NeoChat/Component/Timeline/EventDelegate.qml
@@ -42,7 +42,9 @@ DelegateChooser {

    DelegateChoice {
        roleValue: "sticker"
-        delegate: ImageDelegate {}
+        delegate: ImageDelegate {
+            cardBackground: false
+        }
    }

    DelegateChoice {
--- a/imports/NeoChat/Component/Timeline/FileDelegate.qml
+++ b/imports/NeoChat/Component/Timeline/FileDelegate.qml
@@ -53,7 +53,6 @@ TimelineContainer {
                    icon.name: "document-open"

                    QQC2.ToolTip.text: i18nc("tooltip for a button on a message; offers ability to open its downloaded file with an appropriate application", "Open File")
-                    QQC2.ToolTip.delay: Kirigami.Units.toolTipDelay

                    onClicked: openSavedFile()
                }
@@ -71,7 +70,6 @@ TimelineContainer {
                    icon.name: "media-playback-stop"

                    QQC2.ToolTip.text: i18nc("tooltip for a button on a message; stops downloading the message's file", "Stop Download")
-                    QQC2.ToolTip.delay: Kirigami.Units.toolTipDelay
                    onClicked: currentRoom.cancelFileTransfer(eventId)
                }
            },
--- a/imports/NeoChat/Component/Timeline/ImageDelegate.qml
+++ b/imports/NeoChat/Component/Timeline/ImageDelegate.qml
@@ -91,11 +91,10 @@ TimelineContainer {
            onTapped: {
                fullScreenImage.createObject(parent, {
                    filename: eventId,
-                    source: mediaUrl,
+                    source: model.mediaUrl,
                    blurhash: model.content.info["xyz.amorgan.blurhash"],
                    imageWidth: content.info.w,
-                    imageHeight: content.info.h,
-                    modelData: model
+                    imageHeight: content.info.h
                }).showFullScreen();
            }
        }
--- a/imports/NeoChat/Component/Timeline/LinkPreviewDelegate.qml
+++ b/imports/NeoChat/Component/Timeline/LinkPreviewDelegate.qml
@@ -1,64 +0,0 @@
-// SPDX-FileCopyrightText: 2022 Bharadwaj Raju <bharadwaj.raju777@protonmail.com>
-// SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-or-later OR LicenseRef-KDE-Accepted-GPL
-
-import QtQuick 2.15
-import QtQuick.Controls 2.15
-import QtQuick.Layouts 1.15
-
-import org.kde.kirigami 2.15 as Kirigami
-
-import org.kde.neochat 1.0
-
-RowLayout {
-    id: row
-    property var links: model.display.match(/(\bhttps?:\/\/[^\s\<\>\"\']*[^\s\<\>\"\'])/g)
-        // don't show previews for room links or user mentions
-        .filter(link => !link.includes("https://matrix.to"))
-        // remove ending fullstops and commas
-        .map(link => (link.length && [".", ","].includes(link[link.length-1])) ? link.substring(0, link.length-1) : link)
-    LinkPreviewer {
-        id: lp
-        url: links[0]
-    }
-    visible: lp.loaded && lp.title
-    Rectangle {
-        Layout.fillHeight: true
-        width: Kirigami.Units.smallSpacing
-        visible: lp.loaded && lp.title
-        color: Kirigami.Theme.highlightColor
-    }
-    Image {
-        visible: lp.imageSource
-        Layout.maximumHeight: Kirigami.Units.gridUnit * 5
-        Layout.maximumWidth: Kirigami.Units.gridUnit * 5
-        source: lp.imageSource.replace("mxc://", "image://mxc/")
-        fillMode: Image.PreserveAspectFit
-    }
-    ColumnLayout {
-        id: column
-        spacing: Kirigami.Units.smallSpacing
-        Kirigami.Heading {
-            Layout.maximumWidth: messageDelegate.bubbleMaxWidth
-            Layout.fillWidth: true
-            level: 4
-            wrapMode: Text.Wrap
-            textFormat: Text.RichText
-            text: "<style>
-a {
-    text-decoration: none;
-}
-</style>
-            <a href=\"" + links[0] + "\">" + lp.title.replace("&ndash;", "—") + "</a>"
-            visible: lp.loaded
-            onLinkActivated: RoomManager.openResource(link)
-        }
-        Label {
-            text: lp.description
-            Layout.maximumWidth: messageDelegate.bubbleMaxWidth
-            Layout.fillWidth: true
-            wrapMode: Text.Wrap
-            visible: lp.loaded && lp.description
-        }
-    }
-}
-
--- a/imports/NeoChat/Component/Timeline/MessageDelegate.qml
+++ b/imports/NeoChat/Component/Timeline/MessageDelegate.qml
@@ -14,27 +14,14 @@ TimelineContainer {
    id: messageDelegate

    property bool isEmote: false
-    onOpenContextMenu: openMessageContext(model, label.selectedText, Controller.plainText(label.textDocument))
+    onOpenContextMenu: openMessageContext(model, parent.selectedText, Controller.plainText(label.textDocument))

    onReplyClicked: ListView.view.goToEvent(eventID)
    hoverComponent: hoverActions

-    innerObject: ColumnLayout {
-        RichLabel {
-            id: label
-            isEmote: messageDelegate.isEmote
-            Layout.maximumWidth: messageDelegate.bubbleMaxWidth
-        }
-        Loader {
-            id: linkPreviewLoader
-            Layout.rightMargin: Kirigami.Units.largeSpacing
-            Layout.leftMargin: Kirigami.Units.largeSpacing
-            height: active ? item.implicitHeight : 0
-            active: !currentRoom.usesEncryption && model.display && model.display.includes("http")
-            visible: active
-            sourceComponent: LinkPreviewDelegate {
-                anchors.verticalCenter: parent.verticalCenter
-            }
-        }
+    innerObject: RichLabel {
+        id: label
+        isEmote: messageDelegate.isEmote
+        Layout.maximumWidth: messageDelegate.bubbleMaxWidth
    }
 }
--- a/imports/NeoChat/Component/Timeline/RichLabel.qml
+++ b/imports/NeoChat/Component/Timeline/RichLabel.qml
@@ -24,8 +24,6 @@ TextEdit {
    Layout.rightMargin: Kirigami.Units.largeSpacing
    Layout.leftMargin: Kirigami.Units.largeSpacing

-    persistentSelection: true
-
    text: "<style>
 table {
    width:100%;
@@ -58,8 +56,6 @@ a{
 </style>" + (isEmote ? "* <a href='https://matrix.to/#/" + author.id + "' style='color: " + author.color + "'>" + author.displayName + "</a> " : "") + textMessage + (isEdited ? (" <span style=\"color: " + Kirigami.Theme.disabledTextColor + "\">" + "<span style='font-size: " + Kirigami.Theme.defaultFont.pixelSize +"px'>" + i18n(" (edited)") + "</span>") : "")

    color: Kirigami.Theme.textColor
-    selectedTextColor: Kirigami.Theme.highlightedTextColor
-    selectionColor: Kirigami.Theme.highlightColor
    font.pointSize: model.reply === undefined && isEmoji.test(model.display) ? Kirigami.Theme.defaultFont.pointSize * 4 : Kirigami.Theme.defaultFont.pointSize
    selectByMouse: !Kirigami.Settings.isMobile
    readOnly: true
--- a/imports/NeoChat/Component/Timeline/TimelineContainer.qml
+++ b/imports/NeoChat/Component/Timeline/TimelineContainer.qml
@@ -229,7 +229,6 @@ QQC2.ItemDelegate {
                    color: Kirigami.Theme.disabledTextColor
                    QQC2.ToolTip.visible: hoverHandler.hovered
                    QQC2.ToolTip.text: time.toLocaleString(Qt.locale(), Locale.LongFormat)
-                    QQC2.ToolTip.delay: Kirigami.Units.toolTipDelay

                    HoverHandler {
                        id: hoverHandler
--- a/imports/NeoChat/Component/Timeline/qmldir
+++ b/imports/NeoChat/Component/Timeline/qmldir
@@ -12,4 +12,3 @@ EncryptedDelegate 1.0 EncryptedDelegate.qml
 EventDelegate 1.0 EventDelegate.qml
 MessageDelegate 1.0 MessageDelegate.qml
 ReadMarkerDelegate 1.0 ReadMarkerDelegate.qml
-LinkPreviewDelegate 1.0 LinkPreviewDelegate.qml
--- a/imports/NeoChat/Dialog/KeyVerification/EmojiItem.qml
+++ b/imports/NeoChat/Dialog/KeyVerification/EmojiItem.qml
@@ -1,39 +0,0 @@
-// SPDX-FileCopyrightText: 2022 Tobias Fella <fella@posteo.de>
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-import QtQuick 2.15
-import QtQuick.Controls 2.15 as QQC2
-import QtQml 2.15
-
-import org.kde.kirigami 2.19 as Kirigami
-import org.kde.neochat 1.0
-
-Column {
-    id: emojiItem
-
-    property string emoji
-    property string description
-
-    QQC2.Label {
-        id: emojiLabel
-        x: 0
-        y: 0
-        width: parent.width
-        height: parent.height * 0.75
-        verticalAlignment: Text.AlignVCenter
-        horizontalAlignment: Text.AlignHCenter
-
-        text: emojiItem.emoji
-        font.family: "emoji"
-        font.pointSize: Kirigami.Theme.defaultFont.pointSize * 4
-    }
-    QQC2.Label {
-        x: 0
-        y: parent.height * 0.75
-        width: parent.width
-        height: parent.height * 0.25
-        text: emojiItem.description
-        verticalAlignment: Text.AlignVCenter
-        horizontalAlignment: Text.AlignHCenter
-    }
-}
--- a/imports/NeoChat/Dialog/KeyVerification/EmojiRow.qml
+++ b/imports/NeoChat/Dialog/KeyVerification/EmojiRow.qml
@@ -1,25 +0,0 @@
-// SPDX-FileCopyrightText: 2022 Tobias Fella <fella@posteo.de>
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-import QtQuick 2.15
-import QtQuick.Controls 2.15 as QQC2
-import QtQml 2.15
-
-import org.kde.kirigami 2.19 as Kirigami
-import org.kde.neochat 1.0
-
-Row {
-    id: emojiRow
-
-    property alias model: repeater.model
-    anchors.horizontalCenter: parent.horizontalCenter
-    Repeater {
-        id: repeater
-        delegate: EmojiItem {
-            emoji: modelData.emoji
-            description: modelData.description
-            width: emojiRow.height
-            height: width
-        }
-    }
-}
--- a/imports/NeoChat/Dialog/KeyVerification/EmojiSas.qml
+++ b/imports/NeoChat/Dialog/KeyVerification/EmojiSas.qml
@@ -1,50 +0,0 @@
-// SPDX-FileCopyrightText: 2022 Tobias Fella <fella@posteo.de>
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-import QtQuick 2.15
-import QtQuick.Controls 2.15 as QQC2
-import QtQml 2.15
-
-import org.kde.kirigami 2.19 as Kirigami
-import org.kde.neochat 1.0
-
-Column {
-    id: emojiSas
-
-    required property var model
-
-    signal accept()
-    signal reject()
-
-    visible: dialog.session.state === KeyVerificationSession.WAITINGFORVERIFICATION
-    anchors.centerIn: parent
-    spacing: Kirigami.Units.largeSpacing
-    QQC2.Label {
-        text: i18n("Confirm the emoji below are displayed on both devices, in the same order.")
-    }
-    EmojiRow {
-        anchors.horizontalCenter: parent.horizontalCenter
-        height: Kirigami.Units.gridUnit * 4
-        model: emojiSas.model.slice(0, 4)
-    }
-    EmojiRow {
-        anchors.horizontalCenter: parent.horizontalCenter
-        height: Kirigami.Units.gridUnit * 4
-        model: emojiSas.model.slice(4, 7)
-    }
-    Row {
-        anchors.horizontalCenter: parent.horizontalCenter
-        QQC2.Button {
-            anchors.bottom: parent.bottom
-            text: i18n("They match")
-            icon.name: "dialog-ok"
-            onClicked: emojiSas.accept()
-        }
-        QQC2.Button {
-            anchors.bottom: parent.bottom
-            text: i18n("They don't match")
-            icon.name: "dialog-cancel"
-            onClicked:  emojiSas.reject()
-        }
-    }
-}
--- a/imports/NeoChat/Dialog/KeyVerification/KeyVerificationDialog.qml
+++ b/imports/NeoChat/Dialog/KeyVerification/KeyVerificationDialog.qml
@@ -1,86 +0,0 @@
-// SPDX-FileCopyrightText: 2022 Tobias Fella <fella@posteo.de>
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-import QtQuick 2.15
-import QtQuick.Controls 2.15 as QQC2
-import QtQuick.Layouts 1.15
-import QtQml 2.15
-
-import org.kde.kirigami 2.19 as Kirigami
-import org.kde.neochat 1.0
-
-Kirigami.Page {
-    id: dialog
-    title: i18n("Session Verification")
-
-    required property var session
-
-    Item {
-        anchors.fill: parent
-        VerificationCanceled {
-            visible: dialog.session.state === KeyVerificationSession.CANCELED
-            anchors.centerIn: parent
-            reason: dialog.session.error
-        }
-        EmojiSas {
-            anchors.centerIn: parent
-            visible: dialog.session.state === KeyVerificationSession.WAITINGFORVERIFICATION
-            model: dialog.session.sasEmojis
-            onReject: dialog.session.cancelVerification(KeyVerificationSession.MISMATCHED_SAS)
-            onAccept: dialog.session.sendMac()
-        }
-        Message {
-            visible: dialog.session.state === KeyVerificationSession.WAITINGFORREADY
-            anchors.centerIn: parent
-            icon: "security-medium-symbolic"
-            text: i18n("Waiting for device to accept verification.")
-        }
-        Message {
-            visible: dialog.session.state === KeyVerificationSession.INCOMING
-            anchors.centerIn: parent
-            icon: "security-medium-symbolic"
-            text: i18n("Incoming key verification request from device **%1**", dialog.session.remoteDeviceId)
-        }
-        Message {
-            visible: dialog.session.state === KeyVerificationSession.WAITINGFORMAC
-            anchors.centerIn: parent
-            icon: "security-medium-symbolic"
-            text: i18n("Waiting for other party to verify.")
-        }
-        Kirigami.BasicListItem {
-            id: emojiVerification
-            text: "Emoji Verification"
-            visible: dialog.session.state === KeyVerificationSession.READY
-            subtitle: i18n("Compare a set of emoji on both devices")
-            onClicked: {
-                dialog.session.sendStartSas()
-            }
-        }
-        Message {
-            visible: dialog.session.state === KeyVerificationSession.DONE
-            anchors.centerIn: parent
-            text: i18n("Successfully verified device **%1**", dialog.session.remoteDeviceId)
-            icon: "security-high"
-        }
-    }
-
-    footer: QQC2.ToolBar {
-        visible: dialog.session.state === KeyVerificationSession.INCOMING
-        QQC2.DialogButtonBox {
-            anchors.fill: parent
-            Item { Layout.fillWidth: true }
-            QQC2.Button {
-                text: i18n("Accept")
-                icon.name: "dialog-ok"
-                onClicked: dialog.session.sendReady()
-                QQC2.DialogButtonBox.buttonRole: QQC2.DialogButtonBox.AcceptRole
-            }
-            QQC2.Button {
-                text: i18n("Decline")
-                icon.name: "dialog-cancel"
-                onClicked: dialog.session.cancelVerification("m.user", "Declined")
-                QQC2.DialogButtonBox.buttonRole: QQC2.DialogButtonBox.CancelRole
-            }
-        }
-    }
-}
--- a/imports/NeoChat/Dialog/KeyVerification/Message.qml
+++ b/imports/NeoChat/Dialog/KeyVerification/Message.qml
@@ -1,27 +0,0 @@
-// SPDX-FileCopyrightText: 2022 Tobias Fella <fella@posteo.de>
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-import QtQuick 2.15
-import QtQuick.Controls 2.15 as QQC2
-import QtQml 2.15
-
-import org.kde.kirigami 2.19 as Kirigami
-import org.kde.neochat 1.0
-
-Column {
-    id: message
-    required property string icon
-    required property string text
-
-    anchors.centerIn: parent
-    Kirigami.Icon {
-        width: Kirigami.Units.iconSizes.enormous
-        height: width
-        anchors.horizontalCenter: parent.horizontalCenter
-        source: message.icon
-    }
-    QQC2.Label {
-        text: message.text
-        textFormat: Text.MarkdownText
-    }
-}
--- a/imports/NeoChat/Dialog/KeyVerification/VerificationCanceled.qml
+++ b/imports/NeoChat/Dialog/KeyVerification/VerificationCanceled.qml
@@ -1,70 +0,0 @@
-// SPDX-FileCopyrightText: 2022 Tobias Fella <fella@posteo.de>
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-import QtQuick 2.15
-import QtQuick.Controls 2.15 as QQC2
-import QtQml 2.15
-
-import org.kde.kirigami 2.19 as Kirigami
-import org.kde.neochat 1.0
-
-Message {
-    id: verificationCanceled
-
-    required property int reason
-
-    anchors.centerIn: parent
-    icon: "security-low"
-    text: {
-        switch(verificationCanceled.reason) {
-            case KeyVerificationSession.NONE:
-                return i18n("The session verification was canceled for unknown reason.");
-            case KeyVerificationSession.TIMEOUT:
-                return i18n("The session verification timed out.");
-            case KeyVerificationSession.REMOTE_TIMEOUT:
-                return i18n("The session verification timed out for remote party.");
-            case KeyVerificationSession.USER:
-                return i18n("You canceled the session verification.");
-            case KeyVerificationSession.REMOTE_USER:
-                return i18n("The remote party canceled the session verification.");
-            case KeyVerificationSession.UNEXPECTED_MESSAGE:
-                return i18n("The session verification was canceled because we received an unexpected message.");
-            case KeyVerificationSession.REMOTE_UNEXPECTED_MESSAGE:
-                return i18n("The remote party canceled the session verification because it received an unexpected message.");
-            case KeyVerificationSession.UNKNOWN_TRANSACTION:
-                return i18n("The session verification was canceled because it received a message for an unknown session.");
-            case KeyVerificationSession.REMOTE_UNKNOWN_TRANSACTION:
-                return i18n("The remote party canceled the session verification because it received a message for an unknown session.");
-            case KeyVerificationSession.UNKNOWN_METHOD:
-                return i18n("The session verification was canceled because NeoChat is unable to handle this verification method.");
-            case KeyVerificationSession.REMOTE_UNKNOWN_METHOD:
-                return i18n("The remote party canceled the session verification because it is unable to handle this verification method.");
-            case KeyVerificationSession.KEY_MISMATCH:
-                return i18n("The session verification was canceled because the keys are incorrect.");
-            case KeyVerificationSession.REMOTE_KEY_MISMATCH:
-                return i18n("The remote party canceled the session verification because the keys are incorrect.");
-            case KeyVerificationSession.USER_MISMATCH:
-                return i18n("The session verification was canceled because it verifies an unexpected user.");
-            case KeyVerificationSession.REMOTE_USER_MISMATCH:
-                return i18n("The remote party canceled the session verification because it verifies an unexpected user.");
-            case KeyVerificationSession.INVALID_MESSAGE:
-                return i18n("The session verification was canceled because we received an invalid message.");
-            case KeyVerificationSession.REMOTE_INVALID_MESSAGE:
-                return i18n("The remote party canceled the session verification because it received an invalid message.");
-            case KeyVerificationSession.SESSION_ACCEPTED:
-                return i18n("The session was accepted on a different device"); //TODO this should not be visible
-            case KeyVerificationSession.REMOTE_SESSION_ACCEPTED:
-                return i18n("The session was accepted on a different device"); //TODO neither should this
-            case KeyVerificationSession.MISMATCHED_COMMITMENT:
-                return i18n("The session verification was canceled because of a mismatched key.");
-            case KeyVerificationSession.REMOTE_MISMATCHED_COMMITMENT:
-                return i18n("The remote party canceled the session verification because of a mismatched key.");
-            case KeyVerificationSession.MISMATCHED_SAS:
-                return i18n("The session verification was canceled because the keys do not match.");
-            case KeyVerificationSession.REMOTE_MISMATCHED_SAS:
-                return i18n("The remote party canceled the session verification because the keys do not match.");
-            default:
-                return i18n("The session verification was canceled due to an unknown error.");
-        }
-    }
-}
--- a/imports/NeoChat/Dialog/KeyVerification/qmldir
+++ b/imports/NeoChat/Dialog/KeyVerification/qmldir
@@ -1,7 +0,0 @@
-module NeoChat.Dialog.KeyVerification
-KeyVerificationDialog 1.0 KeyVerificationDialog.qml
-Message 1.0 Message.qml
-VerificationCanceled 1.0 VerificationCanceled.qml
-EmojiItem 1.0 EmojiItem.qml
-EmojiRow 1.0 EmojiRow.qml
-EmojiSas 1.0 EmojiSas.qml
--- a/imports/NeoChat/Dialog/UserDetailDialog.qml
+++ b/imports/NeoChat/Dialog/UserDetailDialog.qml
@@ -14,8 +14,6 @@ import NeoChat.Component 1.0
 Kirigami.OverlaySheet {
    id: root

-    signal closed()
-
    property var room
    property var user

@@ -54,7 +52,7 @@ Kirigami.OverlaySheet {

                    onClicked: {
                        if (avatarMediaId) {
-                            fullScreenImage.createObject(parent, {filename: displayName, source: room.urlToMxcUrl(avatarUrl)}).showFullScreen()
+                            fullScreenImage.createObject(parent, {"filename": displayName, "source": room.urlToMxcUrl(avatarUrl)}).showFullScreen()
                        }
                    }
                }
@@ -166,11 +164,5 @@ Kirigami.OverlaySheet {
            FullScreenImage {}
        }
    }
-
-    onSheetOpenChanged: {
-        if (!sheetOpen) {
-            closed()
-        }
-    }
 }

--- a/imports/NeoChat/Dialog/qmldir
+++ b/imports/NeoChat/Dialog/qmldir
@@ -7,4 +7,3 @@ OpenFileDialog 1.0 OpenFileDialog.qml
 ImageClipboardDialog 1.0 ImageClipboardDialog.qml
 StartChatDialog 1.0 StartChatDialog.qml
 EmojiDialog 1.0 EmojiDialog.qml
-KeyVerificationDialog 1.0 KeyVerificationDialog.qml
--- a/imports/NeoChat/Menu/GlobalMenu.qml
+++ b/imports/NeoChat/Menu/GlobalMenu.qml
@@ -45,7 +45,7 @@ Labs.MenuBar {
        Labs.MenuItem {
            text: i18nc("menu", "New Private Chat…")
            enabled: pageStack.layers.currentItem.title !== i18n("Start a Chat") && Controller.accountCount > 0
-            onTriggered: pushReplaceLayer("qrc:/imports/NeoChat/Page/StartChatPage.qml", {connection: Controller.activeConnection})
+            onTriggered: pushReplaceLayer("qrc:/imports/NeoChat/Page/StartChatPage.qml", {"connection": Controller.activeConnection})
        }
        Labs.MenuItem {
            text: i18nc("menu", "New Group…")
@@ -58,7 +58,7 @@ Labs.MenuBar {
        }
        Labs.MenuItem {
            text: i18nc("menu", "Browse Chats…")
-            onTriggered: pushReplaceLayer("qrc:/imports/NeoChat/Page/JoinRoomPage.qml", {connection: Controller.activeConnection})
+            onTriggered: pushReplaceLayer("qrc:/imports/NeoChat/Page/JoinRoomPage.qml", {"connection": Controller.activeConnection})
        }
    }
    EditMenu {
--- a/imports/NeoChat/Menu/RoomListContextMenu.qml
+++ b/imports/NeoChat/Menu/RoomListContextMenu.qml
@@ -24,7 +24,7 @@ Loader {
        Menu {
            MenuItem {
                id: newWindow
-                text: i18n("Open in New Window")
+                text: i18n("Open in new window")
                onTriggered: RoomManager.openWindow(room);
                visible: !Kirigami.Settings.isMobile
            }
@@ -49,7 +49,7 @@ Loader {
            }

            MenuItem {
-                text: i18nc("@action:inmenu", "Copy Address to Clipboard")
+                text: i18nc("@action:inmenu", "Copy address to clipboard")
                onTriggered: if (room.canonicalAlias.length === 0) {
                    Clipboard.saveText(room.id)
                } else {
@@ -57,53 +57,8 @@ Loader {
                }
            }

-            Menu {
-                title: i18n("Notification State")
-
-                MenuItem {
-                    text: i18n("Follow Global Setting")
-                    checkable: true
-                    autoExclusive: true
-                    checked: room.pushNotificationState === PushNotificationState.Default
-                    enabled: room.pushNotificationState != PushNotificationState.Unknown
-                    onTriggered: {
-                        room.pushNotificationState = PushNotificationState.Default
-                    }
-                }
-                MenuItem {
-                    text: i18nc("As in 'notify for all messages'","All")
-                    checkable: true
-                    autoExclusive: true
-                    checked: room.pushNotificationState === PushNotificationState.All
-                    enabled: room.pushNotificationState != PushNotificationState.Unknown
-                    onTriggered: {
-                        room.pushNotificationState = PushNotificationState.All
-                    }
-                }
-                MenuItem {
-                    text: i18nc("As in 'notify when the user is mentioned or the message contains a set keyword'","@Mentions and Keywords")
-                    checkable: true
-                    autoExclusive: true
-                    checked: room.pushNotificationState === PushNotificationState.MentionKeyword
-                    enabled: room.pushNotificationState != PushNotificationState.Unknown
-                    onTriggered: {
-                        room.pushNotificationState = PushNotificationState.MentionKeyword
-                    }
-                }
-                MenuItem {
-                    text: i18nc("As in 'do not notify for any messages'","Off")
-                    checkable: true
-                    autoExclusive: true
-                    checked: room.pushNotificationState === PushNotificationState.Mute
-                    enabled: room.pushNotificationState != PushNotificationState.Unknown
-                    onTriggered: {
-                        room.pushNotificationState = PushNotificationState.Mute
-                    }
-                }
-            }
-
            MenuItem {
-                text: i18n("Room Settings")
+                text: i18n("Room settings")
                onTriggered: ApplicationWindow.window.pageStack.pushDialogLayer('qrc:/imports/NeoChat/RoomSettings/Categories.qml', {room: room})
            }

--- a/imports/NeoChat/Menu/Timeline/FileDelegateContextMenu.qml
+++ b/imports/NeoChat/Menu/Timeline/FileDelegateContextMenu.qml
@@ -14,8 +14,6 @@ import NeoChat.Menu 1.0
 MessageDelegateContextMenu {
    id: root

-    signal closeFullscreen
-
    required property var file
    required property var progressInfo
    required property string mimeType
@@ -53,7 +51,6 @@ MessageDelegateContextMenu {
            icon.name: "mail-replied-symbolic"
            onTriggered: {
                chatBoxHelper.replyToMessage(eventId, message, author);
-                root.closeFullscreen()
            }
        },
        Kirigami.Action {
@@ -63,18 +60,8 @@ MessageDelegateContextMenu {
            icon.color: "red"
            onTriggered: {
                currentRoom.redactEvent(eventId);
-                root.closeFullscreen()
            }
        },
-        Kirigami.Action {
-            text: i18nc("@action:button 'Report' as in 'Report this event to the administrators'", "Report")
-            icon.name: "dialog-warning-symbolic"
-            visible: author.id !== currentRoom.localUser.id
-            onTriggered: applicationWindow().pageStack.pushDialogLayer("qrc:/imports/NeoChat/Menu/Timeline/ReportSheet.qml", {room: currentRoom, eventId: eventId}, {
-                title: i18nc("@title", "Report Message"),
-                width: Kirigami.Units.gridUnit * 25
-            })
-        },
        Kirigami.Action {
            text: i18n("View Source")
            icon.name: "code-context"
@@ -85,7 +72,6 @@ MessageDelegateContextMenu {
                    title: i18n("Message Source"),
                    width: Kirigami.Units.gridUnit * 25
                });
-                root.closeFullscreen()
            }
        }
    ]
--- a/imports/NeoChat/Menu/Timeline/MessageDelegateContextMenu.qml
+++ b/imports/NeoChat/Menu/Timeline/MessageDelegateContextMenu.qml
@@ -48,15 +48,6 @@ Loader {
            icon.name: "edit-copy"
            onTriggered: Clipboard.saveText(loadRoot.selectedText === "" ? loadRoot.plainMessage : loadRoot.selectedText)
        },
-        Kirigami.Action {
-            text: i18nc("@action:button 'Report' as in 'Report this event to the administrators'", "Report")
-            icon.name: "dialog-warning-symbolic"
-            visible: author.id !== currentRoom.localUser.id
-            onTriggered: applicationWindow().pageStack.pushDialogLayer("qrc:/imports/NeoChat/Menu/Timeline/ReportSheet.qml", {room: currentRoom, eventId: eventId}, {
-                title: i18nc("@title", "Report Message"),
-                width: Kirigami.Units.gridUnit * 25
-            })
-        },
        Kirigami.Action {
            text: i18n("View Source")
            icon.name: "code-context"
--- a/imports/NeoChat/Menu/Timeline/ReportSheet.qml
+++ b/imports/NeoChat/Menu/Timeline/ReportSheet.qml
@@ -1,47 +0,0 @@
-// SPDX-FileCopyrightText: 2022 Tobias Fella <fella@posteo.de>
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-import QtQuick 2.15
-import QtQuick.Controls 2.15 as QQC2
-import QtQuick.Layouts 1.15
-
-import org.kde.kirigami 2.20 as Kirigami
-
-Kirigami.Page {
-    id: reportSheet
-
-    property var room
-    property string eventId
-
-    title: i18n("Report Message")
-
-    QQC2.TextArea {
-        id: reason
-        placeholderText: i18n("Reason for reporting this message")
-        anchors.fill: parent
-        wrapMode: TextEdit.Wrap
-    }
-
-    footer: QQC2.ToolBar {
-        QQC2.DialogButtonBox {
-            anchors.fill: parent
-            Item {
-                Layout.fillWidth: true
-            }
-            QQC2.Button {
-                text: i18nc("@action:button 'Report' as in 'Report this event to the administrators'", "Report")
-                icon.name: "dialog-warning-symbolic"
-                QQC2.DialogButtonBox.buttonRole: QQC2.DialogButtonBox.AcceptRole
-                onClicked: {
-                    reportSheet.room.reportEvent(eventId, reason.text)
-                    reportSheet.closeDialog()
-                }
-            }
-            QQC2.Button {
-                text: i18nc("@action", "Cancel")
-                QQC2.DialogButtonBox.buttonRole: QQC2.DialogButtonBox.RejectRole
-                onClicked: reportSheet.closeDialog()
-            }
-        }
-    }
-}
--- a/imports/NeoChat/Menu/Timeline/qmldir
+++ b/imports/NeoChat/Menu/Timeline/qmldir
@@ -2,4 +2,3 @@ module NeoChat.Menu.Timeline
 MessageDelegateContextMenu 1.0 MessageDelegateContextMenu.qml
 FileDelegateContextMenu 1.0 FileDelegateContextMenu.qml
 MessageSourceSheet 1.0 MessageSourceSheet.qml
-ReportSheet 1.0 ReportSheet.qml
--- a/imports/NeoChat/Page/LoadingPage.qml
+++ b/imports/NeoChat/Page/LoadingPage.qml
@@ -3,11 +3,18 @@

 import QtQuick.Layouts 1.15
 import QtQuick.Controls 2.12 as QQC2
-import org.kde.kirigami 2.19 as Kirigami
+import org.kde.kirigami 2.12 as Kirigami

 Kirigami.Page {
-    Kirigami.LoadingPlaceholder {
+    title: i18n("Loading…")
+
+    Kirigami.PlaceholderMessage {
        id: loadingIndicator
        anchors.centerIn: parent
+        text: i18n("Loading…")
+        QQC2.BusyIndicator {
+            running: false
+            Layout.alignment: Qt.AlignHCenter
+        }
    }
 }
--- a/imports/NeoChat/Page/RoomListPage.qml
+++ b/imports/NeoChat/Page/RoomListPage.qml
@@ -58,7 +58,7 @@ Kirigami.ScrollablePage {
                    flat: true
                    padding: Kirigami.Units.gridUnit / 2
                    icon.name: "home"
-                    text: i18nc("@action:button", "Show All Rooms")
+                    text: i18nc('@action:button', 'Show All Rooms')
                    display: QQC2.AbstractButton.IconOnly

                    onClicked: {
@@ -368,7 +368,7 @@ Kirigami.ScrollablePage {
                }

                function createRoomListContextMenu() {
-                    const menu = roomListContextMenu.createObject(page, {room: currentRoom})
+                    const menu = roomListContextMenu.createObject(page, {"room": currentRoom})
                    configButton.visible = true
                    configButton.down = true
                    menu.closed.connect(function() {
--- a/imports/NeoChat/Page/RoomPage.qml
+++ b/imports/NeoChat/Page/RoomPage.qml
@@ -8,7 +8,7 @@ import QtQuick.Layouts 1.15
 import Qt.labs.platform 1.1 as Platform
 import Qt.labs.qmlmodels 1.0

-import org.kde.kirigami 2.19 as Kirigami
+import org.kde.kirigami 2.15 as Kirigami
 import org.kde.kitemmodels 1.0

 import org.kde.neochat 1.0
@@ -105,17 +105,17 @@ Kirigami.ScrollablePage {
        function onShowMessage(messageType, message) {
            page.header.contentItem.text = message;
            page.header.contentItem.type = messageType === ActionsHandler.Error ? Kirigami.MessageType.Error : Kirigami.MessageType.Information;
-            page.header.visible = true;
+            page.header.contentItem.visible = true;
        }
    }

    header: QQC2.Control {
        height: visible ? implicitHeight : 0
-        visible: false
+        visible: contentItem.visible
        padding: Kirigami.Units.smallSpacing
        contentItem: Kirigami.InlineMessage {
            showCloseButton: true
-            visible: true
+            visible: false
        }
    }

@@ -144,10 +144,15 @@ Kirigami.ScrollablePage {
        }
    }

-    Kirigami.LoadingPlaceholder {
+    Kirigami.PlaceholderMessage {
        id: loadingIndicator
        anchors.centerIn: parent
        visible: loading
+        text: i18n("Loading…")
+        QQC2.BusyIndicator {
+            running: loadingIndicator.visible
+            Layout.alignment: Qt.AlignHCenter
+        }
    }

    focus: true
@@ -177,15 +182,6 @@ Kirigami.ScrollablePage {
        }
    }

-    Connections {
-        target: currentRoom
-        function onPositiveMessage(message) {
-            page.header.contentItem.text = message;
-            page.header.contentItem.type =  Kirigami.MessageType.Positive;
-            page.header.visible = true;
-        }
-    }
-
    // hover actions on a delegate, activated in TimelineContainer.qml
    Connections {
        target: page.flickable
@@ -458,7 +454,6 @@ Kirigami.ScrollablePage {
            property int childOffset: userMsg && Config.showLocalMessagesOnRight && !Config.compactLayout ? (bubble ? bubble.width : 0) - childWidth : Math.max((bubble ? bubble.width : 0) - childWidth, 0)
            x: delegate && bubble ? (delegate.x + bubble.x + Kirigami.Units.largeSpacing + childOffset - (Config.compactLayout ? Kirigami.Units.gridUnit * 3 : 0)) : 0
            y: bubble ? bubble.mapToItem(parent, 0, 0).y - hoverActions.childHeight + Kirigami.Units.smallSpacing: 0;
-
            visible: false

            property var updateFunction
@@ -474,23 +469,10 @@ Kirigami.ScrollablePage {
                    id: hoverHandler
                    margin: Kirigami.Units.smallSpacing
                }
-                Kirigami.Icon {
-                    source: "security-high"
-                    width: height
-                    height: parent.height
-                    visible: hoverActions.event.verified
-                    HoverHandler {
-                        id: hover
-                    }
-                    QQC2.ToolTip.text: i18n("This message was sent from a verified device")
-                    QQC2.ToolTip.visible: hover.hovered
-                    QQC2.ToolTip.delay: Kirigami.Units.toolTipDelay
-                }

                QQC2.Button {
                    QQC2.ToolTip.text: i18n("React")
                    QQC2.ToolTip.visible: hovered
-                    QQC2.ToolTip.delay: Kirigami.Units.toolTipDelay
                    icon.name: "preferences-desktop-emoticons"
                    onClicked: emojiDialog.open();
                    EmojiDialog {
@@ -504,7 +486,6 @@ Kirigami.ScrollablePage {
                QQC2.Button {
                    QQC2.ToolTip.text: i18n("Edit")
                    QQC2.ToolTip.visible: hovered
-                    QQC2.ToolTip.delay: Kirigami.Units.toolTipDelay
                    visible: hoverActions.showEdit
                    icon.name: "document-edit"
                    onClicked: {
@@ -517,7 +498,6 @@ Kirigami.ScrollablePage {
                QQC2.Button {
                    QQC2.ToolTip.text: i18n("Reply")
                    QQC2.ToolTip.visible: hovered
-                    QQC2.ToolTip.delay: Kirigami.Units.toolTipDelay
                    icon.name: "mail-replied-symbolic"
                    onClicked: {
                        chatBoxHelper.replyToMessage(hoverActions.event.eventId, hoverActions.event.message, hoverActions.event.author);
@@ -591,7 +571,7 @@ Kirigami.ScrollablePage {
    function warning(title, message) {
        page.header.contentItem.text = `${title}<br />${message}`;
        page.header.contentItem.type =  Kirigami.MessageType.Warning;
-        page.header.visible = true;
+        page.header.contentItem.visible = true;
    }

    function showUserDetail(user) {
--- a/imports/NeoChat/Panel/RoomDrawer.qml
+++ b/imports/NeoChat/Panel/RoomDrawer.qml
@@ -18,7 +18,7 @@ Kirigami.OverlayDrawer {
    id: roomDrawer
    readonly property var room: RoomManager.currentRoom

-    width: actualWidth
+    width: modal ? undefined : actualWidth

    readonly property int minWidth: Kirigami.Units.gridUnit * 15
    readonly property int maxWidth: Kirigami.Units.gridUnit * 25
@@ -77,70 +77,48 @@ Kirigami.OverlayDrawer {
        sourceComponent: ColumnLayout {
            id: columnLayout
            property alias userSearchText: userListSearchField.text
-            property alias highlightedUser: userListView.currentIndex
            spacing: 0
-
            Kirigami.AbstractApplicationHeader {
                Layout.fillWidth: true
                topPadding: Kirigami.Units.smallSpacing / 2;
                bottomPadding: Kirigami.Units.smallSpacing / 2;
-                rightPadding: Kirigami.Units.largeSpacing
-                leftPadding: Kirigami.Units.largeSpacing
+                rightPadding: Kirigami.Units.smallSpacing
+                leftPadding: Kirigami.Units.smallSpacing

                RowLayout {
                    anchors.fill: parent
-                    spacing: Kirigami.Units.smallSpacing
+                    spacing: 0

-                    Kirigami.Heading {
-                        Layout.fillWidth: true
-                        text: i18n("Room information")
-                        level: 1
-                    }
                    ToolButton {
-                        id: inviteButton
-
-                        Layout.alignment: Qt.AlignRight
                        icon.name: "list-add-user"
-                        text: i18n("Invite user to room")
-                        display: AbstractButton.IconOnly
-
+                        text: i18n("Invite")
                        onClicked: {
                            applicationWindow().pageStack.layers.push("qrc:/imports/NeoChat/Page/InviteUserPage.qml", {room: room})
                            roomDrawer.close();
                        }
-
-                        ToolTip {
-                            text: inviteButton.text
-                        }
                    }
-                    ToolButton {
-                        id: favouriteButton
+                    Item {
+                        // HACK otherwise rating item is not right aligned
+                        Layout.fillWidth: true
+                    }

+                    ToolButton {
                        Layout.alignment: Qt.AlignRight
                        icon.name: room && room.isFavourite ? "rating" : "rating-unrated"
                        checkable: true
                        checked: room && room.isFavourite
-                        text: room && room.isFavourite ? i18n("Remove room from favorites") : i18n("Make room favorite")
-                        display: AbstractButton.IconOnly
-
                        onClicked: room.isFavourite ? room.removeTag("m.favourite") : room.addTag("m.favourite", 1.0)
-
                        ToolTip {
-                            text: favouriteButton.text
+                            text: room && room.isFavourite ? i18n("Remove room from favorites") : i18n("Make room favorite")
                        }
                    }
                    ToolButton {
-                        id: settingsButton
-
                        Layout.alignment: Qt.AlignRight
                        icon.name: 'settings-configure'
-                        text: i18n("Room settings")
-                        display: AbstractButton.IconOnly
-
                        onClicked: ApplicationWindow.window.pageStack.pushDialogLayer('qrc:/imports/NeoChat/RoomSettings/Categories.qml', {room: room})

                        ToolTip {
-                            text: settingsButton.text
+                            text: i18n("Room settings")
                        }
                    }
                }
@@ -149,11 +127,14 @@ Kirigami.OverlayDrawer {
            ColumnLayout {
                Layout.fillWidth: true
                Layout.margins: Kirigami.Units.largeSpacing
-                spacing: Kirigami.Units.largeSpacing
-
+                Kirigami.Heading {
+                    text: i18n("Room information")
+                    level: 3
+                }
                RowLayout {
                    Layout.fillWidth: true
-                    Layout.leftMargin: Kirigami.Units.smallSpacing
+                    Layout.margins: Kirigami.Units.largeSpacing
+
                    spacing: Kirigami.Units.largeSpacing

                    Kirigami.Avatar {
@@ -170,9 +151,10 @@ Kirigami.OverlayDrawer {
                        spacing: 0

                        Kirigami.Heading {
+                            Layout.maximumWidth: Kirigami.Units.gridUnit * 9
                            Layout.fillWidth: true
                            level: 1
-                            type: Kirigami.Heading.Type.Primary
+                            font.bold: true
                            wrapMode: Label.Wrap
                            text: room ? room.displayName : i18n("No name")
                            textFormat: Text.PlainText
@@ -183,8 +165,6 @@ Kirigami.OverlayDrawer {
                            wrapMode: Text.WordWrap
                            selectByMouse: true
                            color: Kirigami.Theme.textColor
-                            selectedTextColor: Kirigami.Theme.highlightedTextColor
-                            selectionColor: Kirigami.Theme.highlightColor
                            readOnly: true
                            text: room && room.canonicalAlias ? room.canonicalAlias : i18n("No Canonical Alias")
                        }
@@ -199,8 +179,6 @@ Kirigami.OverlayDrawer {
                    wrapMode: Text.WordWrap
                    selectByMouse: true
                    color: Kirigami.Theme.textColor
-                    selectedTextColor: Kirigami.Theme.highlightedTextColor
-                    selectionColor: Kirigami.Theme.highlightColor
                    onLinkActivated: UrlHelper.openUrl(link)
                    readOnly: true
                    MouseArea {
@@ -214,23 +192,16 @@ Kirigami.OverlayDrawer {
            Kirigami.ListSectionHeader {
                label: i18n("Members")
                activeFocusOnTab: false
-
                Label {
                    Layout.alignment: Qt.AlignRight
                    text: room ? i18np("%1 Member", "%1 Members", room.joinedCount) : i18n("No Member Count")
                }
            }

-            Control {
-                Layout.fillWidth: true
-
-                // Note need to set padding individually to guarantee it will always work
-                // see note - https://doc.qt.io/qt-6/qml-qtquick-controls2-control.html#padding-prop
-                topPadding: Kirigami.Units.smallSpacing
-                bottomPadding: Kirigami.Units.smallSpacing
-                rightPadding: Kirigami.Units.largeSpacing
-                leftPadding: Kirigami.Units.largeSpacing
-
+            Pane {
+                padding: Kirigami.Units.smallSpacing
+                implicitWidth: parent.width
+                z: 2
                background: Rectangle {
                    color: Kirigami.Theme.backgroundColor
                    Kirigami.Theme.inherit: false
@@ -238,7 +209,6 @@ Kirigami.OverlayDrawer {
                }
                contentItem: Kirigami.SearchField {
                    id: userListSearchField
-
                    onAccepted: sortedMessageEventModel.filterString = text;
                }
            }
@@ -253,6 +223,8 @@ Kirigami.OverlayDrawer {
                ListView {
                    id: userListView
                    clip: true
+                    headerPositioning: ListView.OverlayHeader
+                    boundsBehavior: Flickable.DragOverBounds
                    activeFocusOnTab: true

                    model: KSortFilterProxyModel {
@@ -267,50 +239,58 @@ Kirigami.OverlayDrawer {
                        filterCaseSensitivity: Qt.CaseInsensitive
                    }

-                    delegate: Kirigami.BasicListItem {
-                        id: userListItem
-
+                    delegate: Kirigami.AbstractListItem {
+                        width: userListView.width
                        implicitHeight: Kirigami.Units.gridUnit * 2
-                        leftPadding: Kirigami.Units.largeSpacing + Kirigami.Units.smallSpacing
+                        z: 1

-                        label: name
-
-                        onClicked: {
-                            const popup = userDetailDialog.createObject(ApplicationWindow.overlay, {room: room, user: user, displayName: name, avatarMediaId: avatar})
-                            popup.closed.connect(function() {
-                                userListItem.highlighted = false
-                            })
-                            popup.open()
-                        }
-
-                        leading: Kirigami.Avatar {
-                            implicitWidth: height
-                            sourceSize.height: Kirigami.Units.gridUnit + Kirigami.Units.smallSpacing * 2.5
-                            sourceSize.width: Kirigami.Units.gridUnit + Kirigami.Units.smallSpacing * 2.5
-                            source: avatar ? ("image://mxc/" + avatar) : ""
-                            name: name
-                        }
-
-                        trailing: Label {
-                            visible: perm != UserType.Member
-
-                            text: {
-                                switch (perm) {
-                                    case UserType.Owner:
-                                        return i18n("Owner");
-                                    case UserType.Admin:
-                                        return i18n("Admin");
-                                    case UserType.Moderator:
-                                        return i18n("Mod");
-                                    case UserType.Muted:
-                                        return i18n("Muted");
-                                    default:
-                                        return "";
-                                }
+                        contentItem: RowLayout {
+                            Kirigami.Avatar {
+                                Layout.preferredWidth: Kirigami.Units.gridUnit + Kirigami.Units.smallSpacing * 2.5
+                                Layout.preferredHeight: Kirigami.Units.gridUnit + Kirigami.Units.smallSpacing * 2.5
+                                visible: Config.showAvatarInRoomDrawer
+                                sourceSize.height: Kirigami.Units.gridUnit + Kirigami.Units.smallSpacing * 2.5
+                                sourceSize.width: Kirigami.Units.gridUnit + Kirigami.Units.smallSpacing * 2.5
+                                source: avatar ? ("image://mxc/" + avatar) : ""
+                                name: name
                            }
-                            color: Kirigami.Theme.disabledTextColor
-                            textFormat: Text.PlainText
-                            wrapMode: Text.NoWrap
+
+                            Label {
+                                Layout.fillWidth: true
+
+                                text: name
+                                textFormat: Text.PlainText
+                                elide: Text.ElideRight
+                                wrapMode: Text.NoWrap
+                            }
+
+                            Label {
+                                visible: perm != UserType.Member
+
+                                text: {
+                                    if (perm == UserType.Owner) {
+                                        return i18n("Owner")
+                                    }
+                                    if (perm == UserType.Admin) {
+                                        return i18n("Admin")
+                                    }
+                                    if (perm == UserType.Moderator) {
+                                        return i18n("Mod")
+                                    }
+                                    if (perm == UserType.Muted) {
+                                        return i18n("Muted")
+                                    }
+                                    return ""
+                                }
+                                color: Kirigami.Theme.disabledTextColor
+                                font.pixelSize: 12
+                                textFormat: Text.PlainText
+                                wrapMode: Text.NoWrap
+                            }
+                        }
+
+                        action: Kirigami.Action {
+                            onTriggered: userDetailDialog.createObject(ApplicationWindow.overlay, {"room": room, "user": user, "displayName": name, "avatarMediaId": avatar}).open()
                        }
                    }
                }
@@ -321,7 +301,6 @@ Kirigami.OverlayDrawer {
    onRoomChanged: {
        if (loader.active) {
            loader.item.userSearchText = ""
-            loader.item.highlightedUser = -1
        }
        if (room == null) {
            close()
--- a/imports/NeoChat/RoomSettings/Categories.qml
+++ b/imports/NeoChat/RoomSettings/Categories.qml
@@ -3,12 +3,12 @@

 import QtQuick 2.15
 import org.kde.kirigami 2.18 as Kirigami
+import QtQuick.Controls 2.15 as Controls
 import QtQuick.Layouts 1.15

 Kirigami.CategorizedSettings {
    id: root
    property var room
-
    objectName: "settingsPage"
    actions: [
        Kirigami.SettingAction {
@@ -30,16 +30,6 @@ Kirigami.CategorizedSettings {
                    room: root.room
                }
            }
-        },
-        Kirigami.SettingAction {
-            text: i18n("Notifications")
-            icon.name: "notifications"
-            page: Qt.resolvedUrl("PushNotification.qml")
-            initialProperties: {
-                return {
-                    room: root.room
-                }
-            }
        }
    ]
 }
--- a/imports/NeoChat/RoomSettings/General.qml
+++ b/imports/NeoChat/RoomSettings/General.qml
@@ -21,7 +21,7 @@ Kirigami.ScrollablePage {
    readonly property bool canChangeTopic: room.canSendState("m.room.topic")
    readonly property bool canChangeCanonicalAlias: room.canSendState("m.room.canonical_alias")

-    title: i18n("General")
+    title: i18n('General')

    ColumnLayout {
        Kirigami.FormLayout {
--- a/imports/NeoChat/RoomSettings/PushNotification.qml
+++ b/imports/NeoChat/RoomSettings/PushNotification.qml
@@ -1,57 +0,0 @@
-// SPDX-FileCopyrightText: 2022 James Graham <james.h.graham@protonmail.com>
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-import QtQuick 2.15
-import QtQuick.Controls 2.15 as QQC2
-import QtQuick.Layouts 1.15
-
-import org.kde.kirigami 2.15 as Kirigami
-
-import org.kde.neochat 1.0
-
-Kirigami.ScrollablePage {
-
-    property var room
-
-    title: i18nc('@title:window', 'Notifications')
-
-    ColumnLayout {
-        Kirigami.FormLayout {
-            Layout.fillWidth: true
-
-            QQC2.RadioButton {
-                text: i18n("Follow global setting")
-                Kirigami.FormData.label: i18n("Room notifications setting:")
-                checked: room.pushNotificationState === PushNotificationState.Default
-                enabled: room.pushNotificationState != PushNotificationState.Unknown
-                onToggled: {
-                    room.pushNotificationState = PushNotificationState.Default
-                }
-            }
-            QQC2.RadioButton {
-                text: i18nc("As in 'notify for all messages'","All")
-                checked: room.pushNotificationState === PushNotificationState.All
-                enabled: room.pushNotificationState != PushNotificationState.Unknown
-                onToggled: {
-                    room.pushNotificationState = PushNotificationState.All
-                }
-            }
-            QQC2.RadioButton {
-                text: i18nc("As in 'notify when the user is mentioned or the message contains a set keyword'","@Mentions and Keywords")
-                checked: room.pushNotificationState === PushNotificationState.MentionKeyword
-                enabled: room.pushNotificationState != PushNotificationState.Unknown
-                onToggled: {
-                    room.pushNotificationState = PushNotificationState.MentionKeyword
-                }
-            }
-            QQC2.RadioButton {
-                text: i18nc("As in 'do not notify for any messages'","Off")
-                checked: room.pushNotificationState === PushNotificationState.Mute
-                enabled: room.pushNotificationState != PushNotificationState.Unknown
-                onToggled: {
-                    room.pushNotificationState = PushNotificationState.Mute
-                }
-            }
-        }
-    }
-}
--- a/imports/NeoChat/RoomSettings/Security.qml
+++ b/imports/NeoChat/RoomSettings/Security.qml
@@ -16,13 +16,13 @@ Kirigami.ScrollablePage {

    property var room

-    title: i18n("Security")
+    title: i18n('Security')

    ColumnLayout {
        Kirigami.FormLayout {
            Layout.fillWidth: true

-            RadioButton {
+            CheckBox {
                text: i18nc("@option:check", "Private (invite only)")
                Kirigami.FormData.label: i18nc("@option:check", "Access:")
                checked: room.joinRule === "invite"
@@ -32,7 +32,7 @@ Kirigami.ScrollablePage {
                text: i18n("Only invited people can join.")
                font: Kirigami.Theme.smallFont
            }
-            RadioButton {
+            CheckBox {
                text: i18nc("@option:check", "Space members")
                checked: room.joinRule === "restricted"
                enabled: false
@@ -41,7 +41,7 @@ Kirigami.ScrollablePage {
                text: i18n("Anyone in a space can find and join.")
                font: Kirigami.Theme.smallFont
            }
-            RadioButton {
+            CheckBox {
                text: i18nc("@option:check", "Public")
                checked: room.joinRule === "public"
                enabled: false
--- a/imports/NeoChat/Settings/About.qml
+++ b/imports/NeoChat/Settings/About.qml
@@ -7,6 +7,6 @@ import org.kde.kirigami 2.15 as Kirigami
 import org.kde.neochat 1.0

 Kirigami.AboutPage {
-    title: i18nc("@title:window", "About NeoChat")
+    title: i18nc('@title:window', 'About NeoChat')
    aboutData: Controller.aboutData
 }
--- a/imports/NeoChat/Settings/AccountsPage.qml
+++ b/imports/NeoChat/Settings/AccountsPage.qml
@@ -47,7 +47,7 @@ Kirigami.ScrollablePage {
                        onTriggered: pageSettingStack.pushDialogLayer(Qt.resolvedUrl('./AccountEditorPage.qml'), {
                            connection: model.connection
                        }, {
-                            title: i18n("Account editor")
+                            title: i18n('Account editor')
                        });
                    }
                }
--- a/imports/NeoChat/Settings/AppearanceSettingsPage.qml
+++ b/imports/NeoChat/Settings/AppearanceSettingsPage.qml
@@ -12,7 +12,7 @@ import org.kde.neochat 1.0
 import NeoChat.Settings 1.0

 Kirigami.ScrollablePage {
-    title: i18nc("@title:window", "Appearance")
+    title: i18nc('@title:window', 'Appearance')
    ColumnLayout {
        RowLayout {
            Layout.alignment: Qt.AlignCenter
@@ -177,7 +177,7 @@ Kirigami.ScrollablePage {
        Kirigami.FormLayout {
            Layout.maximumWidth: parent.width
            QQC2.CheckBox {
-                Kirigami.FormData.label: i18n("Show Avatar:")
+                Kirigami.FormData.label: "Show Avatar:"
                text: i18n("In Chat")
                checked: Config.showAvatarInTimeline
                onToggled: {
@@ -237,7 +237,6 @@ Kirigami.ScrollablePage {
                    HoverHandler { id: sliderHover }
                    QQC2.ToolTip.visible: sliderHover.hovered && !enabled
                    QQC2.ToolTip.text: i18n("Only enabled if the transparent chat page is enabled.")
-                    QQC2.ToolTip.delay: Kirigami.Units.toolTipDelay
                }
                QQC2.Label {
                    text: Math.round(Config.transparency * 100) + "%"
--- a/imports/NeoChat/Settings/DevicesPage.qml
+++ b/imports/NeoChat/Settings/DevicesPage.qml
@@ -5,7 +5,7 @@ import QtQuick 2.15
 import QtQuick.Controls 2.15 as Controls
 import QtQuick.Layouts 1.15

-import org.kde.kirigami 2.19 as Kirigami
+import org.kde.kirigami 2.15 as Kirigami

 import org.kde.neochat 1.0

@@ -19,9 +19,13 @@ Kirigami.ScrollablePage {

        anchors.fill: parent

-        Kirigami.LoadingPlaceholder {
+        Kirigami.PlaceholderMessage {
            visible: parent.count === 0 // We can assume 0 means loading since there is at least one device
            anchors.centerIn: parent
+            text: i18n("Loading…")
+            Controls.BusyIndicator {
+                running: parent.visible
+            }
        }

        delegate: Kirigami.BasicListItem {
@@ -41,17 +45,6 @@ Kirigami.ScrollablePage {
                        }
                    }
                }
-                Controls.ToolButton {
-                    display: Controls.AbstractButton.IconOnly
-                    visible: Controller.encryptionSupported
-                    action: Kirigami.Action {
-                        text: i18n("Verify device")
-                        iconName: "security-low-symbolic"
-                        onTriggered: {
-                            devices.connection.startKeyVerificationSession(model.id)
-                        }
-                    }
-                }
                Controls.ToolButton {
                    display: Controls.AbstractButton.IconOnly
                    action: Kirigami.Action {
--- a/imports/NeoChat/Settings/Emoticons.qml
+++ b/imports/NeoChat/Settings/Emoticons.qml
@@ -16,7 +16,7 @@ import NeoChat.Component 1.0 as Components
 import NeoChat.Dialog 1.0

 Kirigami.ScrollablePage {
-    title: i18nc("@title:window", "Custom Emojis")
+    title: i18nc('@title:window', 'Custom Emojis')

    ListView {
        anchors.fill: parent
--- a/imports/NeoChat/Settings/GeneralSettingsPage.qml
+++ b/imports/NeoChat/Settings/GeneralSettingsPage.qml
@@ -11,7 +11,7 @@ import org.kde.kirigami 2.15 as Kirigami
 import org.kde.neochat 1.0

 Kirigami.ScrollablePage {
-    title: i18nc("@title:window", "General")
+    title: i18nc('@title:window', 'General')
    ColumnLayout {
        Kirigami.FormLayout {
            Layout.fillWidth: true
@@ -46,7 +46,6 @@ Kirigami.ScrollablePage {
                onToggled: {
                    Config.showNotifications = checked
                    Config.save()
-                    NotificationsManager.globalNotificationsEnabled = checked
                }
            }
            QQC2.CheckBox {
--- a/imports/NeoChat/Settings/SettingsPage.qml
+++ b/imports/NeoChat/Settings/SettingsPage.qml
@@ -3,6 +3,7 @@

 import QtQuick 2.15
 import org.kde.kirigami 2.18 as Kirigami
+import QtQuick.Controls 2.15 as Controls
 import QtQuick.Layouts 1.15

 Kirigami.CategorizedSettings {
@@ -24,7 +25,7 @@ Kirigami.CategorizedSettings {
            page: Qt.resolvedUrl("AccountsPage.qml")
        },
        Kirigami.SettingAction {
-            text: i18n("Custom Emojis")
+            text: i18n("Custom Emoji")
            icon.name: "preferences-desktop-emoticons"
            page: Qt.resolvedUrl("Emoticons.qml")
        },
--- a/imports/NeoChat/Settings/SonnetConfigPage.qml
+++ b/imports/NeoChat/Settings/SonnetConfigPage.qml
@@ -47,7 +47,7 @@ Kirigami.Page {
            dialog.close();
        }
    }
-    title: i18nc("@window:title", "Spellchecking")
+    title: i18nc('@window:title', 'Spellchecking')

    QQC2.Dialog {
        id: applyDialog
--- a/org.kde.neochat.appdata.xml
+++ b/org.kde.neochat.appdata.xml
@@ -206,9 +206,6 @@
    <content_attribute id="social-chat">intense</content_attribute>
  </content_rating>
  <releases>
-    <release version="22.09" date="2022-09-27">
-      <url>https://www.plasma-mobile.org/2022/09/27/plasma-mobile-gear-22-09/</url>
-    </release>
    <release version="22.06" date="2022-06-24">
      <url>https://www.plasma-mobile.org/2022/06/28/plasma-mobile-gear-22-06/</url>
      <description>
--- 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/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/it/neochat.po
+++ b/po/it/neochat.po
--- a/po/ja/neochat.po
+++ b/po/ja/neochat.po
--- a/po/ko/neochat.po
+++ b/po/ko/neochat.po
--- a/po/nl/neochat.po
+++ b/po/nl/neochat.po
--- a/po/nn/neochat.po
+++ b/po/nn/neochat.po
--- a/po/pa/neochat.po
+++ b/po/pa/neochat.po
--- a/po/pl/neochat.po
+++ b/po/pl/neochat.po
--- a/po/pt/neochat.po
+++ b/po/pt/neochat.po
--- a/po/pt_BR/neochat.po
+++ b/po/pt_BR/neochat.po
--- a/po/ru/neochat.po
+++ b/po/ru/neochat.po
--- a/po/sk/neochat.po
+++ b/po/sk/neochat.po
--- a/po/sl/neochat.po
+++ b/po/sl/neochat.po
--- a/po/sv/neochat.po
+++ b/po/sv/neochat.po
--- a/po/ta/neochat.po
+++ b/po/ta/neochat.po
--- a/po/tok/neochat.po
+++ b/po/tok/neochat.po
--- a/po/tr/neochat.po
+++ b/po/tr/neochat.po
--- a/po/uk/neochat.po
+++ b/po/uk/neochat.po
--- a/po/zh_CN/neochat.po
+++ b/po/zh_CN/neochat.po
--- a/po/zh_TW/neochat.po
+++ b/po/zh_TW/neochat.po
--- a/qml/main.qml
+++ b/qml/main.qml
@@ -13,7 +13,6 @@ import NeoChat.Component 1.0
 import NeoChat.Dialog 1.0
 import NeoChat.Page 1.0
 import NeoChat.Panel 1.0
-import NeoChat.Dialog.KeyVerification 1.0

 Kirigami.ApplicationWindow {
    id: root
@@ -52,7 +51,7 @@ Kirigami.ApplicationWindow {
    Timer {
        id: saveWindowGeometryTimer
        interval: 1000
-        onTriggered: Controller.saveWindowGeometry()
+        onTriggered: Controller.saveWindowGeometry(root)
    }

    Connections {
@@ -60,7 +59,7 @@ Kirigami.ApplicationWindow {
        enabled: false // Disable on startup to avoid writing wrong values if the window is hidden
        target: root

-        function onClosing() { Controller.saveWindowGeometry(); }
+        function onClosing() { Controller.saveWindowGeometry(root); }
        function onWidthChanged() { saveWindowGeometryTimer.restart(); }
        function onHeightChanged() { saveWindowGeometryTimer.restart(); }
        function onXChanged() { saveWindowGeometryTimer.restart(); }
@@ -107,7 +106,7 @@ Kirigami.ApplicationWindow {

        function onOpenRoomInNewWindow(room) {
            const secondayWindow = roomWindow.createObject(applicationWindow(), {currentRoom: room});
-            secondayWiroomWindowndow.width = root.width - pageStack.get(0).width;
+            secondayWindow.width = root.width - pageStack.get(0).width;
            secondayWindow.show();
        }

@@ -140,6 +139,13 @@ Kirigami.ApplicationWindow {
        }
    }

+    function showWindow() {
+        root.show()
+        root.raise()
+        root.requestActivate()
+        Controller.raiseWindow(root)
+    }
+
    contextDrawer: RoomDrawer {
        id: contextDrawer
        modal: !root.wideScreen || !enabled
@@ -229,13 +235,13 @@ Kirigami.ApplicationWindow {
            Kirigami.Action {
                text: i18n("Explore rooms")
                icon.name: "compass"
-                onTriggered: pushReplaceLayer("qrc:/imports/NeoChat/Page/JoinRoomPage.qml", {connection: Controller.activeConnection})
+                onTriggered: pushReplaceLayer("qrc:/imports/NeoChat/Page/JoinRoomPage.qml", {"connection": Controller.activeConnection})
                enabled: pageStack.layers.currentItem.title !== i18n("Explore Rooms") && Controller.accountCount > 0
            },
            Kirigami.Action {
                text: i18n("Start a Chat")
                icon.name: "irc-join-channel"
-                onTriggered: pushReplaceLayer("qrc:/imports/NeoChat/Page/StartChatPage.qml", {connection: Controller.activeConnection})
+                onTriggered: pushReplaceLayer("qrc:/imports/NeoChat/Page/StartChatPage.qml", {"connection": Controller.activeConnection})
                enabled: pageStack.layers.currentItem.title !== i18n("Start a Chat") && Controller.accountCount > 0
            },
            Kirigami.Action {
@@ -347,6 +353,16 @@ Kirigami.ApplicationWindow {
            showPassiveNotification(i18n("%1: %2", error, detail));
        }

+        function onShowWindow(token = null) {
+            root.showWindow()
+            if (token && KWindowSystem) {
+                KWindowSystem.setCurrentXdgActivationToken(basicNotification.xdgActivationToken)
+                KWindowSystem.activateWindow(root)
+            } else {
+                root.raise()
+            }
+        }
+
        function onUserConsentRequired(url) {
            consentSheet.url = url
            consentSheet.open()
@@ -368,23 +384,11 @@ Kirigami.ApplicationWindow {
        }
    }

-    Component {
-        id: keyVerificationDialogComponent
-        KeyVerificationDialog { }
-    }
-
    Connections {
        target: Controller.activeConnection
        function onDirectChatAvailable(directChat) {
            RoomManager.enterRoom(Controller.activeConnection.room(directChat.id));
        }
-        function onNewKeyVerificationSession(session) {
-            applicationWindow().pageStack.pushDialogLayer(keyVerificationDialogComponent, {
-                session: session,
-            }, {
-                title: i18nc("@title:window", "Session Verification")
-            });
-        }
    }

    Kirigami.OverlaySheet {
--- a/res.qrc
+++ b/res.qrc
@@ -15,7 +15,6 @@
        <file>imports/NeoChat/Page/WelcomePage.qml</file>
        <file>imports/NeoChat/RoomSettings/General.qml</file>
        <file>imports/NeoChat/RoomSettings/Security.qml</file>
-        <file>imports/NeoChat/RoomSettings/PushNotification.qml</file>
        <file>imports/NeoChat/RoomSettings/Categories.qml</file>
        <file>imports/NeoChat/Component/qmldir</file>
        <file>imports/NeoChat/Component/FullScreenImage.qml</file>
@@ -40,7 +39,6 @@
        <file>imports/NeoChat/Component/Timeline/SectionDelegate.qml</file>
        <file>imports/NeoChat/Component/Timeline/VideoDelegate.qml</file>
        <file>imports/NeoChat/Component/Timeline/ReactionDelegate.qml</file>
-        <file>imports/NeoChat/Component/Timeline/LinkPreviewDelegate.qml</file>
        <file>imports/NeoChat/Component/Timeline/AudioDelegate.qml</file>
        <file>imports/NeoChat/Component/Timeline/FileDelegate.qml</file>
        <file>imports/NeoChat/Component/Timeline/ImageDelegate.qml</file>
@@ -64,13 +62,6 @@
        <file>imports/NeoChat/Dialog/CreateRoomDialog.qml</file>
        <file>imports/NeoChat/Dialog/EmojiDialog.qml</file>
        <file>imports/NeoChat/Dialog/OpenFileDialog.qml</file>
-        <file>imports/NeoChat/Dialog/KeyVerification/KeyVerificationDialog.qml</file>
-        <file>imports/NeoChat/Dialog/KeyVerification/Message.qml</file>
-        <file>imports/NeoChat/Dialog/KeyVerification/EmojiItem.qml</file>
-        <file>imports/NeoChat/Dialog/KeyVerification/EmojiRow.qml</file>
-        <file>imports/NeoChat/Dialog/KeyVerification/EmojiSas.qml</file>
-        <file>imports/NeoChat/Dialog/KeyVerification/VerificationCanceled.qml</file>
-        <file>imports/NeoChat/Dialog/KeyVerification/qmldir</file>
        <file>imports/NeoChat/Menu/qmldir</file>
        <file>imports/NeoChat/Menu/GlobalMenu.qml</file>
        <file>imports/NeoChat/Menu/EditMenu.qml</file>
@@ -78,7 +69,6 @@
        <file>imports/NeoChat/Menu/Timeline/MessageDelegateContextMenu.qml</file>
        <file>imports/NeoChat/Menu/Timeline/FileDelegateContextMenu.qml</file>
        <file>imports/NeoChat/Menu/Timeline/MessageSourceSheet.qml</file>
-        <file>imports/NeoChat/Menu/Timeline/ReportSheet.qml</file>
        <file>imports/NeoChat/Menu/RoomListContextMenu.qml</file>
        <file>qtquickcontrols2.conf</file>
        <file>imports/NeoChat/Component/glowdot.png</file>
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -38,8 +38,6 @@ add_library(neochat STATIC
    joinrulesevent.cpp
    collapsestateproxymodel.cpp
    urlhelper.cpp
-    windowcontroller.cpp
-    linkpreviewer.cpp
 )

 add_executable(neochat-app
@@ -140,16 +138,13 @@ if(ANDROID)
        "org.kde.neochat"
        "preferences-system-users"
        "preferences-desktop-theme-global"
-        "notifications"
    )
 else()
    target_link_libraries(neochat PUBLIC Qt::Widgets KF5::KIOWidgets)
    install(FILES neochat.notifyrc DESTINATION ${KDE_INSTALL_KNOTIFYRCDIR})
 endif()

-if(NOT ANDROID)
-    set_target_properties(neochat-app PROPERTIES OUTPUT_NAME "neochat")
-endif()
+set_target_properties(neochat-app PROPERTIES OUTPUT_NAME "neochat")

 if(TARGET KF5::DBusAddons)
    target_link_libraries(neochat PUBLIC KF5::DBusAddons)
@@ -160,7 +155,7 @@ if (TARGET KF5::KIOWidgets)
    target_compile_definitions(neochat PUBLIC -DHAVE_KIO)
 endif()

-install(TARGETS neochat-app ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
+install(TARGETS neochat-app ${KF5_INSTALL_TARGETS_DEFAULT_ARGS})

 if (NOT ANDROID AND NOT WIN32 AND NOT APPLE)
    install(FILES plasma-runner-neochat.desktop DESTINATION ${KDE_INSTALL_DATAROOTDIR}/krunner/dbusplugins)
--- a/src/actionshandler.h
+++ b/src/actionshandler.h
@@ -5,8 +5,8 @@

 #include <QObject>

+#include "connection.h"
 #include "neochatroom.h"
-#include <connection.h>

 using namespace Quotient;

--- a/src/chatdocumenthandler.cpp
+++ b/src/chatdocumenthandler.cpp
@@ -159,7 +159,7 @@ QVariantMap ChatDocumentHandler::getAutocompletionInfo(bool isAutocompleting)
            };
        }

-        if (autoCompletePrefix.startsWith("/") && text.trimmed().length() <= 1) {
+        if (autoCompletePrefix.startsWith("/")) {
            return QVariantMap{
                {"keyword", autoCompletePrefix},
                {"type", AutoCompletionType::Command},
--- a/src/collapsestateproxymodel.cpp
+++ b/src/collapsestateproxymodel.cpp
@@ -8,7 +8,6 @@

 bool CollapseStateProxyModel::filterAcceptsRow(int source_row, const QModelIndex &source_parent) const
 {
-    Q_UNUSED(source_parent);
    return sourceModel()->data(sourceModel()->index(source_row, 0), MessageEventModel::EventTypeRole)
        != QLatin1String("state") // If this is not a state, show it
        || sourceModel()->data(sourceModel()->index(source_row + 1, 0), MessageEventModel::EventTypeRole)
--- a/src/controller.cpp
+++ b/src/controller.cpp
@@ -12,6 +12,7 @@
 #include <KWindowConfig>
 #ifdef HAVE_WINDOWSYSTEM
 #include <KWindowEffects>
+#include <KWindowSystem>
 #endif

 #include <QAuthenticator>
@@ -40,21 +41,19 @@
 #include "neochataccountregistry.h"
 #endif

-#include <csapi/account-data.h>
-#include <csapi/content-repo.h>
-#include <csapi/joining.h>
-#include <csapi/logout.h>
-#include <csapi/profile.h>
-#include <events/eventcontent.h>
-#include <qt_connection_util.h>
-#include <settings.h>
-
+#include "csapi/account-data.h"
+#include "csapi/content-repo.h"
+#include "csapi/joining.h"
+#include "csapi/logout.h"
+#include "csapi/profile.h"
+#include "events/eventcontent.h"
 #include "neochatconfig.h"
 #include "neochatroom.h"
 #include "neochatuser.h"
 #include "roommanager.h"
+#include "settings.h"
 #include "utils.h"
-#include "windowcontroller.h"
+#include <qt_connection_util.h>

 #include <KStandardShortcut>

@@ -132,11 +131,6 @@ Controller &Controller::instance()
    return _instance;
 }

-void Controller::showWindow()
-{
-    WindowController::instance().showAndRaiseWindow(QString());
-}
-
 inline QString accessTokenFileName(const AccountSettings &account)
 {
    QString fileName = account.userId();
@@ -574,7 +568,7 @@ void Controller::setActiveConnection(Connection *connection)
    m_connection = connection;
    if (connection != nullptr) {
        NeoChatConfig::self()->setActiveConnection(connection->userId());
-        connect(connection, &Connection::networkError, this, [this]() {
+        connect(connection, &Connection::networkError, this, [this](QString message, QString details, int retriesTaken, int nextRetryInMilliseconds) {
            if (!m_isOnline) {
                return;
            }
@@ -595,9 +589,21 @@ void Controller::setActiveConnection(Connection *connection)
    Q_EMIT activeConnectionChanged();
 }

-void Controller::saveWindowGeometry()
+void Controller::restoreWindowGeometry(QQuickWindow *window)
 {
-    WindowController::instance().saveGeometry();
+    KConfig dataResource("data", KConfig::SimpleConfig, QStandardPaths::AppDataLocation);
+    KConfigGroup windowGroup(&dataResource, "Window");
+    KWindowConfig::restoreWindowSize(window, windowGroup);
+    KWindowConfig::restoreWindowPosition(window, windowGroup);
+}
+
+void Controller::saveWindowGeometry(QQuickWindow *window)
+{
+    KConfig dataResource("data", KConfig::SimpleConfig, QStandardPaths::AppDataLocation);
+    KConfigGroup windowGroup(&dataResource, "Window");
+    KWindowConfig::saveWindowPosition(window, windowGroup);
+    KWindowConfig::saveWindowSize(window, windowGroup);
+    dataResource.sync();
 }

 NeochatDeleteDeviceJob::NeochatDeleteDeviceJob(const QString &deviceId, const Omittable<QJsonObject> &auth)
@@ -675,6 +681,13 @@ void Controller::setBlur(QQuickItem *item, bool blur)
 #endif
 }

+void Controller::raiseWindow(QWindow *window)
+{
+#ifdef HAVE_WINDOWSYSTEM
+    KWindowSystem::activateWindow(window->winId());
+#endif
+}
+
 bool Controller::hasWindowSystem() const
 {
 #ifdef HAVE_WINDOWSYSTEM
--- a/src/controller.h
+++ b/src/controller.h
@@ -11,16 +11,16 @@

 class QKeySequences;

-#include <connection.h>
-#include <csapi/list_public_rooms.h>
-#include <room.h>
-#include <settings.h>
-#include <user.h>
+#include "connection.h"
+#include "csapi/list_public_rooms.h"
+#include "room.h"
+#include "settings.h"
+#include "user.h"

 class NeoChatRoom;
 class NeoChatUser;
 class TrayIcon;
-class QWindow;
+class QQuickWindow;
 class QQuickTextDocument;

 namespace QKeychain
@@ -95,6 +95,7 @@ public:
    Q_INVOKABLE void openOrCreateDirectChat(NeoChatUser *user);

    Q_INVOKABLE void setBlur(QQuickItem *item, bool blur);
+    Q_INVOKABLE void raiseWindow(QWindow *window);
    Q_INVOKABLE QString plainText(QQuickTextDocument *document) const;
    bool encryptionSupported() const;

@@ -117,7 +118,6 @@ private:

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

 Q_SIGNALS:
    void busyChanged();
@@ -137,19 +137,17 @@ Q_SIGNALS:
    void activeConnectionChanged();
    void aboutDataChanged();
    void passwordStatus(Controller::PasswordStatus _t1);
+    void showWindow();
    void userConsentRequired(QUrl url);
    void testConnectionResult(const QString &connection, bool usable);
    void isOnlineChanged(bool isOnline);
-    void keyVerificationRequest(int timeLeft, Connection *connection, const QString &transactionId, const QString &deviceId);
-    void keyVerificationStart();
-    void keyVerificationAccept(const QString &commitment);
-    void keyVerificationKey(const QString &sas);

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

 // TODO libQuotient 0.7: Drop
--- a/src/devicesmodel.cpp
+++ b/src/devicesmodel.cpp
@@ -6,15 +6,11 @@
 #include <csapi/device_management.h>

 #include "controller.h"
-#include <connection.h>

 DevicesModel::DevicesModel(QObject *parent)
    : QAbstractListModel(parent)
 {
-    connect(&Controller::instance(), &Controller::activeConnectionChanged, this, [this]() {
-        DevicesModel::fetchDevices();
-        Q_EMIT connectionChanged();
-    });
+    connect(&Controller::instance(), &Controller::activeConnectionChanged, this, &DevicesModel::fetchDevices);

    fetchDevices();
 }
@@ -98,8 +94,3 @@ void DevicesModel::setName(int index, const QString &name)
        endResetModel();
    });
 }
-
-Connection *DevicesModel::connection() const
-{
-    return Controller::instance().activeConnection();
-}
--- a/src/devicesmodel.h
+++ b/src/devicesmodel.h
@@ -9,17 +9,10 @@

 using namespace Quotient;

-namespace Quotient
-{
-class Connection;
-}
-
 class DevicesModel : public QAbstractListModel
 {
    Q_OBJECT

-    Q_PROPERTY(Connection *connection READ connection NOTIFY connectionChanged)
-
 public:
    enum Roles {
        Id,
@@ -38,11 +31,6 @@ public:
    Q_INVOKABLE void logout(int index, const QString &password);
    Q_INVOKABLE void setName(int index, const QString &name);

-    Connection *connection() const;
-
-Q_SIGNALS:
-    void connectionChanged();
-
 private:
    void fetchDevices();
    QVector<Quotient::Device> m_devices;
--- a/src/joinrulesevent.h
+++ b/src/joinrulesevent.h
@@ -8,25 +8,17 @@

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

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

--- a/src/linkpreviewer.cpp
+++ b/src/linkpreviewer.cpp
@@ -1,64 +0,0 @@
-// SPDX-FileCopyrightText: 2022 Bharadwaj Raju <bharadwaj.raju777@protonmail.com>
-// SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-or-later OR LicenseRef-KDE-Accepted-GPL
-
-#include "linkpreviewer.h"
-
-#include "controller.h"
-
-LinkPreviewer::LinkPreviewer(QObject *parent)
-    : QObject(parent)
-    , m_loaded(false)
-{
-}
-
-bool LinkPreviewer::loaded() const
-{
-    return m_loaded;
-}
-
-QString LinkPreviewer::title() const
-{
-    return m_title;
-}
-
-QString LinkPreviewer::description() const
-{
-    return m_description;
-}
-
-QString LinkPreviewer::imageSource() const
-{
-    return m_imageSource;
-}
-
-QUrl LinkPreviewer::url() const
-{
-    return m_url;
-}
-
-void LinkPreviewer::setUrl(QUrl url)
-{
-    if (url.scheme() == QStringLiteral("https")) {
-        m_loaded = false;
-        Q_EMIT loadedChanged();
-
-        m_url = url;
-        Q_EMIT urlChanged();
-
-        auto conn = Controller::instance().activeConnection();
-
-        GetUrlPreviewJob *job = conn->callApi<GetUrlPreviewJob>(m_url.toString());
-
-        connect(job, &BaseJob::success, this, [this, job]() {
-            const auto json = job->jsonData();
-            m_title = json["og:title"].toString();
-            m_description = json["og:description"].toString();
-            m_imageSource = json["og:image"].toString();
-            m_loaded = true;
-            Q_EMIT titleChanged();
-            Q_EMIT descriptionChanged();
-            Q_EMIT imageSourceChanged();
-            Q_EMIT loadedChanged();
-        });
-    }
-}
--- a/src/linkpreviewer.h
+++ b/src/linkpreviewer.h
@@ -1,46 +0,0 @@
-// SPDX-FileCopyrightText: 2022 Bharadwaj Raju <bharadwaj.raju777@protonmail.com>
-// SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-or-later OR LicenseRef-KDE-Accepted-GPL
-
-#pragma once
-
-#include <connection.h>
-#include <csapi/content-repo.h>
-
-#include <QObject>
-
-using namespace Quotient;
-
-class LinkPreviewer : public QObject
-{
-    Q_OBJECT
-    Q_PROPERTY(bool loaded READ loaded NOTIFY loadedChanged)
-    Q_PROPERTY(QString title READ title NOTIFY titleChanged)
-    Q_PROPERTY(QString description READ description NOTIFY descriptionChanged)
-    Q_PROPERTY(QString imageSource READ imageSource NOTIFY imageSourceChanged)
-    Q_PROPERTY(QUrl url READ url WRITE setUrl NOTIFY urlChanged)
-
-public:
-    explicit LinkPreviewer(QObject *parent = nullptr);
-
-    [[nodiscard]] bool loaded() const;
-    [[nodiscard]] QString title() const;
-    [[nodiscard]] QString description() const;
-    [[nodiscard]] QString imageSource() const;
-    [[nodiscard]] QUrl url() const;
-
-    void setUrl(QUrl);
-
-private:
-    bool m_loaded;
-    QString m_title;
-    QString m_description;
-    QString m_imageSource;
-    QUrl m_url;
-
-Q_SIGNALS:
-    void loadedChanged();
-    void titleChanged();
-    void descriptionChanged();
-    void imageSourceChanged();
-    void urlChanged();
-};
--- a/src/login.cpp
+++ b/src/login.cpp
@@ -2,13 +2,11 @@
 // SPDX-License-Identifier: GPL-2.0-or-later

 #include "login.h"
-
-#include <connection.h>
-#include <qt_connection_util.h>
-
+#include "connection.h"
 #include "controller.h"

 #include <QUrl>
+#include <qt_connection_util.h>

 #include <KLocalizedString>

--- a/src/login.h
+++ b/src/login.h
@@ -5,8 +5,8 @@

 #include <QObject>

-#include <connection.h>
-#include <csapi/wellknown.h>
+#include "connection.h"
+#include "csapi/wellknown.h"

 using namespace Quotient;

--- a/src/main.cpp
+++ b/src/main.cpp
@@ -26,8 +26,8 @@
 #include <KDBusService>
 #endif
 #ifdef HAVE_WINDOWSYSTEM
-#include <KWindowSystem>
 #include <kwindowsystem_version.h>
+#include <KWindowSystem>
 #endif
 #include <KLocalizedContext>
 #include <KLocalizedString>
@@ -36,16 +36,11 @@
 #include "neochat-version.h"

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

-#include <csapi/joining.h>
-#include <csapi/leaving.h>
-#include <networkaccessmanager.h>
-#include <room.h>
-
 #include "actionshandler.h"
 #include "blurhashimageprovider.h"
 #include "chatboxhelper.h"
@@ -54,12 +49,13 @@
 #include "collapsestateproxymodel.h"
 #include "commandmodel.h"
 #include "controller.h"
+#include "csapi/joining.h"
+#include "csapi/leaving.h"
 #include "customemojimodel.h"
 #include "devicesmodel.h"
 #include "emojimodel.h"
 #include "filetypesingleton.h"
 #include "joinrulesevent.h"
-#include "linkpreviewer.h"
 #include "login.h"
 #include "matriximageprovider.h"
 #include "messageeventmodel.h"
@@ -67,6 +63,7 @@
 #include "neochatconfig.h"
 #include "neochatroom.h"
 #include "neochatuser.h"
+#include "networkaccessmanager.h"
 #include "notificationsmanager.h"
 #include "publicroomlistmodel.h"
 #include "roomlistmodel.h"
@@ -78,10 +75,7 @@
 #include "userdirectorylistmodel.h"
 #include "userlistmodel.h"
 #include "webshortcutmodel.h"
-#include "windowcontroller.h"
-#ifdef QUOTIENT_07
-#include <keyverificationsession.h>
-#endif
+#include <room.h>
 #ifdef HAVE_COLORSCHEME
 #include "colorschemer.h"
 #endif
@@ -101,13 +95,20 @@ class NetworkAccessManagerFactory : public QQmlNetworkAccessManagerFactory
    }
 };

-static QWindow *windowFromEngine(QQmlApplicationEngine *engine)
+#ifdef HAVE_WINDOWSYSTEM
+static void raiseWindow(QWindow *window)
 {
-    const auto rootObjects = engine->rootObjects();
-    auto *window = qobject_cast<QQuickWindow *>(rootObjects.first());
-    Q_ASSERT(window);
-    return window;
+#if KWINDOWSYSTEM_VERSION >= QT_VERSION_CHECK(5, 91, 0)
+    KWindowSystem::updateStartupId(window);
+#else
+    if (KWindowSystem::isPlatformWayland()) {
+        KWindowSystem::setCurrentXdgActivationToken(qEnvironmentVariable("XDG_ACTIVATION_TOKEN"));
+    }
+#endif
+    KWindowSystem::activateWindow(window->winId());
+    window->raise();
 }
+#endif

 #ifdef Q_OS_ANDROID
 Q_DECL_EXPORT
@@ -141,7 +142,6 @@ int main(int argc, char *argv[])
    font.setPointSize(10);
    app.setFont(font);
 #endif
-    KLocalizedString::setApplicationDomain("neochat");

    QGuiApplication::setOrganizationName("KDE");

@@ -165,6 +165,7 @@ int main(int argc, char *argv[])
    KAboutData::setApplicationData(about);
    QGuiApplication::setWindowIcon(QIcon::fromTheme(QStringLiteral("org.kde.neochat")));

+
 #ifdef NEOCHAT_FLATPAK
    // Copy over the included FontConfig configuration to the
    // app's config dir:
@@ -189,7 +190,6 @@ int main(int argc, char *argv[])
 #endif

    qmlRegisterSingletonInstance("org.kde.neochat", 1, 0, "Controller", &Controller::instance());
-    qmlRegisterSingletonInstance("org.kde.neochat", 1, 0, "NotificationsManager", &NotificationsManager::instance());
    qmlRegisterSingletonInstance("org.kde.neochat", 1, 0, "Clipboard", &clipboard);
    qmlRegisterSingletonInstance("org.kde.neochat", 1, 0, "Config", config);
    qmlRegisterSingletonInstance("org.kde.neochat", 1, 0, "RoomManager", &RoomManager::instance());
@@ -215,9 +215,7 @@ int main(int argc, char *argv[])
    qmlRegisterType<SortFilterRoomListModel>("org.kde.neochat", 1, 0, "SortFilterRoomListModel");
    qmlRegisterType<SortFilterSpaceListModel>("org.kde.neochat", 1, 0, "SortFilterSpaceListModel");
    qmlRegisterType<DevicesModel>("org.kde.neochat", 1, 0, "DevicesModel");
-    qmlRegisterType<LinkPreviewer>("org.kde.neochat", 1, 0, "LinkPreviewer");
    qmlRegisterUncreatableType<RoomMessageEvent>("org.kde.neochat", 1, 0, "RoomMessageEvent", "ENUM");
-    qmlRegisterUncreatableType<PushNotificationState>("org.kde.neochat", 1, 0, "PushNotificationState", "ENUM");
    qmlRegisterUncreatableType<NeoChatRoomType>("org.kde.neochat", 1, 0, "NeoChatRoomType", "ENUM");
    qmlRegisterUncreatableType<UserType>("org.kde.neochat", 1, 0, "UserType", "ENUM");

@@ -231,12 +229,11 @@ int main(int argc, char *argv[])
    qRegisterMetaType<NeoChatUser *>("NeoChatUser*");
    qRegisterMetaType<GetRoomEventsJob *>("GetRoomEventsJob*");
    qRegisterMetaType<QMimeType>("QMimeType");
-#ifdef QUOTIENT_07
-#ifdef Quotient_E2EE_ENABLED
-    qRegisterMetaType<KeyVerificationSession *>("KeyVerificationSession*");
-    qmlRegisterUncreatableType<KeyVerificationSession>("org.kde.neochat", 1, 0, "KeyVerificationSession", {});
-    qRegisterMetaType<QVector<EmojiEntry>>("QVector<EmojiEntry>");
-#endif
+
+#ifdef HAVE_WINDOWSYSTEM
+    qmlRegisterSingletonType<KWindowSystem>("org.kde.kwindowsystem.private", 1, 0, "KWindowSystem", [](QQmlEngine *, QJSEngine *) -> QObject * {
+        return KWindowSystem::self();
+    });
 #endif

 #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
@@ -245,6 +242,7 @@ int main(int argc, char *argv[])

    QQmlApplicationEngine engine;
    engine.rootContext()->setContextObject(new KLocalizedContext(&engine));
+    KLocalizedString::setApplicationDomain("neochat");
    QObject::connect(&engine, &QQmlApplicationEngine::quit, &app, &QCoreApplication::quit);
    engine.setNetworkAccessManagerFactory(new NetworkAccessManagerFactory());

@@ -284,10 +282,16 @@ int main(int argc, char *argv[])
                    [&engine](const QStringList &arguments, const QString &workingDirectory) {
                        Q_UNUSED(workingDirectory);

-                        QWindow *window = windowFromEngine(&engine);
-                        KWindowSystem::updateStartupId(window);
-
-                        WindowController::instance().showAndRaiseWindow(QString());
+                        // Raise windows
+                        const auto rootObjects = engine.rootObjects();
+                        for (auto obj : rootObjects) {
+                            auto view = qobject_cast<QQuickWindow *>(obj);
+                            if (view) {
+                                view->show();
+                                raiseWindow(view);
+                                return;
+                            }
+                        }

                        // Open matrix uri
                        if (arguments.isEmpty()) {
@@ -300,11 +304,15 @@ int main(int argc, char *argv[])
                        }
                    });
 #endif
-
-    QWindow *window = windowFromEngine(&engine);
-
-    WindowController::instance().setWindow(window);
-    WindowController::instance().restoreGeometry();
-
+    const auto rootObjects = engine.rootObjects();
+    for (auto obj : rootObjects) {
+        auto view = qobject_cast<QQuickWindow *>(obj);
+        if (view) {
+            if (view->isVisible()) {
+                Controller::instance().restoreWindowGeometry(view);
+            }
+            break;
+        }
+    }
    return app.exec();
 }
--- a/src/messageeventmodel.cpp
+++ b/src/messageeventmodel.cpp
@@ -55,7 +55,6 @@ QHash<int, QByteArray> MessageEventModel::roleNames() const
    roles[FormattedBodyRole] = "formattedBody";
    roles[AuthorIdRole] = "authorId";
    roles[MediaUrlRole] = "mediaUrl";
-    roles[VerifiedRole] = "verified";
    return roles;
 }

@@ -542,17 +541,12 @@ QVariant MessageEventModel::data(const QModelIndex &idx, int role) const
    }

    if (role == MimeTypeRole) {
-        if (auto e = eventCast<const RoomMessageEvent>(&evt)) {
-            if (!e || !e->hasFileContent()) {
-                return QVariant();
-            }
-
-            return e->content()->fileInfo()->mimeType.name();
+        auto e = eventCast<const RoomMessageEvent>(&evt);
+        if (!e || !e->hasFileContent()) {
+            return QVariant();
        }

-        if (auto e = eventCast<const StickerEvent>(&evt)) {
-            return e->image().mimeType.name();
-        }
+        return e->content()->fileInfo()->mimeType.name();
    }

    if (role == SpecialMarksRole) {
@@ -721,8 +715,7 @@ QVariant MessageEventModel::data(const QModelIndex &idx, int role) const
        for (auto r = row + 1; r < rowCount(); ++r) {
            auto i = index(r);
            if (data(i, SpecialMarksRole) != EventStatus::Hidden) {
-                return data(i, AuthorRole) != data(idx, AuthorRole) || data(i, EventTypeRole) == "state"
-                    || data(i, TimeRole).toDateTime().msecsTo(data(idx, TimeRole).toDateTime()) > 600000
+                return data(i, AuthorRole) != data(idx, AuthorRole) || data(i, TimeRole).toDateTime().msecsTo(data(idx, TimeRole).toDateTime()) > 600000
                    || data(i, TimeRole).toDateTime().toLocalTime().date().day() != data(idx, TimeRole).toDateTime().toLocalTime().date().day();
            }
        }
@@ -793,38 +786,10 @@ QVariant MessageEventModel::data(const QModelIndex &idx, int role) const
                return m_currentRoom->makeMediaUrl(e->id(), e->content()->originalJson["url"].toString());
            }
        }
-
-        // Requires https://github.com/quotient-im/libQuotient/pull/570
-        // if (auto e = eventCast<const StickerEvent>(&evt)) {
-        //     return m_currentRoom->makeMediaUrl(e->id(), e->url());
-        // }
 #endif
-
-        // Construct link in the same form as urlToDownload as that function doesn't work for stickers
-        if (auto e = eventCast<const StickerEvent>(&evt)) {
-            auto url = QUrl(m_currentRoom->connection()->homeserver().toString() + "/_matrix/media/r0/download/" + e->url().toString().remove("mxc://"));
-            QUrlQuery q(url.query());
-            q.addQueryItem("allow_remote", "true");
-            url.setQuery(q);
-            return url;
-        }
-
        return m_currentRoom->urlToDownload(evt.id());
    }

-    if (role == VerifiedRole) {
-#ifdef QUOTIENT_07
-#ifdef Quotient_E2EE_ENABLED
-        if (evt.originalEvent()) {
-            auto encrypted = dynamic_cast<const EncryptedEvent *>(evt.originalEvent());
-            Q_ASSERT(encrypted);
-            return m_currentRoom->connection()->isVerifiedSession(encrypted->sessionId());
-        }
-        return false;
-#endif
-#endif
-    }
-
    return {};
 }

--- a/src/messageeventmodel.h
+++ b/src/messageeventmodel.h
@@ -6,7 +6,7 @@
 #include <QAbstractListModel>

 #include "neochatroom.h"
-#include <room.h>
+#include "room.h"

 class MessageEventModel : public QAbstractListModel
 {
@@ -48,7 +48,6 @@ public:
        // For debugging
        EventResolvedTypeRole,
        AuthorIdRole,
-        VerifiedRole,
        LastRole, // Keep this last
    };
    Q_ENUM(EventRoles)
--- a/src/neochat.notifyrc
+++ b/src/neochat.notifyrc
@@ -146,7 +146,6 @@ Name[cs]=Nová pozvánka
 Name[de]=Neue Einladung
 Name[en_GB]=New Invitation
 Name[es]=Nueva invitación
-Name[eu]=Gonbidapen berria
 Name[fi]=Uusi kutsu
 Name[fr]=Nouvelle invitation
 Name[ia]=Nove invitation
@@ -173,7 +172,6 @@ Comment[cs]=Máte novou pozvánku do místnosti
 Comment[de]=Es gibt eine neue Einladung zu einem Raum
 Comment[en_GB]=There is a new invitation to a room
 Comment[es]=Hay una nueva invitación a una sala
-Comment[eu]=Gela baterako gonbidapen berri bat dago
 Comment[fi]=Uusi kutsu huoneeseen
 Comment[fr]=Il y a une nouvelle invitation dans un salon.
 Comment[ia]=Il ha un nove invitation a un sala
--- a/Show More
+++ b/Show More