diff --git a/resources/langs/nheko_de.ts b/resources/langs/nheko_de.ts
index 757f86c0..bd65e867 100644
--- a/resources/langs/nheko_de.ts
+++ b/resources/langs/nheko_de.ts
@@ -10,7 +10,7 @@
     </message>
     <message>
         <location line="+4"/>
-        <location line="+894"/>
+        <location line="+866"/>
         <source>Invited user: %1</source>
         <translation>Eingeladener Benutzer: %1</translation>
     </message>
@@ -50,12 +50,12 @@
         <translation>Verbannung von %1 wurde aufgehoben.</translation>
     </message>
     <message>
-        <location line="-815"/>
+        <location line="-791"/>
         <source>Failed to upload media. Please try again.</source>
         <translation>Medienupload fehlgeschlagen. Bitte versuche es erneut.</translation>
     </message>
     <message>
-        <location line="+407"/>
+        <location line="+404"/>
         <source>Failed to restore OLM account. Please login again.</source>
         <translation>Wiederherstellung des OLM Accounts fehlgeschlagen. Bitte logge dich erneut ein.</translation>
     </message>
@@ -71,7 +71,7 @@
     </message>
     <message>
         <location line="+51"/>
-        <location line="+231"/>
+        <location line="+210"/>
         <source>Please try to login again: %1</source>
         <translation>Bitte melde dich erneut an: %1</translation>
     </message>
@@ -248,7 +248,7 @@
 <context>
     <name>MessageDelegate</name>
     <message>
-        <location filename="../qml/delegates/MessageDelegate.qml" line="+63"/>
+        <location filename="../qml/delegates/MessageDelegate.qml" line="+64"/>
         <source>redacted</source>
         <translation>gelöscht</translation>
     </message>
@@ -352,18 +352,10 @@
         <translation>Ungültiger Servername</translation>
     </message>
 </context>
-<context>
-    <name>ReplyPopup</name>
-    <message>
-        <location filename="../../src/popups/ReplyPopup.cpp" line="+46"/>
-        <source>Logout</source>
-        <translation>Abmelden</translation>
-    </message>
-</context>
 <context>
     <name>RoomInfo</name>
     <message>
-        <location filename="../../src/Cache.cpp" line="+2304"/>
+        <location filename="../../src/Cache.cpp" line="+2311"/>
         <source>no version stored</source>
         <translation>keine Version gespeichert</translation>
     </message>
@@ -440,13 +432,13 @@
 <context>
     <name>TextInputWidget</name>
     <message>
-        <location filename="../../src/TextInputWidget.cpp" line="+493"/>
+        <location filename="../../src/TextInputWidget.cpp" line="+459"/>
         <source>Send a file</source>
         <translation>Versende Datei</translation>
     </message>
     <message>
         <location line="+13"/>
-        <location filename="../../src/TextInputWidget.h" line="+159"/>
+        <location filename="../../src/TextInputWidget.h" line="+145"/>
         <source>Write a message...</source>
         <translation>Schreibe eine Nachricht…</translation>
     </message>
@@ -461,7 +453,7 @@
         <translation>Emoji</translation>
     </message>
     <message>
-        <location line="+86"/>
+        <location line="+84"/>
         <source>Select a file</source>
         <translation>Datei auswählen</translation>
     </message>
@@ -497,7 +489,7 @@
         <translation>-- Entschlüsselungsfehler (%1) --</translation>
     </message>
     <message>
-        <location line="+76"/>
+        <location line="+85"/>
         <source>Message redaction failed: %1</source>
         <translation>Nachricht zurückziehen fehlgeschlagen: %1</translation>
     </message>
@@ -522,7 +514,7 @@
         <translation>Datei speichern</translation>
     </message>
     <message>
-        <location line="-582"/>
+        <location line="-591"/>
         <source>-- Encrypted Event (No keys found for decryption) --</source>
         <comment>Placeholder, when the message was not decrypted yet or can&apos;t be decrypted.</comment>
         <translation>-- Verschlüsseltes Event (keine Schlüssel zur Entschlüsselung gefunden) --</translation>
@@ -534,7 +526,7 @@
         <translation>-- Verschlüsseltes Event (Unbekannter Eventtyp) --</translation>
     </message>
     <message numerus="yes">
-        <location line="+636"/>
+        <location line="+648"/>
         <source>%1 and %2 are typing.</source>
         <comment>Multiple users are typing. First argument is a comma separated list of potentially multiple users. Second argument is the last user of that list. (If only one user is typing, %1 is empty. You should still use it in your string though to silence Qt warnings.)</comment>
         <translation>
@@ -672,7 +664,7 @@
 <context>
     <name>TimelineRow</name>
     <message>
-        <location filename="../qml/TimelineRow.qml" line="+69"/>
+        <location filename="../qml/TimelineRow.qml" line="+83"/>
         <source>Reply</source>
         <translation>Antworten</translation>
     </message>
@@ -685,7 +677,7 @@
 <context>
     <name>TimelineView</name>
     <message>
-        <location filename="../qml/TimelineView.qml" line="+45"/>
+        <location filename="../qml/TimelineView.qml" line="+46"/>
         <source>Reply</source>
         <translation>Antworten</translation>
     </message>
@@ -720,7 +712,7 @@
         <translation>Kein Raum geöffnet</translation>
     </message>
     <message>
-        <location line="+241"/>
+        <location line="+239"/>
         <source>Close</source>
         <translation>Schließen</translation>
     </message>
@@ -782,7 +774,7 @@
 <context>
     <name>UserSettingsPage</name>
     <message>
-        <location filename="../../src/UserSettingsPage.cpp" line="+299"/>
+        <location filename="../../src/UserSettingsPage.cpp" line="+333"/>
         <source>Minimize to tray</source>
         <translation>Ins Benachrichtigungsfeld minimieren</translation>
     </message>
@@ -1315,7 +1307,7 @@ Medien-Größe: %2
         <translation>Gespräch beginnen</translation>
     </message>
     <message>
-        <location line="+63"/>
+        <location line="+61"/>
         <source>Devices</source>
         <translation>Geräte</translation>
     </message>
diff --git a/resources/langs/nheko_el.ts b/resources/langs/nheko_el.ts
index 36297298..1a7889d5 100644
--- a/resources/langs/nheko_el.ts
+++ b/resources/langs/nheko_el.ts
@@ -10,7 +10,7 @@
     </message>
     <message>
         <location line="+4"/>
-        <location line="+894"/>
+        <location line="+866"/>
         <source>Invited user: %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -50,12 +50,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-815"/>
