GIT_SILENT Upgrade release service version to 23.07.90.

GIT_SILENT Sync po/docbooks with svn
2023-08-10 21:00:24 +02:00 · 2023-08-10 03:07:45 +00:00 · 2023-08-09 03:12:18 +00:00 · 2023-08-08 15:00:29 +02:00 · 2023-08-08 03:23:23 +00:00 · 2023-08-08 02:36:56 +00:00
100 changed files with 12135 additions and 11592 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,7 +9,7 @@ cmake_minimum_required(VERSION 3.16)
 # KDE Applications version, managed by release script.
 set(RELEASE_SERVICE_VERSION_MAJOR "23")
 set(RELEASE_SERVICE_VERSION_MINOR "07")
-set(RELEASE_SERVICE_VERSION_MICRO "70")
+set(RELEASE_SERVICE_VERSION_MICRO "90")
 set(RELEASE_SERVICE_VERSION "${RELEASE_SERVICE_VERSION_MAJOR}.${RELEASE_SERVICE_VERSION_MINOR}.${RELEASE_SERVICE_VERSION_MICRO}")

 project(NeoChat VERSION ${RELEASE_SERVICE_VERSION})
--- a/org.kde.neochat.appdata.xml
+++ b/org.kde.neochat.appdata.xml
@@ -60,7 +60,7 @@
  <summary xml:lang="eu">Matrix, deszentralizatutako komunikazio protokolorako bezero bat</summary>
  <summary xml:lang="fi">Asiakas Matrixille, hajautetulle viestintäyhteyskäytännölle</summary>
  <summary xml:lang="fr">Un client pour « Matrix », le protocole décentralisé de communications.</summary>
-  <summary xml:lang="gl">Un cliente para Matrix, o protocolo de comunicación descentralizada</summary>
+  <summary xml:lang="gl">Un cliente para Matrix, o protocolo de comunicación descentralizada.</summary>
  <summary xml:lang="hu">Kliens a matrixhoz, a decentralizált kommunikációs protokollhoz</summary>
  <summary xml:lang="ia">Un cliente per Matrix, le protocollo de communication decentralisate</summary>
  <summary xml:lang="id">Klien untuk matrix, protokol komunikasi terdesentralisasi</summary>
@@ -92,17 +92,20 @@ to provide a convergent experience across multiple platforms.</p>
    <p xml:lang="en-GB">NeoChat is a client for Matrix, the decentralised communication protocol for instant messaging. It allows you to send text messages, videos and audio files to your family, colleagues and friends. It uses KDE frameworks and most notably Kirigami to provide a convergent experience across multiple platforms.</p>
    <p xml:lang="eo">NeoChat estas kliento por Matrix, la malcentra komunikoprotokolo por tuja mesaĝado. Ĝi ebligas al vi sendi tekstmesaĝojn, filmetojn kaj sondosierojn al via familio, kolegoj kaj amikoj. Ĝi uzas KDE-framojn kaj precipe Kirigami por disponigi konverĝan sperton tra pluraj platformoj.</p>
    <p xml:lang="es">NeoChat es un cliente para Matrix, el protocolo de comunicaciones descentralizado para mensajería instantánea. Le permite enviar mensajes de texto, vídeos y archivos de sonido a su familia, compañeros de trabajo y amigos. Usa la infraestructura de KDE y, en particular, Kirigami para proporcionar una experiencia convergente en muchas plataformas.</p>
+    <p xml:lang="eu">NeoChat «Matrix»erako, bat-bateko mezularitzarako komunikazio deszentralizatuko protokolorako, bezero bat da. Zure sendiari, kide eta lagunei testu mezuak, bideo eta audio fitxategiak bidaltzeko aukera ematen dizu. «KDE Frameworks» eta bereziki «Kirigami» erabiltzen ditu plataforma anitzen artean esperientzia konbergente bat eskaintzeko.</p>
    <p xml:lang="fi">NeoChat on asiakassovellus Matrixille, hajautetulle pikaviestinyhteyskäytännölle. Sillä voi lähettää teksti-, video- ja ääniviestejä perheelle, tutuille ja ystäville. Se käyttää KDE-kehystä ja erityisesti Kirigamia tuottaakseen mukautuvan monialustaisen käyttökokemuksen.</p>
    <p xml:lang="fr">NeoChat est un client pour le protocole Matrix, un protocole décentralisé de communications pour messagerie instantané. Il vous permet d'envoyer des messages de texte, des vidéos et des fichiers audio à votre famille, vos collègues et vos amis. Il utilise les environnements de développement et plus précisément Kirigami pour fournir une expérience convergente sur plusieurs plate-formes. </p>
-    <p xml:lang="gl">NeoChat é un cliente para Matrix, o protocolo de comunicación descentralizada para mensaxería instantánea. Podes enviar mensaxes de texto, vídeos e ficheiros de son á túa familia, colegas e amizades. Usas infraestruturas de KDE e principalmente Kirigami para proporcionar unha experiencia de uso converxente para varias plataformas.</p>
+    <p xml:lang="gl">NeoChat é un cliente para Matrix, o protocolo de comunicación descentralizada para mensaxaría instantánea. Podes enviar mensaxes de texto, vídeos e ficheiros de son á túa familia, colegas e amizades. Usas infraestruturas de KDE e principalmente Kirigami para proporcionar unha experiencia de uso converxente para varias plataformas.</p>
    <p xml:lang="ia">NeoChat es un cliente per Matrix, le protocollo de communication decentralisate per messager instantanee. Illo te permitte inviar messager de texto, files de video e audio a tu familia, collegas e amicos usante. Illo usa KDE frameworks e super toto Kirigamii forni un experientia convergente trans platteforme multiple.</p>
    <p xml:lang="it">NeoChat è un client per Matrix, il protocollo di comunicazione decentralizzato per la messaggistica istantanea. Ti consente di inviare messaggi di testo, video e file audio a familiari, colleghi e amici. Utilizza i framework KDE e in particolare Kirigami per fornire un'esperienza convergente su più piattaforme.</p>
    <p xml:lang="ka">NeoChat არის Matrix კლიენტი. ის საშუალებას გაძლევთ გაგზავნოთ ტექსტური შეტყობინებები, ვიდეოები და აუდიო ფაილები თქვენს ოჯახს, კოლეგებსა და მეგობრებს მატრიქსის პროტოკოლის გამოყენებით.</p>
+    <p xml:lang="ko">NeoChat은 분산형 인스턴트 메시징 통신 프로토콜인 Matrix 클라이언트입니다. 가족, 동료, 친구에게 텍스트 메시지, 동영상, 오디오 파일을 전송할 수 있습니다. KDE 프레임워크와 Kirigami를 사용하여 다양한 플랫폼에서 일관적인 사용자 경험을 제공합니다.</p>
    <p xml:lang="nl">NeoChat is een client voor Matrix, het gedecentraliseerde communicatieprotocol voor instant messages. Het biedt u het verzenden van tekstberichten, video's en geluidsbestanden naar uw familie, collega's en vrienden. Het gebruik KDE frameworks en het meest opmerkelijk Kirigami om een convergente ervaring te leveren op meerdere platforms.</p>
    <p xml:lang="nn">NeoChat er ein klient for Matrix, ein protokoll for desentralisert kommunikasjon. Du kan utveksla tekst, lyd og videoar med kollegaar, vennar og familie. Programmet brukar KDE Frameworks og Kirigami for å gje ei brukarflate tilpassa ulike plattformer.</p>
    <p xml:lang="pl">NeoChat jest programem do Matriksa, protokołu rozproszonego porozumiewania się w czasie rzeczywistym. Umożliwia wysyłanie wiadomości tekstowych, filmów oraz dźwięku do twojej rodziny, znajomych oraz przyjaciół. Używa szkieletów KDE i głównie Kirigami, aby zapewnić spójne wrażenia na wielu platformach</p>
    <p xml:lang="pt">O NeoChat é um cliente do Matrix. O mesmo permite-lhe enviar mensagens de texto, ficheiros de vídeo e áudio para a sua família, colegas e amigos com o protocolo Matrix. Usa as plataformas do KDE, e principalmente o Kirigami, para oferecer uma experiência convergente entre várias plataformas.</p>
    <p xml:lang="sl">Neochat je odjemalec za Matrix, decentralizirani komunikacijski protokol za takojšnje sporočanje. Omogoča vam pošiljanje besedilnih sporočil, videoposnetkov in zvočnih datotek svoji družini, sodelavcem in prijateljem. Uporablja okvire ogrodje KDE frameworks in predvsem Kirigami za zagotavljanje konvergentne izkušnje na več platformah.</p>
+    <p xml:lang="sv">NeoChat är en klient för Matrix, det decentraliserade kommunikationsprotokollet för direktmeddelanden. Den låter dig skicka textmeddelanden, videor och ljudfiler till din familj, kollegor och vänner. Den använder KDE Ramverk, i synnerhet Kirigami, för att tillhandahålla en konvergent upplevelse på flera plattformar.</p>
    <p xml:lang="tr">NeoChat, anlık iletileşme için merkezi olmayan iletişim protokolü olan Matrix için bir istemcidir. Ailenize, iş arkadaşlarınıza ve arkadaşlarınıza metin iletiler, videolar ve ses dosyaları göndermenize olanak tanır. Birden çok platformda yakınsak bir deneyim sağlamak için KDE Frameworks ve en önemlilerinden Kirigami'yi kullanır.</p>
    <p xml:lang="uk">NeoChat — клієнт Matrix, децентралізованого протоколу спілкування для миттєвого обміну повідомленнями. За його допомогою ви можете надсилати текстові повідомлення, відео та звукові файли вашій родин, колегами та друзям. У програмі використано бібліотеки KDE, зокрема Kirigami, для надання однорідного середовища на декількох програмних та апаратних платформах.</p>
    <p xml:lang="x-test">xxNeoChat is a client for Matrix, the decentralized communication protocol for instant messaging. It allows you to send text messages, videos and audio files to your family, colleagues and friends. It uses KDE frameworks and most notably Kirigami to provide a convergent experience across multiple platforms.xx</p>
@@ -112,17 +115,20 @@ to provide a convergent experience across multiple platforms.</p>
    <p xml:lang="ca-valencia">NeoChat pretén ser una aplicació amb totes les característiques per a l'especificació de Matrix. Com a tal, s'ha implementat tota l'especificació actual estable amb les notables excepcions de VoIP, fils i alguns aspectes de l'encriptació d'extrem a extrem. Hi ha algunes altres omissions més xicotetes a causa del fet que l'especificació de Matrix està evolucionant constantment, però l'objectiu seguix sent proporcionar suport eventual per a tota l'especificació.</p>
    <p xml:lang="en-GB">NeoChat aims to be a fully featured application for the Matrix specification. As such everything in the current stable specification with the notable exceptions of VoIP, threads and some aspects of End-to-End Encryption are supported. There are a few other smaller omissions due to the fact that the Matrix spec is constantly evolving but the aim remains to provide eventual support for the entire spec.</p>
    <p xml:lang="es">NeoChat pretende ser una aplicación con todas las funciones para la especificación de Matrix. Como tal, admite todo en la especificación estable actual, con las notables excepciones de VoIP, subprocesos y algunas funciones de cifrado de extremo a extremo. Existen algunas omisiones menos importantes debido al hecho de que la especificación de Matrix está en constante evolución, pero el objetivo sigue siendo brindar compatibilidad final con toda la especificación.</p>
+    <p xml:lang="eu">«NeoChat»ek «Matrix» zehaztapenaren ezaugarri guztiak eskaintzen dituen aplikazio bat izan nahi du. Beraz, egungo zehaztapen egonkorrean dagoen guztiaren euskarria du, VoIP, hariak eta muturren artean zifratzeko salbuespen nabarmenekin. Badira beste ez-betetze txikiago batzuk, «Matrix»en zehaztapena etengabe eboluzioan dagoelako, baina azken helburua zehaztapen osoaren euskarria ematea izaten jarraitzen du.</p>
    <p xml:lang="fi">NeoChat pyrkii olemaan Matrix-määritelmän täysominaisuuksinen sovellus, joten se tukee kaikkea nykyisessä vakaassa määritelmässä muutamaa huomattavaa poikkeusta lukuun ottamatta (VoIP, säikeet ja jotkin piirteet päästä päähän -salauksessa). Joitakin pienempiäkin puutteita on Matrix-määritelmän jatkuvan kehityksen vuoksi, mutta lopputavoitteena on tarjota määritelmän täysi tuki.</p>
    <p xml:lang="fr">L'objectif de NeoChat est d'être une application complète pour le protocole Matrix. En tant que tel, tout dans la spécification stable actuelle avec les exceptions notables de VoIP, les processus et certains aspects du chiffrement de bout en bout sont pris en charge. Il y a quelques autres petites omissions en raison du fait que la spécification du protocole Matrix est en constante évolution. Cependant, l'objectif reste de fournir un soutien éventuel pour l'ensemble de la spécification.</p>
    <p xml:lang="gl">NeoChat pretende ser unha aplicación completa para a especificación de Matrix. Coas excepcións de VoIP, conversas fiadas e algúns aspectos da cifraxe de extremo a extremo, a versión estábel segue as especificacións. Existen algunhas outras pequenas omisións debido ao feito de que Matrix está en continua evolución pero a intención é implementar a especificación completa.</p>
    <p xml:lang="ia">NeoChat aspira a esser un application plenemente eminente per le specification de Matrix. Tal como omne cosas in le specification currentemente stabile con le exceptiones notabile de VOIP, threads e alcun aspectos del cryptation End-to-End es supportate. Il ha ltere pauc omissiones, debite al facto que le specification de Matrix es in evolution constante ma le aspiration remane a fornir supporto eventual per le integre specification.</p>
    <p xml:lang="it">NeoChat mira ad essere un'applicazione completa per le specifiche Matrix. Pertanto, sono supportati tutti gli elementi dell'attuale specifica stabile con le notevoli eccezioni di VoIP, conversazioni e alcuni aspetti della cifratura end-to-end. Ci sono alcune altre piccole omissioni dovute al fatto che le specifiche Matrix sono in continua evoluzione, ma l'obiettivo rimane quello di fornire un eventuale supporto per l'intera specifica.</p>
    <p xml:lang="ka">NeoChat-ი მიზნად ისახავს Matrix სპეციფიკაციის სრული განხორციელება ჰქონდეს. როგორც ასეთი, ყველაფერი მიმდინარე სპეციფიკაციიდან, VoIP-ის, ძაფებისა და გამჭოლი დაშიფვრის ზოგიერთი ასპექტის გარდა, მხარდაჭერილია. შეძლება ასევე იყოს მცირე ლაფსუსებიც იმის გამო, რომ Matrix-ის სპეციფიკაცია მუდმივად ვითარგდება, მაგრამ ჩვენი მიზანი მისი სრული მხარდაჭერაა.</p>
+    <p xml:lang="ko">NeoChat은 Matrix 표준을 따르는 프로그램을 목표로 합니다. 현재 안정 버전의 표준에서 제공하는 기능의 대부분을 지원하며, VoIP, 스레드, 일부 종단간 암호화와 같은 기능은 아직 지원하지 않습니다. Matrix 표준은 계속하여 진화 중이기 때문에 일부 기능이 빠져 있을 수도 있지만 장기적으로는 전체 표준을 지원하는 것이 목표입니다.</p>
    <p xml:lang="nl">NeoChat richt zich op het volledig bieden van alle mogelijkheden van de Matrix-specificatie. Alles in de huidige stabiele specificatie met merkbare uitzondering van VoIP, gekoppelde discussies en sommige aspecten van eind-tot-eind versleuteling worden ondersteund. Er zijn een paar andere kleinere omissies vanwege het feit dat de Matrix specificatie constant evolueert maar het doel blijft het eventueel bieden van ondersteuning van de gehele specificatie.</p>
    <p xml:lang="nn">NeoChat har som mål å støtta all funksjonalitet i Matrix-spesifikasjonen. Førebels er alt i den gjeldande stabile spesifikasjonen støtta, med unntak av VoIP, trådar og nokre delar av ende-til-kryptering. Det finst òg andre småting som ikkje er støtta, sidan Matrix-spesifikasjon er i stadig endring, men målet er altså støtte for alt.</p>
    <p xml:lang="pl">NeoChat w zamyśle ma być pełnowartościową aplikacją wg wytycznych Matriksa. Z tego powodu, wszystko, co jest obecnie w stabilnych wytycznych z pominięciem VoIP, wątków i niektórych części szyfrowania Użytkownik-do-Użytkownika są obecnie obsługiwane. Pominięto też kilka mniejszych rzeczy ze względu na ciągły rozwój wytycznych Matriksa, lecz celem nadal jest zapewnienie obsługi wszystkich wytycznych.</p>
    <p xml:lang="pt">O NeoChat pretende ser uma aplicação completa para a especificação do Matrix. Como tal, tudo o que existe na especificação estável actual, com as notáveis excepções do VoIP, tópicos e alguns aspectos da Encriptação Ponto-a-Ponto, são suportados. Existem mais algumas omissões, devido ao facto que a norma do Matrix está em constante evolução, mas o objectivo continua a ser oferecer o suporte eventual para a norma por inteiro.</p>
    <p xml:lang="sl">Neochat cilja, da bi bila popolna aplikacija po specifikaciji Matrixa. Kot takšna vsebuje vse v trenutni stabilni specifikaciji z pomembnimi izjemami pri VoIP, nitih in nekaterih vidikov šifriranja od konca do konca. Obstaja nekaj drugih manjših opustitev zaradi dejstva, da se specifikacija Matrix nenehno razvija, vendar cilj ostaja zagotoviti morebitno podporo celotni specifikaciji.</p>
+    <p xml:lang="sv">NeoChat har som mål att vara ett fullständigt program enligt Matrix-specifikationen. Som sådant stöds allt i den nuvarande stabila specifikationen, med de nämnvärda undantagen VoIP, trådar och några aspekter av kryptering hela vägen. Det finns några ytterligare utelämnanden på grund av att Matrix-specifikationen hela tiden utvecklas, men målet förblir att till slut erbjuda stöd för hela specifikationen.</p>
    <p xml:lang="tr">NeoChat, Matrix belirtimi için tam özellikli bir uygulama olmayı hedefler. Bu nedenle; VoIP, ileti zincirleri ve Uçtan Uca Şifreleme'nin bazı yönleri gibi dikkate değer istisnalar dışında var olan kararlı belirtimdeki her şey desteklenir. Matrix belirtiminin sürekli gelişmesi nedeniyle birkaç küçük eksiklik daha var; ancak amaç tüm belirtim için nihai destek sağlamak olmayı sürdürüyor.</p>
    <p xml:lang="uk">Метою створення NeoChat є повноцінна реалізація програми для специфікації Matrix. Як наслідок, реалізовано усе у поточній стабільній специфікації, окрім голосового інтернет-зв'язку, потоків та деяких аспектів міжвузлового шифрування. Є також декілька інших незначних прогалин через те, що специфікація Matrix постійно змінюється, але метою лишається повна підтримка специфікації.</p>
    <p xml:lang="x-test">xxNeoChat aims to be a fully featured application for the Matrix specification. As such everything in the current stable specification with the notable exceptions of VoIP, threads and some aspects of End-to-End Encryption are supported. There are a few other smaller omissions due to the fact that the Matrix spec is constantly evolving but the aim remains to provide eventual support for the entire spec.xx</p>
@@ -132,17 +138,21 @@ to provide a convergent experience across multiple platforms.</p>
    <p xml:lang="ca-valencia">A causa de la naturalea del desenvolupament de l'especificació de Matrix, NeoChat també implementa nombroses característiques inestables. Actualment són:</p>
    <p xml:lang="en-GB">Due to the nature of the Matrix specification development NeoChat also supports numerous unstable features. Currently these are:</p>
    <p xml:lang="es">Debido a la naturaleza del desarrollo de la especificación de Matrix, NeoChat también permite numerosas funciones no estables, como:</p>
