Speed up timeline by using global ToolTip and Menu

14 files changed, 458 insertions, 418 deletions

diff --git a/resources/langs/nheko_de.ts b/resources/langs/nheko_de.ts

index 32526797..74dfb314 100644
--- a/resources/langs/nheko_de.ts
+++ b/resources/langs/nheko_de.ts
@@ -4,28 +4,28 @@
 <context>
     <name>ChatPage</name>
     <message>
-        <location filename="../../src/ChatPage.cpp" line="+211"/>
+        <location filename="../../src/ChatPage.cpp" line="+223"/>
         <source>Failed to invite user: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+4"/>
-        <location line="+84"/>
+        <location line="+864"/>
         <source>Invited user: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-6"/>
+        <location line="-5"/>
         <source>Failed to invite %1 to %2: %3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+19"/>
         <source>Failed to kick %1 to %2: %3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+5"/>
         <source>Kicked user: %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -35,12 +35,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+5"/>
         <source>Banned user: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location line="+14"/>
         <source>Failed to unban %1 in %2: %3</source>
         <translation type="unfinished"></translation>
     </message>
@@ -50,12 +50,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+50"/>
+        <location line="-803"/>
         <source>Failed to upload media. Please try again.</source>
         <translation>Medienupload fehlgeschlagen. Bitte versuche es erneut.</translation>
     </message>
     <message>
-        <location line="+392"/>
+        <location line="+395"/>
         <source>Failed to restore OLM account. Please login again.</source>
         <translation>Wiederherstellung des OLM Accounts fehlgeschlagen. Bitte logge dich erneut ein.</translation>
     </message>
@@ -71,12 +71,12 @@
     </message>
     <message>
         <location line="+51"/>
-        <location line="+154"/>
+        <location line="+231"/>
         <source>Please try to login again: %1</source>
         <translation>Bitte melde dich erneut an: %1</translation>
     </message>
     <message>
-        <location line="-77"/>
+        <location line="-154"/>
         <source>Failed to join room: %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -109,7 +109,7 @@
 <context>
     <name>CommunitiesListItem</name>
     <message>
-        <location filename="../../src/CommunitiesListItem.cpp" line="+130"/>
+        <location filename="../../src/CommunitiesListItem.cpp" line="+133"/>
         <source>All rooms</source>
         <translation>Alle Räume</translation>
     </message>
@@ -161,7 +161,7 @@
 <context>
     <name>EncryptionIndicator</name>
     <message>
-        <location filename="../qml/EncryptionIndicator.qml" line="+11"/>
+        <location filename="../qml/EncryptionIndicator.qml" line="+12"/>
         <source>Encrypted</source>
         <translation>Verschlüsselt</translation>
     </message>
@@ -177,7 +177,7 @@
 <context>
     <name>LoginPage</name>
     <message>
-        <location filename="../../src/LoginPage.cpp" line="+80"/>
+        <location filename="../../src/LoginPage.cpp" line="+82"/>
         <source>Matrix ID</source>
         <translation>Matrix-ID</translation>
     </message>
@@ -235,7 +235,7 @@
 <context>
     <name>MemberList</name>
     <message>
-        <location filename="../../src/dialogs/MemberList.cpp" line="+89"/>
+        <location filename="../../src/dialogs/MemberList.cpp" line="+90"/>
         <source>Room members</source>
         <translation>Teilnehmerliste</translation>
     </message>
@@ -289,7 +289,7 @@
 <context>
     <name>QuickSwitcher</name>
     <message>
-        <location filename="../../src/QuickSwitcher.cpp" line="+72"/>
+        <location filename="../../src/QuickSwitcher.cpp" line="+74"/>
         <source>Search for a room...</source>
         <translation>Raum suchen…</translation>
     </message>
@@ -297,7 +297,7 @@
 <context>
     <name>RegisterPage</name>
     <message>
-        <location filename="../../src/RegisterPage.cpp" line="+77"/>
+        <location filename="../../src/RegisterPage.cpp" line="+80"/>
         <source>Username</source>
         <translation>Benutzername</translation>
     </message>
@@ -407,7 +407,7 @@
 <context>
     <name>StatusIndicator</name>
     <message>
-        <location filename="../qml/StatusIndicator.qml" line="+13"/>
+        <location filename="../qml/StatusIndicator.qml" line="+14"/>
         <source>Failed</source>
         <translation>Fehlgeschlagen</translation>
     </message>
@@ -430,13 +430,13 @@
 <context>
     <name>TextInputWidget</name>
     <message>
-        <location filename="../../src/TextInputWidget.cpp" line="+496"/>
+        <location filename="../../src/TextInputWidget.cpp" line="+493"/>
         <source>Send a file</source>
         <translation>Versende Datei</translation>
     </message>
     <message>
         <location line="+13"/>
-        <location filename="../../src/TextInputWidget.h" line="+163"/>
+        <location filename="../../src/TextInputWidget.h" line="+159"/>
         <source>Write a message...</source>
         <translation>Schreibe eine Nachricht…</translation>
     </message>
@@ -612,7 +612,7 @@
 <context>
     <name>TimelineRow</name>
     <message>
-        <location filename="../qml/TimelineRow.qml" line="+104"/>
+        <location filename="../qml/TimelineRow.qml" line="+64"/>
         <source>Reply</source>
         <translation>Antworten</translation>
     </message>
@@ -621,44 +621,49 @@
         <source>Options</source>
         <translation>Optionen</translation>
     </message>
+</context>
+<context>
+    <name>TimelineView</name>
     <message>
-        <location line="+12"/>
+        <location filename="../qml/TimelineView.qml" line="+31"/>
         <source>Read receipts</source>
-        <translation>Lesebestätigungen</translation>
+        <translation type="unfinished">Lesebestätigungen</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Mark as read</source>
-        <translation>Als gelesen markieren</translation>
+        <translation type="unfinished">Als gelesen markieren</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>View raw message</source>
-        <translation>Zeige rohen Nachrichteninhalt</translation>
+        <translation type="unfinished">Zeige rohen Nachrichteninhalt</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Redact message</source>
-        <translation>Nachricht löschen</translation>
+        <translation type="unfinished">Nachricht löschen</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Save as</source>
-        <translation>Speichern als...</translation>
+        <translation type="unfinished">Speichern als...</translation>
     </message>
-</context>
-<context>
-    <name>TimelineView</name>
     <message>
-        <location filename="../qml/TimelineView.qml" line="+24"/>
+        <location line="+14"/>
         <source>No room open</source>
         <translation>Kein Raum geöffnet</translation>
     </message>
+    <message>
+        <location line="+239"/>
+        <source>Close</source>
+        <translation type="unfinished">Schließen</translation>
+    </message>
 </context>
 <context>
     <name>TopRoomBar</name>
     <message>
-        <location filename="../../src/TopRoomBar.cpp" line="+78"/>
+        <location filename="../../src/TopRoomBar.cpp" line="+86"/>
         <source>Room options</source>
         <translation>Raumoptionen</translation>
     </message>
@@ -691,7 +696,7 @@
 <context>
     <name>TrayIcon</name>
     <message>
-        <location filename="../../src/TrayIcon.cpp" line="+120"/>
+        <location filename="../../src/TrayIcon.cpp" line="+122"/>
         <source>Show</source>
         <translation>Zeigen</translation>
     </message>
@@ -704,7 +709,7 @@
 <context>
     <name>UserInfoWidget</name>
     <message>
-        <location filename="../../src/UserInfoWidget.cpp" line="+87"/>
+        <location filename="../../src/UserInfoWidget.cpp" line="+88"/>
         <source>Logout</source>
         <translation>Abmelden</translation>
     </message>
@@ -712,7 +717,7 @@
 <context>
     <name>UserSettingsPage</name>
     <message>
-        <location filename="../../src/UserSettingsPage.cpp" line="+188"/>
+        <location filename="../../src/UserSettingsPage.cpp" line="+189"/>
         <source>Minimize to tray</source>
         <translation>Ins Benachrichtigungsfeld minimieren</translation>
     </message>
@@ -861,7 +866,7 @@
 <context>
     <name>WelcomePage</name>
     <message>
-        <location filename="../../src/WelcomePage.cpp" line="+46"/>
+        <location filename="../../src/WelcomePage.cpp" line="+47"/>
         <source>Welcome to nheko! The desktop client for the Matrix protocol.</source>
         <translation>Willkommen bei nheko! Ein Desktop-Client für das Matrix-Protokoll.</translation>
     </message>
@@ -884,7 +889,7 @@
 <context>
     <name>descriptiveTime</name>
     <message>
-        <location filename="../../src/Utils.cpp" line="+119"/>
+        <location filename="../../src/Utils.cpp" line="+138"/>
         <source>Yesterday</source>
         <translation>Gestern</translation>
     </message>
@@ -992,7 +997,7 @@
 <context>
     <name>dialogs::PreviewUploadOverlay</name>
     <message>
-        <location filename="../../src/dialogs/PreviewUploadOverlay.cpp" line="+42"/>
+        <location filename="../../src/dialogs/PreviewUploadOverlay.cpp" line="+41"/>
         <source>Upload</source>
         <translation>Hochladen</translation>
     </message>
@@ -1192,7 +1197,7 @@ Medien-Größe: %2
         <translation>Banne den Nutzer aus diesem Raum</translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+8"/>
         <source>Ignore messages from this user</source>
         <translation>Nachrichten von diesem Nutzer ignorieren</translation>
     </message>
@@ -1202,12 +1207,12 @@ Medien-Größe: %2
         <translation>Entferne diesen Nutzer aus dem Raum</translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+8"/>
         <source>Start a conversation</source>
         <translation>Gespräch beginnen</translation>
     </message>
     <message>
-        <location line="+56"/>
+        <location line="+63"/>
         <source>Devices</source>
         <translation>Geräte</translation>
     </message>
@@ -1215,7 +1220,7 @@ Medien-Größe: %2
 <context>
     <name>emoji::Panel</name>
     <message>
-        <location filename="../../src/emoji/Panel.cpp" line="+125"/>
+        <location filename="../../src/emoji/Panel.cpp" line="+126"/>
         <source>Smileys &amp; People</source>
         <translation>Smileys &amp; Personen</translation>
     </message>
@@ -1341,7 +1346,7 @@ Medien-Größe: %2
 <context>
     <name>popups::UserMentions</name>
     <message>
-        <location filename="../../src/popups/UserMentions.cpp" line="+61"/>
+        <location filename="../../src/popups/UserMentions.cpp" line="+64"/>
         <source>This Room</source>
         <translation>Dieser Raum</translation>
     </message>
diff --git a/resources/langs/nheko_el.ts b/resources/langs/nheko_el.ts

index 4344c568..8a4e4dc6 100644
--- a/resources/langs/nheko_el.ts
+++ b/resources/langs/nheko_el.ts
@@ -4,28 +4,28 @@
 <context>
     <name>ChatPage</name>
     <message>
-        <location filename="../../src/ChatPage.cpp" line="+211"/>
+        <location filename="../../src/ChatPage.cpp" line="+223"/>
         <source>Failed to invite user: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+4"/>
-        <location line="+84"/>
+        <location line="+864"/>
         <source>Invited user: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-6"/>
+        <location line="-5"/>
         <source>Failed to invite %1 to %2: %3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+19"/>
         <source>Failed to kick %1 to %2: %3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+5"/>
         <source>Kicked user: %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -35,12 +35,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+5"/>
         <source>Banned user: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location line="+14"/>
         <source>Failed to unban %1 in %2: %3</source>
         <translation type="unfinished"></translation>
     </message>