+        <location line="-791"/>
         <source>Failed to upload media. Please try again.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+407"/>
+        <location line="+404"/>
         <source>Failed to restore OLM account. Please login again.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -71,7 +71,7 @@
     </message>
     <message>
         <location line="+51"/>
-        <location line="+231"/>
+        <location line="+210"/>
         <source>Please try to login again: %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -248,7 +248,7 @@
 <context>
     <name>MessageDelegate</name>
     <message>
-        <location filename="../qml/delegates/MessageDelegate.qml" line="+63"/>
+        <location filename="../qml/delegates/MessageDelegate.qml" line="+64"/>
         <source>redacted</source>
         <translation type="unfinished"></translation>
     </message>
@@ -352,18 +352,10 @@
         <translation>Λανθασμένο όνομα διακομιστή</translation>
     </message>
 </context>
-<context>
-    <name>ReplyPopup</name>
-    <message>
-        <location filename="../../src/popups/ReplyPopup.cpp" line="+46"/>
-        <source>Logout</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>RoomInfo</name>
     <message>
-        <location filename="../../src/Cache.cpp" line="+2304"/>
+        <location filename="../../src/Cache.cpp" line="+2311"/>
         <source>no version stored</source>
         <translation type="unfinished"></translation>
     </message>
@@ -440,13 +432,13 @@
 <context>
     <name>TextInputWidget</name>
     <message>
-        <location filename="../../src/TextInputWidget.cpp" line="+493"/>
+        <location filename="../../src/TextInputWidget.cpp" line="+459"/>
         <source>Send a file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+13"/>
-        <location filename="../../src/TextInputWidget.h" line="+159"/>
+        <location filename="../../src/TextInputWidget.h" line="+145"/>
         <source>Write a message...</source>
         <translation>Γράψε ένα μήνυμα...</translation>
     </message>
@@ -461,7 +453,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+86"/>
+        <location line="+84"/>
         <source>Select a file</source>
         <translation>Διάλεξε ένα αρχείο</translation>
     </message>
@@ -497,7 +489,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+76"/>
+        <location line="+85"/>
         <source>Message redaction failed: %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -522,7 +514,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-582"/>
+        <location line="-591"/>
         <source>-- Encrypted Event (No keys found for decryption) --</source>
         <comment>Placeholder, when the message was not decrypted yet or can&apos;t be decrypted.</comment>
         <translation type="unfinished"></translation>
@@ -534,7 +526,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
-        <location line="+636"/>
+        <location line="+648"/>
         <source>%1 and %2 are typing.</source>
         <comment>Multiple users are typing. First argument is a comma separated list of potentially multiple users. Second argument is the last user of that list. (If only one user is typing, %1 is empty. You should still use it in your string though to silence Qt warnings.)</comment>
         <translation type="unfinished">
@@ -672,7 +664,7 @@
 <context>
     <name>TimelineRow</name>
     <message>
-        <location filename="../qml/TimelineRow.qml" line="+69"/>
+        <location filename="../qml/TimelineRow.qml" line="+83"/>
         <source>Reply</source>
         <translation type="unfinished"></translation>
     </message>
@@ -685,7 +677,7 @@
 <context>
     <name>TimelineView</name>
     <message>
-        <location filename="../qml/TimelineView.qml" line="+45"/>
+        <location filename="../qml/TimelineView.qml" line="+46"/>
         <source>Reply</source>
         <translation type="unfinished"></translation>
     </message>
@@ -720,7 +712,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+241"/>
+        <location line="+239"/>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
@@ -782,7 +774,7 @@
 <context>
     <name>UserSettingsPage</name>
     <message>
-        <location filename="../../src/UserSettingsPage.cpp" line="+299"/>
+        <location filename="../../src/UserSettingsPage.cpp" line="+333"/>
         <source>Minimize to tray</source>
         <translation>Ελαχιστοποίηση</translation>
     </message>
@@ -1313,7 +1305,7 @@ Media size: %2
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+63"/>
+        <location line="+61"/>
         <source>Devices</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/resources/langs/nheko_en.ts b/resources/langs/nheko_en.ts
index e09b9ded..f75068fa 100644
--- a/resources/langs/nheko_en.ts
+++ b/resources/langs/nheko_en.ts
@@ -10,7 +10,7 @@
     </message>
     <message>
         <location line="+4"/>
-        <location line="+894"/>
+        <location line="+866"/>
         <source>Invited user: %1</source>
         <translation>Invited user: %1</translation>
     </message>
@@ -50,12 +50,12 @@
         <translation>Unbanned user: %1</translation>
     </message>
     <message>
-        <location line="-815"/>
+        <location line="-791"/>
         <source>Failed to upload media. Please try again.</source>
         <translation>Failed to upload media. Please try again.</translation>
     </message>
     <message>
-        <location line="+407"/>
+        <location line="+404"/>
         <source>Failed to restore OLM account. Please login again.</source>
         <translation>Failed to restore OLM account. Please login again.</translation>
     </message>
@@ -71,7 +71,7 @@
     </message>
     <message>
         <location line="+51"/>
-        <location line="+231"/>
+        <location line="+210"/>
         <source>Please try to login again: %1</source>
         <translation>Please try to login again: %1</translation>
     </message>
@@ -248,7 +248,7 @@
 <context>
     <name>MessageDelegate</name>
     <message>
-        <location filename="../qml/delegates/MessageDelegate.qml" line="+63"/>
+        <location filename="../qml/delegates/MessageDelegate.qml" line="+64"/>
         <source>redacted</source>
         <translation>redacted</translation>
     </message>
@@ -352,18 +352,10 @@
         <translation>Invalid server name</translation>
     </message>
 </context>
-<context>
-    <name>ReplyPopup</name>
-    <message>
-        <location filename="../../src/popups/ReplyPopup.cpp" line="+46"/>
-        <source>Logout</source>
-        <translation>Logout</translation>
-    </message>
-</context>
 <context>
     <name>RoomInfo</name>
     <message>
-        <location filename="../../src/Cache.cpp" line="+2304"/>
+        <location filename="../../src/Cache.cpp" line="+2311"/>
         <source>no version stored</source>
         <translation>no version stored</translation>
     </message>
@@ -440,13 +432,13 @@
 <context>
     <name>TextInputWidget</name>
     <message>
-        <location filename="../../src/TextInputWidget.cpp" line="+493"/>
+        <location filename="../../src/TextInputWidget.cpp" line="+459"/>
         <source>Send a file</source>
         <translation>Send a file</translation>
     </message>
     <message>
         <location line="+13"/>