+    <p xml:lang="eu">«Matrix» zehaztapenaren garapenaren izaeragatik, «Neo¢hat»ek ezaugarri ezegonkor ugari ere onartzen ditu. Gaur egun hauek:</p>
    <p xml:lang="fi">Matrix-määritelmän kehittyessä NeoChat tukee myös monia epävakaita ominaisuuksia. Tällä hetkellä näitä ovat:</p>
    <p xml:lang="fr">En raison de la nature du développement des spécifications du protocole Matrix, NeoChat prend également en charge de nombreuses fonctionnalités instables. Actuellement, ce sont :</p>
    <p xml:lang="gl">Debido á natureza do desenvolvemento da especificación de Matrix, NeoChat tamén inclúe varias funcionalidades non estábeis:</p>
    <p xml:lang="ia">Debite al natura del disveloppamento de specification de Matrix NeoChat tamben supporta numerose characteristicas instabile. Currentemente istes es:</p>
    <p xml:lang="it">A causa della natura dello sviluppo delle specifiche Matrix, NeoChat supporta anche numerose funzionalità instabili. Attualmente queste sono:</p>
    <p xml:lang="ka">Matrix-ის სპეციფიკაციის განვითარების ბუნების გამო NeoChat-ს ასევე აქვს უამრავი არასტაბილური ფუნქციაც. ახლა ისინია:</p>
+    <p xml:lang="ko">Matrix 표준 개발의 특징으로 인하여 NeoChat은 일부 실험적인 기능을 지원합니다. 현재 지원하는 기능은 다음과 같습니다.</p>
    <p xml:lang="nl">Vanwege de aard van de ontwikkeling van de Matrix specificatie ondersteunt NeoChat ook talloze onstabiele mogelijkheden. Dit zijn nu:</p>
    <p xml:lang="nn">På grunn av måten Matrix-spesifikasjonen vert utvikla på, støttar NeoChat òg nokre uferdige funksjonar:</p>
    <p xml:lang="pl">Ze względu na sposób rozwoju Matriksa, NeoChat obsługuje także kilka niestabilnych możliwości. Obecnie są to:</p>
    <p xml:lang="pt">Devido à natureza do desenvolvimento da especificação do Matrix, o NeoChat também suporta diversas funcionalidades instáveis. De momento são:</p>
    <p xml:lang="sl">Zaradi narave razvoja specifikacije Matrixa NeoChat podpira tudi številne nestabilne zmožnosti. Trenutno so to:</p>
+    <p xml:lang="sv">På grund av sättet Matrix-specifikationens utvecklas, stöder NeoChat också ett stor antal instabila funktioner. För närvarande är de:</p>
+    <p xml:lang="ta">மேட்ரிக்ஸு நெறிமுறை வரையறுக்கப்படும் வித‍த்தின் காரணமாக, பல நிலையற்ற அம்சங்களையும் நியோச்சாட் ஆதரிக்கிறது. தற்போது ஆதரிக்கப்படுபவை:</p>
    <p xml:lang="tr">NeoChat, Matrix belirtimi geliştirmesinin doğası gereği çok sayıda kararsız özelliği de destekler. Şu anda bunlar:</p>
    <p xml:lang="uk">Через природу розробки специфікації Matrix, у NeoChat також передбачено підтримку численних нестабільних можливостей. У поточній версії цими можливостями є:</p>
    <p xml:lang="x-test">xxDue to the nature of the Matrix specification development NeoChat also supports numerous unstable features. Currently these are:xx</p>
@@ -153,16 +163,19 @@ to provide a convergent experience across multiple platforms.</p>
      <li xml:lang="ca-valencia">Enquestes - MSC3381</li>
      <li xml:lang="en-GB">Polls - MSC3381</li>
      <li xml:lang="es">Encuestas - MSC3381</li>
+      <li xml:lang="eu">Polls - MSC3381</li>
      <li xml:lang="fi">Kyselyt – MSC3381</li>
      <li xml:lang="fr">Sondages - MSC3381</li>
-      <li xml:lang="gl">Enquisas - MSC3381</li>
+      <li xml:lang="gl">Enquisas — MSC3381</li>
      <li xml:lang="ia">Inquestas - MSC3381</li>
      <li xml:lang="it">Sondaggi - MSC3381</li>
      <li xml:lang="ka">Polls - MSC3381</li>
+      <li xml:lang="ko">투표 - MSC3381</li>
      <li xml:lang="nl">Polls - MSC3381</li>
      <li xml:lang="nn">Avstemmingar – MSC3381</li>
      <li xml:lang="pt">Inquéritos - MSC3381</li>
      <li xml:lang="sl">Polls - MSC3381</li>
+      <li xml:lang="sv">Polls - MSC3381</li>
      <li xml:lang="ta">வாக்கெடுப்புகள் - MSC3381</li>
      <li xml:lang="tr">Anketler - MSC3381</li>
      <li xml:lang="uk">Опитування - MSC3381</li>
@@ -173,16 +186,19 @@ to provide a convergent experience across multiple platforms.</p>
      <li xml:lang="ca-valencia">Paquets d'adhesius - MSC2545</li>
      <li xml:lang="en-GB">Sticker Packs - MSC2545</li>
      <li xml:lang="es">Paquetes de pegatinas - MSC2545</li>
+      <li xml:lang="eu">Eranskailu paketeak - MSC2545</li>
      <li xml:lang="fi">Tarrapakkaukset – MSC2545</li>
      <li xml:lang="fr">Paquets d'auto-collants - MSC2545</li>
-      <li xml:lang="gl">Paquetes de adhesivos - MSC2545</li>
+      <li xml:lang="gl">Paquetes de adhesivos — MSC2545</li>
      <li xml:lang="ia">Etiquetta gummate (sticker) -MSC2545</li>
      <li xml:lang="it">Pacchetti di adesivi - MSC2545</li>
      <li xml:lang="ka">სტიკერების პაკეტები - MSC2545</li>
+      <li xml:lang="ko">스티커 팩 - MSC2545</li>
      <li xml:lang="nl">Sticker Packs - MSC2545</li>
      <li xml:lang="nn">Klistremerke-pakkar – MSC2545</li>
      <li xml:lang="pt">Pacotes de Autocolantes - MSC2545</li>
      <li xml:lang="sl">Sticker Packs - MSC2545</li>
+      <li xml:lang="sv">Sticker Packs - MSC2545</li>
      <li xml:lang="ta">ஒட்டி தொகுப்புகள் - MSC2545</li>
      <li xml:lang="tr">Yapışkan Paketleri - MSC2545</li>
      <li xml:lang="uk">Пакунки наліпок - MSC2545</li>
@@ -193,16 +209,19 @@ to provide a convergent experience across multiple platforms.</p>
      <li xml:lang="ca-valencia">Esdeveniments d'ubicació - MSC3488</li>
      <li xml:lang="en-GB">Location Events - MSC3488</li>
      <li xml:lang="es">Eventos de ubicación - MSC3488</li>
+      <li xml:lang="eu">Kokaleku-gertaerak - MSC3488</li>
      <li xml:lang="fi">Sijaintitapahtumat – MSC3488</li>
      <li xml:lang="fr">Événements de lieu - MSC3488</li>
-      <li xml:lang="gl">Localización de eventos - MSC3488</li>
+      <li xml:lang="gl">Localización de eventos — MSC3488</li>
      <li xml:lang="ia">Eventos de Location - MSC3488</li>
      <li xml:lang="it">Località eventi - MSC3488</li>
      <li xml:lang="ka">მდებარეობის მოვლენები - MSC3488</li>
+      <li xml:lang="ko">위치 이벤트 - MSC3488</li>
      <li xml:lang="nl">Locatie gebeurtenissen - MSC3488</li>
      <li xml:lang="nn">Posisjonshendingar – MSC3488</li>
      <li xml:lang="pt">Eventos com Localizações - MSC3488</li>
      <li xml:lang="sl">Location Events - MSC3488</li>
+      <li xml:lang="sv">Location Events - MSC3488</li>
      <li xml:lang="ta">இட நிகழ்வுகள் - MSC3488</li>
      <li xml:lang="tr">Konum Etkinlikleri - MSC3488</li>
      <li xml:lang="uk">Місцеві зустрічі - MSC3488</li>
@@ -266,11 +285,19 @@ to provide a convergent experience across multiple platforms.</p>
    <value key="KDE::windows_store::screenshots::1::caption" xml:lang="ca">Vista principal amb la llista de sales, xats i informació de les sales</value>
    <value key="KDE::windows_store::screenshots::1::caption" xml:lang="ca-valencia">Vista principal amb la llista de sales, xats i informació de les sales</value>
    <value key="KDE::windows_store::screenshots::1::caption" xml:lang="es">Vista principal con la lista de salas, chat e información de la sala</value>
+    <value key="KDE::windows_store::screenshots::1::caption" xml:lang="eu">Ikuspegi nagusia gela-zerrenda, berriketa, eta gelako informazioarekin</value>
    <value key="KDE::windows_store::screenshots::1::caption" xml:lang="fr">Vue principale avec la liste des salons ainsi que des informations sur les salons et forums de discussions</value>
+    <value key="KDE::windows_store::screenshots::1::caption" xml:lang="gl">Vista principal coa lista de salas, a charla, e información da sala.</value>
+    <value key="KDE::windows_store::screenshots::1::caption" xml:lang="ia">Vista principal con lista de sala, chat e information de sala</value>
+    <value key="KDE::windows_store::screenshots::1::caption" xml:lang="it">Vista principale con elenco delle stanze, chat e informazioni sulla stanza</value>
    <value key="KDE::windows_store::screenshots::1::caption" xml:lang="ka">მთავარი ხედი სურათების სიით, ჩატით და ოთახის ინფორმაციით</value>
+    <value key="KDE::windows_store::screenshots::1::caption" xml:lang="ko">대화방 목록, 채팅, 대화방 정보가 표시된 주 보기</value>
    <value key="KDE::windows_store::screenshots::1::caption" xml:lang="nl">Hoofdweergave met lijst met rooms, chat en roominformatie</value>
+    <value key="KDE::windows_store::screenshots::1::caption" xml:lang="nn">Hovudvising med romliste, pratevindauge og rominformasjon</value>
    <value key="KDE::windows_store::screenshots::1::caption" xml:lang="pt">A área principal com a lista de salas e com informações sobre a conversa e a sala</value>
    <value key="KDE::windows_store::screenshots::1::caption" xml:lang="sl">Glavni pogled s seznamom sob, klepetom in informacijami o sobah</value>
+    <value key="KDE::windows_store::screenshots::1::caption" xml:lang="sv">Huvudvy med rumslista, chatt, och rumsinformation</value>
+    <value key="KDE::windows_store::screenshots::1::caption" xml:lang="ta">அரங்குப்பட்டியல், உரையாடல், மற்றும் அரங்குவிவரங்களைக் கொண்டுள்ள பிரதான காட்சி</value>
    <value key="KDE::windows_store::screenshots::1::caption" xml:lang="tr">Oda listesini, sohbet penceresini ve oda bilgisini gösteren ana görünüm</value>
    <value key="KDE::windows_store::screenshots::1::caption" xml:lang="uk">Головна панель із списком кімнат, спілкуванням та даними щодо кімнати</value>
    <value key="KDE::windows_store::screenshots::1::caption" xml:lang="x-test">xxMain view with room list, chat, and room informationxx</value>
@@ -279,11 +306,19 @@ to provide a convergent experience across multiple platforms.</p>
    <value key="KDE::windows_store::screenshots::2::caption" xml:lang="ca">Pantalla d'inici de sessió</value>
    <value key="KDE::windows_store::screenshots::2::caption" xml:lang="ca-valencia">Pantalla d'inici de sessió</value>
    <value key="KDE::windows_store::screenshots::2::caption" xml:lang="es">Pantalla de inicio de sesión</value>
+    <value key="KDE::windows_store::screenshots::2::caption" xml:lang="eu">Saio-hasteko pantaila</value>
    <value key="KDE::windows_store::screenshots::2::caption" xml:lang="fr">Écran de connexion</value>
+    <value key="KDE::windows_store::screenshots::2::caption" xml:lang="gl">Pantalla de identificación.</value>
+    <value key="KDE::windows_store::screenshots::2::caption" xml:lang="ia">Schermo de accesso</value>
+    <value key="KDE::windows_store::screenshots::2::caption" xml:lang="it">Schermata di accesso</value>
    <value key="KDE::windows_store::screenshots::2::caption" xml:lang="ka">შესვლის ეკრანი</value>
+    <value key="KDE::windows_store::screenshots::2::caption" xml:lang="ko">로그인 화면</value>
    <value key="KDE::windows_store::screenshots::2::caption" xml:lang="nl">Aanmeldscherm</value>
+    <value key="KDE::windows_store::screenshots::2::caption" xml:lang="nn">Innloggingsbilete</value>
    <value key="KDE::windows_store::screenshots::2::caption" xml:lang="pt">Ecrã de autenticação</value>
    <value key="KDE::windows_store::screenshots::2::caption" xml:lang="sl">Prijavni zaslon</value>
+    <value key="KDE::windows_store::screenshots::2::caption" xml:lang="sv">Inloggningsfönster</value>
+    <value key="KDE::windows_store::screenshots::2::caption" xml:lang="ta">நுழைவுத் திரை</value>
    <value key="KDE::windows_store::screenshots::2::caption" xml:lang="tr">Oturum açma ekranı</value>
    <value key="KDE::windows_store::screenshots::2::caption" xml:lang="uk">Вікно входу</value>
    <value key="KDE::windows_store::screenshots::2::caption" xml:lang="x-test">xxLogin screenxx</value>
--- a/org.kde.neochat.desktop
+++ b/org.kde.neochat.desktop
@@ -93,7 +93,7 @@ Comment[es]=Cliente para el protocolo Matrix
 Comment[eu]=Matrix protokolorako bezeroa
 Comment[fi]=Asiakas Matrix-yhteyskäytännölle
 Comment[fr]=Client pour le protocole « Matrix »
-Comment[gl]=Cliente para o protocolo Matrix
+Comment[gl]=Cliente para o protocolo Matrix.
 Comment[hu]=Kliens a Matrix protokollhoz
 Comment[ia]=Cliente per le protocollo de Matrix
 Comment[id]=Klien untuk protokol Matrix