@@ -50,12 +50,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+50"/>
+        <location line="-803"/>
         <source>Failed to upload media. Please try again.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+392"/>
+        <location line="+395"/>
         <source>Failed to restore OLM account. Please login again.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -71,12 +71,12 @@
     </message>
     <message>
         <location line="+51"/>
-        <location line="+154"/>
+        <location line="+231"/>
         <source>Please try to login again: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-77"/>
+        <location line="-154"/>
         <source>Failed to join room: %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -109,7 +109,7 @@
 <context>
     <name>CommunitiesListItem</name>
     <message>
-        <location filename="../../src/CommunitiesListItem.cpp" line="+130"/>
+        <location filename="../../src/CommunitiesListItem.cpp" line="+133"/>
         <source>All rooms</source>
         <translation type="unfinished"></translation>
     </message>
@@ -161,7 +161,7 @@
 <context>
     <name>EncryptionIndicator</name>
     <message>
-        <location filename="../qml/EncryptionIndicator.qml" line="+11"/>
+        <location filename="../qml/EncryptionIndicator.qml" line="+12"/>
         <source>Encrypted</source>
         <translation type="unfinished"></translation>
     </message>
@@ -177,7 +177,7 @@
 <context>
     <name>LoginPage</name>
     <message>
-        <location filename="../../src/LoginPage.cpp" line="+80"/>
+        <location filename="../../src/LoginPage.cpp" line="+82"/>
         <source>Matrix ID</source>
         <translation>Matrix ID</translation>
     </message>
@@ -235,7 +235,7 @@
 <context>
     <name>MemberList</name>
     <message>
-        <location filename="../../src/dialogs/MemberList.cpp" line="+89"/>
+        <location filename="../../src/dialogs/MemberList.cpp" line="+90"/>
         <source>Room members</source>
         <translation>Μέλη</translation>
     </message>
@@ -289,7 +289,7 @@
 <context>
     <name>QuickSwitcher</name>
     <message>
-        <location filename="../../src/QuickSwitcher.cpp" line="+72"/>
+        <location filename="../../src/QuickSwitcher.cpp" line="+74"/>
         <source>Search for a room...</source>
         <translation>Αναζήτηση συνομιλίας...</translation>
     </message>
@@ -297,7 +297,7 @@
 <context>
     <name>RegisterPage</name>
     <message>
-        <location filename="../../src/RegisterPage.cpp" line="+77"/>
+        <location filename="../../src/RegisterPage.cpp" line="+80"/>
         <source>Username</source>
         <translation>Όνομα χρήστη</translation>
     </message>
@@ -407,7 +407,7 @@
 <context>
     <name>StatusIndicator</name>
     <message>
-        <location filename="../qml/StatusIndicator.qml" line="+13"/>
+        <location filename="../qml/StatusIndicator.qml" line="+14"/>
         <source>Failed</source>
         <translation type="unfinished"></translation>
     </message>
@@ -430,13 +430,13 @@
 <context>
     <name>TextInputWidget</name>
     <message>
-        <location filename="../../src/TextInputWidget.cpp" line="+496"/>
+        <location filename="../../src/TextInputWidget.cpp" line="+493"/>
         <source>Send a file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+13"/>
-        <location filename="../../src/TextInputWidget.h" line="+163"/>
+        <location filename="../../src/TextInputWidget.h" line="+159"/>
         <source>Write a message...</source>
         <translation>Γράψε ένα μήνυμα...</translation>
     </message>
@@ -612,7 +612,7 @@
 <context>
     <name>TimelineRow</name>
     <message>
-        <location filename="../qml/TimelineRow.qml" line="+104"/>
+        <location filename="../qml/TimelineRow.qml" line="+64"/>
         <source>Reply</source>
         <translation type="unfinished"></translation>
     </message>
@@ -621,8 +621,11 @@
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>TimelineView</name>
     <message>
-        <location line="+12"/>
+        <location filename="../qml/TimelineView.qml" line="+31"/>
         <source>Read receipts</source>
         <translation type="unfinished"></translation>
     </message>
@@ -646,19 +649,21 @@
         <source>Save as</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>TimelineView</name>
     <message>
-        <location filename="../qml/TimelineView.qml" line="+24"/>
+        <location line="+14"/>
         <source>No room open</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+239"/>
+        <source>Close</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TopRoomBar</name>
     <message>
-        <location filename="../../src/TopRoomBar.cpp" line="+78"/>
+        <location filename="../../src/TopRoomBar.cpp" line="+86"/>
         <source>Room options</source>
         <translation type="unfinished"></translation>
     </message>
@@ -691,7 +696,7 @@
 <context>
     <name>TrayIcon</name>
     <message>
-        <location filename="../../src/TrayIcon.cpp" line="+120"/>
+        <location filename="../../src/TrayIcon.cpp" line="+122"/>
         <source>Show</source>
         <translation>Εμφάνιση</translation>
     </message>
@@ -704,7 +709,7 @@
 <context>
     <name>UserInfoWidget</name>
     <message>
-        <location filename="../../src/UserInfoWidget.cpp" line="+87"/>
+        <location filename="../../src/UserInfoWidget.cpp" line="+88"/>
         <source>Logout</source>
         <translation type="unfinished"></translation>
     </message>
@@ -712,7 +717,7 @@
 <context>
     <name>UserSettingsPage</name>
     <message>
-        <location filename="../../src/UserSettingsPage.cpp" line="+188"/>
+        <location filename="../../src/UserSettingsPage.cpp" line="+189"/>
         <source>Minimize to tray</source>
         <translation>Ελαχιστοποίηση</translation>
     </message>
@@ -861,7 +866,7 @@
 <context>
     <name>WelcomePage</name>
     <message>
-        <location filename="../../src/WelcomePage.cpp" line="+46"/>
+        <location filename="../../src/WelcomePage.cpp" line="+47"/>
         <source>Welcome to nheko! The desktop client for the Matrix protocol.</source>
         <translation>Καλως ήρθες στο nheko!</translation>
     </message>
@@ -884,7 +889,7 @@
 <context>
     <name>descriptiveTime</name>
     <message>
-        <location filename="../../src/Utils.cpp" line="+119"/>
+        <location filename="../../src/Utils.cpp" line="+138"/>
         <source>Yesterday</source>
         <translation type="unfinished"></translation>
     </message>
@@ -992,7 +997,7 @@
 <context>
     <name>dialogs::PreviewUploadOverlay</name>
     <message>
-        <location filename="../../src/dialogs/PreviewUploadOverlay.cpp" line="+42"/>
+        <location filename="../../src/dialogs/PreviewUploadOverlay.cpp" line="+41"/>
         <source>Upload</source>
         <translation>Μεταφόρτωση</translation>
     </message>
@@ -1190,7 +1195,7 @@ Media size: %2
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+8"/>
         <source>Ignore messages from this user</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1200,12 +1205,12 @@ Media size: %2
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+8"/>
         <source>Start a conversation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+56"/>
+        <location line="+63"/>
         <source>Devices</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1213,7 +1218,7 @@ Media size: %2
 <context>
     <name>emoji::Panel</name>
     <message>
-        <location filename="../../src/emoji/Panel.cpp" line="+125"/>
+        <location filename="../../src/emoji/Panel.cpp" line="+126"/>
         <source>Smileys &amp; People</source>
         <translation>Πρόσωπα</translation>
     </message>
@@ -1339,7 +1344,7 @@ Media size: %2
 <context>
     <name>popups::UserMentions</name>
     <message>
-        <location filename="../../src/popups/UserMentions.cpp" line="+61"/>
+        <location filename="../../src/popups/UserMentions.cpp" line="+64"/>
         <source>This Room</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/resources/langs/nheko_en.ts b/resources/langs/nheko_en.ts

index fee87ffb..d43ef737 100644
--- a/resources/langs/nheko_en.ts
+++ b/resources/langs/nheko_en.ts
@@ -4,28 +4,28 @@
 <context>
     <name>ChatPage</name>
     <message>
-        <location filename="../../src/ChatPage.cpp" line="+211"/>
+        <location filename="../../src/ChatPage.cpp" line="+223"/>
         <source>Failed to invite user: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+4"/>
-        <location line="+84"/>
+        <location line="+864"/>
         <source>Invited user: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-6"/>
+        <location line="-5"/>
         <source>Failed to invite %1 to %2: %3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+19"/>
         <source>Failed to kick %1 to %2: %3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+5"/>
         <source>Kicked user: %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -35,12 +35,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+5"/>
         <source>Banned user: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location line="+14"/>
         <source>Failed to unban %1 in %2: %3</source>
         <translation type="unfinished"></translation>
     </message>
@@ -50,12 +50,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+50"/>
+        <location line="-803"/>
         <source>Failed to upload media. Please try again.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+392"/>
+        <location line="+395"/>
         <source>Failed to restore OLM account. Please login again.</source>
         <translation>Failed to restore OLM account. Please login again.</translation>
     </message>
@@ -71,12 +71,12 @@
     </message>
     <message>
         <location line="+51"/>
-        <location line="+154"/>
+        <location line="+231"/>
         <source>Please try to login again: %1</source>
         <translation>Please try to login again: %1</translation>
     </message>
     <message>
-        <location line="-77"/>
+        <location line="-154"/>
         <source>Failed to join room: %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -109,7 +109,7 @@
 <context>
     <name>CommunitiesListItem</name>
     <message>
-        <location filename="../../src/CommunitiesListItem.cpp" line="+130"/>
+        <location filename="../../src/CommunitiesListItem.cpp" line="+133"/>
         <source>All rooms</source>
         <translation>All rooms</translation>
     </message>
@@ -161,7 +161,7 @@
 <context>
     <name>EncryptionIndicator</name>
     <message>
-        <location filename="../qml/EncryptionIndicator.qml" line="+11"/>
+        <location filename="../qml/EncryptionIndicator.qml" line="+12"/>
         <source>Encrypted</source>
         <translation type="unfinished"></translation>
     </message>
@@ -177,7 +177,7 @@
 <context>
     <name>LoginPage</name>
     <message>
-        <location filename="../../src/LoginPage.cpp" line="+80"/>
+        <location filename="../../src/LoginPage.cpp" line="+82"/>
         <source>Matrix ID</source>
         <translation>Matrix ID</translation>
     </message>
@@ -235,7 +235,7 @@
 <context>
     <name>MemberList</name>
     <message>
-        <location filename="../../src/dialogs/MemberList.cpp" line="+89"/>
+        <location filename="../../src/dialogs/MemberList.cpp" line="+90"/>
         <source>Room members</source>
         <translation>Room members</translation>
     </message>
@@ -289,7 +289,7 @@
 <context>
     <name>QuickSwitcher</name>
     <message>
-        <location filename="../../src/QuickSwitcher.cpp" line="+72"/>
+        <location filename="../../src/QuickSwitcher.cpp" line="+74"/>
         <source>Search for a room...</source>
         <translation>Search for a room…</translation>
     </message>
@@ -297,7 +297,7 @@
 <context>
     <name>RegisterPage</name>
     <message>
-        <location filename="../../src/RegisterPage.cpp" line="+77"/>
+        <location filename="../../src/RegisterPage.cpp" line="+80"/>
         <source>Username</source>
         <translation>Username</translation>
     </message>
@@ -407,7 +407,7 @@
 <context>
     <name>StatusIndicator</name>
     <message>