-        <location filename="../../src/TextInputWidget.h" line="+159"/>
+        <location filename="../../src/TextInputWidget.h" line="+145"/>
         <source>Write a message...</source>
         <translation>Write a message…</translation>
     </message>
@@ -461,7 +453,7 @@
         <translation>Emoji</translation>
     </message>
     <message>
-        <location line="+86"/>
+        <location line="+84"/>
         <source>Select a file</source>
         <translation>Select a file</translation>
     </message>
@@ -497,7 +489,7 @@
         <translation>-- Decryption Error (%1) --</translation>
     </message>
     <message>
-        <location line="+76"/>
+        <location line="+85"/>
         <source>Message redaction failed: %1</source>
         <translation>Message redaction failed: %1</translation>
     </message>
@@ -522,7 +514,7 @@
         <translation>Save file</translation>
     </message>
     <message>
-        <location line="-582"/>
+        <location line="-591"/>
         <source>-- Encrypted Event (No keys found for decryption) --</source>
         <comment>Placeholder, when the message was not decrypted yet or can&apos;t be decrypted.</comment>
         <translation>-- Encrypted Event (No keys found for decryption) --</translation>
@@ -534,7 +526,7 @@
         <translation>-- Encrypted Event (Unknown event type) --</translation>
     </message>
     <message numerus="yes">
-        <location line="+636"/>
+        <location line="+648"/>
         <source>%1 and %2 are typing.</source>
         <comment>Multiple users are typing. First argument is a comma separated list of potentially multiple users. Second argument is the last user of that list. (If only one user is typing, %1 is empty. You should still use it in your string though to silence Qt warnings.)</comment>
         <translation>
@@ -672,7 +664,7 @@
 <context>
     <name>TimelineRow</name>
     <message>
-        <location filename="../qml/TimelineRow.qml" line="+69"/>
+        <location filename="../qml/TimelineRow.qml" line="+83"/>
         <source>Reply</source>
         <translation>Reply</translation>
     </message>
@@ -685,7 +677,7 @@
 <context>
     <name>TimelineView</name>
     <message>
-        <location filename="../qml/TimelineView.qml" line="+45"/>
+        <location filename="../qml/TimelineView.qml" line="+46"/>
         <source>Reply</source>
         <translation>Reply</translation>
     </message>
@@ -720,7 +712,7 @@
         <translation>No room open</translation>
     </message>
     <message>
-        <location line="+241"/>
+        <location line="+239"/>
         <source>Close</source>
         <translation>Close</translation>
     </message>
@@ -782,7 +774,7 @@
 <context>
     <name>UserSettingsPage</name>
     <message>
-        <location filename="../../src/UserSettingsPage.cpp" line="+299"/>
+        <location filename="../../src/UserSettingsPage.cpp" line="+333"/>
         <source>Minimize to tray</source>
         <translation>Minimize to tray</translation>
     </message>
@@ -1317,7 +1309,7 @@ Media size: %2
         <translation>Start a conversation</translation>
     </message>
     <message>
-        <location line="+63"/>
+        <location line="+61"/>
         <source>Devices</source>
         <translation>Devices</translation>
     </message>
diff --git a/resources/langs/nheko_fi.ts b/resources/langs/nheko_fi.ts
index 08137a43..b7230f63 100644
--- a/resources/langs/nheko_fi.ts
+++ b/resources/langs/nheko_fi.ts
@@ -10,7 +10,7 @@
     </message>
     <message>
         <location line="+4"/>
-        <location line="+894"/>
+        <location line="+866"/>
         <source>Invited user: %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -50,12 +50,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-815"/>
+        <location line="-791"/>
         <source>Failed to upload media. Please try again.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+407"/>
+        <location line="+404"/>
         <source>Failed to restore OLM account. Please login again.</source>
         <translation>OLM-tilin palauttaminen epäonnistui. Ole hyvä ja kirjaudu sisään uudelleen.</translation>
     </message>
@@ -71,7 +71,7 @@
     </message>
     <message>
         <location line="+51"/>
-        <location line="+231"/>
+        <location line="+210"/>
         <source>Please try to login again: %1</source>
         <translation>Ole hyvä ja yritä kirjautua sisään uudelleen: %1</translation>
     </message>
@@ -248,7 +248,7 @@
 <context>
     <name>MessageDelegate</name>
     <message>
-        <location filename="../qml/delegates/MessageDelegate.qml" line="+63"/>
+        <location filename="../qml/delegates/MessageDelegate.qml" line="+64"/>
         <source>redacted</source>
         <translation type="unfinished"></translation>
     </message>
@@ -352,18 +352,10 @@
         <translation>Epäkelpo palvelimen nimi</translation>
     </message>
 </context>
-<context>
-    <name>ReplyPopup</name>
-    <message>
-        <location filename="../../src/popups/ReplyPopup.cpp" line="+46"/>
-        <source>Logout</source>
-        <translation>Kirjaudu ulos</translation>
-    </message>
-</context>
 <context>
     <name>RoomInfo</name>
     <message>
-        <location filename="../../src/Cache.cpp" line="+2304"/>
+        <location filename="../../src/Cache.cpp" line="+2311"/>
         <source>no version stored</source>
         <translation>ei tallennettua versiota</translation>
     </message>
@@ -440,13 +432,13 @@
 <context>
     <name>TextInputWidget</name>
     <message>
-        <location filename="../../src/TextInputWidget.cpp" line="+493"/>
+        <location filename="../../src/TextInputWidget.cpp" line="+459"/>
         <source>Send a file</source>
         <translation>Lähetä tiedosto</translation>
     </message>
     <message>
         <location line="+13"/>
-        <location filename="../../src/TextInputWidget.h" line="+159"/>
+        <location filename="../../src/TextInputWidget.h" line="+145"/>
         <source>Write a message...</source>
         <translation>Kirjoita viesti…</translation>
     </message>
@@ -461,7 +453,7 @@
         <translation>Emoji</translation>
     </message>
     <message>
-        <location line="+86"/>
+        <location line="+84"/>
         <source>Select a file</source>
         <translation>Valitse tiedosto</translation>
     </message>
@@ -497,7 +489,7 @@
         <translation type="unfinished">-- Virhe purkaessa salausta (%1) --</translation>
     </message>
     <message>
-        <location line="+76"/>
+        <location line="+85"/>
         <source>Message redaction failed: %1</source>
         <translation type="unfinished">Viestin poisto epäonnistui: %1</translation>
     </message>