--- a/po/ar/neochat.po
+++ b/po/ar/neochat.po
--- a/po/az/neochat.po
+++ b/po/az/neochat.po
--- a/po/ca/neochat.po
+++ b/po/ca/neochat.po
--- a/po/ca@valencia/neochat.po
+++ b/po/ca@valencia/neochat.po
--- a/po/cs/neochat.po
+++ b/po/cs/neochat.po
--- a/po/da/neochat.po
+++ b/po/da/neochat.po
--- a/po/de/neochat.po
+++ b/po/de/neochat.po
--- a/po/el/neochat.po
+++ b/po/el/neochat.po
--- a/po/en_GB/neochat.po
+++ b/po/en_GB/neochat.po
--- a/po/es/neochat.po
+++ b/po/es/neochat.po
--- a/po/eu/neochat.po
+++ b/po/eu/neochat.po
--- a/po/fi/neochat.po
+++ b/po/fi/neochat.po
--- a/po/fr/neochat.po
+++ b/po/fr/neochat.po
--- a/po/hu/neochat.po
+++ b/po/hu/neochat.po
--- a/po/ia/neochat.po
+++ b/po/ia/neochat.po
--- a/po/id/neochat.po
+++ b/po/id/neochat.po
--- a/po/ie/neochat.po
+++ b/po/ie/neochat.po
--- a/po/it/neochat.po
+++ b/po/it/neochat.po
--- a/po/ja/neochat.po
+++ b/po/ja/neochat.po
--- a/po/ka/neochat.po
+++ b/po/ka/neochat.po
--- a/po/ko/neochat.po
+++ b/po/ko/neochat.po
--- a/po/lt/neochat.po
+++ b/po/lt/neochat.po
--- a/po/nl/neochat.po
+++ b/po/nl/neochat.po
--- a/po/nn/neochat.po
+++ b/po/nn/neochat.po
--- a/po/pa/neochat.po
+++ b/po/pa/neochat.po
--- a/po/pl/neochat.po
+++ b/po/pl/neochat.po
--- a/po/pt/neochat.po
+++ b/po/pt/neochat.po
--- a/po/pt_BR/neochat.po
+++ b/po/pt_BR/neochat.po
--- a/po/ru/neochat.po
+++ b/po/ru/neochat.po
--- a/po/sk/neochat.po
+++ b/po/sk/neochat.po
--- a/po/sl/neochat.po
+++ b/po/sl/neochat.po
--- a/po/sv/neochat.po
+++ b/po/sv/neochat.po
--- a/po/ta/neochat.po
+++ b/po/ta/neochat.po
--- a/po/tok/neochat.po
+++ b/po/tok/neochat.po
--- a/po/tr/neochat.po
+++ b/po/tr/neochat.po
--- a/po/uk/neochat.po
+++ b/po/uk/neochat.po
--- a/po/zh_CN/neochat.po
+++ b/po/zh_CN/neochat.po
--- a/po/zh_TW/neochat.po
+++ b/po/zh_TW/neochat.po
--- a/src/chatdocumenthandler.cpp
+++ b/src/chatdocumenthandler.cpp
@@ -218,8 +218,8 @@ void ChatDocumentHandler::setRoom(NeoChatRoom *room)
 void ChatDocumentHandler::complete(int index)
 {
    if (m_completionModel->autoCompletionType() == CompletionModel::User) {
-        auto name = m_completionModel->data(m_completionModel->index(index, 0), CompletionModel::Text).toString();
-        auto id = m_completionModel->data(m_completionModel->index(index, 0), CompletionModel::Subtitle).toString();
+        auto name = m_completionModel->data(m_completionModel->index(index, 0), CompletionModel::DisplayNameRole).toString();
+        auto id = m_completionModel->data(m_completionModel->index(index, 0), CompletionModel::SubtitleRole).toString();
        auto text = getText();
        auto at = text.lastIndexOf(QLatin1Char('@'), cursorPosition() - 1);
        QTextCursor cursor(document()->textDocument());
@@ -232,7 +232,7 @@ void ChatDocumentHandler::complete(int index)
        pushMention({cursor, name, 0, 0, id});
        m_highlighter->rehighlight();
    } else if (m_completionModel->autoCompletionType() == CompletionModel::Command) {
-        auto command = m_completionModel->data(m_completionModel->index(index, 0), CompletionModel::ReplacedText).toString();
+        auto command = m_completionModel->data(m_completionModel->index(index, 0), CompletionModel::ReplacedTextRole).toString();
        auto text = getText();
        auto at = text.lastIndexOf(QLatin1Char('/'));
        QTextCursor cursor(document()->textDocument());
@@ -240,7 +240,7 @@ void ChatDocumentHandler::complete(int index)
        cursor.setPosition(cursorPosition(), QTextCursor::KeepAnchor);
        cursor.insertText(QStringLiteral("/%1 ").arg(command));
    } else if (m_completionModel->autoCompletionType() == CompletionModel::Room) {
-        auto alias = m_completionModel->data(m_completionModel->index(index, 0), CompletionModel::Subtitle).toString();
+        auto alias = m_completionModel->data(m_completionModel->index(index, 0), CompletionModel::SubtitleRole).toString();
        auto text = getText();
        auto at = text.lastIndexOf(QLatin1Char('#'), cursorPosition() - 1);
        QTextCursor cursor(document()->textDocument());
@@ -253,7 +253,7 @@ void ChatDocumentHandler::complete(int index)
        pushMention({cursor, alias, 0, 0, alias});
        m_highlighter->rehighlight();
    } else if (m_completionModel->autoCompletionType() == CompletionModel::Emoji) {
-        auto shortcode = m_completionModel->data(m_completionModel->index(index, 0), CompletionModel::ReplacedText).toString();
+        auto shortcode = m_completionModel->data(m_completionModel->index(index, 0), CompletionModel::ReplacedTextRole).toString();
        auto text = getText();
        auto at = text.lastIndexOf(QLatin1Char(':'));
        QTextCursor cursor(document()->textDocument());
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -185,8 +185,10 @@ int main(int argc, char *argv[])
    initLogging();

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

 #ifdef NEOCHAT_FLATPAK
    // Copy over the included FontConfig configuration to the
--- a/src/matriximageprovider.cpp
+++ b/src/matriximageprovider.cpp
@@ -32,11 +32,17 @@ ThumbnailResponse::ThumbnailResponse(QString id, QSize size)
        requestedSize.setWidth(100);
    }
    if (mediaId.count('/') != 1) {
-        errorStr = i18n("Media id '%1' doesn't follow server/mediaId pattern", mediaId);
-        Q_EMIT finished();
-        return;
+        if (mediaId.startsWith(QLatin1Char('/'))) {
+            mediaId = mediaId.mid(1);
+        } else {
+            errorStr = i18n("Media id '%1' doesn't follow server/mediaId pattern", mediaId);
+            Q_EMIT finished();
+            return;
+        }
    }

+    mediaId = mediaId.split(QLatin1Char('?'))[0];
+
    QImage cachedImage;
    if (cachedImage.load(localFile)) {
        image = cachedImage;
--- a/src/matriximageprovider.h
+++ b/src/matriximageprovider.h
@@ -34,7 +34,7 @@ private Q_SLOTS:
    void prepareResult();

 private:
-    const QString mediaId;
+    QString mediaId;
    QSize requestedSize;
    const QString localFile;
    Quotient::MediaThumbnailJob *job = nullptr;
--- a/src/models/collapsestateproxymodel.cpp
+++ b/src/models/collapsestateproxymodel.cpp
@@ -81,7 +81,7 @@ QString CollapseStateProxyModel::aggregateEventToString(int sourceRow) const
                                                      : QStringLiteral("<a href=\"https://matrix.to/#/%1\" style=\"color: %2\">%3</a> ")
                                                            .arg(uniqueAuthors[0].toMap()["id"].toString(),
                                                                 uniqueAuthors[0].toMap()["color"].toString(),
-                                                                 uniqueAuthors[0].toMap()["displayName"].toString());
+                                                                 uniqueAuthors[0].toMap()["displayName"].toString().toHtmlEscaped());
        text += userText;
        text += chunks.takeFirst();

--- a/src/models/completionmodel.cpp
+++ b/src/models/completionmodel.cpp
@@ -53,54 +53,54 @@ QVariant CompletionModel::data(const QModelIndex &index, int role) const
    }
    auto filterIndex = m_filterModel->index(index.row(), 0);
    if (m_autoCompletionType == User) {
-        if (role == Text) {
+        if (role == DisplayNameRole) {
            return m_filterModel->data(filterIndex, UserListModel::DisplayNameRole);
        }
-        if (role == Subtitle) {
+        if (role == SubtitleRole) {
            return m_filterModel->data(filterIndex, UserListModel::UserIdRole);
        }
-        if (role == Icon) {
+        if (role == IconNameRole) {
            return m_filterModel->data(filterIndex, UserListModel::AvatarRole);
        }
    }

    if (m_autoCompletionType == Command) {
-        if (role == Text) {
+        if (role == DisplayNameRole) {
            return m_filterModel->data(filterIndex, ActionsModel::Prefix).toString() + QStringLiteral(" ")
                + m_filterModel->data(filterIndex, ActionsModel::Parameters).toString();
        }
-        if (role == Subtitle) {
+        if (role == SubtitleRole) {
            return m_filterModel->data(filterIndex, ActionsModel::Description);
        }
-        if (role == Icon) {
+        if (role == IconNameRole) {
            return QStringLiteral("invalid");
        }
-        if (role == ReplacedText) {
+        if (role == ReplacedTextRole) {
            return m_filterModel->data(filterIndex, ActionsModel::Prefix);
        }
    }
    if (m_autoCompletionType == Room) {
-        if (role == Text) {
+        if (role == DisplayNameRole) {
            return m_filterModel->data(filterIndex, RoomListModel::DisplayNameRole);
        }
-        if (role == Subtitle) {
+        if (role == SubtitleRole) {
            return m_filterModel->data(filterIndex, RoomListModel::CanonicalAliasRole);
        }
-        if (role == Icon) {
+        if (role == IconNameRole) {
            return m_filterModel->data(filterIndex, RoomListModel::AvatarRole);
        }
    }
    if (m_autoCompletionType == Emoji) {
-        if (role == Text) {
+        if (role == DisplayNameRole) {
            return m_filterModel->data(filterIndex, CustomEmojiModel::DisplayRole);
        }
-        if (role == Icon) {
+        if (role == IconNameRole) {
            return m_filterModel->data(filterIndex, CustomEmojiModel::MxcUrl);
        }
-        if (role == ReplacedText) {
+        if (role == ReplacedTextRole) {
            return m_filterModel->data(filterIndex, CustomEmojiModel::ReplacedTextRole);
        }
-        if (role == Subtitle) {
+        if (role == SubtitleRole) {
            return m_filterModel->data(filterIndex, EmojiModel::DescriptionRole);
        }
    }
@@ -111,10 +111,10 @@ QVariant CompletionModel::data(const QModelIndex &index, int role) const
 QHash<int, QByteArray> CompletionModel::roleNames() const
 {
    return {
-        {Text, "text"},
-        {Subtitle, "subtitle"},
-        {Icon, "icon"},
-        {ReplacedText, "replacedText"},
+        {DisplayNameRole, "displayName"},
+        {SubtitleRole, "subtitle"},
+        {IconNameRole, "iconName"},
+        {ReplacedTextRole, "replacedText"},
    };
 }

--- a/src/models/completionmodel.h
+++ b/src/models/completionmodel.h
@@ -64,10 +64,10 @@ public:
     * @brief Defines the model roles.
     */
    enum Roles {
-        Text = Qt::DisplayRole, /**< The main text to show. */
-        Subtitle, /**< The subtitle text to show. */
-        Icon, /**< The icon to show. */
-        ReplacedText, /**< The text to replace the input text with for the completion. */
+        DisplayNameRole = Qt::DisplayRole, /**< The main text to show. */
+        SubtitleRole, /**< The subtitle text to show. */
+        IconNameRole, /**< The icon to show. */
+        ReplacedTextRole, /**< The text to replace the input text with for the completion. */
    };
    Q_ENUM(Roles)

--- a/src/models/devicesmodel.cpp
+++ b/src/models/devicesmodel.cpp
@@ -5,6 +5,9 @@

 #include "controller.h"

+#include <QDateTime>
+#include <QLocale>
+
 #include <KLocalizedString>

 #include <Quotient/csapi/device_management.h>
@@ -52,10 +55,17 @@ QVariant DevicesModel::data(const QModelIndex &index, int role) const
        } else {
            return false;
        }
+    case TimestampString:
+        if (device.lastSeenTs) {
+            return QDateTime::fromMSecsSinceEpoch(*device.lastSeenTs).toString(QLocale().dateTimeFormat(QLocale::ShortFormat));
+        } else {
+            return false;
+        }
    case Type:
        if (device.deviceId == m_connection->deviceId()) {
            return This;
        }
+#ifdef Quotient_E2EE_ENABLED
        if (!m_connection->isKnownE2eeCapableDevice(m_connection->userId(), device.deviceId)) {
            return Unencrypted;
        }
@@ -64,6 +74,9 @@ QVariant DevicesModel::data(const QModelIndex &index, int role) const
        } else {
            return Unverified;
        }
+#else
+        return Unverified;
+#endif
    }
    return {};
 }
@@ -81,6 +94,7 @@ QHash<int, QByteArray> DevicesModel::roleNames() const
        {DisplayName, "displayName"},
        {LastIp, "lastIp"},
        {LastTimestamp, "lastTimestamp"},
+        {TimestampString, "timestamp"},
        {Type, "type"},
    };
 }
@@ -147,6 +161,7 @@ void DevicesModel::setConnection(Connection *connection)
    Q_EMIT connectionChanged();
    fetchDevices();

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

 #include "moc_devicesmodel.cpp"
--- a/src/models/devicesmodel.h
+++ b/src/models/devicesmodel.h
@@ -40,6 +40,7 @@ public:
        DisplayName, /**< Display name set by the user for this device. */
        LastIp, /**< The IP address where this device was last seen. */
        LastTimestamp, /**< The timestamp when this devices was last seen. */
+        TimestampString, /**< String for the timestamp when this devices was last seen. */
        Type, /**< The category to sort this device into. */
    };
    Q_ENUM(Roles)
--- a/src/models/roomlistmodel.cpp
+++ b/src/models/roomlistmodel.cpp
@@ -338,7 +338,7 @@ QVariant RoomListModel::data(const QModelIndex &index, int role) const
    if (role == AvatarImageRole) {
        return room->avatar(128);
    }
-    if (role == IdRole) {
+    if (role == RoomIdRole) {
        return room->id();
    }
    if (role == IsSpaceRole) {
@@ -379,7 +379,7 @@ QHash<int, QByteArray> RoomListModel::roleNames() const
    roles[CategoryVisibleRole] = "categoryVisible";
    roles[SubtitleTextRole] = "subtitleText";
    roles[IsSpaceRole] = "isSpace";
-    roles[IdRole] = "id";
+    roles[RoomIdRole] = "roomId";
    roles[IsChildSpaceRole] = "isChildSpace";
    return roles;
 }
--- a/src/models/roomlistmodel.h
+++ b/src/models/roomlistmodel.h
@@ -72,7 +72,7 @@ public:
        CategoryVisibleRole, /**< If the room's category is visible. */
        SubtitleTextRole, /**< The text to show as the room subtitle. */
        AvatarImageRole, /**< The room avatar as an image. */
-        IdRole, /**< The room matrix ID. */
+        RoomIdRole, /**< The room matrix ID. */
        IsSpaceRole, /**< Whether the room is a space. */
        IsChildSpaceRole, /**< Whether this space is a child of a different space. */
    };
--- a/src/models/sortfilterroomlistmodel.cpp
+++ b/src/models/sortfilterroomlistmodel.cpp
@@ -87,7 +87,8 @@ bool SortFilterRoomListModel::filterAcceptsRow(int source_row, const QModelIndex
        return acceptRoom;
    } else {
        const auto &rooms = SpaceHierarchyCache::instance().getRoomListForSpace(m_activeSpaceId, false);
-        return std::find(rooms.begin(), rooms.end(), sourceModel()->data(sourceModel()->index(source_row, 0), RoomListModel::IdRole).toString()) != rooms.end()
+        return std::find(rooms.begin(), rooms.end(), sourceModel()->data(sourceModel()->index(source_row, 0), RoomListModel::RoomIdRole).toString())
+            != rooms.end()
            && acceptRoom;
    }
 }
--- a/src/models/sortfilterspacelistmodel.cpp
+++ b/src/models/sortfilterspacelistmodel.cpp
@@ -8,7 +8,7 @@
 SortFilterSpaceListModel::SortFilterSpaceListModel(QObject *parent)
    : QSortFilterProxyModel{parent}
 {
-    setSortRole(RoomListModel::IdRole);
+    setSortRole(RoomListModel::RoomIdRole);
    sort(0);
    invalidateFilter();
    connect(this, &QAbstractProxyModel::sourceModelChanged, this, [this]() {
@@ -33,8 +33,8 @@ bool SortFilterSpaceListModel::filterAcceptsRow(int source_row, const QModelInde

 bool SortFilterSpaceListModel::lessThan(const QModelIndex &source_left, const QModelIndex &source_right) const
 {
-    const auto idLeft = sourceModel()->data(source_left, RoomListModel::IdRole).toString();
-    const auto idRight = sourceModel()->data(source_right, RoomListModel::IdRole).toString();
+    const auto idLeft = sourceModel()->data(source_left, RoomListModel::RoomIdRole).toString();
+    const auto idRight = sourceModel()->data(source_right, RoomListModel::RoomIdRole).toString();
    return idLeft < idRight;
 }

--- a/src/models/userdirectorylistmodel.cpp
+++ b/src/models/userdirectorylistmodel.cpp
@@ -144,7 +144,7 @@ QVariant UserDirectoryListModel::data(const QModelIndex &index, int role) const
        auto avatarUrl = user.avatarUrl;

        if (avatarUrl.isEmpty()) {
-            return "";
+            return QString();
        }
        return avatarUrl.url().remove(0, 6);
    }
@@ -153,7 +153,7 @@ QVariant UserDirectoryListModel::data(const QModelIndex &index, int role) const
    }
    if (role == DirectChatsRole) {
        if (!m_connection) {
-            return {};
+            return QStringList();
        };

        auto userObj = m_connection->user(user.userId);
@@ -165,6 +165,8 @@ QVariant UserDirectoryListModel::data(const QModelIndex &index, int role) const
                return QVariant::fromValue(directChatsForUser);
            }
        }
+
+        return QStringList();
    }

    return {};
--- a/src/neochat.notifyrc
+++ b/src/neochat.notifyrc
@@ -54,7 +54,7 @@ Comment[es]=Un cliente para Matrix, el protocolo de comunicaciones descentraliza
 Comment[eu]=Matrix, deszentralizatutako komunikazio protokolorako, bezero bat
 Comment[fi]=Hajautetun Matrix-viestintäyhteyskäytännön asiakasohjelma
 Comment[fr]=Un client pour « Matrix », le protocole décentralisé de communications.
-Comment[gl]=Un cliente para Matrix, o protocolo de comunicación descentralizada
+Comment[gl]=Un cliente para Matrix, o protocolo de comunicación descentralizada.
 Comment[hu]=Kliens a matrixhoz, a decentralizált kommunikációs protokollhoz
 Comment[ia]=Un cliente per Matrix, le protocollo de communication decentralisate
 Comment[id]=Sebuah klien untuk matrix, protokol komunikasi terdecentralisasi
@@ -133,7 +133,7 @@ Comment[es]=Hay un mensaje nuevo
 Comment[eu]=Mezu berri bat dago
 Comment[fi]=Saapui uusi viesti
 Comment[fr]=Il y a un nouveau message
-Comment[gl]=Hai unha nova mensaxe
+Comment[gl]=Hai unha nova mensaxe.
 Comment[hu]=Új üzenet érkezett
 Comment[ia]=Il ha un nove message
 Comment[id]=Ada pesan baru
@@ -209,7 +209,7 @@ 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[gl]=Tes un novo convite para unha sala
+Comment[gl]=Tes un novo convite para unha sala.
 Comment[ia]=Il ha un nove invitation a un sala
 Comment[id]=Ada undangan baru ke sebuah ruangan
 Comment[ie]=Vu have un nov invitation a un chambre
--- a/src/neochatroom.cpp
+++ b/src/neochatroom.cpp
@@ -993,7 +993,7 @@ void NeoChatRoom::deleteMessagesByUser(const QString &user, const QString &reaso
 QString NeoChatRoom::joinRule() const
 {
    auto joinRulesEvent = currentState().get<JoinRulesEvent>();
-    if (joinRulesEvent) {
+    if (!joinRulesEvent) {
        return {};
    }
    return joinRulesEvent->joinRule();
@@ -1941,7 +1941,7 @@ QByteArray NeoChatRoom::roomAcountDataJson(const QString &eventType)
 QUrl NeoChatRoom::avatarForMember(NeoChatUser *user) const
 {
    const auto &url = memberAvatarUrl(user->id());
-    if (url.isEmpty()) {
+    if (url.isEmpty() || url.scheme() != "mxc"_ls) {
        return {};
    }
    auto avatar = connection()->makeMediaUrl(url);
--- a/src/notificationsmanager.cpp
+++ b/src/notificationsmanager.cpp
@@ -11,6 +11,7 @@
 #include <KNotification>
 #include <KNotificationReplyAction>

+#include <QPainter>
 #include <Quotient/accountregistry.h>
 #include <Quotient/connection.h>
 #include <Quotient/csapi/pushrules.h>
@@ -203,7 +204,7 @@ void NotificationsManager::postNotification(NeoChatRoom *room,
    }

    notification->setText(notification->text() + '\n' + entry);
-    notification->setPixmap(QPixmap::fromImage(icon));
+    notification->setPixmap(createNotificationImage(icon, room));

    notification->setDefaultAction(i18n("Open NeoChat in this room"));
    connect(notification, &KNotification::defaultActivated, this, [notification, room]() {
@@ -239,7 +240,7 @@ void NotificationsManager::postInviteNotification(NeoChatRoom *room, const QStri
    KNotification *notification = new KNotification("invite");
    notification->setText(i18n("%1 invited you to a room", sender));
    notification->setTitle(title);
-    notification->setPixmap(img);
+    notification->setPixmap(createNotificationImage(icon, nullptr));
    notification->setFlags(KNotification::Persistent);
    notification->setDefaultAction(i18n("Open this invitation in NeoChat"));
    connect(notification, &KNotification::defaultActivated, this, [notification, room]() {
@@ -282,4 +283,33 @@ void NotificationsManager::clearInvitationNotification(const QString &roomId)
    }
 }

+QPixmap NotificationsManager::createNotificationImage(const QImage &icon, NeoChatRoom *room)
+{
+    // Handle avatars that are lopsided in one dimension
+    const int biggestDimension = std::max(icon.width(), icon.height());
+    const QRect imageRect{0, 0, biggestDimension, biggestDimension};
+
+    QImage roundedImage(imageRect.size(), QImage::Format_ARGB32);
+    roundedImage.fill(Qt::transparent);
+
+    QPainter painter(&roundedImage);
+    painter.setRenderHint(QPainter::Antialiasing);
+
+    QBrush brush(icon.scaledToHeight(biggestDimension));
+    painter.setBrush(brush);
+    painter.drawRoundedRect(imageRect, imageRect.width(), imageRect.height());
+
+    if (room != nullptr) {
+        const QImage roomAvatar = room->avatar(imageRect.width(), imageRect.height());
+        if (icon != roomAvatar) {
+            const QRect lowerQuarter{imageRect.center(), imageRect.size() / 2};
+
+            painter.setBrush(roomAvatar.scaled(lowerQuarter.size()));
+            painter.drawRoundedRect(lowerQuarter, lowerQuarter.width(), lowerQuarter.height());
+        }
+    }
+
+    return QPixmap::fromImage(roundedImage);
+}
+
 #include "moc_notificationsmanager.cpp"
--- a/src/notificationsmanager.h
+++ b/src/notificationsmanager.h
@@ -97,4 +97,7 @@ private:

 private Q_SLOTS:
    void processNotificationJob(QPointer<Quotient::Connection> connection, Quotient::GetNotificationsJob *job, bool initialization);
+
+private:
+    QPixmap createNotificationImage(const QImage &icon, NeoChatRoom *room);
 };
--- a/src/plasma-runner-neochat.desktop
+++ b/src/plasma-runner-neochat.desktop
@@ -53,7 +53,7 @@ Comment[es]=Buscar salas en NeoChat
 Comment[eu]=Bilatu gelak NeoChat-en
 Comment[fi]=Etsi huoneita NeoChatissä
 Comment[fr]=Trouver des salons dans NeoChat
-Comment[gl]=Atopa salas en NeoChat
+Comment[gl]=Atopa salas en NeoChat.
 Comment[ia]=Trova salas in NeoChat
 Comment[id]=Cari ruangan di NeoChat
 Comment[ie]=Trovar chambres in NeoChat
--- a/src/qml/Component/AvatarTabButton.qml
+++ b/src/qml/Component/AvatarTabButton.qml
@@ -6,185 +6,33 @@ import QtQuick 2.15
 import QtQuick.Layouts 1.15
 import QtQuick.Controls 2.15 as QQC2
 import QtQuick.Templates 2.15 as T
-import org.kde.kirigami 2.19 as Kirigami
+import org.kde.kirigami 2.20 as Kirigami
+import org.kde.kirigamiaddons.delegates 1.0 as Delegates
+import org.kde.kirigamiaddons.labs.components 1.0 as KirigamiComponents

-T.TabButton {
-    id: control
+Delegates.RoundedItemDelegate {
+    id: root

-    /**
-     * @brief This property specifies the index of this tab within the tab bar.
-     */
-    readonly property int tabIndex: {
-        let tabIdx = 0
-        for (let i = 0; i < parent.children.length; ++i) {
-            if (parent.children[i] === this) {
-                return tabIdx
-            }
-            // Checking for AbstractButtons because any AbstractButton can act as a tab
-            if (parent.children[i] instanceof T.AbstractButton) {
-                ++tabIdx
-            }
-        }
-        return -1
+    required property url source
+
+    signal contextMenuRequested()
+
+    padding: Kirigami.Units.largeSpacing
+
+    QQC2.ToolTip.visible: hovered
+    QQC2.ToolTip.text: text
+    QQC2.ToolTip.delay: Kirigami.Units.toolTipDelay
+
+    onPressAndHold: root.contextMenuRequested()
+
+    TapHandler {
+        acceptedButtons: Qt.RightButton
+        acceptedDevices: PointerDevice.Mouse
+        onTapped: root.contextMenuRequested()
    }

-    /**
-     * @brief This property sets whether the icon colors should be masked with a single color.
-     *
-     * default: ``true``
-     *
-     * @since KDE Frameworks 5.96
-     */
-    property bool recolorIcon: true
-
-    property color foregroundColor: Qt.rgba(Kirigami.Theme.textColor.r, Kirigami.Theme.textColor.g, Kirigami.Theme.textColor.b, 0.85)
-    property color highlightForegroundColor: Qt.rgba(Kirigami.Theme.textColor.r, Kirigami.Theme.textColor.g, Kirigami.Theme.textColor.b, 0.85)
-    property color highlightBarColor: Kirigami.Theme.highlightColor
-
-    property color pressedColor: Qt.rgba(highlightBarColor.r, highlightBarColor.g, highlightBarColor.b, 0.3)
-    property color hoverSelectColor: Qt.rgba(highlightBarColor.r, highlightBarColor.g, highlightBarColor.b, 0.2)
-    property color checkedBorderColor: Qt.rgba(highlightBarColor.r, highlightBarColor.g, highlightBarColor.b, 0.7)
-    property color pressedBorderColor: Qt.rgba(highlightBarColor.r, highlightBarColor.g, highlightBarColor.b, 0.9)
-
-    property url source
-    property string name
-
-    implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset,
-        implicitContentWidth + leftPadding + rightPadding)
-    implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset,
-        implicitContentHeight + topPadding + bottomPadding)
-
-    display: T.AbstractButton.TextUnderIcon
-
-    Kirigami.Theme.colorSet: Kirigami.Theme.Window
-    Kirigami.Theme.inherit: false
-
-    // not using the hover handler built into control, since it seems to misbehave and
-    // permanently report hovered after a touch event
-    HoverHandler {
-        id: hoverHandler
-    }
-
-    padding: Kirigami.Units.smallSpacing
-    spacing: Kirigami.Units.smallSpacing
-
-    icon.height: control.display === T.AbstractButton.TextBesideIcon ? Kirigami.Units.iconSizes.small : Kirigami.Units.iconSizes.smallMedium
-    icon.width: control.display === T.AbstractButton.TextBesideIcon ? Kirigami.Units.iconSizes.small : Kirigami.Units.iconSizes.smallMedium
-    icon.color: control.checked ? control.highlightForegroundColor : control.foregroundColor
-
-    background: Rectangle {
-        Kirigami.Theme.colorSet: Kirigami.Theme.Button
-        Kirigami.Theme.inherit: false
-
-        implicitHeight: (control.display === T.AbstractButton.TextBesideIcon) ? 0 : (Kirigami.Units.gridUnit * 3 + Kirigami.Units.smallSpacing * 2)
-
-        color: "transparent"
-
-        Rectangle {
-            width: parent.width - Kirigami.Units.largeSpacing
-            height: parent.height - Kirigami.Units.largeSpacing
-            anchors.centerIn: parent
-
-            radius: Kirigami.Units.smallSpacing
-            color: control.down ? pressedColor : (control.checked || hoverHandler.hovered ? hoverSelectColor : "transparent")
-
-            border.color: control.checked ? checkedBorderColor : (control.down ? pressedBorderColor : color)
-            border.width: 1
-
-            Behavior on color { ColorAnimation { duration: Kirigami.Units.shortDuration } }
-            Behavior on border.color { ColorAnimation { duration: Kirigami.Units.shortDuration } }
-        }
-    }
-
-    contentItem: GridLayout {
-        id: gridLayout
-        columnSpacing: 0
-        rowSpacing: (label.visible && label.lineCount > 1) ? 0 : control.spacing
-
-        // if this is a row or a column
-        columns: control.display !== T.AbstractButton.TextBesideIcon ? 1 : 2
-
-        property real verticalMargins: (control.display === T.AbstractButton.TextBesideIcon) ? Kirigami.Units.largeSpacing : 0
-
-        Kirigami.Avatar {
-            id: icon
-            source: control.source
-            name: control.name
-            Layout.topMargin: gridLayout.verticalMargins
-            Layout.bottomMargin: gridLayout.verticalMargins
-            Layout.leftMargin: (control.display === T.AbstractButton.TextBesideIcon) ? Kirigami.Units.gridUnit : 0
-            Layout.rightMargin: (control.display === T.AbstractButton.TextBesideIcon) ? Kirigami.Units.gridUnit : 0
-
-            Layout.alignment: {
-                if (control.display === T.AbstractButton.TextBesideIcon) {
-                    // row layout
-                    return Qt.AlignVCenter | Qt.AlignRight;
-                } else {
-                    // column layout
-                    return Qt.AlignHCenter | ((!label.visible || label.lineCount > 1) ? Qt.AlignVCenter : Qt.AlignBottom);
-                }
-            }
-            Layout.preferredWidth: Kirigami.Units.iconSizes.medium
-            Layout.preferredHeight: Kirigami.Units.iconSizes.medium
-        }
-        QQC2.Label {
-            id: label
-            Kirigami.MnemonicData.enabled: control.enabled && control.visible
-            Kirigami.MnemonicData.controlType: Kirigami.MnemonicData.MenuItem
-            Kirigami.MnemonicData.label: control.text
-
-            text: Kirigami.MnemonicData.richTextLabel
-            horizontalAlignment: (control.display === T.AbstractButton.TextBesideIcon) ? Text.AlignLeft : Text.AlignHCenter
-
-            visible: control.display !== T.AbstractButton.IconOnly
-            wrapMode: Text.Wrap
-            elide: Text.ElideMiddle
-            color: control.checked ? control.highlightForegroundColor : control.foregroundColor
-
-            font.bold: control.checked
-            font.family: Kirigami.Theme.smallFont.family
-            font.pointSize: {
-                if (control.display === T.AbstractButton.TextBesideIcon) {
-                    // row layout
-                    return Kirigami.Theme.defaultFont.pointSize;
-                } else {
-                    // column layout
-                    return icon.visible ? Kirigami.Theme.smallFont.pointSize : Kirigami.Theme.defaultFont.pointSize * 1.20; // 1.20 is equivalent to level 2 heading
-                }
-            }
-
-            Behavior on color { ColorAnimation {} }
-            Behavior on opacity { NumberAnimation {} }
-
-            Layout.topMargin: gridLayout.verticalMargins
-            Layout.bottomMargin: gridLayout.verticalMargins
-
-            Layout.alignment: {
-                if (control.display === T.AbstractButton.TextBesideIcon) {
-                    // row layout
-                    return Qt.AlignVCenter | Qt.AlignLeft;
-                } else {
-                    // column layout
-                    return icon.visible ? Qt.AlignHCenter | Qt.AlignTop : Qt.AlignCenter;
-                }
-            }
-
-            // Work around bold text changing implicit size
-            Layout.preferredWidth: boldMetrics.implicitWidth
-            Layout.preferredHeight: boldMetrics.implicitHeight * label.lineCount
-            Layout.fillWidth: true
-
-            QQC2.Label {
-                id: boldMetrics
-                visible: false
-                text: parent.text
-                font.bold: true
-                font.family: Kirigami.Theme.smallFont.family
-                font.pointSize: Kirigami.Theme.smallFont.pointSize
-                horizontalAlignment: Text.AlignHCenter
-                wrapMode: QQC2.Label.Wrap
-                elide: Text.ElideMiddle
-            }
-        }
+    contentItem: KirigamiComponents.Avatar {
+        source: root.source
+        name: root.text
    }
 }
--- a/src/qml/Component/ChatBox/ChatBox.qml
+++ b/src/qml/Component/ChatBox/ChatBox.qml
@@ -56,15 +56,6 @@ ColumnLayout {
    Kirigami.Theme.colorSet: Kirigami.Theme.View
    Kirigami.Theme.inherit: false

-    Kirigami.InlineMessage {
-        Layout.fillWidth: true
-        Layout.leftMargin: 1 // So we can see the border
-        Layout.rightMargin: 1 // So we can see the border
-
-        text: i18n("NeoChat is offline. Please check your network connection.")
-        visible: !Controller.isOnline
-    }
-
    Kirigami.Separator {
        Layout.fillWidth: true
    }
--- a/src/qml/Component/ChatBox/CompletionMenu.qml
+++ b/src/qml/Component/ChatBox/CompletionMenu.qml
@@ -8,6 +8,8 @@ import QtQuick.Controls 2.15 as QQC2
 import Qt.labs.qmlmodels 1.0

 import org.kde.kirigami 2.15 as Kirigami
+import org.kde.kirigamiaddons.delegates 1.0 as Delegates
+import org.kde.kirigamiaddons.labs.components 1.0 as KirigamiComponents

 import org.kde.neochat 1.0

@@ -43,6 +45,7 @@ QQC2.Popup {
    rightPadding: 0
    topPadding: 0
    bottomPadding: 0
+
    implicitHeight: Math.min(completions.contentHeight, Kirigami.Units.gridUnit * 10)

    contentItem: ListView {
@@ -53,23 +56,35 @@ QQC2.Popup {
        currentIndex: 0
        keyNavigationWraps: true
        highlightMoveDuration: 100
-        delegate: Kirigami.BasicListItem {
-            text: model.text
-            subtitle: model.subtitle ?? ""
-            labelItem.textFormat: Text.PlainText
-            subtitleItem.textFormat: Text.PlainText
-            leading: RowLayout {
-                Kirigami.Avatar {
-                    visible: model.icon !== "invalid"
-                    Layout.preferredWidth: height
-                    Layout.fillHeight: true
-                    source: model.icon === "invalid" ? "" : ("image://mxc/" + model.icon)
-                    name: model.text
+        delegate: Delegates.RoundedItemDelegate {
+            id: completionDelegate
+
+            required property int index
+            required property string displayName
+            required property string subtitle
+            required property string iconName
+
+            text: displayName
+
+            contentItem: RowLayout {
+                KirigamiComponents.Avatar {
+                    visible: completionDelegate.iconName !== "invalid"
+                    Layout.preferredWidth: Kirigami.Units.iconSizes.medium
+                    Layout.preferredHeight: Kirigami.Units.iconSizes.medium
+                    source: completionDelegate.iconName === "invalid" ? "" : ("image://" + completionDelegate.iconName)
+                    name: completionDelegate.text
+                }
+                Delegates.SubtitleContentItem {
+                    itemDelegate: completionDelegate
+                    labelItem.textFormat: Text.PlainText
+                    subtitle: completionDelegate.subtitle ?? ""
+                    subtitleItem.textFormat: Text.PlainText
                }
            }
-            onClicked: completionMenu.chatDocumentHandler.complete(model.index)
+            onClicked: completionMenu.chatDocumentHandler.complete(completionDelegate.index)
        }
    }
+
    background: Rectangle {
        color: Kirigami.Theme.backgroundColor
    }
--- a/src/qml/Component/ChatBox/ReplyPane.qml
+++ b/src/qml/Component/ChatBox/ReplyPane.qml
@@ -6,7 +6,8 @@ import QtQuick 2.15
 import QtQuick.Layouts 1.15
 import QtQuick.Controls 2.15 as QQC2

-import org.kde.kirigami 2.14 as Kirigami
+import org.kde.kirigami 2.15 as Kirigami
+import org.kde.kirigamiaddons.labs.components 1.0 as KirigamiComponents

 import org.kde.neochat 1.0

@@ -40,7 +41,7 @@ GridLayout {
        implicitWidth: Kirigami.Units.smallSpacing
        color: userColor
    }
-    Kirigami.Avatar {
+    KirigamiComponents.Avatar {
        id: replyAvatar

        implicitWidth: Kirigami.Units.iconSizes.small
--- a/src/qml/Component/LocationMapItem.qml
+++ b/src/qml/Component/LocationMapItem.qml
@@ -9,6 +9,7 @@ import QtLocation 5.15
 import QtPositioning 5.15

 import org.kde.kirigami 2.15 as Kirigami
+import org.kde.kirigamiaddons.labs.components 1.0 as KirigamiComponents

 import org.kde.neochat 1.0

@@ -44,7 +45,7 @@ MapQuickItem {
            isMask: true
            color: parent.color
        }
-        Kirigami.Avatar {
+        KirigamiComponents.Avatar {
            anchors.centerIn: parent
            anchors.verticalCenterOffset: -parent.height / 8
            visible: root.asset === "m.self"
--- a/src/qml/Component/NeochatMaximizeComponent.qml
+++ b/src/qml/Component/NeochatMaximizeComponent.qml
@@ -56,7 +56,7 @@ Components.AlbumMaximizeComponent {
    }

    leading: RowLayout {
-        Kirigami.Avatar {
+        Components.Avatar {
            id: userAvatar
            implicitWidth: Kirigami.Units.iconSizes.medium
            implicitHeight: Kirigami.Units.iconSizes.medium
--- a/src/qml/Component/QuickSwitcher.qml
+++ b/src/qml/Component/QuickSwitcher.qml
@@ -6,9 +6,11 @@ import QtQuick.Controls 2.15 as QQC2
 import QtQuick.Layouts 1.15

 import org.kde.kirigami 2.20 as Kirigami
+import org.kde.kirigamiaddons.delegates 1.0 as Delegates
 import org.kde.kitemmodels 1.0

 import org.kde.neochat 1.0
+import './RoomList' as RoomList

 QQC2.Dialog {
    id: root
@@ -86,48 +88,23 @@ QQC2.Dialog {
                    connection: Controller.activeConnection
                }
            }
-            delegate: Kirigami.BasicListItem {
-                id: roomListItem

-                required property NeoChatRoom currentRoom
-                required property string displayName
-                required property int index
-                required property int notificationCount
-                required property string subtitleText
-                required property string avatar
+            delegate: RoomList.RoomDelegate {
+                filterText: searchField.text

-                topPadding: Kirigami.Units.largeSpacing
-                bottomPadding: Kirigami.Units.largeSpacing
-                highlighted: roomList.currentIndex === roomListItem.index
-                focus: true
-                icon: undefined
                onClicked: {
-                    RoomManager.enterRoom(roomListItem.currentRoom);
+                    RoomManager.enterRoom(currentRoom);
                    root.close()
                }
+
                Keys.onEnterPressed: {
-                    RoomManager.enterRoom(roomListItem.currentRoom);
+                    RoomManager.enterRoom(currentRoom);
                    root.close();
                }
-                Keys.onReturnPressed: {
-                    RoomManager.enterRoom(roomListItem.currentRoom);
-                    root.close();
-                }
-                @BASICLISTITEM_BOLD@: roomListItem.notificationCount > 0
-                label: roomListItem.displayName ?? ""
-                labelItem.textFormat: Text.PlainText
-                subtitle: roomListItem.subtitleText
-                subtitleItem.textFormat: Text.PlainText
-                onPressAndHold: {
-                    createRoomListContextMenu()
-                }

-                leading: Kirigami.Avatar {
-                    source: roomListItem.avatar ? "image://mxc/" + roomListItem.avatar : ""
-                    name: roomListItem.displayName
-                    implicitWidth: height
-                    sourceSize.width: Kirigami.Units.gridUnit + Kirigami.Units.largeSpacing * 2
-                    sourceSize.height: Kirigami.Units.gridUnit + Kirigami.Units.largeSpacing * 2
+                Keys.onReturnPressed: {
+                    RoomManager.enterRoom(currentRoom);
+                    root.close();
                }
            }
        }
--- a/src/qml/Component/Timeline/AvatarFlow.qml
+++ b/src/qml/Component/Timeline/AvatarFlow.qml
@@ -5,6 +5,7 @@ import QtQuick 2.15
 import QtQuick.Controls 2.15 as QQC2

 import org.kde.kirigami 2.15 as Kirigami
+import org.kde.kirigamiaddons.labs.components 1.0 as KirigamiComponents

 Flow {
    id: root
@@ -17,11 +18,11 @@ Flow {
    spacing: -avatarSize / 2
    Repeater {
        id: avatarFlowRepeater
-        delegate: Kirigami.Avatar {
-            topInset: Kirigami.Units.smallSpacing / 2
-            topPadding: Kirigami.Units.smallSpacing / 2
-            implicitWidth: avatarSize
-            implicitHeight: avatarSize + Kirigami.Units.smallSpacing / 2
+        delegate: KirigamiComponents.Avatar {
+            required property var modelData
+
+            implicitWidth: root.avatarSize
+            implicitHeight: root.avatarSize

            name: modelData.displayName
            source: modelData.avatarSource
--- a/src/qml/Component/Timeline/ReactionDelegate.qml
+++ b/src/qml/Component/Timeline/ReactionDelegate.qml
@@ -50,10 +50,10 @@ Flow {
                Kirigami.Theme.inherit: false
                Kirigami.Theme.colorSet: Kirigami.Theme.View
                radius: height / 2
-                shadow.size: Kirigami.Units.smallSpacing
-                shadow.color: !model.hasLocalUser ? Qt.rgba(0.0, 0.0, 0.0, 0.10) : Qt.rgba(Kirigami.Theme.textColor.r, Kirigami.Theme.textColor.g, Kirigami.Theme.textColor.b, 0.10)
-                border.color: Kirigami.ColorUtils.tintWithAlpha(color, Kirigami.Theme.textColor, 0.15)
-                border.width: 1
+                shadow {
+                    size: Kirigami.Units.smallSpacing
+                    color: !model.hasLocalUser ? Qt.rgba(0.0, 0.0, 0.0, 0.10) : Qt.rgba(Kirigami.Theme.textColor.r, Kirigami.Theme.textColor.g, Kirigami.Theme.textColor.b, 0.10)
+                }
            }

            onClicked: reactionClicked(model.reaction)
--- a/src/qml/Component/Timeline/ReplyComponent.qml
+++ b/src/qml/Component/Timeline/ReplyComponent.qml
@@ -7,6 +7,7 @@ import QtQuick.Controls 2.15 as QQC2
 import QtQuick.Layouts 1.15

 import org.kde.kirigami 2.15 as Kirigami
+import org.kde.kirigamiaddons.labs.components 1.0 as KirigamiComponents

 import org.kde.neochat 1.0

@@ -93,7 +94,7 @@ Item {
            implicitWidth: Kirigami.Units.smallSpacing
            color: root.author.color
        }
-        Kirigami.Avatar {
+        KirigamiComponents.Avatar {
            id: replyAvatar

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

    /**
     * @brief Regex for detecting a message with a spoiler.
@@ -85,7 +90,10 @@ a{
    color: Kirigami.Theme.textColor
    selectedTextColor: Kirigami.Theme.highlightedTextColor
    selectionColor: Kirigami.Theme.highlightColor
-    font.pointSize: !root.isReply && isEmoji.test(textMessage) ? Kirigami.Theme.defaultFont.pointSize * 4 : Kirigami.Theme.defaultFont.pointSize
+    font {
+        pointSize: !root.isReply && root.isEmoji ? Kirigami.Theme.defaultFont.pointSize * 4 : Kirigami.Theme.defaultFont.pointSize
+        family: root.isEmoji ? 'emoji' : Kirigami.Theme.defaultFont.family
+    }
    selectByMouse: !Kirigami.Settings.isMobile
    readOnly: true
    wrapMode: Text.Wrap
--- a/src/qml/Component/Timeline/StateComponent.qml
+++ b/src/qml/Component/Timeline/StateComponent.qml
@@ -6,6 +6,7 @@ import QtQuick.Controls 2.15 as QQC2
 import QtQuick.Layouts 1.15

 import org.kde.kirigami 2.15 as Kirigami
+import org.kde.kirigamiaddons.labs.components 1.0 as KirigamiComponents

 import org.kde.neochat 1.0

@@ -21,14 +22,23 @@ RowLayout {

    implicitHeight: Math.max(label.contentHeight, stateAvatar.implicitHeight)

-    Kirigami.Avatar {
+    KirigamiComponents.Avatar {
        id: stateAvatar
+
        Layout.preferredWidth: Kirigami.Units.iconSizes.small
        Layout.preferredHeight: Kirigami.Units.iconSizes.small

        name: root.name
        color: root.color

+        Rectangle {
+            radius: height
+            height: 4
+            width: 4
+            color: root.color
+            anchors.centerIn: parent
+        }
+
        MouseArea {
            anchors.fill: parent
            cursorShape: Qt.PointingHandCursor
--- a/src/qml/Component/Timeline/StateDelegate.qml
+++ b/src/qml/Component/Timeline/StateDelegate.qml
@@ -6,6 +6,7 @@ import QtQuick.Controls 2.15 as QQC2
 import QtQuick.Layouts 1.15

 import org.kde.kirigami 2.15 as Kirigami
+import org.kde.kirigamiaddons.labs.components 1.0 as KirigamiComponents

 import org.kde.neochat 1.0

@@ -71,34 +72,61 @@ QQC2.Control {
            Flow {
                visible: columnLayout.folded
                spacing: -Kirigami.Units.iconSizes.small / 2
+
                Repeater {
                    model: authorList
-                    delegate: Kirigami.Avatar {
-                        topInset: Kirigami.Units.smallSpacing / 2
-                        topPadding: Kirigami.Units.smallSpacing / 2
+                    delegate: Item {
+                        id: avatarDelegate
+
+                        required property var modelData
+
                        implicitWidth: Kirigami.Units.iconSizes.small
                        implicitHeight: Kirigami.Units.iconSizes.small + Kirigami.Units.smallSpacing / 2

-                        name: modelData.displayName
-                        source: modelData.avatarSource
-                        color: modelData.color
+                        KirigamiComponents.Avatar {
+                            y: Kirigami.Units.smallSpacing / 2
+
+                            implicitWidth: Kirigami.Units.iconSizes.small
+                            implicitHeight: Kirigami.Units.iconSizes.small
+
+                            name: parent.modelData.displayName
+                            source: parent.modelData.avatarSource
+                            color: parent.modelData.color
+
+                            Rectangle {
+                                radius: height
+                                height: 4
+                                width: 4
+                                color: avatarDelegate.modelData.color
+                                anchors.centerIn: parent
+                            }
+                        }
                    }
                }
+
                QQC2.Label {
                    id: excessAuthorsLabel
+
                    text: model.excessAuthors
                    visible: model.excessAuthors !== ""
                    color: Kirigami.Theme.textColor
                    horizontalAlignment: Text.AlignHCenter
                    background: Kirigami.ShadowedRectangle {
-                        color: Kirigami.Theme.backgroundColor
                        Kirigami.Theme.inherit: false
                        Kirigami.Theme.colorSet: Kirigami.Theme.View
+
+                        color: Kirigami.Theme.backgroundColor
                        radius: height / 2
-                        shadow.size: Kirigami.Units.smallSpacing
-                        shadow.color: Qt.rgba(Kirigami.Theme.textColor.r, Kirigami.Theme.textColor.g, Kirigami.Theme.textColor.b, 0.10)
-                        border.color: Kirigami.ColorUtils.tintWithAlpha(color, Kirigami.Theme.textColor, 0.15)
-                        border.width: 1
+
+                        shadow {
+                            size: Kirigami.Units.smallSpacing
+                            color: Qt.rgba(Kirigami.Theme.textColor.r, Kirigami.Theme.textColor.g, Kirigami.Theme.textColor.b, 0.10)
+                        }
+
+                        border {
+                            color: Kirigami.ColorUtils.tintWithAlpha(color, Kirigami.Theme.textColor, 0.15)
+                            width: 1
+                        }
                    }

                    height: Kirigami.Units.iconSizes.small + Kirigami.Units.smallSpacing
@@ -125,13 +153,13 @@ QQC2.Control {
                visible: !columnLayout.folded
            }
            QQC2.ToolButton {
-                icon.name: (!columnLayout.folded ? "go-up" : "go-down")
-                icon.width: Kirigami.Units.iconSizes.small
-                icon.height: Kirigami.Units.iconSizes.small
-
-                onClicked: {
-                    columnLayout.toggleFolded()
+                icon {
+                    name: (!columnLayout.folded ? "go-up" : "go-down")
+                    width: Kirigami.Units.iconSizes.small
+                    height: Kirigami.Units.iconSizes.small
                }
+
+                onClicked: columnLayout.toggleFolded()
            }
        }
        Repeater {
--- a/src/qml/Component/Timeline/TimelineContainer.qml
+++ b/src/qml/Component/Timeline/TimelineContainer.qml
@@ -6,6 +6,7 @@ import QtQuick.Controls 2.15 as QQC2
 import QtQuick.Layouts 1.15

 import org.kde.kirigami 2.15 as Kirigami
+import org.kde.kirigamiaddons.labs.components 1.0 as KirigamiComponents

 import org.kde.neochat 1.0

@@ -353,18 +354,15 @@ ColumnLayout {
            }
        }

-        Kirigami.Avatar {
+        KirigamiComponents.Avatar {
            id: avatar
-            width: visible || Config.showAvatarInTimeline ? Kirigami.Units.gridUnit * 2 + Kirigami.Units.smallSpacing * 2 : 0
+            width: visible || Config.showAvatarInTimeline ? Kirigami.Units.gridUnit + Kirigami.Units.largeSpacing * 2: 0
            height: width
-            padding: Kirigami.Units.smallSpacing
-            topInset: Kirigami.Units.smallSpacing
-            bottomInset: Kirigami.Units.smallSpacing
-            leftInset: Kirigami.Units.smallSpacing
-            rightInset: Kirigami.Units.smallSpacing
            anchors {
                left: parent.left
                leftMargin: Kirigami.Units.smallSpacing
+                top: parent.top
+                topMargin: Kirigami.Units.smallSpacing
            }

            visible: root.showAuthor &&
@@ -395,7 +393,8 @@ ColumnLayout {
            hoverEnabled: true

            anchors {
-                leftMargin: Kirigami.Units.smallSpacing
+                left: avatar.right
+                leftMargin: Kirigami.Units.largeSpacing
                rightMargin: Kirigami.Units.largeSpacing
            }
            // HACK: anchoring didn't reset anchors.right when switching from parent.right to undefined reliably
@@ -519,31 +518,28 @@ ColumnLayout {
                    visible: cardBackground && !Config.compactLayout
                    anchors.fill: parent
                    Kirigami.Theme.colorSet: Kirigami.Theme.View
-                    color: {
-                        if (root.author.isLocalUser) {
-                            return Kirigami.ColorUtils.tintWithAlpha(Kirigami.Theme.backgroundColor, Kirigami.Theme.highlightColor, 0.15)
-                        } else if (root.showHighlight) {
-                            return Kirigami.Theme.positiveBackgroundColor
-                        } else {
-                            return Kirigami.Theme.backgroundColor
-                        }
+                    color:  if (root.author.isLocalUser) {
+                        return Kirigami.ColorUtils.tintWithAlpha(Kirigami.Theme.backgroundColor, Kirigami.Theme.highlightColor, 0.15)
+                    } else if (root.showHighlight) {
+                        return Kirigami.Theme.positiveBackgroundColor
+                    } else {
+                        return Kirigami.Theme.backgroundColor
                    }
                    radius: Kirigami.Units.smallSpacing
-                    shadow.size: Kirigami.Units.smallSpacing
-                    shadow.color: root.showHighlight ? Qt.rgba(0.0, 0.0, 0.0, 0.10) : Qt.rgba(Kirigami.Theme.textColor.r, Kirigami.Theme.textColor.g, Kirigami.Theme.textColor.b, 0.10)
-                    border.color: Kirigami.ColorUtils.tintWithAlpha(color, Kirigami.Theme.textColor, 0.15)
-                    border.width: 1
+                    shadow {
+                        size:  Kirigami.Units.smallSpacing
+                        color: root.isHighlighted ? Qt.rgba(0.0, 0.0, 0.0, 0.10) : Qt.rgba(Kirigami.Theme.textColor.r, Kirigami.Theme.textColor.g, Kirigami.Theme.textColor.b, 0.10)
+                    }

                    Behavior on color {
-                        enabled: isTemporaryHighlighted
-                        ColorAnimation {target: bubbleBackground; duration: Kirigami.Units.veryLongDuration; easing.type: Easing.InOutCubic}
+                        ColorAnimation { duration: Kirigami.Units.shortDuration }
                    }
                }
            }
        }

        background: Rectangle {
-            visible: mainContainer.hovered
+            visible: mainContainer.hovered && Config.compactLayout
            color: Kirigami.ColorUtils.tintWithAlpha(Kirigami.Theme.backgroundColor, Kirigami.Theme.highlightColor, 0.15)
            radius: Kirigami.Units.smallSpacing
        }
--- a/src/qml/Component/TimelineView.qml
+++ b/src/qml/Component/TimelineView.qml
@@ -308,7 +308,7 @@ QQC2.ScrollView {

            x: delegate ? delegate.x + delegate.bubbleX : 0
            y: delegate ? delegate.mapToItem(parent, 0, 0).y + delegate.bubbleY - height + Kirigami.Units.smallSpacing : 0
-            width: delegate.bubbleWidth
+            width: delegate ? delegate.bubbleWidth : Kirigami.Units.gridUnit * 4

            showActions: delegate && delegate.hovered
            verified: delegate && delegate.verified
@@ -420,13 +420,6 @@ QQC2.ScrollView {
                popup.open()
        }

-        function showUserDetail(user) {
-            userDetailDialog.createObject(QQC2.ApplicationWindow.overlay, {
-                room: root.currentRoom,
-                user: root.currentRoom.getUser(user.id),
-            }).open();
-        }
-
        function goToLastMessage() {
            root.currentRoom.markAllMessagesAsRead()
            // scroll to the very end, i.e to messageListView.YEnd
@@ -496,4 +489,11 @@ QQC2.ScrollView {
    function positionViewAtBeginning() {
        messageListView.positionViewAtBeginning()
    }
+
+    function showUserDetail(user) {
+        userDetailDialog.createObject(QQC2.ApplicationWindow.overlay, {
+            room: root.currentRoom,
+            user: root.currentRoom.getUser(user.id),
+        }).open();
+    }
 }
--- a/src/qml/Dialog/UserDetailDialog.qml
+++ b/src/qml/Dialog/UserDetailDialog.qml
@@ -7,6 +7,7 @@ import QtQuick.Controls 2.15 as QQC2
 import QtQuick.Layouts 1.15

 import org.kde.kirigami 2.20 as Kirigami
+import org.kde.kirigamiaddons.labs.components 1.0 as KirigamiComponents

 import org.kde.neochat 1.0

@@ -37,7 +38,7 @@ Kirigami.OverlaySheet {
            Layout.bottomMargin: Kirigami.Units.largeSpacing
            spacing: Kirigami.Units.largeSpacing

-            Kirigami.Avatar {
+            KirigamiComponents.Avatar {
                Layout.preferredWidth: Kirigami.Units.iconSizes.huge
                Layout.preferredHeight: Kirigami.Units.iconSizes.huge

--- a/src/qml/Menu/Timeline/MessageDelegateContextMenu.qml
+++ b/src/qml/Menu/Timeline/MessageDelegateContextMenu.qml
@@ -6,6 +6,7 @@ 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.kirigamiaddons.labs.components 1.0 as KirigamiComponents

 import org.kde.neochat 1.0

@@ -222,11 +223,11 @@ Loader {
                        Layout.fillWidth: true
                        Layout.margins: Kirigami.Units.largeSpacing
                        spacing: Kirigami.Units.largeSpacing
-                        Kirigami.Avatar {
+                        KirigamiComponents.Avatar {
                            id: avatar
                            source: author.avatarSource
-                            Layout.preferredWidth: Kirigami.Units.gridUnit * 3
-                            Layout.preferredHeight: Kirigami.Units.gridUnit * 3
+                            Layout.preferredWidth: Kirigami.Units.gridUnit * 2
+                            Layout.preferredHeight: Kirigami.Units.gridUnit * 2
                            Layout.alignment: Qt.AlignTop
                        }
                        ColumnLayout {
--- a/src/qml/Page/ImageEditorPage.qml
+++ b/src/qml/Page/ImageEditorPage.qml
@@ -7,6 +7,7 @@ import QtQuick.Layouts 1.15
 import Qt.labs.platform 1.1 as Platform

 import org.kde.kirigami 2.15 as Kirigami
+import org.kde.kirigamiaddons.labs.components 1.0 as KirigamiComponents
 import org.kde.kquickimageeditor 1.0 as KQuickImageEditor

 Kirigami.Page {
@@ -170,7 +171,7 @@ Kirigami.Page {
        }
    }

-    footer: Kirigami.InlineMessage {
+    footer: KirigamiComponents.Banner {
        id: msg
        type: Kirigami.MessageType.Error
        showCloseButton: true
--- a/src/qml/Page/InviteUserPage.qml
+++ b/src/qml/Page/InviteUserPage.qml
@@ -6,6 +6,8 @@ import QtQuick.Controls 2.15 as QQC2
 import QtQuick.Layouts 1.15

 import org.kde.kirigami 2.15 as Kirigami
+import org.kde.kirigamiaddons.delegates 1.0 as Delegates
+import org.kde.kirigamiaddons.labs.components 1.0 as KirigamiComponents

 import org.kde.neochat 1.0

@@ -68,38 +70,51 @@ Kirigami.ScrollablePage {
            text: i18n("No users available")
        }

-        delegate: Kirigami.BasicListItem {
+        delegate: Delegates.RoundedItemDelegate {
            id: delegate
+
+            required property string userID
+            required property string name
+            required property string avatar
+
            property bool inRoom: room && room.containsUser(userID)

-            label: model.name
-            subtitle: model.userID
+            text: name

-            leading: Kirigami.Avatar {
-                implicitWidth: height
-                source: model.avatar ? ("image://mxc/" + model.avatar) : ""
-                name: model.name
-            }
-            trailing: QQC2.ToolButton {
-                id: inviteButton
-                icon.name: "document-send"
-                text: i18n("Send invitation")
-                checkable: true
-                checked: inRoom
-                opacity: inRoom ? 0.5 : 1
-
-                onToggled: {
-                    if (inRoom) {
-                        checked = true
-                    } else {
-                        room.inviteToRoom(model.userID);
-                        applicationWindow().pageStack.layers.pop();
-                    }
+            contentItem: RowLayout {
+                KirigamiComponents.Avatar {
+                    Layout.preferredWidth: Kirigami.Units.iconSizes.medium
+                    Layout.preferredHeight: Kirigami.Units.iconSizes.medium
+                    source: delegate.avatar ? ("image://mxc/" + delegate.avatar) : ""
+                    name: delegate.name
                }

-                QQC2.ToolTip.text: !inRoom ? text : i18n("User is either already a member or has been invited")
-                QQC2.ToolTip.visible: inviteButton.hovered
-                QQC2.ToolTip.delay: Kirigami.Units.toolTipDelay
+                Delegates.SubtitleContentItem {
+                    itemDelegate: delegate
+                    subtitle: delegate.userID
+                }
+
+                QQC2.ToolButton {
+                    id: inviteButton
+                    icon.name: "document-send"
+                    text: i18n("Send invitation")
+                    checkable: true
+                    checked: inRoom
+                    opacity: inRoom ? 0.5 : 1
+
+                    onToggled: {
+                        if (inRoom) {
+                            checked = true
+                        } else {
+                            room.inviteToRoom(delegate.userID);
+                            applicationWindow().pageStack.layers.pop();
+                        }
+                    }
+
+                    QQC2.ToolTip.text: !inRoom ? text : i18n("User is either already a member or has been invited")
+                    QQC2.ToolTip.visible: inviteButton.hovered
+                    QQC2.ToolTip.delay: Kirigami.Units.toolTipDelay
+                }
            }
        }
    }
--- a/src/qml/Page/JoinRoomPage.qml
+++ b/src/qml/Page/JoinRoomPage.qml
@@ -8,6 +8,7 @@ import QtQuick.Layouts 1.15
 import Qt.labs.qmlmodels 1.0

 import org.kde.kirigami 2.15 as Kirigami
+import org.kde.kirigamiaddons.labs.components 1.0 as KirigamiComponents

 import org.kde.neochat 1.0

@@ -202,7 +203,7 @@ Kirigami.ScrollablePage {
                applicationWindow().pageStack.layers.pop();
            }
            contentItem: RowLayout {
-                Kirigami.Avatar {
+                KirigamiComponents.Avatar {
                    Layout.preferredWidth: Kirigami.Units.gridUnit * 2
                    Layout.preferredHeight: Kirigami.Units.gridUnit * 2

--- a/src/qml/Page/RoomList/CollapsedRoomDelegate.qml
+++ b/src/qml/Page/RoomList/CollapsedRoomDelegate.qml
@@ -7,6 +7,7 @@ import QtQuick.Layouts 1.15
 import QtQml.Models 2.15

 import org.kde.kirigami 2.15 as Kirigami
+import org.kde.kirigamiaddons.labs.components 1.0 as KirigamiComponents
 import org.kde.kitemmodels 1.0

 import org.kde.neochat 1.0
@@ -32,7 +33,7 @@ QQC2.ItemDelegate {

    visible: root.categoryVisible || filterText.length > 0 || Config.mergeRoomList

-    contentItem: Kirigami.Avatar {
+    contentItem: KirigamiComponents.Avatar {
        source: root.avatar ? `image://mxc/${root.avatar}` : ""
        name: root.displayName

--- a/src/qml/Page/RoomList/ContextMenu.qml
+++ b/src/qml/Page/RoomList/ContextMenu.qml
@@ -7,6 +7,7 @@ import QtQuick.Controls 2.15 as QQC2
 import QtQuick.Layouts 1.15

 import org.kde.kirigami 2.19 as Kirigami
+import org.kde.kirigamiaddons.labs.components 1.0 as KirigamiComponents

 import org.kde.neochat 1.0

@@ -157,7 +158,7 @@ Loader {
                    Layout.fillWidth: true
                    Layout.margins: Kirigami.Units.largeSpacing
                    spacing: Kirigami.Units.largeSpacing
-                    Kirigami.Avatar {
+                    KirigamiComponents.Avatar {
                        id: avatar
                        source: room.avatarMediaId ? ("image://mxc/" + room.avatarMediaId) : ""
                        name: room.displayName
--- a/src/qml/Page/RoomList/Page.qml
+++ b/src/qml/Page/RoomList/Page.qml
@@ -240,6 +240,15 @@ Kirigami.Page {

                    RoomList.RoomDelegate {
                        filterText: sortFilterRoomListModel.filterText
+
+                        height: visible ? implicitHeight : 0
+
+                        visible: categoryVisible || filterText.length > 0 || Config.mergeRoomList
+
+                        onClicked: RoomManager.enterRoom(currentRoom)
+
+                        Keys.onEnterPressed: RoomManager.enterRoom(currentRoom)
+                        Keys.onReturnPressed: RoomManager.enterRoom(currentRoom)
                    }
                }
            }
--- a/src/qml/Page/RoomList/RoomDelegate.qml
+++ b/src/qml/Page/RoomList/RoomDelegate.qml
@@ -7,13 +7,15 @@ import QtQuick.Layouts 1.15
 import QtQml.Models 2.15

 import org.kde.kirigami 2.15 as Kirigami
+import org.kde.kirigamiaddons.delegates 1.0 as Delegates
+import org.kde.kirigamiaddons.labs.components 1.0 as Components
 import org.kde.kitemmodels 1.0

 import org.kde.neochat 1.0

 import './' as RoomList

-Kirigami.BasicListItem {
+Delegates.RoundedItemDelegate {
    id: root

    required property int index
@@ -29,48 +31,61 @@ Kirigami.BasicListItem {

    readonly property bool hasNotifications: notificationCount > 0

-    topPadding: Kirigami.Units.largeSpacing
-    bottomPadding: Kirigami.Units.largeSpacing
-
-    visible: root.categoryVisible || root.filterText.length > 0 || Config.mergeRoomList
-    highlighted: ListView.view.currentIndex === index
-    focus: true
-    icon: undefined
-    @BASICLISTITEM_BOLD@: root.hasNotifications
-
-    label: root.displayName
-    labelItem.textFormat: Text.PlainText
-
-    subtitle: root.subtitleText
-    subtitleItem {
-        textFormat: Text.PlainText
-        visible: !Config.compactRoomList
-    }
-
-    onClicked: RoomManager.enterRoom(root.currentRoom)
    onPressAndHold: createRoomListContextMenu()

-    Keys.onEnterPressed: RoomManager.enterRoom(root.currentRoom)
-    Keys.onReturnPressed: RoomManager.enterRoom(root.currentRoom)
-
    TapHandler {
        acceptedButtons: Qt.RightButton
        acceptedDevices: PointerDevice.Mouse
        onTapped: createRoomListContextMenu()
    }

-    leading: Kirigami.Avatar {
-        source: root.avatar ? `image://mxc/${root.avatar}` : ""
-        name: root.displayName
-        implicitWidth: visible ? height : 0
-        visible: Config.showAvatarInRoomDrawer
-        sourceSize {
-            width: Kirigami.Units.gridUnit + Kirigami.Units.largeSpacing * 2
-            height: Kirigami.Units.gridUnit + Kirigami.Units.largeSpacing * 2
-        }
-    }
+    contentItem: RowLayout {
+        spacing: Kirigami.Units.largeSpacing
+
+        Components.Avatar {
+            source: root.avatar ? "image://mxc/" +  root.avatar : ""
+            name: root.displayName
+            visible: Config.showAvatarInRoomDrawer
+            implicitHeight: Kirigami.Units.gridUnit + (Config.compactRoomList ? 0 : Kirigami.Units.largeSpacing * 2)
+            implicitWidth: visible ? implicitHeight : 0
+
+            Layout.fillHeight: true
+            Layout.preferredWidth: height
+        }
+
+        ColumnLayout {
+            spacing: 0
+
+            Layout.fillWidth: true
+            Layout.alignment: Qt.AlignVCenter
+
+            QQC2.Label {
+                id: label
+
+                text: root.displayName
+                elide: Text.ElideRight
+                font.weight: root.hasNotifications ? Font.Bold : Font.Normal
+                textFormat: Text.PlainText
+
+                Layout.fillWidth: true
+                Layout.alignment: subtitle.visible ? Qt.AlignLeft | Qt.AlignBottom : Qt.AlignLeft | Qt.AlignVCenter
+            }
+
+            QQC2.Label {
+                id: subtitle
+
+                text: root.subtitleText
+                elide: Text.ElideRight
+                font: Kirigami.Theme.smallFont
+                opacity: root.hasNotifications ? 0.9 : 0.7
+                visible: !Config.compactRoomList
+                textFormat: Text.PlainText
+
+                Layout.fillWidth: true
+                Layout.alignment: visible ? Qt.AlignLeft | Qt.AlignTop : Qt.AlignLeft | Qt.AlignVCenter
+            }
+        }

-    trailing: RowLayout {
        Kirigami.Icon {
            source: "notifications-disabled"
            enabled: false
@@ -80,10 +95,12 @@ Kirigami.BasicListItem {
            Accessible.name: i18n("Muted room")
            Layout.rightMargin: Kirigami.Units.smallSpacing
        }
+
        QQC2.Label {
            id: notificationCountLabel
-            text: notificationCount
-            visible: hasNotifications
+
+            text: root.notificationCount
+            visible: root.hasNotifications
            color: Kirigami.Theme.textColor
            horizontalAlignment: Text.AlignHCenter
            background: Rectangle {
@@ -103,6 +120,7 @@ Kirigami.BasicListItem {
                text: notificationCountLabel.text
            }
        }
+
        QQC2.Button {
            id: configButton
            visible: root.hovered && !Kirigami.Settings.isMobile && !Config.compactRoomList
--- a/src/qml/Page/RoomList/SpaceDrawer.qml
+++ b/src/qml/Page/RoomList/SpaceDrawer.qml
@@ -7,6 +7,7 @@ import QtQuick.Controls 2.15 as QQC2
 import QtQuick.Layouts 1.15

 import org.kde.kirigami 2.20 as Kirigami
+import org.kde.kirigamiaddons.delegates 1.0 as Delegates

 import '.'
 import org.kde.neochat 1.0
@@ -15,12 +16,8 @@ QQC2.Control {
    id: root

    readonly property real pinnedWidth: Kirigami.Units.gridUnit * 6
-    readonly property int buttonDisplayMode: Kirigami.NavigationTabButton.IconOnly
    property bool drawerEnabled: true

-    Kirigami.Theme.colorSet: Kirigami.Theme.Window
-    Kirigami.Theme.inherit: false
-
    leftPadding: 0
    rightPadding: 0
    topPadding: 0
@@ -28,12 +25,6 @@ QQC2.Control {

    property string selectedSpaceId

-    background: Rectangle {
-        color: Kirigami.Theme.backgroundColor
-        Kirigami.Theme.colorSet: Kirigami.Theme.View
-        Kirigami.Theme.inherit: false
-    }
-
    contentItem: Loader {
        id: sidebarColumn
        active: root.drawerEnabled
@@ -56,17 +47,23 @@ QQC2.Control {
                    width: scrollView.width
                    spacing: 0

-                    Kirigami.NavigationTabButton {
+                    AvatarTabButton {
+                        id: allRoomButton
+
                        Layout.fillWidth: true
-                        Layout.preferredHeight: width
-                        display: Kirigami.NavigationTabButton.IconOnly
+                        Layout.preferredHeight: width - Kirigami.Units.smallSpacing
+                        Layout.maximumHeight: width - Kirigami.Units.smallSpacing
+                        Layout.topMargin: Kirigami.Units.smallSpacing
+
                        text: i18n("All Rooms")
-                        icon.name: "globe"
-                        checked: true
+                        source: "globe"
+
+                        contentItem: Kirigami.Icon {
+                            source: "globe"
+                        }
+
+                        checked: root.selectedSpaceId === ""
                        onClicked: root.selectedSpaceId = ""
-                        QQC2.ToolTip.visible: hovered
-                        QQC2.ToolTip.text: text
-                        QQC2.ToolTip.delay: Kirigami.Units.toolTipDelay
                    }

                    Repeater {
@@ -79,23 +76,23 @@ QQC2.Control {
                        Component.onCompleted: root.enabled = count > 0

                        delegate: AvatarTabButton {
-                            Layout.fillWidth: true
-                            Layout.preferredHeight: width
-                            display: Kirigami.NavigationTabButton.IconOnly
-                            text: model.displayName
-                            source: model.avatar ? ("image://mxc/" + model.avatar) : ""
-                            name: model.displayName
-                            onClicked: root.selectedSpaceId = model.id
-                            QQC2.ToolTip.visible: hovered
-                            QQC2.ToolTip.text: text
-                            QQC2.ToolTip.delay: Kirigami.Units.toolTipDelay
-                            onPressAndHold: root.createContextMenu(model.currentRoom)
+                            id: spaceDelegate

-                            TapHandler {
-                                acceptedButtons: Qt.RightButton
-                                acceptedDevices: PointerDevice.Mouse
-                                onTapped: root.createContextMenu(model.currentRoom)
-                            }
+                            required property string displayName
+                            required property string avatar
+                            required property string roomId
+                            required property var currentRoom
+
+                            Layout.fillWidth: true
+                            Layout.preferredHeight: width - Kirigami.Units.smallSpacing
+                            Layout.maximumHeight: width - Kirigami.Units.smallSpacing
+
+                            text: displayName
+                            source: avatar ? ("image://mxc/" + avatar) : ""
+
+                            onClicked: root.selectedSpaceId = roomId
+                            checked: root.selectedSpaceId === roomId
+                            onContextMenuRequested: root.createContextMenu(currentRoom)
                        }
                    }
                }
--- a/src/qml/Page/RoomList/SpaceListContextMenu.qml
+++ b/src/qml/Page/RoomList/SpaceListContextMenu.qml
@@ -7,6 +7,7 @@ import QtQuick.Controls 2.15 as QQC2
 import QtQuick.Layouts 1.15

 import org.kde.kirigami 2.19 as Kirigami
+import org.kde.kirigamiaddons.labs.components 1.0 as KirigamiComponents

 import org.kde.neochat 1.0

@@ -78,7 +79,7 @@ Loader {
                    Layout.fillWidth: true
                    Layout.margins: Kirigami.Units.largeSpacing
                    spacing: Kirigami.Units.largeSpacing
-                    Kirigami.Avatar {
+                    KirigamiComponents.Avatar {
                        id: avatar
                        source: room.avatarMediaId ? ("image://mxc/" + room.avatarMediaId) : ""
                        Layout.preferredWidth: Kirigami.Units.gridUnit * 3
--- a/src/qml/Page/RoomList/UserInfo.qml
+++ b/src/qml/Page/RoomList/UserInfo.qml
@@ -5,6 +5,8 @@ import QtQuick 2.15
 import QtQuick.Controls 2.15 as QQC2
 import QtQuick.Layouts 1.15
 import org.kde.kirigami 2.20 as Kirigami
+import org.kde.kirigamiaddons.labs.components 1.0 as KirigamiComponents
+import org.kde.kirigamiaddons.delegates 1.0 as Delegates

 import org.kde.neochat 1.0

@@ -27,34 +29,28 @@ QQC2.ToolBar {

            header: Kirigami.Separator {}

-            footer: Kirigami.BasicListItem {
+            footer: Delegates.RoundedItemDelegate {
+                id: addButton
                width: parent.width
-                highlighted: focus
-                background: Rectangle {
-                    id: background
-                    color: addAccount.backgroundColor
-
-                    Rectangle {
-                        anchors.fill: parent
-                        visible: !Kirigami.Settings.tabletMode && addAccount.hoverEnabled
-                        color: addAccount.activeBackgroundColor
-                        opacity: {
-                            if ((addAccount.highlighted || addAccount.ListView.isCurrentItem) && !addAccount.pressed) {
-                                return .6
-                            } else if (addAccount.hovered && !addAccount.pressed) {
-                                return .3
-                            } else {
-                                return 0
-                            }
-                        }
-                    }
-                }
+                highlighted: focus || (addAccount.highlighted || addAccount.ListView.isCurrentItem) && !addAccount.pressed
                Component.onCompleted: userInfo.addAccount = this
-                icon: "list-add"
+                icon {
+                    name: "list-add"
+                    width: Kirigami.Units.iconSizes.smallMedium
+                    height: Kirigami.Units.iconSizes.smallMedium
+                }
                text: i18n("Add Account")
-                subtitle: i18n("Log in to an existing account")
+                contentItem: Delegates.SubtitleContentItem {
+                    itemDelegate: parent
+                    subtitle: i18n("Log in to an existing account")
+                    labelItem.textFormat: Text.PlainText
+                    subtitleItem.textFormat: Text.PlainText
+                }
+
                onClicked: {
-                    pageStack.pushDialogLayer("qrc:/WelcomePage.qml", {}, {title: i18nc("@title:window", "Login")})
+                    pageStack.pushDialogLayer("qrc:/WelcomePage.qml", {}, {
+                        title: i18nc("@title:window", "Login"),
+                    });
                    if (switchUserButton.checked) {
                        switchUserButton.checked = false
                    }
@@ -101,26 +97,36 @@ QQC2.ToolBar {

            width: parent.width
            Layout.preferredHeight: contentHeight
-            delegate: Kirigami.BasicListItem {
-                leftPadding: topPadding
-                leading: Kirigami.Avatar {
-                    implicitWidth: Kirigami.Units.gridUnit + Kirigami.Units.largeSpacing
-                    implicitHeight: Kirigami.Units.gridUnit + Kirigami.Units.largeSpacing
-                    sourceSize {
-                        width: Kirigami.Units.gridUnit + Kirigami.Units.largeSpacing
-                        height: Kirigami.Units.gridUnit + Kirigami.Units.largeSpacing
-                    }
-                    source: model.connection.localUser.avatarMediaId ? ("image://mxc/" + model.connection.localUser.avatarMediaId) : ""
-                    name: model.connection.localUser.displayName ?? model.connection.localUser.id
-                }
+            delegate: Delegates.RoundedItemDelegate {
+                id: userDelegate
+
+                required property var connection
+
                width: parent.width
-                text: model.connection.localUser.displayName
-                labelItem.textFormat: Text.PlainText
-                subtitleItem.textFormat: Text.PlainText
-                subtitle: model.connection.localUser.id
+                text: connection.localUser.displayName
+
+                contentItem: RowLayout {
+                    KirigamiComponents.Avatar {
+                        implicitWidth: Kirigami.Units.gridUnit + Kirigami.Units.largeSpacing
+                        implicitHeight: Kirigami.Units.gridUnit + Kirigami.Units.largeSpacing
+                        sourceSize {
+                            width: Kirigami.Units.gridUnit + Kirigami.Units.largeSpacing
+                            height: Kirigami.Units.gridUnit + Kirigami.Units.largeSpacing
+                        }
+                        source: userDelegate.connection.localUser.avatarMediaId ? ("image://mxc/" + userDelegate.connection.localUser.avatarMediaId) : ""
+                        name: userDelegate.connection.localUser.displayName ?? userDelegate.connection.localUser.id
+                    }
+
+                    Delegates.SubtitleContentItem {
+                        itemDelegate: userDelegate
+                        subtitle: userDelegate.connection.localUser.id
+                        labelItem.textFormat: Text.PlainText
+                        subtitleItem.textFormat: Text.PlainText
+                    }
+                }

                onClicked: {
-                    Controller.activeConnection = model.connection
+                    Controller.activeConnection = userDelegate.connection
                    if (switchUserButton.checked) {
                        switchUserButton.checked = false
                    }
@@ -139,28 +145,40 @@ QQC2.ToolBar {
            Layout.bottomMargin: Kirigami.Units.smallSpacing
            Layout.minimumHeight: Kirigami.Units.gridUnit * 2 - 2 // HACK: -2 here is to ensure the ChatBox and the UserInfo have the same height

-            Kirigami.Avatar {
-                readonly property string mediaId: Controller.activeConnection.localUser.avatarMediaId
+            QQC2.AbstractButton {
+                id: accountButton

                Layout.preferredWidth: Kirigami.Units.gridUnit + Kirigami.Units.largeSpacing
                Layout.preferredHeight: Kirigami.Units.gridUnit + Kirigami.Units.largeSpacing
                Layout.leftMargin: Kirigami.Units.largeSpacing

-                source: mediaId ? ("image://mxc/" + mediaId) : ""
-                name: Controller.activeConnection.localUser.displayName ?? Controller.activeConnection.localUser.id
-                actions.main: Kirigami.Action {
-                    text: i18n("Edit this account")
-                    icon.name: "document-edit"
-                    onTriggered: pageStack.pushDialogLayer(Qt.resolvedUrl('qrc:/AccountEditorPage.qml'), {
-                        connection: Controller.activeConnection
-                    }, {
-                        title: i18n("Account editor")
-                    });
-                }
                TapHandler {
-                    acceptedButtons: Qt.RightButton
-                    acceptedDevices: PointerDevice.Mouse
-                    onTapped: accountMenu.open()
+                    acceptedButtons: Qt.RightButton | Qt.LeftButton
+                   acceptedDevices: PointerDevice.Mouse
+                    onTapped: (eventPoint, button) => {
+                        // TODO Qt6 remove
+                        if (!button) {
+                            button = eventPoint.event.button;
+                        }
+                        if (button == Qt.RightButton) {
+                            accountMenu.open();
+                        } else {
+                            pageStack.pushDialogLayer(Qt.resolvedUrl('qrc:/AccountEditorPage.qml'), {
+                                connection: Controller.activeConnection
+                            }, {
+                                title: i18n("Account editor")
+                            });
+                        }
+                    }
+                }
+
+                text: i18n("Edit this account")
+
+                contentItem: KirigamiComponents.Avatar {
+                    readonly property string mediaId: Controller.activeConnection.localUser.avatarMediaId
+
+                    source: mediaId ? ("image://mxc/" + mediaId) : ""
+                    name: Controller.activeConnection.localUser.displayName ?? Controller.activeConnection.localUser.id
                }
            }

@@ -220,7 +238,7 @@ QQC2.ToolBar {
                Layout.minimumWidth: Layout.preferredWidth
                Layout.alignment: Qt.AlignRight
                Layout.rightMargin: Kirigami.Units.largeSpacing
-                QQC2.ToolTip.text: parent.text
+                QQC2.ToolTip.text: text
                QQC2.ToolTip.visible: hovered
                QQC2.ToolTip.delay: Kirigami.Units.toolTipDelay
            }
--- a/src/qml/Page/RoomPage.qml
+++ b/src/qml/Page/RoomPage.qml
@@ -7,6 +7,7 @@ import QtQuick.Controls 2.15 as QQC2
 import QtQuick.Layouts 1.15
 import QtQuick.Window 2.15

+import org.kde.kirigamiaddons.labs.components 1.0 as KirigamiComponents
 import org.kde.kirigami 2.19 as Kirigami
 import org.kde.kitemmodels 1.0

@@ -42,16 +43,26 @@ Kirigami.Page {
        }
    }

-    header: QQC2.Control {
-        height: visible ? implicitHeight : 0
-        visible: false
-        padding: Kirigami.Units.smallSpacing
-        contentItem: Kirigami.InlineMessage {
-            showCloseButton: true
-            visible: true
+    Connections {
+        target: Controller
+        function onIsOnlineChanged() {
+            if (true || !Controller.isOnline) {
+                banner.text = i18n("NeoChat is offline. Please check your network connection.");
+                banner.visible = true;
+                banner.type = Kirigami.MessageType.Error;
+            } else {
+                banner.visible = false;
+            }
        }
    }

+    header: KirigamiComponents.Banner {
+        id: banner
+
+        showCloseButton: true
+        visible: false
+    }
+
    Loader {
        id: timelineViewLoader
        anchors.fill: parent
@@ -166,15 +177,19 @@ Kirigami.Page {
    Connections {
        target: currentRoom
        function onShowMessage(messageType, message) {
-            root.header.contentItem.text = message;
-            root.header.contentItem.type = messageType === ActionsHandler.Error ? Kirigami.MessageType.Error : messageType === ActionsHandler.Positive ? Kirigami.MessageType.Positive : Kirigami.MessageType.Information;
-            root.header.visible = true;
+            banner.text = message;
+            banner.type = messageType === ActionsHandler.Error ? Kirigami.MessageType.Error : messageType === ActionsHandler.Positive ? Kirigami.MessageType.Positive : Kirigami.MessageType.Information;
+            banner.visible = true;
        }
    }

    function warning(title, message) {
-        root.header.contentItem.text = `${title}<br />${message}`;
-        root.header.contentItem.type =  Kirigami.MessageType.Warning;
-        root.header.visible = true;
+        banner.text = `${title}<br />${message}`;
+        banner.type =  Kirigami.MessageType.Warning;
+        banner.visible = true;
+    }
+
+    function showUserDetail(user) {
+        timelineViewLoader.item.showUserDetail(user)
    }
 }
--- a/src/qml/Page/StartChatPage.qml
+++ b/src/qml/Page/StartChatPage.qml
@@ -7,6 +7,8 @@ import QtQuick.Controls 2.15 as QQC2
 import QtQuick.Layouts 1.15

 import org.kde.kirigami 2.15 as Kirigami
+import org.kde.kirigamiaddons.delegates 1.0 as Delegates
+import org.kde.kirigamiaddons.labs.components 1.0 as KirigamiComponents

 import org.kde.neochat 1.0

@@ -60,69 +62,68 @@ Kirigami.ScrollablePage {
            keyword: identifierField.text
        }

-        delegate: Kirigami.AbstractListItem {
-            width: userDictListView.width
+        delegate: Delegates.RoundedItemDelegate {
+            id: delegate
+
+            required property string userID
+            required property string avatar
+            required property string name
+            required property var directChats
+
+            text: name
+
            contentItem: RowLayout {
-                spacing: Kirigami.Units.largeSpacing
-
-                Kirigami.Avatar {
-                    Layout.preferredWidth: height
-                    Layout.fillHeight: true
-
-                    source: model.avatar ? ("image://mxc/" + model.avatar) : ""
-                    name: model.name
+                KirigamiComponents.Avatar {
+                    Layout.preferredWidth: Kirigami.Units.iconSizes.medium
+                    Layout.preferredHeight: Kirigami.Units.iconSizes.medium
+                    source: delegate.avatar ? ("image://mxc/" + delegate.avatar) : ""
+                    name: delegate.name
                }

-                ColumnLayout {
+                Delegates.SubtitleContentItem {
+                    itemDelegate: delegate
+                    subtitle: delegate.userID
                    Layout.fillWidth: true
-                    Layout.fillHeight: true
-
-                    spacing: 0
-
-                    Kirigami.Heading {
-                        Layout.fillWidth: true
-                        Layout.fillHeight: true
-
-                        text: name
-                        textFormat: Text.PlainText
-                        elide: Text.ElideRight
-                        wrapMode: Text.NoWrap
-                    }
-
-                    QQC2.Label {
-                        Layout.fillWidth: true
-                        Layout.fillHeight: true
-
-                        text: userID
-                        textFormat: Text.PlainText
-                        elide: Text.ElideRight
-                        wrapMode: Text.NoWrap
-                    }
                }

                QQC2.Button {
                    id: joinChatButton
-                    Layout.alignment: Qt.AlignRight
-                    visible: directChats && directChats.length > 0
+
+                    visible: delegate.directChats && delegate.directChats.length > 0
+                    text: i18n("Join existing chat")
+                    display: QQC2.Button.IconOnly

                    icon.name: "document-send"
                    onClicked: {
-                        connection.requestDirectChat(userID);
+                        connection.requestDirectChat(delegate.userID);
                        applicationWindow().pageStack.layers.pop();
                    }
+
+                    Layout.alignment: Qt.AlignRight
+
+                    QQC2.ToolTip.text: text
+                    QQC2.ToolTip.visible: hovered
+                    QQC2.ToolTip.delay: Kirigami.Units.toolTipDelay
                }

                QQC2.Button {
-                    Layout.alignment: Qt.AlignRight
                    icon.name: "irc-join-channel"
                    // We wants to make sure an user can't start more than one
                    // chat with someone.
                    visible: !joinChatButton.visible
+                    text: i18n("Create new chat")
+                    display: QQC2.Button.IconOnly

                    onClicked: {
-                        connection.requestDirectChat(userID);
+                        connection.requestDirectChat(delegate.userID);
                        applicationWindow().pageStack.layers.pop();
                    }
+
+                    Layout.alignment: Qt.AlignRight
+
+                    QQC2.ToolTip.text: text
+                    QQC2.ToolTip.visible: hovered
+                    QQC2.ToolTip.delay: Kirigami.Units.toolTipDelay
                }
            }
        }
--- a/src/qml/Panel/DirectChatDrawerHeader.qml
+++ b/src/qml/Panel/DirectChatDrawerHeader.qml
@@ -6,6 +6,7 @@ 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.kirigamiaddons.labs.components 1.0 as KirigamiComponents

 import org.kde.neochat 1.0

@@ -18,43 +19,45 @@ ColumnLayout {
        Layout.fillWidth: true
        Layout.preferredHeight: Kirigami.Units.largeSpacing * 2
    }
-    Kirigami.Avatar {
+
+    QQC2.AbstractButton {
        Layout.preferredWidth: Math.round(Kirigami.Units.gridUnit * 3.5)
        Layout.preferredHeight: Math.round(Kirigami.Units.gridUnit * 3.5)
        Layout.alignment: Qt.AlignHCenter

-        name: room ? room.displayName : ""
-        source: room ? ("image://mxc/" +  room.avatarMediaId) : ""
-
-        Rectangle {
-            visible: room.usesEncryption
-            color: Kirigami.Theme.backgroundColor
-
-            width: Kirigami.Units.gridUnit
-            height: Kirigami.Units.gridUnit
-            anchors.bottom: parent.bottom
-            anchors.right: parent.right
-
-            radius: Math.round(width / 2)
-
-            Kirigami.Icon {
-                source: "channel-secure-symbolic"
-                anchors.fill: parent
+        onClicked: {
+            const popup = userDetailDialog.createObject(QQC2.ApplicationWindow.overlay, {
+                room: room,
+                user: room.getUser(room.directChatRemoteUser.id),
+            })
+            popup.closed.connect(() => {
+                userListItem.highlighted = false
+            })
+            if (roomDrawer.modal) {
+                roomDrawer.close()
            }
+            popup.open()
        }
-        actions.main: Kirigami.Action {
-            onTriggered: {
-                const popup = userDetailDialog.createObject(QQC2.ApplicationWindow.overlay, {
-                    room: room,
-                    user: room.getUser(room.directChatRemoteUser.id),
-                })
-                popup.closed.connect(() => {
-                    userListItem.highlighted = false
-                })
-                if (roomDrawer.modal) {
-                    roomDrawer.close()
+
+        contentItem: KirigamiComponents.Avatar {
+            name: room ? room.displayName : ""
+            source: room ? ("image://mxc/" +  room.avatarMediaId) : ""
+
+            Rectangle {
+                visible: room.usesEncryption
+                color: Kirigami.Theme.backgroundColor
+
+                width: Kirigami.Units.gridUnit
+                height: Kirigami.Units.gridUnit
+                anchors.bottom: parent.bottom
+                anchors.right: parent.right
+
+                radius: Math.round(width / 2)
+
+                Kirigami.Icon {
+                    source: "channel-secure-symbolic"
+                    anchors.fill: parent
                }
-                popup.open()
            }
        }
    }
--- a/src/qml/Panel/GroupChatDrawerHeader.qml
+++ b/src/qml/Panel/GroupChatDrawerHeader.qml
@@ -6,6 +6,7 @@ import QtQuick 2.15
 import QtQuick.Controls 2.15 as QQC2
 import QtQuick.Layouts 1.15
 import org.kde.kirigami 2.20 as Kirigami
+import org.kde.kirigamiaddons.labs.components 1.0 as KirigamiComponents

 import org.kde.neochat 1.0

@@ -17,11 +18,14 @@ ColumnLayout {
    RowLayout {
        Layout.fillWidth: true
        Layout.leftMargin: Kirigami.Units.largeSpacing
+        Layout.topMargin: Kirigami.Units.largeSpacing
+        Layout.bottomMargin: Kirigami.Units.largeSpacing
+
        spacing: Kirigami.Units.largeSpacing

-        Kirigami.Avatar {
-            Layout.preferredWidth: Kirigami.Units.gridUnit * 3.5
-            Layout.preferredHeight: Kirigami.Units.gridUnit * 3.5
+        KirigamiComponents.Avatar {
+            Layout.preferredWidth: Kirigami.Units.iconSizes.large
+            Layout.preferredHeight: Kirigami.Units.iconSizes.large

            name: room ? room.displayName : ""
            source: room && room.avatarMediaId ? ("image://mxc/" +  room.avatarMediaId) : ""
@@ -47,6 +51,7 @@ ColumnLayout {
            }
        }

+
        ColumnLayout {
            Layout.fillWidth: true
            Layout.alignment: Qt.AlignVCenter
@@ -54,14 +59,13 @@ ColumnLayout {

            Kirigami.Heading {
                Layout.fillWidth: true
-                type: Kirigami.Heading.Type.Primary
-                wrapMode: QQC2.Label.Wrap
                text: room ? room.displayName : i18n("No name")
                textFormat: Text.PlainText
            }

            Kirigami.SelectableLabel {
                Layout.fillWidth: true
+                font: Kirigami.Theme.smallFont
                textFormat: TextEdit.PlainText
                text: room && room.canonicalAlias ? room.canonicalAlias : i18n("No Canonical Alias")
            }
--- a/src/qml/Panel/RoomDrawer.qml
+++ b/src/qml/Panel/RoomDrawer.qml
@@ -7,6 +7,8 @@ import QtQuick.Controls 2.15 as QQC2
 import QtQuick.Layouts 1.15

 import org.kde.kirigami 2.20 as Kirigami
+import org.kde.kirigamiaddons.delegates 1.0 as Delegates
+import org.kde.kirigamiaddons.labs.components 1.0 as KirigamiComponents
 import org.kde.kitemmodels 1.0

 import org.kde.neochat 1.0
@@ -73,11 +75,15 @@ Kirigami.OverlayDrawer {
        active: roomDrawer.drawerOpen

        sourceComponent: ColumnLayout {
-            readonly property string userSearchText: userListView.headerItem.userListSearchField.text
+            readonly property string userSearchText: userListView.headerItem ? userListView.headerItem.userListSearchField.text : ''
            property alias highlightedUser: userListView.currentIndex

            spacing: 0

+            function clearSearch() {
+                userListView.headerItem.userListSearchField.text = ""
+            }
+
            QQC2.ToolBar {
                Layout.fillWidth: true

@@ -120,7 +126,7 @@ Kirigami.OverlayDrawer {

                        property alias userListSearchField: userListSearchField

-                        spacing: Kirigami.Units.largeSpacing
+                        spacing: 0
                        width: userListView.width

                        Loader {
@@ -128,31 +134,41 @@ Kirigami.OverlayDrawer {
                            Layout.fillWidth: true
                            Layout.topMargin: Kirigami.Units.smallSpacing
                            sourceComponent: room.isDirectChat() ? directChatDrawerHeader : groupChatDrawerHeader
+                            onItemChanged: if (item) {
+                                userListView.positionViewAtBeginning();
+                            }
                        }

                        Kirigami.ListSectionHeader {
                            label: i18n("Options")
                            activeFocusOnTab: false
+
+                            Layout.fillWidth: true
                        }

-                        Kirigami.BasicListItem {
+                        Delegates.RoundedItemDelegate {
                            id: devtoolsButton

-                            icon: "tools"
+                            icon.name: "tools"
                            text: i18n("Open developer tools")
                            visible: Config.developerTools

+                            Layout.fillWidth: true
+
                            onClicked: {
                                applicationWindow().pageStack.layers.push("qrc:/DevtoolsPage.qml", {room: room}, {title: i18n("Developer Tools")})
                                roomDrawer.close();
                            }
                        }
-                        Kirigami.BasicListItem {
+
+                        Delegates.RoundedItemDelegate {
                            id: searchButton

-                            icon: "search"
+                            icon.name: "search"
                            text: i18n("Search in this room")

+                            Layout.fillWidth: true
+
                            onClicked: {
                                pageStack.pushDialogLayer("qrc:/SearchPage.qml", {
                                    currentRoom: room
@@ -161,19 +177,22 @@ Kirigami.OverlayDrawer {
                                })
                            }
                        }
-                        Kirigami.BasicListItem {
+
+                        Delegates.RoundedItemDelegate {
                            id: favouriteButton

-                            icon: room && room.isFavourite ? "rating" : "rating-unrated"
+                            icon.name: room && room.isFavourite ? "rating" : "rating-unrated"
                            text: room && room.isFavourite ? i18n("Remove room from favorites") : i18n("Make room favorite")

                            onClicked: room.isFavourite ? room.removeTag("m.favourite") : room.addTag("m.favourite", 1.0)
+
+                            Layout.fillWidth: true
                        }

-                        Kirigami.BasicListItem {
+                        Delegates.RoundedItemDelegate {
                            id: locationsButton

-                            icon: "map-flat"
+                            icon.name: "map-flat"
                            text: i18n("Show locations for this room")

                            onClicked: pageStack.pushDialogLayer("qrc:/LocationsPage.qml", {
@@ -181,6 +200,8 @@ Kirigami.OverlayDrawer {
                            }, {
                                title: i18nc("Locations on a map", "Locations")
                            })
+
+                            Layout.fillWidth: true
                        }

                        Kirigami.ListSectionHeader {
@@ -189,6 +210,8 @@ Kirigami.OverlayDrawer {
                            spacing: 0
                            visible: !room.isDirectChat()

+                            Layout.fillWidth: true
+
                            QQC2.ToolButton {
                                id: memberSearchToggle
                                checkable: true
@@ -255,44 +278,62 @@ Kirigami.OverlayDrawer {
                    clip: true
                    activeFocusOnTab: true

-                    delegate: Kirigami.BasicListItem {
-                        id: userListItem
+                    delegate: Delegates.RoundedItemDelegate {
+                        id: userDelegate
+
+                        required property string name
+                        required property string userId
+                        required property string avatar
+                        required property int powerLevel
+                        required property string powerLevelString

                        implicitHeight: Kirigami.Units.gridUnit * 2
-                        leftPadding: Kirigami.Units.largeSpacing + Kirigami.Units.smallSpacing

-                        label: name
-                        labelItem.textFormat: Text.PlainText
+                        text: name

                        onClicked: {
+                            userDelegate.highlighted = true;
                            const popup = userDetailDialog.createObject(QQC2.ApplicationWindow.overlay, {
                                room: room,
-                                user: room.getUser(user.id)
-                            })
-                            popup.closed.connect(function() {
-                                userListItem.highlighted = false
-                            })
+                                user: room.getUser(userDelegate.userId)
+                            });
+                            popup.closed.connect(() => {
+                                userDelegate.highlighted = false;
+                            });
                            if (roomDrawer.modal) {
-                                roomDrawer.close()
+                                roomDrawer.close();
                            }
-                            popup.open()
+                            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
-                            name: model.userId
-                        }
+                        contentItem: RowLayout {
+                            KirigamiComponents.Avatar {
+                                implicitWidth: height
+                                sourceSize {
+                                    height: Kirigami.Units.gridUnit + Kirigami.Units.smallSpacing * 2.5
+                                    width: Kirigami.Units.gridUnit + Kirigami.Units.smallSpacing * 2.5
+                                }
+                                source: userDelegate.avatar
+                                name: userDelegate.userId

-                        trailing: QQC2.Label {
-                            visible: powerLevel > 0
+                                Layout.fillHeight: true
+                            }

-                            text: powerLevelString
-                            color: Kirigami.Theme.disabledTextColor
-                            textFormat: Text.PlainText
-                            wrapMode: Text.NoWrap
+                            QQC2.Label {
+                                text: userDelegate.name
+                                textFormat: Text.PlainText
+                                elide: Text.ElideRight
+
+                                Layout.fillWidth: true
+                            }
+
+                            QQC2.Label {
+                                visible: userDelegate.powerLevel > 0
+
+                                text: userDelegate.powerLevelString
+                                color: Kirigami.Theme.disabledTextColor
+                                textFormat: Text.PlainText
+                            }
                        }
                    }
                }
@@ -302,7 +343,7 @@ Kirigami.OverlayDrawer {

    onRoomChanged: {
        if (loader.active) {
-            loader.item.userSearchText = ""
+            loader.item.clearSearch()
            loader.item.highlightedUser = -1
        }
        if (room == null) {
--- a/src/qml/RoomSettings/General.qml
+++ b/src/qml/RoomSettings/General.qml
@@ -9,6 +9,7 @@ import QtQuick.Window 2.15

 import org.kde.kirigami 2.15 as Kirigami
 import org.kde.kirigamiaddons.labs.mobileform 0.1 as MobileForm
+import org.kde.kirigamiaddons.labs.components 1.0 as KirigamiComponents

 import org.kde.neochat 1.0

@@ -38,11 +39,13 @@ Kirigami.ScrollablePage {
                        Item {
                            Layout.fillWidth: true
                        }
-                        Kirigami.Avatar {
+                        KirigamiComponents.Avatar {
                            id: avatar
                            Layout.alignment: Qt.AlignRight
                            name: room.name
                            source: room.avatarMediaId ? ("image://mxc/" + room.avatarMediaId) : ""
+                            implicitWidth: Kirigami.Units.iconSizes.medium
+                            implicitHeight: Kirigami.Units.iconSizes.medium
                        }
                        QQC2.Button {
                            Layout.alignment: Qt.AlignLeft
--- a/src/qml/RoomSettings/Permissions.qml
+++ b/src/qml/RoomSettings/Permissions.qml
@@ -7,6 +7,8 @@ import QtQuick.Layouts 1.15

 import org.kde.kirigami 2.15 as Kirigami
 import org.kde.kirigamiaddons.labs.mobileform 0.1 as MobileForm
+import org.kde.kirigamiaddons.delegates 1.0 as Delegates
+import org.kde.kirigamiaddons.labs.components 1.0 as KirigamiComponents
 import org.kde.kitemmodels 1.0

 import org.kde.neochat 1.0
@@ -93,17 +95,19 @@ Kirigami.ScrollablePage {
                    visible: room.canSendState("m.room.power_levels")

                    contentItem: Kirigami.SearchField {
-                            id: userListSearchField
-                            Layout.fillWidth: true
-                            autoAccept: false
+                        id: userListSearchField

-                            Keys.onUpPressed: userListView.decrementCurrentIndex()
-                            Keys.onDownPressed: userListView.incrementCurrentIndex()
+                        autoAccept: false

-                            onAccepted: {
-                                let currentUser = userListView.itemAtIndex(userListView.currentIndex);
-                                currentUser.action.trigger();
-                            }
+                        Layout.fillWidth: true
+
+                        Keys.onUpPressed: userListView.decrementCurrentIndex()
+                        Keys.onDownPressed: userListView.incrementCurrentIndex()
+
+                        onAccepted: {
+                            let currentUser = userListView.itemAtIndex(userListView.currentIndex);
+                            currentUser.action.trigger();
+                        }
                    }
                    QQC2.Popup {
                        id: userListSearchPopup
@@ -119,21 +123,31 @@ Kirigami.ScrollablePage {
                            return Math.max(Math.min(filterContentHeight, maxHeight), minHeight);
                        }
                        padding: Kirigami.Units.smallSpacing
+                        leftPadding: Kirigami.Units.smallSpacing / 2
+                        rightPadding: Kirigami.Units.smallSpacing / 2
                        modal: false
                        onClosed: userListSearchField.text = ""

                        background: Kirigami.ShadowedRectangle {
+                            property color borderColor: Kirigami.Theme.textColor
+
+                            Kirigami.Theme.colorSet: Kirigami.Theme.View
+                            Kirigami.Theme.inherit: false
+
                            radius: 4
                            color: Kirigami.Theme.backgroundColor

-                            property color borderColor: Kirigami.Theme.textColor
-                            border.color: Qt.rgba(borderColor.r, borderColor.g, borderColor.b, 0.3)
-                            border.width: 1
+                            border {
+                                color: Qt.rgba(borderColor.r, borderColor.g, borderColor.b, 0.3)
+                                width: 1
+                            }

-                            shadow.xOffset: 0
-                            shadow.yOffset: 4
-                            shadow.color: Qt.rgba(0, 0, 0, 0.3)
-                            shadow.size: 8
+                            shadow {
+                                xOffset: 0
+                                yOffset: 4
+                                color: Qt.rgba(0, 0, 0, 0.3)
+                                size: 8
+                            }
                        }

                        contentItem: QQC2.ScrollView {
@@ -158,16 +172,42 @@ Kirigami.ScrollablePage {
                                    }
                                }

-                                delegate: Kirigami.BasicListItem {
+                                delegate: Delegates.RoundedItemDelegate {
                                    id: userListItem

-                                    implicitHeight: Kirigami.Units.gridUnit * 2
-                                    leftPadding: Kirigami.Units.largeSpacing + Kirigami.Units.smallSpacing
+                                    required property string userId
+                                    required property string avatar
+                                    required property string name
+                                    required property int powerLevel
+                                    required property string powerLevelString

-                                    label: name
-                                    labelItem.textFormat: Text.PlainText
-                                    subtitle: userId
-                                    subtitleItem.textFormat: Text.PlainText
+                                    text: name
+
+                                    contentItem: RowLayout {
+                                        KirigamiComponents.Avatar {
+                                            Layout.preferredWidth: Kirigami.Units.iconSizes.medium
+                                            Layout.preferredHeight: Kirigami.Units.iconSizes.medium
+                                            source: userListItem.avatar ? ("image://" + userListItem.avatar) : ""
+                                            name: userListItem.name
+                                        }
+
+                                        Delegates.SubtitleContentItem {
+                                            itemDelegate: userListItem
+                                            subtitle: userListItem.userId
+                                            labelItem.textFormat: Text.PlainText
+                                            subtitleItem.textFormat: Text.PlainText
+                                            Layout.fillWidth: true
+                                        }
+
+                                        QQC2.Label {
+                                            visible: userListItem.powerLevel > 0
+
+                                            text: userListItem.powerLevelString
+                                            color: Kirigami.Theme.disabledTextColor
+                                            textFormat: Text.PlainText
+                                            wrapMode: Text.NoWrap
+                                        }
+                                    }

                                    action: Kirigami.Action {
                                        id: editPowerLevelAction
@@ -175,30 +215,13 @@ Kirigami.ScrollablePage {
                                            userListSearchPopup.close()
                                            let dialog = powerLevelDialog.createObject(applicationWindow().overlay, {
                                                room: root.room,
-                                                userId: model.userId,
-                                                powerLevel: model.powerLevel
+                                                userId: userListItem.userId,
+                                                powerLevel: userListItem.powerLevel
                                            });
                                            dialog.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: model.userId
-                                    }
-
-                                    trailing: QQC2.Label {
-                                        visible: powerLevel > 0
-
-                                        text: powerLevelString
-                                        color: Kirigami.Theme.disabledTextColor
-                                        textFormat: Text.PlainText
-                                        wrapMode: Text.NoWrap
-                                    }
-
                                    Component {
                                        id: powerLevelDialog
                                        PowerLevelDialog {
--- a/src/qml/Settings/AccountEditorPage.qml
+++ b/src/qml/Settings/AccountEditorPage.qml
@@ -10,6 +10,7 @@ import QtQuick.Window 2.15

 import org.kde.kirigami 2.15 as Kirigami
 import org.kde.kirigamiaddons.labs.mobileform 0.1 as MobileForm
+import org.kde.kirigamiaddons.labs.components 1.0 as KirigamiComponents
 import org.kde.neochat 1.0

 Kirigami.ScrollablePage {
@@ -24,6 +25,78 @@ Kirigami.ScrollablePage {
    rightPadding: 0
    ColumnLayout {
        spacing: 0
+
+        QQC2.RoundButton {
+            property var fileDialog: null;
+
+            Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
+            Layout.topMargin: Kirigami.Units.largeSpacing
+
+            // Square button
+            implicitWidth: Kirigami.Units.gridUnit * 5
+            implicitHeight: implicitWidth
+
+            padding: 0
+
+            contentItem: KirigamiComponents.Avatar {
+                id: avatar
+                source: root.connection && root.connection.localUser.avatarMediaId ? ("image://mxc/" + root.connection.localUser.avatarMediaId) : ""
+                name: root.connection.localUser.displayName
+            }
+
+            onClicked: {
+                if (fileDialog != null) {
+                    return;
+                }
+
+                fileDialog = openFileDialog.createObject(QQC2.ApplicationWindow.Overlay)
+                fileDialog.chosen.connect(function(receivedSource) {
+                    if (!receivedSource) {
+                        return;
+                    }
+                    avatar.source = receivedSource;
+                });
+                fileDialog.onRejected.connect(function() {
+                    mouseArea.fileDialog = null;
+                });
+                fileDialog.open();
+            }
+
+            QQC2.Button {
+                anchors {
+                    bottom: parent.bottom
+                    right: parent.right
+                }
+                visible: avatar.source.toString().length === 0
+                icon.name: "cloud-upload"
+                text: i18n("Upload new avatar")
+                display: QQC2.AbstractButton.IconOnly
+
+                onClicked: parent.onClicked()
+
+                QQC2.ToolTip.text: text
+                QQC2.ToolTip.visible: hovered
+                QQC2.ToolTip.delay: Kirigami.Units.toolTipDelay
+            }
+
+            QQC2.Button {
+                anchors {
+                    bottom: parent.bottom
+                    right: parent.right
+                }
+                visible: avatar.source.toString().length !== 0
+                icon.name: "edit-clear"
+                text: i18n("Remove current avatar")
+                display: QQC2.AbstractButton.IconOnly
+
+                onClicked: avatar.source = ""
+
+                QQC2.ToolTip.text: text
+                QQC2.ToolTip.visible: hovered
+                QQC2.ToolTip.delay: Kirigami.Units.toolTipDelay
+            }
+        }
+
        MobileForm.FormHeader {
            Layout.fillWidth: true
            title: i18n("User information")
@@ -32,73 +105,22 @@ Kirigami.ScrollablePage {
            Layout.fillWidth: true
            contentItem: ColumnLayout {
                spacing: 0
-                MobileForm.AbstractFormDelegate {
-                    Layout.fillWidth: true
-                    background: Item {}
-                    contentItem: RowLayout {
-                        Item {
-                            Layout.fillWidth: true
-                        }
-                        Kirigami.Avatar {
-                            id: avatar
-                            Layout.alignment: Qt.AlignRight
-                            source: root.connection && root.connection.localUser.avatarMediaId ? ("image://mxc/" + root.connection.localUser.avatarMediaId) : ""
-                            name: root.connection.localUser.displayName
-
-                            MouseArea {
-                                id: mouseArea
-                                anchors.fill: parent
-                                property var fileDialog: null;
-                                onClicked: {
-                                    if (fileDialog != null) {
-                                        return;
-                                    }
-
-                                    fileDialog = openFileDialog.createObject(QQC2.ApplicationWindow.Overlay)
-                                    fileDialog.chosen.connect(function(receivedSource) {
-                                        mouseArea.fileDialog = null;
-                                        if (!receivedSource) {
-                                            return;
-                                        }
-                                        parent.source = receivedSource;
-                                    });
-                                    fileDialog.onRejected.connect(function() {
-                                        mouseArea.fileDialog = null;
-                                    });
-                                    fileDialog.open();
-                                }
-                            }
-                        }
-                        QQC2.Button {
-                            Layout.alignment: Qt.AlignLeft
-                            visible: avatar.source.toString().length !== 0
-                            icon.name: "edit-clear"
-                            text: i18n("Remove current avatar")
-                            display: QQC2.AbstractButton.IconOnly
-
-                            onClicked: avatar.source = ""
-
-                            QQC2.ToolTip.text: text
-                            QQC2.ToolTip.visible: hovered
-                        }
-                        Item {
-                            Layout.fillWidth: true
-                        }
-                    }
-                }
                MobileForm.FormTextFieldDelegate {
                    id: name
                    label: i18n("Name:")
                    text: root.connection ? root.connection.localUser.displayName : ""
                }
+                MobileForm.FormDelegateSeparator {}
                MobileForm.FormTextFieldDelegate {
                    id: accountLabel
                    label: i18n("Label:")
                    text: root.connection ? Controller.activeAccountLabel : ""
                }
+                MobileForm.FormDelegateSeparator {}
                MobileForm.AbstractFormDelegate {
                    Layout.fillWidth: true
-                    background: Item {}
+                    background: null
+                    padding: Kirigami.Units.smallSpacing
                    contentItem: RowLayout {
                        Item {
                            Layout.fillWidth: true
@@ -136,18 +158,21 @@ Kirigami.ScrollablePage {
                    visible: root.connection !== undefined && root.connection.canChangePassword === false
                    text: i18n("Your server doesn't support changing your password")
                }
+                MobileForm.FormDelegateSeparator { visible: root.connection !== undefined && root.connection.canChangePassword === false }
                MobileForm.FormTextFieldDelegate {
                    id: currentPassword
                    label: i18n("Current Password:")
                    enabled: root.connection !== undefined && root.connection.canChangePassword !== false
                    echoMode: TextInput.Password
                }
+                MobileForm.FormDelegateSeparator {}
                MobileForm.FormTextFieldDelegate {
                    id: newPassword
                    label: i18n("New Password:")
                    enabled: root.connection !== undefined && root.connection.canChangePassword !== false
                    echoMode: TextInput.Password
                }
+                MobileForm.FormDelegateSeparator {}
                MobileForm.FormTextFieldDelegate {
                    id: confirmPassword
                    label: i18n("Confirm new Password:")
@@ -161,9 +186,10 @@ Kirigami.ScrollablePage {
                        confirmPassword.statusMessage = '';
                    }
                }
+                MobileForm.FormDelegateSeparator {}
                MobileForm.AbstractFormDelegate {
                    Layout.fillWidth: true
-                    background: Item {}
+                    background: null
                    contentItem: RowLayout {
                        Item {
                            Layout.fillWidth: true
--- a/src/qml/Settings/AccountsPage.qml
+++ b/src/qml/Settings/AccountsPage.qml
@@ -8,6 +8,7 @@ import Qt.labs.platform 1.1

 import org.kde.kirigami 2.19 as Kirigami
 import org.kde.kirigamiaddons.labs.mobileform 0.1 as MobileForm
+import org.kde.kirigamiaddons.labs.components 1.0 as KirigamiComponents

 import org.kde.neochat 1.0

@@ -38,7 +39,7 @@ Kirigami.ScrollablePage {
                        })

                        contentItem: RowLayout {
-                            Kirigami.Avatar {
+                            KirigamiComponents.Avatar {
                                name: model.connection.localUser.displayName
                                source: model.connection.localUser.avatarMediaId ? ("image://mxc/" + model.connection.localUser.avatarMediaId) : ""

--- a/src/qml/Settings/AppearanceSettingsPage.qml
+++ b/src/qml/Settings/AppearanceSettingsPage.qml
@@ -8,6 +8,7 @@ import QtQuick.Layouts 1.15

 import org.kde.kirigami 2.15 as Kirigami
 import org.kde.kirigamiaddons.labs.mobileform 0.1 as MobileForm
+import org.kde.kirigamiaddons.labs.components 1.0 as KirigamiComponents

 import org.kde.neochat 1.0

@@ -42,7 +43,7 @@ Kirigami.ScrollablePage {
                            innerObject: [
                                RowLayout {
                                    Layout.fillWidth: true
-                                    Kirigami.Avatar {
+                                    KirigamiComponents.Avatar {
                                        color: "#4a5bcc"
                                        Layout.alignment: Qt.AlignTop
                                        visible: Config.showAvatarInTimeline
@@ -79,7 +80,7 @@ Kirigami.ScrollablePage {
                                },
                                RowLayout {
                                    Layout.fillWidth: true
-                                    Kirigami.Avatar {
+                                    KirigamiComponents.Avatar {
                                        color: "#9f244b"
                                        Layout.alignment: Qt.AlignTop
                                        visible: Config.showAvatarInTimeline
@@ -132,7 +133,7 @@ Kirigami.ScrollablePage {
                            innerObject: [
                                RowLayout {
                                    Layout.fillWidth: true
-                                    Kirigami.Avatar {
+                                    KirigamiComponents.Avatar {
                                        color: "#4a5bcc"
                                        Layout.alignment: Qt.AlignTop
                                        visible: Config.showAvatarInTimeline
@@ -159,7 +160,7 @@ Kirigami.ScrollablePage {
                                },
                                RowLayout {
                                    Layout.fillWidth: true
-                                    Kirigami.Avatar {
+                                    KirigamiComponents.Avatar {
                                        color: "#9f244b"
                                        Layout.alignment: Qt.AlignTop
                                        visible: Config.showAvatarInTimeline
--- a/src/qml/Settings/DeviceDelegate.qml
+++ b/src/qml/Settings/DeviceDelegate.qml
@@ -15,7 +15,7 @@ MobileForm.AbstractFormDelegate {
    id: deviceDelegate

    required property string id
-    required property int lastTimestamp
+    required property string timestamp
    required property string displayName

    property bool editDeviceName: false
@@ -49,7 +49,7 @@ MobileForm.AbstractFormDelegate {

            QQC2.Label {
                Layout.fillWidth: true
-                text: deviceDelegate.id + ", Last activity: " +  (new Date(deviceDelegate.lastTimestamp)).toLocaleString(Qt.locale(), Locale.ShortFormat)
+                text: i18nc("@label", "%1, Last activity: %2", deviceDelegate.id, deviceDelegate.timestamp)
                color: Kirigami.Theme.disabledTextColor
                font: Kirigami.Theme.smallFont
                elide: Text.ElideRight
@@ -131,4 +131,4 @@ MobileForm.AbstractFormDelegate {
            }
        }
    }
-}
+}
--- a/src/qml/main.qml
+++ b/src/qml/main.qml
@@ -242,7 +242,6 @@ Kirigami.ApplicationWindow {

        function onInitiated() {
            if (Controller.accountCount === 0) {
-                console.warn("9")
                pageStack.replace("qrc:/WelcomePage.qml", {});
            } else if (!roomListLoaded) {
                pageStack.replace(roomListComponent, {
--- a/src/runner.cpp
+++ b/src/runner.cpp
@@ -61,7 +61,7 @@ RemoteMatches Runner::Match(const QString &searchTerm)
        const QString name = m_model.data(m_model.index(i, 0), RoomListModel::DisplayNameRole).toString();

        match.iconName = QStringLiteral("org.kde.neochat");
-        match.id = m_model.data(m_model.index(i, 0), RoomListModel::IdRole).toString();
+        match.id = m_model.data(m_model.index(i, 0), RoomListModel::RoomIdRole).toString();
        match.text = name;
        match.relevance = 1;
        const RemoteImage remoteImage = serializeImage(m_model.data(m_model.index(i, 0), RoomListModel::AvatarImageRole).value<QImage>());
Author	SHA1	Message	Date
Albert Astals Cid	c77dee09f5	GIT_SILENT Upgrade release service version to 23.07.90.	2023-08-10 21:00:24 +02:00
l10n daemon script	26dde017d0	GIT_SILENT Sync po/docbooks with svn	2023-08-10 03:07:45 +00:00
l10n daemon script	5b27a84bcc	GIT_SILENT Sync po/docbooks with svn	2023-08-09 03:12:18 +00:00
Carl Schwan	fc3c36838c	Display big emoji correctly We already check with a regex if the message only contains emoji so it is safe to hardcode the font family as emoji for these messages. (cherry picked from commit `58213ee3e6`)	2023-08-08 15:00:29 +02:00
l10n daemon script	1fd2072cf8	GIT_SILENT Sync po/docbooks with svn	2023-08-08 03:23:23 +00:00
l10n daemon script	7770d412b3	GIT_SILENT made messages (after extraction)	2023-08-08 02:36:56 +00:00
Tobias Fella	56184920b4	Force plain text in room delegate (cherry picked from commit `3ab04583ae`)	2023-08-07 23:14:58 +02:00
l10n daemon script	b61685b151	GIT_SILENT Sync po/docbooks with svn	2023-08-07 03:49:13 +00:00
l10n daemon script	be0212a686	SVN_SILENT made messages (.desktop file) - always resolve ours In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop"	2023-08-07 03:39:29 +00:00
l10n daemon script	37ed09f957	GIT_SILENT made messages (after extraction)	2023-08-07 03:00:36 +00:00
l10n daemon script	1b7e8ae77a	GIT_SILENT Sync po/docbooks with svn	2023-08-06 03:13:44 +00:00
Tobias Fella	7571b0a9a3	Remove leftover debug statement (cherry picked from commit `88368cefaa`)	2023-08-06 00:52:20 +02:00
Tobias Fella	9477e6343f	Fix last active time in devices page (cherry picked from commit `ab4bb41979`)	2023-08-05 20:34:00 +02:00
l10n daemon script	83241ea956	GIT_SILENT Sync po/docbooks with svn	2023-08-03 04:06:32 +00:00
l10n daemon script	f054467878	GIT_SILENT made messages (after extraction)	2023-08-03 03:11:57 +00:00
l10n daemon script	fb7154b492	GIT_SILENT Sync po/docbooks with svn	2023-08-02 03:20:51 +00:00
l10n daemon script	973a75128c	SVN_SILENT made messages (.desktop file) - always resolve ours In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop"	2023-08-02 03:13:39 +00:00
l10n daemon script	9ea70d7eac	GIT_SILENT made messages (after extraction)	2023-08-02 02:35:56 +00:00
l10n daemon script	7f8285037c	GIT_SILENT Sync po/docbooks with svn	2023-08-01 03:26:38 +00:00
Carl Schwan	c5f19f12e5	Redesign timeline Remove border von bubbles and only hilight the bubble on hover (cherry picked from commit `7f459cb90f`)	2023-07-31 21:51:12 +02:00
Carl Schwan	ed6379ff85	Fix opening account menu on right click (cherry picked from commit `5f41b7b4c1`)	2023-07-31 09:03:01 +02:00
l10n daemon script	9750df90e0	GIT_SILENT Sync po/docbooks with svn	2023-07-31 04:06:19 +00:00
l10n daemon script	bd90658668	GIT_SILENT made messages (after extraction)	2023-07-31 03:12:56 +00:00
l10n daemon script	f78b634720	GIT_SILENT Sync po/docbooks with svn	2023-07-30 03:13:52 +00:00
Tobias Fella	250476f77c	Html-escape display names in state delegates (cherry picked from commit `163c1ef407`)	2023-07-29 22:31:46 +02:00
Tobias Fella	e293d1f644	Fix room list icon size in compact room list BUG: 472682 (cherry picked from commit `3bd639775a`)	2023-07-29 22:31:14 +02:00
l10n daemon script	cde50588cb	GIT_SILENT Sync po/docbooks with svn	2023-07-29 03:09:59 +00:00
l10n daemon script	3972dab7b9	GIT_SILENT made messages (after extraction)	2023-07-29 02:26:29 +00:00
Carl Schwan	7c1b43bcad	Fix compilation with e2ee disabled	2023-07-28 13:01:54 +02:00
l10n daemon script	c22c74f735	GIT_SILENT Sync po/docbooks with svn	2023-07-28 03:18:59 +00:00
l10n daemon script	9c42b3c1a7	GIT_SILENT Sync po/docbooks with svn	2023-07-27 03:12:00 +00:00
l10n daemon script	d45cd5d9c9	GIT_SILENT made messages (after extraction)	2023-07-27 02:26:28 +00:00
Joshua Goins	8c503b8258	Use prettier notification images Avatars are shown rounded in the main interface, so they should look the same in the notification tray too. On top of that, if the room is a group then show that group's icon when applicable in the bottom right. (cherry picked from commit `470418f14f`)	2023-07-26 10:31:47 +02:00
Joshua Goins	7078caac15	Fix errors preventing the avatar from being shown when uploaded (cherry picked from commit `807a9ee779`)	2023-07-26 10:29:06 +02:00
Joshua Goins	94bf65ab43	Add an obvious "upload" button in the account editor It's not obvious at first glance that you can click on the avatar in the account editor to upload an image. This adds a new button when there is no image uploaded. (cherry picked from commit `0ac3932303`)	2023-07-26 10:28:32 +02:00
Joshua Goins	244e93c926	Fix settings button tooltip (cherry picked from commit `4f32a168cd`)	2023-07-26 08:38:06 +02:00
l10n daemon script	412856e882	GIT_SILENT Sync po/docbooks with svn	2023-07-26 03:13:49 +00:00
l10n daemon script	2421f11717	GIT_SILENT Sync po/docbooks with svn	2023-07-25 03:20:17 +00:00
l10n daemon script	2d42cfedec	GIT_SILENT made messages (after extraction)	2023-07-25 02:30:45 +00:00
l10n daemon script	9308c84696	GIT_SILENT Sync po/docbooks with svn	2023-07-24 11:06:34 +00:00
l10n daemon script	72fc242364	SVN_SILENT made messages (.desktop file) - always resolve ours In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop"	2023-07-24 10:47:48 +00:00
Carl Schwan	7d3240c597	Refactor completion menu - Use new Avatar - Use required property in delegate (cherry picked from commit `75cd77facb`)	2023-07-24 10:46:57 +02:00
Carl Schwan	9906ba8b7d	Move no connection info message to the top (cherry picked from commit `f8d3e25f8e`)	2023-07-24 10:46:35 +02:00
Tobias Fella	b949092bc6	Fix clearing user search field text when switching rooms (cherry picked from commit `9ba6b2f0a5`)	2023-07-24 10:46:16 +02:00
Tobias Fella	5cce3bd692	Fix nullptr check	2023-07-23 23:12:01 +02:00
Carl Schwan	ef5d67e5bf	Add back some spacing around the avatar in the timeline (cherry picked from commit `b486cb905c`)	2023-07-22 22:32:28 +02:00
Carl Schwan	4711b954c5	Fix accessibility of StartChatPage and port to new components (cherry picked from commit `cdd5c9f484`)	2023-07-22 22:32:27 +02:00
Carl Schwan	1688b00f48	Port Avatar usage in Settings KirigamiAddons (cherry picked from commit `3e6c426397`)	2023-07-22 22:32:27 +02:00
Carl Schwan	410befa4bf	Port most Avatar usage to new KirigamiAddons Avatar (cherry picked from commit `847f41e1ad`)	2023-07-22 22:32:27 +02:00
Carl Schwan	b380c74b0e	Remove hover effect on timeline events	2023-07-22 22:32:20 +02:00
Carl Schwan	da8227931f	Remove duplicated code in QuickSwitcher for RoomDelegate	2023-07-22 22:31:42 +02:00
Carl Schwan	fdc45ec5c8	Redesign room list Use KirigamiAddons.Delegated.RoundedItemDelegate	2023-07-22 22:31:38 +02:00
Carl Schwan	94dd69ea02	Scroll to top of RoomDrawer on loading of header (cherry picked from commit `c8b4da2b96`)	2023-07-22 17:53:06 +00:00
Carl Schwan	80c3253a6e	Discard wrong avatar urls (cherry picked from commit `ed5bb270ff`)	2023-07-22 17:51:46 +00:00
l10n daemon script	c5f6a6607e	GIT_SILENT Sync po/docbooks with svn	2023-07-21 03:39:31 +00:00
l10n daemon script	a10d5cbe75	GIT_SILENT Sync po/docbooks with svn	2023-07-20 03:31:32 +00:00
l10n daemon script	584cad19b1	GIT_SILENT made messages (after extraction)	2023-07-20 02:45:39 +00:00
Carl Schwan	3745414635	Port to KirigamAddons.Banner (cherry picked from commit `3263a69880`)	2023-07-19 22:48:56 +02:00
l10n daemon script	147ce42c04	GIT_SILENT Sync po/docbooks with svn	2023-07-19 05:18:38 +00:00
l10n daemon script	928feeca82	GIT_SILENT made messages (after extraction)	2023-07-18 08:31:37 +00:00
Tobias Fella	fc04af536d	Fix opening user mentions (cherry picked from commit `646c8ba8fe`)	2023-07-18 08:06:16 +02:00
Tobias Fella	12b949d6cb	Fix image loading in room avatars (cherry picked from commit `918e805718`)	2023-07-18 05:26:04 +00:00
l10n daemon script	6aaaabf159	GIT_SILENT Sync po/docbooks with svn	2023-07-18 04:13:52 +00:00
l10n daemon script	fe45ef85a6	GIT_SILENT made messages (after extraction)	2023-07-18 02:55:30 +00:00
Albert Astals Cid	13e38ed982	GIT_SILENT Upgrade release service version to 23.07.80.	2023-07-17 11:25:34 +02:00