-        <location filename="../qml/StatusIndicator.qml" line="+13"/>
+        <location filename="../qml/StatusIndicator.qml" line="+14"/>
         <source>Failed</source>
         <translation type="unfinished"></translation>
     </message>
@@ -430,13 +430,13 @@
 <context>
     <name>TextInputWidget</name>
     <message>
-        <location filename="../../src/TextInputWidget.cpp" line="+496"/>
+        <location filename="../../src/TextInputWidget.cpp" line="+493"/>
         <source>Send a file</source>
         <translation>Send a file</translation>
     </message>
     <message>
         <location line="+13"/>
-        <location filename="../../src/TextInputWidget.h" line="+163"/>
+        <location filename="../../src/TextInputWidget.h" line="+159"/>
         <source>Write a message...</source>
         <translation>Write a message…</translation>
     </message>
@@ -612,7 +612,7 @@
 <context>
     <name>TimelineRow</name>
     <message>
-        <location filename="../qml/TimelineRow.qml" line="+104"/>
+        <location filename="../qml/TimelineRow.qml" line="+64"/>
         <source>Reply</source>
         <translation type="unfinished"></translation>
     </message>
@@ -621,8 +621,11 @@
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>TimelineView</name>
     <message>
-        <location line="+12"/>
+        <location filename="../qml/TimelineView.qml" line="+31"/>
         <source>Read receipts</source>
         <translation type="unfinished">Read receipts</translation>
     </message>
@@ -646,19 +649,21 @@
         <source>Save as</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>TimelineView</name>
     <message>
-        <location filename="../qml/TimelineView.qml" line="+24"/>
+        <location line="+14"/>
         <source>No room open</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+239"/>
+        <source>Close</source>
+        <translation type="unfinished">Close</translation>
+    </message>
 </context>
 <context>
     <name>TopRoomBar</name>
     <message>
-        <location filename="../../src/TopRoomBar.cpp" line="+78"/>
+        <location filename="../../src/TopRoomBar.cpp" line="+86"/>
         <source>Room options</source>
         <translation>Room options</translation>
     </message>
@@ -691,7 +696,7 @@
 <context>
     <name>TrayIcon</name>
     <message>
-        <location filename="../../src/TrayIcon.cpp" line="+120"/>
+        <location filename="../../src/TrayIcon.cpp" line="+122"/>
         <source>Show</source>
         <translation>Show</translation>
     </message>
@@ -704,7 +709,7 @@
 <context>
     <name>UserInfoWidget</name>
     <message>
-        <location filename="../../src/UserInfoWidget.cpp" line="+87"/>
+        <location filename="../../src/UserInfoWidget.cpp" line="+88"/>
         <source>Logout</source>
         <translation>Logout</translation>
     </message>
@@ -712,7 +717,7 @@
 <context>
     <name>UserSettingsPage</name>
     <message>
-        <location filename="../../src/UserSettingsPage.cpp" line="+188"/>
+        <location filename="../../src/UserSettingsPage.cpp" line="+189"/>
         <source>Minimize to tray</source>
         <translation>Minimize to tray</translation>
     </message>
@@ -861,7 +866,7 @@
 <context>
     <name>WelcomePage</name>
     <message>
-        <location filename="../../src/WelcomePage.cpp" line="+46"/>
+        <location filename="../../src/WelcomePage.cpp" line="+47"/>
         <source>Welcome to nheko! The desktop client for the Matrix protocol.</source>
         <translation>Welcome to nheko! The desktop client for the Matrix protocol.</translation>
     </message>
@@ -884,7 +889,7 @@
 <context>
     <name>descriptiveTime</name>
     <message>
-        <location filename="../../src/Utils.cpp" line="+119"/>
+        <location filename="../../src/Utils.cpp" line="+138"/>
         <source>Yesterday</source>
         <translation>Yesterday</translation>
     </message>
@@ -992,7 +997,7 @@
 <context>
     <name>dialogs::PreviewUploadOverlay</name>
     <message>
-        <location filename="../../src/dialogs/PreviewUploadOverlay.cpp" line="+42"/>
+        <location filename="../../src/dialogs/PreviewUploadOverlay.cpp" line="+41"/>
         <source>Upload</source>
         <translation>Upload</translation>
     </message>
@@ -1194,7 +1199,7 @@ Media size: %2
         <translation>Ban the user from the room</translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+8"/>
         <source>Ignore messages from this user</source>
         <translation>Ignore messages from this user</translation>
     </message>
@@ -1204,12 +1209,12 @@ Media size: %2
         <translation>Kick the user from the room</translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+8"/>
         <source>Start a conversation</source>
         <translation>Start a conversation</translation>
     </message>
     <message>
-        <location line="+56"/>
+        <location line="+63"/>
         <source>Devices</source>
         <translation>Devices</translation>
     </message>
@@ -1217,7 +1222,7 @@ Media size: %2
 <context>
     <name>emoji::Panel</name>
     <message>
-        <location filename="../../src/emoji/Panel.cpp" line="+125"/>
+        <location filename="../../src/emoji/Panel.cpp" line="+126"/>
         <source>Smileys &amp; People</source>
         <translation>Smileys &amp; People</translation>
     </message>
@@ -1343,7 +1348,7 @@ Media size: %2
 <context>
     <name>popups::UserMentions</name>
     <message>
-        <location filename="../../src/popups/UserMentions.cpp" line="+61"/>
+        <location filename="../../src/popups/UserMentions.cpp" line="+64"/>
         <source>This Room</source>
         <translation type="unfinished">This Room</translation>
     </message>
diff --git a/resources/langs/nheko_fi.ts b/resources/langs/nheko_fi.ts

index f6e2756c..2f4ef859 100644
--- a/resources/langs/nheko_fi.ts
+++ b/resources/langs/nheko_fi.ts
@@ -4,28 +4,28 @@
 <context>
     <name>ChatPage</name>
     <message>
-        <location filename="../../src/ChatPage.cpp" line="+211"/>
+        <location filename="../../src/ChatPage.cpp" line="+223"/>
         <source>Failed to invite user: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+4"/>
-        <location line="+84"/>
+        <location line="+864"/>
         <source>Invited user: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-6"/>
+        <location line="-5"/>
         <source>Failed to invite %1 to %2: %3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+19"/>
         <source>Failed to kick %1 to %2: %3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+5"/>
         <source>Kicked user: %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -35,12 +35,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+5"/>
         <source>Banned user: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location line="+14"/>
         <source>Failed to unban %1 in %2: %3</source>
         <translation type="unfinished"></translation>
     </message>
@@ -50,12 +50,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+50"/>
+        <location line="-803"/>
         <source>Failed to upload media. Please try again.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+392"/>
+        <location line="+395"/>
         <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,12 +71,12 @@
     </message>
     <message>
         <location line="+51"/>
-        <location line="+154"/>
+        <location line="+231"/>
         <source>Please try to login again: %1</source>
         <translation>Ole hyvä ja yritä kirjautua sisään uudelleen: %1</translation>
     </message>
     <message>
-        <location line="-77"/>
+        <location line="-154"/>
         <source>Failed to join room: %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -109,7 +109,7 @@
 <context>
     <name>CommunitiesListItem</name>
     <message>
-        <location filename="../../src/CommunitiesListItem.cpp" line="+130"/>
+        <location filename="../../src/CommunitiesListItem.cpp" line="+133"/>
         <source>All rooms</source>
         <translation>Kaikki huoneet</translation>
     </message>
@@ -161,7 +161,7 @@
 <context>
     <name>EncryptionIndicator</name>
     <message>
-        <location filename="../qml/EncryptionIndicator.qml" line="+11"/>
+        <location filename="../qml/EncryptionIndicator.qml" line="+12"/>
         <source>Encrypted</source>
         <translation type="unfinished"></translation>
     </message>
@@ -177,7 +177,7 @@
 <context>
     <name>LoginPage</name>
     <message>
-        <location filename="../../src/LoginPage.cpp" line="+80"/>
+        <location filename="../../src/LoginPage.cpp" line="+82"/>
         <source>Matrix ID</source>
         <translation>Matrix-tunnus</translation>
     </message>
@@ -235,7 +235,7 @@
 <context>
     <name>MemberList</name>
     <message>
-        <location filename="../../src/dialogs/MemberList.cpp" line="+89"/>
+        <location filename="../../src/dialogs/MemberList.cpp" line="+90"/>
         <source>Room members</source>
         <translation>Huoneen jäsenet</translation>
     </message>
@@ -289,7 +289,7 @@
 <context>
     <name>QuickSwitcher</name>
     <message>
-        <location filename="../../src/QuickSwitcher.cpp" line="+72"/>
+        <location filename="../../src/QuickSwitcher.cpp" line="+74"/>
         <source>Search for a room...</source>
         <translation>Etsi huonetta…</translation>
     </message>
@@ -297,7 +297,7 @@
 <context>
     <name>RegisterPage</name>
     <message>
-        <location filename="../../src/RegisterPage.cpp" line="+77"/>
+        <location filename="../../src/RegisterPage.cpp" line="+80"/>
         <source>Username</source>
         <translation>Käyttäjänimi</translation>
     </message>
@@ -407,7 +407,7 @@
 <context>
     <name>StatusIndicator</name>
     <message>
-        <location filename="../qml/StatusIndicator.qml" line="+13"/>
+        <location filename="../qml/StatusIndicator.qml" line="+14"/>
         <source>Failed</source>
         <translation type="unfinished"></translation>
     </message>
@@ -430,13 +430,13 @@
 <context>
     <name>TextInputWidget</name>
     <message>
-        <location filename="../../src/TextInputWidget.cpp" line="+496"/>
+        <location filename="../../src/TextInputWidget.cpp" line="+493"/>
         <source>Send a file</source>
         <translation>Lähetä tiedosto</translation>
     </message>
     <message>
         <location line="+13"/>
-        <location filename="../../src/TextInputWidget.h" line="+163"/>
+        <location filename="../../src/TextInputWidget.h" line="+159"/>
         <source>Write a message...</source>
         <translation>Kirjoita viesti…</translation>
     </message>
@@ -612,7 +612,7 @@
 <context>
     <name>TimelineRow</name>
     <message>
-        <location filename="../qml/TimelineRow.qml" line="+104"/>
+        <location filename="../qml/TimelineRow.qml" line="+64"/>
         <source>Reply</source>
         <translation type="unfinished"></translation>
     </message>
@@ -621,8 +621,11 @@
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>TimelineView</name>
     <message>
-        <location line="+12"/>
+        <location filename="../qml/TimelineView.qml" line="+31"/>
         <source>Read receipts</source>
         <translation type="unfinished">Lukukuittaukset</translation>
     </message>
@@ -646,19 +649,21 @@
         <source>Save as</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>TimelineView</name>
     <message>
-        <location filename="../qml/TimelineView.qml" line="+24"/>
+        <location line="+14"/>
         <source>No room open</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+239"/>
+        <source>Close</source>
+        <translation type="unfinished">Sulje</translation>
+    </message>
 </context>
 <context>
     <name>TopRoomBar</name>
     <message>
-        <location filename="../../src/TopRoomBar.cpp" line="+78"/>
+        <location filename="../../src/TopRoomBar.cpp" line="+86"/>
         <source>Room options</source>
         <translation>Huonevaihtoehdot</translation>
     </message>
@@ -691,7 +696,7 @@
 <context>
     <name>TrayIcon</name>
     <message>
-        <location filename="../../src/TrayIcon.cpp" line="+120"/>
+        <location filename="../../src/TrayIcon.cpp" line="+122"/>
         <source>Show</source>
         <translation>Näytä</translation>
     </message>