@@ -522,7 +514,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-582"/>
+        <location line="-591"/>
         <source>-- Encrypted Event (No keys found for decryption) --</source>
         <comment>Placeholder, when the message was not decrypted yet or can&apos;t be decrypted.</comment>
         <translation type="unfinished">-- Salattu viesti (salauksen purkuavaimia ei löydetty) --</translation>
@@ -534,7 +526,7 @@
         <translation type="unfinished">-- Salattu viesti (tuntematon viestityyppi) --</translation>
     </message>
     <message numerus="yes">
-        <location line="+636"/>
+        <location line="+648"/>
         <source>%1 and %2 are typing.</source>
         <comment>Multiple users are typing. First argument is a comma separated list of potentially multiple users. Second argument is the last user of that list. (If only one user is typing, %1 is empty. You should still use it in your string though to silence Qt warnings.)</comment>
         <translation>
@@ -672,7 +664,7 @@
 <context>
     <name>TimelineRow</name>
     <message>
-        <location filename="../qml/TimelineRow.qml" line="+69"/>
+        <location filename="../qml/TimelineRow.qml" line="+83"/>
         <source>Reply</source>
         <translation type="unfinished"></translation>
     </message>
@@ -685,7 +677,7 @@
 <context>
     <name>TimelineView</name>
     <message>
-        <location filename="../qml/TimelineView.qml" line="+45"/>
+        <location filename="../qml/TimelineView.qml" line="+46"/>
         <source>Reply</source>
         <translation type="unfinished"></translation>
     </message>
@@ -720,7 +712,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+241"/>
+        <location line="+239"/>
         <source>Close</source>
         <translation type="unfinished">Sulje</translation>
     </message>
@@ -782,7 +774,7 @@
 <context>
     <name>UserSettingsPage</name>
     <message>
-        <location filename="../../src/UserSettingsPage.cpp" line="+299"/>
+        <location filename="../../src/UserSettingsPage.cpp" line="+333"/>
         <source>Minimize to tray</source>
         <translation>Pienennä ilmoitusalueelle</translation>
     </message>
@@ -1317,7 +1309,7 @@ Median koko: %2
         <translation>Aloita keskustelu</translation>
     </message>
     <message>
-        <location line="+63"/>
+        <location line="+61"/>
         <source>Devices</source>
         <translation>Laitteet</translation>
     </message>
diff --git a/resources/langs/nheko_fr.ts b/resources/langs/nheko_fr.ts
index eb835410..0ea3540f 100644
--- a/resources/langs/nheko_fr.ts
+++ b/resources/langs/nheko_fr.ts
@@ -10,7 +10,7 @@
     </message>
     <message>
         <location line="+4"/>
-        <location line="+894"/>
+        <location line="+866"/>
         <source>Invited user: %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -50,12 +50,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-815"/>
+        <location line="-791"/>
         <source>Failed to upload media. Please try again.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+407"/>
+        <location line="+404"/>
         <source>Failed to restore OLM account. Please login again.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -71,7 +71,7 @@
     </message>
     <message>
         <location line="+51"/>
-        <location line="+231"/>
+        <location line="+210"/>
         <source>Please try to login again: %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -248,7 +248,7 @@
 <context>
     <name>MessageDelegate</name>
     <message>
-        <location filename="../qml/delegates/MessageDelegate.qml" line="+63"/>
+        <location filename="../qml/delegates/MessageDelegate.qml" line="+64"/>
         <source>redacted</source>
         <translation type="unfinished"></translation>
     </message>
@@ -353,18 +353,10 @@
         <translation>Le nom du serveur est invalide</translation>
     </message>
 </context>
-<context>
-    <name>ReplyPopup</name>
-    <message>
-        <location filename="../../src/popups/ReplyPopup.cpp" line="+46"/>
-        <source>Logout</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>RoomInfo</name>
     <message>
-        <location filename="../../src/Cache.cpp" line="+2304"/>
+        <location filename="../../src/Cache.cpp" line="+2311"/>
         <source>no version stored</source>
         <translation type="unfinished"></translation>
     </message>
@@ -441,13 +433,13 @@
 <context>
     <name>TextInputWidget</name>
     <message>
-        <location filename="../../src/TextInputWidget.cpp" line="+493"/>
+        <location filename="../../src/TextInputWidget.cpp" line="+459"/>
         <source>Send a file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+13"/>
-        <location filename="../../src/TextInputWidget.h" line="+159"/>
+        <location filename="../../src/TextInputWidget.h" line="+145"/>
         <source>Write a message...</source>
         <translation>Écrivez un message...</translation>
     </message>
@@ -462,7 +454,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+86"/>
+        <location line="+84"/>
         <source>Select a file</source>
         <translation>Sélectionnez un fichier</translation>
     </message>
@@ -498,7 +490,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+76"/>
+        <location line="+85"/>
         <source>Message redaction failed: %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -523,7 +515,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-582"/>
+        <location line="-591"/>
         <source>-- Encrypted Event (No keys found for decryption) --</source>
         <comment>Placeholder, when the message was not decrypted yet or can&apos;t be decrypted.</comment>
         <translation type="unfinished"></translation>
@@ -535,7 +527,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
-        <location line="+636"/>
+        <location line="+648"/>
         <source>%1 and %2 are typing.</source>
         <comment>Multiple users are typing. First argument is a comma separated list of potentially multiple users. Second argument is the last user of that list. (If only one user is typing, %1 is empty. You should still use it in your string though to silence Qt warnings.)</comment>
         <translation type="unfinished">
@@ -673,7 +665,7 @@
 <context>
     <name>TimelineRow</name>
     <message>
-        <location filename="../qml/TimelineRow.qml" line="+69"/>
+        <location filename="../qml/TimelineRow.qml" line="+83"/>
         <source>Reply</source>
         <translation type="unfinished"></translation>
     </message>
@@ -686,7 +678,7 @@
 <context>
     <name>TimelineView</name>
     <message>
-        <location filename="../qml/TimelineView.qml" line="+45"/>
+        <location filename="../qml/TimelineView.qml" line="+46"/>
         <source>Reply</source>
         <translation type="unfinished"></translation>
     </message>
@@ -721,7 +713,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+241"/>
+        <location line="+239"/>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
@@ -783,7 +775,7 @@
 <context>
     <name>UserSettingsPage</name>
     <message>
-        <location filename="../../src/UserSettingsPage.cpp" line="+299"/>
+        <location filename="../../src/UserSettingsPage.cpp" line="+333"/>
         <source>Minimize to tray</source>
         <translation>Réduire à la barre des tâches</translation>
     </message>
@@ -1316,7 +1308,7 @@ Taille du média : %2
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+63"/>
+        <location line="+61"/>
         <source>Devices</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/resources/langs/nheko_ja.ts b/resources/langs/nheko_ja.ts
index bdde216d..dc8d4b03 100644
--- a/resources/langs/nheko_ja.ts
+++ b/resources/langs/nheko_ja.ts
@@ -10,7 +10,7 @@
     </message>
     <message>
         <location line="+4"/>
-        <location line="+894"/>
+        <location line="+866"/>
         <source>Invited user: %1</source>
         <translation>招待されたユーザー: %1</translation>
     </message>
@@ -50,12 +50,12 @@
         <translation>永久追放を解除されたユーザー: %1</translation>
     </message>
     <message>
-        <location line="-815"/>
+        <location line="-791"/>
         <source>Failed to upload media. Please try again.</source>
         <translation>メディアをアップロードできませんでした。やり直して下さい。</translation>
     </message>
     <message>
-        <location line="+407"/>
+        <location line="+404"/>
         <source>Failed to restore OLM account. Please login again.</source>
         <translation>OLMアカウントを復元できませんでした。もう一度ログインして下さい。</translation>
     </message>
@@ -71,7 +71,7 @@
     </message>
     <message>
         <location line="+51"/>
-        <location line="+231"/>
+        <location line="+210"/>
         <source>Please try to login again: %1</source>
         <translation>もう一度ログインしてみて下さい: %1</translation>
     </message>
@@ -248,7 +248,7 @@
 <context>
     <name>MessageDelegate</name>
     <message>
-        <location filename="../qml/delegates/MessageDelegate.qml" line="+63"/>
+        <location filename="../qml/delegates/MessageDelegate.qml" line="+64"/>
         <source>redacted</source>
         <translation>編集済み</translation>
     </message>
@@ -352,18 +352,10 @@
         <translation>無効なサーバー名です</translation>
     </message>
 </context>
-<context>
-    <name>ReplyPopup</name>
-    <message>
-        <location filename="../../src/popups/ReplyPopup.cpp" line="+46"/>
-        <source>Logout</source>
-        <translation>ログアウト</translation>
-    </message>
-</context>
 <context>
     <name>RoomInfo</name>
     <message>
-        <location filename="../../src/Cache.cpp" line="+2304"/>
+        <location filename="../../src/Cache.cpp" line="+2311"/>
         <source>no version stored</source>
         <translation>バージョンが保存されていません</translation>
     </message>
@@ -440,13 +432,13 @@
 <context>
     <name>TextInputWidget</name>
     <message>
-        <location filename="../../src/TextInputWidget.cpp" line="+493"/>
+        <location filename="../../src/TextInputWidget.cpp" line="+459"/>
         <source>Send a file</source>
         <translation>ファイルを送信</translation>
     </message>
     <message>
         <location line="+13"/>
-        <location filename="../../src/TextInputWidget.h" line="+159"/>
+        <location filename="../../src/TextInputWidget.h" line="+145"/>
         <source>Write a message...</source>
         <translation>メッセージを書く...</translation>
     </message>
@@ -461,7 +453,7 @@
         <translation>絵文字</translation>
     </message>
     <message>
-        <location line="+86"/>
+        <location line="+84"/>
         <source>Select a file</source>
         <translation>ファイルを選択</translation>
     </message>
@@ -497,7 +489,7 @@
         <translation type="unfinished">-- 復号エラー (%1) --</translation>
     </message>
     <message>
-        <location line="+76"/>
+        <location line="+85"/>
         <source>Message redaction failed: %1</source>
         <translation>メッセージを編集できませんでした: %1</translation>
     </message>
@@ -522,7 +514,7 @@
         <translation>ファイルを保存</translation>
     </message>
     <message>
-        <location line="-582"/>
+        <location line="-591"/>
         <source>-- Encrypted Event (No keys found for decryption) --</source>
         <comment>Placeholder, when the message was not decrypted yet or can&apos;t be decrypted.</comment>
         <translation type="unfinished">-- 暗号化イベント (復号鍵が見つかりません) --</translation>
@@ -534,7 +526,7 @@
         <translation type="unfinished">-- 暗号化イベント (不明なイベント型です) --</translation>
     </message>
     <message numerus="yes">
-        <location line="+636"/>
+        <location line="+648"/>
         <source>%1 and %2 are typing.</source>
         <comment>Multiple users are typing. First argument is a comma separated list of potentially multiple users. Second argument is the last user of that list. (If only one user is typing, %1 is empty. You should still use it in your string though to silence Qt warnings.)</comment>
         <translation>
@@ -671,7 +663,7 @@
 <context>
     <name>TimelineRow</name>
     <message>
-        <location filename="../qml/TimelineRow.qml" line="+69"/>
+        <location filename="../qml/TimelineRow.qml" line="+83"/>
         <source>Reply</source>
         <translation>返信</translation>
     </message>
@@ -684,7 +676,7 @@
 <context>
     <name>TimelineView</name>
     <message>
-        <location filename="../qml/TimelineView.qml" line="+45"/>
+        <location filename="../qml/TimelineView.qml" line="+46"/>
         <source>Reply</source>
         <translation type="unfinished">返信</translation>
     </message>
@@ -719,7 +711,7 @@
         <translation>部屋が開いていません</translation>
     </message>
     <message>
-        <location line="+241"/>
+        <location line="+239"/>
         <source>Close</source>
         <translation>閉じる</translation>
     </message>
@@ -781,7 +773,7 @@
 <context>
     <name>UserSettingsPage</name>
     <message>
-        <location filename="../../src/UserSettingsPage.cpp" line="+299"/>
+        <location filename="../../src/UserSettingsPage.cpp" line="+333"/>
         <source>Minimize to tray</source>
         <translation>トレイへ最小化</translation>
     </message>
@@ -1315,7 +1307,7 @@ Media size: %2
         <translation>会話を始める</translation>
     </message>
     <message>
-        <location line="+63"/>
+        <location line="+61"/>
         <source>Devices</source>
         <translation>デバイス</translation>
     </message>
diff --git a/resources/langs/nheko_nl.ts b/resources/langs/nheko_nl.ts
index 906b2819..cfd01d2f 100644
--- a/resources/langs/nheko_nl.ts
+++ b/resources/langs/nheko_nl.ts
@@ -10,7 +10,7 @@
     </message>
     <message>
         <location line="+4"/>