@@ -704,7 +709,7 @@
 <context>
     <name>UserInfoWidget</name>
     <message>
-        <location filename="../../src/UserInfoWidget.cpp" line="+87"/>
+        <location filename="../../src/UserInfoWidget.cpp" line="+88"/>
         <source>Logout</source>
         <translation>Kirjaudu ulos</translation>
     </message>
@@ -712,7 +717,7 @@
 <context>
     <name>UserSettingsPage</name>
     <message>
-        <location filename="../../src/UserSettingsPage.cpp" line="+188"/>
+        <location filename="../../src/UserSettingsPage.cpp" line="+189"/>
         <source>Minimize to tray</source>
         <translation>Pienennä ilmoitusalueelle</translation>
     </message>
@@ -861,7 +866,7 @@
 <context>
     <name>WelcomePage</name>
     <message>
-        <location filename="../../src/WelcomePage.cpp" line="+46"/>
+        <location filename="../../src/WelcomePage.cpp" line="+47"/>
         <source>Welcome to nheko! The desktop client for the Matrix protocol.</source>
         <translation>Tervetuloa nhekoon! Työpöytäsovellus Matrix-protokollalle.</translation>
     </message>
@@ -884,7 +889,7 @@
 <context>
     <name>descriptiveTime</name>
     <message>
-        <location filename="../../src/Utils.cpp" line="+119"/>
+        <location filename="../../src/Utils.cpp" line="+138"/>
         <source>Yesterday</source>
         <translation>Eilen</translation>
     </message>
@@ -992,7 +997,7 @@
 <context>
     <name>dialogs::PreviewUploadOverlay</name>
     <message>
-        <location filename="../../src/dialogs/PreviewUploadOverlay.cpp" line="+42"/>
+        <location filename="../../src/dialogs/PreviewUploadOverlay.cpp" line="+41"/>
         <source>Upload</source>
         <translation>Lähetä</translation>
     </message>
@@ -1194,7 +1199,7 @@ Median koko: %2
         <translation>Anna käyttäjälle porttikielto huoneesta</translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+8"/>
         <source>Ignore messages from this user</source>
         <translation>Jätä tämän käyttäjän viestit huomiotta</translation>
     </message>
@@ -1204,12 +1209,12 @@ Median koko: %2
         <translation>Potki käyttäjä huoneesta</translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+8"/>
         <source>Start a conversation</source>
         <translation>Aloita keskustelu</translation>
     </message>
     <message>
-        <location line="+56"/>
+        <location line="+63"/>
         <source>Devices</source>
         <translation>Laitteet</translation>
     </message>
@@ -1217,7 +1222,7 @@ Median koko: %2
 <context>
     <name>emoji::Panel</name>
     <message>
-        <location filename="../../src/emoji/Panel.cpp" line="+125"/>
+        <location filename="../../src/emoji/Panel.cpp" line="+126"/>
         <source>Smileys &amp; People</source>
         <translation>Hymiöt ja ihmiset</translation>
     </message>
@@ -1343,7 +1348,7 @@ Median koko: %2
 <context>
     <name>popups::UserMentions</name>
     <message>
-        <location filename="../../src/popups/UserMentions.cpp" line="+61"/>
+        <location filename="../../src/popups/UserMentions.cpp" line="+64"/>
         <source>This Room</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/resources/langs/nheko_fr.ts b/resources/langs/nheko_fr.ts

index 89dd8cdd..4369a873 100644
--- a/resources/langs/nheko_fr.ts
+++ b/resources/langs/nheko_fr.ts
@@ -4,28 +4,28 @@
 <context>
     <name>ChatPage</name>
     <message>
-        <location filename="../../src/ChatPage.cpp" line="+211"/>
+        <location filename="../../src/ChatPage.cpp" line="+223"/>
         <source>Failed to invite user: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+4"/>
-        <location line="+84"/>
+        <location line="+864"/>
         <source>Invited user: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-6"/>
+        <location line="-5"/>
         <source>Failed to invite %1 to %2: %3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+19"/>
         <source>Failed to kick %1 to %2: %3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+5"/>
         <source>Kicked user: %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -35,12 +35,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+5"/>
         <source>Banned user: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location line="+14"/>
         <source>Failed to unban %1 in %2: %3</source>
         <translation type="unfinished"></translation>
     </message>
@@ -50,12 +50,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+50"/>
+        <location line="-803"/>
         <source>Failed to upload media. Please try again.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+392"/>
+        <location line="+395"/>
         <source>Failed to restore OLM account. Please login again.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -71,12 +71,12 @@
     </message>
     <message>
         <location line="+51"/>
-        <location line="+154"/>
+        <location line="+231"/>
         <source>Please try to login again: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-77"/>
+        <location line="-154"/>
         <source>Failed to join room: %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -109,7 +109,7 @@
 <context>
     <name>CommunitiesListItem</name>
     <message>
-        <location filename="../../src/CommunitiesListItem.cpp" line="+130"/>
+        <location filename="../../src/CommunitiesListItem.cpp" line="+133"/>
         <source>All rooms</source>
         <translation type="unfinished"></translation>
     </message>
@@ -161,7 +161,7 @@
 <context>
     <name>EncryptionIndicator</name>
     <message>
-        <location filename="../qml/EncryptionIndicator.qml" line="+11"/>
+        <location filename="../qml/EncryptionIndicator.qml" line="+12"/>
         <source>Encrypted</source>
         <translation type="unfinished"></translation>
     </message>
@@ -177,7 +177,7 @@
 <context>
     <name>LoginPage</name>
     <message>
-        <location filename="../../src/LoginPage.cpp" line="+80"/>
+        <location filename="../../src/LoginPage.cpp" line="+82"/>
         <source>Matrix ID</source>
         <translation>Identifiant Matrix</translation>
     </message>
@@ -235,7 +235,7 @@
 <context>
     <name>MemberList</name>
     <message>
-        <location filename="../../src/dialogs/MemberList.cpp" line="+89"/>
+        <location filename="../../src/dialogs/MemberList.cpp" line="+90"/>
         <source>Room members</source>
         <translation>Membres du salon</translation>
     </message>
@@ -289,7 +289,7 @@
 <context>
     <name>QuickSwitcher</name>
     <message>
-        <location filename="../../src/QuickSwitcher.cpp" line="+72"/>
+        <location filename="../../src/QuickSwitcher.cpp" line="+74"/>
         <source>Search for a room...</source>
         <translation>Chercher un salon…</translation>
     </message>
@@ -297,7 +297,7 @@
 <context>
     <name>RegisterPage</name>
     <message>
-        <location filename="../../src/RegisterPage.cpp" line="+77"/>
+        <location filename="../../src/RegisterPage.cpp" line="+80"/>
         <source>Username</source>
         <translation>Nom d&apos;utilisateur</translation>
     </message>
@@ -408,7 +408,7 @@
 <context>
     <name>StatusIndicator</name>
     <message>
-        <location filename="../qml/StatusIndicator.qml" line="+13"/>
+        <location filename="../qml/StatusIndicator.qml" line="+14"/>
         <source>Failed</source>
         <translation type="unfinished"></translation>
     </message>
@@ -431,13 +431,13 @@
 <context>
     <name>TextInputWidget</name>
     <message>
-        <location filename="../../src/TextInputWidget.cpp" line="+496"/>
+        <location filename="../../src/TextInputWidget.cpp" line="+493"/>
         <source>Send a file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+13"/>
-        <location filename="../../src/TextInputWidget.h" line="+163"/>
+        <location filename="../../src/TextInputWidget.h" line="+159"/>
         <source>Write a message...</source>
         <translation>Écrivez un message...</translation>
     </message>
@@ -613,7 +613,7 @@
 <context>
     <name>TimelineRow</name>
     <message>
-        <location filename="../qml/TimelineRow.qml" line="+104"/>
+        <location filename="../qml/TimelineRow.qml" line="+64"/>
         <source>Reply</source>
         <translation type="unfinished"></translation>
     </message>
@@ -622,8 +622,11 @@
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>TimelineView</name>
     <message>
-        <location line="+12"/>
+        <location filename="../qml/TimelineView.qml" line="+31"/>
         <source>Read receipts</source>
         <translation type="unfinished">Accusés de lecture</translation>
     </message>
@@ -647,19 +650,21 @@
         <source>Save as</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>TimelineView</name>
     <message>
-        <location filename="../qml/TimelineView.qml" line="+24"/>
+        <location line="+14"/>
         <source>No room open</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+239"/>
+        <source>Close</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TopRoomBar</name>
     <message>
-        <location filename="../../src/TopRoomBar.cpp" line="+78"/>
+        <location filename="../../src/TopRoomBar.cpp" line="+86"/>
         <source>Room options</source>
         <translation type="unfinished"></translation>
     </message>
@@ -692,7 +697,7 @@
 <context>
     <name>TrayIcon</name>
     <message>
-        <location filename="../../src/TrayIcon.cpp" line="+120"/>
+        <location filename="../../src/TrayIcon.cpp" line="+122"/>
         <source>Show</source>
         <translation>Montrer</translation>
     </message>
@@ -705,7 +710,7 @@
 <context>
     <name>UserInfoWidget</name>
     <message>
-        <location filename="../../src/UserInfoWidget.cpp" line="+87"/>
+        <location filename="../../src/UserInfoWidget.cpp" line="+88"/>
         <source>Logout</source>
         <translation type="unfinished"></translation>
     </message>
@@ -713,7 +718,7 @@
 <context>
     <name>UserSettingsPage</name>
     <message>
-        <location filename="../../src/UserSettingsPage.cpp" line="+188"/>
+        <location filename="../../src/UserSettingsPage.cpp" line="+189"/>
         <source>Minimize to tray</source>
         <translation>Réduire à la barre des tâches</translation>
     </message>
@@ -862,7 +867,7 @@
 <context>
     <name>WelcomePage</name>
     <message>
-        <location filename="../../src/WelcomePage.cpp" line="+46"/>
+        <location filename="../../src/WelcomePage.cpp" line="+47"/>
         <source>Welcome to nheko! The desktop client for the Matrix protocol.</source>
         <translation>Bienvenue sur nheko ! Le client de bureau pour le protocole Matrix.</translation>
     </message>
@@ -885,7 +890,7 @@
 <context>
     <name>descriptiveTime</name>
     <message>
-        <location filename="../../src/Utils.cpp" line="+119"/>
+        <location filename="../../src/Utils.cpp" line="+138"/>
         <source>Yesterday</source>
         <translation type="unfinished"></translation>
     </message>
@@ -993,7 +998,7 @@
 <context>
     <name>dialogs::PreviewUploadOverlay</name>
     <message>
-        <location filename="../../src/dialogs/PreviewUploadOverlay.cpp" line="+42"/>
+        <location filename="../../src/dialogs/PreviewUploadOverlay.cpp" line="+41"/>
         <source>Upload</source>
         <translation>Envoyer</translation>
     </message>
@@ -1193,7 +1198,7 @@ Taille du média : %2
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+8"/>
         <source>Ignore messages from this user</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1203,12 +1208,12 @@ Taille du média : %2
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+8"/>
         <source>Start a conversation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+56"/>
+        <location line="+63"/>
         <source>Devices</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1216,7 +1221,7 @@ Taille du média : %2
 <context>
     <name>emoji::Panel</name>
     <message>
-        <location filename="../../src/emoji/Panel.cpp" line="+125"/>
+        <location filename="../../src/emoji/Panel.cpp" line="+126"/>
         <source>Smileys &amp; People</source>
         <translation>Smileys &amp; Personnes</translation>
     </message>