-        <location line="+894"/>
+        <location line="+866"/>
         <source>Invited user: %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -50,12 +50,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-815"/>
+        <location line="-791"/>
         <source>Failed to upload media. Please try again.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+407"/>
+        <location line="+404"/>
         <source>Failed to restore OLM account. Please login again.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -71,7 +71,7 @@
     </message>
     <message>
         <location line="+51"/>
-        <location line="+231"/>
+        <location line="+210"/>
         <source>Please try to login again: %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -248,7 +248,7 @@
 <context>
     <name>MessageDelegate</name>
     <message>
-        <location filename="../qml/delegates/MessageDelegate.qml" line="+63"/>
+        <location filename="../qml/delegates/MessageDelegate.qml" line="+64"/>
         <source>redacted</source>
         <translation type="unfinished"></translation>
     </message>
@@ -352,18 +352,10 @@
         <translation>Ongeldige servernaam</translation>
     </message>
 </context>
-<context>
-    <name>ReplyPopup</name>
-    <message>
-        <location filename="../../src/popups/ReplyPopup.cpp" line="+46"/>
-        <source>Logout</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>RoomInfo</name>
     <message>
-        <location filename="../../src/Cache.cpp" line="+2304"/>
+        <location filename="../../src/Cache.cpp" line="+2311"/>
         <source>no version stored</source>
         <translation type="unfinished"></translation>
     </message>
@@ -440,13 +432,13 @@
 <context>
     <name>TextInputWidget</name>
     <message>
-        <location filename="../../src/TextInputWidget.cpp" line="+493"/>
+        <location filename="../../src/TextInputWidget.cpp" line="+459"/>
         <source>Send a file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+13"/>
-        <location filename="../../src/TextInputWidget.h" line="+159"/>
+        <location filename="../../src/TextInputWidget.h" line="+145"/>
         <source>Write a message...</source>
         <translation>Typ een bericht...</translation>
     </message>
@@ -461,7 +453,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+86"/>
+        <location line="+84"/>
         <source>Select a file</source>
         <translation>Kies een bestand</translation>
     </message>
@@ -497,7 +489,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+76"/>
+        <location line="+85"/>
         <source>Message redaction failed: %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -522,7 +514,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-582"/>
+        <location line="-591"/>
         <source>-- Encrypted Event (No keys found for decryption) --</source>
         <comment>Placeholder, when the message was not decrypted yet or can&apos;t be decrypted.</comment>
         <translation type="unfinished"></translation>
@@ -534,7 +526,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
-        <location line="+636"/>
+        <location line="+648"/>
         <source>%1 and %2 are typing.</source>
         <comment>Multiple users are typing. First argument is a comma separated list of potentially multiple users. Second argument is the last user of that list. (If only one user is typing, %1 is empty. You should still use it in your string though to silence Qt warnings.)</comment>
         <translation type="unfinished">
@@ -672,7 +664,7 @@
 <context>
     <name>TimelineRow</name>
     <message>
-        <location filename="../qml/TimelineRow.qml" line="+69"/>
+        <location filename="../qml/TimelineRow.qml" line="+83"/>
         <source>Reply</source>
         <translation type="unfinished"></translation>
     </message>
@@ -685,7 +677,7 @@
 <context>
     <name>TimelineView</name>
     <message>
-        <location filename="../qml/TimelineView.qml" line="+45"/>
+        <location filename="../qml/TimelineView.qml" line="+46"/>
         <source>Reply</source>
         <translation type="unfinished"></translation>
     </message>
@@ -720,7 +712,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+241"/>
+        <location line="+239"/>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
@@ -782,7 +774,7 @@
 <context>
     <name>UserSettingsPage</name>
     <message>
-        <location filename="../../src/UserSettingsPage.cpp" line="+299"/>
+        <location filename="../../src/UserSettingsPage.cpp" line="+333"/>
         <source>Minimize to tray</source>
         <translation>Minimaliseren naar systeemvak</translation>
     </message>
@@ -1315,7 +1307,7 @@ Mediagrootte: %2
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+63"/>
+        <location line="+61"/>
         <source>Devices</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/resources/langs/nheko_pl.ts b/resources/langs/nheko_pl.ts
index 44dbb0e1..11183d23 100644
--- a/resources/langs/nheko_pl.ts
+++ b/resources/langs/nheko_pl.ts
@@ -10,7 +10,7 @@
     </message>
     <message>
         <location line="+4"/>
-        <location line="+894"/>
+        <location line="+866"/>
         <source>Invited user: %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -50,12 +50,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-815"/>
+        <location line="-791"/>
         <source>Failed to upload media. Please try again.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+407"/>
+        <location line="+404"/>
         <source>Failed to restore OLM account. Please login again.</source>
         <translation>Nie udało się przywrócić konta OLM. Spróbuj zalogować się ponownie.</translation>
     </message>
@@ -71,7 +71,7 @@
     </message>
     <message>
         <location line="+51"/>
-        <location line="+231"/>
+        <location line="+210"/>
         <source>Please try to login again: %1</source>
         <translation>Spróbuj zalogować się ponownie: %1</translation>
     </message>
@@ -248,7 +248,7 @@
 <context>
     <name>MessageDelegate</name>
     <message>
-        <location filename="../qml/delegates/MessageDelegate.qml" line="+63"/>
+        <location filename="../qml/delegates/MessageDelegate.qml" line="+64"/>
         <source>redacted</source>
         <translation type="unfinished"></translation>
     </message>
@@ -352,18 +352,10 @@
         <translation>Nieprawidłowa nazwa serwera</translation>
     </message>
 </context>
-<context>
-    <name>ReplyPopup</name>
-    <message>
-        <location filename="../../src/popups/ReplyPopup.cpp" line="+46"/>
-        <source>Logout</source>
-        <translation type="unfinished">Wyloguj</translation>
-    </message>
-</context>
 <context>
     <name>RoomInfo</name>
     <message>
-        <location filename="../../src/Cache.cpp" line="+2304"/>
+        <location filename="../../src/Cache.cpp" line="+2311"/>
         <source>no version stored</source>
         <translation type="unfinished"></translation>
     </message>
@@ -440,13 +432,13 @@
 <context>
     <name>TextInputWidget</name>
     <message>
-        <location filename="../../src/TextInputWidget.cpp" line="+493"/>
+        <location filename="../../src/TextInputWidget.cpp" line="+459"/>
         <source>Send a file</source>
         <translation>Wyślij plik</translation>
     </message>
     <message>
         <location line="+13"/>