@@ -1342,7 +1347,7 @@ Taille du média : %2
 <context>
     <name>popups::UserMentions</name>
     <message>
-        <location filename="../../src/popups/UserMentions.cpp" line="+61"/>
+        <location filename="../../src/popups/UserMentions.cpp" line="+64"/>
         <source>This Room</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/resources/langs/nheko_nl.ts b/resources/langs/nheko_nl.ts

index 2aa5de74..2ad46d78 100644
--- a/resources/langs/nheko_nl.ts
+++ b/resources/langs/nheko_nl.ts
@@ -4,28 +4,28 @@
 <context>
     <name>ChatPage</name>
     <message>
-        <location filename="../../src/ChatPage.cpp" line="+211"/>
+        <location filename="../../src/ChatPage.cpp" line="+223"/>
         <source>Failed to invite user: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+4"/>
-        <location line="+84"/>
+        <location line="+864"/>
         <source>Invited user: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-6"/>
+        <location line="-5"/>
         <source>Failed to invite %1 to %2: %3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+19"/>
         <source>Failed to kick %1 to %2: %3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+5"/>
         <source>Kicked user: %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -35,12 +35,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+5"/>
         <source>Banned user: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location line="+14"/>
         <source>Failed to unban %1 in %2: %3</source>
         <translation type="unfinished"></translation>
     </message>
@@ -50,12 +50,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+50"/>
+        <location line="-803"/>
         <source>Failed to upload media. Please try again.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+392"/>
+        <location line="+395"/>
         <source>Failed to restore OLM account. Please login again.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -71,12 +71,12 @@
     </message>
     <message>
         <location line="+51"/>
-        <location line="+154"/>
+        <location line="+231"/>
         <source>Please try to login again: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-77"/>
+        <location line="-154"/>
         <source>Failed to join room: %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -109,7 +109,7 @@
 <context>
     <name>CommunitiesListItem</name>
     <message>
-        <location filename="../../src/CommunitiesListItem.cpp" line="+130"/>
+        <location filename="../../src/CommunitiesListItem.cpp" line="+133"/>
         <source>All rooms</source>
         <translation type="unfinished"></translation>
     </message>
@@ -161,7 +161,7 @@
 <context>
     <name>EncryptionIndicator</name>
     <message>
-        <location filename="../qml/EncryptionIndicator.qml" line="+11"/>
+        <location filename="../qml/EncryptionIndicator.qml" line="+12"/>
         <source>Encrypted</source>
         <translation type="unfinished"></translation>
     </message>
@@ -177,7 +177,7 @@
 <context>
     <name>LoginPage</name>
     <message>
-        <location filename="../../src/LoginPage.cpp" line="+80"/>
+        <location filename="../../src/LoginPage.cpp" line="+82"/>
         <source>Matrix ID</source>
         <translation>Matrix-id</translation>
     </message>
@@ -235,7 +235,7 @@
 <context>
     <name>MemberList</name>
     <message>
-        <location filename="../../src/dialogs/MemberList.cpp" line="+89"/>
+        <location filename="../../src/dialogs/MemberList.cpp" line="+90"/>
         <source>Room members</source>
         <translation>Kamerleden</translation>
     </message>
@@ -289,7 +289,7 @@
 <context>
     <name>QuickSwitcher</name>
     <message>
-        <location filename="../../src/QuickSwitcher.cpp" line="+72"/>
+        <location filename="../../src/QuickSwitcher.cpp" line="+74"/>
         <source>Search for a room...</source>
         <translation>Zoek een kamer...</translation>
     </message>
@@ -297,7 +297,7 @@
 <context>
     <name>RegisterPage</name>
     <message>
-        <location filename="../../src/RegisterPage.cpp" line="+77"/>
+        <location filename="../../src/RegisterPage.cpp" line="+80"/>
         <source>Username</source>
         <translation>Gebruikersnaam</translation>
     </message>
@@ -407,7 +407,7 @@
 <context>
     <name>StatusIndicator</name>
     <message>
-        <location filename="../qml/StatusIndicator.qml" line="+13"/>
+        <location filename="../qml/StatusIndicator.qml" line="+14"/>
         <source>Failed</source>
         <translation type="unfinished"></translation>
     </message>
@@ -430,13 +430,13 @@
 <context>
     <name>TextInputWidget</name>
     <message>
-        <location filename="../../src/TextInputWidget.cpp" line="+496"/>
+        <location filename="../../src/TextInputWidget.cpp" line="+493"/>
         <source>Send a file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+13"/>
-        <location filename="../../src/TextInputWidget.h" line="+163"/>
+        <location filename="../../src/TextInputWidget.h" line="+159"/>
         <source>Write a message...</source>
         <translation>Typ een bericht...</translation>
     </message>
@@ -612,7 +612,7 @@
 <context>
     <name>TimelineRow</name>
     <message>
-        <location filename="../qml/TimelineRow.qml" line="+104"/>
+        <location filename="../qml/TimelineRow.qml" line="+64"/>
         <source>Reply</source>
         <translation type="unfinished"></translation>
     </message>
@@ -621,8 +621,11 @@
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>TimelineView</name>
     <message>
-        <location line="+12"/>
+        <location filename="../qml/TimelineView.qml" line="+31"/>
         <source>Read receipts</source>
         <translation type="unfinished">Leesbevestigingen</translation>
     </message>
@@ -646,19 +649,21 @@
         <source>Save as</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>TimelineView</name>
     <message>
-        <location filename="../qml/TimelineView.qml" line="+24"/>
+        <location line="+14"/>
         <source>No room open</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+239"/>
+        <source>Close</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TopRoomBar</name>
     <message>
-        <location filename="../../src/TopRoomBar.cpp" line="+78"/>
+        <location filename="../../src/TopRoomBar.cpp" line="+86"/>
         <source>Room options</source>
         <translation type="unfinished"></translation>
     </message>
@@ -691,7 +696,7 @@
 <context>
     <name>TrayIcon</name>
     <message>
-        <location filename="../../src/TrayIcon.cpp" line="+120"/>
+        <location filename="../../src/TrayIcon.cpp" line="+122"/>
         <source>Show</source>
         <translation>Tonen</translation>
     </message>
@@ -704,7 +709,7 @@
 <context>
     <name>UserInfoWidget</name>
     <message>
-        <location filename="../../src/UserInfoWidget.cpp" line="+87"/>
+        <location filename="../../src/UserInfoWidget.cpp" line="+88"/>
         <source>Logout</source>
         <translation type="unfinished"></translation>
     </message>
@@ -712,7 +717,7 @@
 <context>
     <name>UserSettingsPage</name>
     <message>
-        <location filename="../../src/UserSettingsPage.cpp" line="+188"/>
+        <location filename="../../src/UserSettingsPage.cpp" line="+189"/>
         <source>Minimize to tray</source>
         <translation>Minimaliseren naar systeemvak</translation>
     </message>
@@ -861,7 +866,7 @@
 <context>
     <name>WelcomePage</name>
     <message>
-        <location filename="../../src/WelcomePage.cpp" line="+46"/>
+        <location filename="../../src/WelcomePage.cpp" line="+47"/>
         <source>Welcome to nheko! The desktop client for the Matrix protocol.</source>
         <translation>Welkom bij nheko! Dé computerclient voor het Matrix-protocol.</translation>
     </message>
@@ -884,7 +889,7 @@
 <context>
     <name>descriptiveTime</name>
     <message>
-        <location filename="../../src/Utils.cpp" line="+119"/>
+        <location filename="../../src/Utils.cpp" line="+138"/>
         <source>Yesterday</source>
         <translation type="unfinished"></translation>
     </message>
@@ -992,7 +997,7 @@
 <context>
     <name>dialogs::PreviewUploadOverlay</name>
     <message>
-        <location filename="../../src/dialogs/PreviewUploadOverlay.cpp" line="+42"/>
+        <location filename="../../src/dialogs/PreviewUploadOverlay.cpp" line="+41"/>
         <source>Upload</source>
         <translation>Uploaden</translation>
     </message>
@@ -1192,7 +1197,7 @@ Mediagrootte: %2
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+8"/>
         <source>Ignore messages from this user</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1202,12 +1207,12 @@ Mediagrootte: %2
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+8"/>
         <source>Start a conversation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+56"/>
+        <location line="+63"/>
         <source>Devices</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1215,7 +1220,7 @@ Mediagrootte: %2
 <context>
     <name>emoji::Panel</name>
     <message>
-        <location filename="../../src/emoji/Panel.cpp" line="+125"/>
+        <location filename="../../src/emoji/Panel.cpp" line="+126"/>
         <source>Smileys &amp; People</source>
         <translation>Smileys en mensen</translation>
     </message>
@@ -1341,7 +1346,7 @@ Mediagrootte: %2
 <context>
     <name>popups::UserMentions</name>
     <message>
-        <location filename="../../src/popups/UserMentions.cpp" line="+61"/>
+        <location filename="../../src/popups/UserMentions.cpp" line="+64"/>
         <source>This Room</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/resources/langs/nheko_pl.ts b/resources/langs/nheko_pl.ts

index 88dfe2b9..ff18bf61 100644
--- a/resources/langs/nheko_pl.ts
+++ b/resources/langs/nheko_pl.ts
@@ -4,28 +4,28 @@
 <context>
     <name>ChatPage</name>
     <message>
-        <location filename="../../src/ChatPage.cpp" line="+211"/>
+        <location filename="../../src/ChatPage.cpp" line="+223"/>
         <source>Failed to invite user: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+4"/>
-        <location line="+84"/>
+        <location line="+864"/>
         <source>Invited user: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-6"/>
+        <location line="-5"/>
         <source>Failed to invite %1 to %2: %3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+19"/>
         <source>Failed to kick %1 to %2: %3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+5"/>
         <source>Kicked user: %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -35,12 +35,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+5"/>
         <source>Banned user: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location line="+14"/>
         <source>Failed to unban %1 in %2: %3</source>
         <translation type="unfinished"></translation>
     </message>
@@ -50,12 +50,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+50"/>
+        <location line="-803"/>
         <source>Failed to upload media. Please try again.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+392"/>
+        <location line="+395"/>
         <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,12 +71,12 @@
     </message>
     <message>
         <location line="+51"/>
-        <location line="+154"/>
+        <location line="+231"/>
         <source>Please try to login again: %1</source>
         <translation>Spróbuj zalogować się ponownie: %1</translation>
     </message>
     <message>
-        <location line="-77"/>
+        <location line="-154"/>
         <source>Failed to join room: %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -109,7 +109,7 @@
 <context>
     <name>CommunitiesListItem</name>
     <message>
-        <location filename="../../src/CommunitiesListItem.cpp" line="+130"/>
+        <location filename="../../src/CommunitiesListItem.cpp" line="+133"/>
         <source>All rooms</source>
         <translation type="unfinished"></translation>
     </message>
@@ -161,7 +161,7 @@
 <context>
     <name>EncryptionIndicator</name>
     <message>
-        <location filename="../qml/EncryptionIndicator.qml" line="+11"/>
+        <location filename="../qml/EncryptionIndicator.qml" line="+12"/>
         <source>Encrypted</source>
         <translation type="unfinished"></translation>
     </message>
@@ -177,7 +177,7 @@
 <context>
     <name>LoginPage</name>
     <message>
-        <location filename="../../src/LoginPage.cpp" line="+80"/>
+        <location filename="../../src/LoginPage.cpp" line="+82"/>
         <source>Matrix ID</source>
         <translation>ID Matrixa</translation>
     </message>
@@ -235,7 +235,7 @@
 <context>
     <name>MemberList</name>
     <message>
-        <location filename="../../src/dialogs/MemberList.cpp" line="+89"/>
+        <location filename="../../src/dialogs/MemberList.cpp" line="+90"/>
         <source>Room members</source>
         <translation>Członkowie pokoju</translation>
     </message>
@@ -289,7 +289,7 @@
 <context>
     <name>QuickSwitcher</name>
     <message>
-        <location filename="../../src/QuickSwitcher.cpp" line="+72"/>
+        <location filename="../../src/QuickSwitcher.cpp" line="+74"/>
         <source>Search for a room...</source>
         <translation>Wyszukaj pokoju…</translation>
     </message>
@@ -297,7 +297,7 @@
 <context>
     <name>RegisterPage</name>
     <message>
-        <location filename="../../src/RegisterPage.cpp" line="+77"/>
+        <location filename="../../src/RegisterPage.cpp" line="+80"/>
         <source>Username</source>
         <translation>Nazwa użytkownika</translation>
     </message>
@@ -407,7 +407,7 @@
 <context>
     <name>StatusIndicator</name>
     <message>
-        <location filename="../qml/StatusIndicator.qml" line="+13"/>
+        <location filename="../qml/StatusIndicator.qml" line="+14"/>
         <source>Failed</source>
         <translation type="unfinished"></translation>
     </message>
@@ -430,13 +430,13 @@
 <context>
     <name>TextInputWidget</name>
     <message>
-        <location filename="../../src/TextInputWidget.cpp" line="+496"/>
+        <location filename="../../src/TextInputWidget.cpp" line="+493"/>
         <source>Send a file</source>
         <translation>Wyślij plik</translation>
     </message>
     <message>
         <location line="+13"/>
-        <location filename="../../src/TextInputWidget.h" line="+163"/>
+        <location filename="../../src/TextInputWidget.h" line="+159"/>
         <source>Write a message...</source>
         <translation>Napisz wiadomość…</translation>
     </message>
@@ -613,7 +613,7 @@
 <context>
     <name>TimelineRow</name>
     <message>
-        <location filename="../qml/TimelineRow.qml" line="+104"/>
+        <location filename="../qml/TimelineRow.qml" line="+64"/>
         <source>Reply</source>
         <translation type="unfinished"></translation>
     </message>
@@ -622,8 +622,11 @@
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>TimelineView</name>
     <message>
-        <location line="+12"/>
+        <location filename="../qml/TimelineView.qml" line="+31"/>
         <source>Read receipts</source>
         <translation type="unfinished">Potwierdzenia przeczytania</translation>
     </message>
@@ -647,19 +650,21 @@
         <source>Save as</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>TimelineView</name>
     <message>
-        <location filename="../qml/TimelineView.qml" line="+24"/>
+        <location line="+14"/>
         <source>No room open</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+239"/>
+        <source>Close</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TopRoomBar</name>
     <message>
-        <location filename="../../src/TopRoomBar.cpp" line="+78"/>
+        <location filename="../../src/TopRoomBar.cpp" line="+86"/>
         <source>Room options</source>
         <translation>Ustawienia pokoju</translation>
     </message>
@@ -692,7 +697,7 @@
 <context>
     <name>TrayIcon</name>
     <message>
-        <location filename="../../src/TrayIcon.cpp" line="+120"/>
+        <location filename="../../src/TrayIcon.cpp" line="+122"/>
         <source>Show</source>
         <translation>Pokaż</translation>
     </message>
@@ -705,7 +710,7 @@
 <context>
     <name>UserInfoWidget</name>
     <message>
-        <location filename="../../src/UserInfoWidget.cpp" line="+87"/>
+        <location filename="../../src/UserInfoWidget.cpp" line="+88"/>
         <source>Logout</source>
         <translation>Wyloguj</translation>
     </message>
@@ -713,7 +718,7 @@
 <context>
     <name>UserSettingsPage</name>
     <message>
-        <location filename="../../src/UserSettingsPage.cpp" line="+188"/>
+        <location filename="../../src/UserSettingsPage.cpp" line="+189"/>
         <source>Minimize to tray</source>
         <translation>Zminimalizuj do paska zadań</translation>
     </message>
@@ -862,7 +867,7 @@
 <context>
     <name>WelcomePage</name>
     <message>
-        <location filename="../../src/WelcomePage.cpp" line="+46"/>
+        <location filename="../../src/WelcomePage.cpp" line="+47"/>
         <source>Welcome to nheko! The desktop client for the Matrix protocol.</source>
         <translation>Witamy w nheko! Desktopowy klient protokołu Matrix.</translation>
     </message>
@@ -885,7 +890,7 @@
 <context>
     <name>descriptiveTime</name>
     <message>
-        <location filename="../../src/Utils.cpp" line="+119"/>
+        <location filename="../../src/Utils.cpp" line="+138"/>
         <source>Yesterday</source>
         <translation type="unfinished"></translation>
     </message>
@@ -993,7 +998,7 @@
 <context>
     <name>dialogs::PreviewUploadOverlay</name>
     <message>
-        <location filename="../../src/dialogs/PreviewUploadOverlay.cpp" line="+42"/>
+        <location filename="../../src/dialogs/PreviewUploadOverlay.cpp" line="+41"/>
         <source>Upload</source>
         <translation>Wyślij</translation>
     </message>
@@ -1196,7 +1201,7 @@ Rozmiar multimediów: %2
         <translation>Zablokuj użytkownika w tym pokoju</translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+8"/>
         <source>Ignore messages from this user</source>
         <translation>Ignoruj wiadomości od tego użytkownika</translation>
     </message>
@@ -1206,12 +1211,12 @@ Rozmiar multimediów: %2
         <translation>Wyrzuć użytkownika z tego pokoju</translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+8"/>
         <source>Start a conversation</source>
         <translation>Rozpocznij rozmowę</translation>
     </message>
     <message>
-        <location line="+56"/>
+        <location line="+63"/>
         <source>Devices</source>
         <translation>Urządzenia</translation>
     </message>
@@ -1219,7 +1224,7 @@ Rozmiar multimediów: %2
 <context>
     <name>emoji::Panel</name>
     <message>
-        <location filename="../../src/emoji/Panel.cpp" line="+125"/>
+        <location filename="../../src/emoji/Panel.cpp" line="+126"/>
         <source>Smileys &amp; People</source>
         <translation>Twarze i ludzie</translation>
     </message>
@@ -1345,7 +1350,7 @@ Rozmiar multimediów: %2
 <context>
     <name>popups::UserMentions</name>
     <message>
-        <location filename="../../src/popups/UserMentions.cpp" line="+61"/>
+        <location filename="../../src/popups/UserMentions.cpp" line="+64"/>
         <source>This Room</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/resources/langs/nheko_ru.ts b/resources/langs/nheko_ru.ts

index 07e169f7..821d5899 100644
--- a/resources/langs/nheko_ru.ts
+++ b/resources/langs/nheko_ru.ts
@@ -4,28 +4,28 @@
 <context>
     <name>ChatPage</name>
     <message>
-        <location filename="../../src/ChatPage.cpp" line="+211"/>
+        <location filename="../../src/ChatPage.cpp" line="+223"/>
         <source>Failed to invite user: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+4"/>
-        <location line="+84"/>
+        <location line="+864"/>
         <source>Invited user: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-6"/>
+        <location line="-5"/>
         <source>Failed to invite %1 to %2: %3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+19"/>
         <source>Failed to kick %1 to %2: %3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+5"/>
         <source>Kicked user: %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -35,12 +35,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+5"/>
         <source>Banned user: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location line="+14"/>
         <source>Failed to unban %1 in %2: %3</source>
         <translation type="unfinished"></translation>
     </message>
@@ -50,12 +50,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+50"/>
+        <location line="-803"/>
         <source>Failed to upload media. Please try again.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+392"/>
+        <location line="+395"/>
         <source>Failed to restore OLM account. Please login again.</source>
         <translation>Не удалось восстановить учетную запись OLM. Пожалуйста, войдите снова.</translation>
     </message>
@@ -71,12 +71,12 @@
     </message>
     <message>
         <location line="+51"/>
-        <location line="+154"/>
+        <location line="+231"/>
         <source>Please try to login again: %1</source>
         <translation>Повторите попытку входа: %1</translation>
     </message>
     <message>
-        <location line="-77"/>
+        <location line="-154"/>
         <source>Failed to join room: %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -109,7 +109,7 @@
 <context>
     <name>CommunitiesListItem</name>
     <message>
-        <location filename="../../src/CommunitiesListItem.cpp" line="+130"/>
+        <location filename="../../src/CommunitiesListItem.cpp" line="+133"/>
         <source>All rooms</source>
         <translation>Все комнаты</translation>
     </message>
@@ -161,7 +161,7 @@
 <context>
     <name>EncryptionIndicator</name>
     <message>
-        <location filename="../qml/EncryptionIndicator.qml" line="+11"/>
+        <location filename="../qml/EncryptionIndicator.qml" line="+12"/>
         <source>Encrypted</source>
         <translation type="unfinished"></translation>
     </message>
@@ -177,7 +177,7 @@
 <context>
     <name>LoginPage</name>
     <message>
-        <location filename="../../src/LoginPage.cpp" line="+80"/>
+        <location filename="../../src/LoginPage.cpp" line="+82"/>
         <source>Matrix ID</source>
         <translation>Идентификатор Matrix</translation>
     </message>
@@ -235,7 +235,7 @@
 <context>
     <name>MemberList</name>
     <message>
-        <location filename="../../src/dialogs/MemberList.cpp" line="+89"/>
+        <location filename="../../src/dialogs/MemberList.cpp" line="+90"/>
         <source>Room members</source>
         <translation>Участники комнаты</translation>
     </message>
@@ -289,7 +289,7 @@
 <context>
     <name>QuickSwitcher</name>
     <message>
-        <location filename="../../src/QuickSwitcher.cpp" line="+72"/>
+        <location filename="../../src/QuickSwitcher.cpp" line="+74"/>
         <source>Search for a room...</source>
         <translation>Поиск комнаты...</translation>
     </message>
@@ -297,7 +297,7 @@
 <context>
     <name>RegisterPage</name>
     <message>
-        <location filename="../../src/RegisterPage.cpp" line="+77"/>
+        <location filename="../../src/RegisterPage.cpp" line="+80"/>
         <source>Username</source>
         <translation>Имя пользователя</translation>
     </message>
@@ -407,7 +407,7 @@
 <context>
     <name>StatusIndicator</name>
     <message>
-        <location filename="../qml/StatusIndicator.qml" line="+13"/>
+        <location filename="../qml/StatusIndicator.qml" line="+14"/>
         <source>Failed</source>
         <translation type="unfinished"></translation>
     </message>
@@ -430,13 +430,13 @@
 <context>
     <name>TextInputWidget</name>
     <message>
-        <location filename="../../src/TextInputWidget.cpp" line="+496"/>
+        <location filename="../../src/TextInputWidget.cpp" line="+493"/>
         <source>Send a file</source>
         <translation>Отправить файл</translation>
     </message>
     <message>
         <location line="+13"/>
-        <location filename="../../src/TextInputWidget.h" line="+163"/>
+        <location filename="../../src/TextInputWidget.h" line="+159"/>
         <source>Write a message...</source>
         <translation>Написать сообщение...</translation>
     </message>