-        <location filename="../../src/TextInputWidget.h" line="+159"/>
+        <location filename="../../src/TextInputWidget.h" line="+145"/>
         <source>Write a message...</source>
         <translation>Napisz wiadomość…</translation>
     </message>
@@ -461,7 +453,7 @@
         <translation>Emoji</translation>
     </message>
     <message>
-        <location line="+86"/>
+        <location line="+84"/>
         <source>Select a file</source>
         <translation>Wybierz plik</translation>
     </message>
@@ -497,7 +489,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+76"/>
+        <location line="+85"/>
         <source>Message redaction failed: %1</source>
         <translation type="unfinished">Redagowanie wiadomości nie powiodło się: %1</translation>
     </message>
@@ -522,7 +514,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-582"/>
+        <location line="-591"/>
         <source>-- Encrypted Event (No keys found for decryption) --</source>
         <comment>Placeholder, when the message was not decrypted yet or can&apos;t be decrypted.</comment>
         <translation type="unfinished"></translation>
@@ -534,7 +526,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
-        <location line="+636"/>
+        <location line="+648"/>
         <source>%1 and %2 are typing.</source>
         <comment>Multiple users are typing. First argument is a comma separated list of potentially multiple users. Second argument is the last user of that list. (If only one user is typing, %1 is empty. You should still use it in your string though to silence Qt warnings.)</comment>
         <translation type="unfinished">
@@ -673,7 +665,7 @@
 <context>
     <name>TimelineRow</name>
     <message>
-        <location filename="../qml/TimelineRow.qml" line="+69"/>
+        <location filename="../qml/TimelineRow.qml" line="+83"/>
         <source>Reply</source>
         <translation type="unfinished"></translation>
     </message>
@@ -686,7 +678,7 @@
 <context>
     <name>TimelineView</name>
     <message>
-        <location filename="../qml/TimelineView.qml" line="+45"/>
+        <location filename="../qml/TimelineView.qml" line="+46"/>
         <source>Reply</source>
         <translation type="unfinished"></translation>
     </message>
@@ -721,7 +713,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+241"/>
+        <location line="+239"/>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
@@ -783,7 +775,7 @@
 <context>
     <name>UserSettingsPage</name>
     <message>
-        <location filename="../../src/UserSettingsPage.cpp" line="+299"/>
+        <location filename="../../src/UserSettingsPage.cpp" line="+333"/>
         <source>Minimize to tray</source>
         <translation>Zminimalizuj do paska zadań</translation>
     </message>
@@ -1319,7 +1311,7 @@ Rozmiar multimediów: %2
         <translation>Rozpocznij rozmowę</translation>
     </message>
     <message>
-        <location line="+63"/>
+        <location line="+61"/>
         <source>Devices</source>
         <translation>Urządzenia</translation>
     </message>
diff --git a/resources/langs/nheko_ru.ts b/resources/langs/nheko_ru.ts
index 5753cc6f..0facf794 100644
--- a/resources/langs/nheko_ru.ts
+++ b/resources/langs/nheko_ru.ts
@@ -10,7 +10,7 @@
     </message>
     <message>
         <location line="+4"/>
-        <location line="+894"/>
+        <location line="+866"/>
         <source>Invited user: %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -50,12 +50,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-815"/>
+        <location line="-791"/>
         <source>Failed to upload media. Please try again.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+407"/>
+        <location line="+404"/>
         <source>Failed to restore OLM account. Please login again.</source>
         <translation>Не удалось восстановить учетную запись OLM. Пожалуйста, войдите снова.</translation>
     </message>
@@ -71,7 +71,7 @@
     </message>
     <message>
         <location line="+51"/>
-        <location line="+231"/>
+        <location line="+210"/>
         <source>Please try to login again: %1</source>
         <translation>Повторите попытку входа: %1</translation>
     </message>
@@ -248,7 +248,7 @@
 <context>
     <name>MessageDelegate</name>
     <message>
-        <location filename="../qml/delegates/MessageDelegate.qml" line="+63"/>
+        <location filename="../qml/delegates/MessageDelegate.qml" line="+64"/>
         <source>redacted</source>
         <translation type="unfinished"></translation>
     </message>
@@ -352,18 +352,10 @@
         <translation>Неверное имя сервера</translation>
     </message>
 </context>
-<context>
-    <name>ReplyPopup</name>
-    <message>
-        <location filename="../../src/popups/ReplyPopup.cpp" line="+46"/>
-        <source>Logout</source>
-        <translation type="unfinished">Выйти</translation>
-    </message>
-</context>
 <context>
     <name>RoomInfo</name>
     <message>
-        <location filename="../../src/Cache.cpp" line="+2304"/>
+        <location filename="../../src/Cache.cpp" line="+2311"/>
         <source>no version stored</source>
         <translation type="unfinished"></translation>
     </message>
@@ -440,13 +432,13 @@
 <context>
     <name>TextInputWidget</name>
     <message>
-        <location filename="../../src/TextInputWidget.cpp" line="+493"/>
+        <location filename="../../src/TextInputWidget.cpp" line="+459"/>
         <source>Send a file</source>
         <translation>Отправить файл</translation>
     </message>
     <message>
         <location line="+13"/>
-        <location filename="../../src/TextInputWidget.h" line="+159"/>
+        <location filename="../../src/TextInputWidget.h" line="+145"/>
         <source>Write a message...</source>
         <translation>Написать сообщение...</translation>
     </message>
@@ -461,7 +453,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+86"/>
+        <location line="+84"/>
         <source>Select a file</source>
         <translation>Выберите файл</translation>
     </message>
@@ -497,7 +489,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+76"/>
+        <location line="+85"/>
         <source>Message redaction failed: %1</source>
         <translation type="unfinished">Ошибка редактирования сообщения: %1</translation>
     </message>
@@ -522,7 +514,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-582"/>
+        <location line="-591"/>
         <source>-- Encrypted Event (No keys found for decryption) --</source>
         <comment>Placeholder, when the message was not decrypted yet or can&apos;t be decrypted.</comment>
         <translation type="unfinished"></translation>
@@ -534,7 +526,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
-        <location line="+636"/>
+        <location line="+648"/>
         <source>%1 and %2 are typing.</source>
         <comment>Multiple users are typing. First argument is a comma separated list of potentially multiple users. Second argument is the last user of that list. (If only one user is typing, %1 is empty. You should still use it in your string though to silence Qt warnings.)</comment>
         <translation type="unfinished">