@@ -613,7 +613,7 @@
 <context>
     <name>TimelineRow</name>
     <message>
-        <location filename="../qml/TimelineRow.qml" line="+104"/>
+        <location filename="../qml/TimelineRow.qml" line="+64"/>
         <source>Reply</source>
         <translation type="unfinished"></translation>
     </message>
@@ -622,8 +622,11 @@
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>TimelineView</name>
     <message>
-        <location line="+12"/>
+        <location filename="../qml/TimelineView.qml" line="+31"/>
         <source>Read receipts</source>
         <translation type="unfinished">Подтверждать прочтение</translation>
     </message>
@@ -647,19 +650,21 @@
         <source>Save as</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>TimelineView</name>
     <message>
-        <location filename="../qml/TimelineView.qml" line="+24"/>
+        <location line="+14"/>
         <source>No room open</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+239"/>
+        <source>Close</source>
+        <translation type="unfinished">Закрыть</translation>
+    </message>
 </context>
 <context>
     <name>TopRoomBar</name>
     <message>
-        <location filename="../../src/TopRoomBar.cpp" line="+78"/>
+        <location filename="../../src/TopRoomBar.cpp" line="+86"/>
         <source>Room options</source>
         <translation>Настройки комнаты</translation>
     </message>
@@ -692,7 +697,7 @@
 <context>
     <name>TrayIcon</name>
     <message>
-        <location filename="../../src/TrayIcon.cpp" line="+120"/>
+        <location filename="../../src/TrayIcon.cpp" line="+122"/>
         <source>Show</source>
         <translation>Показать</translation>
     </message>
@@ -705,7 +710,7 @@
 <context>
     <name>UserInfoWidget</name>
     <message>
-        <location filename="../../src/UserInfoWidget.cpp" line="+87"/>
+        <location filename="../../src/UserInfoWidget.cpp" line="+88"/>
         <source>Logout</source>
         <translation>Выйти</translation>
     </message>
@@ -713,7 +718,7 @@
 <context>
     <name>UserSettingsPage</name>
     <message>
-        <location filename="../../src/UserSettingsPage.cpp" line="+188"/>
+        <location filename="../../src/UserSettingsPage.cpp" line="+189"/>
         <source>Minimize to tray</source>
         <translation>Сворачивать в системную панель</translation>
     </message>
@@ -863,7 +868,7 @@
 <context>
     <name>WelcomePage</name>
     <message>
-        <location filename="../../src/WelcomePage.cpp" line="+46"/>
+        <location filename="../../src/WelcomePage.cpp" line="+47"/>
         <source>Welcome to nheko! The desktop client for the Matrix protocol.</source>
         <translation>Добро пожаловать в nheko, клиент протокола Matrix!</translation>
     </message>
@@ -886,7 +891,7 @@
 <context>
     <name>descriptiveTime</name>
     <message>
-        <location filename="../../src/Utils.cpp" line="+119"/>
+        <location filename="../../src/Utils.cpp" line="+138"/>
         <source>Yesterday</source>
         <translation type="unfinished"></translation>
     </message>
@@ -994,7 +999,7 @@
 <context>
     <name>dialogs::PreviewUploadOverlay</name>
     <message>
-        <location filename="../../src/dialogs/PreviewUploadOverlay.cpp" line="+42"/>
+        <location filename="../../src/dialogs/PreviewUploadOverlay.cpp" line="+41"/>
         <source>Upload</source>
         <translation>Загрузить</translation>
     </message>
@@ -1195,7 +1200,7 @@ Media size: %2
         <translation>Заблокировать пользователя в комнате</translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+8"/>
         <source>Ignore messages from this user</source>
         <translation>Игнорировать сообщения от этого пользователя</translation>
     </message>
@@ -1205,12 +1210,12 @@ Media size: %2
         <translation>Выгнать пользователя из комнаты</translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+8"/>
         <source>Start a conversation</source>
         <translation>Начать разговор</translation>
     </message>
     <message>
-        <location line="+56"/>
+        <location line="+63"/>
         <source>Devices</source>
         <translation>Устройства</translation>
     </message>
@@ -1218,7 +1223,7 @@ Media size: %2
 <context>
     <name>emoji::Panel</name>
     <message>
-        <location filename="../../src/emoji/Panel.cpp" line="+125"/>
+        <location filename="../../src/emoji/Panel.cpp" line="+126"/>
         <source>Smileys &amp; People</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1344,7 +1349,7 @@ Media size: %2
 <context>
     <name>popups::UserMentions</name>
     <message>
-        <location filename="../../src/popups/UserMentions.cpp" line="+61"/>
+        <location filename="../../src/popups/UserMentions.cpp" line="+64"/>
         <source>This Room</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/resources/langs/nheko_zh_CN.ts b/resources/langs/nheko_zh_CN.ts

index c7e42fba..4e0ce565 100644
--- a/resources/langs/nheko_zh_CN.ts
+++ b/resources/langs/nheko_zh_CN.ts
@@ -4,28 +4,28 @@
 <context>
     <name>ChatPage</name>
     <message>
-        <location filename="../../src/ChatPage.cpp" line="+211"/>
+        <location filename="../../src/ChatPage.cpp" line="+223"/>
         <source>Failed to invite user: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+4"/>
-        <location line="+84"/>
+        <location line="+864"/>
         <source>Invited user: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-6"/>
+        <location line="-5"/>
         <source>Failed to invite %1 to %2: %3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+20"/>
+        <location line="+19"/>
         <source>Failed to kick %1 to %2: %3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+5"/>
         <source>Kicked user: %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -35,12 +35,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
+        <location line="+5"/>
         <source>Banned user: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+16"/>
+        <location line="+14"/>
         <source>Failed to unban %1 in %2: %3</source>
         <translation type="unfinished"></translation>
     </message>
@@ -50,12 +50,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+50"/>
+        <location line="-803"/>
         <source>Failed to upload media. Please try again.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+392"/>
+        <location line="+395"/>
         <source>Failed to restore OLM account. Please login again.</source>
         <translation>恢复 OLM 账户失败。请重新登录。</translation>
     </message>
@@ -71,12 +71,12 @@
     </message>
     <message>
         <location line="+51"/>
-        <location line="+154"/>
+        <location line="+231"/>
         <source>Please try to login again: %1</source>
         <translation>请尝试再次登录：%1</translation>
     </message>
     <message>
-        <location line="-77"/>
+        <location line="-154"/>
         <source>Failed to join room: %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -109,7 +109,7 @@
 <context>
     <name>CommunitiesListItem</name>
     <message>
-        <location filename="../../src/CommunitiesListItem.cpp" line="+130"/>
+        <location filename="../../src/CommunitiesListItem.cpp" line="+133"/>
         <source>All rooms</source>
         <translation type="unfinished"></translation>
     </message>
@@ -161,7 +161,7 @@
 <context>
     <name>EncryptionIndicator</name>
     <message>
-        <location filename="../qml/EncryptionIndicator.qml" line="+11"/>
+        <location filename="../qml/EncryptionIndicator.qml" line="+12"/>
         <source>Encrypted</source>
         <translation type="unfinished"></translation>
     </message>
@@ -177,7 +177,7 @@
 <context>
     <name>LoginPage</name>
     <message>
-        <location filename="../../src/LoginPage.cpp" line="+80"/>
+        <location filename="../../src/LoginPage.cpp" line="+82"/>
         <source>Matrix ID</source>
         <translation></translation>
     </message>
@@ -235,7 +235,7 @@
 <context>
     <name>MemberList</name>
     <message>
-        <location filename="../../src/dialogs/MemberList.cpp" line="+89"/>
+        <location filename="../../src/dialogs/MemberList.cpp" line="+90"/>
         <source>Room members</source>
         <translation>聊天室成员</translation>
     </message>
@@ -289,7 +289,7 @@
 <context>
     <name>QuickSwitcher</name>
     <message>
-        <location filename="../../src/QuickSwitcher.cpp" line="+72"/>
+        <location filename="../../src/QuickSwitcher.cpp" line="+74"/>
         <source>Search for a room...</source>
         <translation>寻找一个聊天室...</translation>
     </message>
@@ -297,7 +297,7 @@
 <context>
     <name>RegisterPage</name>
     <message>
-        <location filename="../../src/RegisterPage.cpp" line="+77"/>
+        <location filename="../../src/RegisterPage.cpp" line="+80"/>
         <source>Username</source>
         <translation>用户名</translation>
     </message>
@@ -407,7 +407,7 @@
 <context>
     <name>StatusIndicator</name>
     <message>
-        <location filename="../qml/StatusIndicator.qml" line="+13"/>
+        <location filename="../qml/StatusIndicator.qml" line="+14"/>
         <source>Failed</source>
         <translation type="unfinished"></translation>
     </message>
@@ -430,13 +430,13 @@
 <context>
     <name>TextInputWidget</name>
     <message>
-        <location filename="../../src/TextInputWidget.cpp" line="+496"/>
+        <location filename="../../src/TextInputWidget.cpp" line="+493"/>
         <source>Send a file</source>
         <translation>发送一个文件</translation>
     </message>
     <message>
         <location line="+13"/>
-        <location filename="../../src/TextInputWidget.h" line="+163"/>
+        <location filename="../../src/TextInputWidget.h" line="+159"/>
         <source>Write a message...</source>
         <translation>写一条消息...</translation>
     </message>
@@ -611,7 +611,7 @@
 <context>
     <name>TimelineRow</name>
     <message>
-        <location filename="../qml/TimelineRow.qml" line="+104"/>
+        <location filename="../qml/TimelineRow.qml" line="+64"/>
         <source>Reply</source>
         <translation type="unfinished"></translation>
     </message>
@@ -620,8 +620,11 @@
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>TimelineView</name>
     <message>
-        <location line="+12"/>
+        <location filename="../qml/TimelineView.qml" line="+31"/>
         <source>Read receipts</source>
         <translation type="unfinished">阅读回执</translation>
     </message>
@@ -645,19 +648,21 @@
         <source>Save as</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>TimelineView</name>
     <message>
-        <location filename="../qml/TimelineView.qml" line="+24"/>
+        <location line="+14"/>
         <source>No room open</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location line="+239"/>
+        <source>Close</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TopRoomBar</name>
     <message>
-        <location filename="../../src/TopRoomBar.cpp" line="+78"/>
+        <location filename="../../src/TopRoomBar.cpp" line="+86"/>
         <source>Room options</source>
         <translation>聊天室选项</translation>
     </message>
@@ -690,7 +695,7 @@
 <context>
     <name>TrayIcon</name>
     <message>
-        <location filename="../../src/TrayIcon.cpp" line="+120"/>
+        <location filename="../../src/TrayIcon.cpp" line="+122"/>
         <source>Show</source>
         <translation>显示</translation>
     </message>
@@ -703,7 +708,7 @@
 <context>
     <name>UserInfoWidget</name>
     <message>
-        <location filename="../../src/UserInfoWidget.cpp" line="+87"/>
+        <location filename="../../src/UserInfoWidget.cpp" line="+88"/>
         <source>Logout</source>
         <translation>登出</translation>
     </message>
@@ -711,7 +716,7 @@
 <context>
     <name>UserSettingsPage</name>
     <message>
-        <location filename="../../src/UserSettingsPage.cpp" line="+188"/>
+        <location filename="../../src/UserSettingsPage.cpp" line="+189"/>
         <source>Minimize to tray</source>
         <translation>最小化至托盘</translation>
     </message>
@@ -860,7 +865,7 @@
 <context>
     <name>WelcomePage</name>
     <message>