@@ -673,7 +665,7 @@
 <context>
     <name>TimelineRow</name>
     <message>
-        <location filename="../qml/TimelineRow.qml" line="+69"/>
+        <location filename="../qml/TimelineRow.qml" line="+83"/>
         <source>Reply</source>
         <translation type="unfinished"></translation>
     </message>
@@ -686,7 +678,7 @@
 <context>
     <name>TimelineView</name>
     <message>
-        <location filename="../qml/TimelineView.qml" line="+45"/>
+        <location filename="../qml/TimelineView.qml" line="+46"/>
         <source>Reply</source>
         <translation type="unfinished"></translation>
     </message>
@@ -721,7 +713,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+241"/>
+        <location line="+239"/>
         <source>Close</source>
         <translation type="unfinished">Закрыть</translation>
     </message>
@@ -783,7 +775,7 @@
 <context>
     <name>UserSettingsPage</name>
     <message>
-        <location filename="../../src/UserSettingsPage.cpp" line="+299"/>
+        <location filename="../../src/UserSettingsPage.cpp" line="+333"/>
         <source>Minimize to tray</source>
         <translation>Сворачивать в системную панель</translation>
     </message>
@@ -1318,7 +1310,7 @@ Media size: %2
         <translation>Начать разговор</translation>
     </message>
     <message>
-        <location line="+63"/>
+        <location line="+61"/>
         <source>Devices</source>
         <translation>Устройства</translation>
     </message>
diff --git a/resources/langs/nheko_zh_CN.ts b/resources/langs/nheko_zh_CN.ts
index cd826123..aa300707 100644
--- a/resources/langs/nheko_zh_CN.ts
+++ b/resources/langs/nheko_zh_CN.ts
@@ -10,7 +10,7 @@
     </message>
     <message>
         <location line="+4"/>
-        <location line="+894"/>
+        <location line="+866"/>
         <source>Invited user: %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -50,12 +50,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-815"/>
+        <location line="-791"/>
         <source>Failed to upload media. Please try again.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+407"/>
+        <location line="+404"/>
         <source>Failed to restore OLM account. Please login again.</source>
         <translation>恢复 OLM 账户失败。请重新登录。</translation>
     </message>
@@ -71,7 +71,7 @@
     </message>
     <message>
         <location line="+51"/>
-        <location line="+231"/>
+        <location line="+210"/>
         <source>Please try to login again: %1</source>
         <translation>请尝试再次登录：%1</translation>
     </message>
@@ -248,7 +248,7 @@
 <context>
     <name>MessageDelegate</name>
     <message>
-        <location filename="../qml/delegates/MessageDelegate.qml" line="+63"/>
+        <location filename="../qml/delegates/MessageDelegate.qml" line="+64"/>
         <source>redacted</source>
         <translation type="unfinished"></translation>
     </message>
@@ -352,18 +352,10 @@
         <translation>无效的服务器名</translation>
     </message>
 </context>
-<context>
-    <name>ReplyPopup</name>
-    <message>
-        <location filename="../../src/popups/ReplyPopup.cpp" line="+46"/>
-        <source>Logout</source>
-        <translation type="unfinished">登出</translation>
-    </message>
-</context>
 <context>
     <name>RoomInfo</name>
     <message>
-        <location filename="../../src/Cache.cpp" line="+2304"/>
+        <location filename="../../src/Cache.cpp" line="+2311"/>
         <source>no version stored</source>
         <translation type="unfinished"></translation>
     </message>
@@ -440,13 +432,13 @@
 <context>
     <name>TextInputWidget</name>
     <message>
-        <location filename="../../src/TextInputWidget.cpp" line="+493"/>
+        <location filename="../../src/TextInputWidget.cpp" line="+459"/>
         <source>Send a file</source>
         <translation>发送一个文件</translation>
     </message>
     <message>
         <location line="+13"/>
-        <location filename="../../src/TextInputWidget.h" line="+159"/>
+        <location filename="../../src/TextInputWidget.h" line="+145"/>
         <source>Write a message...</source>
         <translation>写一条消息...</translation>
     </message>
@@ -461,7 +453,7 @@
         <translation></translation>
     </message>
     <message>
-        <location line="+86"/>
+        <location line="+84"/>
         <source>Select a file</source>
         <translation>选择一个文件</translation>
     </message>
@@ -497,7 +489,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+76"/>
+        <location line="+85"/>
         <source>Message redaction failed: %1</source>
         <translation type="unfinished">删除消息失败：%1</translation>
     </message>
@@ -522,7 +514,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-582"/>
+        <location line="-591"/>
         <source>-- Encrypted Event (No keys found for decryption) --</source>
         <comment>Placeholder, when the message was not decrypted yet or can&apos;t be decrypted.</comment>
         <translation type="unfinished"></translation>
@@ -534,7 +526,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
-        <location line="+636"/>
+        <location line="+648"/>
         <source>%1 and %2 are typing.</source>
         <comment>Multiple users are typing. First argument is a comma separated list of potentially multiple users. Second argument is the last user of that list. (If only one user is typing, %1 is empty. You should still use it in your string though to silence Qt warnings.)</comment>
         <translation type="unfinished">
@@ -671,7 +663,7 @@
 <context>
     <name>TimelineRow</name>
     <message>
-        <location filename="../qml/TimelineRow.qml" line="+69"/>
+        <location filename="../qml/TimelineRow.qml" line="+83"/>
         <source>Reply</source>
         <translation type="unfinished"></translation>
     </message>
@@ -684,7 +676,7 @@
 <context>
     <name>TimelineView</name>
     <message>
-        <location filename="../qml/TimelineView.qml" line="+45"/>
+        <location filename="../qml/TimelineView.qml" line="+46"/>
         <source>Reply</source>
         <translation type="unfinished"></translation>
     </message>
@@ -719,7 +711,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+241"/>
+        <location line="+239"/>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
@@ -781,7 +773,7 @@
 <context>
     <name>UserSettingsPage</name>
     <message>
-        <location filename="../../src/UserSettingsPage.cpp" line="+299"/>
+        <location filename="../../src/UserSettingsPage.cpp" line="+333"/>
         <source>Minimize to tray</source>
         <translation>最小化至托盘</translation>
     </message>
@@ -1315,7 +1307,7 @@ Media size: %2
         <translation>开始一个聊天</translation>
     </message>
     <message>
-        <location line="+63"/>
+        <location line="+61"/>
         <source>Devices</source>
         <translation>设备</translation>
     </message>