-        <location filename="../../src/WelcomePage.cpp" line="+46"/>
+        <location filename="../../src/WelcomePage.cpp" line="+47"/>
         <source>Welcome to nheko! The desktop client for the Matrix protocol.</source>
         <translation>欢迎使用 nheko! Matrix 协议的桌面客户端。</translation>
     </message>
@@ -883,7 +888,7 @@
 <context>
     <name>descriptiveTime</name>
     <message>
-        <location filename="../../src/Utils.cpp" line="+119"/>
+        <location filename="../../src/Utils.cpp" line="+138"/>
         <source>Yesterday</source>
         <translation type="unfinished"></translation>
     </message>
@@ -991,7 +996,7 @@
 <context>
     <name>dialogs::PreviewUploadOverlay</name>
     <message>
-        <location filename="../../src/dialogs/PreviewUploadOverlay.cpp" line="+42"/>
+        <location filename="../../src/dialogs/PreviewUploadOverlay.cpp" line="+41"/>
         <source>Upload</source>
         <translation>上传</translation>
     </message>
@@ -1192,7 +1197,7 @@ Media size: %2
         <translation>在这个聊天室封禁这个用户</translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+8"/>
         <source>Ignore messages from this user</source>
         <translation>忽略这个用户的消息</translation>
     </message>
@@ -1202,12 +1207,12 @@ Media size: %2
         <translation>把这个用户踢出聊天室</translation>
     </message>
     <message>
-        <location line="+9"/>
+        <location line="+8"/>
         <source>Start a conversation</source>
         <translation>开始一个聊天</translation>
     </message>
     <message>
-        <location line="+56"/>
+        <location line="+63"/>
         <source>Devices</source>
         <translation>设备</translation>
     </message>
@@ -1215,7 +1220,7 @@ Media size: %2
 <context>
     <name>emoji::Panel</name>
     <message>
-        <location filename="../../src/emoji/Panel.cpp" line="+125"/>
+        <location filename="../../src/emoji/Panel.cpp" line="+126"/>
         <source>Smileys &amp; People</source>
         <translatorcomment>笑脸和人</translatorcomment>
         <translation>Smileys &amp; People</translation>
@@ -1349,7 +1354,7 @@ Media size: %2
 <context>
     <name>popups::UserMentions</name>
     <message>
-        <location filename="../../src/popups/UserMentions.cpp" line="+61"/>
+        <location filename="../../src/popups/UserMentions.cpp" line="+64"/>
         <source>This Room</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/resources/qml/EncryptionIndicator.qml b/resources/qml/EncryptionIndicator.qml

index 6eb04e34..00fe2ee4 100644
--- a/resources/qml/EncryptionIndicator.qml
+++ b/resources/qml/EncryptionIndicator.qml
@@ -7,11 +7,10 @@ Rectangle {
 	color: "transparent"
 	width: 16
 	height: 16
-	ToolTip {
-		palette: colors
-		visible: ma.containsMouse && indicator.visible
-		text: qsTr("Encrypted")
-	}
+
+	ToolTip.visible: ma.containsMouse && indicator.visible
+	ToolTip.text: qsTr("Encrypted")
+
 	MouseArea{
 		id: ma
 		anchors.fill: parent
diff --git a/resources/qml/MatrixText.qml b/resources/qml/MatrixText.qml

index 46e74711..560a8108 100644
--- a/resources/qml/MatrixText.qml
+++ b/resources/qml/MatrixText.qml
@@ -20,14 +20,12 @@ TextEdit {
 	}
 	MouseArea
 	{
+		id: ma
 		anchors.fill: parent
 		onPressed:  mouse.accepted = false
 		cursorShape: parent.hoveredLink ? Qt.PointingHandCursor : Qt.ArrowCursor
 	}
 
-	ToolTip {
-		visible: parent.hoveredLink
-		text: parent.hoveredLink
-		palette: colors
-	}
+	ToolTip.visible: hoveredLink
+	ToolTip.text: hoveredLink
 }
diff --git a/resources/qml/StatusIndicator.qml b/resources/qml/StatusIndicator.qml

index 3361640d..ec82ed49 100644
--- a/resources/qml/StatusIndicator.qml
+++ b/resources/qml/StatusIndicator.qml
@@ -8,16 +8,14 @@ Rectangle {
 	color: "transparent"
 	width: 16
 	height: 16
-	ToolTip {
-		palette: colors
-	    visible: ma.containsMouse && state != MtxEvent.Empty
-	    text: switch (state) {
-		    case MtxEvent.Failed: return qsTr("Failed")
-			case MtxEvent.Sent: return qsTr("Sent")
-			case MtxEvent.Received: return qsTr("Received")
-			case MtxEvent.Read: return qsTr("Read")
-			default: return ""
-		}
+
+	ToolTip.visible: ma.containsMouse && state != MtxEvent.Empty
+	ToolTip.text: switch (state) {
+		case MtxEvent.Failed: return qsTr("Failed")
+		case MtxEvent.Sent: return qsTr("Sent")
+		case MtxEvent.Received: return qsTr("Received")
+		case MtxEvent.Read: return qsTr("Read")
+		default: return ""
 	}
 	MouseArea{
 		id: ma
diff --git a/resources/qml/TimelineRow.qml b/resources/qml/TimelineRow.qml

index c33de470..a371f78b 100644
--- a/resources/qml/TimelineRow.qml
+++ b/resources/qml/TimelineRow.qml
@@ -14,8 +14,6 @@ RowLayout {
 	anchors.left: parent.left
 	anchors.right: parent.right
 
-	//height: Math.max(model.replyTo ? reply.height + contentItem.height + 4 : contentItem.height, 16)
-
 	Column {
 		Layout.fillWidth: true
 		Layout.alignment: Qt.AlignTop
@@ -42,71 +40,45 @@ RowLayout {
 		state: model.state
 		Layout.alignment: Qt.AlignRight | Qt.AlignTop
 		Layout.preferredHeight: 16
+		width: 16
 	}
 
 	EncryptionIndicator {
 		visible: model.isEncrypted
 		Layout.alignment: Qt.AlignRight | Qt.AlignTop
 		Layout.preferredHeight: 16
+		width: 16
 	}
 
 	ImageButton {
 		Layout.alignment: Qt.AlignRight | Qt.AlignTop
 		Layout.preferredHeight: 16
+		width: 16
 		id: replyButton
-    	hoverEnabled: true
+		hoverEnabled: true
 
 
 		image: ":/icons/icons/ui/mail-reply.png"
-		ToolTip {
-			visible: replyButton.hovered
-			text: qsTr("Reply")
-			palette: colors
-		}
+
+		ToolTip.visible: hovered
+		ToolTip.text: qsTr("Reply")
 
 		onClicked: view.model.replyAction(model.id)
 	}
 	ImageButton {
 		Layout.alignment: Qt.AlignRight | Qt.AlignTop
 		Layout.preferredHeight: 16
+		width: 16
 		id: optionsButton
 		hoverEnabled: true
 
 		image: ":/icons/icons/ui/vertical-ellipsis.png"
-		ToolTip {
-			visible: optionsButton.hovered
-			text: qsTr("Options")
-			palette: colors
-		}
 
-		onClicked: contextMenu.open()
+		ToolTip.visible: hovered
+		ToolTip.text: qsTr("Options")
 
-		Menu {
-			y: optionsButton.height
-			id: contextMenu
-			palette: colors
+		onClicked: messageContextMenu.show(model.id, model.type, optionsButton)
 
-			MenuItem {
-				text: qsTr("Read receipts")
-				onTriggered: view.model.readReceiptsAction(model.id)
-			}
-			MenuItem {
-				text: qsTr("Mark as read")
-			}
-			MenuItem {
-				text: qsTr("View raw message")
-				onTriggered: view.model.viewRawMessage(model.id)
-			}
-			MenuItem {
-				text: qsTr("Redact message")
-				onTriggered: view.model.redactEvent(model.id)
-			}
-			MenuItem {
-				visible: model.type == MtxEvent.ImageMessage || model.type == MtxEvent.VideoMessage || model.type == MtxEvent.AudioMessage || model.type == MtxEvent.FileMessage || model.type == MtxEvent.Sticker
-				text: qsTr("Save as")
-				onTriggered: timelineManager.timeline.saveMedia(model.id)
-			}
-		}
 	}
 
 	Text {
@@ -120,10 +92,7 @@ RowLayout {
 			hoverEnabled: true
 		}
 
-		ToolTip {
-			visible: ma.containsMouse
-			text: Qt.formatDateTime(model.timestamp, Qt.DefaultLocaleLongDate)
-			palette: colors
-		}
+		ToolTip.visible: ma.containsMouse
+		ToolTip.text: Qt.formatDateTime(model.timestamp, Qt.DefaultLocaleLongDate)
 	}
 }
diff --git a/resources/qml/TimelineView.qml b/resources/qml/TimelineView.qml

index 956f7e09..d3bd8be9 100644
--- a/resources/qml/TimelineView.qml
+++ b/resources/qml/TimelineView.qml
@@ -1,5 +1,5 @@
 import QtQuick 2.9
-import QtQuick.Controls 2.1
+import QtQuick.Controls 2.3
 import QtQuick.Layouts 1.2
 import QtGraphicalEffects 1.0
 import QtQuick.Window 2.2
@@ -14,6 +14,41 @@ Item {
 	property var inactiveColors: currentInactivePalette ? currentInactivePalette : systemInactive
 	property int avatarSize: 40
 
+	Menu {
+		id: messageContextMenu
+		palette: colors
+
+		function show(eventId_, eventType_, showAt) {
+			eventId = eventId_
+			eventType = eventType_
+			popup(showAt)
+		}
+
+		property string eventId
+		property int eventType
+
+		MenuItem {
+			text: qsTr("Read receipts")
+			onTriggered: chat.model.readReceiptsAction(messageContextMenu.eventId)
+		}
+		MenuItem {
+			text: qsTr("Mark as read")
+		}
+		MenuItem {
+			text: qsTr("View raw message")
+			onTriggered: chat.model.viewRawMessage(messageContextMenu.eventId)
+		}
+		MenuItem {
+			text: qsTr("Redact message")
+			onTriggered: chat.model.redactEvent(messageContextMenu.eventId)
+		}
+		MenuItem {
+			visible: messageContextMenu.eventType == MtxEvent.ImageMessage || messageContextMenu.eventType == MtxEvent.VideoMessage || messageContextMenu.eventType == MtxEvent.AudioMessage || messageContextMenu.eventType == MtxEvent.FileMessage || messageContextMenu.eventType == MtxEvent.Sticker
+			text: qsTr("Save as")
+			onTriggered: timelineManager.timeline.saveMedia(messageContextMenu.eventId)
+		}
+	}
+
 	id: timelineRoot
 
 	Rectangle {
@@ -63,7 +98,6 @@ Item {
 					if (wheel.angleDelta != 0) {
 						chat.contentY = chat.contentY - wheel.angleDelta.y
 						wheel.accepted = true
-						chat.forceLayout()
 						chat.returnToBounds()
 					}
 				}
@@ -262,11 +296,8 @@ Item {
 						height: 16
 
 						image: ":/icons/icons/ui/remove-symbol.png"
-						ToolTip {
-							visible: closeReplyButton.hovered
-							text: qsTr("Close")
-							palette: colors
-						}
+						ToolTip.visible: closeReplyButton.hovered
+						ToolTip.text: qsTr("Close")
 
 						onClicked: timelineManager.updateReplyingEvent(undefined)
 					}