diff --git a/resources/langs/nheko_cs.ts b/resources/langs/nheko_cs.ts
index 8ab0dd25c1fe23f5746f684d1a79770e89bea389..da63d0325b12c398cca9ae36ab533569da57077c 100644
--- a/resources/langs/nheko_cs.ts
+++ b/resources/langs/nheko_cs.ts
@@ -4,7 +4,7 @@
 <context>
     <name>ActiveCallBar</name>
     <message>
-        <location filename="../qml/voip/ActiveCallBar.qml" line="+66"/>
+        <location filename="../qml/voip/ActiveCallBar.qml" line="+106"/>
         <source>Calling...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15,8 +15,13 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+76"/>
-        <source>Toggle camera view</source>
+        <location line="+67"/>
+        <source>You are screen sharing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Hide/Show Picture-in-Picture</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -33,7 +38,7 @@
 <context>
     <name>AwaitingVerificationConfirmation</name>
     <message>
-        <location filename="../qml/device-verification/AwaitingVerificationConfirmation.qml" line="+7"/>
+        <location filename="../qml/device-verification/AwaitingVerificationConfirmation.qml" line="+11"/>
         <source>Awaiting Confirmation</source>
         <translation type="unfinished"></translation>
     </message>
@@ -51,7 +56,7 @@
 <context>
     <name>Cache</name>
     <message>
-        <location filename="../../src/Cache.cpp" line="+2084"/>
+        <location filename="../../src/Cache.cpp" line="+2026"/>
         <source>You joined this room.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -59,7 +64,7 @@
 <context>
     <name>CallInvite</name>
     <message>
-        <location filename="../qml/voip/CallInvite.qml" line="+66"/>
+        <location filename="../qml/voip/CallInvite.qml" line="+70"/>
         <source>Video Call</source>
         <translation type="unfinished"></translation>
     </message>
@@ -77,7 +82,7 @@
 <context>
     <name>CallInviteBar</name>
     <message>
-        <location filename="../qml/voip/CallInviteBar.qml" line="+60"/>
+        <location filename="../qml/voip/CallInviteBar.qml" line="+64"/>
         <source>Video Call</source>
         <translation type="unfinished"></translation>
     </message>
@@ -92,7 +97,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
+        <location line="+10"/>
         <source>Accept</source>
         <translation type="unfinished"></translation>
     </message>
@@ -117,36 +122,55 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>CallManager</name>
+    <message>
+        <location filename="../../src/CallManager.cpp" line="+521"/>
+        <source>Entire screen</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>ChatPage</name>
     <message>
-        <location filename="../../src/ChatPage.cpp" line="+215"/>
+        <location filename="../../src/ChatPage.cpp" line="+203"/>
         <source>Failed to invite user: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+4"/>
-        <location line="+797"/>
+        <location line="+806"/>
         <source>Invited user: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-500"/>
+        <location line="-510"/>
         <source>Migrating the cache to the current version failed. This can have different reasons. Please open an issue and try to use an older version in the mean time. Alternatively you can try deleting the cache manually.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+456"/>
+        <location line="+413"/>
+        <source>Confirm join</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Do you really want to join %1?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+44"/>
         <source>Room %1 created.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+35"/>
+        <location line="+323"/>
         <source>Confirm invite</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="-322"/>
         <source>Do you really want to invite %1 (%2)?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -211,7 +235,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-582"/>
+        <location line="+226"/>
+        <source>Do you really want to start a private chat with %1?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-818"/>
         <source>Cache migration failed!</source>
         <translation type="unfinished"></translation>
     </message>
@@ -236,7 +265,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+165"/>
+        <location line="+157"/>
         <source>Failed to setup encryption keys. Server response: %1 %2. Please try again later.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -247,7 +276,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+47"/>
         <source>Failed to join room: %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -267,12 +296,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+18"/>
         <source>Failed to leave room: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+54"/>
+        <location line="+61"/>
         <source>Failed to kick %1 from %2: %3</source>
         <translation type="unfinished"></translation>
     </message>
@@ -280,7 +309,7 @@
 <context>
     <name>CommunitiesListItem</name>
     <message>
-        <location filename="../../src/CommunitiesListItem.cpp" line="+26"/>
+        <location filename="../../src/CommunitiesListItem.cpp" line="+30"/>
         <source>Hide rooms with this tag or from this community</source>
         <translation type="unfinished"></translation>
     </message>
@@ -348,7 +377,7 @@
 <context>
     <name>DigitVerification</name>
     <message>
-        <location filename="../qml/device-verification/DigitVerification.qml" line="+7"/>
+        <location filename="../qml/device-verification/DigitVerification.qml" line="+11"/>
         <source>Verification Code</source>
         <translation type="unfinished"></translation>
     </message>
@@ -371,7 +400,7 @@
 <context>
     <name>EditModal</name>
     <message>
-        <location filename="../../src/dialogs/RoomSettings.cpp" line="+73"/>
+        <location filename="../../src/ui/RoomSettings.cpp" line="+42"/>
         <source>Apply</source>
         <translation type="unfinished"></translation>
     </message>
@@ -394,7 +423,7 @@
 <context>
     <name>EmojiPicker</name>
     <message>
-        <location filename="../qml/emoji/EmojiPicker.qml" line="+113"/>
+        <location filename="../qml/emoji/EmojiPicker.qml" line="+117"/>
         <location line="+181"/>
         <source>Search</source>
         <translation type="unfinished"></translation>
@@ -443,7 +472,7 @@
 <context>
     <name>EmojiVerification</name>
     <message>
-        <location filename="../qml/device-verification/EmojiVerification.qml" line="+7"/>
+        <location filename="../qml/device-verification/EmojiVerification.qml" line="+11"/>
         <source>Verification Code</source>
         <translation type="unfinished"></translation>
     </message>
@@ -466,7 +495,7 @@
 <context>
     <name>EncryptionIndicator</name>
     <message>
-        <location filename="../qml/EncryptionIndicator.qml" line="+19"/>
+        <location filename="../qml/EncryptionIndicator.qml" line="+23"/>
         <source>Encrypted</source>
         <translation type="unfinished"></translation>
     </message>
@@ -479,7 +508,7 @@
 <context>
     <name>EventStore</name>
     <message>
-        <location filename="../../src/timeline/EventStore.cpp" line="+612"/>
+        <location filename="../../src/timeline/EventStore.cpp" line="+613"/>
         <source>-- Encrypted Event (No keys found for decryption) --</source>
         <comment>Placeholder, when the message was not decrypted yet or can&apos;t be decrypted.</comment>
         <translation type="unfinished"></translation>
@@ -524,7 +553,7 @@
 <context>
     <name>Failed</name>
     <message>
-        <location filename="../qml/device-verification/Failed.qml" line="+7"/>
+        <location filename="../qml/device-verification/Failed.qml" line="+11"/>
         <source>Verification failed</source>
         <translation type="unfinished"></translation>
     </message>
@@ -558,7 +587,7 @@
 <context>
     <name>InputBar</name>
     <message>
-        <location filename="../../src/timeline/InputBar.cpp" line="+227"/>
+        <location filename="../../src/timeline/InputBar.cpp" line="+253"/>
         <source>Select a file</source>
         <translation type="unfinished"></translation>
     </message>
@@ -568,7 +597,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+384"/>
+        <location line="+371"/>
         <source>Failed to upload media. Please try again.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -576,7 +605,7 @@
 <context>
     <name>InviteeItem</name>
     <message>
-        <location filename="../../src/InviteeItem.cpp" line="+18"/>
+        <location filename="../../src/InviteeItem.cpp" line="+22"/>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
@@ -584,7 +613,7 @@
 <context>
     <name>LoginPage</name>
     <message>
-        <location filename="../../src/LoginPage.cpp" line="+92"/>
+        <location filename="../../src/LoginPage.cpp" line="+80"/>
         <source>Matrix ID</source>
         <translation type="unfinished"></translation>
     </message>
@@ -639,20 +668,19 @@ Example: https://server.my:8787</source>
     </message>
     <message>
         <location line="+19"/>
-        <location line="+218"/>
         <source>LOGIN</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-151"/>
+        <location line="+84"/>
         <location line="+11"/>
-        <location line="+157"/>
+        <location line="+156"/>
         <location line="+11"/>
         <source>You have entered an invalid Matrix ID  e.g @joe:matrix.org</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-132"/>
+        <location line="-131"/>
         <source>Autodiscovery failed. Received malformed response.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -677,12 +705,12 @@ Example: https://server.my:8787</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+59"/>
+        <location line="-168"/>
         <source>SSO LOGIN</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+263"/>
         <source>Empty password</source>
         <translation type="unfinished"></translation>
     </message>
@@ -695,7 +723,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>MemberList</name>
     <message>
-        <location filename="../../src/dialogs/MemberList.cpp" line="+90"/>
+        <location filename="../../src/dialogs/MemberList.cpp" line="+94"/>
         <source>Room members</source>
         <translation type="unfinished"></translation>
     </message>
@@ -708,7 +736,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>MessageDelegate</name>
     <message>
-        <location filename="../qml/delegates/MessageDelegate.qml" line="+123"/>
+        <location filename="../qml/delegates/MessageDelegate.qml" line="+127"/>
         <source>Encryption enabled</source>
         <translation type="unfinished"></translation>
     </message>
@@ -777,7 +805,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>MessageInput</name>
     <message>
-        <location filename="../qml/MessageInput.qml" line="+38"/>
+        <location filename="../qml/MessageInput.qml" line="+42"/>
         <source>Hang up</source>
         <translation type="unfinished"></translation>
     </message>
@@ -787,22 +815,22 @@ Example: https://server.my:8787</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+25"/>
         <source>Send a file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+42"/>
         <source>Write a message...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+186"/>
+        <location line="+211"/>
         <source>Emoji</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+16"/>
         <source>Send</source>
         <translation type="unfinished"></translation>
     </message>
@@ -810,7 +838,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>NewVerificationRequest</name>
     <message>
-        <location filename="../qml/device-verification/NewVerificationRequest.qml" line="+7"/>
+        <location filename="../qml/device-verification/NewVerificationRequest.qml" line="+11"/>
         <source>Send Verification Request</source>
         <translation type="unfinished"></translation>
     </message>
@@ -868,7 +896,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>PlaceCall</name>
     <message>
-        <location filename="../qml/voip/PlaceCall.qml" line="+36"/>
+        <location filename="../qml/voip/PlaceCall.qml" line="+48"/>
         <source>Place a call to %1?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -888,7 +916,12 @@ Example: https://server.my:8787</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location line="+14"/>
+        <source>Screen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -896,7 +929,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>Placeholder</name>
     <message>
-        <location filename="../qml/delegates/Placeholder.qml" line="+4"/>
+        <location filename="../qml/delegates/Placeholder.qml" line="+8"/>
         <source>unimplemented event: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -904,7 +937,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>QCoreApplication</name>
     <message>
-        <location filename="../../src/main.cpp" line="+179"/>
+        <location filename="../../src/main.cpp" line="+167"/>
         <source>Create a unique profile, which allows you to log into several accounts at the same time and start multiple instances of nheko.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -922,7 +955,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>QuickSwitcher</name>
     <message>
-        <location filename="../../src/QuickSwitcher.cpp" line="+74"/>
+        <location filename="../../src/QuickSwitcher.cpp" line="+62"/>
         <source>Search for a room...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -930,18 +963,18 @@ Example: https://server.my:8787</source>
 <context>
     <name>RegisterPage</name>
     <message>
-        <location filename="../../src/RegisterPage.cpp" line="+89"/>
+        <location filename="../../src/RegisterPage.cpp" line="+77"/>
         <source>Username</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+2"/>
-        <location line="+286"/>
+        <location line="+287"/>
         <source>The username must not be empty, and must contain only the characters a-z, 0-9, ., _, =, -, and /.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-282"/>
+        <location line="-283"/>
         <source>Password</source>
         <translation type="unfinished"></translation>
     </message>
@@ -976,7 +1009,7 @@ Example: https://server.my:8787</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+209"/>
+        <location line="+210"/>
         <source>One or more fields have invalid inputs. Please correct those issues and try again.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -999,7 +1032,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>ReplyPopup</name>
     <message>
-        <location filename="../qml/ReplyPopup.qml" line="+45"/>
+        <location filename="../qml/ReplyPopup.qml" line="+49"/>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1012,7 +1045,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>RoomInfo</name>
     <message>
-        <location filename="../../src/Cache.cpp" line="+1861"/>
+        <location filename="../../src/Cache.cpp" line="+1793"/>
         <source>no version stored</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1020,7 +1053,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>RoomInfoListItem</name>
     <message>
-        <location filename="../../src/RoomInfoListItem.cpp" line="+102"/>
+        <location filename="../../src/RoomInfoListItem.cpp" line="+90"/>
         <source>Leave room</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1082,10 +1115,116 @@ Example: https://server.my:8787</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>RoomSettings</name>
+    <message>
+        <location filename="../qml/RoomSettings.qml" line="+204"/>
+        <source>End-to-End Encryption</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Encryption is currently experimental and things might break unexpectedly. &lt;br&gt;
+                            Please take note that it can&apos;t be disabled afterwards.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>Whether or not the client should respond automatically with the session keys
+                                upon request. Use with caution, this is a temporary measure to test the
+                                E2E implementation until device verification is completed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/ui/RoomSettings.cpp" line="+267"/>
+        <source>Failed to enable encryption: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+228"/>
+        <source>Select an avatar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>All Files (*)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>The selected file is not an image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Error while reading file: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+34"/>
+        <location line="+20"/>
+        <source>Failed to upload image: %s</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ScreenShare</name>
+    <message>
+        <location filename="../qml/voip/ScreenShare.qml" line="+30"/>
+        <source>Share desktop with %1?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Window:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Frame rate:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Include your camera picture-in-picture</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>Request remote camera</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location line="+9"/>
+        <source>View your callee&apos;s camera like a regular video call</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Hide mouse cursor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Share</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Preview</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>SideBarActions</name>
     <message>
-        <location filename="../../src/SideBarActions.cpp" line="+40"/>
+        <location filename="../../src/SideBarActions.cpp" line="+44"/>
         <source>User settings</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1113,7 +1252,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>StatusIndicator</name>
     <message>
-        <location filename="../qml/StatusIndicator.qml" line="+17"/>
+        <location filename="../qml/StatusIndicator.qml" line="+21"/>
         <source>Failed</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1136,7 +1275,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>Success</name>
     <message>
-        <location filename="../qml/device-verification/Success.qml" line="+6"/>
+        <location filename="../qml/device-verification/Success.qml" line="+10"/>
         <source>Successful Verification</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1154,7 +1293,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>TimelineModel</name>
     <message>
-        <location filename="../../src/timeline/TimelineModel.cpp" line="+895"/>
+        <location filename="../../src/timeline/TimelineModel.cpp" line="+911"/>
         <source>Message redaction failed: %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1305,12 +1444,12 @@ Example: https://server.my:8787</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-795"/>
+        <location line="-798"/>
         <source>You joined this room.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+797"/>
+        <location line="+800"/>
         <source>Rejected the knock from %1.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1334,7 +1473,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>TimelineRow</name>
     <message>
-        <location filename="../qml/TimelineRow.qml" line="+99"/>
+        <location filename="../qml/TimelineRow.qml" line="+100"/>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1362,7 +1501,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>TimelineView</name>
     <message>
-        <location filename="../qml/TimelineView.qml" line="+85"/>
+        <location filename="../qml/TimelineView.qml" line="+97"/>
         <source>React</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1412,7 +1551,7 @@ Example: https://server.my:8787</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+61"/>
         <source>No room open</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1420,7 +1559,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>TimelineViewManager</name>
     <message>
-        <location filename="../../src/timeline/TimelineViewManager.cpp" line="+423"/>
+        <location filename="../../src/timeline/TimelineViewManager.cpp" line="+430"/>
         <source>No encrypted private chat found with this user. Create an encrypted private chat with this user and try again.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1428,7 +1567,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>TopBar</name>
     <message>
-        <location filename="../qml/TopBar.qml" line="+43"/>
+        <location filename="../qml/TopBar.qml" line="+47"/>
         <source>Back to room list</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1467,7 +1606,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>TrayIcon</name>
     <message>
-        <location filename="../../src/TrayIcon.cpp" line="+122"/>
+        <location filename="../../src/TrayIcon.cpp" line="+110"/>
         <source>Show</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1480,7 +1619,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>UserInfoWidget</name>
     <message>
-        <location filename="../../src/UserInfoWidget.cpp" line="+95"/>
+        <location filename="../../src/UserInfoWidget.cpp" line="+82"/>
         <source>Logout</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1528,7 +1667,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>UserProfile</name>
     <message>
-        <location filename="../qml/UserProfile.qml" line="+133"/>
+        <location filename="../qml/UserProfile.qml" line="+137"/>
         <source>Verify</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1548,7 +1687,7 @@ Example: https://server.my:8787</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/UserProfile.cpp" line="+296"/>
+        <location filename="../../src/ui/UserProfile.cpp" line="+301"/>
         <source>Select an avatar</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1571,7 +1710,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>UserSettings</name>
     <message>
-        <location filename="../../src/UserSettingsPage.cpp" line="+345"/>
+        <location filename="../../src/UserSettingsPage.cpp" line="+337"/>
         <location filename="../../src/UserSettingsPage.h" line="+183"/>
         <source>Default</source>
         <translation type="unfinished"></translation>
@@ -1580,7 +1719,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>UserSettingsPage</name>
     <message>
-        <location line="+496"/>
+        <location line="+540"/>
         <source>Minimize to tray</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1796,7 +1935,7 @@ This usually causes the application icon in the task bar to animate in some fash
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+407"/>
+        <location line="+406"/>
         <source>CACHED</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1806,7 +1945,7 @@ This usually causes the application icon in the task bar to animate in some fash
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-461"/>
+        <location line="-460"/>
         <source>Scale factor</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1981,7 +2120,7 @@ This usually causes the application icon in the task bar to animate in some fash
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+237"/>
+        <location line="+236"/>
         <source>Open Sessions File</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2026,7 +2165,7 @@ This usually causes the application icon in the task bar to animate in some fash
 <context>
     <name>Waiting</name>
     <message>
-        <location filename="../qml/device-verification/Waiting.qml" line="+7"/>
+        <location filename="../qml/device-verification/Waiting.qml" line="+11"/>
         <source>Waiting for other party…</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2054,7 +2193,7 @@ This usually causes the application icon in the task bar to animate in some fash
 <context>
     <name>WelcomePage</name>
     <message>
-        <location filename="../../src/WelcomePage.cpp" line="+46"/>
+        <location filename="../../src/WelcomePage.cpp" line="+34"/>
         <source>Welcome to nheko! The desktop client for the Matrix protocol.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2077,7 +2216,7 @@ This usually causes the application icon in the task bar to animate in some fash
 <context>
     <name>descriptiveTime</name>
     <message>
-        <location filename="../../src/Utils.cpp" line="+145"/>
+        <location filename="../../src/Utils.cpp" line="+149"/>
         <source>Yesterday</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2085,7 +2224,7 @@ This usually causes the application icon in the task bar to animate in some fash
 <context>
     <name>dialogs::CreateRoom</name>
     <message>
-        <location filename="../../src/dialogs/CreateRoom.cpp" line="+36"/>
+        <location filename="../../src/dialogs/CreateRoom.cpp" line="+40"/>
         <source>Create room</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2128,7 +2267,7 @@ This usually causes the application icon in the task bar to animate in some fash
 <context>
     <name>dialogs::FallbackAuth</name>
     <message>
-        <location filename="../../src/dialogs/FallbackAuth.cpp" line="+30"/>
+        <location filename="../../src/dialogs/FallbackAuth.cpp" line="+34"/>
         <source>Open Fallback in Browser</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2151,7 +2290,7 @@ This usually causes the application icon in the task bar to animate in some fash
 <context>
     <name>dialogs::InviteUsers</name>
     <message>
-        <location filename="../../src/dialogs/InviteUsers.cpp" line="+42"/>
+        <location filename="../../src/dialogs/InviteUsers.cpp" line="+46"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2164,7 +2303,7 @@ This usually causes the application icon in the task bar to animate in some fash
 <context>
     <name>dialogs::JoinRoom</name>
     <message>
-        <location filename="../../src/dialogs/JoinRoom.cpp" line="+30"/>
+        <location filename="../../src/dialogs/JoinRoom.cpp" line="+34"/>
         <source>Join</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2182,7 +2321,7 @@ This usually causes the application icon in the task bar to animate in some fash
 <context>
     <name>dialogs::LeaveRoom</name>
     <message>
-        <location filename="../../src/dialogs/LeaveRoom.cpp" line="+31"/>
+        <location filename="../../src/dialogs/LeaveRoom.cpp" line="+35"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2195,7 +2334,7 @@ This usually causes the application icon in the task bar to animate in some fash
 <context>
     <name>dialogs::Logout</name>
     <message>
-        <location filename="../../src/dialogs/Logout.cpp" line="+47"/>
+        <location filename="../../src/dialogs/Logout.cpp" line="+35"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2208,7 +2347,7 @@ This usually causes the application icon in the task bar to animate in some fash
 <context>
     <name>dialogs::PreviewUploadOverlay</name>
     <message>
-        <location filename="../../src/dialogs/PreviewUploadOverlay.cpp" line="+41"/>
+        <location filename="../../src/dialogs/PreviewUploadOverlay.cpp" line="+29"/>
         <source>Upload</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2228,7 +2367,7 @@ Media size: %2
 <context>
     <name>dialogs::ReCaptcha</name>
     <message>
-        <location filename="../../src/dialogs/ReCaptcha.cpp" line="+31"/>
+        <location filename="../../src/dialogs/ReCaptcha.cpp" line="+35"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2246,7 +2385,7 @@ Media size: %2
 <context>
     <name>dialogs::ReadReceipts</name>
     <message>
-        <location filename="../../src/dialogs/ReadReceipts.cpp" line="+120"/>
+        <location filename="../../src/dialogs/ReadReceipts.cpp" line="+124"/>
         <source>Read receipts</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2269,140 +2408,10 @@ Media size: %2
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>dialogs::RoomSettings</name>
-    <message>
-        <location filename="../../src/dialogs/RoomSettings.cpp" line="+135"/>
-        <source>Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Info</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+11"/>
-        <source>Internal ID</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>Room Version</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Notifications</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Muted</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Mentions only</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>All messages</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+97"/>
-        <source>Room access</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Anyone and guests</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Anyone</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Invited users</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+50"/>
-        <source>Encryption</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+31"/>
-        <source>End-to-End Encryption</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Encryption is currently experimental and things might break unexpectedly. &lt;br&gt;Please take note that it can&apos;t be disabled afterwards.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-24"/>
-        <source>Respond to key requests</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Whether or not the client should respond automatically with the session keys
- upon request. Use with caution, this is a temporary measure to test the
- E2E implementation until device verification is completed.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message numerus="yes">
-        <location line="+80"/>
-        <source>%n member(s)</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
-    </message>
-    <message>
-        <location line="+142"/>
-        <source>Failed to enable encryption: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+147"/>
-        <source>Select an avatar</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>All Files (*)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+12"/>
-        <source>The selected file is not an image</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Error while reading file: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+35"/>
-        <location line="+20"/>
-        <source>Failed to upload image: %s</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>message-description sent:</name>
     <message>
-        <location filename="../../src/Utils.h" line="+108"/>
+        <location filename="../../src/Utils.h" line="+112"/>
         <source>You sent an audio clip</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2515,7 +2524,7 @@ Media size: %2
 <context>
     <name>popups::UserMentions</name>
     <message>
-        <location filename="../../src/popups/UserMentions.cpp" line="+64"/>
+        <location filename="../../src/popups/UserMentions.cpp" line="+68"/>
         <source>This Room</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/resources/langs/nheko_de.ts b/resources/langs/nheko_de.ts
index 983f7c8d8fcc9e4987d224ee69ec5a5d10047689..679c5632421327c069fc483db81d955d324bc9b2 100644
--- a/resources/langs/nheko_de.ts
+++ b/resources/langs/nheko_de.ts
@@ -4,7 +4,7 @@
 <context>
     <name>ActiveCallBar</name>
     <message>
-        <location filename="../qml/voip/ActiveCallBar.qml" line="+66"/>
+        <location filename="../qml/voip/ActiveCallBar.qml" line="+106"/>
         <source>Calling...</source>
         <translation>Wählt...</translation>
     </message>
@@ -15,9 +15,14 @@
         <translation>Verbindet...</translation>
     </message>
     <message>
-        <location line="+76"/>
-        <source>Toggle camera view</source>
-        <translation>Kameraansicht wechseln</translation>
+        <location line="+67"/>
+        <source>You are screen sharing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Hide/Show Picture-in-Picture</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+13"/>
@@ -33,7 +38,7 @@
 <context>
     <name>AwaitingVerificationConfirmation</name>
     <message>
-        <location filename="../qml/device-verification/AwaitingVerificationConfirmation.qml" line="+7"/>
+        <location filename="../qml/device-verification/AwaitingVerificationConfirmation.qml" line="+11"/>
         <source>Awaiting Confirmation</source>
         <translation>Auf Bestätigung warten</translation>
     </message>
@@ -51,7 +56,7 @@
 <context>
     <name>Cache</name>
     <message>
-        <location filename="../../src/Cache.cpp" line="+2084"/>
+        <location filename="../../src/Cache.cpp" line="+2026"/>
         <source>You joined this room.</source>
         <translation>Du bist dem Raum beigetreten.</translation>
     </message>
@@ -59,7 +64,7 @@
 <context>
     <name>CallInvite</name>
     <message>
-        <location filename="../qml/voip/CallInvite.qml" line="+66"/>
+        <location filename="../qml/voip/CallInvite.qml" line="+70"/>
         <source>Video Call</source>
         <translation>Videoanruf</translation>
     </message>
@@ -77,7 +82,7 @@
 <context>
     <name>CallInviteBar</name>
     <message>
-        <location filename="../qml/voip/CallInviteBar.qml" line="+60"/>
+        <location filename="../qml/voip/CallInviteBar.qml" line="+64"/>
         <source>Video Call</source>
         <translation>Videoanruf</translation>
     </message>
@@ -92,7 +97,7 @@
         <translation>Geräte</translation>
     </message>
     <message>
-        <location line="+11"/>
+        <location line="+10"/>
         <source>Accept</source>
         <translation>Akzeptieren</translation>
     </message>
@@ -117,36 +122,55 @@
         <translation>Kein Mikrofon gefunden.</translation>
     </message>
 </context>
+<context>
+    <name>CallManager</name>
+    <message>
+        <location filename="../../src/CallManager.cpp" line="+521"/>
+        <source>Entire screen</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>ChatPage</name>
     <message>
-        <location filename="../../src/ChatPage.cpp" line="+215"/>
+        <location filename="../../src/ChatPage.cpp" line="+203"/>
         <source>Failed to invite user: %1</source>
         <translation>Nutzer konnte nicht eingeladen werden: %1</translation>
     </message>
     <message>
         <location line="+4"/>
-        <location line="+797"/>
+        <location line="+806"/>
         <source>Invited user: %1</source>
         <translation>Eingeladener Benutzer: %1</translation>
     </message>
     <message>
-        <location line="-500"/>
+        <location line="-510"/>
         <source>Migrating the cache to the current version failed. This can have different reasons. Please open an issue and try to use an older version in the mean time. Alternatively you can try deleting the cache manually.</source>
         <translation>Das Migrieren des Caches auf die aktuelle Version ist fehlgeschlagen. Das kann verschiedene Gründe als Ursache haben. Bitte melde den Fehler und verwende in der Zwischenzeit eine ältere Version. Alternativ kannst du den Cache manuell löschen.</translation>
     </message>
     <message>
-        <location line="+456"/>
+        <location line="+413"/>
+        <source>Confirm join</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Do you really want to join %1?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+44"/>
         <source>Room %1 created.</source>
         <translation>Raum %1 erzeugt.</translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+35"/>
+        <location line="+323"/>
         <source>Confirm invite</source>
         <translation>Einladung bestätigen</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="-322"/>
         <source>Do you really want to invite %1 (%2)?</source>
         <translation>Willst du wirklich %1 (%2) einladen?</translation>
     </message>
@@ -211,7 +235,12 @@
         <translation>Verbannung von %1 wurde aufgehoben.</translation>
     </message>
     <message>
-        <location line="-582"/>
+        <location line="+226"/>
+        <source>Do you really want to start a private chat with %1?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-818"/>
         <source>Cache migration failed!</source>
         <translation>Migration des Caches fehlgeschlagen!</translation>
     </message>
@@ -236,7 +265,7 @@
         <translation>Gespeicherte Nachrichten konnten nicht wiederhergestellt werden. Bitte melde Dich erneut an.</translation>
     </message>
     <message>
-        <location line="+165"/>
+        <location line="+157"/>
         <source>Failed to setup encryption keys. Server response: %1 %2. Please try again later.</source>
         <translation>Fehler beim Setup der Verschlüsselungsschlüssel. Servermeldung: %1 %2. Bitte versuche es später erneut.</translation>
     </message>
@@ -247,7 +276,7 @@
         <translation>Bitte melde dich erneut an: %1</translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+47"/>
         <source>Failed to join room: %1</source>
         <translation>Konnte Raum nicht betreten: %1</translation>
     </message>
@@ -267,12 +296,12 @@
         <translation>Raum konnte nicht erstellt werden: %1</translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+18"/>
         <source>Failed to leave room: %1</source>
         <translation>Konnte den Raum nicht verlassen: %1</translation>
     </message>
     <message>
-        <location line="+54"/>
+        <location line="+61"/>
         <source>Failed to kick %1 from %2: %3</source>
         <translation>Kontte %1 nicht aus %2 entfernen: %3</translation>
     </message>
@@ -280,7 +309,7 @@
 <context>
     <name>CommunitiesListItem</name>
     <message>
-        <location filename="../../src/CommunitiesListItem.cpp" line="+26"/>
+        <location filename="../../src/CommunitiesListItem.cpp" line="+30"/>
         <source>Hide rooms with this tag or from this community</source>
         <translation>Verstecke Räume mit diesem Tag oder aus dieser Community</translation>
     </message>
@@ -348,7 +377,7 @@
 <context>
     <name>DigitVerification</name>
     <message>
-        <location filename="../qml/device-verification/DigitVerification.qml" line="+7"/>
+        <location filename="../qml/device-verification/DigitVerification.qml" line="+11"/>
         <source>Verification Code</source>
         <translation>Verifizierungscode</translation>
     </message>
@@ -371,7 +400,7 @@
 <context>
     <name>EditModal</name>
     <message>
-        <location filename="../../src/dialogs/RoomSettings.cpp" line="+73"/>
+        <location filename="../../src/ui/RoomSettings.cpp" line="+42"/>
         <source>Apply</source>
         <translation>Anwenden</translation>
     </message>
@@ -394,7 +423,7 @@
 <context>
     <name>EmojiPicker</name>
     <message>
-        <location filename="../qml/emoji/EmojiPicker.qml" line="+113"/>
+        <location filename="../qml/emoji/EmojiPicker.qml" line="+117"/>
         <location line="+181"/>
         <source>Search</source>
         <translation>Suche</translation>
@@ -443,7 +472,7 @@
 <context>
     <name>EmojiVerification</name>
     <message>
-        <location filename="../qml/device-verification/EmojiVerification.qml" line="+7"/>
+        <location filename="../qml/device-verification/EmojiVerification.qml" line="+11"/>
         <source>Verification Code</source>
         <translation>Verifizierungscode</translation>
     </message>
@@ -466,7 +495,7 @@
 <context>
     <name>EncryptionIndicator</name>
     <message>
-        <location filename="../qml/EncryptionIndicator.qml" line="+19"/>
+        <location filename="../qml/EncryptionIndicator.qml" line="+23"/>
         <source>Encrypted</source>
         <translation>Verschlüsselt</translation>
     </message>
@@ -479,7 +508,7 @@
 <context>
     <name>EventStore</name>
     <message>
-        <location filename="../../src/timeline/EventStore.cpp" line="+612"/>
+        <location filename="../../src/timeline/EventStore.cpp" line="+613"/>
         <source>-- Encrypted Event (No keys found for decryption) --</source>
         <comment>Placeholder, when the message was not decrypted yet or can&apos;t be decrypted.</comment>
         <translation>-- Verschlüsseltes Event (keine Schlüssel zur Entschlüsselung gefunden) --</translation>
@@ -524,7 +553,7 @@
 <context>
     <name>Failed</name>
     <message>
-        <location filename="../qml/device-verification/Failed.qml" line="+7"/>
+        <location filename="../qml/device-verification/Failed.qml" line="+11"/>
         <source>Verification failed</source>
         <translation>Verifizierung fehlgeschlagen</translation>
     </message>
@@ -558,7 +587,7 @@
 <context>
     <name>InputBar</name>
     <message>
-        <location filename="../../src/timeline/InputBar.cpp" line="+227"/>
+        <location filename="../../src/timeline/InputBar.cpp" line="+253"/>
         <source>Select a file</source>
         <translation>Datei auswählen</translation>
     </message>
@@ -568,7 +597,7 @@
         <translation>Alle Dateien (*)</translation>
     </message>
     <message>
-        <location line="+384"/>
+        <location line="+371"/>
         <source>Failed to upload media. Please try again.</source>
         <translation>Medienupload fehlgeschlagen. Bitte versuche es erneut.</translation>
     </message>
@@ -576,7 +605,7 @@
 <context>
     <name>InviteeItem</name>
     <message>
-        <location filename="../../src/InviteeItem.cpp" line="+18"/>
+        <location filename="../../src/InviteeItem.cpp" line="+22"/>
         <source>Remove</source>
         <translation>Löschen</translation>
     </message>
@@ -584,7 +613,7 @@
 <context>
     <name>LoginPage</name>
     <message>
-        <location filename="../../src/LoginPage.cpp" line="+92"/>
+        <location filename="../../src/LoginPage.cpp" line="+80"/>
         <source>Matrix ID</source>
         <translation>Matrix-ID</translation>
     </message>
@@ -643,20 +672,19 @@ Beispiel: https://mein.server:8787</translation>
     </message>
     <message>
         <location line="+19"/>
-        <location line="+218"/>
         <source>LOGIN</source>
         <translation>ANMELDEN</translation>
     </message>
     <message>
-        <location line="-151"/>
+        <location line="+84"/>
         <location line="+11"/>
-        <location line="+157"/>
+        <location line="+156"/>
         <location line="+11"/>
         <source>You have entered an invalid Matrix ID  e.g @joe:matrix.org</source>
         <translation>Du hast eine invalide Matrix ID eingegeben. Normalerwise sehen die so aus: @joe:matrix.org</translation>
     </message>
     <message>
-        <location line="-132"/>
+        <location line="-131"/>
         <source>Autodiscovery failed. Received malformed response.</source>
         <translation>Automatische Erkennung fehlgeschlagen. Antwort war fehlerhaft.</translation>
     </message>
@@ -681,12 +709,12 @@ Beispiel: https://mein.server:8787</translation>
         <translation>Ein unbekannter Fehler ist aufgetreten. Bitte Homeserverdomain prüfen.</translation>
     </message>
     <message>
-        <location line="+59"/>
+        <location line="-168"/>
         <source>SSO LOGIN</source>
         <translation>SSO ANMELDUNG</translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+263"/>
         <source>Empty password</source>
         <translation>Leeres Passwort</translation>
     </message>
@@ -699,7 +727,7 @@ Beispiel: https://mein.server:8787</translation>
 <context>
     <name>MemberList</name>
     <message>
-        <location filename="../../src/dialogs/MemberList.cpp" line="+90"/>
+        <location filename="../../src/dialogs/MemberList.cpp" line="+94"/>
         <source>Room members</source>
         <translation>Teilnehmerliste</translation>
     </message>
@@ -712,7 +740,7 @@ Beispiel: https://mein.server:8787</translation>
 <context>
     <name>MessageDelegate</name>
     <message>
-        <location filename="../qml/delegates/MessageDelegate.qml" line="+105"/>
+        <location filename="../qml/delegates/MessageDelegate.qml" line="+109"/>
         <location line="+9"/>
         <source>removed</source>
         <translation>entfernt</translation>
@@ -781,7 +809,7 @@ Beispiel: https://mein.server:8787</translation>
 <context>
     <name>MessageInput</name>
     <message>
-        <location filename="../qml/MessageInput.qml" line="+38"/>
+        <location filename="../qml/MessageInput.qml" line="+42"/>
         <source>Hang up</source>
         <translation>Auflegen</translation>
     </message>
@@ -791,22 +819,22 @@ Beispiel: https://mein.server:8787</translation>
         <translation>Anrufen</translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+25"/>
         <source>Send a file</source>
         <translation>Versende Datei</translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+42"/>
         <source>Write a message...</source>
         <translation>Schreibe eine Nachricht…</translation>
     </message>
     <message>
-        <location line="+186"/>
+        <location line="+211"/>
         <source>Emoji</source>
         <translation>Emoji</translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+16"/>
         <source>Send</source>
         <translation>Senden</translation>
     </message>
@@ -814,7 +842,7 @@ Beispiel: https://mein.server:8787</translation>
 <context>
     <name>NewVerificationRequest</name>
     <message>
-        <location filename="../qml/device-verification/NewVerificationRequest.qml" line="+7"/>
+        <location filename="../qml/device-verification/NewVerificationRequest.qml" line="+11"/>
         <source>Send Verification Request</source>
         <translation>Sende eine Verifizierungsanfrage</translation>
     </message>
@@ -872,7 +900,7 @@ Beispiel: https://mein.server:8787</translation>
 <context>
     <name>PlaceCall</name>
     <message>
-        <location filename="../qml/voip/PlaceCall.qml" line="+36"/>
+        <location filename="../qml/voip/PlaceCall.qml" line="+48"/>
         <source>Place a call to %1?</source>
         <translation>%1 anrufen?</translation>
     </message>
@@ -892,7 +920,12 @@ Beispiel: https://mein.server:8787</translation>
         <translation>Video</translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location line="+14"/>
+        <source>Screen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
         <source>Cancel</source>
         <translation>Abbrechen</translation>
     </message>
@@ -900,7 +933,7 @@ Beispiel: https://mein.server:8787</translation>
 <context>
     <name>Placeholder</name>
     <message>
-        <location filename="../qml/delegates/Placeholder.qml" line="+4"/>
+        <location filename="../qml/delegates/Placeholder.qml" line="+8"/>
         <source>unimplemented event: </source>
         <translation>Unimplementiertes Event: </translation>
     </message>
@@ -908,7 +941,7 @@ Beispiel: https://mein.server:8787</translation>
 <context>
     <name>QCoreApplication</name>
     <message>
-        <location filename="../../src/main.cpp" line="+179"/>
+        <location filename="../../src/main.cpp" line="+167"/>
         <source>Create a unique profile, which allows you to log into several accounts at the same time and start multiple instances of nheko.</source>
         <translation>Benutze ein separates profil, wodurch mehrere Accounts und Nhekoinstanzen zur gleichen Zeit verwendet werden können.</translation>
     </message>
@@ -926,7 +959,7 @@ Beispiel: https://mein.server:8787</translation>
 <context>
     <name>QuickSwitcher</name>
     <message>
-        <location filename="../../src/QuickSwitcher.cpp" line="+74"/>
+        <location filename="../../src/QuickSwitcher.cpp" line="+62"/>
         <source>Search for a room...</source>
         <translation>Raum suchen…</translation>
     </message>
@@ -934,18 +967,18 @@ Beispiel: https://mein.server:8787</translation>
 <context>
     <name>RegisterPage</name>
     <message>
-        <location filename="../../src/RegisterPage.cpp" line="+89"/>
+        <location filename="../../src/RegisterPage.cpp" line="+77"/>
         <source>Username</source>
         <translation>Benutzername</translation>
     </message>
     <message>
         <location line="+2"/>
-        <location line="+286"/>
+        <location line="+287"/>
         <source>The username must not be empty, and must contain only the characters a-z, 0-9, ., _, =, -, and /.</source>
         <translation>Der Benutzername sollte nicht leer sein und nur aus a-z, 0-9, ., _, =, - und / bestehen.</translation>
     </message>
     <message>
-        <location line="-282"/>
+        <location line="-283"/>
         <source>Password</source>
         <translation>Passwort</translation>
     </message>
@@ -980,7 +1013,7 @@ Beispiel: https://mein.server:8787</translation>
         <translation>Keine unterstützten Registrierungsmethoden!</translation>
     </message>
     <message>
-        <location line="+209"/>
+        <location line="+210"/>
         <source>One or more fields have invalid inputs. Please correct those issues and try again.</source>
         <translation>Mindestens ein Feld hat invalide Werte. Bitte behebe diese Fehler und versuche es erneut.</translation>
     </message>
@@ -1003,7 +1036,7 @@ Beispiel: https://mein.server:8787</translation>
 <context>
     <name>ReplyPopup</name>
     <message>
-        <location filename="../qml/ReplyPopup.qml" line="+45"/>
+        <location filename="../qml/ReplyPopup.qml" line="+49"/>
         <source>Close</source>
         <translation>Schließen</translation>
     </message>
@@ -1016,7 +1049,7 @@ Beispiel: https://mein.server:8787</translation>
 <context>
     <name>RoomInfo</name>
     <message>
-        <location filename="../../src/Cache.cpp" line="+1861"/>
+        <location filename="../../src/Cache.cpp" line="+1793"/>
         <source>no version stored</source>
         <translation>keine Version gespeichert</translation>
     </message>
@@ -1024,7 +1057,7 @@ Beispiel: https://mein.server:8787</translation>
 <context>
     <name>RoomInfoListItem</name>
     <message>
-        <location filename="../../src/RoomInfoListItem.cpp" line="+102"/>
+        <location filename="../../src/RoomInfoListItem.cpp" line="+90"/>
         <source>Leave room</source>
         <translation>Raum verlassen</translation>
     </message>
@@ -1086,10 +1119,116 @@ Beispiel: https://mein.server:8787</translation>
         <translation>Ablehnen</translation>
     </message>
 </context>
+<context>
+    <name>RoomSettings</name>
+    <message>
+        <location filename="../qml/RoomSettings.qml" line="+204"/>
+        <source>End-to-End Encryption</source>
+        <translation type="unfinished">Ende-zu-Ende Verschlüsselung</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Encryption is currently experimental and things might break unexpectedly. &lt;br&gt;
+                            Please take note that it can&apos;t be disabled afterwards.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>Whether or not the client should respond automatically with the session keys
+                                upon request. Use with caution, this is a temporary measure to test the
+                                E2E implementation until device verification is completed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/ui/RoomSettings.cpp" line="+267"/>
+        <source>Failed to enable encryption: %1</source>
+        <translation type="unfinished">Aktivierung der Verschlüsselung fehlgeschlagen: %1</translation>
+    </message>
+    <message>
+        <location line="+228"/>
+        <source>Select an avatar</source>
+        <translation type="unfinished">Wähle einen Avatar</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>All Files (*)</source>
+        <translation type="unfinished">Alle Dateien (*)</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>The selected file is not an image</source>
+        <translation type="unfinished">Die ausgewählte Datei ist kein Bild</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Error while reading file: %1</source>
+        <translation type="unfinished">Fehler beim Lesen der DateI: %1</translation>
+    </message>
+    <message>
+        <location line="+34"/>
+        <location line="+20"/>
+        <source>Failed to upload image: %s</source>
+        <translation type="unfinished">Hochladen der Bilddatei fehlgeschlagen: %s</translation>
+    </message>
+</context>
+<context>
+    <name>ScreenShare</name>
+    <message>
+        <location filename="../qml/voip/ScreenShare.qml" line="+30"/>
+        <source>Share desktop with %1?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Window:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Frame rate:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Include your camera picture-in-picture</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>Request remote camera</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location line="+9"/>
+        <source>View your callee&apos;s camera like a regular video call</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Hide mouse cursor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Share</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Preview</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Abbrechen</translation>
+    </message>
+</context>
 <context>
     <name>SideBarActions</name>
     <message>
-        <location filename="../../src/SideBarActions.cpp" line="+40"/>
+        <location filename="../../src/SideBarActions.cpp" line="+44"/>
         <source>User settings</source>
         <translation>Benutzereinstellungen</translation>
     </message>
@@ -1117,7 +1256,7 @@ Beispiel: https://mein.server:8787</translation>
 <context>
     <name>StatusIndicator</name>
     <message>
-        <location filename="../qml/StatusIndicator.qml" line="+17"/>
+        <location filename="../qml/StatusIndicator.qml" line="+21"/>
         <source>Failed</source>
         <translation>Fehlgeschlagen</translation>
     </message>
@@ -1140,7 +1279,7 @@ Beispiel: https://mein.server:8787</translation>
 <context>
     <name>Success</name>
     <message>
-        <location filename="../qml/device-verification/Success.qml" line="+6"/>
+        <location filename="../qml/device-verification/Success.qml" line="+10"/>
         <source>Successful Verification</source>
         <translation>Erfolgreiche Verifizierung</translation>
     </message>
@@ -1158,7 +1297,7 @@ Beispiel: https://mein.server:8787</translation>
 <context>
     <name>TimelineModel</name>
     <message>
-        <location filename="../../src/timeline/TimelineModel.cpp" line="+895"/>
+        <location filename="../../src/timeline/TimelineModel.cpp" line="+911"/>
         <source>Message redaction failed: %1</source>
         <translation>Nachricht zurückziehen fehlgeschlagen: %1</translation>
     </message>
@@ -1308,12 +1447,12 @@ Beispiel: https://mein.server:8787</translation>
         <translation>%1 hat das Anklopfen zurückgezogen.</translation>
     </message>
     <message>
-        <location line="-795"/>
+        <location line="-798"/>
         <source>You joined this room.</source>
         <translation>Du bist dem Raum beigetreten.</translation>
     </message>
     <message>
-        <location line="+797"/>
+        <location line="+800"/>
         <source>Rejected the knock from %1.</source>
         <translation>Hat das Anklopfen von %1 abgewiesen.</translation>
     </message>
@@ -1337,7 +1476,7 @@ Beispiel: https://mein.server:8787</translation>
 <context>
     <name>TimelineRow</name>
     <message>
-        <location filename="../qml/TimelineRow.qml" line="+99"/>
+        <location filename="../qml/TimelineRow.qml" line="+100"/>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1365,7 +1504,7 @@ Beispiel: https://mein.server:8787</translation>
 <context>
     <name>TimelineView</name>
     <message>
-        <location filename="../qml/TimelineView.qml" line="+85"/>
+        <location filename="../qml/TimelineView.qml" line="+97"/>
         <source>React</source>
         <translation>Reaktion senden</translation>
     </message>
@@ -1415,7 +1554,7 @@ Beispiel: https://mein.server:8787</translation>
         <translation>Öffne in externen Programm</translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+61"/>
         <source>No room open</source>
         <translation>Kein Raum geöffnet</translation>
     </message>
@@ -1423,7 +1562,7 @@ Beispiel: https://mein.server:8787</translation>
 <context>
     <name>TimelineViewManager</name>
     <message>
-        <location filename="../../src/timeline/TimelineViewManager.cpp" line="+423"/>
+        <location filename="../../src/timeline/TimelineViewManager.cpp" line="+430"/>
         <source>No encrypted private chat found with this user. Create an encrypted private chat with this user and try again.</source>
         <translation>Keinen verschlüsselten Chat mit diesem User gefunden. Erstelle einen verschlüsselten 1:1 Chat mit diesem Nutzer und versuche es erneut.</translation>
     </message>
@@ -1431,7 +1570,7 @@ Beispiel: https://mein.server:8787</translation>
 <context>
     <name>TopBar</name>
     <message>
-        <location filename="../qml/TopBar.qml" line="+43"/>
+        <location filename="../qml/TopBar.qml" line="+47"/>
         <source>Back to room list</source>
         <translation>Zurück zur Raumliste</translation>
     </message>
@@ -1470,7 +1609,7 @@ Beispiel: https://mein.server:8787</translation>
 <context>
     <name>TrayIcon</name>
     <message>
-        <location filename="../../src/TrayIcon.cpp" line="+122"/>
+        <location filename="../../src/TrayIcon.cpp" line="+110"/>
         <source>Show</source>
         <translation>Zeigen</translation>
     </message>
@@ -1483,7 +1622,7 @@ Beispiel: https://mein.server:8787</translation>
 <context>
     <name>UserInfoWidget</name>
     <message>
-        <location filename="../../src/UserInfoWidget.cpp" line="+95"/>
+        <location filename="../../src/UserInfoWidget.cpp" line="+82"/>
         <source>Logout</source>
         <translation>Abmelden</translation>
     </message>
@@ -1531,7 +1670,7 @@ Beispiel: https://mein.server:8787</translation>
 <context>
     <name>UserProfile</name>
     <message>
-        <location filename="../qml/UserProfile.qml" line="+133"/>
+        <location filename="../qml/UserProfile.qml" line="+137"/>
         <source>Verify</source>
         <translation>Verifizieren</translation>
     </message>
@@ -1551,7 +1690,7 @@ Beispiel: https://mein.server:8787</translation>
         <translation>Kicke den Nutzer</translation>
     </message>
     <message>
-        <location filename="../../src/ui/UserProfile.cpp" line="+296"/>
+        <location filename="../../src/ui/UserProfile.cpp" line="+301"/>
         <source>Select an avatar</source>
         <translation type="unfinished">Wähle einen Avatar</translation>
     </message>
@@ -1574,7 +1713,7 @@ Beispiel: https://mein.server:8787</translation>
 <context>
     <name>UserSettings</name>
     <message>
-        <location filename="../../src/UserSettingsPage.cpp" line="+345"/>
+        <location filename="../../src/UserSettingsPage.cpp" line="+337"/>
         <location filename="../../src/UserSettingsPage.h" line="+183"/>
         <source>Default</source>
         <translation type="unfinished"></translation>
@@ -1583,7 +1722,7 @@ Beispiel: https://mein.server:8787</translation>
 <context>
     <name>UserSettingsPage</name>
     <message>
-        <location line="+496"/>
+        <location line="+540"/>
         <source>Minimize to tray</source>
         <translation>Ins Benachrichtigungsfeld minimieren</translation>
     </message>
@@ -1807,7 +1946,7 @@ Normalerweise animiert das den Taskbaricon oder färbt das Fenster orange ein.</
         <translation>Teile Schlüssel mit verifizierten Nutzern und Geräten</translation>
     </message>
     <message>
-        <location line="+407"/>
+        <location line="+406"/>
         <source>CACHED</source>
         <translation>IM CACHE</translation>
     </message>
@@ -1817,7 +1956,7 @@ Normalerweise animiert das den Taskbaricon oder färbt das Fenster orange ein.</
         <translation>NICHT IM CACHE</translation>
     </message>
     <message>
-        <location line="-461"/>
+        <location line="-460"/>
         <source>Scale factor</source>
         <translation>Skalierungsfaktor</translation>
     </message>
@@ -1992,7 +2131,7 @@ Normalerweise animiert das den Taskbaricon oder färbt das Fenster orange ein.</
         <translation>Alle Dateien (*)</translation>
     </message>
     <message>
-        <location line="+237"/>
+        <location line="+236"/>
         <source>Open Sessions File</source>
         <translation>Öffne Sessions Datei</translation>
     </message>
@@ -2037,7 +2176,7 @@ Normalerweise animiert das den Taskbaricon oder färbt das Fenster orange ein.</
 <context>
     <name>Waiting</name>
     <message>
-        <location filename="../qml/device-verification/Waiting.qml" line="+7"/>
+        <location filename="../qml/device-verification/Waiting.qml" line="+11"/>
         <source>Waiting for other party…</source>
         <translation>Warten auf die andere Seite...</translation>
     </message>
@@ -2065,7 +2204,7 @@ Normalerweise animiert das den Taskbaricon oder färbt das Fenster orange ein.</
 <context>
     <name>WelcomePage</name>
     <message>
-        <location filename="../../src/WelcomePage.cpp" line="+46"/>
+        <location filename="../../src/WelcomePage.cpp" line="+34"/>
         <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>
@@ -2088,7 +2227,7 @@ Normalerweise animiert das den Taskbaricon oder färbt das Fenster orange ein.</
 <context>
     <name>descriptiveTime</name>
     <message>
-        <location filename="../../src/Utils.cpp" line="+145"/>
+        <location filename="../../src/Utils.cpp" line="+149"/>
         <source>Yesterday</source>
         <translation>Gestern</translation>
     </message>
@@ -2096,7 +2235,7 @@ Normalerweise animiert das den Taskbaricon oder färbt das Fenster orange ein.</
 <context>
     <name>dialogs::CreateRoom</name>
     <message>
-        <location filename="../../src/dialogs/CreateRoom.cpp" line="+36"/>
+        <location filename="../../src/dialogs/CreateRoom.cpp" line="+40"/>
         <source>Create room</source>
         <translation>Raum erstellen</translation>
     </message>
@@ -2139,7 +2278,7 @@ Normalerweise animiert das den Taskbaricon oder färbt das Fenster orange ein.</
 <context>
     <name>dialogs::FallbackAuth</name>
     <message>
-        <location filename="../../src/dialogs/FallbackAuth.cpp" line="+30"/>
+        <location filename="../../src/dialogs/FallbackAuth.cpp" line="+34"/>
         <source>Open Fallback in Browser</source>
         <translation>Öffne Fallback im Browser</translation>
     </message>
@@ -2162,7 +2301,7 @@ Normalerweise animiert das den Taskbaricon oder färbt das Fenster orange ein.</
 <context>
     <name>dialogs::InviteUsers</name>
     <message>
-        <location filename="../../src/dialogs/InviteUsers.cpp" line="+42"/>
+        <location filename="../../src/dialogs/InviteUsers.cpp" line="+46"/>
         <source>Cancel</source>
         <translation>Abbrechen</translation>
     </message>
@@ -2175,7 +2314,7 @@ Normalerweise animiert das den Taskbaricon oder färbt das Fenster orange ein.</
 <context>
     <name>dialogs::JoinRoom</name>
     <message>
-        <location filename="../../src/dialogs/JoinRoom.cpp" line="+30"/>
+        <location filename="../../src/dialogs/JoinRoom.cpp" line="+34"/>
         <source>Join</source>
         <translation>Betreten</translation>
     </message>
@@ -2193,7 +2332,7 @@ Normalerweise animiert das den Taskbaricon oder färbt das Fenster orange ein.</
 <context>
     <name>dialogs::LeaveRoom</name>
     <message>
-        <location filename="../../src/dialogs/LeaveRoom.cpp" line="+31"/>
+        <location filename="../../src/dialogs/LeaveRoom.cpp" line="+35"/>
         <source>Cancel</source>
         <translation>Abbrechen</translation>
     </message>
@@ -2206,7 +2345,7 @@ Normalerweise animiert das den Taskbaricon oder färbt das Fenster orange ein.</
 <context>
     <name>dialogs::Logout</name>
     <message>
-        <location filename="../../src/dialogs/Logout.cpp" line="+47"/>
+        <location filename="../../src/dialogs/Logout.cpp" line="+35"/>
         <source>Cancel</source>
         <translation>Abbrechen</translation>
     </message>
@@ -2219,7 +2358,7 @@ Normalerweise animiert das den Taskbaricon oder färbt das Fenster orange ein.</
 <context>
     <name>dialogs::PreviewUploadOverlay</name>
     <message>
-        <location filename="../../src/dialogs/PreviewUploadOverlay.cpp" line="+41"/>
+        <location filename="../../src/dialogs/PreviewUploadOverlay.cpp" line="+29"/>
         <source>Upload</source>
         <translation>Hochladen</translation>
     </message>
@@ -2241,7 +2380,7 @@ Medien-Größe: %2
 <context>
     <name>dialogs::ReCaptcha</name>
     <message>
-        <location filename="../../src/dialogs/ReCaptcha.cpp" line="+31"/>
+        <location filename="../../src/dialogs/ReCaptcha.cpp" line="+35"/>
         <source>Cancel</source>
         <translation>Abbrechen</translation>
     </message>
@@ -2259,7 +2398,7 @@ Medien-Größe: %2
 <context>
     <name>dialogs::ReadReceipts</name>
     <message>
-        <location filename="../../src/dialogs/ReadReceipts.cpp" line="+120"/>
+        <location filename="../../src/dialogs/ReadReceipts.cpp" line="+124"/>
         <source>Read receipts</source>
         <translation>Lesebestätigungen</translation>
     </message>
@@ -2282,139 +2421,10 @@ Medien-Größe: %2
         <translation>Gestern %1</translation>
     </message>
 </context>
-<context>
-    <name>dialogs::RoomSettings</name>
-    <message>
-        <location filename="../../src/dialogs/RoomSettings.cpp" line="+135"/>
-        <source>Settings</source>
-        <translation>Einstellungen</translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Info</source>
-        <translation>Informationen</translation>
-    </message>
-    <message>
-        <location line="+11"/>
-        <source>Internal ID</source>
-        <translation>interne ID</translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>Room Version</source>
-        <translation>Raumversion</translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Notifications</source>
-        <translation>Benachrichtigungen</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Muted</source>
-        <translation>Stumm</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Mentions only</source>
-        <translation>Nur Erwähnungen</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>All messages</source>
-        <translation>Alle Nachrichten</translation>
-    </message>
-    <message>
-        <location line="+97"/>
-        <source>Room access</source>
-        <translation>Raumzugang</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Anyone and guests</source>
-        <translation>Alle, denen der Raum-Link bekannt ist (auch Gäste)</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Anyone</source>
-        <translation>Alle, denen der Raum-Link bekannt ist (ausgenommen Gäste)</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Invited users</source>
-        <translation>Nur Eingeladene</translation>
-    </message>
-    <message>
-        <location line="+50"/>
-        <source>Encryption</source>
-        <translation>Verschlüsselung</translation>
-    </message>
-    <message>
-        <location line="+31"/>
-        <source>End-to-End Encryption</source>
-        <translation>Ende-zu-Ende Verschlüsselung</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Encryption is currently experimental and things might break unexpectedly. &lt;br&gt;Please take note that it can&apos;t be disabled afterwards.</source>
-        <translation>Verschlüsselung befindet sich momentan in einem experimentellen Stadium, unerwartete Fehler können auftreten. &lt;br&gt;Sie kann anschließend nicht wieder deaktiviert werden.</translation>
-    </message>
-    <message>
-        <location line="-24"/>
-        <source>Respond to key requests</source>
-        <translation>Schlüsselnfrage beantworten</translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Whether or not the client should respond automatically with the session keys
- upon request. Use with caution, this is a temporary measure to test the
- E2E implementation until device verification is completed.</source>
-        <translation>Ob nheko automatisch auf Anfragen mit Sessionschlüsseln antworten soll, oder nicht. Bitte mit Vorsicht nutzen, da dies eine temporäre Massnahme ist. Sie dient dem Test von E2E Verschlüsselung, bis die Geräteverifikation fertig gestellt ist.</translation>
-    </message>
-    <message numerus="yes">
-        <location line="+80"/>
-        <source>%n member(s)</source>
-        <translation>
-            <numerusform>%n Teilnehmer</numerusform>
-            <numerusform>%n Teilnehmer</numerusform>
-        </translation>
-    </message>
-    <message>
-        <location line="+142"/>
-        <source>Failed to enable encryption: %1</source>
-        <translation>Aktivierung der Verschlüsselung fehlgeschlagen: %1</translation>
-    </message>
-    <message>
-        <location line="+147"/>
-        <source>Select an avatar</source>
-        <translation>Wähle einen Avatar</translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>All Files (*)</source>
-        <translation>Alle Dateien (*)</translation>
-    </message>
-    <message>
-        <location line="+12"/>
-        <source>The selected file is not an image</source>
-        <translation>Die ausgewählte Datei ist kein Bild</translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Error while reading file: %1</source>
-        <translation>Fehler beim Lesen der DateI: %1</translation>
-    </message>
-    <message>
-        <location line="+35"/>
-        <location line="+20"/>
-        <source>Failed to upload image: %s</source>
-        <translation>Hochladen der Bilddatei fehlgeschlagen: %s</translation>
-    </message>
-</context>
 <context>
     <name>message-description sent:</name>
     <message>
-        <location filename="../../src/Utils.h" line="+108"/>
+        <location filename="../../src/Utils.h" line="+112"/>
         <source>You sent an audio clip</source>
         <translation>Du hast eine Audiodatei gesendet.</translation>
     </message>
@@ -2527,7 +2537,7 @@ Medien-Größe: %2
 <context>
     <name>popups::UserMentions</name>
     <message>
-        <location filename="../../src/popups/UserMentions.cpp" line="+64"/>
+        <location filename="../../src/popups/UserMentions.cpp" line="+68"/>
         <source>This Room</source>
         <translation>Dieser Raum</translation>
     </message>
diff --git a/resources/langs/nheko_el.ts b/resources/langs/nheko_el.ts
index f86dfcabc9a45a39a6d64351a47298e369c09e2a..d25dde25c44add37045eef424255eb26b34cd6e3 100644
--- a/resources/langs/nheko_el.ts
+++ b/resources/langs/nheko_el.ts
@@ -4,7 +4,7 @@
 <context>
     <name>ActiveCallBar</name>
     <message>
-        <location filename="../qml/voip/ActiveCallBar.qml" line="+66"/>
+        <location filename="../qml/voip/ActiveCallBar.qml" line="+106"/>
         <source>Calling...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15,8 +15,13 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+76"/>
-        <source>Toggle camera view</source>
+        <location line="+67"/>
+        <source>You are screen sharing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Hide/Show Picture-in-Picture</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -33,7 +38,7 @@
 <context>
     <name>AwaitingVerificationConfirmation</name>
     <message>
-        <location filename="../qml/device-verification/AwaitingVerificationConfirmation.qml" line="+7"/>
+        <location filename="../qml/device-verification/AwaitingVerificationConfirmation.qml" line="+11"/>
         <source>Awaiting Confirmation</source>
         <translation type="unfinished"></translation>
     </message>
@@ -51,7 +56,7 @@
 <context>
     <name>Cache</name>
     <message>
-        <location filename="../../src/Cache.cpp" line="+2084"/>
+        <location filename="../../src/Cache.cpp" line="+2026"/>
         <source>You joined this room.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -59,7 +64,7 @@
 <context>
     <name>CallInvite</name>
     <message>
-        <location filename="../qml/voip/CallInvite.qml" line="+66"/>
+        <location filename="../qml/voip/CallInvite.qml" line="+70"/>
         <source>Video Call</source>
         <translation type="unfinished"></translation>
     </message>
@@ -77,7 +82,7 @@
 <context>
     <name>CallInviteBar</name>
     <message>
-        <location filename="../qml/voip/CallInviteBar.qml" line="+60"/>
+        <location filename="../qml/voip/CallInviteBar.qml" line="+64"/>
         <source>Video Call</source>
         <translation type="unfinished"></translation>
     </message>
@@ -92,7 +97,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
+        <location line="+10"/>
         <source>Accept</source>
         <translation type="unfinished">Αποδοχή</translation>
     </message>
@@ -117,36 +122,55 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>CallManager</name>
+    <message>
+        <location filename="../../src/CallManager.cpp" line="+521"/>
+        <source>Entire screen</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>ChatPage</name>
     <message>
-        <location filename="../../src/ChatPage.cpp" line="+215"/>
+        <location filename="../../src/ChatPage.cpp" line="+203"/>
         <source>Failed to invite user: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+4"/>
-        <location line="+797"/>
+        <location line="+806"/>
         <source>Invited user: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-500"/>
+        <location line="-510"/>
         <source>Migrating the cache to the current version failed. This can have different reasons. Please open an issue and try to use an older version in the mean time. Alternatively you can try deleting the cache manually.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+456"/>
+        <location line="+413"/>
+        <source>Confirm join</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Do you really want to join %1?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+44"/>
         <source>Room %1 created.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+35"/>
+        <location line="+323"/>
         <source>Confirm invite</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="-322"/>
         <source>Do you really want to invite %1 (%2)?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -211,7 +235,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-582"/>
+        <location line="+226"/>
+        <source>Do you really want to start a private chat with %1?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-818"/>
         <source>Cache migration failed!</source>
         <translation type="unfinished"></translation>
     </message>
@@ -236,7 +265,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+165"/>
+        <location line="+157"/>
         <source>Failed to setup encryption keys. Server response: %1 %2. Please try again later.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -247,7 +276,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+47"/>
         <source>Failed to join room: %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -267,12 +296,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+18"/>
         <source>Failed to leave room: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+54"/>
+        <location line="+61"/>
         <source>Failed to kick %1 from %2: %3</source>
         <translation type="unfinished"></translation>
     </message>
@@ -280,7 +309,7 @@
 <context>
     <name>CommunitiesListItem</name>
     <message>
-        <location filename="../../src/CommunitiesListItem.cpp" line="+26"/>
+        <location filename="../../src/CommunitiesListItem.cpp" line="+30"/>
         <source>Hide rooms with this tag or from this community</source>
         <translation type="unfinished"></translation>
     </message>
@@ -348,7 +377,7 @@
 <context>
     <name>DigitVerification</name>
     <message>
-        <location filename="../qml/device-verification/DigitVerification.qml" line="+7"/>
+        <location filename="../qml/device-verification/DigitVerification.qml" line="+11"/>
         <source>Verification Code</source>
         <translation type="unfinished"></translation>
     </message>
@@ -371,7 +400,7 @@
 <context>
     <name>EditModal</name>
     <message>
-        <location filename="../../src/dialogs/RoomSettings.cpp" line="+73"/>
+        <location filename="../../src/ui/RoomSettings.cpp" line="+42"/>
         <source>Apply</source>
         <translation type="unfinished"></translation>
     </message>
@@ -394,7 +423,7 @@
 <context>
     <name>EmojiPicker</name>
     <message>
-        <location filename="../qml/emoji/EmojiPicker.qml" line="+113"/>
+        <location filename="../qml/emoji/EmojiPicker.qml" line="+117"/>
         <location line="+181"/>
         <source>Search</source>
         <translation type="unfinished"></translation>
@@ -443,7 +472,7 @@
 <context>
     <name>EmojiVerification</name>
     <message>
-        <location filename="../qml/device-verification/EmojiVerification.qml" line="+7"/>
+        <location filename="../qml/device-verification/EmojiVerification.qml" line="+11"/>
         <source>Verification Code</source>
         <translation type="unfinished"></translation>
     </message>
@@ -466,7 +495,7 @@
 <context>
     <name>EncryptionIndicator</name>
     <message>
-        <location filename="../qml/EncryptionIndicator.qml" line="+19"/>
+        <location filename="../qml/EncryptionIndicator.qml" line="+23"/>
         <source>Encrypted</source>
         <translation type="unfinished"></translation>
     </message>
@@ -479,7 +508,7 @@
 <context>
     <name>EventStore</name>
     <message>
-        <location filename="../../src/timeline/EventStore.cpp" line="+612"/>
+        <location filename="../../src/timeline/EventStore.cpp" line="+613"/>
         <source>-- Encrypted Event (No keys found for decryption) --</source>
         <comment>Placeholder, when the message was not decrypted yet or can&apos;t be decrypted.</comment>
         <translation type="unfinished"></translation>
@@ -524,7 +553,7 @@
 <context>
     <name>Failed</name>
     <message>
-        <location filename="../qml/device-verification/Failed.qml" line="+7"/>
+        <location filename="../qml/device-verification/Failed.qml" line="+11"/>
         <source>Verification failed</source>
         <translation type="unfinished"></translation>
     </message>
@@ -558,7 +587,7 @@
 <context>
     <name>InputBar</name>
     <message>
-        <location filename="../../src/timeline/InputBar.cpp" line="+227"/>
+        <location filename="../../src/timeline/InputBar.cpp" line="+253"/>
         <source>Select a file</source>
         <translation type="unfinished">Διάλεξε ένα αρχείο</translation>
     </message>
@@ -568,7 +597,7 @@
         <translation type="unfinished">Όλα τα αρχεία (*)</translation>
     </message>
     <message>
-        <location line="+384"/>
+        <location line="+371"/>
         <source>Failed to upload media. Please try again.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -576,7 +605,7 @@
 <context>
     <name>InviteeItem</name>
     <message>
-        <location filename="../../src/InviteeItem.cpp" line="+18"/>
+        <location filename="../../src/InviteeItem.cpp" line="+22"/>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
@@ -584,7 +613,7 @@
 <context>
     <name>LoginPage</name>
     <message>
-        <location filename="../../src/LoginPage.cpp" line="+92"/>
+        <location filename="../../src/LoginPage.cpp" line="+80"/>
         <source>Matrix ID</source>
         <translation>Matrix ID</translation>
     </message>
@@ -639,20 +668,19 @@ Example: https://server.my:8787</source>
     </message>
     <message>
         <location line="+19"/>
-        <location line="+218"/>
         <source>LOGIN</source>
         <translation>ΕΙΣΟΔΟΣ</translation>
     </message>
     <message>
-        <location line="-151"/>
+        <location line="+84"/>
         <location line="+11"/>
-        <location line="+157"/>
+        <location line="+156"/>
         <location line="+11"/>
         <source>You have entered an invalid Matrix ID  e.g @joe:matrix.org</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-132"/>
+        <location line="-131"/>
         <source>Autodiscovery failed. Received malformed response.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -677,12 +705,12 @@ Example: https://server.my:8787</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+59"/>
+        <location line="-168"/>
         <source>SSO LOGIN</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+263"/>
         <source>Empty password</source>
         <translation>Κενός κωδικός</translation>
     </message>
@@ -695,7 +723,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>MemberList</name>
     <message>
-        <location filename="../../src/dialogs/MemberList.cpp" line="+90"/>
+        <location filename="../../src/dialogs/MemberList.cpp" line="+94"/>
         <source>Room members</source>
         <translation>Μέλη</translation>
     </message>
@@ -708,7 +736,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>MessageDelegate</name>
     <message>
-        <location filename="../qml/delegates/MessageDelegate.qml" line="+105"/>
+        <location filename="../qml/delegates/MessageDelegate.qml" line="+109"/>
         <location line="+9"/>
         <source>removed</source>
         <translation type="unfinished"></translation>
@@ -777,7 +805,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>MessageInput</name>
     <message>
-        <location filename="../qml/MessageInput.qml" line="+38"/>
+        <location filename="../qml/MessageInput.qml" line="+42"/>
         <source>Hang up</source>
         <translation type="unfinished"></translation>
     </message>
@@ -787,22 +815,22 @@ Example: https://server.my:8787</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+25"/>
         <source>Send a file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+42"/>
         <source>Write a message...</source>
         <translation type="unfinished">Γράψε ένα μήνυμα...</translation>
     </message>
     <message>
-        <location line="+186"/>
+        <location line="+211"/>
         <source>Emoji</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+16"/>
         <source>Send</source>
         <translation type="unfinished"></translation>
     </message>
@@ -810,7 +838,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>NewVerificationRequest</name>
     <message>
-        <location filename="../qml/device-verification/NewVerificationRequest.qml" line="+7"/>
+        <location filename="../qml/device-verification/NewVerificationRequest.qml" line="+11"/>
         <source>Send Verification Request</source>
         <translation type="unfinished"></translation>
     </message>
@@ -868,7 +896,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>PlaceCall</name>
     <message>
-        <location filename="../qml/voip/PlaceCall.qml" line="+36"/>
+        <location filename="../qml/voip/PlaceCall.qml" line="+48"/>
         <source>Place a call to %1?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -888,7 +916,12 @@ Example: https://server.my:8787</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location line="+14"/>
+        <source>Screen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
         <source>Cancel</source>
         <translation type="unfinished">Άκυρο</translation>
     </message>
@@ -896,7 +929,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>Placeholder</name>
     <message>
-        <location filename="../qml/delegates/Placeholder.qml" line="+4"/>
+        <location filename="../qml/delegates/Placeholder.qml" line="+8"/>
         <source>unimplemented event: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -904,7 +937,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>QCoreApplication</name>
     <message>
-        <location filename="../../src/main.cpp" line="+179"/>
+        <location filename="../../src/main.cpp" line="+167"/>
         <source>Create a unique profile, which allows you to log into several accounts at the same time and start multiple instances of nheko.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -922,7 +955,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>QuickSwitcher</name>
     <message>
-        <location filename="../../src/QuickSwitcher.cpp" line="+74"/>
+        <location filename="../../src/QuickSwitcher.cpp" line="+62"/>
         <source>Search for a room...</source>
         <translation>Αναζήτηση συνομιλίας...</translation>
     </message>
@@ -930,18 +963,18 @@ Example: https://server.my:8787</source>
 <context>
     <name>RegisterPage</name>
     <message>
-        <location filename="../../src/RegisterPage.cpp" line="+89"/>
+        <location filename="../../src/RegisterPage.cpp" line="+77"/>
         <source>Username</source>
         <translation>Όνομα χρήστη</translation>
     </message>
     <message>
         <location line="+2"/>
-        <location line="+286"/>
+        <location line="+287"/>
         <source>The username must not be empty, and must contain only the characters a-z, 0-9, ., _, =, -, and /.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-282"/>
+        <location line="-283"/>
         <source>Password</source>
         <translation>Κωδικός</translation>
     </message>
@@ -976,7 +1009,7 @@ Example: https://server.my:8787</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+209"/>
+        <location line="+210"/>
         <source>One or more fields have invalid inputs. Please correct those issues and try again.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -999,7 +1032,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>ReplyPopup</name>
     <message>
-        <location filename="../qml/ReplyPopup.qml" line="+45"/>
+        <location filename="../qml/ReplyPopup.qml" line="+49"/>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1012,7 +1045,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>RoomInfo</name>
     <message>
-        <location filename="../../src/Cache.cpp" line="+1861"/>
+        <location filename="../../src/Cache.cpp" line="+1793"/>
         <source>no version stored</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1020,7 +1053,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>RoomInfoListItem</name>
     <message>
-        <location filename="../../src/RoomInfoListItem.cpp" line="+102"/>
+        <location filename="../../src/RoomInfoListItem.cpp" line="+90"/>
         <source>Leave room</source>
         <translation>Βγές</translation>
     </message>
@@ -1082,10 +1115,116 @@ Example: https://server.my:8787</source>
         <translation>Απόρριψη</translation>
     </message>
 </context>
+<context>
+    <name>RoomSettings</name>
+    <message>
+        <location filename="../qml/RoomSettings.qml" line="+204"/>
+        <source>End-to-End Encryption</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Encryption is currently experimental and things might break unexpectedly. &lt;br&gt;
+                            Please take note that it can&apos;t be disabled afterwards.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>Whether or not the client should respond automatically with the session keys
+                                upon request. Use with caution, this is a temporary measure to test the
+                                E2E implementation until device verification is completed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/ui/RoomSettings.cpp" line="+267"/>
+        <source>Failed to enable encryption: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+228"/>
+        <source>Select an avatar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>All Files (*)</source>
+        <translation type="unfinished">Όλα τα αρχεία (*)</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>The selected file is not an image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Error while reading file: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+34"/>
+        <location line="+20"/>
+        <source>Failed to upload image: %s</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ScreenShare</name>
+    <message>
+        <location filename="../qml/voip/ScreenShare.qml" line="+30"/>
+        <source>Share desktop with %1?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Window:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Frame rate:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Include your camera picture-in-picture</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>Request remote camera</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location line="+9"/>
+        <source>View your callee&apos;s camera like a regular video call</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Hide mouse cursor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Share</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Preview</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Άκυρο</translation>
+    </message>
+</context>
 <context>
     <name>SideBarActions</name>
     <message>
-        <location filename="../../src/SideBarActions.cpp" line="+40"/>
+        <location filename="../../src/SideBarActions.cpp" line="+44"/>
         <source>User settings</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1113,7 +1252,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>StatusIndicator</name>
     <message>
-        <location filename="../qml/StatusIndicator.qml" line="+17"/>
+        <location filename="../qml/StatusIndicator.qml" line="+21"/>
         <source>Failed</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1136,7 +1275,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>Success</name>
     <message>
-        <location filename="../qml/device-verification/Success.qml" line="+6"/>
+        <location filename="../qml/device-verification/Success.qml" line="+10"/>
         <source>Successful Verification</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1154,7 +1293,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>TimelineModel</name>
     <message>
-        <location filename="../../src/timeline/TimelineModel.cpp" line="+895"/>
+        <location filename="../../src/timeline/TimelineModel.cpp" line="+911"/>
         <source>Message redaction failed: %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1304,12 +1443,12 @@ Example: https://server.my:8787</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-795"/>
+        <location line="-798"/>
         <source>You joined this room.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+797"/>
+        <location line="+800"/>
         <source>Rejected the knock from %1.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1333,7 +1472,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>TimelineRow</name>
     <message>
-        <location filename="../qml/TimelineRow.qml" line="+99"/>
+        <location filename="../qml/TimelineRow.qml" line="+100"/>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1361,7 +1500,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>TimelineView</name>
     <message>
-        <location filename="../qml/TimelineView.qml" line="+85"/>
+        <location filename="../qml/TimelineView.qml" line="+97"/>
         <source>React</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1411,7 +1550,7 @@ Example: https://server.my:8787</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+61"/>
         <source>No room open</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1419,7 +1558,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>TimelineViewManager</name>
     <message>
-        <location filename="../../src/timeline/TimelineViewManager.cpp" line="+423"/>
+        <location filename="../../src/timeline/TimelineViewManager.cpp" line="+430"/>
         <source>No encrypted private chat found with this user. Create an encrypted private chat with this user and try again.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1427,7 +1566,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>TopBar</name>
     <message>
-        <location filename="../qml/TopBar.qml" line="+43"/>
+        <location filename="../qml/TopBar.qml" line="+47"/>
         <source>Back to room list</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1466,7 +1605,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>TrayIcon</name>
     <message>
-        <location filename="../../src/TrayIcon.cpp" line="+122"/>
+        <location filename="../../src/TrayIcon.cpp" line="+110"/>
         <source>Show</source>
         <translation>Εμφάνιση</translation>
     </message>
@@ -1479,7 +1618,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>UserInfoWidget</name>
     <message>
-        <location filename="../../src/UserInfoWidget.cpp" line="+95"/>
+        <location filename="../../src/UserInfoWidget.cpp" line="+82"/>
         <source>Logout</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1527,7 +1666,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>UserProfile</name>
     <message>
-        <location filename="../qml/UserProfile.qml" line="+133"/>
+        <location filename="../qml/UserProfile.qml" line="+137"/>
         <source>Verify</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1547,7 +1686,7 @@ Example: https://server.my:8787</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/UserProfile.cpp" line="+296"/>
+        <location filename="../../src/ui/UserProfile.cpp" line="+301"/>
         <source>Select an avatar</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1570,7 +1709,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>UserSettings</name>
     <message>
-        <location filename="../../src/UserSettingsPage.cpp" line="+345"/>
+        <location filename="../../src/UserSettingsPage.cpp" line="+337"/>
         <location filename="../../src/UserSettingsPage.h" line="+183"/>
         <source>Default</source>
         <translation type="unfinished"></translation>
@@ -1579,7 +1718,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>UserSettingsPage</name>
     <message>
-        <location line="+496"/>
+        <location line="+540"/>
         <source>Minimize to tray</source>
         <translation>Ελαχιστοποίηση</translation>
     </message>
@@ -1795,7 +1934,7 @@ This usually causes the application icon in the task bar to animate in some fash
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+407"/>
+        <location line="+406"/>
         <source>CACHED</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1805,7 +1944,7 @@ This usually causes the application icon in the task bar to animate in some fash
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-461"/>
+        <location line="-460"/>
         <source>Scale factor</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1980,7 +2119,7 @@ This usually causes the application icon in the task bar to animate in some fash
         <translation type="unfinished">Όλα τα αρχεία (*)</translation>
     </message>
     <message>
-        <location line="+237"/>
+        <location line="+236"/>
         <source>Open Sessions File</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2025,7 +2164,7 @@ This usually causes the application icon in the task bar to animate in some fash
 <context>
     <name>Waiting</name>
     <message>
-        <location filename="../qml/device-verification/Waiting.qml" line="+7"/>
+        <location filename="../qml/device-verification/Waiting.qml" line="+11"/>
         <source>Waiting for other party…</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2053,7 +2192,7 @@ This usually causes the application icon in the task bar to animate in some fash
 <context>
     <name>WelcomePage</name>
     <message>
-        <location filename="../../src/WelcomePage.cpp" line="+46"/>
+        <location filename="../../src/WelcomePage.cpp" line="+34"/>
         <source>Welcome to nheko! The desktop client for the Matrix protocol.</source>
         <translation>Καλως ήρθες στο nheko!</translation>
     </message>
@@ -2076,7 +2215,7 @@ This usually causes the application icon in the task bar to animate in some fash
 <context>
     <name>descriptiveTime</name>
     <message>
-        <location filename="../../src/Utils.cpp" line="+145"/>
+        <location filename="../../src/Utils.cpp" line="+149"/>
         <source>Yesterday</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2084,7 +2223,7 @@ This usually causes the application icon in the task bar to animate in some fash
 <context>
     <name>dialogs::CreateRoom</name>
     <message>
-        <location filename="../../src/dialogs/CreateRoom.cpp" line="+36"/>
+        <location filename="../../src/dialogs/CreateRoom.cpp" line="+40"/>
         <source>Create room</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2127,7 +2266,7 @@ This usually causes the application icon in the task bar to animate in some fash
 <context>
     <name>dialogs::FallbackAuth</name>
     <message>
-        <location filename="../../src/dialogs/FallbackAuth.cpp" line="+30"/>
+        <location filename="../../src/dialogs/FallbackAuth.cpp" line="+34"/>
         <source>Open Fallback in Browser</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2150,7 +2289,7 @@ This usually causes the application icon in the task bar to animate in some fash
 <context>
     <name>dialogs::InviteUsers</name>
     <message>
-        <location filename="../../src/dialogs/InviteUsers.cpp" line="+42"/>
+        <location filename="../../src/dialogs/InviteUsers.cpp" line="+46"/>
         <source>Cancel</source>
         <translation type="unfinished">Άκυρο</translation>
     </message>
@@ -2163,7 +2302,7 @@ This usually causes the application icon in the task bar to animate in some fash
 <context>
     <name>dialogs::JoinRoom</name>
     <message>
-        <location filename="../../src/dialogs/JoinRoom.cpp" line="+30"/>
+        <location filename="../../src/dialogs/JoinRoom.cpp" line="+34"/>
         <source>Join</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2181,7 +2320,7 @@ This usually causes the application icon in the task bar to animate in some fash
 <context>
     <name>dialogs::LeaveRoom</name>
     <message>
-        <location filename="../../src/dialogs/LeaveRoom.cpp" line="+31"/>
+        <location filename="../../src/dialogs/LeaveRoom.cpp" line="+35"/>
         <source>Cancel</source>
         <translation type="unfinished">Άκυρο</translation>
     </message>
@@ -2194,7 +2333,7 @@ This usually causes the application icon in the task bar to animate in some fash
 <context>
     <name>dialogs::Logout</name>
     <message>
-        <location filename="../../src/dialogs/Logout.cpp" line="+47"/>
+        <location filename="../../src/dialogs/Logout.cpp" line="+35"/>
         <source>Cancel</source>
         <translation type="unfinished">Άκυρο</translation>
     </message>
@@ -2207,7 +2346,7 @@ This usually causes the application icon in the task bar to animate in some fash
 <context>
     <name>dialogs::PreviewUploadOverlay</name>
     <message>
-        <location filename="../../src/dialogs/PreviewUploadOverlay.cpp" line="+41"/>
+        <location filename="../../src/dialogs/PreviewUploadOverlay.cpp" line="+29"/>
         <source>Upload</source>
         <translation>Μεταφόρτωση</translation>
     </message>
@@ -2227,7 +2366,7 @@ Media size: %2
 <context>
     <name>dialogs::ReCaptcha</name>
     <message>
-        <location filename="../../src/dialogs/ReCaptcha.cpp" line="+31"/>
+        <location filename="../../src/dialogs/ReCaptcha.cpp" line="+35"/>
         <source>Cancel</source>
         <translation type="unfinished">Άκυρο</translation>
     </message>
@@ -2245,7 +2384,7 @@ Media size: %2
 <context>
     <name>dialogs::ReadReceipts</name>
     <message>
-        <location filename="../../src/dialogs/ReadReceipts.cpp" line="+120"/>
+        <location filename="../../src/dialogs/ReadReceipts.cpp" line="+124"/>
         <source>Read receipts</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2268,139 +2407,10 @@ Media size: %2
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>dialogs::RoomSettings</name>
-    <message>
-        <location filename="../../src/dialogs/RoomSettings.cpp" line="+135"/>
-        <source>Settings</source>
-        <translation type="unfinished">Ρυθμίσεις</translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Info</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+11"/>
-        <source>Internal ID</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>Room Version</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Notifications</source>
-        <translation>Ειδοποιήσεις</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Muted</source>
-        <translation>Αθόρυβο</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Mentions only</source>
-        <translation>Αναφορές μόνο</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>All messages</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+97"/>
-        <source>Room access</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Anyone and guests</source>
-        <translation>Οποιοσδήποτε &amp; επισκέπτες</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Anyone</source>
-        <translation>Οποιοσδήποτε</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Invited users</source>
-        <translation>Μόνο με πρόσκληση</translation>
-    </message>
-    <message>
-        <location line="+50"/>
-        <source>Encryption</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+31"/>
-        <source>End-to-End Encryption</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Encryption is currently experimental and things might break unexpectedly. &lt;br&gt;Please take note that it can&apos;t be disabled afterwards.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-24"/>
-        <source>Respond to key requests</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Whether or not the client should respond automatically with the session keys
- upon request. Use with caution, this is a temporary measure to test the
- E2E implementation until device verification is completed.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message numerus="yes">
-        <location line="+80"/>
-        <source>%n member(s)</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
-    </message>
-    <message>
-        <location line="+142"/>
-        <source>Failed to enable encryption: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+147"/>
-        <source>Select an avatar</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>All Files (*)</source>
-        <translation type="unfinished">Όλα τα αρχεία (*)</translation>
-    </message>
-    <message>
-        <location line="+12"/>
-        <source>The selected file is not an image</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Error while reading file: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+35"/>
-        <location line="+20"/>
-        <source>Failed to upload image: %s</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>message-description sent:</name>
     <message>
-        <location filename="../../src/Utils.h" line="+108"/>
+        <location filename="../../src/Utils.h" line="+112"/>
         <source>You sent an audio clip</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2513,7 +2523,7 @@ Media size: %2
 <context>
     <name>popups::UserMentions</name>
     <message>
-        <location filename="../../src/popups/UserMentions.cpp" line="+64"/>
+        <location filename="../../src/popups/UserMentions.cpp" line="+68"/>
         <source>This Room</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/resources/langs/nheko_en.ts b/resources/langs/nheko_en.ts
index 35c70c0b17fd172e2ab09e39a2056b5e781d19c4..2f315c20c39ad6c8cbeb74f72de312640eb390ec 100644
--- a/resources/langs/nheko_en.ts
+++ b/resources/langs/nheko_en.ts
@@ -4,7 +4,7 @@
 <context>
     <name>ActiveCallBar</name>
     <message>
-        <location filename="../qml/voip/ActiveCallBar.qml" line="+66"/>
+        <location filename="../qml/voip/ActiveCallBar.qml" line="+106"/>
         <source>Calling...</source>
         <translation>Calling...</translation>
     </message>
@@ -15,9 +15,14 @@
         <translation>Connecting...</translation>
     </message>
     <message>
-        <location line="+76"/>
-        <source>Toggle camera view</source>
-        <translation>Toggle camera view</translation>
+        <location line="+67"/>
+        <source>You are screen sharing</source>
+        <translation>You are screen sharing</translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Hide/Show Picture-in-Picture</source>
+        <translation>Hide/Show Picture-in-Picture</translation>
     </message>
     <message>
         <location line="+13"/>
@@ -33,7 +38,7 @@
 <context>
     <name>AwaitingVerificationConfirmation</name>
     <message>
-        <location filename="../qml/device-verification/AwaitingVerificationConfirmation.qml" line="+7"/>
+        <location filename="../qml/device-verification/AwaitingVerificationConfirmation.qml" line="+11"/>
         <source>Awaiting Confirmation</source>
         <translation>Awaiting Confirmation</translation>
     </message>
@@ -51,7 +56,7 @@
 <context>
     <name>Cache</name>
     <message>
-        <location filename="../../src/Cache.cpp" line="+2084"/>
+        <location filename="../../src/Cache.cpp" line="+2026"/>
         <source>You joined this room.</source>
         <translation>You joined this room.</translation>
     </message>
@@ -59,7 +64,7 @@
 <context>
     <name>CallInvite</name>
     <message>
-        <location filename="../qml/voip/CallInvite.qml" line="+66"/>
+        <location filename="../qml/voip/CallInvite.qml" line="+70"/>
         <source>Video Call</source>
         <translation>Video Call</translation>
     </message>
@@ -77,7 +82,7 @@
 <context>
     <name>CallInviteBar</name>
     <message>
-        <location filename="../qml/voip/CallInviteBar.qml" line="+60"/>
+        <location filename="../qml/voip/CallInviteBar.qml" line="+64"/>
         <source>Video Call</source>
         <translation>Video Call</translation>
     </message>
@@ -92,7 +97,7 @@
         <translation>Devices</translation>
     </message>
     <message>
-        <location line="+11"/>
+        <location line="+10"/>
         <source>Accept</source>
         <translation>Accept</translation>
     </message>
@@ -117,36 +122,55 @@
         <translation>No microphone found.</translation>
     </message>
 </context>
+<context>
+    <name>CallManager</name>
+    <message>
+        <location filename="../../src/CallManager.cpp" line="+521"/>
+        <source>Entire screen</source>
+        <translation>Entire screen</translation>
+    </message>
+</context>
 <context>
     <name>ChatPage</name>
     <message>
-        <location filename="../../src/ChatPage.cpp" line="+215"/>
+        <location filename="../../src/ChatPage.cpp" line="+203"/>
         <source>Failed to invite user: %1</source>
         <translation>Failed to invite user: %1</translation>
     </message>
     <message>
         <location line="+4"/>
-        <location line="+797"/>
+        <location line="+806"/>
         <source>Invited user: %1</source>
         <translation>Invited user: %1</translation>
     </message>
     <message>
-        <location line="-500"/>
+        <location line="-510"/>
         <source>Migrating the cache to the current version failed. This can have different reasons. Please open an issue and try to use an older version in the mean time. Alternatively you can try deleting the cache manually.</source>
         <translation>Migrating the cache to the current version failed. This can have different reasons. Please open an issue and try to use an older version in the mean time. Alternatively you can try deleting the cache manually.</translation>
     </message>
     <message>
-        <location line="+456"/>
+        <location line="+413"/>
+        <source>Confirm join</source>
+        <translation>Confirm join</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Do you really want to join %1?</source>
+        <translation></translation>
+    </message>
+    <message>
+        <location line="+44"/>
         <source>Room %1 created.</source>
         <translation>Room %1 created.</translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+35"/>
+        <location line="+323"/>
         <source>Confirm invite</source>
         <translation>Confirm invite</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="-322"/>
         <source>Do you really want to invite %1 (%2)?</source>
         <translation>Do you really want to invite %1 (%2)?</translation>
     </message>
@@ -211,7 +235,12 @@
         <translation>Unbanned user: %1</translation>
     </message>
     <message>
-        <location line="-582"/>
+        <location line="+226"/>
+        <source>Do you really want to start a private chat with %1?</source>
+        <translation>Do you really want to start a private chat with %1?</translation>
+    </message>
+    <message>
+        <location line="-818"/>
         <source>Cache migration failed!</source>
         <translation>Cache migration failed!</translation>
     </message>
@@ -236,7 +265,7 @@
         <translation>Failed to restore save data. Please login again.</translation>
     </message>
     <message>
-        <location line="+165"/>
+        <location line="+157"/>
         <source>Failed to setup encryption keys. Server response: %1 %2. Please try again later.</source>
         <translation>Failed to setup encryption keys. Server response: %1 %2. Please try again later.</translation>
     </message>
@@ -247,7 +276,7 @@
         <translation>Please try to login again: %1</translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+47"/>
         <source>Failed to join room: %1</source>
         <translation>Failed to join room: %1</translation>
     </message>
@@ -267,12 +296,12 @@
         <translation>Room creation failed: %1</translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+18"/>
         <source>Failed to leave room: %1</source>
         <translation>Failed to leave room: %1</translation>
     </message>
     <message>
-        <location line="+54"/>
+        <location line="+61"/>
         <source>Failed to kick %1 from %2: %3</source>
         <translation>Failed to kick %1 from %2: %3</translation>
     </message>
@@ -280,7 +309,7 @@
 <context>
     <name>CommunitiesListItem</name>
     <message>
-        <location filename="../../src/CommunitiesListItem.cpp" line="+26"/>
+        <location filename="../../src/CommunitiesListItem.cpp" line="+30"/>
         <source>Hide rooms with this tag or from this community</source>
         <translation>Hide rooms with this tag or from this community</translation>
     </message>
@@ -348,7 +377,7 @@
 <context>
     <name>DigitVerification</name>
     <message>
-        <location filename="../qml/device-verification/DigitVerification.qml" line="+7"/>
+        <location filename="../qml/device-verification/DigitVerification.qml" line="+11"/>
         <source>Verification Code</source>
         <translation>Verification Code</translation>
     </message>
@@ -371,7 +400,7 @@
 <context>
     <name>EditModal</name>
     <message>
-        <location filename="../../src/dialogs/RoomSettings.cpp" line="+73"/>
+        <location filename="../../src/ui/RoomSettings.cpp" line="+42"/>
         <source>Apply</source>
         <translation>Apply</translation>
     </message>
@@ -394,7 +423,7 @@
 <context>
     <name>EmojiPicker</name>
     <message>
-        <location filename="../qml/emoji/EmojiPicker.qml" line="+113"/>
+        <location filename="../qml/emoji/EmojiPicker.qml" line="+117"/>
         <location line="+181"/>
         <source>Search</source>
         <translation>Search</translation>
@@ -443,7 +472,7 @@
 <context>
     <name>EmojiVerification</name>
     <message>
-        <location filename="../qml/device-verification/EmojiVerification.qml" line="+7"/>
+        <location filename="../qml/device-verification/EmojiVerification.qml" line="+11"/>
         <source>Verification Code</source>
         <translation>Verification Code</translation>
     </message>
@@ -466,7 +495,7 @@
 <context>
     <name>EncryptionIndicator</name>
     <message>
-        <location filename="../qml/EncryptionIndicator.qml" line="+19"/>
+        <location filename="../qml/EncryptionIndicator.qml" line="+23"/>
         <source>Encrypted</source>
         <translation>Encrypted</translation>
     </message>
@@ -479,7 +508,7 @@
 <context>
     <name>EventStore</name>
     <message>
-        <location filename="../../src/timeline/EventStore.cpp" line="+612"/>
+        <location filename="../../src/timeline/EventStore.cpp" line="+613"/>
         <source>-- Encrypted Event (No keys found for decryption) --</source>
         <comment>Placeholder, when the message was not decrypted yet or can&apos;t be decrypted.</comment>
         <translation>-- Encrypted Event (No keys found for decryption) --</translation>
@@ -524,7 +553,7 @@
 <context>
     <name>Failed</name>
     <message>
-        <location filename="../qml/device-verification/Failed.qml" line="+7"/>
+        <location filename="../qml/device-verification/Failed.qml" line="+11"/>
         <source>Verification failed</source>
         <translation>Verification failed</translation>
     </message>
@@ -558,7 +587,7 @@
 <context>
     <name>InputBar</name>
     <message>
-        <location filename="../../src/timeline/InputBar.cpp" line="+227"/>
+        <location filename="../../src/timeline/InputBar.cpp" line="+253"/>
         <source>Select a file</source>
         <translation>Select a file</translation>
     </message>
@@ -568,7 +597,7 @@
         <translation>All Files (*)</translation>
     </message>
     <message>
-        <location line="+384"/>
+        <location line="+371"/>
         <source>Failed to upload media. Please try again.</source>
         <translation>Failed to upload media. Please try again.</translation>
     </message>
@@ -576,7 +605,7 @@
 <context>
     <name>InviteeItem</name>
     <message>
-        <location filename="../../src/InviteeItem.cpp" line="+18"/>
+        <location filename="../../src/InviteeItem.cpp" line="+22"/>
         <source>Remove</source>
         <translation>Remove</translation>
     </message>
@@ -584,7 +613,7 @@
 <context>
     <name>LoginPage</name>
     <message>
-        <location filename="../../src/LoginPage.cpp" line="+92"/>
+        <location filename="../../src/LoginPage.cpp" line="+80"/>
         <source>Matrix ID</source>
         <translation>Matrix ID</translation>
     </message>
@@ -643,20 +672,19 @@ Example: https://server.my:8787</translation>
     </message>
     <message>
         <location line="+19"/>
-        <location line="+218"/>
         <source>LOGIN</source>
         <translation>LOGIN</translation>
     </message>
     <message>
-        <location line="-151"/>
+        <location line="+84"/>
         <location line="+11"/>
-        <location line="+157"/>
+        <location line="+156"/>
         <location line="+11"/>
         <source>You have entered an invalid Matrix ID  e.g @joe:matrix.org</source>
         <translation>You have entered an invalid Matrix ID  e.g @joe:matrix.org</translation>
     </message>
     <message>
-        <location line="-132"/>
+        <location line="-131"/>
         <source>Autodiscovery failed. Received malformed response.</source>
         <translation>Autodiscovery failed. Received malformed response.</translation>
     </message>
@@ -681,12 +709,12 @@ Example: https://server.my:8787</translation>
         <translation>An unknown error occured. Make sure the homeserver domain is valid.</translation>
     </message>
     <message>
-        <location line="+59"/>
+        <location line="-168"/>
         <source>SSO LOGIN</source>
         <translation>SSO LOGIN</translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+263"/>
         <source>Empty password</source>
         <translation>Empty password</translation>
     </message>
@@ -699,7 +727,7 @@ Example: https://server.my:8787</translation>
 <context>
     <name>MemberList</name>
     <message>
-        <location filename="../../src/dialogs/MemberList.cpp" line="+90"/>
+        <location filename="../../src/dialogs/MemberList.cpp" line="+94"/>
         <source>Room members</source>
         <translation>Room members</translation>
     </message>
@@ -712,7 +740,7 @@ Example: https://server.my:8787</translation>
 <context>
     <name>MessageDelegate</name>
     <message>
-        <location filename="../qml/delegates/MessageDelegate.qml" line="+123"/>
+        <location filename="../qml/delegates/MessageDelegate.qml" line="+127"/>
         <source>Encryption enabled</source>
         <translation>Encryption enabled</translation>
     </message>
@@ -781,7 +809,7 @@ Example: https://server.my:8787</translation>
 <context>
     <name>MessageInput</name>
     <message>
-        <location filename="../qml/MessageInput.qml" line="+38"/>
+        <location filename="../qml/MessageInput.qml" line="+42"/>
         <source>Hang up</source>
         <translation>Hang up</translation>
     </message>
@@ -791,22 +819,22 @@ Example: https://server.my:8787</translation>
         <translation>Place a call</translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+25"/>
         <source>Send a file</source>
         <translation>Send a file</translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+42"/>
         <source>Write a message...</source>
         <translation>Write a message…</translation>
     </message>
     <message>
-        <location line="+186"/>
+        <location line="+211"/>
         <source>Emoji</source>
         <translation>Emoji</translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+16"/>
         <source>Send</source>
         <translation>Send</translation>
     </message>
@@ -814,7 +842,7 @@ Example: https://server.my:8787</translation>
 <context>
     <name>NewVerificationRequest</name>
     <message>
-        <location filename="../qml/device-verification/NewVerificationRequest.qml" line="+7"/>
+        <location filename="../qml/device-verification/NewVerificationRequest.qml" line="+11"/>
         <source>Send Verification Request</source>
         <translation>Send Verification Request</translation>
     </message>
@@ -872,7 +900,7 @@ Example: https://server.my:8787</translation>
 <context>
     <name>PlaceCall</name>
     <message>
-        <location filename="../qml/voip/PlaceCall.qml" line="+36"/>
+        <location filename="../qml/voip/PlaceCall.qml" line="+48"/>
         <source>Place a call to %1?</source>
         <translation>Place a call to %1?</translation>
     </message>
@@ -892,7 +920,12 @@ Example: https://server.my:8787</translation>
         <translation>Video</translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location line="+14"/>
+        <source>Screen</source>
+        <translation>Screen</translation>
+    </message>
+    <message>
+        <location line="+10"/>
         <source>Cancel</source>
         <translation>Cancel</translation>
     </message>
@@ -900,7 +933,7 @@ Example: https://server.my:8787</translation>
 <context>
     <name>Placeholder</name>
     <message>
-        <location filename="../qml/delegates/Placeholder.qml" line="+4"/>
+        <location filename="../qml/delegates/Placeholder.qml" line="+8"/>
         <source>unimplemented event: </source>
         <translation>unimplemented event: </translation>
     </message>
@@ -908,7 +941,7 @@ Example: https://server.my:8787</translation>
 <context>
     <name>QCoreApplication</name>
     <message>
-        <location filename="../../src/main.cpp" line="+179"/>
+        <location filename="../../src/main.cpp" line="+167"/>
         <source>Create a unique profile, which allows you to log into several accounts at the same time and start multiple instances of nheko.</source>
         <translation>Create a unique profile, which allows you to log into several accounts at the same time and start multiple instances of nheko.</translation>
     </message>
@@ -926,7 +959,7 @@ Example: https://server.my:8787</translation>
 <context>
     <name>QuickSwitcher</name>
     <message>
-        <location filename="../../src/QuickSwitcher.cpp" line="+74"/>
+        <location filename="../../src/QuickSwitcher.cpp" line="+62"/>
         <source>Search for a room...</source>
         <translation>Search for a room…</translation>
     </message>
@@ -934,18 +967,18 @@ Example: https://server.my:8787</translation>
 <context>
     <name>RegisterPage</name>
     <message>
-        <location filename="../../src/RegisterPage.cpp" line="+89"/>
+        <location filename="../../src/RegisterPage.cpp" line="+77"/>
         <source>Username</source>
         <translation>Username</translation>
     </message>
     <message>
         <location line="+2"/>
-        <location line="+286"/>
+        <location line="+287"/>
         <source>The username must not be empty, and must contain only the characters a-z, 0-9, ., _, =, -, and /.</source>
         <translation>The username must not be empty, and must contain only the characters a-z, 0-9, ., _, =, -, and /.</translation>
     </message>
     <message>
-        <location line="-282"/>
+        <location line="-283"/>
         <source>Password</source>
         <translation>Password</translation>
     </message>
@@ -980,7 +1013,7 @@ Example: https://server.my:8787</translation>
         <translation>No supported registration flows!</translation>
     </message>
     <message>
-        <location line="+209"/>
+        <location line="+210"/>
         <source>One or more fields have invalid inputs. Please correct those issues and try again.</source>
         <translation>One or more fields have invalid inputs. Please correct those issues and try again.</translation>
     </message>
@@ -1003,7 +1036,7 @@ Example: https://server.my:8787</translation>
 <context>
     <name>ReplyPopup</name>
     <message>
-        <location filename="../qml/ReplyPopup.qml" line="+45"/>
+        <location filename="../qml/ReplyPopup.qml" line="+49"/>
         <source>Close</source>
         <translation>Close</translation>
     </message>
@@ -1016,7 +1049,7 @@ Example: https://server.my:8787</translation>
 <context>
     <name>RoomInfo</name>
     <message>
-        <location filename="../../src/Cache.cpp" line="+1861"/>
+        <location filename="../../src/Cache.cpp" line="+1793"/>
         <source>no version stored</source>
         <translation>no version stored</translation>
     </message>
@@ -1024,7 +1057,7 @@ Example: https://server.my:8787</translation>
 <context>
     <name>RoomInfoListItem</name>
     <message>
-        <location filename="../../src/RoomInfoListItem.cpp" line="+102"/>
+        <location filename="../../src/RoomInfoListItem.cpp" line="+90"/>
         <source>Leave room</source>
         <translation>Leave room</translation>
     </message>
@@ -1086,10 +1119,118 @@ Example: https://server.my:8787</translation>
         <translation>Decline</translation>
     </message>
 </context>
+<context>
+    <name>RoomSettings</name>
+    <message>
+        <location filename="../qml/RoomSettings.qml" line="+204"/>
+        <source>End-to-End Encryption</source>
+        <translation>End-to-End Encryption</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Encryption is currently experimental and things might break unexpectedly. &lt;br&gt;
+                            Please take note that it can&apos;t be disabled afterwards.</source>
+        <translation>Encryption is currently experimental and things might break unexpectedly.&lt;br&gt;Please take note that it can&apos;t be disabled afterwards.</translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>Whether or not the client should respond automatically with the session keys
+                                upon request. Use with caution, this is a temporary measure to test the
+                                E2E implementation until device verification is completed.</source>
+        <translation>Whether or not the client should respond automatically with the session keys
+upon request. Use with caution, this is a temporary measure to test the
+E2E implementation until device verification is completed.</translation>
+    </message>
+    <message>
+        <location filename="../../src/ui/RoomSettings.cpp" line="+267"/>
+        <source>Failed to enable encryption: %1</source>
+        <translation>Failed to enable encryption: %1</translation>
+    </message>
+    <message>
+        <location line="+228"/>
+        <source>Select an avatar</source>
+        <translation>Select an avatar</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>All Files (*)</source>
+        <translation>All Files (*)</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>The selected file is not an image</source>
+        <translation>The selected file is not an image</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Error while reading file: %1</source>
+        <translation>Error while reading file: %1</translation>
+    </message>
+    <message>
+        <location line="+34"/>
+        <location line="+20"/>
+        <source>Failed to upload image: %s</source>
+        <translation>Failed to upload image: %s</translation>
+    </message>
+</context>
+<context>
+    <name>ScreenShare</name>
+    <message>
+        <location filename="../qml/voip/ScreenShare.qml" line="+30"/>
+        <source>Share desktop with %1?</source>
+        <translation>Share desktop with %1?</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Window:</source>
+        <translation>Window:</translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Frame rate:</source>
+        <translation>Frame rate:</translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Include your camera picture-in-picture</source>
+        <translation>Include your camera picture-in-picture</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>Request remote camera</source>
+        <translation>Request remote camera</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location line="+9"/>
+        <source>View your callee&apos;s camera like a regular video call</source>
+        <translation>View your callee&apos;s camera like a regular video call</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Hide mouse cursor</source>
+        <translation>Hide mouse cursor</translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Share</source>
+        <translation>Share</translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Preview</source>
+        <translation>Preview</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Cancel</source>
+        <translation>Cancel</translation>
+    </message>
+</context>
 <context>
     <name>SideBarActions</name>
     <message>
-        <location filename="../../src/SideBarActions.cpp" line="+40"/>
+        <location filename="../../src/SideBarActions.cpp" line="+44"/>
         <source>User settings</source>
         <translation>User settings</translation>
     </message>
@@ -1117,7 +1258,7 @@ Example: https://server.my:8787</translation>
 <context>
     <name>StatusIndicator</name>
     <message>
-        <location filename="../qml/StatusIndicator.qml" line="+17"/>
+        <location filename="../qml/StatusIndicator.qml" line="+21"/>
         <source>Failed</source>
         <translation>Failed</translation>
     </message>
@@ -1140,7 +1281,7 @@ Example: https://server.my:8787</translation>
 <context>
     <name>Success</name>
     <message>
-        <location filename="../qml/device-verification/Success.qml" line="+6"/>
+        <location filename="../qml/device-verification/Success.qml" line="+10"/>
         <source>Successful Verification</source>
         <translation>Successful Verification</translation>
     </message>
@@ -1158,7 +1299,7 @@ Example: https://server.my:8787</translation>
 <context>
     <name>TimelineModel</name>
     <message>
-        <location filename="../../src/timeline/TimelineModel.cpp" line="+895"/>
+        <location filename="../../src/timeline/TimelineModel.cpp" line="+911"/>
         <source>Message redaction failed: %1</source>
         <translation>Message redaction failed: %1</translation>
     </message>
@@ -1308,12 +1449,12 @@ Example: https://server.my:8787</translation>
         <translation>%1 redacted their knock.</translation>
     </message>
     <message>
-        <location line="-795"/>
+        <location line="-798"/>
         <source>You joined this room.</source>
         <translation>You joined this room.</translation>
     </message>
     <message>
-        <location line="+797"/>
+        <location line="+800"/>
         <source>Rejected the knock from %1.</source>
         <translation>Rejected the knock from %1.</translation>
     </message>
@@ -1337,7 +1478,7 @@ Example: https://server.my:8787</translation>
 <context>
     <name>TimelineRow</name>
     <message>
-        <location filename="../qml/TimelineRow.qml" line="+99"/>
+        <location filename="../qml/TimelineRow.qml" line="+100"/>
         <source>Edit</source>
         <translation>Edit</translation>
     </message>
@@ -1365,7 +1506,7 @@ Example: https://server.my:8787</translation>
 <context>
     <name>TimelineView</name>
     <message>
-        <location filename="../qml/TimelineView.qml" line="+85"/>
+        <location filename="../qml/TimelineView.qml" line="+97"/>
         <source>React</source>
         <translation>React</translation>
     </message>
@@ -1415,7 +1556,7 @@ Example: https://server.my:8787</translation>
         <translation>Open in external program</translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+61"/>
         <source>No room open</source>
         <translation>No room open</translation>
     </message>
@@ -1423,7 +1564,7 @@ Example: https://server.my:8787</translation>
 <context>
     <name>TimelineViewManager</name>
     <message>
-        <location filename="../../src/timeline/TimelineViewManager.cpp" line="+423"/>
+        <location filename="../../src/timeline/TimelineViewManager.cpp" line="+430"/>
         <source>No encrypted private chat found with this user. Create an encrypted private chat with this user and try again.</source>
         <translation>No encrypted private chat found with this user. Create an encrypted private chat with this user and try again.</translation>
     </message>
@@ -1431,7 +1572,7 @@ Example: https://server.my:8787</translation>
 <context>
     <name>TopBar</name>
     <message>
-        <location filename="../qml/TopBar.qml" line="+43"/>
+        <location filename="../qml/TopBar.qml" line="+47"/>
         <source>Back to room list</source>
         <translation>Back to room list</translation>
     </message>
@@ -1470,7 +1611,7 @@ Example: https://server.my:8787</translation>
 <context>
     <name>TrayIcon</name>
     <message>
-        <location filename="../../src/TrayIcon.cpp" line="+122"/>
+        <location filename="../../src/TrayIcon.cpp" line="+110"/>
         <source>Show</source>
         <translation>Show</translation>
     </message>
@@ -1483,7 +1624,7 @@ Example: https://server.my:8787</translation>
 <context>
     <name>UserInfoWidget</name>
     <message>
-        <location filename="../../src/UserInfoWidget.cpp" line="+95"/>
+        <location filename="../../src/UserInfoWidget.cpp" line="+82"/>
         <source>Logout</source>
         <translation>Logout</translation>
     </message>
@@ -1531,7 +1672,7 @@ Example: https://server.my:8787</translation>
 <context>
     <name>UserProfile</name>
     <message>
-        <location filename="../qml/UserProfile.qml" line="+133"/>
+        <location filename="../qml/UserProfile.qml" line="+137"/>
         <source>Verify</source>
         <translation>Verify</translation>
     </message>
@@ -1551,7 +1692,7 @@ Example: https://server.my:8787</translation>
         <translation>Kick the user</translation>
     </message>
     <message>
-        <location filename="../../src/ui/UserProfile.cpp" line="+296"/>
+        <location filename="../../src/ui/UserProfile.cpp" line="+301"/>
         <source>Select an avatar</source>
         <translation>Select an avatar</translation>
     </message>
@@ -1574,7 +1715,7 @@ Example: https://server.my:8787</translation>
 <context>
     <name>UserSettings</name>
     <message>
-        <location filename="../../src/UserSettingsPage.cpp" line="+345"/>
+        <location filename="../../src/UserSettingsPage.cpp" line="+337"/>
         <location filename="../../src/UserSettingsPage.h" line="+183"/>
         <source>Default</source>
         <translation>Default</translation>
@@ -1583,7 +1724,7 @@ Example: https://server.my:8787</translation>
 <context>
     <name>UserSettingsPage</name>
     <message>
-        <location line="+496"/>
+        <location line="+540"/>
         <source>Minimize to tray</source>
         <translation>Minimize to tray</translation>
     </message>
@@ -1810,7 +1951,7 @@ This usually causes the application icon in the task bar to animate in some fash
         <translation>Share keys with verified users and devices</translation>
     </message>
     <message>
-        <location line="+407"/>
+        <location line="+406"/>
         <source>CACHED</source>
         <translation>CACHED</translation>
     </message>
@@ -1820,7 +1961,7 @@ This usually causes the application icon in the task bar to animate in some fash
         <translation>NOT CACHED</translation>
     </message>
     <message>
-        <location line="-461"/>
+        <location line="-460"/>
         <source>Scale factor</source>
         <translation>Scale factor</translation>
     </message>
@@ -1995,7 +2136,7 @@ This usually causes the application icon in the task bar to animate in some fash
         <translation>All Files (*)</translation>
     </message>
     <message>
-        <location line="+237"/>
+        <location line="+236"/>
         <source>Open Sessions File</source>
         <translation>Open Sessions File</translation>
     </message>
@@ -2040,7 +2181,7 @@ This usually causes the application icon in the task bar to animate in some fash
 <context>
     <name>Waiting</name>
     <message>
-        <location filename="../qml/device-verification/Waiting.qml" line="+7"/>
+        <location filename="../qml/device-verification/Waiting.qml" line="+11"/>
         <source>Waiting for other party…</source>
         <translation>Waiting for other party…</translation>
     </message>
@@ -2068,7 +2209,7 @@ This usually causes the application icon in the task bar to animate in some fash
 <context>
     <name>WelcomePage</name>
     <message>
-        <location filename="../../src/WelcomePage.cpp" line="+46"/>
+        <location filename="../../src/WelcomePage.cpp" line="+34"/>
         <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>
@@ -2091,7 +2232,7 @@ This usually causes the application icon in the task bar to animate in some fash
 <context>
     <name>descriptiveTime</name>
     <message>
-        <location filename="../../src/Utils.cpp" line="+145"/>
+        <location filename="../../src/Utils.cpp" line="+149"/>
         <source>Yesterday</source>
         <translation>Yesterday</translation>
     </message>
@@ -2099,7 +2240,7 @@ This usually causes the application icon in the task bar to animate in some fash
 <context>
     <name>dialogs::CreateRoom</name>
     <message>
-        <location filename="../../src/dialogs/CreateRoom.cpp" line="+36"/>
+        <location filename="../../src/dialogs/CreateRoom.cpp" line="+40"/>
         <source>Create room</source>
         <translation>Create room</translation>
     </message>
@@ -2142,7 +2283,7 @@ This usually causes the application icon in the task bar to animate in some fash
 <context>
     <name>dialogs::FallbackAuth</name>
     <message>
-        <location filename="../../src/dialogs/FallbackAuth.cpp" line="+30"/>
+        <location filename="../../src/dialogs/FallbackAuth.cpp" line="+34"/>
         <source>Open Fallback in Browser</source>
         <translation>Open Fallback in Browser</translation>
     </message>
@@ -2165,7 +2306,7 @@ This usually causes the application icon in the task bar to animate in some fash
 <context>
     <name>dialogs::InviteUsers</name>
     <message>
-        <location filename="../../src/dialogs/InviteUsers.cpp" line="+42"/>
+        <location filename="../../src/dialogs/InviteUsers.cpp" line="+46"/>
         <source>Cancel</source>
         <translation>Cancel</translation>
     </message>
@@ -2178,7 +2319,7 @@ This usually causes the application icon in the task bar to animate in some fash
 <context>
     <name>dialogs::JoinRoom</name>
     <message>
-        <location filename="../../src/dialogs/JoinRoom.cpp" line="+30"/>
+        <location filename="../../src/dialogs/JoinRoom.cpp" line="+34"/>
         <source>Join</source>
         <translation>Join</translation>
     </message>
@@ -2196,7 +2337,7 @@ This usually causes the application icon in the task bar to animate in some fash
 <context>
     <name>dialogs::LeaveRoom</name>
     <message>
-        <location filename="../../src/dialogs/LeaveRoom.cpp" line="+31"/>
+        <location filename="../../src/dialogs/LeaveRoom.cpp" line="+35"/>
         <source>Cancel</source>
         <translation>Cancel</translation>
     </message>
@@ -2209,7 +2350,7 @@ This usually causes the application icon in the task bar to animate in some fash
 <context>
     <name>dialogs::Logout</name>
     <message>
-        <location filename="../../src/dialogs/Logout.cpp" line="+47"/>
+        <location filename="../../src/dialogs/Logout.cpp" line="+35"/>
         <source>Cancel</source>
         <translation>Cancel</translation>
     </message>
@@ -2222,7 +2363,7 @@ This usually causes the application icon in the task bar to animate in some fash
 <context>
     <name>dialogs::PreviewUploadOverlay</name>
     <message>
-        <location filename="../../src/dialogs/PreviewUploadOverlay.cpp" line="+41"/>
+        <location filename="../../src/dialogs/PreviewUploadOverlay.cpp" line="+29"/>
         <source>Upload</source>
         <translation>Upload</translation>
     </message>
@@ -2244,7 +2385,7 @@ Media size: %2
 <context>
     <name>dialogs::ReCaptcha</name>
     <message>
-        <location filename="../../src/dialogs/ReCaptcha.cpp" line="+31"/>
+        <location filename="../../src/dialogs/ReCaptcha.cpp" line="+35"/>
         <source>Cancel</source>
         <translation>Cancel</translation>
     </message>
@@ -2262,7 +2403,7 @@ Media size: %2
 <context>
     <name>dialogs::ReadReceipts</name>
     <message>
-        <location filename="../../src/dialogs/ReadReceipts.cpp" line="+120"/>
+        <location filename="../../src/dialogs/ReadReceipts.cpp" line="+124"/>
         <source>Read receipts</source>
         <translation>Read receipts</translation>
     </message>
@@ -2285,139 +2426,10 @@ Media size: %2
         <translation>Yesterday %1</translation>
     </message>
 </context>
-<context>
-    <name>dialogs::RoomSettings</name>
-    <message>
-        <location filename="../../src/dialogs/RoomSettings.cpp" line="+135"/>
-        <source>Settings</source>
-        <translation>Settings</translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Info</source>
-        <translation>Info</translation>
-    </message>
-    <message>
-        <location line="+11"/>
-        <source>Internal ID</source>
-        <translation>Internal ID</translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>Room Version</source>
-        <translation>Room Version</translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Notifications</source>
-        <translation>Notifications</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Muted</source>
-        <translation>Muted</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Mentions only</source>
-        <translation>Mentions only</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>All messages</source>
-        <translation>All messages</translation>
-    </message>
-    <message>
-        <location line="+97"/>
-        <source>Room access</source>
-        <translation>Room access</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Anyone and guests</source>
-        <translation>Anyone and guests</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Anyone</source>
-        <translation>Anyone who knows the room link (no guests)</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Invited users</source>
-        <translation>Invited users</translation>
-    </message>
-    <message>
-        <location line="+50"/>
-        <source>Encryption</source>
-        <translation>Encryption</translation>
-    </message>
-    <message>
-        <location line="+11"/>
-        <source>Whether or not the client should respond automatically with the session keys
- upon request. Use with caution, this is a temporary measure to test the
- E2E implementation until device verification is completed.</source>
-        <translation>Whether or not the client should respond automatically with the session keys upon request. Use with caution, this is a temporary measure to test the E2E implementation until device verification is completed.</translation>
-    </message>
-    <message>
-        <location line="+20"/>
-        <source>End-to-End Encryption</source>
-        <translation>End-to-End Encryption</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Encryption is currently experimental and things might break unexpectedly. &lt;br&gt;Please take note that it can&apos;t be disabled afterwards.</source>
-        <translation>Encryption is currently experimental and things might break unexpectedly. &lt;br&gt;Please take note that it can&apos;t be disabled afterwards.</translation>
-    </message>
-    <message>
-        <location line="-24"/>
-        <source>Respond to key requests</source>
-        <translation>Respond to key requests</translation>
-    </message>
-    <message numerus="yes">
-        <location line="+83"/>
-        <source>%n member(s)</source>
-        <translation>
-            <numerusform>%n member</numerusform>
-            <numerusform>%n members</numerusform>
-        </translation>
-    </message>
-    <message>
-        <location line="+142"/>
-        <source>Failed to enable encryption: %1</source>
-        <translation>Failed to enable encryption: %1</translation>
-    </message>
-    <message>
-        <location line="+147"/>
-        <source>Select an avatar</source>
-        <translation>Select an avatar</translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>All Files (*)</source>
-        <translation>All Files (*)</translation>
-    </message>
-    <message>
-        <location line="+12"/>
-        <source>The selected file is not an image</source>
-        <translation>The selected file is not an image</translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Error while reading file: %1</source>
-        <translation>Error while reading file: %1</translation>
-    </message>
-    <message>
-        <location line="+35"/>
-        <location line="+20"/>
-        <source>Failed to upload image: %s</source>
-        <translation>Failed to upload image: %s</translation>
-    </message>
-</context>
 <context>
     <name>message-description sent:</name>
     <message>
-        <location filename="../../src/Utils.h" line="+108"/>
+        <location filename="../../src/Utils.h" line="+112"/>
         <source>You sent an audio clip</source>
         <translation>You sent an audio clip</translation>
     </message>
@@ -2530,7 +2542,7 @@ Media size: %2
 <context>
     <name>popups::UserMentions</name>
     <message>
-        <location filename="../../src/popups/UserMentions.cpp" line="+64"/>
+        <location filename="../../src/popups/UserMentions.cpp" line="+68"/>
         <source>This Room</source>
         <translation>This Room</translation>
     </message>
diff --git a/resources/langs/nheko_eo.ts b/resources/langs/nheko_eo.ts
index 5f0eade70bd0ae4f8aa5db91d5a9f4b644e0f461..cc5386248bee5cae43010a3baf6ff1031a554d95 100644
--- a/resources/langs/nheko_eo.ts
+++ b/resources/langs/nheko_eo.ts
@@ -4,7 +4,7 @@
 <context>
     <name>ActiveCallBar</name>
     <message>
-        <location filename="../qml/voip/ActiveCallBar.qml" line="+66"/>
+        <location filename="../qml/voip/ActiveCallBar.qml" line="+106"/>
         <source>Calling...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15,8 +15,13 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+76"/>
-        <source>Toggle camera view</source>
+        <location line="+67"/>
+        <source>You are screen sharing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Hide/Show Picture-in-Picture</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -33,7 +38,7 @@
 <context>
     <name>AwaitingVerificationConfirmation</name>
     <message>
-        <location filename="../qml/device-verification/AwaitingVerificationConfirmation.qml" line="+7"/>
+        <location filename="../qml/device-verification/AwaitingVerificationConfirmation.qml" line="+11"/>
         <source>Awaiting Confirmation</source>
         <translation type="unfinished"></translation>
     </message>
@@ -51,7 +56,7 @@
 <context>
     <name>Cache</name>
     <message>
-        <location filename="../../src/Cache.cpp" line="+2084"/>
+        <location filename="../../src/Cache.cpp" line="+2026"/>
         <source>You joined this room.</source>
         <translation>Vi aliĝis ĉi tiun ĉambron.</translation>
     </message>
@@ -59,7 +64,7 @@
 <context>
     <name>CallInvite</name>
     <message>
-        <location filename="../qml/voip/CallInvite.qml" line="+66"/>
+        <location filename="../qml/voip/CallInvite.qml" line="+70"/>
         <source>Video Call</source>
         <translation type="unfinished"></translation>
     </message>
@@ -77,7 +82,7 @@
 <context>
     <name>CallInviteBar</name>
     <message>
-        <location filename="../qml/voip/CallInviteBar.qml" line="+60"/>
+        <location filename="../qml/voip/CallInviteBar.qml" line="+64"/>
         <source>Video Call</source>
         <translation type="unfinished"></translation>
     </message>
@@ -92,7 +97,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
+        <location line="+10"/>
         <source>Accept</source>
         <translation type="unfinished"></translation>
     </message>
@@ -117,37 +122,56 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>CallManager</name>
+    <message>
+        <location filename="../../src/CallManager.cpp" line="+521"/>
+        <source>Entire screen</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>ChatPage</name>
     <message>
-        <location filename="../../src/ChatPage.cpp" line="+215"/>
+        <location filename="../../src/ChatPage.cpp" line="+203"/>
         <source>Failed to invite user: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+4"/>
-        <location line="+797"/>
+        <location line="+806"/>
         <source>Invited user: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-500"/>
+        <location line="-510"/>
         <source>Migrating the cache to the current version failed. This can have different reasons. Please open an issue and try to use an older version in the mean time. Alternatively you can try deleting the cache manually.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+456"/>
+        <location line="+413"/>
+        <source>Confirm join</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Do you really want to join %1?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+44"/>
         <source>Room %1 created.</source>
         <translatorcomment>I believe that the -at ending is correct here.</translatorcomment>
         <translation>Ĉambro %1 farit.</translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+35"/>
+        <location line="+323"/>
         <source>Confirm invite</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="-322"/>
         <source>Do you really want to invite %1 (%2)?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -212,7 +236,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-582"/>
+        <location line="+226"/>
+        <source>Do you really want to start a private chat with %1?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-818"/>
         <source>Cache migration failed!</source>
         <translation type="unfinished"></translation>
     </message>
@@ -237,7 +266,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+165"/>
+        <location line="+157"/>
         <source>Failed to setup encryption keys. Server response: %1 %2. Please try again later.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -248,7 +277,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+47"/>
         <source>Failed to join room: %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -268,12 +297,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+18"/>
         <source>Failed to leave room: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+54"/>
+        <location line="+61"/>
         <source>Failed to kick %1 from %2: %3</source>
         <translation type="unfinished"></translation>
     </message>
@@ -281,7 +310,7 @@
 <context>
     <name>CommunitiesListItem</name>
     <message>
-        <location filename="../../src/CommunitiesListItem.cpp" line="+26"/>
+        <location filename="../../src/CommunitiesListItem.cpp" line="+30"/>
         <source>Hide rooms with this tag or from this community</source>
         <translation type="unfinished"></translation>
     </message>
@@ -349,7 +378,7 @@
 <context>
     <name>DigitVerification</name>
     <message>
-        <location filename="../qml/device-verification/DigitVerification.qml" line="+7"/>
+        <location filename="../qml/device-verification/DigitVerification.qml" line="+11"/>
         <source>Verification Code</source>
         <translation type="unfinished"></translation>
     </message>
@@ -372,7 +401,7 @@
 <context>
     <name>EditModal</name>
     <message>
-        <location filename="../../src/dialogs/RoomSettings.cpp" line="+73"/>
+        <location filename="../../src/ui/RoomSettings.cpp" line="+42"/>
         <source>Apply</source>
         <translation type="unfinished"></translation>
     </message>
@@ -395,7 +424,7 @@
 <context>
     <name>EmojiPicker</name>
     <message>
-        <location filename="../qml/emoji/EmojiPicker.qml" line="+113"/>
+        <location filename="../qml/emoji/EmojiPicker.qml" line="+117"/>
         <location line="+181"/>
         <source>Search</source>
         <translation>Trovu</translation>
@@ -444,7 +473,7 @@
 <context>
     <name>EmojiVerification</name>
     <message>
-        <location filename="../qml/device-verification/EmojiVerification.qml" line="+7"/>
+        <location filename="../qml/device-verification/EmojiVerification.qml" line="+11"/>
         <source>Verification Code</source>
         <translation type="unfinished"></translation>
     </message>
@@ -467,7 +496,7 @@
 <context>
     <name>EncryptionIndicator</name>
     <message>
-        <location filename="../qml/EncryptionIndicator.qml" line="+19"/>
+        <location filename="../qml/EncryptionIndicator.qml" line="+23"/>
         <source>Encrypted</source>
         <translation type="unfinished"></translation>
     </message>
@@ -480,7 +509,7 @@
 <context>
     <name>EventStore</name>
     <message>
-        <location filename="../../src/timeline/EventStore.cpp" line="+612"/>
+        <location filename="../../src/timeline/EventStore.cpp" line="+613"/>
         <source>-- Encrypted Event (No keys found for decryption) --</source>
         <comment>Placeholder, when the message was not decrypted yet or can&apos;t be decrypted.</comment>
         <translation type="unfinished"></translation>
@@ -525,7 +554,7 @@
 <context>
     <name>Failed</name>
     <message>
-        <location filename="../qml/device-verification/Failed.qml" line="+7"/>
+        <location filename="../qml/device-verification/Failed.qml" line="+11"/>
         <source>Verification failed</source>
         <translation type="unfinished"></translation>
     </message>
@@ -559,7 +588,7 @@
 <context>
     <name>InputBar</name>
     <message>
-        <location filename="../../src/timeline/InputBar.cpp" line="+227"/>
+        <location filename="../../src/timeline/InputBar.cpp" line="+253"/>
         <source>Select a file</source>
         <translation type="unfinished"></translation>
     </message>
@@ -569,7 +598,7 @@
         <translation type="unfinished">Ĉiuj dosieroj (*)</translation>
     </message>
     <message>
-        <location line="+384"/>
+        <location line="+371"/>
         <source>Failed to upload media. Please try again.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -577,7 +606,7 @@
 <context>
     <name>InviteeItem</name>
     <message>
-        <location filename="../../src/InviteeItem.cpp" line="+18"/>
+        <location filename="../../src/InviteeItem.cpp" line="+22"/>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
@@ -585,7 +614,7 @@
 <context>
     <name>LoginPage</name>
     <message>
-        <location filename="../../src/LoginPage.cpp" line="+92"/>
+        <location filename="../../src/LoginPage.cpp" line="+80"/>
         <source>Matrix ID</source>
         <translation type="unfinished"></translation>
     </message>
@@ -643,21 +672,20 @@ Ekzemplo: https://servisto.mia:8787</translation>
     </message>
     <message>
         <location line="+19"/>
-        <location line="+218"/>
         <source>LOGIN</source>
         <translatorcomment>Maybe shouldn&apos;t be imperative?</translatorcomment>
         <translation>ENSALUTU</translation>
     </message>
     <message>
-        <location line="-151"/>
+        <location line="+84"/>
         <location line="+11"/>
-        <location line="+157"/>
+        <location line="+156"/>
         <location line="+11"/>
         <source>You have entered an invalid Matrix ID  e.g @joe:matrix.org</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-132"/>
+        <location line="-131"/>
         <source>Autodiscovery failed. Received malformed response.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -682,12 +710,12 @@ Ekzemplo: https://servisto.mia:8787</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+59"/>
+        <location line="-168"/>
         <source>SSO LOGIN</source>
         <translation>SSO ENSALUTU</translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+263"/>
         <source>Empty password</source>
         <translation type="unfinished"></translation>
     </message>
@@ -700,7 +728,7 @@ Ekzemplo: https://servisto.mia:8787</translation>
 <context>
     <name>MemberList</name>
     <message>
-        <location filename="../../src/dialogs/MemberList.cpp" line="+90"/>
+        <location filename="../../src/dialogs/MemberList.cpp" line="+94"/>
         <source>Room members</source>
         <translation>Membroj de la ĉambro</translation>
     </message>
@@ -713,7 +741,7 @@ Ekzemplo: https://servisto.mia:8787</translation>
 <context>
     <name>MessageDelegate</name>
     <message>
-        <location filename="../qml/delegates/MessageDelegate.qml" line="+105"/>
+        <location filename="../qml/delegates/MessageDelegate.qml" line="+109"/>
         <location line="+9"/>
         <source>removed</source>
         <translation type="unfinished"></translation>
@@ -782,7 +810,7 @@ Ekzemplo: https://servisto.mia:8787</translation>
 <context>
     <name>MessageInput</name>
     <message>
-        <location filename="../qml/MessageInput.qml" line="+38"/>
+        <location filename="../qml/MessageInput.qml" line="+42"/>
         <source>Hang up</source>
         <translation type="unfinished"></translation>
     </message>
@@ -792,22 +820,22 @@ Ekzemplo: https://servisto.mia:8787</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+25"/>
         <source>Send a file</source>
         <translation type="unfinished">Sendu dosieron</translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+42"/>
         <source>Write a message...</source>
         <translation type="unfinished">Skribu mesaĝon...</translation>
     </message>
     <message>
-        <location line="+186"/>
+        <location line="+211"/>
         <source>Emoji</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+16"/>
         <source>Send</source>
         <translation>Sendu</translation>
     </message>
@@ -815,7 +843,7 @@ Ekzemplo: https://servisto.mia:8787</translation>
 <context>
     <name>NewVerificationRequest</name>
     <message>
-        <location filename="../qml/device-verification/NewVerificationRequest.qml" line="+7"/>
+        <location filename="../qml/device-verification/NewVerificationRequest.qml" line="+11"/>
         <source>Send Verification Request</source>
         <translation type="unfinished"></translation>
     </message>
@@ -873,7 +901,7 @@ Ekzemplo: https://servisto.mia:8787</translation>
 <context>
     <name>PlaceCall</name>
     <message>
-        <location filename="../qml/voip/PlaceCall.qml" line="+36"/>
+        <location filename="../qml/voip/PlaceCall.qml" line="+48"/>
         <source>Place a call to %1?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -893,7 +921,12 @@ Ekzemplo: https://servisto.mia:8787</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location line="+14"/>
+        <source>Screen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -901,7 +934,7 @@ Ekzemplo: https://servisto.mia:8787</translation>
 <context>
     <name>Placeholder</name>
     <message>
-        <location filename="../qml/delegates/Placeholder.qml" line="+4"/>
+        <location filename="../qml/delegates/Placeholder.qml" line="+8"/>
         <source>unimplemented event: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -909,7 +942,7 @@ Ekzemplo: https://servisto.mia:8787</translation>
 <context>
     <name>QCoreApplication</name>
     <message>
-        <location filename="../../src/main.cpp" line="+179"/>
+        <location filename="../../src/main.cpp" line="+167"/>
         <source>Create a unique profile, which allows you to log into several accounts at the same time and start multiple instances of nheko.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -927,7 +960,7 @@ Ekzemplo: https://servisto.mia:8787</translation>
 <context>
     <name>QuickSwitcher</name>
     <message>
-        <location filename="../../src/QuickSwitcher.cpp" line="+74"/>
+        <location filename="../../src/QuickSwitcher.cpp" line="+62"/>
         <source>Search for a room...</source>
         <translation>Trovu por ĉambro...</translation>
     </message>
@@ -935,18 +968,18 @@ Ekzemplo: https://servisto.mia:8787</translation>
 <context>
     <name>RegisterPage</name>
     <message>
-        <location filename="../../src/RegisterPage.cpp" line="+89"/>
+        <location filename="../../src/RegisterPage.cpp" line="+77"/>
         <source>Username</source>
         <translation>Uzantnomo</translation>
     </message>
     <message>
         <location line="+2"/>
-        <location line="+286"/>
+        <location line="+287"/>
         <source>The username must not be empty, and must contain only the characters a-z, 0-9, ., _, =, -, and /.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-282"/>
+        <location line="-283"/>
         <source>Password</source>
         <translation>Pasvorto</translation>
     </message>
@@ -981,7 +1014,7 @@ Ekzemplo: https://servisto.mia:8787</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+209"/>
+        <location line="+210"/>
         <source>One or more fields have invalid inputs. Please correct those issues and try again.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1004,7 +1037,7 @@ Ekzemplo: https://servisto.mia:8787</translation>
 <context>
     <name>ReplyPopup</name>
     <message>
-        <location filename="../qml/ReplyPopup.qml" line="+45"/>
+        <location filename="../qml/ReplyPopup.qml" line="+49"/>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1017,7 +1050,7 @@ Ekzemplo: https://servisto.mia:8787</translation>
 <context>
     <name>RoomInfo</name>
     <message>
-        <location filename="../../src/Cache.cpp" line="+1861"/>
+        <location filename="../../src/Cache.cpp" line="+1793"/>
         <source>no version stored</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1025,7 +1058,7 @@ Ekzemplo: https://servisto.mia:8787</translation>
 <context>
     <name>RoomInfoListItem</name>
     <message>
-        <location filename="../../src/RoomInfoListItem.cpp" line="+102"/>
+        <location filename="../../src/RoomInfoListItem.cpp" line="+90"/>
         <source>Leave room</source>
         <translation>Eliru ĉambro</translation>
     </message>
@@ -1087,10 +1120,116 @@ Ekzemplo: https://servisto.mia:8787</translation>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>RoomSettings</name>
+    <message>
+        <location filename="../qml/RoomSettings.qml" line="+204"/>
+        <source>End-to-End Encryption</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Encryption is currently experimental and things might break unexpectedly. &lt;br&gt;
+                            Please take note that it can&apos;t be disabled afterwards.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>Whether or not the client should respond automatically with the session keys
+                                upon request. Use with caution, this is a temporary measure to test the
+                                E2E implementation until device verification is completed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/ui/RoomSettings.cpp" line="+267"/>
+        <source>Failed to enable encryption: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+228"/>
+        <source>Select an avatar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>All Files (*)</source>
+        <translation type="unfinished">Ĉiuj dosieroj (*)</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>The selected file is not an image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Error while reading file: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+34"/>
+        <location line="+20"/>
+        <source>Failed to upload image: %s</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ScreenShare</name>
+    <message>
+        <location filename="../qml/voip/ScreenShare.qml" line="+30"/>
+        <source>Share desktop with %1?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Window:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Frame rate:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Include your camera picture-in-picture</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>Request remote camera</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location line="+9"/>
+        <source>View your callee&apos;s camera like a regular video call</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Hide mouse cursor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Share</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Preview</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>SideBarActions</name>
     <message>
-        <location filename="../../src/SideBarActions.cpp" line="+40"/>
+        <location filename="../../src/SideBarActions.cpp" line="+44"/>
         <source>User settings</source>
         <translation>Uzanta agordoj</translation>
     </message>
@@ -1119,7 +1258,7 @@ Ekzemplo: https://servisto.mia:8787</translation>
 <context>
     <name>StatusIndicator</name>
     <message>
-        <location filename="../qml/StatusIndicator.qml" line="+17"/>
+        <location filename="../qml/StatusIndicator.qml" line="+21"/>
         <source>Failed</source>
         <translation>Estas malsukcesa</translation>
     </message>
@@ -1143,7 +1282,7 @@ Ekzemplo: https://servisto.mia:8787</translation>
 <context>
     <name>Success</name>
     <message>
-        <location filename="../qml/device-verification/Success.qml" line="+6"/>
+        <location filename="../qml/device-verification/Success.qml" line="+10"/>
         <source>Successful Verification</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1161,7 +1300,7 @@ Ekzemplo: https://servisto.mia:8787</translation>
 <context>
     <name>TimelineModel</name>
     <message>
-        <location filename="../../src/timeline/TimelineModel.cpp" line="+895"/>
+        <location filename="../../src/timeline/TimelineModel.cpp" line="+911"/>
         <source>Message redaction failed: %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1313,12 +1452,12 @@ Ekzemplo: https://servisto.mia:8787</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-795"/>
+        <location line="-798"/>
         <source>You joined this room.</source>
         <translation>Vi aliĝis ĉi tiun ĉambron.</translation>
     </message>
     <message>
-        <location line="+797"/>
+        <location line="+800"/>
         <source>Rejected the knock from %1.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1342,7 +1481,7 @@ Ekzemplo: https://servisto.mia:8787</translation>
 <context>
     <name>TimelineRow</name>
     <message>
-        <location filename="../qml/TimelineRow.qml" line="+99"/>
+        <location filename="../qml/TimelineRow.qml" line="+100"/>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1370,7 +1509,7 @@ Ekzemplo: https://servisto.mia:8787</translation>
 <context>
     <name>TimelineView</name>
     <message>
-        <location filename="../qml/TimelineView.qml" line="+85"/>
+        <location filename="../qml/TimelineView.qml" line="+97"/>
         <source>React</source>
         <translation>Reagu</translation>
     </message>
@@ -1420,7 +1559,7 @@ Ekzemplo: https://servisto.mia:8787</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+61"/>
         <source>No room open</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1428,7 +1567,7 @@ Ekzemplo: https://servisto.mia:8787</translation>
 <context>
     <name>TimelineViewManager</name>
     <message>
-        <location filename="../../src/timeline/TimelineViewManager.cpp" line="+423"/>
+        <location filename="../../src/timeline/TimelineViewManager.cpp" line="+430"/>
         <source>No encrypted private chat found with this user. Create an encrypted private chat with this user and try again.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1436,7 +1575,7 @@ Ekzemplo: https://servisto.mia:8787</translation>
 <context>
     <name>TopBar</name>
     <message>
-        <location filename="../qml/TopBar.qml" line="+43"/>
+        <location filename="../qml/TopBar.qml" line="+47"/>
         <source>Back to room list</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1475,7 +1614,7 @@ Ekzemplo: https://servisto.mia:8787</translation>
 <context>
     <name>TrayIcon</name>
     <message>
-        <location filename="../../src/TrayIcon.cpp" line="+122"/>
+        <location filename="../../src/TrayIcon.cpp" line="+110"/>
         <source>Show</source>
         <translation>Montru</translation>
     </message>
@@ -1488,7 +1627,7 @@ Ekzemplo: https://servisto.mia:8787</translation>
 <context>
     <name>UserInfoWidget</name>
     <message>
-        <location filename="../../src/UserInfoWidget.cpp" line="+95"/>
+        <location filename="../../src/UserInfoWidget.cpp" line="+82"/>
         <source>Logout</source>
         <translation>Elsalutu</translation>
     </message>
@@ -1536,7 +1675,7 @@ Ekzemplo: https://servisto.mia:8787</translation>
 <context>
     <name>UserProfile</name>
     <message>
-        <location filename="../qml/UserProfile.qml" line="+133"/>
+        <location filename="../qml/UserProfile.qml" line="+137"/>
         <source>Verify</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1556,7 +1695,7 @@ Ekzemplo: https://servisto.mia:8787</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/UserProfile.cpp" line="+296"/>
+        <location filename="../../src/ui/UserProfile.cpp" line="+301"/>
         <source>Select an avatar</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1579,7 +1718,7 @@ Ekzemplo: https://servisto.mia:8787</translation>
 <context>
     <name>UserSettings</name>
     <message>
-        <location filename="../../src/UserSettingsPage.cpp" line="+345"/>
+        <location filename="../../src/UserSettingsPage.cpp" line="+337"/>
         <location filename="../../src/UserSettingsPage.h" line="+183"/>
         <source>Default</source>
         <translation type="unfinished"></translation>
@@ -1588,7 +1727,7 @@ Ekzemplo: https://servisto.mia:8787</translation>
 <context>
     <name>UserSettingsPage</name>
     <message>
-        <location line="+496"/>
+        <location line="+540"/>
         <source>Minimize to tray</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1804,7 +1943,7 @@ This usually causes the application icon in the task bar to animate in some fash
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+407"/>
+        <location line="+406"/>
         <source>CACHED</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1814,7 +1953,7 @@ This usually causes the application icon in the task bar to animate in some fash
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-461"/>
+        <location line="-460"/>
         <source>Scale factor</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1989,7 +2128,7 @@ This usually causes the application icon in the task bar to animate in some fash
         <translation type="unfinished">Ĉiuj dosieroj (*)</translation>
     </message>
     <message>
-        <location line="+237"/>
+        <location line="+236"/>
         <source>Open Sessions File</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2034,7 +2173,7 @@ This usually causes the application icon in the task bar to animate in some fash
 <context>
     <name>Waiting</name>
     <message>
-        <location filename="../qml/device-verification/Waiting.qml" line="+7"/>
+        <location filename="../qml/device-verification/Waiting.qml" line="+11"/>
         <source>Waiting for other party…</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2062,7 +2201,7 @@ This usually causes the application icon in the task bar to animate in some fash
 <context>
     <name>WelcomePage</name>
     <message>
-        <location filename="../../src/WelcomePage.cpp" line="+46"/>
+        <location filename="../../src/WelcomePage.cpp" line="+34"/>
         <source>Welcome to nheko! The desktop client for the Matrix protocol.</source>
         <translatorcomment>Should &quot;Matrico&quot; be &quot;Matrica&quot;? (I don&apos;t think so)</translatorcomment>
         <translation>Bonvenon al nheko! La labortabla kliento por la Matrico protokolo.</translation>
@@ -2086,7 +2225,7 @@ This usually causes the application icon in the task bar to animate in some fash
 <context>
     <name>descriptiveTime</name>
     <message>
-        <location filename="../../src/Utils.cpp" line="+145"/>
+        <location filename="../../src/Utils.cpp" line="+149"/>
         <source>Yesterday</source>
         <translation>HieraÅ­</translation>
     </message>
@@ -2094,7 +2233,7 @@ This usually causes the application icon in the task bar to animate in some fash
 <context>
     <name>dialogs::CreateRoom</name>
     <message>
-        <location filename="../../src/dialogs/CreateRoom.cpp" line="+36"/>
+        <location filename="../../src/dialogs/CreateRoom.cpp" line="+40"/>
         <source>Create room</source>
         <translation>Faru ĉambron</translation>
     </message>
@@ -2137,7 +2276,7 @@ This usually causes the application icon in the task bar to animate in some fash
 <context>
     <name>dialogs::FallbackAuth</name>
     <message>
-        <location filename="../../src/dialogs/FallbackAuth.cpp" line="+30"/>
+        <location filename="../../src/dialogs/FallbackAuth.cpp" line="+34"/>
         <source>Open Fallback in Browser</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2160,7 +2299,7 @@ This usually causes the application icon in the task bar to animate in some fash
 <context>
     <name>dialogs::InviteUsers</name>
     <message>
-        <location filename="../../src/dialogs/InviteUsers.cpp" line="+42"/>
+        <location filename="../../src/dialogs/InviteUsers.cpp" line="+46"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2173,7 +2312,7 @@ This usually causes the application icon in the task bar to animate in some fash
 <context>
     <name>dialogs::JoinRoom</name>
     <message>
-        <location filename="../../src/dialogs/JoinRoom.cpp" line="+30"/>
+        <location filename="../../src/dialogs/JoinRoom.cpp" line="+34"/>
         <source>Join</source>
         <translation>Aliĝu</translation>
     </message>
@@ -2191,7 +2330,7 @@ This usually causes the application icon in the task bar to animate in some fash
 <context>
     <name>dialogs::LeaveRoom</name>
     <message>
-        <location filename="../../src/dialogs/LeaveRoom.cpp" line="+31"/>
+        <location filename="../../src/dialogs/LeaveRoom.cpp" line="+35"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2204,7 +2343,7 @@ This usually causes the application icon in the task bar to animate in some fash
 <context>
     <name>dialogs::Logout</name>
     <message>
-        <location filename="../../src/dialogs/Logout.cpp" line="+47"/>
+        <location filename="../../src/dialogs/Logout.cpp" line="+35"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2217,7 +2356,7 @@ This usually causes the application icon in the task bar to animate in some fash
 <context>
     <name>dialogs::PreviewUploadOverlay</name>
     <message>
-        <location filename="../../src/dialogs/PreviewUploadOverlay.cpp" line="+41"/>
+        <location filename="../../src/dialogs/PreviewUploadOverlay.cpp" line="+29"/>
         <source>Upload</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2237,7 +2376,7 @@ Media size: %2
 <context>
     <name>dialogs::ReCaptcha</name>
     <message>
-        <location filename="../../src/dialogs/ReCaptcha.cpp" line="+31"/>
+        <location filename="../../src/dialogs/ReCaptcha.cpp" line="+35"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2255,7 +2394,7 @@ Media size: %2
 <context>
     <name>dialogs::ReadReceipts</name>
     <message>
-        <location filename="../../src/dialogs/ReadReceipts.cpp" line="+120"/>
+        <location filename="../../src/dialogs/ReadReceipts.cpp" line="+124"/>
         <source>Read receipts</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2278,139 +2417,10 @@ Media size: %2
         <translation>HieraÅ­ %1</translation>
     </message>
 </context>
-<context>
-    <name>dialogs::RoomSettings</name>
-    <message>
-        <location filename="../../src/dialogs/RoomSettings.cpp" line="+135"/>
-        <source>Settings</source>
-        <translation>Agordoj</translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Info</source>
-        <translation>Informo</translation>
-    </message>
-    <message>
-        <location line="+11"/>
-        <source>Internal ID</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>Room Version</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Notifications</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Muted</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Mentions only</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>All messages</source>
-        <translation>Ĉiuj mesaĝoj</translation>
-    </message>
-    <message>
-        <location line="+97"/>
-        <source>Room access</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Anyone and guests</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Anyone</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Invited users</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+50"/>
-        <source>Encryption</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+31"/>
-        <source>End-to-End Encryption</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Encryption is currently experimental and things might break unexpectedly. &lt;br&gt;Please take note that it can&apos;t be disabled afterwards.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-24"/>
-        <source>Respond to key requests</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Whether or not the client should respond automatically with the session keys
- upon request. Use with caution, this is a temporary measure to test the
- E2E implementation until device verification is completed.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message numerus="yes">
-        <location line="+80"/>
-        <source>%n member(s)</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
-    </message>
-    <message>
-        <location line="+142"/>
-        <source>Failed to enable encryption: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+147"/>
-        <source>Select an avatar</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>All Files (*)</source>
-        <translation>Ĉiuj dosieroj (*)</translation>
-    </message>
-    <message>
-        <location line="+12"/>
-        <source>The selected file is not an image</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Error while reading file: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+35"/>
-        <location line="+20"/>
-        <source>Failed to upload image: %s</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>message-description sent:</name>
     <message>
-        <location filename="../../src/Utils.h" line="+108"/>
+        <location filename="../../src/Utils.h" line="+112"/>
         <source>You sent an audio clip</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2523,7 +2533,7 @@ Media size: %2
 <context>
     <name>popups::UserMentions</name>
     <message>
-        <location filename="../../src/popups/UserMentions.cpp" line="+64"/>
+        <location filename="../../src/popups/UserMentions.cpp" line="+68"/>
         <source>This Room</source>
         <translation>Ĉi tiu ĉambro</translation>
     </message>
diff --git a/resources/langs/nheko_et.ts b/resources/langs/nheko_et.ts
index 7b73e0e528741a6df760aa4a247a1e7e0198b374..8bdb0b6d6804c62f97d2e179d251a0aba8585764 100644
--- a/resources/langs/nheko_et.ts
+++ b/resources/langs/nheko_et.ts
@@ -4,7 +4,7 @@
 <context>
     <name>ActiveCallBar</name>
     <message>
-        <location filename="../qml/voip/ActiveCallBar.qml" line="+66"/>
+        <location filename="../qml/voip/ActiveCallBar.qml" line="+106"/>
         <source>Calling...</source>
         <translation>Helistan...</translation>
     </message>
@@ -15,9 +15,14 @@
         <translation>Ãœhendan...</translation>
     </message>
     <message>
-        <location line="+76"/>
-        <source>Toggle camera view</source>
-        <translation>Klõpsi kaameravaade sisse või välja</translation>
+        <location line="+67"/>
+        <source>You are screen sharing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Hide/Show Picture-in-Picture</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+13"/>
@@ -33,7 +38,7 @@
 <context>
     <name>AwaitingVerificationConfirmation</name>
     <message>
-        <location filename="../qml/device-verification/AwaitingVerificationConfirmation.qml" line="+7"/>
+        <location filename="../qml/device-verification/AwaitingVerificationConfirmation.qml" line="+11"/>
         <source>Awaiting Confirmation</source>
         <translation>Ootan kinnitust</translation>
     </message>
@@ -51,7 +56,7 @@
 <context>
     <name>Cache</name>
     <message>
-        <location filename="../../src/Cache.cpp" line="+2084"/>
+        <location filename="../../src/Cache.cpp" line="+2026"/>
         <source>You joined this room.</source>
         <translation>Sa liitusid selle jututoaga.</translation>
     </message>
@@ -59,7 +64,7 @@
 <context>
     <name>CallInvite</name>
     <message>
-        <location filename="../qml/voip/CallInvite.qml" line="+66"/>
+        <location filename="../qml/voip/CallInvite.qml" line="+70"/>
         <source>Video Call</source>
         <translation>Videokõne</translation>
     </message>
@@ -77,7 +82,7 @@
 <context>
     <name>CallInviteBar</name>
     <message>
-        <location filename="../qml/voip/CallInviteBar.qml" line="+60"/>
+        <location filename="../qml/voip/CallInviteBar.qml" line="+64"/>
         <source>Video Call</source>
         <translation>Videokõne</translation>
     </message>
@@ -92,7 +97,7 @@
         <translation>Seadmed</translation>
     </message>
     <message>
-        <location line="+11"/>
+        <location line="+10"/>
         <source>Accept</source>
         <translation>Võta vastu</translation>
     </message>
@@ -117,36 +122,55 @@
         <translation>Ei suuda tuvastada mikrofoni.</translation>
     </message>
 </context>
+<context>
+    <name>CallManager</name>
+    <message>
+        <location filename="../../src/CallManager.cpp" line="+521"/>
+        <source>Entire screen</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>ChatPage</name>
     <message>
-        <location filename="../../src/ChatPage.cpp" line="+215"/>
+        <location filename="../../src/ChatPage.cpp" line="+203"/>
         <source>Failed to invite user: %1</source>
         <translation>Kutse saatmine kasutajale ei õnnestunud: %1</translation>
     </message>
     <message>
         <location line="+4"/>
-        <location line="+797"/>
+        <location line="+806"/>
         <source>Invited user: %1</source>
         <translation>Kutsutud kasutaja: %1</translation>
     </message>
     <message>
-        <location line="-500"/>
+        <location line="-510"/>
         <source>Migrating the cache to the current version failed. This can have different reasons. Please open an issue and try to use an older version in the mean time. Alternatively you can try deleting the cache manually.</source>
         <translation>Puhverdatud andmete muutmine sobivaks rakenduse praeguse versiooniga ei õnnestunud. Sellel võib olla erinevaid põhjuseid. Palun saada meile veateade ja seni kasuta vanemat rakenduse versiooni. Aga kui sa soovid proovida, siis kustuta puhverdatud andmed käsitsi.</translation>
     </message>
     <message>
-        <location line="+456"/>
+        <location line="+413"/>
+        <source>Confirm join</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Do you really want to join %1?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+44"/>
         <source>Room %1 created.</source>
         <translation>%1 jututuba on loodud.</translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+35"/>
+        <location line="+323"/>
         <source>Confirm invite</source>
         <translation>Kinnita kutse</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="-322"/>
         <source>Do you really want to invite %1 (%2)?</source>
         <translation>Kas sa tõesti soovid saata kutset kasutajale %1 (%2)?</translation>
     </message>
@@ -211,7 +235,12 @@
         <translation>Suhtluskeeld eemaldatud: %1</translation>
     </message>
     <message>
-        <location line="-582"/>
+        <location line="+226"/>
+        <source>Do you really want to start a private chat with %1?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-818"/>
         <source>Cache migration failed!</source>
         <translation>Puhvri versiooniuuendus ebaõnnestus!</translation>
     </message>
@@ -236,7 +265,7 @@
         <translation>Salvestatud andmete taastamine ei õnnestunud. Palun logi uuesti sisse.</translation>
     </message>
     <message>
-        <location line="+165"/>
+        <location line="+157"/>
         <source>Failed to setup encryption keys. Server response: %1 %2. Please try again later.</source>
         <translation>Krüptovõtmete kasutusele võtmine ei õnnestunud. Koduserveri vastus päringule: %1 %2. Palun proovi hiljem uuesti.</translation>
     </message>
@@ -247,7 +276,7 @@
         <translation>Palun proovi uuesti sisse logida: %1</translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+47"/>
         <source>Failed to join room: %1</source>
         <translation>Jututoaga liitumine ei õnnestunud: %1</translation>
     </message>
@@ -267,12 +296,12 @@
         <translation>Jututoa loomine ei õnnestunud: %1</translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+18"/>
         <source>Failed to leave room: %1</source>
         <translation>Jututoast lahkumine ei õnnestunud: %1</translation>
     </message>
     <message>
-        <location line="+54"/>
+        <location line="+61"/>
         <source>Failed to kick %1 from %2: %3</source>
         <translation>Kasutaja %1 väljamüksamine %2 jututoast ei õnnestunud: %3</translation>
     </message>
@@ -280,7 +309,7 @@
 <context>
     <name>CommunitiesListItem</name>
     <message>
-        <location filename="../../src/CommunitiesListItem.cpp" line="+26"/>
+        <location filename="../../src/CommunitiesListItem.cpp" line="+30"/>
         <source>Hide rooms with this tag or from this community</source>
         <translation>Peida sellest kogukonnast antud sildiga jututoad</translation>
     </message>
@@ -348,7 +377,7 @@
 <context>
     <name>DigitVerification</name>
     <message>
-        <location filename="../qml/device-verification/DigitVerification.qml" line="+7"/>
+        <location filename="../qml/device-verification/DigitVerification.qml" line="+11"/>
         <source>Verification Code</source>
         <translation>Verifitseerimise kood</translation>
     </message>
@@ -371,7 +400,7 @@
 <context>
     <name>EditModal</name>
     <message>
-        <location filename="../../src/dialogs/RoomSettings.cpp" line="+73"/>
+        <location filename="../../src/ui/RoomSettings.cpp" line="+42"/>
         <source>Apply</source>
         <translation>Rakenda</translation>
     </message>
@@ -394,7 +423,7 @@
 <context>
     <name>EmojiPicker</name>
     <message>
-        <location filename="../qml/emoji/EmojiPicker.qml" line="+113"/>
+        <location filename="../qml/emoji/EmojiPicker.qml" line="+117"/>
         <location line="+181"/>
         <source>Search</source>
         <translation>Otsi</translation>
@@ -443,7 +472,7 @@
 <context>
     <name>EmojiVerification</name>
     <message>
-        <location filename="../qml/device-verification/EmojiVerification.qml" line="+7"/>
+        <location filename="../qml/device-verification/EmojiVerification.qml" line="+11"/>
         <source>Verification Code</source>
         <translation>Verifitseerimise kood</translation>
     </message>
@@ -466,7 +495,7 @@
 <context>
     <name>EncryptionIndicator</name>
     <message>
-        <location filename="../qml/EncryptionIndicator.qml" line="+19"/>
+        <location filename="../qml/EncryptionIndicator.qml" line="+23"/>
         <source>Encrypted</source>
         <translation>Krüptitud</translation>
     </message>
@@ -479,7 +508,7 @@
 <context>
     <name>EventStore</name>
     <message>
-        <location filename="../../src/timeline/EventStore.cpp" line="+612"/>
+        <location filename="../../src/timeline/EventStore.cpp" line="+613"/>
         <source>-- Encrypted Event (No keys found for decryption) --</source>
         <comment>Placeholder, when the message was not decrypted yet or can&apos;t be decrypted.</comment>
         <translation>-- Krüptitud sündmus (Dekrüptimisvõtmeid ei leidunud) --</translation>
@@ -524,7 +553,7 @@
 <context>
     <name>Failed</name>
     <message>
-        <location filename="../qml/device-verification/Failed.qml" line="+7"/>
+        <location filename="../qml/device-verification/Failed.qml" line="+11"/>
         <source>Verification failed</source>
         <translation>Verifitseerimine ei õnnestunud</translation>
     </message>
@@ -558,7 +587,7 @@
 <context>
     <name>InputBar</name>
     <message>
-        <location filename="../../src/timeline/InputBar.cpp" line="+227"/>
+        <location filename="../../src/timeline/InputBar.cpp" line="+253"/>
         <source>Select a file</source>
         <translation>Vali fail</translation>
     </message>
@@ -568,7 +597,7 @@
         <translation>Kõik failid (*)</translation>
     </message>
     <message>
-        <location line="+384"/>
+        <location line="+371"/>
         <source>Failed to upload media. Please try again.</source>
         <translation>Meediafailide üleslaadimine ei õnnestunud. Palun proovi uuesti.</translation>
     </message>
@@ -576,7 +605,7 @@
 <context>
     <name>InviteeItem</name>
     <message>
-        <location filename="../../src/InviteeItem.cpp" line="+18"/>
+        <location filename="../../src/InviteeItem.cpp" line="+22"/>
         <source>Remove</source>
         <translation>Eemalda</translation>
     </message>
@@ -584,7 +613,7 @@
 <context>
     <name>LoginPage</name>
     <message>
-        <location filename="../../src/LoginPage.cpp" line="+92"/>
+        <location filename="../../src/LoginPage.cpp" line="+80"/>
         <source>Matrix ID</source>
         <translation>Matrix&apos;i kasutajatunnus</translation>
     </message>
@@ -643,20 +672,19 @@ Näiteks: https://server.minu:8787</translation>
     </message>
     <message>
         <location line="+19"/>
-        <location line="+218"/>
         <source>LOGIN</source>
         <translation>LOGI SISSE</translation>
     </message>
     <message>
-        <location line="-151"/>
+        <location line="+84"/>
         <location line="+11"/>
-        <location line="+157"/>
+        <location line="+156"/>
         <location line="+11"/>
         <source>You have entered an invalid Matrix ID  e.g @joe:matrix.org</source>
         <translation>Sisestatud Matrix&apos;i kasutajatunnus on vigane - peaks olema @kasutaja:server.tld</translation>
     </message>
     <message>
-        <location line="-132"/>
+        <location line="-131"/>
         <source>Autodiscovery failed. Received malformed response.</source>
         <translation>Koduserveri automaatne tuvastamine ei õnnestunud: päringuvastus oli vigane.</translation>
     </message>
@@ -681,12 +709,12 @@ Näiteks: https://server.minu:8787</translation>
         <translation>Tekkis teadmata viga. Palun kontrolli, et koduserveri domeen on õige.</translation>
     </message>
     <message>
-        <location line="+59"/>
+        <location line="-168"/>
         <source>SSO LOGIN</source>
         <translation>ÃœHEKORDNE SISSELOGIMINE</translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+263"/>
         <source>Empty password</source>
         <translation>Tühi salasõna</translation>
     </message>
@@ -699,7 +727,7 @@ Näiteks: https://server.minu:8787</translation>
 <context>
     <name>MemberList</name>
     <message>
-        <location filename="../../src/dialogs/MemberList.cpp" line="+90"/>
+        <location filename="../../src/dialogs/MemberList.cpp" line="+94"/>
         <source>Room members</source>
         <translation>Jututoa liikmed</translation>
     </message>
@@ -712,7 +740,7 @@ Näiteks: https://server.minu:8787</translation>
 <context>
     <name>MessageDelegate</name>
     <message>
-        <location filename="../qml/delegates/MessageDelegate.qml" line="+123"/>
+        <location filename="../qml/delegates/MessageDelegate.qml" line="+127"/>
         <source>Encryption enabled</source>
         <translation>Krüptimine on kasutusel</translation>
     </message>
@@ -781,7 +809,7 @@ Näiteks: https://server.minu:8787</translation>
 <context>
     <name>MessageInput</name>
     <message>
-        <location filename="../qml/MessageInput.qml" line="+38"/>
+        <location filename="../qml/MessageInput.qml" line="+42"/>
         <source>Hang up</source>
         <translation>Lõpeta kõne</translation>
     </message>
@@ -791,22 +819,22 @@ Näiteks: https://server.minu:8787</translation>
         <translation>Helista</translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+25"/>
         <source>Send a file</source>
         <translation>Saada fail</translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+42"/>
         <source>Write a message...</source>
         <translation>Kirjuta sõnum…</translation>
     </message>
     <message>
-        <location line="+186"/>
+        <location line="+211"/>
         <source>Emoji</source>
         <translation>Emoji</translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+16"/>
         <source>Send</source>
         <translation>Saada</translation>
     </message>
@@ -814,7 +842,7 @@ Näiteks: https://server.minu:8787</translation>
 <context>
     <name>NewVerificationRequest</name>
     <message>
-        <location filename="../qml/device-verification/NewVerificationRequest.qml" line="+7"/>
+        <location filename="../qml/device-verification/NewVerificationRequest.qml" line="+11"/>
         <source>Send Verification Request</source>
         <translation>Saada verifitseerimispäring</translation>
     </message>
@@ -872,7 +900,7 @@ Näiteks: https://server.minu:8787</translation>
 <context>
     <name>PlaceCall</name>
     <message>
-        <location filename="../qml/voip/PlaceCall.qml" line="+36"/>
+        <location filename="../qml/voip/PlaceCall.qml" line="+48"/>
         <source>Place a call to %1?</source>
         <translation>Kas helistame kasutajale %1?</translation>
     </message>
@@ -892,7 +920,12 @@ Näiteks: https://server.minu:8787</translation>
         <translation>Videokõne</translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location line="+14"/>
+        <source>Screen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
         <source>Cancel</source>
         <translation>Katkesta</translation>
     </message>
@@ -900,7 +933,7 @@ Näiteks: https://server.minu:8787</translation>
 <context>
     <name>Placeholder</name>
     <message>
-        <location filename="../qml/delegates/Placeholder.qml" line="+4"/>
+        <location filename="../qml/delegates/Placeholder.qml" line="+8"/>
         <source>unimplemented event: </source>
         <translation>implementeerimata sündmus: </translation>
     </message>
@@ -908,7 +941,7 @@ Näiteks: https://server.minu:8787</translation>
 <context>
     <name>QCoreApplication</name>
     <message>
-        <location filename="../../src/main.cpp" line="+179"/>
+        <location filename="../../src/main.cpp" line="+167"/>
         <source>Create a unique profile, which allows you to log into several accounts at the same time and start multiple instances of nheko.</source>
         <translation>Loo unikaalne profiil, mis võimaldab sul logida samaaegselt sisse erinevatele kasutajakontodele ning käivitada mitu Nheko programmiakent.</translation>
     </message>
@@ -926,7 +959,7 @@ Näiteks: https://server.minu:8787</translation>
 <context>
     <name>QuickSwitcher</name>
     <message>
-        <location filename="../../src/QuickSwitcher.cpp" line="+74"/>
+        <location filename="../../src/QuickSwitcher.cpp" line="+62"/>
         <source>Search for a room...</source>
         <translation>Otsi jututuba…</translation>
     </message>
@@ -934,18 +967,18 @@ Näiteks: https://server.minu:8787</translation>
 <context>
     <name>RegisterPage</name>
     <message>
-        <location filename="../../src/RegisterPage.cpp" line="+89"/>
+        <location filename="../../src/RegisterPage.cpp" line="+77"/>
         <source>Username</source>
         <translation>Kasutajanimi</translation>
     </message>
     <message>
         <location line="+2"/>
-        <location line="+286"/>
+        <location line="+287"/>
         <source>The username must not be empty, and must contain only the characters a-z, 0-9, ., _, =, -, and /.</source>
         <translation>Kasutajanimi ei tohi olla tühi ning võib sisaldada vaid a-z, 0-9, ., _, =, -, / tähemärke.</translation>
     </message>
     <message>
-        <location line="-282"/>
+        <location line="-283"/>
         <source>Password</source>
         <translation>Salasõna</translation>
     </message>
@@ -980,7 +1013,7 @@ Näiteks: https://server.minu:8787</translation>
         <translation>Selline registreerimise töövoog pole toetatud!</translation>
     </message>
     <message>
-        <location line="+209"/>
+        <location line="+210"/>
         <source>One or more fields have invalid inputs. Please correct those issues and try again.</source>
         <translation>Ühel või enamal andmeväljal on vigane väärtus. Palun paranda vead ja proovi uuesti.</translation>
     </message>
@@ -1003,7 +1036,7 @@ Näiteks: https://server.minu:8787</translation>
 <context>
     <name>ReplyPopup</name>
     <message>
-        <location filename="../qml/ReplyPopup.qml" line="+45"/>
+        <location filename="../qml/ReplyPopup.qml" line="+49"/>
         <source>Close</source>
         <translation>Sulge</translation>
     </message>
@@ -1016,7 +1049,7 @@ Näiteks: https://server.minu:8787</translation>
 <context>
     <name>RoomInfo</name>
     <message>
-        <location filename="../../src/Cache.cpp" line="+1861"/>
+        <location filename="../../src/Cache.cpp" line="+1793"/>
         <source>no version stored</source>
         <translation>salvestatud versiooni ei leidu</translation>
     </message>
@@ -1024,7 +1057,7 @@ Näiteks: https://server.minu:8787</translation>
 <context>
     <name>RoomInfoListItem</name>
     <message>
-        <location filename="../../src/RoomInfoListItem.cpp" line="+102"/>
+        <location filename="../../src/RoomInfoListItem.cpp" line="+90"/>
         <source>Leave room</source>
         <translation>Lahku jututoast</translation>
     </message>
@@ -1086,10 +1119,116 @@ Näiteks: https://server.minu:8787</translation>
         <translation>Ei nõustu</translation>
     </message>
 </context>
+<context>
+    <name>RoomSettings</name>
+    <message>
+        <location filename="../qml/RoomSettings.qml" line="+204"/>
+        <source>End-to-End Encryption</source>
+        <translation type="unfinished">Läbiv krüptimine</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Encryption is currently experimental and things might break unexpectedly. &lt;br&gt;
+                            Please take note that it can&apos;t be disabled afterwards.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>Whether or not the client should respond automatically with the session keys
+                                upon request. Use with caution, this is a temporary measure to test the
+                                E2E implementation until device verification is completed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/ui/RoomSettings.cpp" line="+267"/>
+        <source>Failed to enable encryption: %1</source>
+        <translation type="unfinished">Krüptimise kasutuselevõtmine ei õnnestunud: %1</translation>
+    </message>
+    <message>
+        <location line="+228"/>
+        <source>Select an avatar</source>
+        <translation type="unfinished">Vali tunnuspilt</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>All Files (*)</source>
+        <translation type="unfinished">Kõik failid (*)</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>The selected file is not an image</source>
+        <translation type="unfinished">Valitud fail ei ole pildifail</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Error while reading file: %1</source>
+        <translation type="unfinished">Viga faili lugemisel: %1</translation>
+    </message>
+    <message>
+        <location line="+34"/>
+        <location line="+20"/>
+        <source>Failed to upload image: %s</source>
+        <translation type="unfinished">Viga faili üleslaadimisel: %1</translation>
+    </message>
+</context>
+<context>
+    <name>ScreenShare</name>
+    <message>
+        <location filename="../qml/voip/ScreenShare.qml" line="+30"/>
+        <source>Share desktop with %1?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Window:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Frame rate:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Include your camera picture-in-picture</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>Request remote camera</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location line="+9"/>
+        <source>View your callee&apos;s camera like a regular video call</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Hide mouse cursor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Share</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Preview</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>SideBarActions</name>
     <message>
-        <location filename="../../src/SideBarActions.cpp" line="+40"/>
+        <location filename="../../src/SideBarActions.cpp" line="+44"/>
         <source>User settings</source>
         <translation>Kasutaja seadistused</translation>
     </message>
@@ -1117,7 +1256,7 @@ Näiteks: https://server.minu:8787</translation>
 <context>
     <name>StatusIndicator</name>
     <message>
-        <location filename="../qml/StatusIndicator.qml" line="+17"/>
+        <location filename="../qml/StatusIndicator.qml" line="+21"/>
         <source>Failed</source>
         <translation>Ebaõnnestus</translation>
     </message>
@@ -1140,7 +1279,7 @@ Näiteks: https://server.minu:8787</translation>
 <context>
     <name>Success</name>
     <message>
-        <location filename="../qml/device-verification/Success.qml" line="+6"/>
+        <location filename="../qml/device-verification/Success.qml" line="+10"/>
         <source>Successful Verification</source>
         <translation>Verifitseerimine õnnestus</translation>
     </message>
@@ -1158,7 +1297,7 @@ Näiteks: https://server.minu:8787</translation>
 <context>
     <name>TimelineModel</name>
     <message>
-        <location filename="../../src/timeline/TimelineModel.cpp" line="+895"/>
+        <location filename="../../src/timeline/TimelineModel.cpp" line="+911"/>
         <source>Message redaction failed: %1</source>
         <translation>Sõnumi ümbersõnastamine ebaõnnestus: %1</translation>
     </message>
@@ -1308,12 +1447,12 @@ Näiteks: https://server.minu:8787</translation>
         <translation>%1 muutis oma koputust jututoa uksele.</translation>
     </message>
     <message>
-        <location line="-795"/>
+        <location line="-798"/>
         <source>You joined this room.</source>
         <translation>Sa liitusid jututoaga.</translation>
     </message>
     <message>
-        <location line="+797"/>
+        <location line="+800"/>
         <source>Rejected the knock from %1.</source>
         <translation>Lükkas tagasi %1 koputuse jututoa uksele.</translation>
     </message>
@@ -1337,7 +1476,7 @@ Näiteks: https://server.minu:8787</translation>
 <context>
     <name>TimelineRow</name>
     <message>
-        <location filename="../qml/TimelineRow.qml" line="+99"/>
+        <location filename="../qml/TimelineRow.qml" line="+100"/>
         <source>Edit</source>
         <translation>Muuda</translation>
     </message>
@@ -1365,7 +1504,7 @@ Näiteks: https://server.minu:8787</translation>
 <context>
     <name>TimelineView</name>
     <message>
-        <location filename="../qml/TimelineView.qml" line="+85"/>
+        <location filename="../qml/TimelineView.qml" line="+97"/>
         <source>React</source>
         <translation>Reageeri</translation>
     </message>
@@ -1415,7 +1554,7 @@ Näiteks: https://server.minu:8787</translation>
         <translation>Ava välise rakendusega</translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+61"/>
         <source>No room open</source>
         <translation>Ãœhtegi jututuba pole avatud</translation>
     </message>
@@ -1423,7 +1562,7 @@ Näiteks: https://server.minu:8787</translation>
 <context>
     <name>TimelineViewManager</name>
     <message>
-        <location filename="../../src/timeline/TimelineViewManager.cpp" line="+423"/>
+        <location filename="../../src/timeline/TimelineViewManager.cpp" line="+430"/>
         <source>No encrypted private chat found with this user. Create an encrypted private chat with this user and try again.</source>
         <translation>Ühtegi krüptitud vestlust selle kasutajaga ei leidunud. Palun loo temaga krüptitud vestlus ja proovi uuesti.</translation>
     </message>
@@ -1431,7 +1570,7 @@ Näiteks: https://server.minu:8787</translation>
 <context>
     <name>TopBar</name>
     <message>
-        <location filename="../qml/TopBar.qml" line="+43"/>
+        <location filename="../qml/TopBar.qml" line="+47"/>
         <source>Back to room list</source>
         <translation>Tagasi jututubade loendisse</translation>
     </message>
@@ -1470,7 +1609,7 @@ Näiteks: https://server.minu:8787</translation>
 <context>
     <name>TrayIcon</name>
     <message>
-        <location filename="../../src/TrayIcon.cpp" line="+122"/>
+        <location filename="../../src/TrayIcon.cpp" line="+110"/>
         <source>Show</source>
         <translation>Näita</translation>
     </message>
@@ -1483,7 +1622,7 @@ Näiteks: https://server.minu:8787</translation>
 <context>
     <name>UserInfoWidget</name>
     <message>
-        <location filename="../../src/UserInfoWidget.cpp" line="+95"/>
+        <location filename="../../src/UserInfoWidget.cpp" line="+82"/>
         <source>Logout</source>
         <translation>Logi välja</translation>
     </message>
@@ -1531,7 +1670,7 @@ Näiteks: https://server.minu:8787</translation>
 <context>
     <name>UserProfile</name>
     <message>
-        <location filename="../qml/UserProfile.qml" line="+133"/>
+        <location filename="../qml/UserProfile.qml" line="+137"/>
         <source>Verify</source>
         <translation>Verifitseeri</translation>
     </message>
@@ -1551,7 +1690,7 @@ Näiteks: https://server.minu:8787</translation>
         <translation>Müksa kasutaja välja</translation>
     </message>
     <message>
-        <location filename="../../src/ui/UserProfile.cpp" line="+296"/>
+        <location filename="../../src/ui/UserProfile.cpp" line="+301"/>
         <source>Select an avatar</source>
         <translation>Vali tunnuspilt</translation>
     </message>
@@ -1574,7 +1713,7 @@ Näiteks: https://server.minu:8787</translation>
 <context>
     <name>UserSettings</name>
     <message>
-        <location filename="../../src/UserSettingsPage.cpp" line="+345"/>
+        <location filename="../../src/UserSettingsPage.cpp" line="+337"/>
         <location filename="../../src/UserSettingsPage.h" line="+183"/>
         <source>Default</source>
         <translation>Vaikimisi</translation>
@@ -1583,7 +1722,7 @@ Näiteks: https://server.minu:8787</translation>
 <context>
     <name>UserSettingsPage</name>
     <message>
-        <location line="+496"/>
+        <location line="+540"/>
         <source>Minimize to tray</source>
         <translation>Vähenda tegumiribale</translation>
     </message>
@@ -1810,7 +1949,7 @@ See tavaliselt tähendab, et rakenduse ikoon tegumiribal annab mingit sorti anim
         <translation>Jaga võtmeid verifitseeritud kasutajate ja seadmetega</translation>
     </message>
     <message>
-        <location line="+407"/>
+        <location line="+406"/>
         <source>CACHED</source>
         <translation>PUHVERDATUD</translation>
     </message>
@@ -1820,7 +1959,7 @@ See tavaliselt tähendab, et rakenduse ikoon tegumiribal annab mingit sorti anim
         <translation>PUHVERDAMATA</translation>
     </message>
     <message>
-        <location line="-461"/>
+        <location line="-460"/>
         <source>Scale factor</source>
         <translation>Mastaabitegur</translation>
     </message>
@@ -1995,7 +2134,7 @@ See tavaliselt tähendab, et rakenduse ikoon tegumiribal annab mingit sorti anim
         <translation>Kõik failid (*)</translation>
     </message>
     <message>
-        <location line="+237"/>
+        <location line="+236"/>
         <source>Open Sessions File</source>
         <translation>Ava sessioonide fail</translation>
     </message>
@@ -2040,7 +2179,7 @@ See tavaliselt tähendab, et rakenduse ikoon tegumiribal annab mingit sorti anim
 <context>
     <name>Waiting</name>
     <message>
-        <location filename="../qml/device-verification/Waiting.qml" line="+7"/>
+        <location filename="../qml/device-verification/Waiting.qml" line="+11"/>
         <source>Waiting for other party…</source>
         <translation>Ootan teise osapoole tegevust…</translation>
     </message>
@@ -2068,7 +2207,7 @@ See tavaliselt tähendab, et rakenduse ikoon tegumiribal annab mingit sorti anim
 <context>
     <name>WelcomePage</name>
     <message>
-        <location filename="../../src/WelcomePage.cpp" line="+46"/>
+        <location filename="../../src/WelcomePage.cpp" line="+34"/>
         <source>Welcome to nheko! The desktop client for the Matrix protocol.</source>
         <translation>Tere tulemast nheko kasutajaks! Töölauarakendus Matrix&apos;i protokolli jaoks.</translation>
     </message>
@@ -2091,7 +2230,7 @@ See tavaliselt tähendab, et rakenduse ikoon tegumiribal annab mingit sorti anim
 <context>
     <name>descriptiveTime</name>
     <message>
-        <location filename="../../src/Utils.cpp" line="+145"/>
+        <location filename="../../src/Utils.cpp" line="+149"/>
         <source>Yesterday</source>
         <translation>Eile</translation>
     </message>
@@ -2099,7 +2238,7 @@ See tavaliselt tähendab, et rakenduse ikoon tegumiribal annab mingit sorti anim
 <context>
     <name>dialogs::CreateRoom</name>
     <message>
-        <location filename="../../src/dialogs/CreateRoom.cpp" line="+36"/>
+        <location filename="../../src/dialogs/CreateRoom.cpp" line="+40"/>
         <source>Create room</source>
         <translation>Loo jututuba</translation>
     </message>
@@ -2142,7 +2281,7 @@ See tavaliselt tähendab, et rakenduse ikoon tegumiribal annab mingit sorti anim
 <context>
     <name>dialogs::FallbackAuth</name>
     <message>
-        <location filename="../../src/dialogs/FallbackAuth.cpp" line="+30"/>
+        <location filename="../../src/dialogs/FallbackAuth.cpp" line="+34"/>
         <source>Open Fallback in Browser</source>
         <translation>Ava kasutaja registreerimise tagavaravariant veebibrauseris</translation>
     </message>
@@ -2165,7 +2304,7 @@ See tavaliselt tähendab, et rakenduse ikoon tegumiribal annab mingit sorti anim
 <context>
     <name>dialogs::InviteUsers</name>
     <message>
-        <location filename="../../src/dialogs/InviteUsers.cpp" line="+42"/>
+        <location filename="../../src/dialogs/InviteUsers.cpp" line="+46"/>
         <source>Cancel</source>
         <translation>Tühista</translation>
     </message>
@@ -2178,7 +2317,7 @@ See tavaliselt tähendab, et rakenduse ikoon tegumiribal annab mingit sorti anim
 <context>
     <name>dialogs::JoinRoom</name>
     <message>
-        <location filename="../../src/dialogs/JoinRoom.cpp" line="+30"/>
+        <location filename="../../src/dialogs/JoinRoom.cpp" line="+34"/>
         <source>Join</source>
         <translation>Liitu</translation>
     </message>
@@ -2196,7 +2335,7 @@ See tavaliselt tähendab, et rakenduse ikoon tegumiribal annab mingit sorti anim
 <context>
     <name>dialogs::LeaveRoom</name>
     <message>
-        <location filename="../../src/dialogs/LeaveRoom.cpp" line="+31"/>
+        <location filename="../../src/dialogs/LeaveRoom.cpp" line="+35"/>
         <source>Cancel</source>
         <translation>Tühista</translation>
     </message>
@@ -2209,7 +2348,7 @@ See tavaliselt tähendab, et rakenduse ikoon tegumiribal annab mingit sorti anim
 <context>
     <name>dialogs::Logout</name>
     <message>
-        <location filename="../../src/dialogs/Logout.cpp" line="+47"/>
+        <location filename="../../src/dialogs/Logout.cpp" line="+35"/>
         <source>Cancel</source>
         <translation>Tühista</translation>
     </message>
@@ -2222,7 +2361,7 @@ See tavaliselt tähendab, et rakenduse ikoon tegumiribal annab mingit sorti anim
 <context>
     <name>dialogs::PreviewUploadOverlay</name>
     <message>
-        <location filename="../../src/dialogs/PreviewUploadOverlay.cpp" line="+41"/>
+        <location filename="../../src/dialogs/PreviewUploadOverlay.cpp" line="+29"/>
         <source>Upload</source>
         <translation>Laadi üles</translation>
     </message>
@@ -2244,7 +2383,7 @@ Meedia suurus: %2
 <context>
     <name>dialogs::ReCaptcha</name>
     <message>
-        <location filename="../../src/dialogs/ReCaptcha.cpp" line="+31"/>
+        <location filename="../../src/dialogs/ReCaptcha.cpp" line="+35"/>
         <source>Cancel</source>
         <translation>Tühista</translation>
     </message>
@@ -2262,7 +2401,7 @@ Meedia suurus: %2
 <context>
     <name>dialogs::ReadReceipts</name>
     <message>
-        <location filename="../../src/dialogs/ReadReceipts.cpp" line="+120"/>
+        <location filename="../../src/dialogs/ReadReceipts.cpp" line="+124"/>
         <source>Read receipts</source>
         <translation>Lugemisteatised</translation>
     </message>
@@ -2285,139 +2424,10 @@ Meedia suurus: %2
         <translation>Eile %1</translation>
     </message>
 </context>
-<context>
-    <name>dialogs::RoomSettings</name>
-    <message>
-        <location filename="../../src/dialogs/RoomSettings.cpp" line="+135"/>
-        <source>Settings</source>
-        <translation>Seadistused</translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Info</source>
-        <translation>Teave</translation>
-    </message>
-    <message>
-        <location line="+11"/>
-        <source>Internal ID</source>
-        <translation>Sisemine tunnus</translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>Room Version</source>
-        <translation>Jututoa versioon</translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Notifications</source>
-        <translation>Teavitused</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Muted</source>
-        <translation>Summutatud</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Mentions only</source>
-        <translation>Vaid mainimised</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>All messages</source>
-        <translation>Kõik sõnumid</translation>
-    </message>
-    <message>
-        <location line="+97"/>
-        <source>Room access</source>
-        <translation>Ligipääs jututuppa</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Anyone and guests</source>
-        <translation>Kõik (sealhulgas külalised)</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Anyone</source>
-        <translation>Kõik, kes teavad jututoa aadressi (aga mitte külalised)</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Invited users</source>
-        <translation>Kutsutud kasutajad</translation>
-    </message>
-    <message>
-        <location line="+50"/>
-        <source>Encryption</source>
-        <translation>Krüptimine</translation>
-    </message>
-    <message>
-        <location line="+31"/>
-        <source>End-to-End Encryption</source>
-        <translation>Läbiv krüptimine</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Encryption is currently experimental and things might break unexpectedly. &lt;br&gt;Please take note that it can&apos;t be disabled afterwards.</source>
-        <translation>Krüptimine on nhekos hetkel veel katseline ning nii mõndagi võib ootamatult katki minna. &lt;br&gt;Palun arvesta, et krüptimist ei saa hiljem enam välja lülitada.</translation>
-    </message>
-    <message>
-        <location line="-24"/>
-        <source>Respond to key requests</source>
-        <translation>Vasta krüptovõtmete päringutele</translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Whether or not the client should respond automatically with the session keys
- upon request. Use with caution, this is a temporary measure to test the
- E2E implementation until device verification is completed.</source>
-        <translation>Kas klient peaks automaatselt vastama või mitte vastama sessioonivõtmete päringule. Kasuta seda võimalust ettevaatlikult. Tegemist on ajutise lahendusega läbiva krüptimise testimiseks seni, kuni terviklik seadmete verifitseerimine on implementeeritud.</translation>
-    </message>
-    <message numerus="yes">
-        <location line="+80"/>
-        <source>%n member(s)</source>
-        <translation>
-            <numerusform>%n kasutaja</numerusform>
-            <numerusform>%n kasutajat</numerusform>
-        </translation>
-    </message>
-    <message>
-        <location line="+142"/>
-        <source>Failed to enable encryption: %1</source>
-        <translation>Krüptimise kasutuselevõtmine ei õnnestunud: %1</translation>
-    </message>
-    <message>
-        <location line="+147"/>
-        <source>Select an avatar</source>
-        <translation>Vali tunnuspilt</translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>All Files (*)</source>
-        <translation>Kõik failid (*)</translation>
-    </message>
-    <message>
-        <location line="+12"/>
-        <source>The selected file is not an image</source>
-        <translation>Valitud fail ei ole pildifail</translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Error while reading file: %1</source>
-        <translation>Viga faili lugemisel: %1</translation>
-    </message>
-    <message>
-        <location line="+35"/>
-        <location line="+20"/>
-        <source>Failed to upload image: %s</source>
-        <translation>Viga faili üleslaadimisel: %1</translation>
-    </message>
-</context>
 <context>
     <name>message-description sent:</name>
     <message>
-        <location filename="../../src/Utils.h" line="+108"/>
+        <location filename="../../src/Utils.h" line="+112"/>
         <source>You sent an audio clip</source>
         <translation>Sa saatsid helifaili</translation>
     </message>
@@ -2530,7 +2540,7 @@ Meedia suurus: %2
 <context>
     <name>popups::UserMentions</name>
     <message>
-        <location filename="../../src/popups/UserMentions.cpp" line="+64"/>
+        <location filename="../../src/popups/UserMentions.cpp" line="+68"/>
         <source>This Room</source>
         <translation>See jututuba</translation>
     </message>
diff --git a/resources/langs/nheko_fi.ts b/resources/langs/nheko_fi.ts
index 4dbe14caf9df25b5a652130e08eaec8ca5962213..cb1b2244d00d6172e9b6808a61a87999527ce351 100644
--- a/resources/langs/nheko_fi.ts
+++ b/resources/langs/nheko_fi.ts
@@ -4,7 +4,7 @@
 <context>
     <name>ActiveCallBar</name>
     <message>
-        <location filename="../qml/voip/ActiveCallBar.qml" line="+66"/>
+        <location filename="../qml/voip/ActiveCallBar.qml" line="+106"/>
         <source>Calling...</source>
         <translation>Soitetaan...</translation>
     </message>
@@ -15,8 +15,13 @@
         <translation>Yhdistetään...</translation>
     </message>
     <message>
-        <location line="+76"/>
-        <source>Toggle camera view</source>
+        <location line="+67"/>
+        <source>You are screen sharing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Hide/Show Picture-in-Picture</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -33,7 +38,7 @@
 <context>
     <name>AwaitingVerificationConfirmation</name>
     <message>
-        <location filename="../qml/device-verification/AwaitingVerificationConfirmation.qml" line="+7"/>
+        <location filename="../qml/device-verification/AwaitingVerificationConfirmation.qml" line="+11"/>
         <source>Awaiting Confirmation</source>
         <translation>Odotetaan vahvistusta</translation>
     </message>
@@ -51,7 +56,7 @@
 <context>
     <name>Cache</name>
     <message>
-        <location filename="../../src/Cache.cpp" line="+2084"/>
+        <location filename="../../src/Cache.cpp" line="+2026"/>
         <source>You joined this room.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -59,7 +64,7 @@
 <context>
     <name>CallInvite</name>
     <message>
-        <location filename="../qml/voip/CallInvite.qml" line="+66"/>
+        <location filename="../qml/voip/CallInvite.qml" line="+70"/>
         <source>Video Call</source>
         <translation type="unfinished"></translation>
     </message>
@@ -77,7 +82,7 @@
 <context>
     <name>CallInviteBar</name>
     <message>
-        <location filename="../qml/voip/CallInviteBar.qml" line="+60"/>
+        <location filename="../qml/voip/CallInviteBar.qml" line="+64"/>
         <source>Video Call</source>
         <translation type="unfinished"></translation>
     </message>
@@ -92,7 +97,7 @@
         <translation>Laitteet</translation>
     </message>
     <message>
-        <location line="+11"/>
+        <location line="+10"/>
         <source>Accept</source>
         <translation>Hyväksy</translation>
     </message>
@@ -117,36 +122,55 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>CallManager</name>
+    <message>
+        <location filename="../../src/CallManager.cpp" line="+521"/>
+        <source>Entire screen</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>ChatPage</name>
     <message>
-        <location filename="../../src/ChatPage.cpp" line="+215"/>
+        <location filename="../../src/ChatPage.cpp" line="+203"/>
         <source>Failed to invite user: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+4"/>
-        <location line="+797"/>
+        <location line="+806"/>
         <source>Invited user: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-500"/>
+        <location line="-510"/>
         <source>Migrating the cache to the current version failed. This can have different reasons. Please open an issue and try to use an older version in the mean time. Alternatively you can try deleting the cache manually.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+456"/>
+        <location line="+413"/>
+        <source>Confirm join</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Do you really want to join %1?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+44"/>
         <source>Room %1 created.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+35"/>
+        <location line="+323"/>
         <source>Confirm invite</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="-322"/>
         <source>Do you really want to invite %1 (%2)?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -211,7 +235,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-582"/>
+        <location line="+226"/>
+        <source>Do you really want to start a private chat with %1?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-818"/>
         <source>Cache migration failed!</source>
         <translation type="unfinished"></translation>
     </message>
@@ -236,7 +265,7 @@
         <translation>Tallennettujen tietojen palauttaminen epäonnistui. Ole hyvä ja kirjaudu sisään uudelleen.</translation>
     </message>
     <message>
-        <location line="+165"/>
+        <location line="+157"/>
         <source>Failed to setup encryption keys. Server response: %1 %2. Please try again later.</source>
         <translation>Salausavainten lähetys epäonnistui. Palvelimen vastaus: %1 %2. Ole hyvä ja yritä uudelleen myöhemmin.</translation>
     </message>
@@ -247,7 +276,7 @@
         <translation>Ole hyvä ja yritä kirjautua sisään uudelleen: %1</translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+47"/>
         <source>Failed to join room: %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -267,12 +296,12 @@
         <translation>Huoneen luominen epäonnistui: %1</translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+18"/>
         <source>Failed to leave room: %1</source>
         <translation>Huoneesta poistuminen epäonnistui: %1</translation>
     </message>
     <message>
-        <location line="+54"/>
+        <location line="+61"/>
         <source>Failed to kick %1 from %2: %3</source>
         <translation type="unfinished"></translation>
     </message>
@@ -280,7 +309,7 @@
 <context>
     <name>CommunitiesListItem</name>
     <message>
-        <location filename="../../src/CommunitiesListItem.cpp" line="+26"/>
+        <location filename="../../src/CommunitiesListItem.cpp" line="+30"/>
         <source>Hide rooms with this tag or from this community</source>
         <translation type="unfinished"></translation>
     </message>
@@ -348,7 +377,7 @@
 <context>
     <name>DigitVerification</name>
     <message>
-        <location filename="../qml/device-verification/DigitVerification.qml" line="+7"/>
+        <location filename="../qml/device-verification/DigitVerification.qml" line="+11"/>
         <source>Verification Code</source>
         <translation type="unfinished"></translation>
     </message>
@@ -371,7 +400,7 @@
 <context>
     <name>EditModal</name>
     <message>
-        <location filename="../../src/dialogs/RoomSettings.cpp" line="+73"/>
+        <location filename="../../src/ui/RoomSettings.cpp" line="+42"/>
         <source>Apply</source>
         <translation>Tallenna</translation>
     </message>
@@ -394,7 +423,7 @@
 <context>
     <name>EmojiPicker</name>
     <message>
-        <location filename="../qml/emoji/EmojiPicker.qml" line="+113"/>
+        <location filename="../qml/emoji/EmojiPicker.qml" line="+117"/>
         <location line="+181"/>
         <source>Search</source>
         <translation type="unfinished"></translation>
@@ -443,7 +472,7 @@
 <context>
     <name>EmojiVerification</name>
     <message>
-        <location filename="../qml/device-verification/EmojiVerification.qml" line="+7"/>
+        <location filename="../qml/device-verification/EmojiVerification.qml" line="+11"/>
         <source>Verification Code</source>
         <translation type="unfinished"></translation>
     </message>
@@ -466,7 +495,7 @@
 <context>
     <name>EncryptionIndicator</name>
     <message>
-        <location filename="../qml/EncryptionIndicator.qml" line="+19"/>
+        <location filename="../qml/EncryptionIndicator.qml" line="+23"/>
         <source>Encrypted</source>
         <translation type="unfinished"></translation>
     </message>
@@ -479,7 +508,7 @@
 <context>
     <name>EventStore</name>
     <message>
-        <location filename="../../src/timeline/EventStore.cpp" line="+612"/>
+        <location filename="../../src/timeline/EventStore.cpp" line="+613"/>
         <source>-- Encrypted Event (No keys found for decryption) --</source>
         <comment>Placeholder, when the message was not decrypted yet or can&apos;t be decrypted.</comment>
         <translation>-- Salattu viesti (salauksen purkuavaimia ei löydetty) --</translation>
@@ -524,7 +553,7 @@
 <context>
     <name>Failed</name>
     <message>
-        <location filename="../qml/device-verification/Failed.qml" line="+7"/>
+        <location filename="../qml/device-verification/Failed.qml" line="+11"/>
         <source>Verification failed</source>
         <translation type="unfinished"></translation>
     </message>
@@ -558,7 +587,7 @@
 <context>
     <name>InputBar</name>
     <message>
-        <location filename="../../src/timeline/InputBar.cpp" line="+227"/>
+        <location filename="../../src/timeline/InputBar.cpp" line="+253"/>
         <source>Select a file</source>
         <translation>Valitse tiedosto</translation>
     </message>
@@ -568,7 +597,7 @@
         <translation>Kaikki Tiedostot (*)</translation>
     </message>
     <message>
-        <location line="+384"/>
+        <location line="+371"/>
         <source>Failed to upload media. Please try again.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -576,7 +605,7 @@
 <context>
     <name>InviteeItem</name>
     <message>
-        <location filename="../../src/InviteeItem.cpp" line="+18"/>
+        <location filename="../../src/InviteeItem.cpp" line="+22"/>
         <source>Remove</source>
         <translation>Poista</translation>
     </message>
@@ -584,7 +613,7 @@
 <context>
     <name>LoginPage</name>
     <message>
-        <location filename="../../src/LoginPage.cpp" line="+92"/>
+        <location filename="../../src/LoginPage.cpp" line="+80"/>
         <source>Matrix ID</source>
         <translation>Matrix-tunnus</translation>
     </message>
@@ -639,20 +668,19 @@ Example: https://server.my:8787</source>
     </message>
     <message>
         <location line="+19"/>
-        <location line="+218"/>
         <source>LOGIN</source>
         <translation>KIRJAUDU</translation>
     </message>
     <message>
-        <location line="-151"/>
+        <location line="+84"/>
         <location line="+11"/>
-        <location line="+157"/>
+        <location line="+156"/>
         <location line="+11"/>
         <source>You have entered an invalid Matrix ID  e.g @joe:matrix.org</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-132"/>
+        <location line="-131"/>
         <source>Autodiscovery failed. Received malformed response.</source>
         <translation>Palvelimen tietojen hakeminen epäonnistui: virheellinen vastaus.</translation>
     </message>
@@ -677,12 +705,12 @@ Example: https://server.my:8787</source>
         <translation>Tapahtui tuntematon virhe. Varmista, että kotipalvelimen osoite on pätevä.</translation>
     </message>
     <message>
-        <location line="+59"/>
+        <location line="-168"/>
         <source>SSO LOGIN</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+263"/>
         <source>Empty password</source>
         <translation>Tyhjä salasana</translation>
     </message>
@@ -695,7 +723,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>MemberList</name>
     <message>
-        <location filename="../../src/dialogs/MemberList.cpp" line="+90"/>
+        <location filename="../../src/dialogs/MemberList.cpp" line="+94"/>
         <source>Room members</source>
         <translation>Huoneen jäsenet</translation>
     </message>
@@ -708,7 +736,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>MessageDelegate</name>
     <message>
-        <location filename="../qml/delegates/MessageDelegate.qml" line="+105"/>
+        <location filename="../qml/delegates/MessageDelegate.qml" line="+109"/>
         <location line="+9"/>
         <source>removed</source>
         <translation type="unfinished"></translation>
@@ -777,7 +805,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>MessageInput</name>
     <message>
-        <location filename="../qml/MessageInput.qml" line="+38"/>
+        <location filename="../qml/MessageInput.qml" line="+42"/>
         <source>Hang up</source>
         <translation type="unfinished"></translation>
     </message>
@@ -787,22 +815,22 @@ Example: https://server.my:8787</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+25"/>
         <source>Send a file</source>
         <translation>Lähetä tiedosto</translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+42"/>
         <source>Write a message...</source>
         <translation>Kirjoita viesti…</translation>
     </message>
     <message>
-        <location line="+186"/>
+        <location line="+211"/>
         <source>Emoji</source>
         <translation>Emoji</translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+16"/>
         <source>Send</source>
         <translation type="unfinished"></translation>
     </message>
@@ -810,7 +838,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>NewVerificationRequest</name>
     <message>
-        <location filename="../qml/device-verification/NewVerificationRequest.qml" line="+7"/>
+        <location filename="../qml/device-verification/NewVerificationRequest.qml" line="+11"/>
         <source>Send Verification Request</source>
         <translation type="unfinished"></translation>
     </message>
@@ -868,7 +896,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>PlaceCall</name>
     <message>
-        <location filename="../qml/voip/PlaceCall.qml" line="+36"/>
+        <location filename="../qml/voip/PlaceCall.qml" line="+48"/>
         <source>Place a call to %1?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -888,7 +916,12 @@ Example: https://server.my:8787</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location line="+14"/>
+        <source>Screen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
         <source>Cancel</source>
         <translation>Peruuta</translation>
     </message>
@@ -896,7 +929,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>Placeholder</name>
     <message>
-        <location filename="../qml/delegates/Placeholder.qml" line="+4"/>
+        <location filename="../qml/delegates/Placeholder.qml" line="+8"/>
         <source>unimplemented event: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -904,7 +937,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>QCoreApplication</name>
     <message>
-        <location filename="../../src/main.cpp" line="+179"/>
+        <location filename="../../src/main.cpp" line="+167"/>
         <source>Create a unique profile, which allows you to log into several accounts at the same time and start multiple instances of nheko.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -922,7 +955,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>QuickSwitcher</name>
     <message>
-        <location filename="../../src/QuickSwitcher.cpp" line="+74"/>
+        <location filename="../../src/QuickSwitcher.cpp" line="+62"/>
         <source>Search for a room...</source>
         <translation>Etsi huonetta…</translation>
     </message>
@@ -930,18 +963,18 @@ Example: https://server.my:8787</source>
 <context>
     <name>RegisterPage</name>
     <message>
-        <location filename="../../src/RegisterPage.cpp" line="+89"/>
+        <location filename="../../src/RegisterPage.cpp" line="+77"/>
         <source>Username</source>
         <translation>Käyttäjänimi</translation>
     </message>
     <message>
         <location line="+2"/>
-        <location line="+286"/>
+        <location line="+287"/>
         <source>The username must not be empty, and must contain only the characters a-z, 0-9, ., _, =, -, and /.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-282"/>
+        <location line="-283"/>
         <source>Password</source>
         <translation>Salasana</translation>
     </message>
@@ -976,7 +1009,7 @@ Example: https://server.my:8787</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+209"/>
+        <location line="+210"/>
         <source>One or more fields have invalid inputs. Please correct those issues and try again.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -999,7 +1032,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>ReplyPopup</name>
     <message>
-        <location filename="../qml/ReplyPopup.qml" line="+45"/>
+        <location filename="../qml/ReplyPopup.qml" line="+49"/>
         <source>Close</source>
         <translation>Sulje</translation>
     </message>
@@ -1012,7 +1045,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>RoomInfo</name>
     <message>
-        <location filename="../../src/Cache.cpp" line="+1861"/>
+        <location filename="../../src/Cache.cpp" line="+1793"/>
         <source>no version stored</source>
         <translation>ei tallennettua versiota</translation>
     </message>
@@ -1020,7 +1053,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>RoomInfoListItem</name>
     <message>
-        <location filename="../../src/RoomInfoListItem.cpp" line="+102"/>
+        <location filename="../../src/RoomInfoListItem.cpp" line="+90"/>
         <source>Leave room</source>
         <translation>Poistu huoneesta</translation>
     </message>
@@ -1082,10 +1115,116 @@ Example: https://server.my:8787</source>
         <translation>Hylkää</translation>
     </message>
 </context>
+<context>
+    <name>RoomSettings</name>
+    <message>
+        <location filename="../qml/RoomSettings.qml" line="+204"/>
+        <source>End-to-End Encryption</source>
+        <translation type="unfinished">Päästä-päähän-salaus</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Encryption is currently experimental and things might break unexpectedly. &lt;br&gt;
+                            Please take note that it can&apos;t be disabled afterwards.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>Whether or not the client should respond automatically with the session keys
+                                upon request. Use with caution, this is a temporary measure to test the
+                                E2E implementation until device verification is completed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/ui/RoomSettings.cpp" line="+267"/>
+        <source>Failed to enable encryption: %1</source>
+        <translation type="unfinished">Salauksen aktivointi epäonnistui: %1</translation>
+    </message>
+    <message>
+        <location line="+228"/>
+        <source>Select an avatar</source>
+        <translation type="unfinished">Valitse profiilikuva</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>All Files (*)</source>
+        <translation type="unfinished">Kaikki Tiedostot (*)</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>The selected file is not an image</source>
+        <translation type="unfinished">Valittu tiedosto ei ole kuva</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Error while reading file: %1</source>
+        <translation type="unfinished">Virhe lukiessa tiedostoa: %1</translation>
+    </message>
+    <message>
+        <location line="+34"/>
+        <location line="+20"/>
+        <source>Failed to upload image: %s</source>
+        <translation type="unfinished">Kuvan lähetys epäonnistui: %s</translation>
+    </message>
+</context>
+<context>
+    <name>ScreenShare</name>
+    <message>
+        <location filename="../qml/voip/ScreenShare.qml" line="+30"/>
+        <source>Share desktop with %1?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Window:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Frame rate:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Include your camera picture-in-picture</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>Request remote camera</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location line="+9"/>
+        <source>View your callee&apos;s camera like a regular video call</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Hide mouse cursor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Share</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Preview</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Peruuta</translation>
+    </message>
+</context>
 <context>
     <name>SideBarActions</name>
     <message>
-        <location filename="../../src/SideBarActions.cpp" line="+40"/>
+        <location filename="../../src/SideBarActions.cpp" line="+44"/>
         <source>User settings</source>
         <translation>Käyttäjäasetukset</translation>
     </message>
@@ -1113,7 +1252,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>StatusIndicator</name>
     <message>
-        <location filename="../qml/StatusIndicator.qml" line="+17"/>
+        <location filename="../qml/StatusIndicator.qml" line="+21"/>
         <source>Failed</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1136,7 +1275,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>Success</name>
     <message>
-        <location filename="../qml/device-verification/Success.qml" line="+6"/>
+        <location filename="../qml/device-verification/Success.qml" line="+10"/>
         <source>Successful Verification</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1154,7 +1293,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>TimelineModel</name>
     <message>
-        <location filename="../../src/timeline/TimelineModel.cpp" line="+895"/>
+        <location filename="../../src/timeline/TimelineModel.cpp" line="+911"/>
         <source>Message redaction failed: %1</source>
         <translation>Viestin muokkaus epäonnistui: %1</translation>
     </message>
@@ -1304,12 +1443,12 @@ Example: https://server.my:8787</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-795"/>
+        <location line="-798"/>
         <source>You joined this room.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+797"/>
+        <location line="+800"/>
         <source>Rejected the knock from %1.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1333,7 +1472,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>TimelineRow</name>
     <message>
-        <location filename="../qml/TimelineRow.qml" line="+99"/>
+        <location filename="../qml/TimelineRow.qml" line="+100"/>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1361,7 +1500,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>TimelineView</name>
     <message>
-        <location filename="../qml/TimelineView.qml" line="+85"/>
+        <location filename="../qml/TimelineView.qml" line="+97"/>
         <source>React</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1411,7 +1550,7 @@ Example: https://server.my:8787</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+61"/>
         <source>No room open</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1419,7 +1558,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>TimelineViewManager</name>
     <message>
-        <location filename="../../src/timeline/TimelineViewManager.cpp" line="+423"/>
+        <location filename="../../src/timeline/TimelineViewManager.cpp" line="+430"/>
         <source>No encrypted private chat found with this user. Create an encrypted private chat with this user and try again.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1427,7 +1566,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>TopBar</name>
     <message>
-        <location filename="../qml/TopBar.qml" line="+43"/>
+        <location filename="../qml/TopBar.qml" line="+47"/>
         <source>Back to room list</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1466,7 +1605,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>TrayIcon</name>
     <message>
-        <location filename="../../src/TrayIcon.cpp" line="+122"/>
+        <location filename="../../src/TrayIcon.cpp" line="+110"/>
         <source>Show</source>
         <translation>Näytä</translation>
     </message>
@@ -1479,7 +1618,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>UserInfoWidget</name>
     <message>
-        <location filename="../../src/UserInfoWidget.cpp" line="+95"/>
+        <location filename="../../src/UserInfoWidget.cpp" line="+82"/>
         <source>Logout</source>
         <translation>Kirjaudu ulos</translation>
     </message>
@@ -1527,7 +1666,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>UserProfile</name>
     <message>
-        <location filename="../qml/UserProfile.qml" line="+133"/>
+        <location filename="../qml/UserProfile.qml" line="+137"/>
         <source>Verify</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1547,7 +1686,7 @@ Example: https://server.my:8787</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/UserProfile.cpp" line="+296"/>
+        <location filename="../../src/ui/UserProfile.cpp" line="+301"/>
         <source>Select an avatar</source>
         <translation>Valitse profiilikuva</translation>
     </message>
@@ -1570,7 +1709,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>UserSettings</name>
     <message>
-        <location filename="../../src/UserSettingsPage.cpp" line="+345"/>
+        <location filename="../../src/UserSettingsPage.cpp" line="+337"/>
         <location filename="../../src/UserSettingsPage.h" line="+183"/>
         <source>Default</source>
         <translation type="unfinished"></translation>
@@ -1579,7 +1718,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>UserSettingsPage</name>
     <message>
-        <location line="+496"/>
+        <location line="+540"/>
         <source>Minimize to tray</source>
         <translation>Pienennä ilmoitusalueelle</translation>
     </message>
@@ -1795,7 +1934,7 @@ This usually causes the application icon in the task bar to animate in some fash
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+407"/>
+        <location line="+406"/>
         <source>CACHED</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1805,7 +1944,7 @@ This usually causes the application icon in the task bar to animate in some fash
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-461"/>
+        <location line="-460"/>
         <source>Scale factor</source>
         <translation>Mittakerroin</translation>
     </message>
@@ -1980,7 +2119,7 @@ This usually causes the application icon in the task bar to animate in some fash
         <translation>Kaikki Tiedostot (*)</translation>
     </message>
     <message>
-        <location line="+237"/>
+        <location line="+236"/>
         <source>Open Sessions File</source>
         <translation>Avaa Istuntoavaintiedosto</translation>
     </message>
@@ -2025,7 +2164,7 @@ This usually causes the application icon in the task bar to animate in some fash
 <context>
     <name>Waiting</name>
     <message>
-        <location filename="../qml/device-verification/Waiting.qml" line="+7"/>
+        <location filename="../qml/device-verification/Waiting.qml" line="+11"/>
         <source>Waiting for other party…</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2053,7 +2192,7 @@ This usually causes the application icon in the task bar to animate in some fash
 <context>
     <name>WelcomePage</name>
     <message>
-        <location filename="../../src/WelcomePage.cpp" line="+46"/>
+        <location filename="../../src/WelcomePage.cpp" line="+34"/>
         <source>Welcome to nheko! The desktop client for the Matrix protocol.</source>
         <translation>Tervetuloa nhekoon! Työpöytäsovellus Matrix-protokollalle.</translation>
     </message>
@@ -2076,7 +2215,7 @@ This usually causes the application icon in the task bar to animate in some fash
 <context>
     <name>descriptiveTime</name>
     <message>
-        <location filename="../../src/Utils.cpp" line="+145"/>
+        <location filename="../../src/Utils.cpp" line="+149"/>
         <source>Yesterday</source>
         <translation>Eilen</translation>
     </message>
@@ -2084,7 +2223,7 @@ This usually causes the application icon in the task bar to animate in some fash
 <context>
     <name>dialogs::CreateRoom</name>
     <message>
-        <location filename="../../src/dialogs/CreateRoom.cpp" line="+36"/>
+        <location filename="../../src/dialogs/CreateRoom.cpp" line="+40"/>
         <source>Create room</source>
         <translation>Luo huone</translation>
     </message>
@@ -2127,7 +2266,7 @@ This usually causes the application icon in the task bar to animate in some fash
 <context>
     <name>dialogs::FallbackAuth</name>
     <message>
-        <location filename="../../src/dialogs/FallbackAuth.cpp" line="+30"/>
+        <location filename="../../src/dialogs/FallbackAuth.cpp" line="+34"/>
         <source>Open Fallback in Browser</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2150,7 +2289,7 @@ This usually causes the application icon in the task bar to animate in some fash
 <context>
     <name>dialogs::InviteUsers</name>
     <message>
-        <location filename="../../src/dialogs/InviteUsers.cpp" line="+42"/>
+        <location filename="../../src/dialogs/InviteUsers.cpp" line="+46"/>
         <source>Cancel</source>
         <translation>Peruuta</translation>
     </message>
@@ -2163,7 +2302,7 @@ This usually causes the application icon in the task bar to animate in some fash
 <context>
     <name>dialogs::JoinRoom</name>
     <message>
-        <location filename="../../src/dialogs/JoinRoom.cpp" line="+30"/>
+        <location filename="../../src/dialogs/JoinRoom.cpp" line="+34"/>
         <source>Join</source>
         <translation>Liity</translation>
     </message>
@@ -2181,7 +2320,7 @@ This usually causes the application icon in the task bar to animate in some fash
 <context>
     <name>dialogs::LeaveRoom</name>
     <message>
-        <location filename="../../src/dialogs/LeaveRoom.cpp" line="+31"/>
+        <location filename="../../src/dialogs/LeaveRoom.cpp" line="+35"/>
         <source>Cancel</source>
         <translation>Peruuta</translation>
     </message>
@@ -2194,7 +2333,7 @@ This usually causes the application icon in the task bar to animate in some fash
 <context>
     <name>dialogs::Logout</name>
     <message>
-        <location filename="../../src/dialogs/Logout.cpp" line="+47"/>
+        <location filename="../../src/dialogs/Logout.cpp" line="+35"/>
         <source>Cancel</source>
         <translation>Peruuta</translation>
     </message>
@@ -2207,7 +2346,7 @@ This usually causes the application icon in the task bar to animate in some fash
 <context>
     <name>dialogs::PreviewUploadOverlay</name>
     <message>
-        <location filename="../../src/dialogs/PreviewUploadOverlay.cpp" line="+41"/>
+        <location filename="../../src/dialogs/PreviewUploadOverlay.cpp" line="+29"/>
         <source>Upload</source>
         <translation>Lähetä</translation>
     </message>
@@ -2229,7 +2368,7 @@ Median koko: %2
 <context>
     <name>dialogs::ReCaptcha</name>
     <message>
-        <location filename="../../src/dialogs/ReCaptcha.cpp" line="+31"/>
+        <location filename="../../src/dialogs/ReCaptcha.cpp" line="+35"/>
         <source>Cancel</source>
         <translation>Peruuta</translation>
     </message>
@@ -2247,7 +2386,7 @@ Median koko: %2
 <context>
     <name>dialogs::ReadReceipts</name>
     <message>
-        <location filename="../../src/dialogs/ReadReceipts.cpp" line="+120"/>
+        <location filename="../../src/dialogs/ReadReceipts.cpp" line="+124"/>
         <source>Read receipts</source>
         <translation>Lukukuittaukset</translation>
     </message>
@@ -2270,139 +2409,10 @@ Median koko: %2
         <translation>Eilen %1</translation>
     </message>
 </context>
-<context>
-    <name>dialogs::RoomSettings</name>
-    <message>
-        <location filename="../../src/dialogs/RoomSettings.cpp" line="+135"/>
-        <source>Settings</source>
-        <translation>Asetukset</translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Info</source>
-        <translation>Tiedot</translation>
-    </message>
-    <message>
-        <location line="+11"/>
-        <source>Internal ID</source>
-        <translation>Sisäinen tunnus</translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>Room Version</source>
-        <translation>Huoneen versio</translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Notifications</source>
-        <translation>Ilmoitukset</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Muted</source>
-        <translation>Vaimennettu</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Mentions only</source>
-        <translation>Vain maininnat</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>All messages</source>
-        <translation>Kaikki viestit</translation>
-    </message>
-    <message>
-        <location line="+97"/>
-        <source>Room access</source>
-        <translation>Pääsy huoneeseen</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Anyone and guests</source>
-        <translation>Kaikki (mukaanlukien vieraat)</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Anyone</source>
-        <translation>Kaikki (poislukien vieraat)</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Invited users</source>
-        <translation>Kutsutut käyttäjät</translation>
-    </message>
-    <message>
-        <location line="+50"/>
-        <source>Encryption</source>
-        <translation>Salaus</translation>
-    </message>
-    <message>
-        <location line="+31"/>
-        <source>End-to-End Encryption</source>
-        <translation>Päästä-päähän-salaus</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Encryption is currently experimental and things might break unexpectedly. &lt;br&gt;Please take note that it can&apos;t be disabled afterwards.</source>
-        <translation>Salaus on tällä hetkellä kokeellinen ja asiat saattavat mennä rikki odottamattomasti.&lt;br&gt;Huomaa, ettei sitä voi poistaa käytöstä jälkikäteen.</translation>
-    </message>
-    <message>
-        <location line="-24"/>
-        <source>Respond to key requests</source>
-        <translation>Vastaa avainpyyntöihin</translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Whether or not the client should respond automatically with the session keys
- upon request. Use with caution, this is a temporary measure to test the
- E2E implementation until device verification is completed.</source>
-        <translation>Pitäisikö asiakasohjelman palauttaa salausavaimet automaattisesti pyydettäessä. Käytä varoen, tämä on väliaikainen vaihtoehto salausjärjestelmän testausta varten, kunnes laitteiden vahvistus on valmis.</translation>
-    </message>
-    <message numerus="yes">
-        <location line="+80"/>
-        <source>%n member(s)</source>
-        <translation>
-            <numerusform>%n käyttäjä</numerusform>
-            <numerusform>%n käyttäjää</numerusform>
-        </translation>
-    </message>
-    <message>
-        <location line="+142"/>
-        <source>Failed to enable encryption: %1</source>
-        <translation>Salauksen aktivointi epäonnistui: %1</translation>
-    </message>
-    <message>
-        <location line="+147"/>
-        <source>Select an avatar</source>
-        <translation>Valitse profiilikuva</translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>All Files (*)</source>
-        <translation>Kaikki Tiedostot (*)</translation>
-    </message>
-    <message>
-        <location line="+12"/>
-        <source>The selected file is not an image</source>
-        <translation>Valittu tiedosto ei ole kuva</translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Error while reading file: %1</source>
-        <translation>Virhe lukiessa tiedostoa: %1</translation>
-    </message>
-    <message>
-        <location line="+35"/>
-        <location line="+20"/>
-        <source>Failed to upload image: %s</source>
-        <translation>Kuvan lähetys epäonnistui: %s</translation>
-    </message>
-</context>
 <context>
     <name>message-description sent:</name>
     <message>
-        <location filename="../../src/Utils.h" line="+108"/>
+        <location filename="../../src/Utils.h" line="+112"/>
         <source>You sent an audio clip</source>
         <translation>Lähetit äänileikkeen</translation>
     </message>
@@ -2515,7 +2525,7 @@ Median koko: %2
 <context>
     <name>popups::UserMentions</name>
     <message>
-        <location filename="../../src/popups/UserMentions.cpp" line="+64"/>
+        <location filename="../../src/popups/UserMentions.cpp" line="+68"/>
         <source>This Room</source>
         <translation>Tämä huone</translation>
     </message>
diff --git a/resources/langs/nheko_fr.ts b/resources/langs/nheko_fr.ts
index ab544f7c86c2959cafb55043635674cf8b7a55e5..b6027342aed2dfc0312d40c03a7137d8ec504a6e 100644
--- a/resources/langs/nheko_fr.ts
+++ b/resources/langs/nheko_fr.ts
@@ -4,7 +4,7 @@
 <context>
     <name>ActiveCallBar</name>
     <message>
-        <location filename="../qml/voip/ActiveCallBar.qml" line="+66"/>
+        <location filename="../qml/voip/ActiveCallBar.qml" line="+106"/>
         <source>Calling...</source>
         <translation>Appel en cours…</translation>
     </message>
@@ -15,9 +15,14 @@
         <translation>Connexion en cours…</translation>
     </message>
     <message>
-        <location line="+76"/>
-        <source>Toggle camera view</source>
-        <translation>Afficher/masquer la caméra</translation>
+        <location line="+67"/>
+        <source>You are screen sharing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Hide/Show Picture-in-Picture</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+13"/>
@@ -33,7 +38,7 @@
 <context>
     <name>AwaitingVerificationConfirmation</name>
     <message>
-        <location filename="../qml/device-verification/AwaitingVerificationConfirmation.qml" line="+7"/>
+        <location filename="../qml/device-verification/AwaitingVerificationConfirmation.qml" line="+11"/>
         <source>Awaiting Confirmation</source>
         <translation>Attente de confirmation</translation>
     </message>
@@ -51,7 +56,7 @@
 <context>
     <name>Cache</name>
     <message>
-        <location filename="../../src/Cache.cpp" line="+2084"/>
+        <location filename="../../src/Cache.cpp" line="+2026"/>
         <source>You joined this room.</source>
         <translation>Vous avez rejoint ce salon.</translation>
     </message>
@@ -59,7 +64,7 @@
 <context>
     <name>CallInvite</name>
     <message>
-        <location filename="../qml/voip/CallInvite.qml" line="+66"/>
+        <location filename="../qml/voip/CallInvite.qml" line="+70"/>
         <source>Video Call</source>
         <translation>Appel vidéo</translation>
     </message>
@@ -77,7 +82,7 @@
 <context>
     <name>CallInviteBar</name>
     <message>
-        <location filename="../qml/voip/CallInviteBar.qml" line="+60"/>
+        <location filename="../qml/voip/CallInviteBar.qml" line="+64"/>
         <source>Video Call</source>
         <translation>Appel vidéo</translation>
     </message>
@@ -92,19 +97,19 @@
         <translation type="unfinished">Appareils</translation>
     </message>
     <message>
-        <location line="+11"/>
+        <location line="+10"/>
         <source>Accept</source>
         <translation type="unfinished">Décrocher</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>Unknown microphone: %1</source>
-        <translation>Microphone inconnu  : %1</translation>
+        <translation>Microphone inconnu&#xa0;&#xa0;: %1</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Unknown camera: %1</source>
-        <translation>Caméra inconnue  : %1</translation>
+        <translation>Caméra inconnue&#xa0;&#xa0;: %1</translation>
     </message>
     <message>
         <location line="+13"/>
@@ -117,43 +122,62 @@
         <translation>Pas de microphone trouvé.</translation>
     </message>
 </context>
+<context>
+    <name>CallManager</name>
+    <message>
+        <location filename="../../src/CallManager.cpp" line="+521"/>
+        <source>Entire screen</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>ChatPage</name>
     <message>
-        <location filename="../../src/ChatPage.cpp" line="+215"/>
+        <location filename="../../src/ChatPage.cpp" line="+203"/>
         <source>Failed to invite user: %1</source>
         <translation>Échec lors de l&apos;invitation de %1</translation>
     </message>
     <message>
         <location line="+4"/>
-        <location line="+797"/>
+        <location line="+806"/>
         <source>Invited user: %1</source>
         <translation>%1 a été invité(e)</translation>
     </message>
     <message>
-        <location line="-500"/>
+        <location line="-510"/>
         <source>Migrating the cache to the current version failed. This can have different reasons. Please open an issue and try to use an older version in the mean time. Alternatively you can try deleting the cache manually.</source>
         <translation>La migration du cache vers la version actuelle a échoué. Cela peut arriver pour différentes raisons. Signalez le problème et essayez d&apos;utiliser une ancienne version en attendant. Vous pouvez également supprimer le cache manuellement.</translation>
     </message>
     <message>
-        <location line="+456"/>
+        <location line="+413"/>
+        <source>Confirm join</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Do you really want to join %1?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+44"/>
         <source>Room %1 created.</source>
         <translation>Salon %1 créé.</translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+35"/>
+        <location line="+323"/>
         <source>Confirm invite</source>
         <translation>Confirmer l&apos;invitation</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="-322"/>
         <source>Do you really want to invite %1 (%2)?</source>
-        <translation>Voulez-vous vraiment inviter %1 (%2) ?</translation>
+        <translation>Voulez-vous vraiment inviter %1 (%2)&#x202f;?</translation>
     </message>
     <message>
         <location line="+11"/>
         <source>Failed to invite %1 to %2: %3</source>
-        <translation>Échec de l&apos;invitation de %1 dans %2 : %3</translation>
+        <translation>Échec de l&apos;invitation de %1 dans %2&#xa0;: %3</translation>
     </message>
     <message>
         <location line="+15"/>
@@ -163,7 +187,7 @@
     <message>
         <location line="+1"/>
         <source>Do you really want to kick %1 (%2)?</source>
-        <translation>Voulez-vous vraiment expulser %1 (%2) ?</translation>
+        <translation>Voulez-vous vraiment expulser %1 (%2)&#x202f;?</translation>
     </message>
     <message>
         <location line="+16"/>
@@ -178,7 +202,7 @@
     <message>
         <location line="+1"/>
         <source>Do you really want to ban %1 (%2)?</source>
-        <translation>Voulez-vous vraiment bannir %1 (%2) ?</translation>
+        <translation>Voulez-vous vraiment bannir %1 (%2)&#x202f;?</translation>
     </message>
     <message>
         <location line="+11"/>
@@ -198,12 +222,12 @@
     <message>
         <location line="+1"/>
         <source>Do you really want to unban %1 (%2)?</source>
-        <translation>Voulez-vous vraiment annuler le bannissement de %1 (%2) ?</translation>
+        <translation>Voulez-vous vraiment annuler le bannissement de %1 (%2)&#x202f;?</translation>
     </message>
     <message>
         <location line="+11"/>
         <source>Failed to unban %1 in %2: %3</source>
-        <translation>Échec de l&apos;annulation du bannissement de %1 dans %2 : %3</translation>
+        <translation>Échec de l&apos;annulation du bannissement de %1 dans %2&#xa0;: %3</translation>
     </message>
     <message>
         <location line="+5"/>
@@ -211,9 +235,14 @@
         <translation>%1 n&apos;est plus banni(e)</translation>
     </message>
     <message>
-        <location line="-582"/>
+        <location line="+226"/>
+        <source>Do you really want to start a private chat with %1?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-818"/>
         <source>Cache migration failed!</source>
-        <translation>Échec de la migration du cache !</translation>
+        <translation>Échec de la migration du cache&#x202f;!</translation>
     </message>
     <message>
         <location line="+13"/>
@@ -236,20 +265,20 @@
         <translation>Échec de la restauration des données sauvegardées. Veuillez vous reconnecter.</translation>
     </message>
     <message>
-        <location line="+165"/>
+        <location line="+157"/>
         <source>Failed to setup encryption keys. Server response: %1 %2. Please try again later.</source>
-        <translation>Échec de la configuration des clés de chiffrement. Réponse du serveur : %1 %2. Veuillez réessayer plus tard.</translation>
+        <translation>Échec de la configuration des clés de chiffrement. Réponse du serveur&#xa0;: %1 %2. Veuillez réessayer plus tard.</translation>
     </message>
     <message>
         <location line="+34"/>
         <location line="+116"/>
         <source>Please try to login again: %1</source>
-        <translation>Veuillez vous reconnecter : %1</translation>
+        <translation>Veuillez vous reconnecter&#xa0;: %1</translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+47"/>
         <source>Failed to join room: %1</source>
-        <translation>Impossible de rejoindre le salon : %1</translation>
+        <translation>Impossible de rejoindre le salon&#xa0;: %1</translation>
     </message>
     <message>
         <location line="+5"/>
@@ -259,28 +288,28 @@
     <message>
         <location line="+6"/>
         <source>Failed to remove invite: %1</source>
-        <translation>Impossible de supprimer l&apos;invitation : %1</translation>
+        <translation>Impossible de supprimer l&apos;invitation&#x202f;: %1</translation>
     </message>
     <message>
         <location line="+21"/>
         <source>Room creation failed: %1</source>
-        <translation>Échec de la création du salon : %1</translation>
+        <translation>Échec de la création du salon&#xa0;: %1</translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+18"/>
         <source>Failed to leave room: %1</source>
-        <translation>Impossible de quitter le salon : %1</translation>
+        <translation>Impossible de quitter le salon&#xa0;: %1</translation>
     </message>
     <message>
-        <location line="+54"/>
+        <location line="+61"/>
         <source>Failed to kick %1 from %2: %3</source>
-        <translation>Échec de l&apos;expulsion de %1 depuis %2  : %3</translation>
+        <translation>Échec de l&apos;expulsion de %1 depuis %2&#x202f;&#x202f;: %3</translation>
     </message>
 </context>
 <context>
     <name>CommunitiesListItem</name>
     <message>
-        <location filename="../../src/CommunitiesListItem.cpp" line="+26"/>
+        <location filename="../../src/CommunitiesListItem.cpp" line="+30"/>
         <source>Hide rooms with this tag or from this community</source>
         <translation>Cacher les salons portant cette étiquette ou appartenant à cette communauté</translation>
     </message>
@@ -327,12 +356,12 @@
     <message>
         <location line="+2"/>
         <source>Enter your recovery key or passphrase to decrypt your secrets:</source>
-        <translation type="unfinished">Entrez votre clé de récupération ou phrase de passe pour déchiffrer vos secrets  :</translation>
+        <translation type="unfinished">Entrez votre clé de récupération ou phrase de passe pour déchiffrer vos secrets&#xa0;&#xa0;:</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Enter your recovery key or passphrase called %1 to decrypt your secrets:</source>
-        <translation type="unfinished">Entrez votre clé de récupération ou votre phrase de passe nommée %1 pour déchiffrer vos secrets  :</translation>
+        <translation type="unfinished">Entrez votre clé de récupération ou votre phrase de passe nommée %1 pour déchiffrer vos secrets&#xa0;&#xa0;:</translation>
     </message>
     <message>
         <location line="+17"/>
@@ -348,30 +377,30 @@
 <context>
     <name>DigitVerification</name>
     <message>
-        <location filename="../qml/device-verification/DigitVerification.qml" line="+7"/>
+        <location filename="../qml/device-verification/DigitVerification.qml" line="+11"/>
         <source>Verification Code</source>
         <translation>Code de vérification</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Please verify the following digits. You should see the same numbers on both sides. If they differ, please press &apos;They do not match!&apos; to abort verification!</source>
-        <translation>Veuillez vérifier les chiffres suivants. Vous devriez voir les mêmes chiffres des deux côtés. Si ceux-ci diffèrent, veuillez choisir « Ils sont différents ! » pour annuler la vérification !</translation>
+        <translation>Veuillez vérifier les chiffres suivants. Vous devriez voir les mêmes chiffres des deux côtés. Si ceux-ci diffèrent, veuillez choisir «&#x202f;Ils sont différents&#x202f;!&#x202f;» pour annuler la vérification&#x202f;!</translation>
     </message>
     <message>
         <location line="+31"/>
         <source>They do not match!</source>
-        <translation>Ils sont différents !</translation>
+        <translation>Ils sont différents&#x202f;!</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>They match!</source>
-        <translation>Ils sont identiques !</translation>
+        <translation>Ils sont identiques&#x202f;!</translation>
     </message>
 </context>
 <context>
     <name>EditModal</name>
     <message>
-        <location filename="../../src/dialogs/RoomSettings.cpp" line="+73"/>
+        <location filename="../../src/ui/RoomSettings.cpp" line="+42"/>
         <source>Apply</source>
         <translation>Appliquer</translation>
     </message>
@@ -394,7 +423,7 @@
 <context>
     <name>EmojiPicker</name>
     <message>
-        <location filename="../qml/emoji/EmojiPicker.qml" line="+113"/>
+        <location filename="../qml/emoji/EmojiPicker.qml" line="+117"/>
         <location line="+181"/>
         <source>Search</source>
         <translation>Chercher</translation>
@@ -443,43 +472,43 @@
 <context>
     <name>EmojiVerification</name>
     <message>
-        <location filename="../qml/device-verification/EmojiVerification.qml" line="+7"/>
+        <location filename="../qml/device-verification/EmojiVerification.qml" line="+11"/>
         <source>Verification Code</source>
         <translation>Code de vérification</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Please verify the following emoji. You should see the same emoji on both sides. If they differ, please press &apos;They do not match!&apos; to abort verification!</source>
-        <translation>Veuillez vérifier les émoji suivantes. Vous devriez voir les mêmes émoji des deux côtés. Si celles-ci diffèrent, veuillez choisir « Elles sont différentes ! » pour annuler la vérification !</translation>
+        <translation>Veuillez vérifier les émoji suivantes. Vous devriez voir les mêmes émoji des deux côtés. Si celles-ci diffèrent, veuillez choisir «&#x202f;Elles sont différentes&#x202f;!&#x202f;» pour annuler la vérification&#x202f;!</translation>
     </message>
     <message>
         <location line="+376"/>
         <source>They do not match!</source>
-        <translation>Elles sont différentes !</translation>
+        <translation>Elles sont différentes&#x202f;!</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>They match!</source>
-        <translation>Elles sont identiques !</translation>
+        <translation>Elles sont identiques&#x202f;!</translation>
     </message>
 </context>
 <context>
     <name>EncryptionIndicator</name>
     <message>
-        <location filename="../qml/EncryptionIndicator.qml" line="+19"/>
+        <location filename="../qml/EncryptionIndicator.qml" line="+23"/>
         <source>Encrypted</source>
         <translation>Chiffré</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>This message is not encrypted!</source>
-        <translation>Ce message n&apos;est pas chiffré !</translation>
+        <translation>Ce message n&apos;est pas chiffré&#x202f;!</translation>
     </message>
 </context>
 <context>
     <name>EventStore</name>
     <message>
-        <location filename="../../src/timeline/EventStore.cpp" line="+612"/>
+        <location filename="../../src/timeline/EventStore.cpp" line="+613"/>
         <source>-- Encrypted Event (No keys found for decryption) --</source>
         <comment>Placeholder, when the message was not decrypted yet or can&apos;t be decrypted.</comment>
         <translation>-- Évènement chiffré (pas de clé trouvée pour le déchiffrement) --</translation>
@@ -513,18 +542,18 @@
     <message>
         <location line="+13"/>
         <source>-- Replay attack! This message index was reused! --</source>
-        <translation>-- Attaque par rejeu (replay attack) ! Cet index de message a été réutilisé ! --</translation>
+        <translation>-- Attaque par rejeu (replay attack)&#x202f;! Cet index de message a été réutilisé&#x202f;! --</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>-- Message by unverified device! --</source>
-        <translation>-- Message d&apos;un appareil non vérifié  --</translation>
+        <translation>-- Message d&apos;un appareil non vérifié&#x202f; --</translation>
     </message>
 </context>
 <context>
     <name>Failed</name>
     <message>
-        <location filename="../qml/device-verification/Failed.qml" line="+7"/>
+        <location filename="../qml/device-verification/Failed.qml" line="+11"/>
         <source>Verification failed</source>
         <translation>Échec de la vérification</translation>
     </message>
@@ -536,7 +565,7 @@
     <message>
         <location line="+4"/>
         <source>Key mismatch detected!</source>
-        <translation>Clés non correspondantes détectées !</translation>
+        <translation>Clés non correspondantes détectées&#x202f;!</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -558,7 +587,7 @@
 <context>
     <name>InputBar</name>
     <message>
-        <location filename="../../src/timeline/InputBar.cpp" line="+227"/>
+        <location filename="../../src/timeline/InputBar.cpp" line="+253"/>
         <source>Select a file</source>
         <translation>Sélectionnez un fichier</translation>
     </message>
@@ -568,7 +597,7 @@
         <translation>Tous les types de fichiers (*)</translation>
     </message>
     <message>
-        <location line="+384"/>
+        <location line="+371"/>
         <source>Failed to upload media. Please try again.</source>
         <translation>Échec de l&apos;envoi du média. Veuillez réessayer.</translation>
     </message>
@@ -576,7 +605,7 @@
 <context>
     <name>InviteeItem</name>
     <message>
-        <location filename="../../src/InviteeItem.cpp" line="+18"/>
+        <location filename="../../src/InviteeItem.cpp" line="+22"/>
         <source>Remove</source>
         <translation>Retirer</translation>
     </message>
@@ -584,7 +613,7 @@
 <context>
     <name>LoginPage</name>
     <message>
-        <location filename="../../src/LoginPage.cpp" line="+92"/>
+        <location filename="../../src/LoginPage.cpp" line="+80"/>
         <source>Matrix ID</source>
         <translation>Identifiant Matrix</translation>
     </message>
@@ -599,9 +628,9 @@
 You can also put your homeserver address there, if your server doesn&apos;t support .well-known lookup.
 Example: @user:server.my
 If Nheko fails to discover your homeserver, it will show you a field to enter the server manually.</source>
-        <translation>Votre nom de connexion. Un mxid doit commencer par un « @ » suivi de l&apos;identifiant. L&apos;identifiant doit être suivi du nom de serveur, séparé de celui-ci par « : ».
+        <translation>Votre nom de connexion. Un mxid doit commencer par un «&#x202f;@&#x202f;» suivi de l&apos;identifiant. L&apos;identifiant doit être suivi du nom de serveur, séparé de celui-ci par «&#x202f;:&#x202f;».
 Vous pouvez également spécifier l&apos;adresse de votre serveur ici, si votre serveur ne supporte pas l&apos;identification .well-known.
-Exemple : @utilisateur :monserveur.example.com
+Exemple&#x202f;: @utilisateur&#x202f;:monserveur.example.com
 Si Nheko n&apos;arrive pas à trouver votre serveur, il vous proposera de l&apos;indiquer manuellement.</translation>
     </message>
     <message>
@@ -639,24 +668,23 @@ Si Nheko n&apos;arrive pas à trouver votre serveur, il vous proposera de l&apos
         <source>The address that can be used to contact you homeservers client API.
 Example: https://server.my:8787</source>
         <translation>L&apos;adresse qui peut être utilisée pour joindre l&apos;API client de votre serveur.
-Exemple : https ://monserveur.example.com :8787</translation>
+Exemple&#xa0;: https&#x202f;://monserveur.example.com&#x202f;:8787</translation>
     </message>
     <message>
         <location line="+19"/>
-        <location line="+218"/>
         <source>LOGIN</source>
         <translation>CONNEXION</translation>
     </message>
     <message>
-        <location line="-151"/>
+        <location line="+84"/>
         <location line="+11"/>
-        <location line="+157"/>
+        <location line="+156"/>
         <location line="+11"/>
         <source>You have entered an invalid Matrix ID  e.g @joe:matrix.org</source>
-        <translation>Vous avez entré un identifiant Matrix invalide (exemple correct : @moi :mon.serveur.fr)</translation>
+        <translation>Vous avez entré un identifiant Matrix invalide (exemple correct&#x202f;: @moi&#x202f;:mon.serveur.fr)</translation>
     </message>
     <message>
-        <location line="-132"/>
+        <location line="-131"/>
         <source>Autodiscovery failed. Received malformed response.</source>
         <translation>Échec de la découverte automatique. Réponse mal formatée reçue.</translation>
     </message>
@@ -681,12 +709,12 @@ Exemple : https ://monserveur.example.com :8787</translation>
         <translation>Une erreur inconnue est survenue. Vérifiez que le nom de domaine du serveur est valide.</translation>
     </message>
     <message>
-        <location line="+59"/>
+        <location line="-168"/>
         <source>SSO LOGIN</source>
         <translation>CONNEXION SSO</translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+263"/>
         <source>Empty password</source>
         <translation>Mot de passe vide</translation>
     </message>
@@ -699,7 +727,7 @@ Exemple : https ://monserveur.example.com :8787</translation>
 <context>
     <name>MemberList</name>
     <message>
-        <location filename="../../src/dialogs/MemberList.cpp" line="+90"/>
+        <location filename="../../src/dialogs/MemberList.cpp" line="+94"/>
         <source>Room members</source>
         <translation>Membres du salon</translation>
     </message>
@@ -712,7 +740,7 @@ Exemple : https ://monserveur.example.com :8787</translation>
 <context>
     <name>MessageDelegate</name>
     <message>
-        <location filename="../qml/delegates/MessageDelegate.qml" line="+105"/>
+        <location filename="../qml/delegates/MessageDelegate.qml" line="+109"/>
         <location line="+9"/>
         <source>removed</source>
         <translation>retiré</translation>
@@ -725,7 +753,7 @@ Exemple : https ://monserveur.example.com :8787</translation>
     <message>
         <location line="+9"/>
         <source>room name changed to: %1</source>
-        <translation>nom du salon changé en : %1</translation>
+        <translation>nom du salon changé en&#xa0;: %1</translation>
     </message>
     <message>
         <location line="+0"/>
@@ -735,7 +763,7 @@ Exemple : https ://monserveur.example.com :8787</translation>
     <message>
         <location line="+9"/>
         <source>topic changed to: %1</source>
-        <translation>sujet changé pour : %1</translation>
+        <translation>sujet changé pour&#xa0;: %1</translation>
     </message>
     <message>
         <location line="+0"/>
@@ -745,7 +773,7 @@ Exemple : https ://monserveur.example.com :8787</translation>
     <message>
         <location line="+9"/>
         <source>%1 created and configured room: %2</source>
-        <translation>%1 a créé et configuré le salon : %2</translation>
+        <translation>%1 a créé et configuré le salon&#xa0;: %2</translation>
     </message>
     <message>
         <location line="+12"/>
@@ -781,7 +809,7 @@ Exemple : https ://monserveur.example.com :8787</translation>
 <context>
     <name>MessageInput</name>
     <message>
-        <location filename="../qml/MessageInput.qml" line="+38"/>
+        <location filename="../qml/MessageInput.qml" line="+42"/>
         <source>Hang up</source>
         <translation>Raccrocher</translation>
     </message>
@@ -791,22 +819,22 @@ Exemple : https ://monserveur.example.com :8787</translation>
         <translation>Appeler</translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+25"/>
         <source>Send a file</source>
         <translation>Envoyer un fichier</translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+42"/>
         <source>Write a message...</source>
         <translation>Écrivez un message…</translation>
     </message>
     <message>
-        <location line="+186"/>
+        <location line="+211"/>
         <source>Emoji</source>
         <translation>Émoji</translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+16"/>
         <source>Send</source>
         <translation>Envoyer</translation>
     </message>
@@ -814,7 +842,7 @@ Exemple : https ://monserveur.example.com :8787</translation>
 <context>
     <name>NewVerificationRequest</name>
     <message>
-        <location filename="../qml/device-verification/NewVerificationRequest.qml" line="+7"/>
+        <location filename="../qml/device-verification/NewVerificationRequest.qml" line="+11"/>
         <source>Send Verification Request</source>
         <translation>Envoyer la demande de vérification</translation>
     </message>
@@ -826,7 +854,7 @@ Exemple : https ://monserveur.example.com :8787</translation>
     <message>
         <location line="+15"/>
         <source>To allow other users to see, which of your devices actually belong to you, you can verify them. This also allows key backup to work automatically. Verify %1 now?</source>
-        <translation>Pour permettre aux autres utilisateurs de vérifier quels appareils de votre compte sont sous votre contrôle, vous pouvez vérifier ceux-ci. Cela permet également à ces appareils de sauvegarder vos clés de chiffrement automatiquement. Vérifier %1 maintenant ?</translation>
+        <translation>Pour permettre aux autres utilisateurs de vérifier quels appareils de votre compte sont sous votre contrôle, vous pouvez vérifier ceux-ci. Cela permet également à ces appareils de sauvegarder vos clés de chiffrement automatiquement. Vérifier %1 maintenant&#x202f;?</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -872,9 +900,9 @@ Exemple : https ://monserveur.example.com :8787</translation>
 <context>
     <name>PlaceCall</name>
     <message>
-        <location filename="../qml/voip/PlaceCall.qml" line="+36"/>
+        <location filename="../qml/voip/PlaceCall.qml" line="+48"/>
         <source>Place a call to %1?</source>
-        <translation>Appeler %1 ?</translation>
+        <translation>Appeler %1&#x202f;?</translation>
     </message>
     <message>
         <location line="+16"/>
@@ -892,7 +920,12 @@ Exemple : https ://monserveur.example.com :8787</translation>
         <translation>Vidéo</translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location line="+14"/>
+        <source>Screen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
         <source>Cancel</source>
         <translation>Annuler</translation>
     </message>
@@ -900,15 +933,15 @@ Exemple : https ://monserveur.example.com :8787</translation>
 <context>
     <name>Placeholder</name>
     <message>
-        <location filename="../qml/delegates/Placeholder.qml" line="+4"/>
+        <location filename="../qml/delegates/Placeholder.qml" line="+8"/>
         <source>unimplemented event: </source>
-        <translation>Évènement non implémenté : </translation>
+        <translation>Évènement non implémenté&#xa0;: </translation>
     </message>
 </context>
 <context>
     <name>QCoreApplication</name>
     <message>
-        <location filename="../../src/main.cpp" line="+179"/>
+        <location filename="../../src/main.cpp" line="+167"/>
         <source>Create a unique profile, which allows you to log into several accounts at the same time and start multiple instances of nheko.</source>
         <translation>Créer un profil unique, vous permettant de vous connecter simultanément à plusieurs comptes et à lancer plusieurs instances de nheko.</translation>
     </message>
@@ -926,7 +959,7 @@ Exemple : https ://monserveur.example.com :8787</translation>
 <context>
     <name>QuickSwitcher</name>
     <message>
-        <location filename="../../src/QuickSwitcher.cpp" line="+74"/>
+        <location filename="../../src/QuickSwitcher.cpp" line="+62"/>
         <source>Search for a room...</source>
         <translation>Chercher un salon…</translation>
     </message>
@@ -934,18 +967,18 @@ Exemple : https ://monserveur.example.com :8787</translation>
 <context>
     <name>RegisterPage</name>
     <message>
-        <location filename="../../src/RegisterPage.cpp" line="+89"/>
+        <location filename="../../src/RegisterPage.cpp" line="+77"/>
         <source>Username</source>
         <translation>Nom d&apos;utilisateur</translation>
     </message>
     <message>
         <location line="+2"/>
-        <location line="+286"/>
+        <location line="+287"/>
         <source>The username must not be empty, and must contain only the characters a-z, 0-9, ., _, =, -, and /.</source>
-        <translation>Le nom d&apos;utilisateur ne doit pas être vide, et ne peut contenir que les caractères a à z, 0 à 9, et « . _ = - / ».</translation>
+        <translation>Le nom d&apos;utilisateur ne doit pas être vide, et ne peut contenir que les caractères a à z, 0 à 9, et «&#x202f;. _ = - /&#x202f;».</translation>
     </message>
     <message>
-        <location line="-282"/>
+        <location line="-283"/>
         <source>Password</source>
         <translation>Mot de passe</translation>
     </message>
@@ -977,10 +1010,10 @@ Exemple : https ://monserveur.example.com :8787</translation>
     <message>
         <location line="+62"/>
         <source>No supported registration flows!</source>
-        <translation>Pas de méthode d&apos;inscription supportée !</translation>
+        <translation>Pas de méthode d&apos;inscription supportée&#xa0;!</translation>
     </message>
     <message>
-        <location line="+209"/>
+        <location line="+210"/>
         <source>One or more fields have invalid inputs. Please correct those issues and try again.</source>
         <translation>Un ou plusieurs champs ont des entrées invalides. Veuillez les corriger et réessayer.</translation>
     </message>
@@ -1003,7 +1036,7 @@ Exemple : https ://monserveur.example.com :8787</translation>
 <context>
     <name>ReplyPopup</name>
     <message>
-        <location filename="../qml/ReplyPopup.qml" line="+45"/>
+        <location filename="../qml/ReplyPopup.qml" line="+49"/>
         <source>Close</source>
         <translation>Fermer</translation>
     </message>
@@ -1016,7 +1049,7 @@ Exemple : https ://monserveur.example.com :8787</translation>
 <context>
     <name>RoomInfo</name>
     <message>
-        <location filename="../../src/Cache.cpp" line="+1861"/>
+        <location filename="../../src/Cache.cpp" line="+1793"/>
         <source>no version stored</source>
         <translation>pas de version enregistrée</translation>
     </message>
@@ -1024,14 +1057,14 @@ Exemple : https ://monserveur.example.com :8787</translation>
 <context>
     <name>RoomInfoListItem</name>
     <message>
-        <location filename="../../src/RoomInfoListItem.cpp" line="+102"/>
+        <location filename="../../src/RoomInfoListItem.cpp" line="+90"/>
         <source>Leave room</source>
         <translation>Quitter le salon</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Tag room as:</source>
-        <translation>Étiqueter le salon comme :</translation>
+        <translation>Étiqueter le salon comme&#xa0;:</translation>
     </message>
     <message>
         <location line="+18"/>
@@ -1073,7 +1106,7 @@ Exemple : https ://monserveur.example.com :8787</translation>
         <location line="+1"/>
         <source>Tag:</source>
         <comment>Tag name prompt</comment>
-        <translation>Étiquette :</translation>
+        <translation>Étiquette&#xa0;:</translation>
     </message>
     <message>
         <location line="+169"/>
@@ -1086,10 +1119,116 @@ Exemple : https ://monserveur.example.com :8787</translation>
         <translation>Décliner</translation>
     </message>
 </context>
+<context>
+    <name>RoomSettings</name>
+    <message>
+        <location filename="../qml/RoomSettings.qml" line="+204"/>
+        <source>End-to-End Encryption</source>
+        <translation type="unfinished">Chiffrement bout-à-bout</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Encryption is currently experimental and things might break unexpectedly. &lt;br&gt;
+                            Please take note that it can&apos;t be disabled afterwards.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>Whether or not the client should respond automatically with the session keys
+                                upon request. Use with caution, this is a temporary measure to test the
+                                E2E implementation until device verification is completed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/ui/RoomSettings.cpp" line="+267"/>
+        <source>Failed to enable encryption: %1</source>
+        <translation type="unfinished">Échec de l&apos;activation du chiffrement&#xa0;&#xa0;: %1</translation>
+    </message>
+    <message>
+        <location line="+228"/>
+        <source>Select an avatar</source>
+        <translation type="unfinished">Sélectionner un avatar</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>All Files (*)</source>
+        <translation type="unfinished">Tous les types de fichiers (*)</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>The selected file is not an image</source>
+        <translation type="unfinished">Le fichier sélectionné n&apos;est pas une image</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Error while reading file: %1</source>
+        <translation type="unfinished">Erreur lors de la lecture du fichier&#xa0;&#xa0;: %1</translation>
+    </message>
+    <message>
+        <location line="+34"/>
+        <location line="+20"/>
+        <source>Failed to upload image: %s</source>
+        <translation type="unfinished">Échec de l&apos;envoi de l&apos;image&#xa0;&#xa0;: %s</translation>
+    </message>
+</context>
+<context>
+    <name>ScreenShare</name>
+    <message>
+        <location filename="../qml/voip/ScreenShare.qml" line="+30"/>
+        <source>Share desktop with %1?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Window:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Frame rate:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Include your camera picture-in-picture</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>Request remote camera</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location line="+9"/>
+        <source>View your callee&apos;s camera like a regular video call</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Hide mouse cursor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Share</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Preview</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Annuler</translation>
+    </message>
+</context>
 <context>
     <name>SideBarActions</name>
     <message>
-        <location filename="../../src/SideBarActions.cpp" line="+40"/>
+        <location filename="../../src/SideBarActions.cpp" line="+44"/>
         <source>User settings</source>
         <translation>Paramètres utilisateur</translation>
     </message>
@@ -1117,7 +1256,7 @@ Exemple : https ://monserveur.example.com :8787</translation>
 <context>
     <name>StatusIndicator</name>
     <message>
-        <location filename="../qml/StatusIndicator.qml" line="+17"/>
+        <location filename="../qml/StatusIndicator.qml" line="+21"/>
         <source>Failed</source>
         <translation>Échec</translation>
     </message>
@@ -1140,14 +1279,14 @@ Exemple : https ://monserveur.example.com :8787</translation>
 <context>
     <name>Success</name>
     <message>
-        <location filename="../qml/device-verification/Success.qml" line="+6"/>
+        <location filename="../qml/device-verification/Success.qml" line="+10"/>
         <source>Successful Verification</source>
         <translation>Vérification réussie</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>Verification successful! Both sides verified their devices!</source>
-        <translation>Vérification réussie ! Les deux côtés ont vérifié leur appareil !</translation>
+        <translation>Vérification réussie&#x202f;! Les deux côtés ont vérifié leur appareil&#x202f;!</translation>
     </message>
     <message>
         <location line="+12"/>
@@ -1158,15 +1297,15 @@ Exemple : https ://monserveur.example.com :8787</translation>
 <context>
     <name>TimelineModel</name>
     <message>
-        <location filename="../../src/timeline/TimelineModel.cpp" line="+895"/>
+        <location filename="../../src/timeline/TimelineModel.cpp" line="+911"/>
         <source>Message redaction failed: %1</source>
-        <translation>Échec de la suppression du message : %1</translation>
+        <translation>Échec de la suppression du message&#xa0;: %1</translation>
     </message>
     <message>
         <location line="+73"/>
         <location line="+5"/>
         <source>Failed to encrypt event, sending aborted!</source>
-        <translation>Échec du chiffrement de l&apos;évènement, envoi abandonné !</translation>
+        <translation>Échec du chiffrement de l&apos;évènement, envoi abandonné&#x202f;!</translation>
     </message>
     <message>
         <location line="+164"/>
@@ -1308,12 +1447,12 @@ Exemple : https ://monserveur.example.com :8787</translation>
         <translation>%1 ne frappe plus au salon.</translation>
     </message>
     <message>
-        <location line="-795"/>
+        <location line="-798"/>
         <source>You joined this room.</source>
         <translation>Vous avez rejoint ce salon.</translation>
     </message>
     <message>
-        <location line="+797"/>
+        <location line="+800"/>
         <source>Rejected the knock from %1.</source>
         <translation>%1 a été rejeté après avoir frappé au salon.</translation>
     </message>
@@ -1321,12 +1460,12 @@ Exemple : https ://monserveur.example.com :8787</translation>
         <location line="+2"/>
         <source>%1 left after having already left!</source>
         <comment>This is a leave event after the user already left and shouldn&apos;t happen apart from state resets</comment>
-        <translation>%1 a quitté le salon après l&apos;avoir déjà quitté !</translation>
+        <translation>%1 a quitté le salon après l&apos;avoir déjà quitté&#x202f;!</translation>
     </message>
     <message>
         <location line="+15"/>
         <source> Reason: %1</source>
-        <translation>Raison : %1</translation>
+        <translation>Raison&#xa0;: %1</translation>
     </message>
     <message>
         <location line="-5"/>
@@ -1337,7 +1476,7 @@ Exemple : https ://monserveur.example.com :8787</translation>
 <context>
     <name>TimelineRow</name>
     <message>
-        <location filename="../qml/TimelineRow.qml" line="+99"/>
+        <location filename="../qml/TimelineRow.qml" line="+100"/>
         <source>Edit</source>
         <translation>Modifier</translation>
     </message>
@@ -1365,7 +1504,7 @@ Exemple : https ://monserveur.example.com :8787</translation>
 <context>
     <name>TimelineView</name>
     <message>
-        <location filename="../qml/TimelineView.qml" line="+85"/>
+        <location filename="../qml/TimelineView.qml" line="+97"/>
         <source>React</source>
         <translation>Réagir</translation>
     </message>
@@ -1415,7 +1554,7 @@ Exemple : https ://monserveur.example.com :8787</translation>
         <translation>Ouvrir dans une application externe</translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+61"/>
         <source>No room open</source>
         <translation>Aucun salon ouvert</translation>
     </message>
@@ -1423,7 +1562,7 @@ Exemple : https ://monserveur.example.com :8787</translation>
 <context>
     <name>TimelineViewManager</name>
     <message>
-        <location filename="../../src/timeline/TimelineViewManager.cpp" line="+423"/>
+        <location filename="../../src/timeline/TimelineViewManager.cpp" line="+430"/>
         <source>No encrypted private chat found with this user. Create an encrypted private chat with this user and try again.</source>
         <translation>Pas de discussion privée et chiffrée trouvée avec cet utilisateur. Créez-en une et réessayez.</translation>
     </message>
@@ -1431,7 +1570,7 @@ Exemple : https ://monserveur.example.com :8787</translation>
 <context>
     <name>TopBar</name>
     <message>
-        <location filename="../qml/TopBar.qml" line="+43"/>
+        <location filename="../qml/TopBar.qml" line="+47"/>
         <source>Back to room list</source>
         <translation>Revenir à la liste des salons</translation>
     </message>
@@ -1470,7 +1609,7 @@ Exemple : https ://monserveur.example.com :8787</translation>
 <context>
     <name>TrayIcon</name>
     <message>
-        <location filename="../../src/TrayIcon.cpp" line="+122"/>
+        <location filename="../../src/TrayIcon.cpp" line="+110"/>
         <source>Show</source>
         <translation>Montrer</translation>
     </message>
@@ -1483,7 +1622,7 @@ Exemple : https ://monserveur.example.com :8787</translation>
 <context>
     <name>UserInfoWidget</name>
     <message>
-        <location filename="../../src/UserInfoWidget.cpp" line="+95"/>
+        <location filename="../../src/UserInfoWidget.cpp" line="+82"/>
         <source>Logout</source>
         <translation>Se déconnecter</translation>
     </message>
@@ -1500,7 +1639,7 @@ Exemple : https ://monserveur.example.com :8787</translation>
     <message>
         <location line="+1"/>
         <source>Status:</source>
-        <translation>Statut :</translation>
+        <translation>Statut&#xa0;:</translation>
     </message>
     <message>
         <location line="+8"/>
@@ -1531,7 +1670,7 @@ Exemple : https ://monserveur.example.com :8787</translation>
 <context>
     <name>UserProfile</name>
     <message>
-        <location filename="../qml/UserProfile.qml" line="+133"/>
+        <location filename="../qml/UserProfile.qml" line="+137"/>
         <source>Verify</source>
         <translation>Vérifier</translation>
     </message>
@@ -1551,7 +1690,7 @@ Exemple : https ://monserveur.example.com :8787</translation>
         <translation>Expulser l&apos;utilisateur</translation>
     </message>
     <message>
-        <location filename="../../src/ui/UserProfile.cpp" line="+296"/>
+        <location filename="../../src/ui/UserProfile.cpp" line="+301"/>
         <source>Select an avatar</source>
         <translation>Sélectionner un avatar</translation>
     </message>
@@ -1568,13 +1707,13 @@ Exemple : https ://monserveur.example.com :8787</translation>
     <message>
         <location line="+5"/>
         <source>Error while reading file: %1</source>
-        <translation>Erreur lors de la lecture du fichier  : %1</translation>
+        <translation>Erreur lors de la lecture du fichier&#xa0;&#xa0;: %1</translation>
     </message>
 </context>
 <context>
     <name>UserSettings</name>
     <message>
-        <location filename="../../src/UserSettingsPage.cpp" line="+345"/>
+        <location filename="../../src/UserSettingsPage.cpp" line="+337"/>
         <location filename="../../src/UserSettingsPage.h" line="+183"/>
         <source>Default</source>
         <translation>Défaut</translation>
@@ -1583,7 +1722,7 @@ Exemple : https ://monserveur.example.com :8787</translation>
 <context>
     <name>UserSettingsPage</name>
     <message>
-        <location line="+496"/>
+        <location line="+540"/>
         <source>Minimize to tray</source>
         <translation>Réduire à la barre des tâches</translation>
     </message>
@@ -1605,7 +1744,7 @@ Exemple : https ://monserveur.example.com :8787</translation>
     <message>
         <location line="-210"/>
         <source>profile: %1</source>
-        <translation>profil : %1</translation>
+        <translation>profil&#x202f;: %1</translation>
     </message>
     <message>
         <location line="+96"/>
@@ -1812,7 +1951,7 @@ Cela met l&apos;application en évidence dans la barre des tâches.</translation
         <translation>Partager vos clés avec les utilisateurs et appareils que vous avez vérifiés</translation>
     </message>
     <message>
-        <location line="+407"/>
+        <location line="+406"/>
         <source>CACHED</source>
         <translation>EN CACHE</translation>
     </message>
@@ -1822,7 +1961,7 @@ Cela met l&apos;application en évidence dans la barre des tâches.</translation
         <translation>PAS DANS LE CACHE</translation>
     </message>
     <message>
-        <location line="-461"/>
+        <location line="-460"/>
         <source>Scale factor</source>
         <translation>Facteur d&apos;échelle</translation>
     </message>
@@ -1997,7 +2136,7 @@ Cela met l&apos;application en évidence dans la barre des tâches.</translation
         <translation>Tous les types de fichiers (*)</translation>
     </message>
     <message>
-        <location line="+237"/>
+        <location line="+236"/>
         <source>Open Sessions File</source>
         <translation>Ouvrir fichier de sessions</translation>
     </message>
@@ -2020,7 +2159,7 @@ Cela met l&apos;application en évidence dans la barre des tâches.</translation
     <message>
         <location line="-27"/>
         <source>Enter the passphrase to decrypt the file:</source>
-        <translation>Entrez la clé secrète pour déchiffrer le fichier  :</translation>
+        <translation>Entrez la clé secrète pour déchiffrer le fichier&#xa0;&#xa0;:</translation>
     </message>
     <message>
         <location line="+8"/>
@@ -2031,7 +2170,7 @@ Cela met l&apos;application en évidence dans la barre des tâches.</translation
     <message>
         <location line="-8"/>
         <source>Enter passphrase to encrypt your session keys:</source>
-        <translation>Entrez une clé secrète pour chiffrer vos clés de session  :</translation>
+        <translation>Entrez une clé secrète pour chiffrer vos clés de session&#xa0;&#xa0;:</translation>
     </message>
     <message>
         <location line="+15"/>
@@ -2042,7 +2181,7 @@ Cela met l&apos;application en évidence dans la barre des tâches.</translation
 <context>
     <name>Waiting</name>
     <message>
-        <location filename="../qml/device-verification/Waiting.qml" line="+7"/>
+        <location filename="../qml/device-verification/Waiting.qml" line="+11"/>
         <source>Waiting for other party…</source>
         <translation>Attente du correspondant…</translation>
     </message>
@@ -2070,7 +2209,7 @@ Cela met l&apos;application en évidence dans la barre des tâches.</translation
 <context>
     <name>WelcomePage</name>
     <message>
-        <location filename="../../src/WelcomePage.cpp" line="+46"/>
+        <location filename="../../src/WelcomePage.cpp" line="+34"/>
         <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>
@@ -2093,7 +2232,7 @@ Cela met l&apos;application en évidence dans la barre des tâches.</translation
 <context>
     <name>descriptiveTime</name>
     <message>
-        <location filename="../../src/Utils.cpp" line="+145"/>
+        <location filename="../../src/Utils.cpp" line="+149"/>
         <source>Yesterday</source>
         <translation>Hier</translation>
     </message>
@@ -2101,7 +2240,7 @@ Cela met l&apos;application en évidence dans la barre des tâches.</translation
 <context>
     <name>dialogs::CreateRoom</name>
     <message>
-        <location filename="../../src/dialogs/CreateRoom.cpp" line="+36"/>
+        <location filename="../../src/dialogs/CreateRoom.cpp" line="+40"/>
         <source>Create room</source>
         <translation>Créer un salon</translation>
     </message>
@@ -2144,7 +2283,7 @@ Cela met l&apos;application en évidence dans la barre des tâches.</translation
 <context>
     <name>dialogs::FallbackAuth</name>
     <message>
-        <location filename="../../src/dialogs/FallbackAuth.cpp" line="+30"/>
+        <location filename="../../src/dialogs/FallbackAuth.cpp" line="+34"/>
         <source>Open Fallback in Browser</source>
         <translation>Ouvrir la solution de repli dans le navigateur</translation>
     </message>
@@ -2167,7 +2306,7 @@ Cela met l&apos;application en évidence dans la barre des tâches.</translation
 <context>
     <name>dialogs::InviteUsers</name>
     <message>
-        <location filename="../../src/dialogs/InviteUsers.cpp" line="+42"/>
+        <location filename="../../src/dialogs/InviteUsers.cpp" line="+46"/>
         <source>Cancel</source>
         <translation>Annuler</translation>
     </message>
@@ -2180,7 +2319,7 @@ Cela met l&apos;application en évidence dans la barre des tâches.</translation
 <context>
     <name>dialogs::JoinRoom</name>
     <message>
-        <location filename="../../src/dialogs/JoinRoom.cpp" line="+30"/>
+        <location filename="../../src/dialogs/JoinRoom.cpp" line="+34"/>
         <source>Join</source>
         <translation>Rejoindre</translation>
     </message>
@@ -2198,7 +2337,7 @@ Cela met l&apos;application en évidence dans la barre des tâches.</translation
 <context>
     <name>dialogs::LeaveRoom</name>
     <message>
-        <location filename="../../src/dialogs/LeaveRoom.cpp" line="+31"/>
+        <location filename="../../src/dialogs/LeaveRoom.cpp" line="+35"/>
         <source>Cancel</source>
         <translation>Annuler</translation>
     </message>
@@ -2211,7 +2350,7 @@ Cela met l&apos;application en évidence dans la barre des tâches.</translation
 <context>
     <name>dialogs::Logout</name>
     <message>
-        <location filename="../../src/dialogs/Logout.cpp" line="+47"/>
+        <location filename="../../src/dialogs/Logout.cpp" line="+35"/>
         <source>Cancel</source>
         <translation>Annuler</translation>
     </message>
@@ -2224,7 +2363,7 @@ Cela met l&apos;application en évidence dans la barre des tâches.</translation
 <context>
     <name>dialogs::PreviewUploadOverlay</name>
     <message>
-        <location filename="../../src/dialogs/PreviewUploadOverlay.cpp" line="+41"/>
+        <location filename="../../src/dialogs/PreviewUploadOverlay.cpp" line="+29"/>
         <source>Upload</source>
         <translation>Envoyer</translation>
     </message>
@@ -2246,7 +2385,7 @@ Taille du média : %2
 <context>
     <name>dialogs::ReCaptcha</name>
     <message>
-        <location filename="../../src/dialogs/ReCaptcha.cpp" line="+31"/>
+        <location filename="../../src/dialogs/ReCaptcha.cpp" line="+35"/>
         <source>Cancel</source>
         <translation>Annuler</translation>
     </message>
@@ -2264,7 +2403,7 @@ Taille du média : %2
 <context>
     <name>dialogs::ReadReceipts</name>
     <message>
-        <location filename="../../src/dialogs/ReadReceipts.cpp" line="+120"/>
+        <location filename="../../src/dialogs/ReadReceipts.cpp" line="+124"/>
         <source>Read receipts</source>
         <translation>Accusés de lecture</translation>
     </message>
@@ -2287,142 +2426,10 @@ Taille du média : %2
         <translation>Hier %1</translation>
     </message>
 </context>
-<context>
-    <name>dialogs::RoomSettings</name>
-    <message>
-        <location filename="../../src/dialogs/RoomSettings.cpp" line="+135"/>
-        <source>Settings</source>
-        <translation>Paramètres</translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Info</source>
-        <translation>Info</translation>
-    </message>
-    <message>
-        <location line="+11"/>
-        <source>Internal ID</source>
-        <translation>Identifiant interne</translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>Room Version</source>
-        <translation>Version de salon</translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Notifications</source>
-        <translation>Notifications</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Muted</source>
-        <translation>Silencieux</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Mentions only</source>
-        <translation>Uniquement les mentions</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>All messages</source>
-        <translation>Tous les messages</translation>
-    </message>
-    <message>
-        <location line="+97"/>
-        <source>Room access</source>
-        <translation>Accès au salon</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Anyone and guests</source>
-        <translation>Tout le monde, invités inclus</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Anyone</source>
-        <translation>Tout le monde</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Invited users</source>
-        <translation>Utilisateurs invités</translation>
-    </message>
-    <message>
-        <location line="+50"/>
-        <source>Encryption</source>
-        <translation>Chiffrement</translation>
-    </message>
-    <message>
-        <location line="+31"/>
-        <source>End-to-End Encryption</source>
-        <translation>Chiffrement bout-à-bout</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Encryption is currently experimental and things might break unexpectedly. &lt;br&gt;Please take note that it can&apos;t be disabled afterwards.</source>
-        <translation>Le chiffrement est actuellement expérimental, et des choses inattendues peuvent se produire. &lt;br&gt;Veuillez noter qu&apos;il n&apos;est pas possible de le désactiver ultérieurement.</translation>
-    </message>
-    <message>
-        <location line="-24"/>
-        <source>Respond to key requests</source>
-        <translation>Répondre aux requêtes de clés</translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Whether or not the client should respond automatically with the session keys
- upon request. Use with caution, this is a temporary measure to test the
- E2E implementation until device verification is completed.</source>
-        <translation>Choisit si le client doit répondre automatiquement ou non avec les clés de session
-lorsqu&apos;elles lui sont demandées. Utiliser avec précaution, il s&apos;agit d&apos;une mesure
-temporaire pour valider l&apos;implémentation du chiffrement de bout en bout en
-attendant que la vérification des appareils soit opérationnelle.</translation>
-    </message>
-    <message numerus="yes">
-        <location line="+80"/>
-        <source>%n member(s)</source>
-        <translation>
-            <numerusform>%n membre</numerusform>
-            <numerusform>%n membres</numerusform>
-        </translation>
-    </message>
-    <message>
-        <location line="+142"/>
-        <source>Failed to enable encryption: %1</source>
-        <translation>Échec de l&apos;activation du chiffrement  : %1</translation>
-    </message>
-    <message>
-        <location line="+147"/>
-        <source>Select an avatar</source>
-        <translation>Sélectionner un avatar</translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>All Files (*)</source>
-        <translation>Tous les types de fichiers (*)</translation>
-    </message>
-    <message>
-        <location line="+12"/>
-        <source>The selected file is not an image</source>
-        <translation>Le fichier sélectionné n&apos;est pas une image</translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Error while reading file: %1</source>
-        <translation>Erreur lors de la lecture du fichier  : %1</translation>
-    </message>
-    <message>
-        <location line="+35"/>
-        <location line="+20"/>
-        <source>Failed to upload image: %s</source>
-        <translation>Échec de l&apos;envoi de l&apos;image  : %s</translation>
-    </message>
-</context>
 <context>
     <name>message-description sent:</name>
     <message>
-        <location filename="../../src/Utils.h" line="+108"/>
+        <location filename="../../src/Utils.h" line="+112"/>
         <source>You sent an audio clip</source>
         <translation>Vous avez envoyé un message audio</translation>
     </message>
@@ -2484,12 +2491,12 @@ attendant que la vérification des appareils soit opérationnelle.</translation>
     <message>
         <location line="+5"/>
         <source>You: %1</source>
-        <translation>Vous  : %1</translation>
+        <translation>Vous&#xa0;&#xa0;: %1</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>%1: %2</source>
-        <translation>%1  : %2</translation>
+        <translation>%1&#xa0;&#xa0;: %2</translation>
     </message>
     <message>
         <location line="+7"/>
@@ -2535,7 +2542,7 @@ attendant que la vérification des appareils soit opérationnelle.</translation>
 <context>
     <name>popups::UserMentions</name>
     <message>
-        <location filename="../../src/popups/UserMentions.cpp" line="+64"/>
+        <location filename="../../src/popups/UserMentions.cpp" line="+68"/>
         <source>This Room</source>
         <translation>Ce salon</translation>
     </message>
diff --git a/resources/langs/nheko_hu.ts b/resources/langs/nheko_hu.ts
index 27c74ac27b108ab1decf89c2725ca67ee01d432d..075f0e5ad9d0cf29d2ff4515d479aaa220fd2f3f 100644
--- a/resources/langs/nheko_hu.ts
+++ b/resources/langs/nheko_hu.ts
@@ -4,7 +4,7 @@
 <context>
     <name>ActiveCallBar</name>
     <message>
-        <location filename="../qml/voip/ActiveCallBar.qml" line="+66"/>
+        <location filename="../qml/voip/ActiveCallBar.qml" line="+106"/>
         <source>Calling...</source>
         <translation>Hívás...</translation>
     </message>
@@ -15,9 +15,14 @@
         <translation>Csatlakozás...</translation>
     </message>
     <message>
-        <location line="+76"/>
-        <source>Toggle camera view</source>
-        <translation>Kameranézet be-/kikapcsolása</translation>
+        <location line="+67"/>
+        <source>You are screen sharing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Hide/Show Picture-in-Picture</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+13"/>
@@ -33,7 +38,7 @@
 <context>
     <name>AwaitingVerificationConfirmation</name>
     <message>
-        <location filename="../qml/device-verification/AwaitingVerificationConfirmation.qml" line="+7"/>
+        <location filename="../qml/device-verification/AwaitingVerificationConfirmation.qml" line="+11"/>
         <source>Awaiting Confirmation</source>
         <translation>Várakozás megerősítésre</translation>
     </message>
@@ -51,7 +56,7 @@
 <context>
     <name>Cache</name>
     <message>
-        <location filename="../../src/Cache.cpp" line="+2084"/>
+        <location filename="../../src/Cache.cpp" line="+2026"/>
         <source>You joined this room.</source>
         <translation>Csatlakoztál ehhez a szobához.</translation>
     </message>
@@ -59,7 +64,7 @@
 <context>
     <name>CallInvite</name>
     <message>
-        <location filename="../qml/voip/CallInvite.qml" line="+66"/>
+        <location filename="../qml/voip/CallInvite.qml" line="+70"/>
         <source>Video Call</source>
         <translation>Videóhívás</translation>
     </message>
@@ -77,7 +82,7 @@
 <context>
     <name>CallInviteBar</name>
     <message>
-        <location filename="../qml/voip/CallInviteBar.qml" line="+60"/>
+        <location filename="../qml/voip/CallInviteBar.qml" line="+64"/>
         <source>Video Call</source>
         <translation>Videóhívás</translation>
     </message>
@@ -92,7 +97,7 @@
         <translation>Eszközök</translation>
     </message>
     <message>
-        <location line="+11"/>
+        <location line="+10"/>
         <source>Accept</source>
         <translation>Elfogadás</translation>
     </message>
@@ -117,36 +122,55 @@
         <translation>Nem található mikrofon.</translation>
     </message>
 </context>
+<context>
+    <name>CallManager</name>
+    <message>
+        <location filename="../../src/CallManager.cpp" line="+521"/>
+        <source>Entire screen</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>ChatPage</name>
     <message>
-        <location filename="../../src/ChatPage.cpp" line="+215"/>
+        <location filename="../../src/ChatPage.cpp" line="+203"/>
         <source>Failed to invite user: %1</source>
         <translation>Nem sikerült meghívni a felhasználót: %1</translation>
     </message>
     <message>
         <location line="+4"/>
-        <location line="+797"/>
+        <location line="+806"/>
         <source>Invited user: %1</source>
         <translation>A felhasználó meg lett hívva: %1</translation>
     </message>
     <message>
-        <location line="-500"/>
+        <location line="-510"/>
         <source>Migrating the cache to the current version failed. This can have different reasons. Please open an issue and try to use an older version in the mean time. Alternatively you can try deleting the cache manually.</source>
         <translation>A gyorsítótár átvitele a jelenlegi verzióhoz nem sikerült. Ennek több oka is lehet. Kérlek, írj egy hibajelentést és egyelőre próbálj meg egy régebbi verziót használni! Alternatív megoldásként megprobálhatod eltávolítani a gyorsítótárat kézzel.</translation>
     </message>
     <message>
-        <location line="+456"/>
+        <location line="+413"/>
+        <source>Confirm join</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Do you really want to join %1?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+44"/>
         <source>Room %1 created.</source>
         <translation>A %1 nevű szoba létre lett hozva.</translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+35"/>
+        <location line="+323"/>
         <source>Confirm invite</source>
         <translation>Meghívás megerősítése</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="-322"/>
         <source>Do you really want to invite %1 (%2)?</source>
         <translation>Biztos, hogy meg akarod hívni a következő felhasználót: %1 (%2)?</translation>
     </message>
@@ -211,7 +235,12 @@
         <translation>Kitiltás feloldva a felhasználónak: %1</translation>
     </message>
     <message>
-        <location line="-582"/>
+        <location line="+226"/>
+        <source>Do you really want to start a private chat with %1?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-818"/>
         <source>Cache migration failed!</source>
         <translation>Gyorsítótár migráció nem sikerült!</translation>
     </message>
@@ -236,7 +265,7 @@
         <translation>Nem sikerült visszaállítani a mentési adatot. Kérlek, jelentkezz be ismét!</translation>
     </message>
     <message>
-        <location line="+165"/>
+        <location line="+157"/>
         <source>Failed to setup encryption keys. Server response: %1 %2. Please try again later.</source>
         <translation>Nem sikerült beállítani a titkosítási kulcsokat. Válasz a szervertől: %1 %2. Kérlek, próbáld újra később!</translation>
     </message>
@@ -247,7 +276,7 @@
         <translation>Kérlek, próbálj meg bejelentkezni újra: %1</translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+47"/>
         <source>Failed to join room: %1</source>
         <translation>Nem sikerült csatlakozni a szobához: %1</translation>
     </message>
@@ -267,12 +296,12 @@
         <translation>Nem sikerült létrehozni a szobát: %1</translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+18"/>
         <source>Failed to leave room: %1</source>
         <translation>Nem sikerült elhagyni a szobát: %1</translation>
     </message>
     <message>
-        <location line="+54"/>
+        <location line="+61"/>
         <source>Failed to kick %1 from %2: %3</source>
         <translation>Nem sikerült kirúgni %1 felhasználót %2 szobából: %3</translation>
     </message>
@@ -280,7 +309,7 @@
 <context>
     <name>CommunitiesListItem</name>
     <message>
-        <location filename="../../src/CommunitiesListItem.cpp" line="+26"/>
+        <location filename="../../src/CommunitiesListItem.cpp" line="+30"/>
         <source>Hide rooms with this tag or from this community</source>
         <translation>Az ilyen címkével ellátott vagy közösséghez tartozó szobák elrejtése</translation>
     </message>
@@ -348,7 +377,7 @@
 <context>
     <name>DigitVerification</name>
     <message>
-        <location filename="../qml/device-verification/DigitVerification.qml" line="+7"/>
+        <location filename="../qml/device-verification/DigitVerification.qml" line="+11"/>
         <source>Verification Code</source>
         <translation>HItelesítési kód</translation>
     </message>
@@ -371,7 +400,7 @@
 <context>
     <name>EditModal</name>
     <message>
-        <location filename="../../src/dialogs/RoomSettings.cpp" line="+73"/>
+        <location filename="../../src/ui/RoomSettings.cpp" line="+42"/>
         <source>Apply</source>
         <translation>Alkalmaz</translation>
     </message>
@@ -394,7 +423,7 @@
 <context>
     <name>EmojiPicker</name>
     <message>
-        <location filename="../qml/emoji/EmojiPicker.qml" line="+113"/>
+        <location filename="../qml/emoji/EmojiPicker.qml" line="+117"/>
         <location line="+181"/>
         <source>Search</source>
         <translation>Keresés</translation>
@@ -443,7 +472,7 @@
 <context>
     <name>EmojiVerification</name>
     <message>
-        <location filename="../qml/device-verification/EmojiVerification.qml" line="+7"/>
+        <location filename="../qml/device-verification/EmojiVerification.qml" line="+11"/>
         <source>Verification Code</source>
         <translation>Ellenőrzési kód</translation>
     </message>
@@ -466,7 +495,7 @@
 <context>
     <name>EncryptionIndicator</name>
     <message>
-        <location filename="../qml/EncryptionIndicator.qml" line="+19"/>
+        <location filename="../qml/EncryptionIndicator.qml" line="+23"/>
         <source>Encrypted</source>
         <translation>Titkosítva</translation>
     </message>
@@ -479,7 +508,7 @@
 <context>
     <name>EventStore</name>
     <message>
-        <location filename="../../src/timeline/EventStore.cpp" line="+612"/>
+        <location filename="../../src/timeline/EventStore.cpp" line="+613"/>
         <source>-- Encrypted Event (No keys found for decryption) --</source>
         <comment>Placeholder, when the message was not decrypted yet or can&apos;t be decrypted.</comment>
         <translation>-- Titkosított esemény (Nem találhatók kulcsok a titkosítás feloldásához) --</translation>
@@ -524,7 +553,7 @@
 <context>
     <name>Failed</name>
     <message>
-        <location filename="../qml/device-verification/Failed.qml" line="+7"/>
+        <location filename="../qml/device-verification/Failed.qml" line="+11"/>
         <source>Verification failed</source>
         <translation>A hitelesítés nem sikerült</translation>
     </message>
@@ -558,7 +587,7 @@
 <context>
     <name>InputBar</name>
     <message>
-        <location filename="../../src/timeline/InputBar.cpp" line="+227"/>
+        <location filename="../../src/timeline/InputBar.cpp" line="+253"/>
         <source>Select a file</source>
         <translation>Fájl kiválasztása</translation>
     </message>
@@ -568,7 +597,7 @@
         <translation>Minden fájl (*)</translation>
     </message>
     <message>
-        <location line="+384"/>
+        <location line="+371"/>
         <source>Failed to upload media. Please try again.</source>
         <translation>Nem sikerült feltölteni a médiafájlt. Kérlek, próbáld újra!</translation>
     </message>
@@ -576,7 +605,7 @@
 <context>
     <name>InviteeItem</name>
     <message>
-        <location filename="../../src/InviteeItem.cpp" line="+18"/>
+        <location filename="../../src/InviteeItem.cpp" line="+22"/>
         <source>Remove</source>
         <translation>Eltávolítás</translation>
     </message>
@@ -584,7 +613,7 @@
 <context>
     <name>LoginPage</name>
     <message>
-        <location filename="../../src/LoginPage.cpp" line="+92"/>
+        <location filename="../../src/LoginPage.cpp" line="+80"/>
         <source>Matrix ID</source>
         <translation>Matrixazonosító</translation>
     </message>
@@ -643,20 +672,19 @@ Példa: https://szerver.em:8787</translation>
     </message>
     <message>
         <location line="+19"/>
-        <location line="+218"/>
         <source>LOGIN</source>
         <translation>BEJELENTKEZÉS</translation>
     </message>
     <message>
-        <location line="-151"/>
+        <location line="+84"/>
         <location line="+11"/>
-        <location line="+157"/>
+        <location line="+156"/>
         <location line="+11"/>
         <source>You have entered an invalid Matrix ID  e.g @joe:matrix.org</source>
         <translation>Érvénytelen Matrixazonosítót adtál meg. Példa: @janos:matrix.org</translation>
     </message>
     <message>
-        <location line="-132"/>
+        <location line="-131"/>
         <source>Autodiscovery failed. Received malformed response.</source>
         <translation>Az automatikus felderítés nem sikerült. Helytelen válasz érkezett.</translation>
     </message>
@@ -681,12 +709,12 @@ Példa: https://szerver.em:8787</translation>
         <translation>Egy ismeretlen hiba történt. Ellenőrizd, hogy a homeszervered domainje helyes.</translation>
     </message>
     <message>
-        <location line="+59"/>
+        <location line="-168"/>
         <source>SSO LOGIN</source>
         <translation>SSO BEJELENTKEZÉS</translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+263"/>
         <source>Empty password</source>
         <translation>Üres jelszó</translation>
     </message>
@@ -699,7 +727,7 @@ Példa: https://szerver.em:8787</translation>
 <context>
     <name>MemberList</name>
     <message>
-        <location filename="../../src/dialogs/MemberList.cpp" line="+90"/>
+        <location filename="../../src/dialogs/MemberList.cpp" line="+94"/>
         <source>Room members</source>
         <translation>Szobatagok</translation>
     </message>
@@ -712,7 +740,7 @@ Példa: https://szerver.em:8787</translation>
 <context>
     <name>MessageDelegate</name>
     <message>
-        <location filename="../qml/delegates/MessageDelegate.qml" line="+123"/>
+        <location filename="../qml/delegates/MessageDelegate.qml" line="+127"/>
         <source>Encryption enabled</source>
         <translation>Titkosítás bekapcsolva</translation>
     </message>
@@ -781,7 +809,7 @@ Példa: https://szerver.em:8787</translation>
 <context>
     <name>MessageInput</name>
     <message>
-        <location filename="../qml/MessageInput.qml" line="+38"/>
+        <location filename="../qml/MessageInput.qml" line="+42"/>
         <source>Hang up</source>
         <translation>Hívás befejezése</translation>
     </message>
@@ -791,22 +819,22 @@ Példa: https://szerver.em:8787</translation>
         <translation>Hívás kezdeményezése</translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+25"/>
         <source>Send a file</source>
         <translation>Fájl küldése</translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+42"/>
         <source>Write a message...</source>
         <translation>Írj egy üzenetet…</translation>
     </message>
     <message>
-        <location line="+186"/>
+        <location line="+211"/>
         <source>Emoji</source>
         <translation>Hangulatjelek</translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+16"/>
         <source>Send</source>
         <translation>Küldés</translation>
     </message>
@@ -814,7 +842,7 @@ Példa: https://szerver.em:8787</translation>
 <context>
     <name>NewVerificationRequest</name>
     <message>
-        <location filename="../qml/device-verification/NewVerificationRequest.qml" line="+7"/>
+        <location filename="../qml/device-verification/NewVerificationRequest.qml" line="+11"/>
         <source>Send Verification Request</source>
         <translation>Hitelesítési kérés küldése</translation>
     </message>
@@ -872,7 +900,7 @@ Példa: https://szerver.em:8787</translation>
 <context>
     <name>PlaceCall</name>
     <message>
-        <location filename="../qml/voip/PlaceCall.qml" line="+36"/>
+        <location filename="../qml/voip/PlaceCall.qml" line="+48"/>
         <source>Place a call to %1?</source>
         <translation>Hívás indítása %1 felé?</translation>
     </message>
@@ -892,7 +920,12 @@ Példa: https://szerver.em:8787</translation>
         <translation>Videó</translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location line="+14"/>
+        <source>Screen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
         <source>Cancel</source>
         <translation>Mégse</translation>
     </message>
@@ -900,7 +933,7 @@ Példa: https://szerver.em:8787</translation>
 <context>
     <name>Placeholder</name>
     <message>
-        <location filename="../qml/delegates/Placeholder.qml" line="+4"/>
+        <location filename="../qml/delegates/Placeholder.qml" line="+8"/>
         <source>unimplemented event: </source>
         <translation>nem implementált esemény: </translation>
     </message>
@@ -908,7 +941,7 @@ Példa: https://szerver.em:8787</translation>
 <context>
     <name>QCoreApplication</name>
     <message>
-        <location filename="../../src/main.cpp" line="+179"/>
+        <location filename="../../src/main.cpp" line="+167"/>
         <source>Create a unique profile, which allows you to log into several accounts at the same time and start multiple instances of nheko.</source>
         <translation>Egy egyedi profil létrehozása, amellyel be tudsz jelentkezni egyszerre több fiókon keresztül és a Nheko több példányát is tudod futtatni.</translation>
     </message>
@@ -926,7 +959,7 @@ Példa: https://szerver.em:8787</translation>
 <context>
     <name>QuickSwitcher</name>
     <message>
-        <location filename="../../src/QuickSwitcher.cpp" line="+74"/>
+        <location filename="../../src/QuickSwitcher.cpp" line="+62"/>
         <source>Search for a room...</source>
         <translation>Szoba keresése…</translation>
     </message>
@@ -934,18 +967,18 @@ Példa: https://szerver.em:8787</translation>
 <context>
     <name>RegisterPage</name>
     <message>
-        <location filename="../../src/RegisterPage.cpp" line="+89"/>
+        <location filename="../../src/RegisterPage.cpp" line="+77"/>
         <source>Username</source>
         <translation>Felhasználónév</translation>
     </message>
     <message>
         <location line="+2"/>
-        <location line="+286"/>
+        <location line="+287"/>
         <source>The username must not be empty, and must contain only the characters a-z, 0-9, ., _, =, -, and /.</source>
         <translation>A felhasználónév nem lehet üres és csak a következő karaktereket tartalmazhatja: a-z, 0-9, ., _, =, - és /.</translation>
     </message>
     <message>
-        <location line="-282"/>
+        <location line="-283"/>
         <source>Password</source>
         <translation>Jelszó</translation>
     </message>
@@ -980,7 +1013,7 @@ Példa: https://szerver.em:8787</translation>
         <translation>Nem támogatott regisztrációs folyamat!</translation>
     </message>
     <message>
-        <location line="+209"/>
+        <location line="+210"/>
         <source>One or more fields have invalid inputs. Please correct those issues and try again.</source>
         <translation>Egy vagy több mező tartalma nem helyes. Kérlek, javítsd ki azokat a hibákat, és próbáld újra!</translation>
     </message>
@@ -1003,7 +1036,7 @@ Példa: https://szerver.em:8787</translation>
 <context>
     <name>ReplyPopup</name>
     <message>
-        <location filename="../qml/ReplyPopup.qml" line="+45"/>
+        <location filename="../qml/ReplyPopup.qml" line="+49"/>
         <source>Close</source>
         <translation>Bezárás</translation>
     </message>
@@ -1016,7 +1049,7 @@ Példa: https://szerver.em:8787</translation>
 <context>
     <name>RoomInfo</name>
     <message>
-        <location filename="../../src/Cache.cpp" line="+1861"/>
+        <location filename="../../src/Cache.cpp" line="+1793"/>
         <source>no version stored</source>
         <translation>nincs tárolva verzió</translation>
     </message>
@@ -1024,7 +1057,7 @@ Példa: https://szerver.em:8787</translation>
 <context>
     <name>RoomInfoListItem</name>
     <message>
-        <location filename="../../src/RoomInfoListItem.cpp" line="+102"/>
+        <location filename="../../src/RoomInfoListItem.cpp" line="+90"/>
         <source>Leave room</source>
         <translation>Szoba elhagyása</translation>
     </message>
@@ -1086,10 +1119,116 @@ Példa: https://szerver.em:8787</translation>
         <translation>Elutasítás</translation>
     </message>
 </context>
+<context>
+    <name>RoomSettings</name>
+    <message>
+        <location filename="../qml/RoomSettings.qml" line="+204"/>
+        <source>End-to-End Encryption</source>
+        <translation type="unfinished">Végponttól végpontig titkosítás</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Encryption is currently experimental and things might break unexpectedly. &lt;br&gt;
+                            Please take note that it can&apos;t be disabled afterwards.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>Whether or not the client should respond automatically with the session keys
+                                upon request. Use with caution, this is a temporary measure to test the
+                                E2E implementation until device verification is completed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/ui/RoomSettings.cpp" line="+267"/>
+        <source>Failed to enable encryption: %1</source>
+        <translation type="unfinished">Nem sikerült a titkosítás aktiválása: %1</translation>
+    </message>
+    <message>
+        <location line="+228"/>
+        <source>Select an avatar</source>
+        <translation type="unfinished">Profilkép kiválasztása</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>All Files (*)</source>
+        <translation type="unfinished">Minden fájl (*)</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>The selected file is not an image</source>
+        <translation type="unfinished">A kiválasztott fájl nem egy kép</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Error while reading file: %1</source>
+        <translation type="unfinished">Hiba a fájl olvasása közben: %1</translation>
+    </message>
+    <message>
+        <location line="+34"/>
+        <location line="+20"/>
+        <source>Failed to upload image: %s</source>
+        <translation type="unfinished">Nem sikerült a kép feltöltése: %s</translation>
+    </message>
+</context>
+<context>
+    <name>ScreenShare</name>
+    <message>
+        <location filename="../qml/voip/ScreenShare.qml" line="+30"/>
+        <source>Share desktop with %1?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Window:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Frame rate:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Include your camera picture-in-picture</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>Request remote camera</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location line="+9"/>
+        <source>View your callee&apos;s camera like a regular video call</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Hide mouse cursor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Share</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Preview</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Mégse</translation>
+    </message>
+</context>
 <context>
     <name>SideBarActions</name>
     <message>
-        <location filename="../../src/SideBarActions.cpp" line="+40"/>
+        <location filename="../../src/SideBarActions.cpp" line="+44"/>
         <source>User settings</source>
         <translation>Felhasználói beállítások</translation>
     </message>
@@ -1117,7 +1256,7 @@ Példa: https://szerver.em:8787</translation>
 <context>
     <name>StatusIndicator</name>
     <message>
-        <location filename="../qml/StatusIndicator.qml" line="+17"/>
+        <location filename="../qml/StatusIndicator.qml" line="+21"/>
         <source>Failed</source>
         <translation>Sikertelen</translation>
     </message>
@@ -1140,7 +1279,7 @@ Példa: https://szerver.em:8787</translation>
 <context>
     <name>Success</name>
     <message>
-        <location filename="../qml/device-verification/Success.qml" line="+6"/>
+        <location filename="../qml/device-verification/Success.qml" line="+10"/>
         <source>Successful Verification</source>
         <translation>Sikeres hitelesítés</translation>
     </message>
@@ -1158,7 +1297,7 @@ Példa: https://szerver.em:8787</translation>
 <context>
     <name>TimelineModel</name>
     <message>
-        <location filename="../../src/timeline/TimelineModel.cpp" line="+895"/>
+        <location filename="../../src/timeline/TimelineModel.cpp" line="+911"/>
         <source>Message redaction failed: %1</source>
         <translation>Az üzenet visszavonása nem sikerült: %1</translation>
     </message>
@@ -1194,7 +1333,6 @@ Példa: https://szerver.em:8787</translation>
         <comment>Multiple users are typing. First argument is a comma separated list of potentially multiple users. Second argument is the last user of that list. (If only one user is typing, %1 is empty. You should still use it in your string though to silence Qt warnings.)</comment>
         <translation>
             <numerusform>%1%2 gépel.</numerusform>
-            <numerusform>%1 és %2 gépelnek.</numerusform>
         </translation>
     </message>
     <message>
@@ -1308,12 +1446,12 @@ Példa: https://szerver.em:8787</translation>
         <translation>%1 visszavonta a kopogását.</translation>
     </message>
     <message>
-        <location line="-795"/>
+        <location line="-798"/>
         <source>You joined this room.</source>
         <translation>Csatlakoztál ehhez a szobához.</translation>
     </message>
     <message>
-        <location line="+797"/>
+        <location line="+800"/>
         <source>Rejected the knock from %1.</source>
         <translation>Kopogás elutasítva tőle: %1.</translation>
     </message>
@@ -1337,7 +1475,7 @@ Példa: https://szerver.em:8787</translation>
 <context>
     <name>TimelineRow</name>
     <message>
-        <location filename="../qml/TimelineRow.qml" line="+99"/>
+        <location filename="../qml/TimelineRow.qml" line="+100"/>
         <source>Edit</source>
         <translation>Szerkesztés</translation>
     </message>
@@ -1365,7 +1503,7 @@ Példa: https://szerver.em:8787</translation>
 <context>
     <name>TimelineView</name>
     <message>
-        <location filename="../qml/TimelineView.qml" line="+85"/>
+        <location filename="../qml/TimelineView.qml" line="+97"/>
         <source>React</source>
         <translation>Reakció</translation>
     </message>
@@ -1415,7 +1553,7 @@ Példa: https://szerver.em:8787</translation>
         <translation>Megnyitás külső programban</translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+61"/>
         <source>No room open</source>
         <translation>Nincs nyitott szoba</translation>
     </message>
@@ -1423,7 +1561,7 @@ Példa: https://szerver.em:8787</translation>
 <context>
     <name>TimelineViewManager</name>
     <message>
-        <location filename="../../src/timeline/TimelineViewManager.cpp" line="+423"/>
+        <location filename="../../src/timeline/TimelineViewManager.cpp" line="+430"/>
         <source>No encrypted private chat found with this user. Create an encrypted private chat with this user and try again.</source>
         <translation>Nem található titkosított privát csevegés ezzel a felhasználóval. Hozz létre egy titkosított privát csevegést vele, és próbáld újra!</translation>
     </message>
@@ -1431,7 +1569,7 @@ Példa: https://szerver.em:8787</translation>
 <context>
     <name>TopBar</name>
     <message>
-        <location filename="../qml/TopBar.qml" line="+43"/>
+        <location filename="../qml/TopBar.qml" line="+47"/>
         <source>Back to room list</source>
         <translation>Vissza a szobák listájára</translation>
     </message>
@@ -1470,7 +1608,7 @@ Példa: https://szerver.em:8787</translation>
 <context>
     <name>TrayIcon</name>
     <message>
-        <location filename="../../src/TrayIcon.cpp" line="+122"/>
+        <location filename="../../src/TrayIcon.cpp" line="+110"/>
         <source>Show</source>
         <translation>Mutat</translation>
     </message>
@@ -1483,7 +1621,7 @@ Példa: https://szerver.em:8787</translation>
 <context>
     <name>UserInfoWidget</name>
     <message>
-        <location filename="../../src/UserInfoWidget.cpp" line="+95"/>
+        <location filename="../../src/UserInfoWidget.cpp" line="+82"/>
         <source>Logout</source>
         <translation>Kijelentkezés</translation>
     </message>
@@ -1531,7 +1669,7 @@ Példa: https://szerver.em:8787</translation>
 <context>
     <name>UserProfile</name>
     <message>
-        <location filename="../qml/UserProfile.qml" line="+133"/>
+        <location filename="../qml/UserProfile.qml" line="+137"/>
         <source>Verify</source>
         <translation>Hitelesítés</translation>
     </message>
@@ -1551,7 +1689,7 @@ Példa: https://szerver.em:8787</translation>
         <translation>A felhasználó kirúgása</translation>
     </message>
     <message>
-        <location filename="../../src/ui/UserProfile.cpp" line="+296"/>
+        <location filename="../../src/ui/UserProfile.cpp" line="+301"/>
         <source>Select an avatar</source>
         <translation>Profilkép kiválasztása</translation>
     </message>
@@ -1574,7 +1712,7 @@ Példa: https://szerver.em:8787</translation>
 <context>
     <name>UserSettings</name>
     <message>
-        <location filename="../../src/UserSettingsPage.cpp" line="+345"/>
+        <location filename="../../src/UserSettingsPage.cpp" line="+337"/>
         <location filename="../../src/UserSettingsPage.h" line="+183"/>
         <source>Default</source>
         <translation>Alapértelmezett</translation>
@@ -1583,7 +1721,7 @@ Példa: https://szerver.em:8787</translation>
 <context>
     <name>UserSettingsPage</name>
     <message>
-        <location line="+496"/>
+        <location line="+540"/>
         <source>Minimize to tray</source>
         <translation>Kicsinyítés a tálcára</translation>
     </message>
@@ -1811,7 +1949,7 @@ Ettől általában animálttá válik az alkalmazásablakok listáján szereplő
         <translation>Kulcsok megosztása hitelesített felhasználókkal és eszközökkel</translation>
     </message>
     <message>
-        <location line="+407"/>
+        <location line="+406"/>
         <source>CACHED</source>
         <translation>GYORSÍTÓTÁRAZVA</translation>
     </message>
@@ -1821,7 +1959,7 @@ Ettől általában animálttá válik az alkalmazásablakok listáján szereplő
         <translation>NINCS GYORSÍTÓTÁRAZVA</translation>
     </message>
     <message>
-        <location line="-461"/>
+        <location line="-460"/>
         <source>Scale factor</source>
         <translation>Nagyítási tényező</translation>
     </message>
@@ -1996,7 +2134,7 @@ Ettől általában animálttá válik az alkalmazásablakok listáján szereplő
         <translation>Minden fájl (*)</translation>
     </message>
     <message>
-        <location line="+237"/>
+        <location line="+236"/>
         <source>Open Sessions File</source>
         <translation>Munkameneti fájl megnyitása</translation>
     </message>
@@ -2041,7 +2179,7 @@ Ettől általában animálttá válik az alkalmazásablakok listáján szereplő
 <context>
     <name>Waiting</name>
     <message>
-        <location filename="../qml/device-verification/Waiting.qml" line="+7"/>
+        <location filename="../qml/device-verification/Waiting.qml" line="+11"/>
         <source>Waiting for other party…</source>
         <translation>Várakozás a másik félre…</translation>
     </message>
@@ -2069,7 +2207,7 @@ Ettől általában animálttá válik az alkalmazásablakok listáján szereplő
 <context>
     <name>WelcomePage</name>
     <message>
-        <location filename="../../src/WelcomePage.cpp" line="+46"/>
+        <location filename="../../src/WelcomePage.cpp" line="+34"/>
         <source>Welcome to nheko! The desktop client for the Matrix protocol.</source>
         <translation>Üdvözöl a Nheko, egy asztali kliens a Matrix protokollhoz!</translation>
     </message>
@@ -2092,7 +2230,7 @@ Ettől általában animálttá válik az alkalmazásablakok listáján szereplő
 <context>
     <name>descriptiveTime</name>
     <message>
-        <location filename="../../src/Utils.cpp" line="+145"/>
+        <location filename="../../src/Utils.cpp" line="+149"/>
         <source>Yesterday</source>
         <translation>Tegnap</translation>
     </message>
@@ -2100,7 +2238,7 @@ Ettől általában animálttá válik az alkalmazásablakok listáján szereplő
 <context>
     <name>dialogs::CreateRoom</name>
     <message>
-        <location filename="../../src/dialogs/CreateRoom.cpp" line="+36"/>
+        <location filename="../../src/dialogs/CreateRoom.cpp" line="+40"/>
         <source>Create room</source>
         <translation>Szoba létrehozása</translation>
     </message>
@@ -2143,7 +2281,7 @@ Ettől általában animálttá válik az alkalmazásablakok listáján szereplő
 <context>
     <name>dialogs::FallbackAuth</name>
     <message>
-        <location filename="../../src/dialogs/FallbackAuth.cpp" line="+30"/>
+        <location filename="../../src/dialogs/FallbackAuth.cpp" line="+34"/>
         <source>Open Fallback in Browser</source>
         <translation>Fallback megnyitása böngészőben</translation>
     </message>
@@ -2166,7 +2304,7 @@ Ettől általában animálttá válik az alkalmazásablakok listáján szereplő
 <context>
     <name>dialogs::InviteUsers</name>
     <message>
-        <location filename="../../src/dialogs/InviteUsers.cpp" line="+42"/>
+        <location filename="../../src/dialogs/InviteUsers.cpp" line="+46"/>
         <source>Cancel</source>
         <translation>Mégse</translation>
     </message>
@@ -2179,7 +2317,7 @@ Ettől általában animálttá válik az alkalmazásablakok listáján szereplő
 <context>
     <name>dialogs::JoinRoom</name>
     <message>
-        <location filename="../../src/dialogs/JoinRoom.cpp" line="+30"/>
+        <location filename="../../src/dialogs/JoinRoom.cpp" line="+34"/>
         <source>Join</source>
         <translation>Csatlakozás</translation>
     </message>
@@ -2197,7 +2335,7 @@ Ettől általában animálttá válik az alkalmazásablakok listáján szereplő
 <context>
     <name>dialogs::LeaveRoom</name>
     <message>
-        <location filename="../../src/dialogs/LeaveRoom.cpp" line="+31"/>
+        <location filename="../../src/dialogs/LeaveRoom.cpp" line="+35"/>
         <source>Cancel</source>
         <translation>Mégse</translation>
     </message>
@@ -2210,7 +2348,7 @@ Ettől általában animálttá válik az alkalmazásablakok listáján szereplő
 <context>
     <name>dialogs::Logout</name>
     <message>
-        <location filename="../../src/dialogs/Logout.cpp" line="+47"/>
+        <location filename="../../src/dialogs/Logout.cpp" line="+35"/>
         <source>Cancel</source>
         <translation>Mégse</translation>
     </message>
@@ -2223,7 +2361,7 @@ Ettől általában animálttá válik az alkalmazásablakok listáján szereplő
 <context>
     <name>dialogs::PreviewUploadOverlay</name>
     <message>
-        <location filename="../../src/dialogs/PreviewUploadOverlay.cpp" line="+41"/>
+        <location filename="../../src/dialogs/PreviewUploadOverlay.cpp" line="+29"/>
         <source>Upload</source>
         <translation>Feltöltés</translation>
     </message>
@@ -2245,7 +2383,7 @@ Média mérete: %2
 <context>
     <name>dialogs::ReCaptcha</name>
     <message>
-        <location filename="../../src/dialogs/ReCaptcha.cpp" line="+31"/>
+        <location filename="../../src/dialogs/ReCaptcha.cpp" line="+35"/>
         <source>Cancel</source>
         <translation>Mégse</translation>
     </message>
@@ -2263,7 +2401,7 @@ Média mérete: %2
 <context>
     <name>dialogs::ReadReceipts</name>
     <message>
-        <location filename="../../src/dialogs/ReadReceipts.cpp" line="+120"/>
+        <location filename="../../src/dialogs/ReadReceipts.cpp" line="+124"/>
         <source>Read receipts</source>
         <translation>Olvasási jegyek</translation>
     </message>
@@ -2286,139 +2424,10 @@ Média mérete: %2
         <translation>Tegnap %1</translation>
     </message>
 </context>
-<context>
-    <name>dialogs::RoomSettings</name>
-    <message>
-        <location filename="../../src/dialogs/RoomSettings.cpp" line="+135"/>
-        <source>Settings</source>
-        <translation>Beállítások</translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Info</source>
-        <translation>Infó</translation>
-    </message>
-    <message>
-        <location line="+11"/>
-        <source>Internal ID</source>
-        <translation>Belső azonosító</translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>Room Version</source>
-        <translation>Szoba verziója</translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Notifications</source>
-        <translation>Értesítések</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Muted</source>
-        <translation>Némítva</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Mentions only</source>
-        <translation>Csak megemlítéskor</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>All messages</source>
-        <translation>Mindegyik üzenetnél</translation>
-    </message>
-    <message>
-        <location line="+97"/>
-        <source>Room access</source>
-        <translation>Szoba hozzáférhetősége</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Anyone and guests</source>
-        <translation>Bárkinek és vendégeknek</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Anyone</source>
-        <translation>Bárkinek, aki ismeri a szoba linkjét (vendégek nem)</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Invited users</source>
-        <translation>Meghívott felhasználók</translation>
-    </message>
-    <message>
-        <location line="+50"/>
-        <source>Encryption</source>
-        <translation>Titkosítás</translation>
-    </message>
-    <message>
-        <location line="+11"/>
-        <source>Whether or not the client should respond automatically with the session keys
- upon request. Use with caution, this is a temporary measure to test the
- E2E implementation until device verification is completed.</source>
-        <translation>Válaszoljon-e kérés esetén a kliens munkamenetkulcsokkal automatikusan. Óvatosan használandó, mivel ez csak egy átmeneti megoldás a végponttól végpontig (E2E) titkosítás teszteléséhez, amíg be nincs fejezve az eszközhitelesítés.</translation>
-    </message>
-    <message>
-        <location line="+20"/>
-        <source>End-to-End Encryption</source>
-        <translation>Végponttól végpontig titkosítás</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Encryption is currently experimental and things might break unexpectedly. &lt;br&gt;Please take note that it can&apos;t be disabled afterwards.</source>
-        <translation>A titkosítás jelenleg kísérleti stádiumú és váratlan furcsaságok történhetnek. &lt;br# Kérlek, vedd vigyelembe, hogy ha egyszer aktiváltad, nem lehet utána kikapcsolni.</translation>
-    </message>
-    <message>
-        <location line="-24"/>
-        <source>Respond to key requests</source>
-        <translation>Válasz kulcskérelmekre</translation>
-    </message>
-    <message numerus="yes">
-        <location line="+83"/>
-        <source>%n member(s)</source>
-        <translation>
-            <numerusform>%n tag</numerusform>
-            <numerusform>%n tag</numerusform>
-        </translation>
-    </message>
-    <message>
-        <location line="+142"/>
-        <source>Failed to enable encryption: %1</source>
-        <translation>Nem sikerült a titkosítás aktiválása: %1</translation>
-    </message>
-    <message>
-        <location line="+147"/>
-        <source>Select an avatar</source>
-        <translation>Profilkép kiválasztása</translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>All Files (*)</source>
-        <translation>Minden fájl (*)</translation>
-    </message>
-    <message>
-        <location line="+12"/>
-        <source>The selected file is not an image</source>
-        <translation>A kiválasztott fájl nem egy kép</translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Error while reading file: %1</source>
-        <translation>Hiba a fájl olvasása közben: %1</translation>
-    </message>
-    <message>
-        <location line="+35"/>
-        <location line="+20"/>
-        <source>Failed to upload image: %s</source>
-        <translation>Nem sikerült a kép feltöltése: %s</translation>
-    </message>
-</context>
 <context>
     <name>message-description sent:</name>
     <message>
-        <location filename="../../src/Utils.h" line="+108"/>
+        <location filename="../../src/Utils.h" line="+112"/>
         <source>You sent an audio clip</source>
         <translation>Küldtél egy hangfájlt</translation>
     </message>
@@ -2531,7 +2540,7 @@ Média mérete: %2
 <context>
     <name>popups::UserMentions</name>
     <message>
-        <location filename="../../src/popups/UserMentions.cpp" line="+64"/>
+        <location filename="../../src/popups/UserMentions.cpp" line="+68"/>
         <source>This Room</source>
         <translation>Ez a szoba</translation>
     </message>
diff --git a/resources/langs/nheko_it.ts b/resources/langs/nheko_it.ts
index 2c01a1bbf1dc46db082bbd9eba75d8d2d72024ca..5caa666af474dd4ce5aa7d917e3045477d769545 100644
--- a/resources/langs/nheko_it.ts
+++ b/resources/langs/nheko_it.ts
@@ -4,7 +4,7 @@
 <context>
     <name>ActiveCallBar</name>
     <message>
-        <location filename="../qml/voip/ActiveCallBar.qml" line="+66"/>
+        <location filename="../qml/voip/ActiveCallBar.qml" line="+106"/>
         <source>Calling...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15,8 +15,13 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+76"/>
-        <source>Toggle camera view</source>
+        <location line="+67"/>
+        <source>You are screen sharing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Hide/Show Picture-in-Picture</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -33,7 +38,7 @@
 <context>
     <name>AwaitingVerificationConfirmation</name>
     <message>
-        <location filename="../qml/device-verification/AwaitingVerificationConfirmation.qml" line="+7"/>
+        <location filename="../qml/device-verification/AwaitingVerificationConfirmation.qml" line="+11"/>
         <source>Awaiting Confirmation</source>
         <translation type="unfinished"></translation>
     </message>
@@ -51,7 +56,7 @@
 <context>
     <name>Cache</name>
     <message>
-        <location filename="../../src/Cache.cpp" line="+2084"/>
+        <location filename="../../src/Cache.cpp" line="+2026"/>
         <source>You joined this room.</source>
         <translation>Sei entrato in questa stanza.</translation>
     </message>
@@ -59,7 +64,7 @@
 <context>
     <name>CallInvite</name>
     <message>
-        <location filename="../qml/voip/CallInvite.qml" line="+66"/>
+        <location filename="../qml/voip/CallInvite.qml" line="+70"/>
         <source>Video Call</source>
         <translation type="unfinished"></translation>
     </message>
@@ -77,7 +82,7 @@
 <context>
     <name>CallInviteBar</name>
     <message>
-        <location filename="../qml/voip/CallInviteBar.qml" line="+60"/>
+        <location filename="../qml/voip/CallInviteBar.qml" line="+64"/>
         <source>Video Call</source>
         <translation type="unfinished"></translation>
     </message>
@@ -92,7 +97,7 @@
         <translation type="unfinished">Dispositivi</translation>
     </message>
     <message>
-        <location line="+11"/>
+        <location line="+10"/>
         <source>Accept</source>
         <translation type="unfinished">Accetta</translation>
     </message>
@@ -117,36 +122,55 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>CallManager</name>
+    <message>
+        <location filename="../../src/CallManager.cpp" line="+521"/>
+        <source>Entire screen</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>ChatPage</name>
     <message>
-        <location filename="../../src/ChatPage.cpp" line="+215"/>
+        <location filename="../../src/ChatPage.cpp" line="+203"/>
         <source>Failed to invite user: %1</source>
         <translation>Impossibile invitare l&apos;utente: %1</translation>
     </message>
     <message>
         <location line="+4"/>
-        <location line="+797"/>
+        <location line="+806"/>
         <source>Invited user: %1</source>
         <translation>Invitato utente: %1</translation>
     </message>
     <message>
-        <location line="-500"/>
+        <location line="-510"/>
         <source>Migrating the cache to the current version failed. This can have different reasons. Please open an issue and try to use an older version in the mean time. Alternatively you can try deleting the cache manually.</source>
         <translation>Migrazione della cache alla versione corrente fallita. Questo può avere diverse cause. Per favore apri una issue e nel frattempo prova ad usare una versione più vecchia. In alternativa puoi provare a cancellare la cache manualmente.</translation>
     </message>
     <message>
-        <location line="+456"/>
+        <location line="+413"/>
+        <source>Confirm join</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Do you really want to join %1?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+44"/>
         <source>Room %1 created.</source>
         <translation>Stanza %1 creata.</translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+35"/>
+        <location line="+323"/>
         <source>Confirm invite</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="-322"/>
         <source>Do you really want to invite %1 (%2)?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -211,7 +235,12 @@
         <translation>Rimosso il ban dall&apos;utente: %1</translation>
     </message>
     <message>
-        <location line="-582"/>
+        <location line="+226"/>
+        <source>Do you really want to start a private chat with %1?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-818"/>
         <source>Cache migration failed!</source>
         <translation>Migrazione della cache fallita!</translation>
     </message>
@@ -236,7 +265,7 @@
         <translation>Impossibile ripristinare i dati salvati. Per favore accedi nuovamente.</translation>
     </message>
     <message>
-        <location line="+165"/>
+        <location line="+157"/>
         <source>Failed to setup encryption keys. Server response: %1 %2. Please try again later.</source>
         <translation>Impossibile configurare le chiavi crittografiche. Risposta del server: %1 %2. Per favore riprova in seguito.</translation>
     </message>
@@ -247,7 +276,7 @@
         <translation>Per favore prova ad accedere nuovamente: %1</translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+47"/>
         <source>Failed to join room: %1</source>
         <translation>Impossibile accedere alla stanza: %1</translation>
     </message>
@@ -267,12 +296,12 @@
         <translation>Creazione della stanza fallita: %1</translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+18"/>
         <source>Failed to leave room: %1</source>
         <translation>Impossibile lasciare la stanza: %1</translation>
     </message>
     <message>
-        <location line="+54"/>
+        <location line="+61"/>
         <source>Failed to kick %1 from %2: %3</source>
         <translation type="unfinished"></translation>
     </message>
@@ -280,7 +309,7 @@
 <context>
     <name>CommunitiesListItem</name>
     <message>
-        <location filename="../../src/CommunitiesListItem.cpp" line="+26"/>
+        <location filename="../../src/CommunitiesListItem.cpp" line="+30"/>
         <source>Hide rooms with this tag or from this community</source>
         <translation type="unfinished"></translation>
     </message>
@@ -348,7 +377,7 @@
 <context>
     <name>DigitVerification</name>
     <message>
-        <location filename="../qml/device-verification/DigitVerification.qml" line="+7"/>
+        <location filename="../qml/device-verification/DigitVerification.qml" line="+11"/>
         <source>Verification Code</source>
         <translation type="unfinished"></translation>
     </message>
@@ -371,7 +400,7 @@
 <context>
     <name>EditModal</name>
     <message>
-        <location filename="../../src/dialogs/RoomSettings.cpp" line="+73"/>
+        <location filename="../../src/ui/RoomSettings.cpp" line="+42"/>
         <source>Apply</source>
         <translation>Applica</translation>
     </message>
@@ -394,7 +423,7 @@
 <context>
     <name>EmojiPicker</name>
     <message>
-        <location filename="../qml/emoji/EmojiPicker.qml" line="+113"/>
+        <location filename="../qml/emoji/EmojiPicker.qml" line="+117"/>
         <location line="+181"/>
         <source>Search</source>
         <translation type="unfinished"></translation>
@@ -443,7 +472,7 @@
 <context>
     <name>EmojiVerification</name>
     <message>
-        <location filename="../qml/device-verification/EmojiVerification.qml" line="+7"/>
+        <location filename="../qml/device-verification/EmojiVerification.qml" line="+11"/>
         <source>Verification Code</source>
         <translation type="unfinished"></translation>
     </message>
@@ -466,7 +495,7 @@
 <context>
     <name>EncryptionIndicator</name>
     <message>
-        <location filename="../qml/EncryptionIndicator.qml" line="+19"/>
+        <location filename="../qml/EncryptionIndicator.qml" line="+23"/>
         <source>Encrypted</source>
         <translation>Criptato</translation>
     </message>
@@ -479,7 +508,7 @@
 <context>
     <name>EventStore</name>
     <message>
-        <location filename="../../src/timeline/EventStore.cpp" line="+612"/>
+        <location filename="../../src/timeline/EventStore.cpp" line="+613"/>
         <source>-- Encrypted Event (No keys found for decryption) --</source>
         <comment>Placeholder, when the message was not decrypted yet or can&apos;t be decrypted.</comment>
         <translation type="unfinished">-- Evento Criptato (Chiavi per la decriptazione non trovate) --</translation>
@@ -524,7 +553,7 @@
 <context>
     <name>Failed</name>
     <message>
-        <location filename="../qml/device-verification/Failed.qml" line="+7"/>
+        <location filename="../qml/device-verification/Failed.qml" line="+11"/>
         <source>Verification failed</source>
         <translation type="unfinished"></translation>
     </message>
@@ -558,7 +587,7 @@
 <context>
     <name>InputBar</name>
     <message>
-        <location filename="../../src/timeline/InputBar.cpp" line="+227"/>
+        <location filename="../../src/timeline/InputBar.cpp" line="+253"/>
         <source>Select a file</source>
         <translation type="unfinished">Seleziona un file</translation>
     </message>
@@ -568,7 +597,7 @@
         <translation type="unfinished">Tutti i File (*)</translation>
     </message>
     <message>
-        <location line="+384"/>
+        <location line="+371"/>
         <source>Failed to upload media. Please try again.</source>
         <translation type="unfinished">Impossibile inviare il file multimediale. Per favore riprova.</translation>
     </message>
@@ -576,7 +605,7 @@
 <context>
     <name>InviteeItem</name>
     <message>
-        <location filename="../../src/InviteeItem.cpp" line="+18"/>
+        <location filename="../../src/InviteeItem.cpp" line="+22"/>
         <source>Remove</source>
         <translation>Rimuovi</translation>
     </message>
@@ -584,7 +613,7 @@
 <context>
     <name>LoginPage</name>
     <message>
-        <location filename="../../src/LoginPage.cpp" line="+92"/>
+        <location filename="../../src/LoginPage.cpp" line="+80"/>
         <source>Matrix ID</source>
         <translation>ID Matrix</translation>
     </message>
@@ -643,20 +672,19 @@ Esempio: https://server.mio:8787</translation>
     </message>
     <message>
         <location line="+19"/>
-        <location line="+218"/>
         <source>LOGIN</source>
         <translation>ACCEDI</translation>
     </message>
     <message>
-        <location line="-151"/>
+        <location line="+84"/>
         <location line="+11"/>
-        <location line="+157"/>
+        <location line="+156"/>
         <location line="+11"/>
         <source>You have entered an invalid Matrix ID  e.g @joe:matrix.org</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-132"/>
+        <location line="-131"/>
         <source>Autodiscovery failed. Received malformed response.</source>
         <translation>Ricerca automatica fallita. Ricevuta risposta malformata.</translation>
     </message>
@@ -681,12 +709,12 @@ Esempio: https://server.mio:8787</translation>
         <translation>Avvenuto un errore sconosciuto. Assicurati che il dominio dell&apos;homeserver sia valido.</translation>
     </message>
     <message>
-        <location line="+59"/>
+        <location line="-168"/>
         <source>SSO LOGIN</source>
         <translation>ACCESSO SSO</translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+263"/>
         <source>Empty password</source>
         <translation>Password vuota</translation>
     </message>
@@ -699,7 +727,7 @@ Esempio: https://server.mio:8787</translation>
 <context>
     <name>MemberList</name>
     <message>
-        <location filename="../../src/dialogs/MemberList.cpp" line="+90"/>
+        <location filename="../../src/dialogs/MemberList.cpp" line="+94"/>
         <source>Room members</source>
         <translation>Membri della stanza</translation>
     </message>
@@ -712,7 +740,7 @@ Esempio: https://server.mio:8787</translation>
 <context>
     <name>MessageDelegate</name>
     <message>
-        <location filename="../qml/delegates/MessageDelegate.qml" line="+105"/>
+        <location filename="../qml/delegates/MessageDelegate.qml" line="+109"/>
         <location line="+9"/>
         <source>removed</source>
         <translation type="unfinished"></translation>
@@ -781,7 +809,7 @@ Esempio: https://server.mio:8787</translation>
 <context>
     <name>MessageInput</name>
     <message>
-        <location filename="../qml/MessageInput.qml" line="+38"/>
+        <location filename="../qml/MessageInput.qml" line="+42"/>
         <source>Hang up</source>
         <translation type="unfinished"></translation>
     </message>
@@ -791,22 +819,22 @@ Esempio: https://server.mio:8787</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+25"/>
         <source>Send a file</source>
         <translation type="unfinished">Invia un file</translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+42"/>
         <source>Write a message...</source>
         <translation type="unfinished">Scrivi un messaggio…</translation>
     </message>
     <message>
-        <location line="+186"/>
+        <location line="+211"/>
         <source>Emoji</source>
         <translation type="unfinished">Emoji</translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+16"/>
         <source>Send</source>
         <translation type="unfinished"></translation>
     </message>
@@ -814,7 +842,7 @@ Esempio: https://server.mio:8787</translation>
 <context>
     <name>NewVerificationRequest</name>
     <message>
-        <location filename="../qml/device-verification/NewVerificationRequest.qml" line="+7"/>
+        <location filename="../qml/device-verification/NewVerificationRequest.qml" line="+11"/>
         <source>Send Verification Request</source>
         <translation type="unfinished"></translation>
     </message>
@@ -872,7 +900,7 @@ Esempio: https://server.mio:8787</translation>
 <context>
     <name>PlaceCall</name>
     <message>
-        <location filename="../qml/voip/PlaceCall.qml" line="+36"/>
+        <location filename="../qml/voip/PlaceCall.qml" line="+48"/>
         <source>Place a call to %1?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -892,7 +920,12 @@ Esempio: https://server.mio:8787</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location line="+14"/>
+        <source>Screen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
         <source>Cancel</source>
         <translation type="unfinished">Annulla</translation>
     </message>
@@ -900,7 +933,7 @@ Esempio: https://server.mio:8787</translation>
 <context>
     <name>Placeholder</name>
     <message>
-        <location filename="../qml/delegates/Placeholder.qml" line="+4"/>
+        <location filename="../qml/delegates/Placeholder.qml" line="+8"/>
         <source>unimplemented event: </source>
         <translation>event non implementato: </translation>
     </message>
@@ -908,7 +941,7 @@ Esempio: https://server.mio:8787</translation>
 <context>
     <name>QCoreApplication</name>
     <message>
-        <location filename="../../src/main.cpp" line="+179"/>
+        <location filename="../../src/main.cpp" line="+167"/>
         <source>Create a unique profile, which allows you to log into several accounts at the same time and start multiple instances of nheko.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -926,7 +959,7 @@ Esempio: https://server.mio:8787</translation>
 <context>
     <name>QuickSwitcher</name>
     <message>
-        <location filename="../../src/QuickSwitcher.cpp" line="+74"/>
+        <location filename="../../src/QuickSwitcher.cpp" line="+62"/>
         <source>Search for a room...</source>
         <translation>Cerca una stanza…</translation>
     </message>
@@ -934,18 +967,18 @@ Esempio: https://server.mio:8787</translation>
 <context>
     <name>RegisterPage</name>
     <message>
-        <location filename="../../src/RegisterPage.cpp" line="+89"/>
+        <location filename="../../src/RegisterPage.cpp" line="+77"/>
         <source>Username</source>
         <translation>Nome utente</translation>
     </message>
     <message>
         <location line="+2"/>
-        <location line="+286"/>
+        <location line="+287"/>
         <source>The username must not be empty, and must contain only the characters a-z, 0-9, ., _, =, -, and /.</source>
         <translation>Il nome utente non deve essere vuoto e deve contenere solo i caratteri a-z, 0-9, ., _, =, -, e /.</translation>
     </message>
     <message>
-        <location line="-282"/>
+        <location line="-283"/>
         <source>Password</source>
         <translation>Password</translation>
     </message>
@@ -980,7 +1013,7 @@ Esempio: https://server.mio:8787</translation>
         <translation>Non ci sono processi di registrazione supportati!</translation>
     </message>
     <message>
-        <location line="+209"/>
+        <location line="+210"/>
         <source>One or more fields have invalid inputs. Please correct those issues and try again.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1003,7 +1036,7 @@ Esempio: https://server.mio:8787</translation>
 <context>
     <name>ReplyPopup</name>
     <message>
-        <location filename="../qml/ReplyPopup.qml" line="+45"/>
+        <location filename="../qml/ReplyPopup.qml" line="+49"/>
         <source>Close</source>
         <translation>Chiudi</translation>
     </message>
@@ -1016,7 +1049,7 @@ Esempio: https://server.mio:8787</translation>
 <context>
     <name>RoomInfo</name>
     <message>
-        <location filename="../../src/Cache.cpp" line="+1861"/>
+        <location filename="../../src/Cache.cpp" line="+1793"/>
         <source>no version stored</source>
         <translation>nessuna versione memorizzata</translation>
     </message>
@@ -1024,7 +1057,7 @@ Esempio: https://server.mio:8787</translation>
 <context>
     <name>RoomInfoListItem</name>
     <message>
-        <location filename="../../src/RoomInfoListItem.cpp" line="+102"/>
+        <location filename="../../src/RoomInfoListItem.cpp" line="+90"/>
         <source>Leave room</source>
         <translation>Lascia la stanza</translation>
     </message>
@@ -1086,10 +1119,116 @@ Esempio: https://server.mio:8787</translation>
         <translation>Rifiuta</translation>
     </message>
 </context>
+<context>
+    <name>RoomSettings</name>
+    <message>
+        <location filename="../qml/RoomSettings.qml" line="+204"/>
+        <source>End-to-End Encryption</source>
+        <translation type="unfinished">Crittografia End-to-End</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Encryption is currently experimental and things might break unexpectedly. &lt;br&gt;
+                            Please take note that it can&apos;t be disabled afterwards.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>Whether or not the client should respond automatically with the session keys
+                                upon request. Use with caution, this is a temporary measure to test the
+                                E2E implementation until device verification is completed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/ui/RoomSettings.cpp" line="+267"/>
+        <source>Failed to enable encryption: %1</source>
+        <translation type="unfinished">Impossibile abilitare la crittografia: %1</translation>
+    </message>
+    <message>
+        <location line="+228"/>
+        <source>Select an avatar</source>
+        <translation type="unfinished">Scegli un avatar</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>All Files (*)</source>
+        <translation type="unfinished">Tutti i File (*)</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>The selected file is not an image</source>
+        <translation type="unfinished">Il file selezionato non è un&apos;immagine</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Error while reading file: %1</source>
+        <translation type="unfinished">Errore durante la lettura del file: %1</translation>
+    </message>
+    <message>
+        <location line="+34"/>
+        <location line="+20"/>
+        <source>Failed to upload image: %s</source>
+        <translation type="unfinished">Impossibile fare l&apos;upload dell&apos;immagine: %s</translation>
+    </message>
+</context>
+<context>
+    <name>ScreenShare</name>
+    <message>
+        <location filename="../qml/voip/ScreenShare.qml" line="+30"/>
+        <source>Share desktop with %1?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Window:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Frame rate:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Include your camera picture-in-picture</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>Request remote camera</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location line="+9"/>
+        <source>View your callee&apos;s camera like a regular video call</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Hide mouse cursor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Share</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Preview</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Annulla</translation>
+    </message>
+</context>
 <context>
     <name>SideBarActions</name>
     <message>
-        <location filename="../../src/SideBarActions.cpp" line="+40"/>
+        <location filename="../../src/SideBarActions.cpp" line="+44"/>
         <source>User settings</source>
         <translation>Impostazioni utente</translation>
     </message>
@@ -1117,7 +1256,7 @@ Esempio: https://server.mio:8787</translation>
 <context>
     <name>StatusIndicator</name>
     <message>
-        <location filename="../qml/StatusIndicator.qml" line="+17"/>
+        <location filename="../qml/StatusIndicator.qml" line="+21"/>
         <source>Failed</source>
         <translation>Fallito</translation>
     </message>
@@ -1140,7 +1279,7 @@ Esempio: https://server.mio:8787</translation>
 <context>
     <name>Success</name>
     <message>
-        <location filename="../qml/device-verification/Success.qml" line="+6"/>
+        <location filename="../qml/device-verification/Success.qml" line="+10"/>
         <source>Successful Verification</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1158,7 +1297,7 @@ Esempio: https://server.mio:8787</translation>
 <context>
     <name>TimelineModel</name>
     <message>
-        <location filename="../../src/timeline/TimelineModel.cpp" line="+895"/>
+        <location filename="../../src/timeline/TimelineModel.cpp" line="+911"/>
         <source>Message redaction failed: %1</source>
         <translation>Oscuramento del messaggio fallito: %1</translation>
     </message>
@@ -1308,12 +1447,12 @@ Esempio: https://server.mio:8787</translation>
         <translation>%1 ha oscurato la sua bussata.</translation>
     </message>
     <message>
-        <location line="-795"/>
+        <location line="-798"/>
         <source>You joined this room.</source>
         <translation>Sei entrato in questa stanza.</translation>
     </message>
     <message>
-        <location line="+797"/>
+        <location line="+800"/>
         <source>Rejected the knock from %1.</source>
         <translation>Rifiutata la bussata di %1.</translation>
     </message>
@@ -1337,7 +1476,7 @@ Esempio: https://server.mio:8787</translation>
 <context>
     <name>TimelineRow</name>
     <message>
-        <location filename="../qml/TimelineRow.qml" line="+99"/>
+        <location filename="../qml/TimelineRow.qml" line="+100"/>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1365,7 +1504,7 @@ Esempio: https://server.mio:8787</translation>
 <context>
     <name>TimelineView</name>
     <message>
-        <location filename="../qml/TimelineView.qml" line="+85"/>
+        <location filename="../qml/TimelineView.qml" line="+97"/>
         <source>React</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1415,7 +1554,7 @@ Esempio: https://server.mio:8787</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+61"/>
         <source>No room open</source>
         <translation>Nessuna stanza aperta</translation>
     </message>
@@ -1423,7 +1562,7 @@ Esempio: https://server.mio:8787</translation>
 <context>
     <name>TimelineViewManager</name>
     <message>
-        <location filename="../../src/timeline/TimelineViewManager.cpp" line="+423"/>
+        <location filename="../../src/timeline/TimelineViewManager.cpp" line="+430"/>
         <source>No encrypted private chat found with this user. Create an encrypted private chat with this user and try again.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1431,7 +1570,7 @@ Esempio: https://server.mio:8787</translation>
 <context>
     <name>TopBar</name>
     <message>
-        <location filename="../qml/TopBar.qml" line="+43"/>
+        <location filename="../qml/TopBar.qml" line="+47"/>
         <source>Back to room list</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1470,7 +1609,7 @@ Esempio: https://server.mio:8787</translation>
 <context>
     <name>TrayIcon</name>
     <message>
-        <location filename="../../src/TrayIcon.cpp" line="+122"/>
+        <location filename="../../src/TrayIcon.cpp" line="+110"/>
         <source>Show</source>
         <translation>Rivela</translation>
     </message>
@@ -1483,7 +1622,7 @@ Esempio: https://server.mio:8787</translation>
 <context>
     <name>UserInfoWidget</name>
     <message>
-        <location filename="../../src/UserInfoWidget.cpp" line="+95"/>
+        <location filename="../../src/UserInfoWidget.cpp" line="+82"/>
         <source>Logout</source>
         <translation>Disconnettiti</translation>
     </message>
@@ -1531,7 +1670,7 @@ Esempio: https://server.mio:8787</translation>
 <context>
     <name>UserProfile</name>
     <message>
-        <location filename="../qml/UserProfile.qml" line="+133"/>
+        <location filename="../qml/UserProfile.qml" line="+137"/>
         <source>Verify</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1551,7 +1690,7 @@ Esempio: https://server.mio:8787</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/UserProfile.cpp" line="+296"/>
+        <location filename="../../src/ui/UserProfile.cpp" line="+301"/>
         <source>Select an avatar</source>
         <translation type="unfinished">Scegli un avatar</translation>
     </message>
@@ -1574,7 +1713,7 @@ Esempio: https://server.mio:8787</translation>
 <context>
     <name>UserSettings</name>
     <message>
-        <location filename="../../src/UserSettingsPage.cpp" line="+345"/>
+        <location filename="../../src/UserSettingsPage.cpp" line="+337"/>
         <location filename="../../src/UserSettingsPage.h" line="+183"/>
         <source>Default</source>
         <translation type="unfinished"></translation>
@@ -1583,7 +1722,7 @@ Esempio: https://server.mio:8787</translation>
 <context>
     <name>UserSettingsPage</name>
     <message>
-        <location line="+496"/>
+        <location line="+540"/>
         <source>Minimize to tray</source>
         <translation>Minimizza nella tray</translation>
     </message>
@@ -1799,7 +1938,7 @@ This usually causes the application icon in the task bar to animate in some fash
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+407"/>
+        <location line="+406"/>
         <source>CACHED</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1809,7 +1948,7 @@ This usually causes the application icon in the task bar to animate in some fash
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-461"/>
+        <location line="-460"/>
         <source>Scale factor</source>
         <translation>Fattore di scala</translation>
     </message>
@@ -1984,7 +2123,7 @@ This usually causes the application icon in the task bar to animate in some fash
         <translation type="unfinished">Tutti i File (*)</translation>
     </message>
     <message>
-        <location line="+237"/>
+        <location line="+236"/>
         <source>Open Sessions File</source>
         <translation>Apri File delle Sessioni</translation>
     </message>
@@ -2029,7 +2168,7 @@ This usually causes the application icon in the task bar to animate in some fash
 <context>
     <name>Waiting</name>
     <message>
-        <location filename="../qml/device-verification/Waiting.qml" line="+7"/>
+        <location filename="../qml/device-verification/Waiting.qml" line="+11"/>
         <source>Waiting for other party…</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2057,7 +2196,7 @@ This usually causes the application icon in the task bar to animate in some fash
 <context>
     <name>WelcomePage</name>
     <message>
-        <location filename="../../src/WelcomePage.cpp" line="+46"/>
+        <location filename="../../src/WelcomePage.cpp" line="+34"/>
         <source>Welcome to nheko! The desktop client for the Matrix protocol.</source>
         <translation>Benvenuto su nheko! Il client desktop per il protocollo Matrix.</translation>
     </message>
@@ -2080,7 +2219,7 @@ This usually causes the application icon in the task bar to animate in some fash
 <context>
     <name>descriptiveTime</name>
     <message>
-        <location filename="../../src/Utils.cpp" line="+145"/>
+        <location filename="../../src/Utils.cpp" line="+149"/>
         <source>Yesterday</source>
         <translation>Ieri</translation>
     </message>
@@ -2088,7 +2227,7 @@ This usually causes the application icon in the task bar to animate in some fash
 <context>
     <name>dialogs::CreateRoom</name>
     <message>
-        <location filename="../../src/dialogs/CreateRoom.cpp" line="+36"/>
+        <location filename="../../src/dialogs/CreateRoom.cpp" line="+40"/>
         <source>Create room</source>
         <translation>Crea stanza</translation>
     </message>
@@ -2131,7 +2270,7 @@ This usually causes the application icon in the task bar to animate in some fash
 <context>
     <name>dialogs::FallbackAuth</name>
     <message>
-        <location filename="../../src/dialogs/FallbackAuth.cpp" line="+30"/>
+        <location filename="../../src/dialogs/FallbackAuth.cpp" line="+34"/>
         <source>Open Fallback in Browser</source>
         <translation>Apertura di Ripiego nel Browser </translation>
     </message>
@@ -2154,7 +2293,7 @@ This usually causes the application icon in the task bar to animate in some fash
 <context>
     <name>dialogs::InviteUsers</name>
     <message>
-        <location filename="../../src/dialogs/InviteUsers.cpp" line="+42"/>
+        <location filename="../../src/dialogs/InviteUsers.cpp" line="+46"/>
         <source>Cancel</source>
         <translation>Annulla</translation>
     </message>
@@ -2167,7 +2306,7 @@ This usually causes the application icon in the task bar to animate in some fash
 <context>
     <name>dialogs::JoinRoom</name>
     <message>
-        <location filename="../../src/dialogs/JoinRoom.cpp" line="+30"/>
+        <location filename="../../src/dialogs/JoinRoom.cpp" line="+34"/>
         <source>Join</source>
         <translation>Entra</translation>
     </message>
@@ -2185,7 +2324,7 @@ This usually causes the application icon in the task bar to animate in some fash
 <context>
     <name>dialogs::LeaveRoom</name>
     <message>
-        <location filename="../../src/dialogs/LeaveRoom.cpp" line="+31"/>
+        <location filename="../../src/dialogs/LeaveRoom.cpp" line="+35"/>
         <source>Cancel</source>
         <translation>Annulla</translation>
     </message>
@@ -2198,7 +2337,7 @@ This usually causes the application icon in the task bar to animate in some fash
 <context>
     <name>dialogs::Logout</name>
     <message>
-        <location filename="../../src/dialogs/Logout.cpp" line="+47"/>
+        <location filename="../../src/dialogs/Logout.cpp" line="+35"/>
         <source>Cancel</source>
         <translation>Annulla</translation>
     </message>
@@ -2211,7 +2350,7 @@ This usually causes the application icon in the task bar to animate in some fash
 <context>
     <name>dialogs::PreviewUploadOverlay</name>
     <message>
-        <location filename="../../src/dialogs/PreviewUploadOverlay.cpp" line="+41"/>
+        <location filename="../../src/dialogs/PreviewUploadOverlay.cpp" line="+29"/>
         <source>Upload</source>
         <translation>Upload</translation>
     </message>
@@ -2233,7 +2372,7 @@ Peso media: %2
 <context>
     <name>dialogs::ReCaptcha</name>
     <message>
-        <location filename="../../src/dialogs/ReCaptcha.cpp" line="+31"/>
+        <location filename="../../src/dialogs/ReCaptcha.cpp" line="+35"/>
         <source>Cancel</source>
         <translation>Annulla</translation>
     </message>
@@ -2251,7 +2390,7 @@ Peso media: %2
 <context>
     <name>dialogs::ReadReceipts</name>
     <message>
-        <location filename="../../src/dialogs/ReadReceipts.cpp" line="+120"/>
+        <location filename="../../src/dialogs/ReadReceipts.cpp" line="+124"/>
         <source>Read receipts</source>
         <translation>Ricevute di lettura</translation>
     </message>
@@ -2274,141 +2413,10 @@ Peso media: %2
         <translation>Ieri %1</translation>
     </message>
 </context>
-<context>
-    <name>dialogs::RoomSettings</name>
-    <message>
-        <location filename="../../src/dialogs/RoomSettings.cpp" line="+135"/>
-        <source>Settings</source>
-        <translation>Impostazioni</translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Info</source>
-        <translation>Informazioni</translation>
-    </message>
-    <message>
-        <location line="+11"/>
-        <source>Internal ID</source>
-        <translation>ID interno</translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>Room Version</source>
-        <translation>Versione Stanza</translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Notifications</source>
-        <translation>Notifiche</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Muted</source>
-        <translation>Silenziata</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Mentions only</source>
-        <translation>Solo menzioni</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>All messages</source>
-        <translation>Tutti i messaggi</translation>
-    </message>
-    <message>
-        <location line="+97"/>
-        <source>Room access</source>
-        <translation>Accesso stanza</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Anyone and guests</source>
-        <translation>Chiunque ed ospiti</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Anyone</source>
-        <translation>Chiunque conosca il link della stanza (no ospiti)</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Invited users</source>
-        <translation>Utenti invitati</translation>
-    </message>
-    <message>
-        <location line="+50"/>
-        <source>Encryption</source>
-        <translation>Crittografia</translation>
-    </message>
-    <message>
-        <location line="+31"/>
-        <source>End-to-End Encryption</source>
-        <translation>Crittografia End-to-End</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Encryption is currently experimental and things might break unexpectedly. &lt;br&gt;Please take note that it can&apos;t be disabled afterwards.</source>
-        <translation>La crittografia è ancora sperimentale e le cose potrebbero rompersi inaspettatamente. &lt;br&gt;Per favore prendi nota che in seguito non potrà essere disabilitata.</translation>
-    </message>
-    <message>
-        <location line="-24"/>
-        <source>Respond to key requests</source>
-        <translation>Rispondi alle richieste di chiavi</translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Whether or not the client should respond automatically with the session keys
- upon request. Use with caution, this is a temporary measure to test the
- E2E implementation until device verification is completed.</source>
-        <translation>Indica se il client deve rispondere automaticamente con le chiavi di sessione
- su richiesta. Usa con cautela, questa è una misura temporanea per testare
- l&apos;implementazione di E2E fino al completamento della verifica dei dispositivi.</translation>
-    </message>
-    <message numerus="yes">
-        <location line="+80"/>
-        <source>%n member(s)</source>
-        <translation>
-            <numerusform>%n membro</numerusform>
-            <numerusform>%n membri</numerusform>
-        </translation>
-    </message>
-    <message>
-        <location line="+142"/>
-        <source>Failed to enable encryption: %1</source>
-        <translation>Impossibile abilitare la crittografia: %1</translation>
-    </message>
-    <message>
-        <location line="+147"/>
-        <source>Select an avatar</source>
-        <translation>Scegli un avatar</translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>All Files (*)</source>
-        <translation>Tutti i File (*)</translation>
-    </message>
-    <message>
-        <location line="+12"/>
-        <source>The selected file is not an image</source>
-        <translation>Il file selezionato non è un&apos;immagine</translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Error while reading file: %1</source>
-        <translation>Errore durante la lettura del file: %1</translation>
-    </message>
-    <message>
-        <location line="+35"/>
-        <location line="+20"/>
-        <source>Failed to upload image: %s</source>
-        <translation>Impossibile fare l&apos;upload dell&apos;immagine: %s</translation>
-    </message>
-</context>
 <context>
     <name>message-description sent:</name>
     <message>
-        <location filename="../../src/Utils.h" line="+108"/>
+        <location filename="../../src/Utils.h" line="+112"/>
         <source>You sent an audio clip</source>
         <translation>Hai inviato una clip audio</translation>
     </message>
@@ -2521,7 +2529,7 @@ Peso media: %2
 <context>
     <name>popups::UserMentions</name>
     <message>
-        <location filename="../../src/popups/UserMentions.cpp" line="+64"/>
+        <location filename="../../src/popups/UserMentions.cpp" line="+68"/>
         <source>This Room</source>
         <translation>Questa Stanza</translation>
     </message>
diff --git a/resources/langs/nheko_ja.ts b/resources/langs/nheko_ja.ts
index 18e18c207832317746ce5f6dd8976a9aae04d5e3..f6ea0b87ea4d980b929848010d59141885db8b9b 100644
--- a/resources/langs/nheko_ja.ts
+++ b/resources/langs/nheko_ja.ts
@@ -4,7 +4,7 @@
 <context>
     <name>ActiveCallBar</name>
     <message>
-        <location filename="../qml/voip/ActiveCallBar.qml" line="+66"/>
+        <location filename="../qml/voip/ActiveCallBar.qml" line="+106"/>
         <source>Calling...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15,8 +15,13 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+76"/>
-        <source>Toggle camera view</source>
+        <location line="+67"/>
+        <source>You are screen sharing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Hide/Show Picture-in-Picture</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -33,7 +38,7 @@
 <context>
     <name>AwaitingVerificationConfirmation</name>
     <message>
-        <location filename="../qml/device-verification/AwaitingVerificationConfirmation.qml" line="+7"/>
+        <location filename="../qml/device-verification/AwaitingVerificationConfirmation.qml" line="+11"/>
         <source>Awaiting Confirmation</source>
         <translation type="unfinished"></translation>
     </message>
@@ -51,7 +56,7 @@
 <context>
     <name>Cache</name>
     <message>
-        <location filename="../../src/Cache.cpp" line="+2084"/>
+        <location filename="../../src/Cache.cpp" line="+2026"/>
         <source>You joined this room.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -59,7 +64,7 @@
 <context>
     <name>CallInvite</name>
     <message>
-        <location filename="../qml/voip/CallInvite.qml" line="+66"/>
+        <location filename="../qml/voip/CallInvite.qml" line="+70"/>
         <source>Video Call</source>
         <translation type="unfinished"></translation>
     </message>
@@ -77,7 +82,7 @@
 <context>
     <name>CallInviteBar</name>
     <message>
-        <location filename="../qml/voip/CallInviteBar.qml" line="+60"/>
+        <location filename="../qml/voip/CallInviteBar.qml" line="+64"/>
         <source>Video Call</source>
         <translation type="unfinished"></translation>
     </message>
@@ -92,7 +97,7 @@
         <translation type="unfinished">デバイス</translation>
     </message>
     <message>
-        <location line="+11"/>
+        <location line="+10"/>
         <source>Accept</source>
         <translation type="unfinished">容認</translation>
     </message>
@@ -117,36 +122,55 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>CallManager</name>
+    <message>
+        <location filename="../../src/CallManager.cpp" line="+521"/>
+        <source>Entire screen</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>ChatPage</name>
     <message>
-        <location filename="../../src/ChatPage.cpp" line="+215"/>
+        <location filename="../../src/ChatPage.cpp" line="+203"/>
         <source>Failed to invite user: %1</source>
         <translation>ユーザーを招待できませんでした: %1</translation>
     </message>
     <message>
         <location line="+4"/>
-        <location line="+797"/>
+        <location line="+806"/>
         <source>Invited user: %1</source>
         <translation>招待されたユーザー: %1</translation>
     </message>
     <message>
-        <location line="-500"/>
+        <location line="-510"/>
         <source>Migrating the cache to the current version failed. This can have different reasons. Please open an issue and try to use an older version in the mean time. Alternatively you can try deleting the cache manually.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+456"/>
+        <location line="+413"/>
+        <source>Confirm join</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Do you really want to join %1?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+44"/>
         <source>Room %1 created.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+35"/>
+        <location line="+323"/>
         <source>Confirm invite</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="-322"/>
         <source>Do you really want to invite %1 (%2)?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -211,7 +235,12 @@
         <translation>永久追放を解除されたユーザー: %1</translation>
     </message>
     <message>
-        <location line="-582"/>
+        <location line="+226"/>
+        <source>Do you really want to start a private chat with %1?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-818"/>
         <source>Cache migration failed!</source>
         <translation type="unfinished"></translation>
     </message>
@@ -236,7 +265,7 @@
         <translation>セーブデータを復元できませんでした。もう一度ログインして下さい。</translation>
     </message>
     <message>
-        <location line="+165"/>
+        <location line="+157"/>
         <source>Failed to setup encryption keys. Server response: %1 %2. Please try again later.</source>
         <translation>暗号化鍵を設定できませんでした。サーバーの応答: %1 %2. 後でやり直して下さい。</translation>
     </message>
@@ -247,7 +276,7 @@
         <translation>もう一度ログインしてみて下さい: %1</translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+47"/>
         <source>Failed to join room: %1</source>
         <translation>部屋に参加できませんでした: %1</translation>
     </message>
@@ -267,12 +296,12 @@
         <translation>部屋を作成できませんでした: %1</translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+18"/>
         <source>Failed to leave room: %1</source>
         <translation>部屋から出られませんでした: %1</translation>
     </message>
     <message>
-        <location line="+54"/>
+        <location line="+61"/>
         <source>Failed to kick %1 from %2: %3</source>
         <translation type="unfinished"></translation>
     </message>
@@ -280,7 +309,7 @@
 <context>
     <name>CommunitiesListItem</name>
     <message>
-        <location filename="../../src/CommunitiesListItem.cpp" line="+26"/>
+        <location filename="../../src/CommunitiesListItem.cpp" line="+30"/>
         <source>Hide rooms with this tag or from this community</source>
         <translation type="unfinished"></translation>
     </message>
@@ -348,7 +377,7 @@
 <context>
     <name>DigitVerification</name>
     <message>
-        <location filename="../qml/device-verification/DigitVerification.qml" line="+7"/>
+        <location filename="../qml/device-verification/DigitVerification.qml" line="+11"/>
         <source>Verification Code</source>
         <translation type="unfinished"></translation>
     </message>
@@ -371,7 +400,7 @@
 <context>
     <name>EditModal</name>
     <message>
-        <location filename="../../src/dialogs/RoomSettings.cpp" line="+73"/>
+        <location filename="../../src/ui/RoomSettings.cpp" line="+42"/>
         <source>Apply</source>
         <translation>適用</translation>
     </message>
@@ -394,7 +423,7 @@
 <context>
     <name>EmojiPicker</name>
     <message>
-        <location filename="../qml/emoji/EmojiPicker.qml" line="+113"/>
+        <location filename="../qml/emoji/EmojiPicker.qml" line="+117"/>
         <location line="+181"/>
         <source>Search</source>
         <translation type="unfinished"></translation>
@@ -443,7 +472,7 @@
 <context>
     <name>EmojiVerification</name>
     <message>
-        <location filename="../qml/device-verification/EmojiVerification.qml" line="+7"/>
+        <location filename="../qml/device-verification/EmojiVerification.qml" line="+11"/>
         <source>Verification Code</source>
         <translation type="unfinished"></translation>
     </message>
@@ -466,7 +495,7 @@
 <context>
     <name>EncryptionIndicator</name>
     <message>
-        <location filename="../qml/EncryptionIndicator.qml" line="+19"/>
+        <location filename="../qml/EncryptionIndicator.qml" line="+23"/>
         <source>Encrypted</source>
         <translation>暗号化されています</translation>
     </message>
@@ -479,7 +508,7 @@
 <context>
     <name>EventStore</name>
     <message>
-        <location filename="../../src/timeline/EventStore.cpp" line="+612"/>
+        <location filename="../../src/timeline/EventStore.cpp" line="+613"/>
         <source>-- Encrypted Event (No keys found for decryption) --</source>
         <comment>Placeholder, when the message was not decrypted yet or can&apos;t be decrypted.</comment>
         <translation type="unfinished">-- 暗号化イベント (復号鍵が見つかりません) --</translation>
@@ -524,7 +553,7 @@
 <context>
     <name>Failed</name>
     <message>
-        <location filename="../qml/device-verification/Failed.qml" line="+7"/>
+        <location filename="../qml/device-verification/Failed.qml" line="+11"/>
         <source>Verification failed</source>
         <translation type="unfinished"></translation>
     </message>
@@ -558,7 +587,7 @@
 <context>
     <name>InputBar</name>
     <message>
-        <location filename="../../src/timeline/InputBar.cpp" line="+227"/>
+        <location filename="../../src/timeline/InputBar.cpp" line="+253"/>
         <source>Select a file</source>
         <translation type="unfinished">ファイルを選択</translation>
     </message>
@@ -568,7 +597,7 @@
         <translation type="unfinished">全てのファイル (*)</translation>
     </message>
     <message>
-        <location line="+384"/>
+        <location line="+371"/>
         <source>Failed to upload media. Please try again.</source>
         <translation type="unfinished">メディアをアップロードできませんでした。やり直して下さい。</translation>
     </message>
@@ -576,7 +605,7 @@
 <context>
     <name>InviteeItem</name>
     <message>
-        <location filename="../../src/InviteeItem.cpp" line="+18"/>
+        <location filename="../../src/InviteeItem.cpp" line="+22"/>
         <source>Remove</source>
         <translation>削除</translation>
     </message>
@@ -584,7 +613,7 @@
 <context>
     <name>LoginPage</name>
     <message>
-        <location filename="../../src/LoginPage.cpp" line="+92"/>
+        <location filename="../../src/LoginPage.cpp" line="+80"/>
         <source>Matrix ID</source>
         <translation>Matrix ID</translation>
     </message>
@@ -639,20 +668,19 @@ Example: https://server.my:8787</source>
     </message>
     <message>
         <location line="+19"/>
-        <location line="+218"/>
         <source>LOGIN</source>
         <translation>ログイン</translation>
     </message>
     <message>
-        <location line="-151"/>
+        <location line="+84"/>
         <location line="+11"/>
-        <location line="+157"/>
+        <location line="+156"/>
         <location line="+11"/>
         <source>You have entered an invalid Matrix ID  e.g @joe:matrix.org</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-132"/>
+        <location line="-131"/>
         <source>Autodiscovery failed. Received malformed response.</source>
         <translation>自動検出できませんでした。不正な形式の応答を受信しました。</translation>
     </message>
@@ -677,12 +705,12 @@ Example: https://server.my:8787</source>
         <translation>不明なエラーが発生しました。ホームサーバーのドメイン名が有効であるかを確認して下さい。</translation>
     </message>
     <message>
-        <location line="+59"/>
+        <location line="-168"/>
         <source>SSO LOGIN</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+263"/>
         <source>Empty password</source>
         <translation>パスワードが入力されていません</translation>
     </message>
@@ -695,7 +723,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>MemberList</name>
     <message>
-        <location filename="../../src/dialogs/MemberList.cpp" line="+90"/>
+        <location filename="../../src/dialogs/MemberList.cpp" line="+94"/>
         <source>Room members</source>
         <translation>部屋の参加者</translation>
     </message>
@@ -708,7 +736,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>MessageDelegate</name>
     <message>
-        <location filename="../qml/delegates/MessageDelegate.qml" line="+105"/>
+        <location filename="../qml/delegates/MessageDelegate.qml" line="+109"/>
         <location line="+9"/>
         <source>removed</source>
         <translation type="unfinished"></translation>
@@ -777,7 +805,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>MessageInput</name>
     <message>
-        <location filename="../qml/MessageInput.qml" line="+38"/>
+        <location filename="../qml/MessageInput.qml" line="+42"/>
         <source>Hang up</source>
         <translation type="unfinished"></translation>
     </message>
@@ -787,22 +815,22 @@ Example: https://server.my:8787</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+25"/>
         <source>Send a file</source>
         <translation type="unfinished">ファイルを送信</translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+42"/>
         <source>Write a message...</source>
         <translation type="unfinished">メッセージを書く...</translation>
     </message>
     <message>
-        <location line="+186"/>
+        <location line="+211"/>
         <source>Emoji</source>
         <translation type="unfinished">絵文字</translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+16"/>
         <source>Send</source>
         <translation type="unfinished"></translation>
     </message>
@@ -810,7 +838,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>NewVerificationRequest</name>
     <message>
-        <location filename="../qml/device-verification/NewVerificationRequest.qml" line="+7"/>
+        <location filename="../qml/device-verification/NewVerificationRequest.qml" line="+11"/>
         <source>Send Verification Request</source>
         <translation type="unfinished"></translation>
     </message>
@@ -868,7 +896,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>PlaceCall</name>
     <message>
-        <location filename="../qml/voip/PlaceCall.qml" line="+36"/>
+        <location filename="../qml/voip/PlaceCall.qml" line="+48"/>
         <source>Place a call to %1?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -888,7 +916,12 @@ Example: https://server.my:8787</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location line="+14"/>
+        <source>Screen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
         <source>Cancel</source>
         <translation type="unfinished">キャンセル</translation>
     </message>
@@ -896,7 +929,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>Placeholder</name>
     <message>
-        <location filename="../qml/delegates/Placeholder.qml" line="+4"/>
+        <location filename="../qml/delegates/Placeholder.qml" line="+8"/>
         <source>unimplemented event: </source>
         <translation>未実装のイベント: </translation>
     </message>
@@ -904,7 +937,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>QCoreApplication</name>
     <message>
-        <location filename="../../src/main.cpp" line="+179"/>
+        <location filename="../../src/main.cpp" line="+167"/>
         <source>Create a unique profile, which allows you to log into several accounts at the same time and start multiple instances of nheko.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -922,7 +955,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>QuickSwitcher</name>
     <message>
-        <location filename="../../src/QuickSwitcher.cpp" line="+74"/>
+        <location filename="../../src/QuickSwitcher.cpp" line="+62"/>
         <source>Search for a room...</source>
         <translation>部屋を探す...</translation>
     </message>
@@ -930,18 +963,18 @@ Example: https://server.my:8787</source>
 <context>
     <name>RegisterPage</name>
     <message>
-        <location filename="../../src/RegisterPage.cpp" line="+89"/>
+        <location filename="../../src/RegisterPage.cpp" line="+77"/>
         <source>Username</source>
         <translation>ユーザー名</translation>
     </message>
     <message>
         <location line="+2"/>
-        <location line="+286"/>
+        <location line="+287"/>
         <source>The username must not be empty, and must contain only the characters a-z, 0-9, ., _, =, -, and /.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-282"/>
+        <location line="-283"/>
         <source>Password</source>
         <translation>パスワード</translation>
     </message>
@@ -976,7 +1009,7 @@ Example: https://server.my:8787</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+209"/>
+        <location line="+210"/>
         <source>One or more fields have invalid inputs. Please correct those issues and try again.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -999,7 +1032,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>ReplyPopup</name>
     <message>
-        <location filename="../qml/ReplyPopup.qml" line="+45"/>
+        <location filename="../qml/ReplyPopup.qml" line="+49"/>
         <source>Close</source>
         <translation type="unfinished">閉じる</translation>
     </message>
@@ -1012,7 +1045,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>RoomInfo</name>
     <message>
-        <location filename="../../src/Cache.cpp" line="+1861"/>
+        <location filename="../../src/Cache.cpp" line="+1793"/>
         <source>no version stored</source>
         <translation>バージョンが保存されていません</translation>
     </message>
@@ -1020,7 +1053,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>RoomInfoListItem</name>
     <message>
-        <location filename="../../src/RoomInfoListItem.cpp" line="+102"/>
+        <location filename="../../src/RoomInfoListItem.cpp" line="+90"/>
         <source>Leave room</source>
         <translation>部屋を出る</translation>
     </message>
@@ -1082,10 +1115,116 @@ Example: https://server.my:8787</source>
         <translation>拒否</translation>
     </message>
 </context>
+<context>
+    <name>RoomSettings</name>
+    <message>
+        <location filename="../qml/RoomSettings.qml" line="+204"/>
+        <source>End-to-End Encryption</source>
+        <translation type="unfinished">エンドツーエンド暗号化</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Encryption is currently experimental and things might break unexpectedly. &lt;br&gt;
+                            Please take note that it can&apos;t be disabled afterwards.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>Whether or not the client should respond automatically with the session keys
+                                upon request. Use with caution, this is a temporary measure to test the
+                                E2E implementation until device verification is completed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/ui/RoomSettings.cpp" line="+267"/>
+        <source>Failed to enable encryption: %1</source>
+        <translation type="unfinished">暗号化を有効にできませんでした: %1</translation>
+    </message>
+    <message>
+        <location line="+228"/>
+        <source>Select an avatar</source>
+        <translation type="unfinished">アバターを選択</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>All Files (*)</source>
+        <translation type="unfinished">全てのファイル (*)</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>The selected file is not an image</source>
+        <translation type="unfinished">選択したファイルは画像ではありません</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Error while reading file: %1</source>
+        <translation type="unfinished">ファイルの読み込み時にエラーが発生しました: %1</translation>
+    </message>
+    <message>
+        <location line="+34"/>
+        <location line="+20"/>
+        <source>Failed to upload image: %s</source>
+        <translation type="unfinished">画像をアップロードできませんでした: %s</translation>
+    </message>
+</context>
+<context>
+    <name>ScreenShare</name>
+    <message>
+        <location filename="../qml/voip/ScreenShare.qml" line="+30"/>
+        <source>Share desktop with %1?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Window:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Frame rate:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Include your camera picture-in-picture</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>Request remote camera</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location line="+9"/>
+        <source>View your callee&apos;s camera like a regular video call</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Hide mouse cursor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Share</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Preview</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Cancel</source>
+        <translation type="unfinished">キャンセル</translation>
+    </message>
+</context>
 <context>
     <name>SideBarActions</name>
     <message>
-        <location filename="../../src/SideBarActions.cpp" line="+40"/>
+        <location filename="../../src/SideBarActions.cpp" line="+44"/>
         <source>User settings</source>
         <translation>ユーザー設定</translation>
     </message>
@@ -1113,7 +1252,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>StatusIndicator</name>
     <message>
-        <location filename="../qml/StatusIndicator.qml" line="+17"/>
+        <location filename="../qml/StatusIndicator.qml" line="+21"/>
         <source>Failed</source>
         <translation>失敗</translation>
     </message>
@@ -1136,7 +1275,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>Success</name>
     <message>
-        <location filename="../qml/device-verification/Success.qml" line="+6"/>
+        <location filename="../qml/device-verification/Success.qml" line="+10"/>
         <source>Successful Verification</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1154,7 +1293,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>TimelineModel</name>
     <message>
-        <location filename="../../src/timeline/TimelineModel.cpp" line="+895"/>
+        <location filename="../../src/timeline/TimelineModel.cpp" line="+911"/>
         <source>Message redaction failed: %1</source>
         <translation>メッセージを編集できませんでした: %1</translation>
     </message>
@@ -1303,12 +1442,12 @@ Example: https://server.my:8787</source>
         <translation>%1がノックを編集しました。</translation>
     </message>
     <message>
-        <location line="-795"/>
+        <location line="-798"/>
         <source>You joined this room.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+797"/>
+        <location line="+800"/>
         <source>Rejected the knock from %1.</source>
         <translation>%1からのノックを拒否しました。</translation>
     </message>
@@ -1332,7 +1471,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>TimelineRow</name>
     <message>
-        <location filename="../qml/TimelineRow.qml" line="+99"/>
+        <location filename="../qml/TimelineRow.qml" line="+100"/>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1360,7 +1499,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>TimelineView</name>
     <message>
-        <location filename="../qml/TimelineView.qml" line="+85"/>
+        <location filename="../qml/TimelineView.qml" line="+97"/>
         <source>React</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1410,7 +1549,7 @@ Example: https://server.my:8787</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+61"/>
         <source>No room open</source>
         <translation>部屋が開いていません</translation>
     </message>
@@ -1418,7 +1557,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>TimelineViewManager</name>
     <message>
-        <location filename="../../src/timeline/TimelineViewManager.cpp" line="+423"/>
+        <location filename="../../src/timeline/TimelineViewManager.cpp" line="+430"/>
         <source>No encrypted private chat found with this user. Create an encrypted private chat with this user and try again.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1426,7 +1565,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>TopBar</name>
     <message>
-        <location filename="../qml/TopBar.qml" line="+43"/>
+        <location filename="../qml/TopBar.qml" line="+47"/>
         <source>Back to room list</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1465,7 +1604,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>TrayIcon</name>
     <message>
-        <location filename="../../src/TrayIcon.cpp" line="+122"/>
+        <location filename="../../src/TrayIcon.cpp" line="+110"/>
         <source>Show</source>
         <translation>表示</translation>
     </message>
@@ -1478,7 +1617,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>UserInfoWidget</name>
     <message>
-        <location filename="../../src/UserInfoWidget.cpp" line="+95"/>
+        <location filename="../../src/UserInfoWidget.cpp" line="+82"/>
         <source>Logout</source>
         <translation>ログアウト</translation>
     </message>
@@ -1526,7 +1665,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>UserProfile</name>
     <message>
-        <location filename="../qml/UserProfile.qml" line="+133"/>
+        <location filename="../qml/UserProfile.qml" line="+137"/>
         <source>Verify</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1546,7 +1685,7 @@ Example: https://server.my:8787</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/UserProfile.cpp" line="+296"/>
+        <location filename="../../src/ui/UserProfile.cpp" line="+301"/>
         <source>Select an avatar</source>
         <translation type="unfinished">アバターを選択</translation>
     </message>
@@ -1569,7 +1708,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>UserSettings</name>
     <message>
-        <location filename="../../src/UserSettingsPage.cpp" line="+345"/>
+        <location filename="../../src/UserSettingsPage.cpp" line="+337"/>
         <location filename="../../src/UserSettingsPage.h" line="+183"/>
         <source>Default</source>
         <translation type="unfinished"></translation>
@@ -1578,7 +1717,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>UserSettingsPage</name>
     <message>
-        <location line="+496"/>
+        <location line="+540"/>
         <source>Minimize to tray</source>
         <translation>トレイへ最小化</translation>
     </message>
@@ -1794,7 +1933,7 @@ This usually causes the application icon in the task bar to animate in some fash
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+407"/>
+        <location line="+406"/>
         <source>CACHED</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1804,7 +1943,7 @@ This usually causes the application icon in the task bar to animate in some fash
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-461"/>
+        <location line="-460"/>
         <source>Scale factor</source>
         <translation>尺度係数</translation>
     </message>
@@ -1979,7 +2118,7 @@ This usually causes the application icon in the task bar to animate in some fash
         <translation type="unfinished">全てのファイル (*)</translation>
     </message>
     <message>
-        <location line="+237"/>
+        <location line="+236"/>
         <source>Open Sessions File</source>
         <translation>セッションファイルを開く</translation>
     </message>
@@ -2024,7 +2163,7 @@ This usually causes the application icon in the task bar to animate in some fash
 <context>
     <name>Waiting</name>
     <message>
-        <location filename="../qml/device-verification/Waiting.qml" line="+7"/>
+        <location filename="../qml/device-verification/Waiting.qml" line="+11"/>
         <source>Waiting for other party…</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2052,7 +2191,7 @@ This usually causes the application icon in the task bar to animate in some fash
 <context>
     <name>WelcomePage</name>
     <message>
-        <location filename="../../src/WelcomePage.cpp" line="+46"/>
+        <location filename="../../src/WelcomePage.cpp" line="+34"/>
         <source>Welcome to nheko! The desktop client for the Matrix protocol.</source>
         <translation>Matrixプロトコルのデスクトップクライアント、nhekoへようこそ!</translation>
     </message>
@@ -2075,7 +2214,7 @@ This usually causes the application icon in the task bar to animate in some fash
 <context>
     <name>descriptiveTime</name>
     <message>
-        <location filename="../../src/Utils.cpp" line="+145"/>
+        <location filename="../../src/Utils.cpp" line="+149"/>
         <source>Yesterday</source>
         <translation>昨日</translation>
     </message>
@@ -2083,7 +2222,7 @@ This usually causes the application icon in the task bar to animate in some fash
 <context>
     <name>dialogs::CreateRoom</name>
     <message>
-        <location filename="../../src/dialogs/CreateRoom.cpp" line="+36"/>
+        <location filename="../../src/dialogs/CreateRoom.cpp" line="+40"/>
         <source>Create room</source>
         <translation>部屋を作成</translation>
     </message>
@@ -2126,7 +2265,7 @@ This usually causes the application icon in the task bar to animate in some fash
 <context>
     <name>dialogs::FallbackAuth</name>
     <message>
-        <location filename="../../src/dialogs/FallbackAuth.cpp" line="+30"/>
+        <location filename="../../src/dialogs/FallbackAuth.cpp" line="+34"/>
         <source>Open Fallback in Browser</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2149,7 +2288,7 @@ This usually causes the application icon in the task bar to animate in some fash
 <context>
     <name>dialogs::InviteUsers</name>
     <message>
-        <location filename="../../src/dialogs/InviteUsers.cpp" line="+42"/>
+        <location filename="../../src/dialogs/InviteUsers.cpp" line="+46"/>
         <source>Cancel</source>
         <translation>キャンセル</translation>
     </message>
@@ -2162,7 +2301,7 @@ This usually causes the application icon in the task bar to animate in some fash
 <context>
     <name>dialogs::JoinRoom</name>
     <message>
-        <location filename="../../src/dialogs/JoinRoom.cpp" line="+30"/>
+        <location filename="../../src/dialogs/JoinRoom.cpp" line="+34"/>
         <source>Join</source>
         <translation>参加</translation>
     </message>
@@ -2180,7 +2319,7 @@ This usually causes the application icon in the task bar to animate in some fash
 <context>
     <name>dialogs::LeaveRoom</name>
     <message>
-        <location filename="../../src/dialogs/LeaveRoom.cpp" line="+31"/>
+        <location filename="../../src/dialogs/LeaveRoom.cpp" line="+35"/>
         <source>Cancel</source>
         <translation>キャンセル</translation>
     </message>
@@ -2193,7 +2332,7 @@ This usually causes the application icon in the task bar to animate in some fash
 <context>
     <name>dialogs::Logout</name>
     <message>
-        <location filename="../../src/dialogs/Logout.cpp" line="+47"/>
+        <location filename="../../src/dialogs/Logout.cpp" line="+35"/>
         <source>Cancel</source>
         <translation>キャンセル</translation>
     </message>
@@ -2206,7 +2345,7 @@ This usually causes the application icon in the task bar to animate in some fash
 <context>
     <name>dialogs::PreviewUploadOverlay</name>
     <message>
-        <location filename="../../src/dialogs/PreviewUploadOverlay.cpp" line="+41"/>
+        <location filename="../../src/dialogs/PreviewUploadOverlay.cpp" line="+29"/>
         <source>Upload</source>
         <translation>アップロード</translation>
     </message>
@@ -2228,7 +2367,7 @@ Media size: %2
 <context>
     <name>dialogs::ReCaptcha</name>
     <message>
-        <location filename="../../src/dialogs/ReCaptcha.cpp" line="+31"/>
+        <location filename="../../src/dialogs/ReCaptcha.cpp" line="+35"/>
         <source>Cancel</source>
         <translation>キャンセル</translation>
     </message>
@@ -2246,7 +2385,7 @@ Media size: %2
 <context>
     <name>dialogs::ReadReceipts</name>
     <message>
-        <location filename="../../src/dialogs/ReadReceipts.cpp" line="+120"/>
+        <location filename="../../src/dialogs/ReadReceipts.cpp" line="+124"/>
         <source>Read receipts</source>
         <translation>開封確認</translation>
     </message>
@@ -2269,140 +2408,10 @@ Media size: %2
         <translation>昨日 %1</translation>
     </message>
 </context>
-<context>
-    <name>dialogs::RoomSettings</name>
-    <message>
-        <location filename="../../src/dialogs/RoomSettings.cpp" line="+135"/>
-        <source>Settings</source>
-        <translation>設定</translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Info</source>
-        <translation>情報</translation>
-    </message>
-    <message>
-        <location line="+11"/>
-        <source>Internal ID</source>
-        <translation>内部ID</translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>Room Version</source>
-        <translation>部屋のバージョン</translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Notifications</source>
-        <translation>通知</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Muted</source>
-        <translation>ミュート</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Mentions only</source>
-        <translation>メンションのみ</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>All messages</source>
-        <translation>全てのメッセージ</translation>
-    </message>
-    <message>
-        <location line="+97"/>
-        <source>Room access</source>
-        <translation>部屋のアクセス権</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Anyone and guests</source>
-        <translation>登録ユーザーとゲスト</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Anyone</source>
-        <translation>登録ユーザーのみ</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Invited users</source>
-        <translation>招待された登録ユーザーのみ</translation>
-    </message>
-    <message>
-        <location line="+50"/>
-        <source>Encryption</source>
-        <translation>暗号化</translation>
-    </message>
-    <message>
-        <location line="+31"/>
-        <source>End-to-End Encryption</source>
-        <translation>エンドツーエンド暗号化</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Encryption is currently experimental and things might break unexpectedly. &lt;br&gt;Please take note that it can&apos;t be disabled afterwards.</source>
-        <translation>暗号化機能は実験段階にあるので、予期せずに壊れるかもしれません。 &lt;br&gt;この機能を後から無効にできないことに注意して下さい。</translation>
-    </message>
-    <message>
-        <location line="-24"/>
-        <source>Respond to key requests</source>
-        <translation>鍵の要求に応答する</translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Whether or not the client should respond automatically with the session keys
- upon request. Use with caution, this is a temporary measure to test the
- E2E implementation until device verification is completed.</source>
-        <translation>クライアントがセッション鍵を要求された際に、自動的に応答するべきか否か。
-デバイス検証機能が実装されるまでのE2E暗号化を検査するための一時的な方法なので、
-これを利用する際は注意して下さい。</translation>
-    </message>
-    <message numerus="yes">
-        <location line="+80"/>
-        <source>%n member(s)</source>
-        <translation>
-            <numerusform>%n人</numerusform>
-        </translation>
-    </message>
-    <message>
-        <location line="+142"/>
-        <source>Failed to enable encryption: %1</source>
-        <translation>暗号化を有効にできませんでした: %1</translation>
-    </message>
-    <message>
-        <location line="+147"/>
-        <source>Select an avatar</source>
-        <translation>アバターを選択</translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>All Files (*)</source>
-        <translation>全てのファイル (*)</translation>
-    </message>
-    <message>
-        <location line="+12"/>
-        <source>The selected file is not an image</source>
-        <translation>選択したファイルは画像ではありません</translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Error while reading file: %1</source>
-        <translation>ファイルの読み込み時にエラーが発生しました: %1</translation>
-    </message>
-    <message>
-        <location line="+35"/>
-        <location line="+20"/>
-        <source>Failed to upload image: %s</source>
-        <translation>画像をアップロードできませんでした: %s</translation>
-    </message>
-</context>
 <context>
     <name>message-description sent:</name>
     <message>
-        <location filename="../../src/Utils.h" line="+108"/>
+        <location filename="../../src/Utils.h" line="+112"/>
         <source>You sent an audio clip</source>
         <translation>音声データを送信しました</translation>
     </message>
@@ -2515,7 +2524,7 @@ Media size: %2
 <context>
     <name>popups::UserMentions</name>
     <message>
-        <location filename="../../src/popups/UserMentions.cpp" line="+64"/>
+        <location filename="../../src/popups/UserMentions.cpp" line="+68"/>
         <source>This Room</source>
         <translation>この部屋</translation>
     </message>
diff --git a/resources/langs/nheko_ml.ts b/resources/langs/nheko_ml.ts
index 9905ff35c2a97600569e336b9f97626fba84db72..f74ce8c06016349c90d8a60b8aa43496699a108c 100644
--- a/resources/langs/nheko_ml.ts
+++ b/resources/langs/nheko_ml.ts
@@ -4,7 +4,7 @@
 <context>
     <name>ActiveCallBar</name>
     <message>
-        <location filename="../qml/voip/ActiveCallBar.qml" line="+66"/>
+        <location filename="../qml/voip/ActiveCallBar.qml" line="+106"/>
         <source>Calling...</source>
         <translation>വിളിക്കുന്നു...</translation>
     </message>
@@ -15,8 +15,13 @@
         <translation>ബന്ധിപ്പിക്കുന്നു...</translation>
     </message>
     <message>
-        <location line="+76"/>
-        <source>Toggle camera view</source>
+        <location line="+67"/>
+        <source>You are screen sharing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Hide/Show Picture-in-Picture</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -33,7 +38,7 @@
 <context>
     <name>AwaitingVerificationConfirmation</name>
     <message>
-        <location filename="../qml/device-verification/AwaitingVerificationConfirmation.qml" line="+7"/>
+        <location filename="../qml/device-verification/AwaitingVerificationConfirmation.qml" line="+11"/>
         <source>Awaiting Confirmation</source>
         <translation>സ്ഥിരീകരണത്തിനായി കാത്തിരിക്കുന്നു</translation>
     </message>
@@ -51,7 +56,7 @@
 <context>
     <name>Cache</name>
     <message>
-        <location filename="../../src/Cache.cpp" line="+2084"/>
+        <location filename="../../src/Cache.cpp" line="+2026"/>
         <source>You joined this room.</source>
         <translation>നിങ്ങൾ ഈ മുറിയിൽ ചേർന്നു.</translation>
     </message>
@@ -59,7 +64,7 @@
 <context>
     <name>CallInvite</name>
     <message>
-        <location filename="../qml/voip/CallInvite.qml" line="+66"/>
+        <location filename="../qml/voip/CallInvite.qml" line="+70"/>
         <source>Video Call</source>
         <translation>വീഡിയോ കോൾ</translation>
     </message>
@@ -77,7 +82,7 @@
 <context>
     <name>CallInviteBar</name>
     <message>
-        <location filename="../qml/voip/CallInviteBar.qml" line="+60"/>
+        <location filename="../qml/voip/CallInviteBar.qml" line="+64"/>
         <source>Video Call</source>
         <translation>വീഡിയോ കോൾ</translation>
     </message>
@@ -92,7 +97,7 @@
         <translation>ഉപകരണങ്ങൾ</translation>
     </message>
     <message>
-        <location line="+11"/>
+        <location line="+10"/>
         <source>Accept</source>
         <translation type="unfinished"></translation>
     </message>
@@ -117,36 +122,55 @@
         <translation>മൈക്രോഫോണൊന്നും കണ്ടെത്തിയില്ല.</translation>
     </message>
 </context>
+<context>
+    <name>CallManager</name>
+    <message>
+        <location filename="../../src/CallManager.cpp" line="+521"/>
+        <source>Entire screen</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>ChatPage</name>
     <message>
-        <location filename="../../src/ChatPage.cpp" line="+215"/>
+        <location filename="../../src/ChatPage.cpp" line="+203"/>
         <source>Failed to invite user: %1</source>
         <translation>ഉപയോക്താവിനെ ക്ഷണിക്കുന്നതിൽ പരാജയപ്പെട്ടു: %1</translation>
     </message>
     <message>
         <location line="+4"/>
-        <location line="+797"/>
+        <location line="+806"/>
         <source>Invited user: %1</source>
         <translation>ക്ഷണിച്ച ഉപയോക്താവ്:% 1</translation>
     </message>
     <message>
-        <location line="-500"/>
+        <location line="-510"/>
         <source>Migrating the cache to the current version failed. This can have different reasons. Please open an issue and try to use an older version in the mean time. Alternatively you can try deleting the cache manually.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+456"/>
+        <location line="+413"/>
+        <source>Confirm join</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Do you really want to join %1?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+44"/>
         <source>Room %1 created.</source>
         <translation>%1 മുറി സൃഷ്ടിച്ചു</translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+35"/>
+        <location line="+323"/>
         <source>Confirm invite</source>
         <translation>ക്ഷണം ഉറപ്പാക്കു</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="-322"/>
         <source>Do you really want to invite %1 (%2)?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -211,7 +235,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-582"/>
+        <location line="+226"/>
+        <source>Do you really want to start a private chat with %1?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-818"/>
         <source>Cache migration failed!</source>
         <translation type="unfinished"></translation>
     </message>
@@ -236,7 +265,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+165"/>
+        <location line="+157"/>
         <source>Failed to setup encryption keys. Server response: %1 %2. Please try again later.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -247,7 +276,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+47"/>
         <source>Failed to join room: %1</source>
         <translation>മുറിയിൽ ചേരുന്നതിൽ പരാജയം: %1</translation>
     </message>
@@ -267,12 +296,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+18"/>
         <source>Failed to leave room: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+54"/>
+        <location line="+61"/>
         <source>Failed to kick %1 from %2: %3</source>
         <translation type="unfinished"></translation>
     </message>
@@ -280,7 +309,7 @@
 <context>
     <name>CommunitiesListItem</name>
     <message>
-        <location filename="../../src/CommunitiesListItem.cpp" line="+26"/>
+        <location filename="../../src/CommunitiesListItem.cpp" line="+30"/>
         <source>Hide rooms with this tag or from this community</source>
         <translation type="unfinished"></translation>
     </message>
@@ -348,7 +377,7 @@
 <context>
     <name>DigitVerification</name>
     <message>
-        <location filename="../qml/device-verification/DigitVerification.qml" line="+7"/>
+        <location filename="../qml/device-verification/DigitVerification.qml" line="+11"/>
         <source>Verification Code</source>
         <translation type="unfinished"></translation>
     </message>
@@ -371,7 +400,7 @@
 <context>
     <name>EditModal</name>
     <message>
-        <location filename="../../src/dialogs/RoomSettings.cpp" line="+73"/>
+        <location filename="../../src/ui/RoomSettings.cpp" line="+42"/>
         <source>Apply</source>
         <translation>പ്രയോഗിക്കുക</translation>
     </message>
@@ -394,7 +423,7 @@
 <context>
     <name>EmojiPicker</name>
     <message>
-        <location filename="../qml/emoji/EmojiPicker.qml" line="+113"/>
+        <location filename="../qml/emoji/EmojiPicker.qml" line="+117"/>
         <location line="+181"/>
         <source>Search</source>
         <translation>തിരയുക</translation>
@@ -443,7 +472,7 @@
 <context>
     <name>EmojiVerification</name>
     <message>
-        <location filename="../qml/device-verification/EmojiVerification.qml" line="+7"/>
+        <location filename="../qml/device-verification/EmojiVerification.qml" line="+11"/>
         <source>Verification Code</source>
         <translation type="unfinished"></translation>
     </message>
@@ -466,7 +495,7 @@
 <context>
     <name>EncryptionIndicator</name>
     <message>
-        <location filename="../qml/EncryptionIndicator.qml" line="+19"/>
+        <location filename="../qml/EncryptionIndicator.qml" line="+23"/>
         <source>Encrypted</source>
         <translation type="unfinished"></translation>
     </message>
@@ -479,7 +508,7 @@
 <context>
     <name>EventStore</name>
     <message>
-        <location filename="../../src/timeline/EventStore.cpp" line="+612"/>
+        <location filename="../../src/timeline/EventStore.cpp" line="+613"/>
         <source>-- Encrypted Event (No keys found for decryption) --</source>
         <comment>Placeholder, when the message was not decrypted yet or can&apos;t be decrypted.</comment>
         <translation type="unfinished"></translation>
@@ -524,7 +553,7 @@
 <context>
     <name>Failed</name>
     <message>
-        <location filename="../qml/device-verification/Failed.qml" line="+7"/>
+        <location filename="../qml/device-verification/Failed.qml" line="+11"/>
         <source>Verification failed</source>
         <translation type="unfinished"></translation>
     </message>
@@ -558,7 +587,7 @@
 <context>
     <name>InputBar</name>
     <message>
-        <location filename="../../src/timeline/InputBar.cpp" line="+227"/>
+        <location filename="../../src/timeline/InputBar.cpp" line="+253"/>
         <source>Select a file</source>
         <translation>ഒരു ഫയൽ തിരഞ്ഞെടുക്കുക</translation>
     </message>
@@ -568,7 +597,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+384"/>
+        <location line="+371"/>
         <source>Failed to upload media. Please try again.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -576,7 +605,7 @@
 <context>
     <name>InviteeItem</name>
     <message>
-        <location filename="../../src/InviteeItem.cpp" line="+18"/>
+        <location filename="../../src/InviteeItem.cpp" line="+22"/>
         <source>Remove</source>
         <translation>നീക്കംചെയ്യുക</translation>
     </message>
@@ -584,7 +613,7 @@
 <context>
     <name>LoginPage</name>
     <message>
-        <location filename="../../src/LoginPage.cpp" line="+92"/>
+        <location filename="../../src/LoginPage.cpp" line="+80"/>
         <source>Matrix ID</source>
         <translation>Matrix ID</translation>
     </message>
@@ -639,20 +668,19 @@ Example: https://server.my:8787</source>
     </message>
     <message>
         <location line="+19"/>
-        <location line="+218"/>
         <source>LOGIN</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-151"/>
+        <location line="+84"/>
         <location line="+11"/>
-        <location line="+157"/>
+        <location line="+156"/>
         <location line="+11"/>
         <source>You have entered an invalid Matrix ID  e.g @joe:matrix.org</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-132"/>
+        <location line="-131"/>
         <source>Autodiscovery failed. Received malformed response.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -677,12 +705,12 @@ Example: https://server.my:8787</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+59"/>
+        <location line="-168"/>
         <source>SSO LOGIN</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+263"/>
         <source>Empty password</source>
         <translation type="unfinished"></translation>
     </message>
@@ -695,7 +723,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>MemberList</name>
     <message>
-        <location filename="../../src/dialogs/MemberList.cpp" line="+90"/>
+        <location filename="../../src/dialogs/MemberList.cpp" line="+94"/>
         <source>Room members</source>
         <translation type="unfinished"></translation>
     </message>
@@ -708,7 +736,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>MessageDelegate</name>
     <message>
-        <location filename="../qml/delegates/MessageDelegate.qml" line="+123"/>
+        <location filename="../qml/delegates/MessageDelegate.qml" line="+127"/>
         <source>Encryption enabled</source>
         <translation type="unfinished"></translation>
     </message>
@@ -777,7 +805,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>MessageInput</name>
     <message>
-        <location filename="../qml/MessageInput.qml" line="+38"/>
+        <location filename="../qml/MessageInput.qml" line="+42"/>
         <source>Hang up</source>
         <translation type="unfinished"></translation>
     </message>
@@ -787,22 +815,22 @@ Example: https://server.my:8787</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+25"/>
         <source>Send a file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+42"/>
         <source>Write a message...</source>
         <translation>ഒരു സന്ദേശം എഴുതുക….</translation>
     </message>
     <message>
-        <location line="+186"/>
+        <location line="+211"/>
         <source>Emoji</source>
         <translation>ഇമോജി</translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+16"/>
         <source>Send</source>
         <translation>അയക്കുക</translation>
     </message>
@@ -810,7 +838,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>NewVerificationRequest</name>
     <message>
-        <location filename="../qml/device-verification/NewVerificationRequest.qml" line="+7"/>
+        <location filename="../qml/device-verification/NewVerificationRequest.qml" line="+11"/>
         <source>Send Verification Request</source>
         <translation type="unfinished"></translation>
     </message>
@@ -868,7 +896,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>PlaceCall</name>
     <message>
-        <location filename="../qml/voip/PlaceCall.qml" line="+36"/>
+        <location filename="../qml/voip/PlaceCall.qml" line="+48"/>
         <source>Place a call to %1?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -888,7 +916,12 @@ Example: https://server.my:8787</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location line="+14"/>
+        <source>Screen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
         <source>Cancel</source>
         <translation>റദ്ദാക്കു</translation>
     </message>
@@ -896,7 +929,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>Placeholder</name>
     <message>
-        <location filename="../qml/delegates/Placeholder.qml" line="+4"/>
+        <location filename="../qml/delegates/Placeholder.qml" line="+8"/>
         <source>unimplemented event: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -904,7 +937,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>QCoreApplication</name>
     <message>
-        <location filename="../../src/main.cpp" line="+179"/>
+        <location filename="../../src/main.cpp" line="+167"/>
         <source>Create a unique profile, which allows you to log into several accounts at the same time and start multiple instances of nheko.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -922,7 +955,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>QuickSwitcher</name>
     <message>
-        <location filename="../../src/QuickSwitcher.cpp" line="+74"/>
+        <location filename="../../src/QuickSwitcher.cpp" line="+62"/>
         <source>Search for a room...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -930,18 +963,18 @@ Example: https://server.my:8787</source>
 <context>
     <name>RegisterPage</name>
     <message>
-        <location filename="../../src/RegisterPage.cpp" line="+89"/>
+        <location filename="../../src/RegisterPage.cpp" line="+77"/>
         <source>Username</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+2"/>
-        <location line="+286"/>
+        <location line="+287"/>
         <source>The username must not be empty, and must contain only the characters a-z, 0-9, ., _, =, -, and /.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-282"/>
+        <location line="-283"/>
         <source>Password</source>
         <translation type="unfinished">പാസ്‍വേഡ്</translation>
     </message>
@@ -976,7 +1009,7 @@ Example: https://server.my:8787</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+209"/>
+        <location line="+210"/>
         <source>One or more fields have invalid inputs. Please correct those issues and try again.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -999,7 +1032,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>ReplyPopup</name>
     <message>
-        <location filename="../qml/ReplyPopup.qml" line="+45"/>
+        <location filename="../qml/ReplyPopup.qml" line="+49"/>
         <source>Close</source>
         <translation type="unfinished">അടയ്‌ക്കുക</translation>
     </message>
@@ -1012,7 +1045,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>RoomInfo</name>
     <message>
-        <location filename="../../src/Cache.cpp" line="+1861"/>
+        <location filename="../../src/Cache.cpp" line="+1793"/>
         <source>no version stored</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1020,7 +1053,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>RoomInfoListItem</name>
     <message>
-        <location filename="../../src/RoomInfoListItem.cpp" line="+102"/>
+        <location filename="../../src/RoomInfoListItem.cpp" line="+90"/>
         <source>Leave room</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1082,10 +1115,116 @@ Example: https://server.my:8787</source>
         <translation type="unfinished">നിരസിക്കുക</translation>
     </message>
 </context>
+<context>
+    <name>RoomSettings</name>
+    <message>
+        <location filename="../qml/RoomSettings.qml" line="+204"/>
+        <source>End-to-End Encryption</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Encryption is currently experimental and things might break unexpectedly. &lt;br&gt;
+                            Please take note that it can&apos;t be disabled afterwards.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>Whether or not the client should respond automatically with the session keys
+                                upon request. Use with caution, this is a temporary measure to test the
+                                E2E implementation until device verification is completed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/ui/RoomSettings.cpp" line="+267"/>
+        <source>Failed to enable encryption: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+228"/>
+        <source>Select an avatar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>All Files (*)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>The selected file is not an image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Error while reading file: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+34"/>
+        <location line="+20"/>
+        <source>Failed to upload image: %s</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ScreenShare</name>
+    <message>
+        <location filename="../qml/voip/ScreenShare.qml" line="+30"/>
+        <source>Share desktop with %1?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Window:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Frame rate:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Include your camera picture-in-picture</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>Request remote camera</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location line="+9"/>
+        <source>View your callee&apos;s camera like a regular video call</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Hide mouse cursor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Share</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Preview</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Cancel</source>
+        <translation type="unfinished">റദ്ദാക്കു</translation>
+    </message>
+</context>
 <context>
     <name>SideBarActions</name>
     <message>
-        <location filename="../../src/SideBarActions.cpp" line="+40"/>
+        <location filename="../../src/SideBarActions.cpp" line="+44"/>
         <source>User settings</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1113,7 +1252,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>StatusIndicator</name>
     <message>
-        <location filename="../qml/StatusIndicator.qml" line="+17"/>
+        <location filename="../qml/StatusIndicator.qml" line="+21"/>
         <source>Failed</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1136,7 +1275,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>Success</name>
     <message>
-        <location filename="../qml/device-verification/Success.qml" line="+6"/>
+        <location filename="../qml/device-verification/Success.qml" line="+10"/>
         <source>Successful Verification</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1154,7 +1293,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>TimelineModel</name>
     <message>
-        <location filename="../../src/timeline/TimelineModel.cpp" line="+895"/>
+        <location filename="../../src/timeline/TimelineModel.cpp" line="+911"/>
         <source>Message redaction failed: %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1304,12 +1443,12 @@ Example: https://server.my:8787</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-795"/>
+        <location line="-798"/>
         <source>You joined this room.</source>
         <translation type="unfinished">നിങ്ങൾ ഈ മുറിയിൽ ചേർന്നു.</translation>
     </message>
     <message>
-        <location line="+797"/>
+        <location line="+800"/>
         <source>Rejected the knock from %1.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1333,7 +1472,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>TimelineRow</name>
     <message>
-        <location filename="../qml/TimelineRow.qml" line="+99"/>
+        <location filename="../qml/TimelineRow.qml" line="+100"/>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1361,7 +1500,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>TimelineView</name>
     <message>
-        <location filename="../qml/TimelineView.qml" line="+85"/>
+        <location filename="../qml/TimelineView.qml" line="+97"/>
         <source>React</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1411,7 +1550,7 @@ Example: https://server.my:8787</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+61"/>
         <source>No room open</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1419,7 +1558,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>TimelineViewManager</name>
     <message>
-        <location filename="../../src/timeline/TimelineViewManager.cpp" line="+423"/>
+        <location filename="../../src/timeline/TimelineViewManager.cpp" line="+430"/>
         <source>No encrypted private chat found with this user. Create an encrypted private chat with this user and try again.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1427,7 +1566,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>TopBar</name>
     <message>
-        <location filename="../qml/TopBar.qml" line="+43"/>
+        <location filename="../qml/TopBar.qml" line="+47"/>
         <source>Back to room list</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1466,7 +1605,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>TrayIcon</name>
     <message>
-        <location filename="../../src/TrayIcon.cpp" line="+122"/>
+        <location filename="../../src/TrayIcon.cpp" line="+110"/>
         <source>Show</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1479,7 +1618,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>UserInfoWidget</name>
     <message>
-        <location filename="../../src/UserInfoWidget.cpp" line="+95"/>
+        <location filename="../../src/UserInfoWidget.cpp" line="+82"/>
         <source>Logout</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1527,7 +1666,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>UserProfile</name>
     <message>
-        <location filename="../qml/UserProfile.qml" line="+133"/>
+        <location filename="../qml/UserProfile.qml" line="+137"/>
         <source>Verify</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1547,7 +1686,7 @@ Example: https://server.my:8787</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/UserProfile.cpp" line="+296"/>
+        <location filename="../../src/ui/UserProfile.cpp" line="+301"/>
         <source>Select an avatar</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1570,7 +1709,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>UserSettings</name>
     <message>
-        <location filename="../../src/UserSettingsPage.cpp" line="+345"/>
+        <location filename="../../src/UserSettingsPage.cpp" line="+337"/>
         <location filename="../../src/UserSettingsPage.h" line="+183"/>
         <source>Default</source>
         <translation type="unfinished"></translation>
@@ -1579,7 +1718,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>UserSettingsPage</name>
     <message>
-        <location line="+496"/>
+        <location line="+540"/>
         <source>Minimize to tray</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1795,7 +1934,7 @@ This usually causes the application icon in the task bar to animate in some fash
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+407"/>
+        <location line="+406"/>
         <source>CACHED</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1805,7 +1944,7 @@ This usually causes the application icon in the task bar to animate in some fash
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-461"/>
+        <location line="-460"/>
         <source>Scale factor</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1980,7 +2119,7 @@ This usually causes the application icon in the task bar to animate in some fash
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+237"/>
+        <location line="+236"/>
         <source>Open Sessions File</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2025,7 +2164,7 @@ This usually causes the application icon in the task bar to animate in some fash
 <context>
     <name>Waiting</name>
     <message>
-        <location filename="../qml/device-verification/Waiting.qml" line="+7"/>
+        <location filename="../qml/device-verification/Waiting.qml" line="+11"/>
         <source>Waiting for other party…</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2053,7 +2192,7 @@ This usually causes the application icon in the task bar to animate in some fash
 <context>
     <name>WelcomePage</name>
     <message>
-        <location filename="../../src/WelcomePage.cpp" line="+46"/>
+        <location filename="../../src/WelcomePage.cpp" line="+34"/>
         <source>Welcome to nheko! The desktop client for the Matrix protocol.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2076,7 +2215,7 @@ This usually causes the application icon in the task bar to animate in some fash
 <context>
     <name>descriptiveTime</name>
     <message>
-        <location filename="../../src/Utils.cpp" line="+145"/>
+        <location filename="../../src/Utils.cpp" line="+149"/>
         <source>Yesterday</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2084,7 +2223,7 @@ This usually causes the application icon in the task bar to animate in some fash
 <context>
     <name>dialogs::CreateRoom</name>
     <message>
-        <location filename="../../src/dialogs/CreateRoom.cpp" line="+36"/>
+        <location filename="../../src/dialogs/CreateRoom.cpp" line="+40"/>
         <source>Create room</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2127,7 +2266,7 @@ This usually causes the application icon in the task bar to animate in some fash
 <context>
     <name>dialogs::FallbackAuth</name>
     <message>
-        <location filename="../../src/dialogs/FallbackAuth.cpp" line="+30"/>
+        <location filename="../../src/dialogs/FallbackAuth.cpp" line="+34"/>
         <source>Open Fallback in Browser</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2150,7 +2289,7 @@ This usually causes the application icon in the task bar to animate in some fash
 <context>
     <name>dialogs::InviteUsers</name>
     <message>
-        <location filename="../../src/dialogs/InviteUsers.cpp" line="+42"/>
+        <location filename="../../src/dialogs/InviteUsers.cpp" line="+46"/>
         <source>Cancel</source>
         <translation type="unfinished">റദ്ദാക്കു</translation>
     </message>
@@ -2163,7 +2302,7 @@ This usually causes the application icon in the task bar to animate in some fash
 <context>
     <name>dialogs::JoinRoom</name>
     <message>
-        <location filename="../../src/dialogs/JoinRoom.cpp" line="+30"/>
+        <location filename="../../src/dialogs/JoinRoom.cpp" line="+34"/>
         <source>Join</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2181,7 +2320,7 @@ This usually causes the application icon in the task bar to animate in some fash
 <context>
     <name>dialogs::LeaveRoom</name>
     <message>
-        <location filename="../../src/dialogs/LeaveRoom.cpp" line="+31"/>
+        <location filename="../../src/dialogs/LeaveRoom.cpp" line="+35"/>
         <source>Cancel</source>
         <translation type="unfinished">റദ്ദാക്കു</translation>
     </message>
@@ -2194,7 +2333,7 @@ This usually causes the application icon in the task bar to animate in some fash
 <context>
     <name>dialogs::Logout</name>
     <message>
-        <location filename="../../src/dialogs/Logout.cpp" line="+47"/>
+        <location filename="../../src/dialogs/Logout.cpp" line="+35"/>
         <source>Cancel</source>
         <translation type="unfinished">റദ്ദാക്കു</translation>
     </message>
@@ -2207,7 +2346,7 @@ This usually causes the application icon in the task bar to animate in some fash
 <context>
     <name>dialogs::PreviewUploadOverlay</name>
     <message>
-        <location filename="../../src/dialogs/PreviewUploadOverlay.cpp" line="+41"/>
+        <location filename="../../src/dialogs/PreviewUploadOverlay.cpp" line="+29"/>
         <source>Upload</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2227,7 +2366,7 @@ Media size: %2
 <context>
     <name>dialogs::ReCaptcha</name>
     <message>
-        <location filename="../../src/dialogs/ReCaptcha.cpp" line="+31"/>
+        <location filename="../../src/dialogs/ReCaptcha.cpp" line="+35"/>
         <source>Cancel</source>
         <translation type="unfinished">റദ്ദാക്കു</translation>
     </message>
@@ -2245,7 +2384,7 @@ Media size: %2
 <context>
     <name>dialogs::ReadReceipts</name>
     <message>
-        <location filename="../../src/dialogs/ReadReceipts.cpp" line="+120"/>
+        <location filename="../../src/dialogs/ReadReceipts.cpp" line="+124"/>
         <source>Read receipts</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2268,139 +2407,10 @@ Media size: %2
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>dialogs::RoomSettings</name>
-    <message>
-        <location filename="../../src/dialogs/RoomSettings.cpp" line="+135"/>
-        <source>Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Info</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+11"/>
-        <source>Internal ID</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>Room Version</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Notifications</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Muted</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Mentions only</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>All messages</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+97"/>
-        <source>Room access</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Anyone and guests</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Anyone</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Invited users</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+50"/>
-        <source>Encryption</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+11"/>
-        <source>Whether or not the client should respond automatically with the session keys
- upon request. Use with caution, this is a temporary measure to test the
- E2E implementation until device verification is completed.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+20"/>
-        <source>End-to-End Encryption</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Encryption is currently experimental and things might break unexpectedly. &lt;br&gt;Please take note that it can&apos;t be disabled afterwards.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-24"/>
-        <source>Respond to key requests</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message numerus="yes">
-        <location line="+83"/>
-        <source>%n member(s)</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
-    </message>
-    <message>
-        <location line="+142"/>
-        <source>Failed to enable encryption: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+147"/>
-        <source>Select an avatar</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>All Files (*)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+12"/>
-        <source>The selected file is not an image</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Error while reading file: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+35"/>
-        <location line="+20"/>
-        <source>Failed to upload image: %s</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>message-description sent:</name>
     <message>
-        <location filename="../../src/Utils.h" line="+108"/>
+        <location filename="../../src/Utils.h" line="+112"/>
         <source>You sent an audio clip</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2513,7 +2523,7 @@ Media size: %2
 <context>
     <name>popups::UserMentions</name>
     <message>
-        <location filename="../../src/popups/UserMentions.cpp" line="+64"/>
+        <location filename="../../src/popups/UserMentions.cpp" line="+68"/>
         <source>This Room</source>
         <translation>ഈ മുറി</translation>
     </message>
diff --git a/resources/langs/nheko_nl.ts b/resources/langs/nheko_nl.ts
index 520f0f170d2dcdb7aabb34c81f026691d9b9b0d5..d832d1a14648a9b07e13812721386203416f3019 100644
--- a/resources/langs/nheko_nl.ts
+++ b/resources/langs/nheko_nl.ts
@@ -4,7 +4,7 @@
 <context>
     <name>ActiveCallBar</name>
     <message>
-        <location filename="../qml/voip/ActiveCallBar.qml" line="+66"/>
+        <location filename="../qml/voip/ActiveCallBar.qml" line="+106"/>
         <source>Calling...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15,8 +15,13 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+76"/>
-        <source>Toggle camera view</source>
+        <location line="+67"/>
+        <source>You are screen sharing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Hide/Show Picture-in-Picture</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -33,7 +38,7 @@
 <context>
     <name>AwaitingVerificationConfirmation</name>
     <message>
-        <location filename="../qml/device-verification/AwaitingVerificationConfirmation.qml" line="+7"/>
+        <location filename="../qml/device-verification/AwaitingVerificationConfirmation.qml" line="+11"/>
         <source>Awaiting Confirmation</source>
         <translation type="unfinished"></translation>
     </message>
@@ -51,7 +56,7 @@
 <context>
     <name>Cache</name>
     <message>
-        <location filename="../../src/Cache.cpp" line="+2084"/>
+        <location filename="../../src/Cache.cpp" line="+2026"/>
         <source>You joined this room.</source>
         <translation>Je bent lid geworden van deze kamer.</translation>
     </message>
@@ -59,7 +64,7 @@
 <context>
     <name>CallInvite</name>
     <message>
-        <location filename="../qml/voip/CallInvite.qml" line="+66"/>
+        <location filename="../qml/voip/CallInvite.qml" line="+70"/>
         <source>Video Call</source>
         <translation type="unfinished"></translation>
     </message>
@@ -77,7 +82,7 @@
 <context>
     <name>CallInviteBar</name>
     <message>
-        <location filename="../qml/voip/CallInviteBar.qml" line="+60"/>
+        <location filename="../qml/voip/CallInviteBar.qml" line="+64"/>
         <source>Video Call</source>
         <translation type="unfinished"></translation>
     </message>
@@ -92,7 +97,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
+        <location line="+10"/>
         <source>Accept</source>
         <translation type="unfinished">Accepteren</translation>
     </message>
@@ -117,36 +122,55 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>CallManager</name>
+    <message>
+        <location filename="../../src/CallManager.cpp" line="+521"/>
+        <source>Entire screen</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>ChatPage</name>
     <message>
-        <location filename="../../src/ChatPage.cpp" line="+215"/>
+        <location filename="../../src/ChatPage.cpp" line="+203"/>
         <source>Failed to invite user: %1</source>
         <translation>Gebruiker uitnodigen mislukt: %1</translation>
     </message>
     <message>
         <location line="+4"/>
-        <location line="+797"/>
+        <location line="+806"/>
         <source>Invited user: %1</source>
         <translation>Gebruiker uitgenodigd: %1</translation>
     </message>
     <message>
-        <location line="-500"/>
+        <location line="-510"/>
         <source>Migrating the cache to the current version failed. This can have different reasons. Please open an issue and try to use an older version in the mean time. Alternatively you can try deleting the cache manually.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+456"/>
+        <location line="+413"/>
+        <source>Confirm join</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Do you really want to join %1?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+44"/>
         <source>Room %1 created.</source>
         <translation>Kamer %1 gecreëerd.</translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+35"/>
+        <location line="+323"/>
         <source>Confirm invite</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="-322"/>
         <source>Do you really want to invite %1 (%2)?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -211,7 +235,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-582"/>
+        <location line="+226"/>
+        <source>Do you really want to start a private chat with %1?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-818"/>
         <source>Cache migration failed!</source>
         <translation type="unfinished"></translation>
     </message>
@@ -236,7 +265,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+165"/>
+        <location line="+157"/>
         <source>Failed to setup encryption keys. Server response: %1 %2. Please try again later.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -247,7 +276,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+47"/>
         <source>Failed to join room: %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -267,12 +296,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+18"/>
         <source>Failed to leave room: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+54"/>
+        <location line="+61"/>
         <source>Failed to kick %1 from %2: %3</source>
         <translation type="unfinished"></translation>
     </message>
@@ -280,7 +309,7 @@
 <context>
     <name>CommunitiesListItem</name>
     <message>
-        <location filename="../../src/CommunitiesListItem.cpp" line="+26"/>
+        <location filename="../../src/CommunitiesListItem.cpp" line="+30"/>
         <source>Hide rooms with this tag or from this community</source>
         <translation type="unfinished"></translation>
     </message>
@@ -348,7 +377,7 @@
 <context>
     <name>DigitVerification</name>
     <message>
-        <location filename="../qml/device-verification/DigitVerification.qml" line="+7"/>
+        <location filename="../qml/device-verification/DigitVerification.qml" line="+11"/>
         <source>Verification Code</source>
         <translation type="unfinished"></translation>
     </message>
@@ -371,7 +400,7 @@
 <context>
     <name>EditModal</name>
     <message>
-        <location filename="../../src/dialogs/RoomSettings.cpp" line="+73"/>
+        <location filename="../../src/ui/RoomSettings.cpp" line="+42"/>
         <source>Apply</source>
         <translation type="unfinished"></translation>
     </message>
@@ -394,7 +423,7 @@
 <context>
     <name>EmojiPicker</name>
     <message>
-        <location filename="../qml/emoji/EmojiPicker.qml" line="+113"/>
+        <location filename="../qml/emoji/EmojiPicker.qml" line="+117"/>
         <location line="+181"/>
         <source>Search</source>
         <translation type="unfinished"></translation>
@@ -443,7 +472,7 @@
 <context>
     <name>EmojiVerification</name>
     <message>
-        <location filename="../qml/device-verification/EmojiVerification.qml" line="+7"/>
+        <location filename="../qml/device-verification/EmojiVerification.qml" line="+11"/>
         <source>Verification Code</source>
         <translation type="unfinished"></translation>
     </message>
@@ -466,7 +495,7 @@
 <context>
     <name>EncryptionIndicator</name>
     <message>
-        <location filename="../qml/EncryptionIndicator.qml" line="+19"/>
+        <location filename="../qml/EncryptionIndicator.qml" line="+23"/>
         <source>Encrypted</source>
         <translation type="unfinished"></translation>
     </message>
@@ -479,7 +508,7 @@
 <context>
     <name>EventStore</name>
     <message>
-        <location filename="../../src/timeline/EventStore.cpp" line="+612"/>
+        <location filename="../../src/timeline/EventStore.cpp" line="+613"/>
         <source>-- Encrypted Event (No keys found for decryption) --</source>
         <comment>Placeholder, when the message was not decrypted yet or can&apos;t be decrypted.</comment>
         <translation type="unfinished"></translation>
@@ -524,7 +553,7 @@
 <context>
     <name>Failed</name>
     <message>
-        <location filename="../qml/device-verification/Failed.qml" line="+7"/>
+        <location filename="../qml/device-verification/Failed.qml" line="+11"/>
         <source>Verification failed</source>
         <translation type="unfinished"></translation>
     </message>
@@ -558,7 +587,7 @@
 <context>
     <name>InputBar</name>
     <message>
-        <location filename="../../src/timeline/InputBar.cpp" line="+227"/>
+        <location filename="../../src/timeline/InputBar.cpp" line="+253"/>
         <source>Select a file</source>
         <translation type="unfinished">Kies een bestand</translation>
     </message>
@@ -568,7 +597,7 @@
         <translation type="unfinished">Alle bestanden (*)</translation>
     </message>
     <message>
-        <location line="+384"/>
+        <location line="+371"/>
         <source>Failed to upload media. Please try again.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -576,7 +605,7 @@
 <context>
     <name>InviteeItem</name>
     <message>
-        <location filename="../../src/InviteeItem.cpp" line="+18"/>
+        <location filename="../../src/InviteeItem.cpp" line="+22"/>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
@@ -584,7 +613,7 @@
 <context>
     <name>LoginPage</name>
     <message>
-        <location filename="../../src/LoginPage.cpp" line="+92"/>
+        <location filename="../../src/LoginPage.cpp" line="+80"/>
         <source>Matrix ID</source>
         <translation>Matrix-id</translation>
     </message>
@@ -639,20 +668,19 @@ Example: https://server.my:8787</source>
     </message>
     <message>
         <location line="+19"/>
-        <location line="+218"/>
         <source>LOGIN</source>
         <translation>INLOGGEN</translation>
     </message>
     <message>
-        <location line="-151"/>
+        <location line="+84"/>
         <location line="+11"/>
-        <location line="+157"/>
+        <location line="+156"/>
         <location line="+11"/>
         <source>You have entered an invalid Matrix ID  e.g @joe:matrix.org</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-132"/>
+        <location line="-131"/>
         <source>Autodiscovery failed. Received malformed response.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -677,12 +705,12 @@ Example: https://server.my:8787</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+59"/>
+        <location line="-168"/>
         <source>SSO LOGIN</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+263"/>
         <source>Empty password</source>
         <translation>Leeg wachtwoord</translation>
     </message>
@@ -695,7 +723,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>MemberList</name>
     <message>
-        <location filename="../../src/dialogs/MemberList.cpp" line="+90"/>
+        <location filename="../../src/dialogs/MemberList.cpp" line="+94"/>
         <source>Room members</source>
         <translation>Kamerleden</translation>
     </message>
@@ -708,7 +736,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>MessageDelegate</name>
     <message>
-        <location filename="../qml/delegates/MessageDelegate.qml" line="+105"/>
+        <location filename="../qml/delegates/MessageDelegate.qml" line="+109"/>
         <location line="+9"/>
         <source>removed</source>
         <translation type="unfinished"></translation>
@@ -777,7 +805,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>MessageInput</name>
     <message>
-        <location filename="../qml/MessageInput.qml" line="+38"/>
+        <location filename="../qml/MessageInput.qml" line="+42"/>
         <source>Hang up</source>
         <translation type="unfinished"></translation>
     </message>
@@ -787,22 +815,22 @@ Example: https://server.my:8787</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+25"/>
         <source>Send a file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+42"/>
         <source>Write a message...</source>
         <translation type="unfinished">Typ een bericht...</translation>
     </message>
     <message>
-        <location line="+186"/>
+        <location line="+211"/>
         <source>Emoji</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+16"/>
         <source>Send</source>
         <translation type="unfinished"></translation>
     </message>
@@ -810,7 +838,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>NewVerificationRequest</name>
     <message>
-        <location filename="../qml/device-verification/NewVerificationRequest.qml" line="+7"/>
+        <location filename="../qml/device-verification/NewVerificationRequest.qml" line="+11"/>
         <source>Send Verification Request</source>
         <translation type="unfinished"></translation>
     </message>
@@ -868,7 +896,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>PlaceCall</name>
     <message>
-        <location filename="../qml/voip/PlaceCall.qml" line="+36"/>
+        <location filename="../qml/voip/PlaceCall.qml" line="+48"/>
         <source>Place a call to %1?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -888,7 +916,12 @@ Example: https://server.my:8787</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location line="+14"/>
+        <source>Screen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
         <source>Cancel</source>
         <translation type="unfinished">Annuleren</translation>
     </message>
@@ -896,7 +929,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>Placeholder</name>
     <message>
-        <location filename="../qml/delegates/Placeholder.qml" line="+4"/>
+        <location filename="../qml/delegates/Placeholder.qml" line="+8"/>
         <source>unimplemented event: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -904,7 +937,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>QCoreApplication</name>
     <message>
-        <location filename="../../src/main.cpp" line="+179"/>
+        <location filename="../../src/main.cpp" line="+167"/>
         <source>Create a unique profile, which allows you to log into several accounts at the same time and start multiple instances of nheko.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -922,7 +955,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>QuickSwitcher</name>
     <message>
-        <location filename="../../src/QuickSwitcher.cpp" line="+74"/>
+        <location filename="../../src/QuickSwitcher.cpp" line="+62"/>
         <source>Search for a room...</source>
         <translation>Zoek een kamer...</translation>
     </message>
@@ -930,18 +963,18 @@ Example: https://server.my:8787</source>
 <context>
     <name>RegisterPage</name>
     <message>
-        <location filename="../../src/RegisterPage.cpp" line="+89"/>
+        <location filename="../../src/RegisterPage.cpp" line="+77"/>
         <source>Username</source>
         <translation>Gebruikersnaam</translation>
     </message>
     <message>
         <location line="+2"/>
-        <location line="+286"/>
+        <location line="+287"/>
         <source>The username must not be empty, and must contain only the characters a-z, 0-9, ., _, =, -, and /.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-282"/>
+        <location line="-283"/>
         <source>Password</source>
         <translation>Wachtwoord</translation>
     </message>
@@ -976,7 +1009,7 @@ Example: https://server.my:8787</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+209"/>
+        <location line="+210"/>
         <source>One or more fields have invalid inputs. Please correct those issues and try again.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -999,7 +1032,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>ReplyPopup</name>
     <message>
-        <location filename="../qml/ReplyPopup.qml" line="+45"/>
+        <location filename="../qml/ReplyPopup.qml" line="+49"/>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1012,7 +1045,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>RoomInfo</name>
     <message>
-        <location filename="../../src/Cache.cpp" line="+1861"/>
+        <location filename="../../src/Cache.cpp" line="+1793"/>
         <source>no version stored</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1020,7 +1053,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>RoomInfoListItem</name>
     <message>
-        <location filename="../../src/RoomInfoListItem.cpp" line="+102"/>
+        <location filename="../../src/RoomInfoListItem.cpp" line="+90"/>
         <source>Leave room</source>
         <translation>Kamer verlaten</translation>
     </message>
@@ -1082,10 +1115,116 @@ Example: https://server.my:8787</source>
         <translation>Afwijzen</translation>
     </message>
 </context>
+<context>
+    <name>RoomSettings</name>
+    <message>
+        <location filename="../qml/RoomSettings.qml" line="+204"/>
+        <source>End-to-End Encryption</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Encryption is currently experimental and things might break unexpectedly. &lt;br&gt;
+                            Please take note that it can&apos;t be disabled afterwards.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>Whether or not the client should respond automatically with the session keys
+                                upon request. Use with caution, this is a temporary measure to test the
+                                E2E implementation until device verification is completed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/ui/RoomSettings.cpp" line="+267"/>
+        <source>Failed to enable encryption: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+228"/>
+        <source>Select an avatar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>All Files (*)</source>
+        <translation type="unfinished">Alle bestanden (*)</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>The selected file is not an image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Error while reading file: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+34"/>
+        <location line="+20"/>
+        <source>Failed to upload image: %s</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ScreenShare</name>
+    <message>
+        <location filename="../qml/voip/ScreenShare.qml" line="+30"/>
+        <source>Share desktop with %1?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Window:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Frame rate:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Include your camera picture-in-picture</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>Request remote camera</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location line="+9"/>
+        <source>View your callee&apos;s camera like a regular video call</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Hide mouse cursor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Share</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Preview</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Annuleren</translation>
+    </message>
+</context>
 <context>
     <name>SideBarActions</name>
     <message>
-        <location filename="../../src/SideBarActions.cpp" line="+40"/>
+        <location filename="../../src/SideBarActions.cpp" line="+44"/>
         <source>User settings</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1113,7 +1252,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>StatusIndicator</name>
     <message>
-        <location filename="../qml/StatusIndicator.qml" line="+17"/>
+        <location filename="../qml/StatusIndicator.qml" line="+21"/>
         <source>Failed</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1136,7 +1275,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>Success</name>
     <message>
-        <location filename="../qml/device-verification/Success.qml" line="+6"/>
+        <location filename="../qml/device-verification/Success.qml" line="+10"/>
         <source>Successful Verification</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1154,7 +1293,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>TimelineModel</name>
     <message>
-        <location filename="../../src/timeline/TimelineModel.cpp" line="+895"/>
+        <location filename="../../src/timeline/TimelineModel.cpp" line="+911"/>
         <source>Message redaction failed: %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1304,12 +1443,12 @@ Example: https://server.my:8787</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-795"/>
+        <location line="-798"/>
         <source>You joined this room.</source>
         <translation type="unfinished">Je bent lid geworden van deze kamer.</translation>
     </message>
     <message>
-        <location line="+797"/>
+        <location line="+800"/>
         <source>Rejected the knock from %1.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1333,7 +1472,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>TimelineRow</name>
     <message>
-        <location filename="../qml/TimelineRow.qml" line="+99"/>
+        <location filename="../qml/TimelineRow.qml" line="+100"/>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1361,7 +1500,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>TimelineView</name>
     <message>
-        <location filename="../qml/TimelineView.qml" line="+85"/>
+        <location filename="../qml/TimelineView.qml" line="+97"/>
         <source>React</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1411,7 +1550,7 @@ Example: https://server.my:8787</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+61"/>
         <source>No room open</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1419,7 +1558,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>TimelineViewManager</name>
     <message>
-        <location filename="../../src/timeline/TimelineViewManager.cpp" line="+423"/>
+        <location filename="../../src/timeline/TimelineViewManager.cpp" line="+430"/>
         <source>No encrypted private chat found with this user. Create an encrypted private chat with this user and try again.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1427,7 +1566,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>TopBar</name>
     <message>
-        <location filename="../qml/TopBar.qml" line="+43"/>
+        <location filename="../qml/TopBar.qml" line="+47"/>
         <source>Back to room list</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1466,7 +1605,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>TrayIcon</name>
     <message>
-        <location filename="../../src/TrayIcon.cpp" line="+122"/>
+        <location filename="../../src/TrayIcon.cpp" line="+110"/>
         <source>Show</source>
         <translation>Tonen</translation>
     </message>
@@ -1479,7 +1618,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>UserInfoWidget</name>
     <message>
-        <location filename="../../src/UserInfoWidget.cpp" line="+95"/>
+        <location filename="../../src/UserInfoWidget.cpp" line="+82"/>
         <source>Logout</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1527,7 +1666,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>UserProfile</name>
     <message>
-        <location filename="../qml/UserProfile.qml" line="+133"/>
+        <location filename="../qml/UserProfile.qml" line="+137"/>
         <source>Verify</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1547,7 +1686,7 @@ Example: https://server.my:8787</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/UserProfile.cpp" line="+296"/>
+        <location filename="../../src/ui/UserProfile.cpp" line="+301"/>
         <source>Select an avatar</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1570,7 +1709,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>UserSettings</name>
     <message>
-        <location filename="../../src/UserSettingsPage.cpp" line="+345"/>
+        <location filename="../../src/UserSettingsPage.cpp" line="+337"/>
         <location filename="../../src/UserSettingsPage.h" line="+183"/>
         <source>Default</source>
         <translation type="unfinished"></translation>
@@ -1579,7 +1718,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>UserSettingsPage</name>
     <message>
-        <location line="+496"/>
+        <location line="+540"/>
         <source>Minimize to tray</source>
         <translation>Minimaliseren naar systeemvak</translation>
     </message>
@@ -1795,7 +1934,7 @@ This usually causes the application icon in the task bar to animate in some fash
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+407"/>
+        <location line="+406"/>
         <source>CACHED</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1805,7 +1944,7 @@ This usually causes the application icon in the task bar to animate in some fash
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-461"/>
+        <location line="-460"/>
         <source>Scale factor</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1980,7 +2119,7 @@ This usually causes the application icon in the task bar to animate in some fash
         <translation type="unfinished">Alle bestanden (*)</translation>
     </message>
     <message>
-        <location line="+237"/>
+        <location line="+236"/>
         <source>Open Sessions File</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2025,7 +2164,7 @@ This usually causes the application icon in the task bar to animate in some fash
 <context>
     <name>Waiting</name>
     <message>
-        <location filename="../qml/device-verification/Waiting.qml" line="+7"/>
+        <location filename="../qml/device-verification/Waiting.qml" line="+11"/>
         <source>Waiting for other party…</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2053,7 +2192,7 @@ This usually causes the application icon in the task bar to animate in some fash
 <context>
     <name>WelcomePage</name>
     <message>
-        <location filename="../../src/WelcomePage.cpp" line="+46"/>
+        <location filename="../../src/WelcomePage.cpp" line="+34"/>
         <source>Welcome to nheko! The desktop client for the Matrix protocol.</source>
         <translation>Welkom bij nheko! Dé computerclient voor het Matrix-protocol.</translation>
     </message>
@@ -2076,7 +2215,7 @@ This usually causes the application icon in the task bar to animate in some fash
 <context>
     <name>descriptiveTime</name>
     <message>
-        <location filename="../../src/Utils.cpp" line="+145"/>
+        <location filename="../../src/Utils.cpp" line="+149"/>
         <source>Yesterday</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2084,7 +2223,7 @@ This usually causes the application icon in the task bar to animate in some fash
 <context>
     <name>dialogs::CreateRoom</name>
     <message>
-        <location filename="../../src/dialogs/CreateRoom.cpp" line="+36"/>
+        <location filename="../../src/dialogs/CreateRoom.cpp" line="+40"/>
         <source>Create room</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2127,7 +2266,7 @@ This usually causes the application icon in the task bar to animate in some fash
 <context>
     <name>dialogs::FallbackAuth</name>
     <message>
-        <location filename="../../src/dialogs/FallbackAuth.cpp" line="+30"/>
+        <location filename="../../src/dialogs/FallbackAuth.cpp" line="+34"/>
         <source>Open Fallback in Browser</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2150,7 +2289,7 @@ This usually causes the application icon in the task bar to animate in some fash
 <context>
     <name>dialogs::InviteUsers</name>
     <message>
-        <location filename="../../src/dialogs/InviteUsers.cpp" line="+42"/>
+        <location filename="../../src/dialogs/InviteUsers.cpp" line="+46"/>
         <source>Cancel</source>
         <translation type="unfinished">Annuleren</translation>
     </message>
@@ -2163,7 +2302,7 @@ This usually causes the application icon in the task bar to animate in some fash
 <context>
     <name>dialogs::JoinRoom</name>
     <message>
-        <location filename="../../src/dialogs/JoinRoom.cpp" line="+30"/>
+        <location filename="../../src/dialogs/JoinRoom.cpp" line="+34"/>
         <source>Join</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2181,7 +2320,7 @@ This usually causes the application icon in the task bar to animate in some fash
 <context>
     <name>dialogs::LeaveRoom</name>
     <message>
-        <location filename="../../src/dialogs/LeaveRoom.cpp" line="+31"/>
+        <location filename="../../src/dialogs/LeaveRoom.cpp" line="+35"/>
         <source>Cancel</source>
         <translation type="unfinished">Annuleren</translation>
     </message>
@@ -2194,7 +2333,7 @@ This usually causes the application icon in the task bar to animate in some fash
 <context>
     <name>dialogs::Logout</name>
     <message>
-        <location filename="../../src/dialogs/Logout.cpp" line="+47"/>
+        <location filename="../../src/dialogs/Logout.cpp" line="+35"/>
         <source>Cancel</source>
         <translation type="unfinished">Annuleren</translation>
     </message>
@@ -2207,7 +2346,7 @@ This usually causes the application icon in the task bar to animate in some fash
 <context>
     <name>dialogs::PreviewUploadOverlay</name>
     <message>
-        <location filename="../../src/dialogs/PreviewUploadOverlay.cpp" line="+41"/>
+        <location filename="../../src/dialogs/PreviewUploadOverlay.cpp" line="+29"/>
         <source>Upload</source>
         <translation>Uploaden</translation>
     </message>
@@ -2229,7 +2368,7 @@ Mediagrootte: %2
 <context>
     <name>dialogs::ReCaptcha</name>
     <message>
-        <location filename="../../src/dialogs/ReCaptcha.cpp" line="+31"/>
+        <location filename="../../src/dialogs/ReCaptcha.cpp" line="+35"/>
         <source>Cancel</source>
         <translation type="unfinished">Annuleren</translation>
     </message>
@@ -2247,7 +2386,7 @@ Mediagrootte: %2
 <context>
     <name>dialogs::ReadReceipts</name>
     <message>
-        <location filename="../../src/dialogs/ReadReceipts.cpp" line="+120"/>
+        <location filename="../../src/dialogs/ReadReceipts.cpp" line="+124"/>
         <source>Read receipts</source>
         <translation>Leesbevestigingen</translation>
     </message>
@@ -2270,139 +2409,10 @@ Mediagrootte: %2
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>dialogs::RoomSettings</name>
-    <message>
-        <location filename="../../src/dialogs/RoomSettings.cpp" line="+135"/>
-        <source>Settings</source>
-        <translation type="unfinished">Instellingen</translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Info</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+11"/>
-        <source>Internal ID</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>Room Version</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Notifications</source>
-        <translation>Meldingen</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Muted</source>
-        <translation>Gedempt</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Mentions only</source>
-        <translation>Alleen vermeldingen</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>All messages</source>
-        <translation>Alle berichten</translation>
-    </message>
-    <message>
-        <location line="+97"/>
-        <source>Room access</source>
-        <translation>Kamertoegang</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Anyone and guests</source>
-        <translation>Iedereen, incl. gasten</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Anyone</source>
-        <translation>Iedereen</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Invited users</source>
-        <translation>Uitgenodigde gebruikers</translation>
-    </message>
-    <message>
-        <location line="+50"/>
-        <source>Encryption</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+31"/>
-        <source>End-to-End Encryption</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Encryption is currently experimental and things might break unexpectedly. &lt;br&gt;Please take note that it can&apos;t be disabled afterwards.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-24"/>
-        <source>Respond to key requests</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Whether or not the client should respond automatically with the session keys
- upon request. Use with caution, this is a temporary measure to test the
- E2E implementation until device verification is completed.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message numerus="yes">
-        <location line="+80"/>
-        <source>%n member(s)</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
-    </message>
-    <message>
-        <location line="+142"/>
-        <source>Failed to enable encryption: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+147"/>
-        <source>Select an avatar</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>All Files (*)</source>
-        <translation type="unfinished">Alle bestanden (*)</translation>
-    </message>
-    <message>
-        <location line="+12"/>
-        <source>The selected file is not an image</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Error while reading file: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+35"/>
-        <location line="+20"/>
-        <source>Failed to upload image: %s</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>message-description sent:</name>
     <message>
-        <location filename="../../src/Utils.h" line="+108"/>
+        <location filename="../../src/Utils.h" line="+112"/>
         <source>You sent an audio clip</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2515,7 +2525,7 @@ Mediagrootte: %2
 <context>
     <name>popups::UserMentions</name>
     <message>
-        <location filename="../../src/popups/UserMentions.cpp" line="+64"/>
+        <location filename="../../src/popups/UserMentions.cpp" line="+68"/>
         <source>This Room</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/resources/langs/nheko_pl.ts b/resources/langs/nheko_pl.ts
index 534689035cfc48fe399f7bad64fbcd0a0ebef798..c25cebdb8ebfcf5cb4196960da5943ec1e138223 100644
--- a/resources/langs/nheko_pl.ts
+++ b/resources/langs/nheko_pl.ts
@@ -4,7 +4,7 @@
 <context>
     <name>ActiveCallBar</name>
     <message>
-        <location filename="../qml/voip/ActiveCallBar.qml" line="+66"/>
+        <location filename="../qml/voip/ActiveCallBar.qml" line="+106"/>
         <source>Calling...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15,8 +15,13 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+76"/>
-        <source>Toggle camera view</source>
+        <location line="+67"/>
+        <source>You are screen sharing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Hide/Show Picture-in-Picture</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -33,7 +38,7 @@
 <context>
     <name>AwaitingVerificationConfirmation</name>
     <message>
-        <location filename="../qml/device-verification/AwaitingVerificationConfirmation.qml" line="+7"/>
+        <location filename="../qml/device-verification/AwaitingVerificationConfirmation.qml" line="+11"/>
         <source>Awaiting Confirmation</source>
         <translation>Oczekiwanie na potwierdzenie</translation>
     </message>
@@ -51,7 +56,7 @@
 <context>
     <name>Cache</name>
     <message>
-        <location filename="../../src/Cache.cpp" line="+2084"/>
+        <location filename="../../src/Cache.cpp" line="+2026"/>
         <source>You joined this room.</source>
         <translation>Dołączyłeś(-łaś) do tego pokoju.</translation>
     </message>
@@ -59,7 +64,7 @@
 <context>
     <name>CallInvite</name>
     <message>
-        <location filename="../qml/voip/CallInvite.qml" line="+66"/>
+        <location filename="../qml/voip/CallInvite.qml" line="+70"/>
         <source>Video Call</source>
         <translation type="unfinished"></translation>
     </message>
@@ -77,7 +82,7 @@
 <context>
     <name>CallInviteBar</name>
     <message>
-        <location filename="../qml/voip/CallInviteBar.qml" line="+60"/>
+        <location filename="../qml/voip/CallInviteBar.qml" line="+64"/>
         <source>Video Call</source>
         <translation type="unfinished"></translation>
     </message>
@@ -92,7 +97,7 @@
         <translation type="unfinished">UrzÄ…dzenia</translation>
     </message>
     <message>
-        <location line="+11"/>
+        <location line="+10"/>
         <source>Accept</source>
         <translation type="unfinished">Akceptuj</translation>
     </message>
@@ -117,36 +122,55 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>CallManager</name>
+    <message>
+        <location filename="../../src/CallManager.cpp" line="+521"/>
+        <source>Entire screen</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>ChatPage</name>
     <message>
-        <location filename="../../src/ChatPage.cpp" line="+215"/>
+        <location filename="../../src/ChatPage.cpp" line="+203"/>
         <source>Failed to invite user: %1</source>
         <translation>Nie udało się zaprosić użytkownika: %1</translation>
     </message>
     <message>
         <location line="+4"/>
-        <location line="+797"/>
+        <location line="+806"/>
         <source>Invited user: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-500"/>
+        <location line="-510"/>
         <source>Migrating the cache to the current version failed. This can have different reasons. Please open an issue and try to use an older version in the mean time. Alternatively you can try deleting the cache manually.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+456"/>
+        <location line="+413"/>
+        <source>Confirm join</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Do you really want to join %1?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+44"/>
         <source>Room %1 created.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+35"/>
+        <location line="+323"/>
         <source>Confirm invite</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="-322"/>
         <source>Do you really want to invite %1 (%2)?</source>
         <translation>Czy na pewno chcesz zaprosić %1 (%2)?</translation>
     </message>
@@ -211,7 +235,12 @@
         <translation>Odblokowano użytkownika: %1</translation>
     </message>
     <message>
-        <location line="-582"/>
+        <location line="+226"/>
+        <source>Do you really want to start a private chat with %1?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-818"/>
         <source>Cache migration failed!</source>
         <translation>Nie udało się przenieść pamięci podręcznej!</translation>
     </message>
@@ -236,7 +265,7 @@
         <translation>Nie udało się przywrócić zapisanych danych. Spróbuj zalogować się ponownie.</translation>
     </message>
     <message>
-        <location line="+165"/>
+        <location line="+157"/>
         <source>Failed to setup encryption keys. Server response: %1 %2. Please try again later.</source>
         <translation>Nie udało się ustawić kluczy szyfrujących. Odpowiedź serwera: %1 %2. Spróbuj ponownie później.</translation>
     </message>
@@ -247,7 +276,7 @@
         <translation>Spróbuj zalogować się ponownie: %1</translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+47"/>
         <source>Failed to join room: %1</source>
         <translation>Nie udało się dołączyć do pokoju: %1</translation>
     </message>
@@ -267,12 +296,12 @@
         <translation>Tworzenie pokoju nie powiodło się: %1</translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+18"/>
         <source>Failed to leave room: %1</source>
         <translation>Nie udało się opuścić pokoju: %1</translation>
     </message>
     <message>
-        <location line="+54"/>
+        <location line="+61"/>
         <source>Failed to kick %1 from %2: %3</source>
         <translation type="unfinished"></translation>
     </message>
@@ -280,7 +309,7 @@
 <context>
     <name>CommunitiesListItem</name>
     <message>
-        <location filename="../../src/CommunitiesListItem.cpp" line="+26"/>
+        <location filename="../../src/CommunitiesListItem.cpp" line="+30"/>
         <source>Hide rooms with this tag or from this community</source>
         <translation type="unfinished"></translation>
     </message>
@@ -348,7 +377,7 @@
 <context>
     <name>DigitVerification</name>
     <message>
-        <location filename="../qml/device-verification/DigitVerification.qml" line="+7"/>
+        <location filename="../qml/device-verification/DigitVerification.qml" line="+11"/>
         <source>Verification Code</source>
         <translation>Kod weryfikacyjny</translation>
     </message>
@@ -371,7 +400,7 @@
 <context>
     <name>EditModal</name>
     <message>
-        <location filename="../../src/dialogs/RoomSettings.cpp" line="+73"/>
+        <location filename="../../src/ui/RoomSettings.cpp" line="+42"/>
         <source>Apply</source>
         <translation>Zastosuj</translation>
     </message>
@@ -394,7 +423,7 @@
 <context>
     <name>EmojiPicker</name>
     <message>
-        <location filename="../qml/emoji/EmojiPicker.qml" line="+113"/>
+        <location filename="../qml/emoji/EmojiPicker.qml" line="+117"/>
         <location line="+181"/>
         <source>Search</source>
         <translation>Szukaj</translation>
@@ -443,7 +472,7 @@
 <context>
     <name>EmojiVerification</name>
     <message>
-        <location filename="../qml/device-verification/EmojiVerification.qml" line="+7"/>
+        <location filename="../qml/device-verification/EmojiVerification.qml" line="+11"/>
         <source>Verification Code</source>
         <translation>Kod weryfikacyjny</translation>
     </message>
@@ -466,7 +495,7 @@
 <context>
     <name>EncryptionIndicator</name>
     <message>
-        <location filename="../qml/EncryptionIndicator.qml" line="+19"/>
+        <location filename="../qml/EncryptionIndicator.qml" line="+23"/>
         <source>Encrypted</source>
         <translation>Zaszyfrowane</translation>
     </message>
@@ -479,7 +508,7 @@
 <context>
     <name>EventStore</name>
     <message>
-        <location filename="../../src/timeline/EventStore.cpp" line="+612"/>
+        <location filename="../../src/timeline/EventStore.cpp" line="+613"/>
         <source>-- Encrypted Event (No keys found for decryption) --</source>
         <comment>Placeholder, when the message was not decrypted yet or can&apos;t be decrypted.</comment>
         <translation>-- Zdarzenie szyfrowania (Nie znaleziono kluczy deszyfrujÄ…cych)</translation>
@@ -524,7 +553,7 @@
 <context>
     <name>Failed</name>
     <message>
-        <location filename="../qml/device-verification/Failed.qml" line="+7"/>
+        <location filename="../qml/device-verification/Failed.qml" line="+11"/>
         <source>Verification failed</source>
         <translation>Weryfikacja nieudana</translation>
     </message>
@@ -558,7 +587,7 @@
 <context>
     <name>InputBar</name>
     <message>
-        <location filename="../../src/timeline/InputBar.cpp" line="+227"/>
+        <location filename="../../src/timeline/InputBar.cpp" line="+253"/>
         <source>Select a file</source>
         <translation type="unfinished">Wybierz plik</translation>
     </message>
@@ -568,7 +597,7 @@
         <translation type="unfinished">Wszystkie pliki (*)</translation>
     </message>
     <message>
-        <location line="+384"/>
+        <location line="+371"/>
         <source>Failed to upload media. Please try again.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -576,7 +605,7 @@
 <context>
     <name>InviteeItem</name>
     <message>
-        <location filename="../../src/InviteeItem.cpp" line="+18"/>
+        <location filename="../../src/InviteeItem.cpp" line="+22"/>
         <source>Remove</source>
         <translation>Usuń</translation>
     </message>
@@ -584,7 +613,7 @@
 <context>
     <name>LoginPage</name>
     <message>
-        <location filename="../../src/LoginPage.cpp" line="+92"/>
+        <location filename="../../src/LoginPage.cpp" line="+80"/>
         <source>Matrix ID</source>
         <translation>ID Matrixa</translation>
     </message>
@@ -641,20 +670,19 @@ Example: https://server.my:8787</source>
     </message>
     <message>
         <location line="+19"/>
-        <location line="+218"/>
         <source>LOGIN</source>
         <translation>ZALOGUJ</translation>
     </message>
     <message>
-        <location line="-151"/>
+        <location line="+84"/>
         <location line="+11"/>
-        <location line="+157"/>
+        <location line="+156"/>
         <location line="+11"/>
         <source>You have entered an invalid Matrix ID  e.g @joe:matrix.org</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-132"/>
+        <location line="-131"/>
         <source>Autodiscovery failed. Received malformed response.</source>
         <translation>Automatyczne odkrywanie zakończone niepowodzeniem. Otrzymano nieprawidłową odpowiedź.</translation>
     </message>
@@ -679,12 +707,12 @@ Example: https://server.my:8787</source>
         <translation>Wystąpił nieznany błąd. Upewnij się, że domena serwera domowego jest prawidłowa.</translation>
     </message>
     <message>
-        <location line="+59"/>
+        <location line="-168"/>
         <source>SSO LOGIN</source>
         <translation>Logowanie SSO</translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+263"/>
         <source>Empty password</source>
         <translation>Puste hasło</translation>
     </message>
@@ -697,7 +725,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>MemberList</name>
     <message>
-        <location filename="../../src/dialogs/MemberList.cpp" line="+90"/>
+        <location filename="../../src/dialogs/MemberList.cpp" line="+94"/>
         <source>Room members</source>
         <translation>Członkowie pokoju</translation>
     </message>
@@ -710,7 +738,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>MessageDelegate</name>
     <message>
-        <location filename="../qml/delegates/MessageDelegate.qml" line="+105"/>
+        <location filename="../qml/delegates/MessageDelegate.qml" line="+109"/>
         <location line="+9"/>
         <source>removed</source>
         <translation type="unfinished"></translation>
@@ -779,7 +807,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>MessageInput</name>
     <message>
-        <location filename="../qml/MessageInput.qml" line="+38"/>
+        <location filename="../qml/MessageInput.qml" line="+42"/>
         <source>Hang up</source>
         <translation type="unfinished"></translation>
     </message>
@@ -789,22 +817,22 @@ Example: https://server.my:8787</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+25"/>
         <source>Send a file</source>
         <translation type="unfinished">Wyślij plik</translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+42"/>
         <source>Write a message...</source>
         <translation type="unfinished">Napisz wiadomość…</translation>
     </message>
     <message>
-        <location line="+186"/>
+        <location line="+211"/>
         <source>Emoji</source>
         <translation type="unfinished">Emoji</translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+16"/>
         <source>Send</source>
         <translation type="unfinished"></translation>
     </message>
@@ -812,7 +840,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>NewVerificationRequest</name>
     <message>
-        <location filename="../qml/device-verification/NewVerificationRequest.qml" line="+7"/>
+        <location filename="../qml/device-verification/NewVerificationRequest.qml" line="+11"/>
         <source>Send Verification Request</source>
         <translation type="unfinished"></translation>
     </message>
@@ -870,7 +898,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>PlaceCall</name>
     <message>
-        <location filename="../qml/voip/PlaceCall.qml" line="+36"/>
+        <location filename="../qml/voip/PlaceCall.qml" line="+48"/>
         <source>Place a call to %1?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -890,7 +918,12 @@ Example: https://server.my:8787</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location line="+14"/>
+        <source>Screen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
         <source>Cancel</source>
         <translation type="unfinished">Anuluj</translation>
     </message>
@@ -898,7 +931,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>Placeholder</name>
     <message>
-        <location filename="../qml/delegates/Placeholder.qml" line="+4"/>
+        <location filename="../qml/delegates/Placeholder.qml" line="+8"/>
         <source>unimplemented event: </source>
         <translation>Niezaimplementowane wydarzenie: </translation>
     </message>
@@ -906,7 +939,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>QCoreApplication</name>
     <message>
-        <location filename="../../src/main.cpp" line="+179"/>
+        <location filename="../../src/main.cpp" line="+167"/>
         <source>Create a unique profile, which allows you to log into several accounts at the same time and start multiple instances of nheko.</source>
         <translation>Stwórz unikalny profil, który pozwoli Ci na zalogowanie się do kilku kont jednocześnie i uruchomienie wielu instancji Nheko.</translation>
     </message>
@@ -924,7 +957,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>QuickSwitcher</name>
     <message>
-        <location filename="../../src/QuickSwitcher.cpp" line="+74"/>
+        <location filename="../../src/QuickSwitcher.cpp" line="+62"/>
         <source>Search for a room...</source>
         <translation>Wyszukaj pokoju…</translation>
     </message>
@@ -932,18 +965,18 @@ Example: https://server.my:8787</source>
 <context>
     <name>RegisterPage</name>
     <message>
-        <location filename="../../src/RegisterPage.cpp" line="+89"/>
+        <location filename="../../src/RegisterPage.cpp" line="+77"/>
         <source>Username</source>
         <translation>Nazwa użytkownika</translation>
     </message>
     <message>
         <location line="+2"/>
-        <location line="+286"/>
+        <location line="+287"/>
         <source>The username must not be empty, and must contain only the characters a-z, 0-9, ., _, =, -, and /.</source>
         <translation>Nazwa użytkownika nie może być pusta i  może  zawierać wyłącznie znaki a-z, 0-9, ., _, =, -, i /.</translation>
     </message>
     <message>
-        <location line="-282"/>
+        <location line="-283"/>
         <source>Password</source>
         <translation>Hasło</translation>
     </message>
@@ -978,7 +1011,7 @@ Example: https://server.my:8787</source>
         <translation>Nie wspierana procedura rejestracji!</translation>
     </message>
     <message>
-        <location line="+209"/>
+        <location line="+210"/>
         <source>One or more fields have invalid inputs. Please correct those issues and try again.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1001,7 +1034,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>ReplyPopup</name>
     <message>
-        <location filename="../qml/ReplyPopup.qml" line="+45"/>
+        <location filename="../qml/ReplyPopup.qml" line="+49"/>
         <source>Close</source>
         <translation>Zamknij</translation>
     </message>
@@ -1014,7 +1047,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>RoomInfo</name>
     <message>
-        <location filename="../../src/Cache.cpp" line="+1861"/>
+        <location filename="../../src/Cache.cpp" line="+1793"/>
         <source>no version stored</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1022,7 +1055,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>RoomInfoListItem</name>
     <message>
-        <location filename="../../src/RoomInfoListItem.cpp" line="+102"/>
+        <location filename="../../src/RoomInfoListItem.cpp" line="+90"/>
         <source>Leave room</source>
         <translation>Opuść pokój</translation>
     </message>
@@ -1084,10 +1117,116 @@ Example: https://server.my:8787</source>
         <translation>Odrzuć</translation>
     </message>
 </context>
+<context>
+    <name>RoomSettings</name>
+    <message>
+        <location filename="../qml/RoomSettings.qml" line="+204"/>
+        <source>End-to-End Encryption</source>
+        <translation type="unfinished">Szyfrowanie end-to-end</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Encryption is currently experimental and things might break unexpectedly. &lt;br&gt;
+                            Please take note that it can&apos;t be disabled afterwards.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>Whether or not the client should respond automatically with the session keys
+                                upon request. Use with caution, this is a temporary measure to test the
+                                E2E implementation until device verification is completed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/ui/RoomSettings.cpp" line="+267"/>
+        <source>Failed to enable encryption: %1</source>
+        <translation type="unfinished">Nie udało się włączyć szyfrowania: %1</translation>
+    </message>
+    <message>
+        <location line="+228"/>
+        <source>Select an avatar</source>
+        <translation type="unfinished">Wybierz awatar</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>All Files (*)</source>
+        <translation type="unfinished">Wszystkie pliki (*)</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>The selected file is not an image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Error while reading file: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+34"/>
+        <location line="+20"/>
+        <source>Failed to upload image: %s</source>
+        <translation type="unfinished">Nie udało się wysłać obrazu: %s</translation>
+    </message>
+</context>
+<context>
+    <name>ScreenShare</name>
+    <message>
+        <location filename="../qml/voip/ScreenShare.qml" line="+30"/>
+        <source>Share desktop with %1?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Window:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Frame rate:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Include your camera picture-in-picture</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>Request remote camera</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location line="+9"/>
+        <source>View your callee&apos;s camera like a regular video call</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Hide mouse cursor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Share</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Preview</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Anuluj</translation>
+    </message>
+</context>
 <context>
     <name>SideBarActions</name>
     <message>
-        <location filename="../../src/SideBarActions.cpp" line="+40"/>
+        <location filename="../../src/SideBarActions.cpp" line="+44"/>
         <source>User settings</source>
         <translation>Ustawienia użytkownika</translation>
     </message>
@@ -1115,7 +1254,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>StatusIndicator</name>
     <message>
-        <location filename="../qml/StatusIndicator.qml" line="+17"/>
+        <location filename="../qml/StatusIndicator.qml" line="+21"/>
         <source>Failed</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1138,7 +1277,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>Success</name>
     <message>
-        <location filename="../qml/device-verification/Success.qml" line="+6"/>
+        <location filename="../qml/device-verification/Success.qml" line="+10"/>
         <source>Successful Verification</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1156,7 +1295,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>TimelineModel</name>
     <message>
-        <location filename="../../src/timeline/TimelineModel.cpp" line="+895"/>
+        <location filename="../../src/timeline/TimelineModel.cpp" line="+911"/>
         <source>Message redaction failed: %1</source>
         <translation type="unfinished">Redagowanie wiadomości nie powiodło się: %1</translation>
     </message>
@@ -1307,12 +1446,12 @@ Example: https://server.my:8787</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-795"/>
+        <location line="-798"/>
         <source>You joined this room.</source>
         <translation type="unfinished">Dołączyłeś(-łaś) do tego pokoju.</translation>
     </message>
     <message>
-        <location line="+797"/>
+        <location line="+800"/>
         <source>Rejected the knock from %1.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1336,7 +1475,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>TimelineRow</name>
     <message>
-        <location filename="../qml/TimelineRow.qml" line="+99"/>
+        <location filename="../qml/TimelineRow.qml" line="+100"/>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1364,7 +1503,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>TimelineView</name>
     <message>
-        <location filename="../qml/TimelineView.qml" line="+85"/>
+        <location filename="../qml/TimelineView.qml" line="+97"/>
         <source>React</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1414,7 +1553,7 @@ Example: https://server.my:8787</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+61"/>
         <source>No room open</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1422,7 +1561,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>TimelineViewManager</name>
     <message>
-        <location filename="../../src/timeline/TimelineViewManager.cpp" line="+423"/>
+        <location filename="../../src/timeline/TimelineViewManager.cpp" line="+430"/>
         <source>No encrypted private chat found with this user. Create an encrypted private chat with this user and try again.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1430,7 +1569,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>TopBar</name>
     <message>
-        <location filename="../qml/TopBar.qml" line="+43"/>
+        <location filename="../qml/TopBar.qml" line="+47"/>
         <source>Back to room list</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1469,7 +1608,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>TrayIcon</name>
     <message>
-        <location filename="../../src/TrayIcon.cpp" line="+122"/>
+        <location filename="../../src/TrayIcon.cpp" line="+110"/>
         <source>Show</source>
         <translation>Pokaż</translation>
     </message>
@@ -1482,7 +1621,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>UserInfoWidget</name>
     <message>
-        <location filename="../../src/UserInfoWidget.cpp" line="+95"/>
+        <location filename="../../src/UserInfoWidget.cpp" line="+82"/>
         <source>Logout</source>
         <translation>Wyloguj</translation>
     </message>
@@ -1530,7 +1669,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>UserProfile</name>
     <message>
-        <location filename="../qml/UserProfile.qml" line="+133"/>
+        <location filename="../qml/UserProfile.qml" line="+137"/>
         <source>Verify</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1550,7 +1689,7 @@ Example: https://server.my:8787</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/UserProfile.cpp" line="+296"/>
+        <location filename="../../src/ui/UserProfile.cpp" line="+301"/>
         <source>Select an avatar</source>
         <translation type="unfinished">Wybierz awatar</translation>
     </message>
@@ -1573,7 +1712,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>UserSettings</name>
     <message>
-        <location filename="../../src/UserSettingsPage.cpp" line="+345"/>
+        <location filename="../../src/UserSettingsPage.cpp" line="+337"/>
         <location filename="../../src/UserSettingsPage.h" line="+183"/>
         <source>Default</source>
         <translation type="unfinished"></translation>
@@ -1582,7 +1721,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>UserSettingsPage</name>
     <message>
-        <location line="+496"/>
+        <location line="+540"/>
         <source>Minimize to tray</source>
         <translation>Zminimalizuj do paska zadań</translation>
     </message>
@@ -1798,7 +1937,7 @@ This usually causes the application icon in the task bar to animate in some fash
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+407"/>
+        <location line="+406"/>
         <source>CACHED</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1808,7 +1947,7 @@ This usually causes the application icon in the task bar to animate in some fash
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-461"/>
+        <location line="-460"/>
         <source>Scale factor</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1983,7 +2122,7 @@ This usually causes the application icon in the task bar to animate in some fash
         <translation type="unfinished">Wszystkie pliki (*)</translation>
     </message>
     <message>
-        <location line="+237"/>
+        <location line="+236"/>
         <source>Open Sessions File</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2028,7 +2167,7 @@ This usually causes the application icon in the task bar to animate in some fash
 <context>
     <name>Waiting</name>
     <message>
-        <location filename="../qml/device-verification/Waiting.qml" line="+7"/>
+        <location filename="../qml/device-verification/Waiting.qml" line="+11"/>
         <source>Waiting for other party…</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2056,7 +2195,7 @@ This usually causes the application icon in the task bar to animate in some fash
 <context>
     <name>WelcomePage</name>
     <message>
-        <location filename="../../src/WelcomePage.cpp" line="+46"/>
+        <location filename="../../src/WelcomePage.cpp" line="+34"/>
         <source>Welcome to nheko! The desktop client for the Matrix protocol.</source>
         <translation>Witamy w nheko! Desktopowy klient protokołu Matrix.</translation>
     </message>
@@ -2079,7 +2218,7 @@ This usually causes the application icon in the task bar to animate in some fash
 <context>
     <name>descriptiveTime</name>
     <message>
-        <location filename="../../src/Utils.cpp" line="+145"/>
+        <location filename="../../src/Utils.cpp" line="+149"/>
         <source>Yesterday</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2087,7 +2226,7 @@ This usually causes the application icon in the task bar to animate in some fash
 <context>
     <name>dialogs::CreateRoom</name>
     <message>
-        <location filename="../../src/dialogs/CreateRoom.cpp" line="+36"/>
+        <location filename="../../src/dialogs/CreateRoom.cpp" line="+40"/>
         <source>Create room</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2130,7 +2269,7 @@ This usually causes the application icon in the task bar to animate in some fash
 <context>
     <name>dialogs::FallbackAuth</name>
     <message>
-        <location filename="../../src/dialogs/FallbackAuth.cpp" line="+30"/>
+        <location filename="../../src/dialogs/FallbackAuth.cpp" line="+34"/>
         <source>Open Fallback in Browser</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2153,7 +2292,7 @@ This usually causes the application icon in the task bar to animate in some fash
 <context>
     <name>dialogs::InviteUsers</name>
     <message>
-        <location filename="../../src/dialogs/InviteUsers.cpp" line="+42"/>
+        <location filename="../../src/dialogs/InviteUsers.cpp" line="+46"/>
         <source>Cancel</source>
         <translation>Anuluj</translation>
     </message>
@@ -2166,7 +2305,7 @@ This usually causes the application icon in the task bar to animate in some fash
 <context>
     <name>dialogs::JoinRoom</name>
     <message>
-        <location filename="../../src/dialogs/JoinRoom.cpp" line="+30"/>
+        <location filename="../../src/dialogs/JoinRoom.cpp" line="+34"/>
         <source>Join</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2184,7 +2323,7 @@ This usually causes the application icon in the task bar to animate in some fash
 <context>
     <name>dialogs::LeaveRoom</name>
     <message>
-        <location filename="../../src/dialogs/LeaveRoom.cpp" line="+31"/>
+        <location filename="../../src/dialogs/LeaveRoom.cpp" line="+35"/>
         <source>Cancel</source>
         <translation>Anuluj</translation>
     </message>
@@ -2197,7 +2336,7 @@ This usually causes the application icon in the task bar to animate in some fash
 <context>
     <name>dialogs::Logout</name>
     <message>
-        <location filename="../../src/dialogs/Logout.cpp" line="+47"/>
+        <location filename="../../src/dialogs/Logout.cpp" line="+35"/>
         <source>Cancel</source>
         <translation>Anuluj</translation>
     </message>
@@ -2210,7 +2349,7 @@ This usually causes the application icon in the task bar to animate in some fash
 <context>
     <name>dialogs::PreviewUploadOverlay</name>
     <message>
-        <location filename="../../src/dialogs/PreviewUploadOverlay.cpp" line="+41"/>
+        <location filename="../../src/dialogs/PreviewUploadOverlay.cpp" line="+29"/>
         <source>Upload</source>
         <translation>Wyślij</translation>
     </message>
@@ -2232,7 +2371,7 @@ Rozmiar multimediów: %2
 <context>
     <name>dialogs::ReCaptcha</name>
     <message>
-        <location filename="../../src/dialogs/ReCaptcha.cpp" line="+31"/>
+        <location filename="../../src/dialogs/ReCaptcha.cpp" line="+35"/>
         <source>Cancel</source>
         <translation>Anuluj</translation>
     </message>
@@ -2250,7 +2389,7 @@ Rozmiar multimediów: %2
 <context>
     <name>dialogs::ReadReceipts</name>
     <message>
-        <location filename="../../src/dialogs/ReadReceipts.cpp" line="+120"/>
+        <location filename="../../src/dialogs/ReadReceipts.cpp" line="+124"/>
         <source>Read receipts</source>
         <translation>Potwierdzenia przeczytania</translation>
     </message>
@@ -2273,142 +2412,10 @@ Rozmiar multimediów: %2
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>dialogs::RoomSettings</name>
-    <message>
-        <location filename="../../src/dialogs/RoomSettings.cpp" line="+135"/>
-        <source>Settings</source>
-        <translation>Ustawienia</translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Info</source>
-        <translation>Informacje</translation>
-    </message>
-    <message>
-        <location line="+11"/>
-        <source>Internal ID</source>
-        <translation>Wewnętrzne ID</translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>Room Version</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Notifications</source>
-        <translation>Powiadomienia</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Muted</source>
-        <translation>Wyciszone</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Mentions only</source>
-        <translation>Tylko wspomnienia</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>All messages</source>
-        <translation>Wszystkie wiadomości</translation>
-    </message>
-    <message>
-        <location line="+97"/>
-        <source>Room access</source>
-        <translation>Dostęp do pokoju</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Anyone and guests</source>
-        <translation>Wszyscy i goście</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Anyone</source>
-        <translation>Wszyscy</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Invited users</source>
-        <translation>Zaproszeni użytkownicy</translation>
-    </message>
-    <message>
-        <location line="+50"/>
-        <source>Encryption</source>
-        <translation>Szyfrowanie</translation>
-    </message>
-    <message>
-        <location line="+31"/>
-        <source>End-to-End Encryption</source>
-        <translation>Szyfrowanie end-to-end</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Encryption is currently experimental and things might break unexpectedly. &lt;br&gt;Please take note that it can&apos;t be disabled afterwards.</source>
-        <translation>Szyfrowanie jest obecnie eksperymentalne i może spowodować nieoczekiwane błędy. &lt;br&gt;Zapamiętaj, że nie może zostać później wyłączona.</translation>
-    </message>
-    <message>
-        <location line="-24"/>
-        <source>Respond to key requests</source>
-        <translation>Odpowiadaj na żądania o klucze</translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Whether or not the client should respond automatically with the session keys
- upon request. Use with caution, this is a temporary measure to test the
- E2E implementation until device verification is completed.</source>
-        <translation>Określa, czy klient powinien odpowiadać automatycznie z kluczami
- sesji na żądania. Używaj ostrożnie, jest to tymczasowe rozwiązanie
- do testowania implementacji E2E, zanim weryfikacja urządzeń będzie ukończona.</translation>
-    </message>
-    <message numerus="yes">
-        <location line="+80"/>
-        <source>%n member(s)</source>
-        <translation>
-            <numerusform>%n członek</numerusform>
-            <numerusform>%n członków</numerusform>
-            <numerusform>%n członków</numerusform>
-        </translation>
-    </message>
-    <message>
-        <location line="+142"/>
-        <source>Failed to enable encryption: %1</source>
-        <translation>Nie udało się włączyć szyfrowania: %1</translation>
-    </message>
-    <message>
-        <location line="+147"/>
-        <source>Select an avatar</source>
-        <translation>Wybierz awatar</translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>All Files (*)</source>
-        <translation>Wszystkie pliki (*)</translation>
-    </message>
-    <message>
-        <location line="+12"/>
-        <source>The selected file is not an image</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Error while reading file: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+35"/>
-        <location line="+20"/>
-        <source>Failed to upload image: %s</source>
-        <translation>Nie udało się wysłać obrazu: %s</translation>
-    </message>
-</context>
 <context>
     <name>message-description sent:</name>
     <message>
-        <location filename="../../src/Utils.h" line="+108"/>
+        <location filename="../../src/Utils.h" line="+112"/>
         <source>You sent an audio clip</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2521,7 +2528,7 @@ Rozmiar multimediów: %2
 <context>
     <name>popups::UserMentions</name>
     <message>
-        <location filename="../../src/popups/UserMentions.cpp" line="+64"/>
+        <location filename="../../src/popups/UserMentions.cpp" line="+68"/>
         <source>This Room</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/resources/langs/nheko_pt_PT.ts b/resources/langs/nheko_pt_PT.ts
index caa970b5e99ce6567622f612ac708e65951f213f..e3f57ad2b981609e9c9f6f9e15c20a76e2d3894a 100644
--- a/resources/langs/nheko_pt_PT.ts
+++ b/resources/langs/nheko_pt_PT.ts
@@ -4,7 +4,7 @@
 <context>
     <name>ActiveCallBar</name>
     <message>
-        <location filename="../qml/voip/ActiveCallBar.qml" line="+66"/>
+        <location filename="../qml/voip/ActiveCallBar.qml" line="+106"/>
         <source>Calling...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15,8 +15,13 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+76"/>
-        <source>Toggle camera view</source>
+        <location line="+67"/>
+        <source>You are screen sharing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Hide/Show Picture-in-Picture</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -33,7 +38,7 @@
 <context>
     <name>AwaitingVerificationConfirmation</name>
     <message>
-        <location filename="../qml/device-verification/AwaitingVerificationConfirmation.qml" line="+7"/>
+        <location filename="../qml/device-verification/AwaitingVerificationConfirmation.qml" line="+11"/>
         <source>Awaiting Confirmation</source>
         <translation type="unfinished"></translation>
     </message>
@@ -51,7 +56,7 @@
 <context>
     <name>Cache</name>
     <message>
-        <location filename="../../src/Cache.cpp" line="+2084"/>
+        <location filename="../../src/Cache.cpp" line="+2026"/>
         <source>You joined this room.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -59,7 +64,7 @@
 <context>
     <name>CallInvite</name>
     <message>
-        <location filename="../qml/voip/CallInvite.qml" line="+66"/>
+        <location filename="../qml/voip/CallInvite.qml" line="+70"/>
         <source>Video Call</source>
         <translation type="unfinished"></translation>
     </message>
@@ -77,7 +82,7 @@
 <context>
     <name>CallInviteBar</name>
     <message>
-        <location filename="../qml/voip/CallInviteBar.qml" line="+60"/>
+        <location filename="../qml/voip/CallInviteBar.qml" line="+64"/>
         <source>Video Call</source>
         <translation type="unfinished"></translation>
     </message>
@@ -92,7 +97,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
+        <location line="+10"/>
         <source>Accept</source>
         <translation type="unfinished"></translation>
     </message>
@@ -117,36 +122,55 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>CallManager</name>
+    <message>
+        <location filename="../../src/CallManager.cpp" line="+521"/>
+        <source>Entire screen</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>ChatPage</name>
     <message>
-        <location filename="../../src/ChatPage.cpp" line="+215"/>
+        <location filename="../../src/ChatPage.cpp" line="+203"/>
         <source>Failed to invite user: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+4"/>
-        <location line="+797"/>
+        <location line="+806"/>
         <source>Invited user: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-500"/>
+        <location line="-510"/>
         <source>Migrating the cache to the current version failed. This can have different reasons. Please open an issue and try to use an older version in the mean time. Alternatively you can try deleting the cache manually.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+456"/>
+        <location line="+413"/>
+        <source>Confirm join</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Do you really want to join %1?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+44"/>
         <source>Room %1 created.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+35"/>
+        <location line="+323"/>
         <source>Confirm invite</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="-322"/>
         <source>Do you really want to invite %1 (%2)?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -211,7 +235,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-582"/>
+        <location line="+226"/>
+        <source>Do you really want to start a private chat with %1?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-818"/>
         <source>Cache migration failed!</source>
         <translation type="unfinished"></translation>
     </message>
@@ -236,7 +265,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+165"/>
+        <location line="+157"/>
         <source>Failed to setup encryption keys. Server response: %1 %2. Please try again later.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -247,7 +276,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+47"/>
         <source>Failed to join room: %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -267,12 +296,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+18"/>
         <source>Failed to leave room: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+54"/>
+        <location line="+61"/>
         <source>Failed to kick %1 from %2: %3</source>
         <translation type="unfinished"></translation>
     </message>
@@ -280,7 +309,7 @@
 <context>
     <name>CommunitiesListItem</name>
     <message>
-        <location filename="../../src/CommunitiesListItem.cpp" line="+26"/>
+        <location filename="../../src/CommunitiesListItem.cpp" line="+30"/>
         <source>Hide rooms with this tag or from this community</source>
         <translation type="unfinished"></translation>
     </message>
@@ -348,7 +377,7 @@
 <context>
     <name>DigitVerification</name>
     <message>
-        <location filename="../qml/device-verification/DigitVerification.qml" line="+7"/>
+        <location filename="../qml/device-verification/DigitVerification.qml" line="+11"/>
         <source>Verification Code</source>
         <translation type="unfinished"></translation>
     </message>
@@ -371,7 +400,7 @@
 <context>
     <name>EditModal</name>
     <message>
-        <location filename="../../src/dialogs/RoomSettings.cpp" line="+73"/>
+        <location filename="../../src/ui/RoomSettings.cpp" line="+42"/>
         <source>Apply</source>
         <translation type="unfinished"></translation>
     </message>
@@ -394,7 +423,7 @@
 <context>
     <name>EmojiPicker</name>
     <message>
-        <location filename="../qml/emoji/EmojiPicker.qml" line="+113"/>
+        <location filename="../qml/emoji/EmojiPicker.qml" line="+117"/>
         <location line="+181"/>
         <source>Search</source>
         <translation type="unfinished"></translation>
@@ -443,7 +472,7 @@
 <context>
     <name>EmojiVerification</name>
     <message>
-        <location filename="../qml/device-verification/EmojiVerification.qml" line="+7"/>
+        <location filename="../qml/device-verification/EmojiVerification.qml" line="+11"/>
         <source>Verification Code</source>
         <translation type="unfinished"></translation>
     </message>
@@ -466,7 +495,7 @@
 <context>
     <name>EncryptionIndicator</name>
     <message>
-        <location filename="../qml/EncryptionIndicator.qml" line="+19"/>
+        <location filename="../qml/EncryptionIndicator.qml" line="+23"/>
         <source>Encrypted</source>
         <translation type="unfinished"></translation>
     </message>
@@ -479,7 +508,7 @@
 <context>
     <name>EventStore</name>
     <message>
-        <location filename="../../src/timeline/EventStore.cpp" line="+612"/>
+        <location filename="../../src/timeline/EventStore.cpp" line="+613"/>
         <source>-- Encrypted Event (No keys found for decryption) --</source>
         <comment>Placeholder, when the message was not decrypted yet or can&apos;t be decrypted.</comment>
         <translation type="unfinished"></translation>
@@ -524,7 +553,7 @@
 <context>
     <name>Failed</name>
     <message>
-        <location filename="../qml/device-verification/Failed.qml" line="+7"/>
+        <location filename="../qml/device-verification/Failed.qml" line="+11"/>
         <source>Verification failed</source>
         <translation type="unfinished"></translation>
     </message>
@@ -558,7 +587,7 @@
 <context>
     <name>InputBar</name>
     <message>
-        <location filename="../../src/timeline/InputBar.cpp" line="+227"/>
+        <location filename="../../src/timeline/InputBar.cpp" line="+253"/>
         <source>Select a file</source>
         <translation type="unfinished"></translation>
     </message>
@@ -568,7 +597,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+384"/>
+        <location line="+371"/>
         <source>Failed to upload media. Please try again.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -576,7 +605,7 @@
 <context>
     <name>InviteeItem</name>
     <message>
-        <location filename="../../src/InviteeItem.cpp" line="+18"/>
+        <location filename="../../src/InviteeItem.cpp" line="+22"/>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
@@ -584,7 +613,7 @@
 <context>
     <name>LoginPage</name>
     <message>
-        <location filename="../../src/LoginPage.cpp" line="+92"/>
+        <location filename="../../src/LoginPage.cpp" line="+80"/>
         <source>Matrix ID</source>
         <translation type="unfinished"></translation>
     </message>
@@ -639,20 +668,19 @@ Example: https://server.my:8787</source>
     </message>
     <message>
         <location line="+19"/>
-        <location line="+218"/>
         <source>LOGIN</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-151"/>
+        <location line="+84"/>
         <location line="+11"/>
-        <location line="+157"/>
+        <location line="+156"/>
         <location line="+11"/>
         <source>You have entered an invalid Matrix ID  e.g @joe:matrix.org</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-132"/>
+        <location line="-131"/>
         <source>Autodiscovery failed. Received malformed response.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -677,12 +705,12 @@ Example: https://server.my:8787</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+59"/>
+        <location line="-168"/>
         <source>SSO LOGIN</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+263"/>
         <source>Empty password</source>
         <translation type="unfinished"></translation>
     </message>
@@ -695,7 +723,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>MemberList</name>
     <message>
-        <location filename="../../src/dialogs/MemberList.cpp" line="+90"/>
+        <location filename="../../src/dialogs/MemberList.cpp" line="+94"/>
         <source>Room members</source>
         <translation type="unfinished"></translation>
     </message>
@@ -708,7 +736,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>MessageDelegate</name>
     <message>
-        <location filename="../qml/delegates/MessageDelegate.qml" line="+123"/>
+        <location filename="../qml/delegates/MessageDelegate.qml" line="+127"/>
         <source>Encryption enabled</source>
         <translation type="unfinished"></translation>
     </message>
@@ -777,7 +805,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>MessageInput</name>
     <message>
-        <location filename="../qml/MessageInput.qml" line="+38"/>
+        <location filename="../qml/MessageInput.qml" line="+42"/>
         <source>Hang up</source>
         <translation type="unfinished"></translation>
     </message>
@@ -787,22 +815,22 @@ Example: https://server.my:8787</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+25"/>
         <source>Send a file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+42"/>
         <source>Write a message...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+186"/>
+        <location line="+211"/>
         <source>Emoji</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+16"/>
         <source>Send</source>
         <translation type="unfinished"></translation>
     </message>
@@ -810,7 +838,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>NewVerificationRequest</name>
     <message>
-        <location filename="../qml/device-verification/NewVerificationRequest.qml" line="+7"/>
+        <location filename="../qml/device-verification/NewVerificationRequest.qml" line="+11"/>
         <source>Send Verification Request</source>
         <translation type="unfinished"></translation>
     </message>
@@ -868,7 +896,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>PlaceCall</name>
     <message>
-        <location filename="../qml/voip/PlaceCall.qml" line="+36"/>
+        <location filename="../qml/voip/PlaceCall.qml" line="+48"/>
         <source>Place a call to %1?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -888,7 +916,12 @@ Example: https://server.my:8787</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location line="+14"/>
+        <source>Screen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -896,7 +929,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>Placeholder</name>
     <message>
-        <location filename="../qml/delegates/Placeholder.qml" line="+4"/>
+        <location filename="../qml/delegates/Placeholder.qml" line="+8"/>
         <source>unimplemented event: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -904,7 +937,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>QCoreApplication</name>
     <message>
-        <location filename="../../src/main.cpp" line="+179"/>
+        <location filename="../../src/main.cpp" line="+167"/>
         <source>Create a unique profile, which allows you to log into several accounts at the same time and start multiple instances of nheko.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -922,7 +955,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>QuickSwitcher</name>
     <message>
-        <location filename="../../src/QuickSwitcher.cpp" line="+74"/>
+        <location filename="../../src/QuickSwitcher.cpp" line="+62"/>
         <source>Search for a room...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -930,18 +963,18 @@ Example: https://server.my:8787</source>
 <context>
     <name>RegisterPage</name>
     <message>
-        <location filename="../../src/RegisterPage.cpp" line="+89"/>
+        <location filename="../../src/RegisterPage.cpp" line="+77"/>
         <source>Username</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+2"/>
-        <location line="+286"/>
+        <location line="+287"/>
         <source>The username must not be empty, and must contain only the characters a-z, 0-9, ., _, =, -, and /.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-282"/>
+        <location line="-283"/>
         <source>Password</source>
         <translation type="unfinished"></translation>
     </message>
@@ -976,7 +1009,7 @@ Example: https://server.my:8787</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+209"/>
+        <location line="+210"/>
         <source>One or more fields have invalid inputs. Please correct those issues and try again.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -999,7 +1032,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>ReplyPopup</name>
     <message>
-        <location filename="../qml/ReplyPopup.qml" line="+45"/>
+        <location filename="../qml/ReplyPopup.qml" line="+49"/>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1012,7 +1045,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>RoomInfo</name>
     <message>
-        <location filename="../../src/Cache.cpp" line="+1861"/>
+        <location filename="../../src/Cache.cpp" line="+1793"/>
         <source>no version stored</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1020,7 +1053,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>RoomInfoListItem</name>
     <message>
-        <location filename="../../src/RoomInfoListItem.cpp" line="+102"/>
+        <location filename="../../src/RoomInfoListItem.cpp" line="+90"/>
         <source>Leave room</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1082,10 +1115,116 @@ Example: https://server.my:8787</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>RoomSettings</name>
+    <message>
+        <location filename="../qml/RoomSettings.qml" line="+204"/>
+        <source>End-to-End Encryption</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Encryption is currently experimental and things might break unexpectedly. &lt;br&gt;
+                            Please take note that it can&apos;t be disabled afterwards.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>Whether or not the client should respond automatically with the session keys
+                                upon request. Use with caution, this is a temporary measure to test the
+                                E2E implementation until device verification is completed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/ui/RoomSettings.cpp" line="+267"/>
+        <source>Failed to enable encryption: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+228"/>
+        <source>Select an avatar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>All Files (*)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>The selected file is not an image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Error while reading file: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+34"/>
+        <location line="+20"/>
+        <source>Failed to upload image: %s</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ScreenShare</name>
+    <message>
+        <location filename="../qml/voip/ScreenShare.qml" line="+30"/>
+        <source>Share desktop with %1?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Window:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Frame rate:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Include your camera picture-in-picture</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>Request remote camera</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location line="+9"/>
+        <source>View your callee&apos;s camera like a regular video call</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Hide mouse cursor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Share</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Preview</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>SideBarActions</name>
     <message>
-        <location filename="../../src/SideBarActions.cpp" line="+40"/>
+        <location filename="../../src/SideBarActions.cpp" line="+44"/>
         <source>User settings</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1113,7 +1252,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>StatusIndicator</name>
     <message>
-        <location filename="../qml/StatusIndicator.qml" line="+17"/>
+        <location filename="../qml/StatusIndicator.qml" line="+21"/>
         <source>Failed</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1136,7 +1275,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>Success</name>
     <message>
-        <location filename="../qml/device-verification/Success.qml" line="+6"/>
+        <location filename="../qml/device-verification/Success.qml" line="+10"/>
         <source>Successful Verification</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1154,7 +1293,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>TimelineModel</name>
     <message>
-        <location filename="../../src/timeline/TimelineModel.cpp" line="+895"/>
+        <location filename="../../src/timeline/TimelineModel.cpp" line="+911"/>
         <source>Message redaction failed: %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1304,12 +1443,12 @@ Example: https://server.my:8787</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-795"/>
+        <location line="-798"/>
         <source>You joined this room.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+797"/>
+        <location line="+800"/>
         <source>Rejected the knock from %1.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1333,7 +1472,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>TimelineRow</name>
     <message>
-        <location filename="../qml/TimelineRow.qml" line="+99"/>
+        <location filename="../qml/TimelineRow.qml" line="+100"/>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1361,7 +1500,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>TimelineView</name>
     <message>
-        <location filename="../qml/TimelineView.qml" line="+85"/>
+        <location filename="../qml/TimelineView.qml" line="+97"/>
         <source>React</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1411,7 +1550,7 @@ Example: https://server.my:8787</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+61"/>
         <source>No room open</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1419,7 +1558,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>TimelineViewManager</name>
     <message>
-        <location filename="../../src/timeline/TimelineViewManager.cpp" line="+423"/>
+        <location filename="../../src/timeline/TimelineViewManager.cpp" line="+430"/>
         <source>No encrypted private chat found with this user. Create an encrypted private chat with this user and try again.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1427,7 +1566,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>TopBar</name>
     <message>
-        <location filename="../qml/TopBar.qml" line="+43"/>
+        <location filename="../qml/TopBar.qml" line="+47"/>
         <source>Back to room list</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1466,7 +1605,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>TrayIcon</name>
     <message>
-        <location filename="../../src/TrayIcon.cpp" line="+122"/>
+        <location filename="../../src/TrayIcon.cpp" line="+110"/>
         <source>Show</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1479,7 +1618,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>UserInfoWidget</name>
     <message>
-        <location filename="../../src/UserInfoWidget.cpp" line="+95"/>
+        <location filename="../../src/UserInfoWidget.cpp" line="+82"/>
         <source>Logout</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1527,7 +1666,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>UserProfile</name>
     <message>
-        <location filename="../qml/UserProfile.qml" line="+133"/>
+        <location filename="../qml/UserProfile.qml" line="+137"/>
         <source>Verify</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1547,7 +1686,7 @@ Example: https://server.my:8787</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/UserProfile.cpp" line="+296"/>
+        <location filename="../../src/ui/UserProfile.cpp" line="+301"/>
         <source>Select an avatar</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1570,7 +1709,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>UserSettings</name>
     <message>
-        <location filename="../../src/UserSettingsPage.cpp" line="+345"/>
+        <location filename="../../src/UserSettingsPage.cpp" line="+337"/>
         <location filename="../../src/UserSettingsPage.h" line="+183"/>
         <source>Default</source>
         <translation type="unfinished"></translation>
@@ -1579,7 +1718,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>UserSettingsPage</name>
     <message>
-        <location line="+496"/>
+        <location line="+540"/>
         <source>Minimize to tray</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1795,7 +1934,7 @@ This usually causes the application icon in the task bar to animate in some fash
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+407"/>
+        <location line="+406"/>
         <source>CACHED</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1805,7 +1944,7 @@ This usually causes the application icon in the task bar to animate in some fash
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-461"/>
+        <location line="-460"/>
         <source>Scale factor</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1980,7 +2119,7 @@ This usually causes the application icon in the task bar to animate in some fash
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+237"/>
+        <location line="+236"/>
         <source>Open Sessions File</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2025,7 +2164,7 @@ This usually causes the application icon in the task bar to animate in some fash
 <context>
     <name>Waiting</name>
     <message>
-        <location filename="../qml/device-verification/Waiting.qml" line="+7"/>
+        <location filename="../qml/device-verification/Waiting.qml" line="+11"/>
         <source>Waiting for other party…</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2053,7 +2192,7 @@ This usually causes the application icon in the task bar to animate in some fash
 <context>
     <name>WelcomePage</name>
     <message>
-        <location filename="../../src/WelcomePage.cpp" line="+46"/>
+        <location filename="../../src/WelcomePage.cpp" line="+34"/>
         <source>Welcome to nheko! The desktop client for the Matrix protocol.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2076,7 +2215,7 @@ This usually causes the application icon in the task bar to animate in some fash
 <context>
     <name>descriptiveTime</name>
     <message>
-        <location filename="../../src/Utils.cpp" line="+145"/>
+        <location filename="../../src/Utils.cpp" line="+149"/>
         <source>Yesterday</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2084,7 +2223,7 @@ This usually causes the application icon in the task bar to animate in some fash
 <context>
     <name>dialogs::CreateRoom</name>
     <message>
-        <location filename="../../src/dialogs/CreateRoom.cpp" line="+36"/>
+        <location filename="../../src/dialogs/CreateRoom.cpp" line="+40"/>
         <source>Create room</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2127,7 +2266,7 @@ This usually causes the application icon in the task bar to animate in some fash
 <context>
     <name>dialogs::FallbackAuth</name>
     <message>
-        <location filename="../../src/dialogs/FallbackAuth.cpp" line="+30"/>
+        <location filename="../../src/dialogs/FallbackAuth.cpp" line="+34"/>
         <source>Open Fallback in Browser</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2150,7 +2289,7 @@ This usually causes the application icon in the task bar to animate in some fash
 <context>
     <name>dialogs::InviteUsers</name>
     <message>
-        <location filename="../../src/dialogs/InviteUsers.cpp" line="+42"/>
+        <location filename="../../src/dialogs/InviteUsers.cpp" line="+46"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2163,7 +2302,7 @@ This usually causes the application icon in the task bar to animate in some fash
 <context>
     <name>dialogs::JoinRoom</name>
     <message>
-        <location filename="../../src/dialogs/JoinRoom.cpp" line="+30"/>
+        <location filename="../../src/dialogs/JoinRoom.cpp" line="+34"/>
         <source>Join</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2181,7 +2320,7 @@ This usually causes the application icon in the task bar to animate in some fash
 <context>
     <name>dialogs::LeaveRoom</name>
     <message>
-        <location filename="../../src/dialogs/LeaveRoom.cpp" line="+31"/>
+        <location filename="../../src/dialogs/LeaveRoom.cpp" line="+35"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2194,7 +2333,7 @@ This usually causes the application icon in the task bar to animate in some fash
 <context>
     <name>dialogs::Logout</name>
     <message>
-        <location filename="../../src/dialogs/Logout.cpp" line="+47"/>
+        <location filename="../../src/dialogs/Logout.cpp" line="+35"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2207,7 +2346,7 @@ This usually causes the application icon in the task bar to animate in some fash
 <context>
     <name>dialogs::PreviewUploadOverlay</name>
     <message>
-        <location filename="../../src/dialogs/PreviewUploadOverlay.cpp" line="+41"/>
+        <location filename="../../src/dialogs/PreviewUploadOverlay.cpp" line="+29"/>
         <source>Upload</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2227,7 +2366,7 @@ Media size: %2
 <context>
     <name>dialogs::ReCaptcha</name>
     <message>
-        <location filename="../../src/dialogs/ReCaptcha.cpp" line="+31"/>
+        <location filename="../../src/dialogs/ReCaptcha.cpp" line="+35"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2245,7 +2384,7 @@ Media size: %2
 <context>
     <name>dialogs::ReadReceipts</name>
     <message>
-        <location filename="../../src/dialogs/ReadReceipts.cpp" line="+120"/>
+        <location filename="../../src/dialogs/ReadReceipts.cpp" line="+124"/>
         <source>Read receipts</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2268,139 +2407,10 @@ Media size: %2
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>dialogs::RoomSettings</name>
-    <message>
-        <location filename="../../src/dialogs/RoomSettings.cpp" line="+135"/>
-        <source>Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Info</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+11"/>
-        <source>Internal ID</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>Room Version</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Notifications</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Muted</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Mentions only</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>All messages</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+97"/>
-        <source>Room access</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Anyone and guests</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Anyone</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Invited users</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+50"/>
-        <source>Encryption</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+31"/>
-        <source>End-to-End Encryption</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Encryption is currently experimental and things might break unexpectedly. &lt;br&gt;Please take note that it can&apos;t be disabled afterwards.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-24"/>
-        <source>Respond to key requests</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Whether or not the client should respond automatically with the session keys
- upon request. Use with caution, this is a temporary measure to test the
- E2E implementation until device verification is completed.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message numerus="yes">
-        <location line="+80"/>
-        <source>%n member(s)</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
-    </message>
-    <message>
-        <location line="+142"/>
-        <source>Failed to enable encryption: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+147"/>
-        <source>Select an avatar</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>All Files (*)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+12"/>
-        <source>The selected file is not an image</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Error while reading file: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+35"/>
-        <location line="+20"/>
-        <source>Failed to upload image: %s</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>message-description sent:</name>
     <message>
-        <location filename="../../src/Utils.h" line="+108"/>
+        <location filename="../../src/Utils.h" line="+112"/>
         <source>You sent an audio clip</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2513,7 +2523,7 @@ Media size: %2
 <context>
     <name>popups::UserMentions</name>
     <message>
-        <location filename="../../src/popups/UserMentions.cpp" line="+64"/>
+        <location filename="../../src/popups/UserMentions.cpp" line="+68"/>
         <source>This Room</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/resources/langs/nheko_ro.ts b/resources/langs/nheko_ro.ts
index 662377f5f17ac97cecaad2272dfb75aaa0857041..560cb65aeeeece98ac23b22d9dfcc3cf05f39f13 100644
--- a/resources/langs/nheko_ro.ts
+++ b/resources/langs/nheko_ro.ts
@@ -4,7 +4,7 @@
 <context>
     <name>ActiveCallBar</name>
     <message>
-        <location filename="../qml/voip/ActiveCallBar.qml" line="+66"/>
+        <location filename="../qml/voip/ActiveCallBar.qml" line="+106"/>
         <source>Calling...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15,8 +15,13 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+76"/>
-        <source>Toggle camera view</source>
+        <location line="+67"/>
+        <source>You are screen sharing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Hide/Show Picture-in-Picture</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -33,7 +38,7 @@
 <context>
     <name>AwaitingVerificationConfirmation</name>
     <message>
-        <location filename="../qml/device-verification/AwaitingVerificationConfirmation.qml" line="+7"/>
+        <location filename="../qml/device-verification/AwaitingVerificationConfirmation.qml" line="+11"/>
         <source>Awaiting Confirmation</source>
         <translation type="unfinished"></translation>
     </message>
@@ -51,7 +56,7 @@
 <context>
     <name>Cache</name>
     <message>
-        <location filename="../../src/Cache.cpp" line="+2084"/>
+        <location filename="../../src/Cache.cpp" line="+2026"/>
         <source>You joined this room.</source>
         <translation>Te-ai alăturat camerei.</translation>
     </message>
@@ -59,7 +64,7 @@
 <context>
     <name>CallInvite</name>
     <message>
-        <location filename="../qml/voip/CallInvite.qml" line="+66"/>
+        <location filename="../qml/voip/CallInvite.qml" line="+70"/>
         <source>Video Call</source>
         <translation type="unfinished"></translation>
     </message>
@@ -77,7 +82,7 @@
 <context>
     <name>CallInviteBar</name>
     <message>
-        <location filename="../qml/voip/CallInviteBar.qml" line="+60"/>
+        <location filename="../qml/voip/CallInviteBar.qml" line="+64"/>
         <source>Video Call</source>
         <translation type="unfinished"></translation>
     </message>
@@ -92,7 +97,7 @@
         <translation type="unfinished">Dispozitive</translation>
     </message>
     <message>
-        <location line="+11"/>
+        <location line="+10"/>
         <source>Accept</source>
         <translation type="unfinished">Acceptare</translation>
     </message>
@@ -117,36 +122,55 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>CallManager</name>
+    <message>
+        <location filename="../../src/CallManager.cpp" line="+521"/>
+        <source>Entire screen</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>ChatPage</name>
     <message>
-        <location filename="../../src/ChatPage.cpp" line="+215"/>
+        <location filename="../../src/ChatPage.cpp" line="+203"/>
         <source>Failed to invite user: %1</source>
         <translation>Nu s-a putut invita utilizatorul: %1</translation>
     </message>
     <message>
         <location line="+4"/>
-        <location line="+797"/>
+        <location line="+806"/>
         <source>Invited user: %1</source>
         <translation>Utilizator invitat: %1</translation>
     </message>
     <message>
-        <location line="-500"/>
+        <location line="-510"/>
         <source>Migrating the cache to the current version failed. This can have different reasons. Please open an issue and try to use an older version in the mean time. Alternatively you can try deleting the cache manually.</source>
         <translation>Nu s-a putut muta cache-ul pe versiunea curentă. Acest lucru poate avea diferite cauze. Vă rugăm să deschideți un issue și încercați să folosiți o versiune mai veche între timp. O altă opțiune ar fi să încercați să ștergeți cache-ul manual.</translation>
     </message>
     <message>
-        <location line="+456"/>
+        <location line="+413"/>
+        <source>Confirm join</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Do you really want to join %1?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+44"/>
         <source>Room %1 created.</source>
         <translation>Camera %1 a fost creată.</translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+35"/>
+        <location line="+323"/>
         <source>Confirm invite</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="-322"/>
         <source>Do you really want to invite %1 (%2)?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -211,7 +235,12 @@
         <translation>Utilizator dezinterzis: %1</translation>
     </message>
     <message>
-        <location line="-582"/>
+        <location line="+226"/>
+        <source>Do you really want to start a private chat with %1?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-818"/>
         <source>Cache migration failed!</source>
         <translation>Nu s-a putut migra cache-ul!</translation>
     </message>
@@ -236,7 +265,7 @@
         <translation>Nu s-au putut restabili datele salvate. Vă rugăm să vă reconectați.</translation>
     </message>
     <message>
-        <location line="+165"/>
+        <location line="+157"/>
         <source>Failed to setup encryption keys. Server response: %1 %2. Please try again later.</source>
         <translation>Nu s-au putut stabili cheile. Răspunsul serverului: %1 %2. Vă rugăm încercați mai târziu.</translation>
     </message>
@@ -247,7 +276,7 @@
         <translation>Vă rugăm să vă reconectați: %1</translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+47"/>
         <source>Failed to join room: %1</source>
         <translation>Nu s-a putut alătura la cameră: %1</translation>
     </message>
@@ -267,12 +296,12 @@
         <translation>Nu s-a putut crea camera: %1</translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+18"/>
         <source>Failed to leave room: %1</source>
         <translation>Nu s-a putut părăsi camera: %1</translation>
     </message>
     <message>
-        <location line="+54"/>
+        <location line="+61"/>
         <source>Failed to kick %1 from %2: %3</source>
         <translation type="unfinished"></translation>
     </message>
@@ -280,7 +309,7 @@
 <context>
     <name>CommunitiesListItem</name>
     <message>
-        <location filename="../../src/CommunitiesListItem.cpp" line="+26"/>
+        <location filename="../../src/CommunitiesListItem.cpp" line="+30"/>
         <source>Hide rooms with this tag or from this community</source>
         <translation type="unfinished"></translation>
     </message>
@@ -348,7 +377,7 @@
 <context>
     <name>DigitVerification</name>
     <message>
-        <location filename="../qml/device-verification/DigitVerification.qml" line="+7"/>
+        <location filename="../qml/device-verification/DigitVerification.qml" line="+11"/>
         <source>Verification Code</source>
         <translation type="unfinished"></translation>
     </message>
@@ -371,7 +400,7 @@
 <context>
     <name>EditModal</name>
     <message>
-        <location filename="../../src/dialogs/RoomSettings.cpp" line="+73"/>
+        <location filename="../../src/ui/RoomSettings.cpp" line="+42"/>
         <source>Apply</source>
         <translation>Aplicare</translation>
     </message>
@@ -394,7 +423,7 @@
 <context>
     <name>EmojiPicker</name>
     <message>
-        <location filename="../qml/emoji/EmojiPicker.qml" line="+113"/>
+        <location filename="../qml/emoji/EmojiPicker.qml" line="+117"/>
         <location line="+181"/>
         <source>Search</source>
         <translation type="unfinished"></translation>
@@ -443,7 +472,7 @@
 <context>
     <name>EmojiVerification</name>
     <message>
-        <location filename="../qml/device-verification/EmojiVerification.qml" line="+7"/>
+        <location filename="../qml/device-verification/EmojiVerification.qml" line="+11"/>
         <source>Verification Code</source>
         <translation type="unfinished"></translation>
     </message>
@@ -466,7 +495,7 @@
 <context>
     <name>EncryptionIndicator</name>
     <message>
-        <location filename="../qml/EncryptionIndicator.qml" line="+19"/>
+        <location filename="../qml/EncryptionIndicator.qml" line="+23"/>
         <source>Encrypted</source>
         <translation>Criptat</translation>
     </message>
@@ -479,7 +508,7 @@
 <context>
     <name>EventStore</name>
     <message>
-        <location filename="../../src/timeline/EventStore.cpp" line="+612"/>
+        <location filename="../../src/timeline/EventStore.cpp" line="+613"/>
         <source>-- Encrypted Event (No keys found for decryption) --</source>
         <comment>Placeholder, when the message was not decrypted yet or can&apos;t be decrypted.</comment>
         <translation type="unfinished"></translation>
@@ -524,7 +553,7 @@
 <context>
     <name>Failed</name>
     <message>
-        <location filename="../qml/device-verification/Failed.qml" line="+7"/>
+        <location filename="../qml/device-verification/Failed.qml" line="+11"/>
         <source>Verification failed</source>
         <translation type="unfinished"></translation>
     </message>
@@ -558,7 +587,7 @@
 <context>
     <name>InputBar</name>
     <message>
-        <location filename="../../src/timeline/InputBar.cpp" line="+227"/>
+        <location filename="../../src/timeline/InputBar.cpp" line="+253"/>
         <source>Select a file</source>
         <translation type="unfinished"></translation>
     </message>
@@ -568,7 +597,7 @@
         <translation type="unfinished">Toate fișierele (*)</translation>
     </message>
     <message>
-        <location line="+384"/>
+        <location line="+371"/>
         <source>Failed to upload media. Please try again.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -576,7 +605,7 @@
 <context>
     <name>InviteeItem</name>
     <message>
-        <location filename="../../src/InviteeItem.cpp" line="+18"/>
+        <location filename="../../src/InviteeItem.cpp" line="+22"/>
         <source>Remove</source>
         <translation>Ștergere</translation>
     </message>
@@ -584,7 +613,7 @@
 <context>
     <name>LoginPage</name>
     <message>
-        <location filename="../../src/LoginPage.cpp" line="+92"/>
+        <location filename="../../src/LoginPage.cpp" line="+80"/>
         <source>Matrix ID</source>
         <translation>ID Matrix</translation>
     </message>
@@ -643,20 +672,19 @@ Exemplu: https://serverul.meu:8787</translation>
     </message>
     <message>
         <location line="+19"/>
-        <location line="+218"/>
         <source>LOGIN</source>
         <translation>CONECTARE</translation>
     </message>
     <message>
-        <location line="-151"/>
+        <location line="+84"/>
         <location line="+11"/>
-        <location line="+157"/>
+        <location line="+156"/>
         <location line="+11"/>
         <source>You have entered an invalid Matrix ID  e.g @joe:matrix.org</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-132"/>
+        <location line="-131"/>
         <source>Autodiscovery failed. Received malformed response.</source>
         <translation>Autodescoperirea a eșuat. Răspunsul primit este defectuos.</translation>
     </message>
@@ -681,12 +709,12 @@ Exemplu: https://serverul.meu:8787</translation>
         <translation>A apărut o eroare necunoscută. Verificați ca domeniul homeserverului să fie valid.</translation>
     </message>
     <message>
-        <location line="+59"/>
+        <location line="-168"/>
         <source>SSO LOGIN</source>
         <translation>CONECTARE SSO</translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+263"/>
         <source>Empty password</source>
         <translation>Parolă necompletată</translation>
     </message>
@@ -699,7 +727,7 @@ Exemplu: https://serverul.meu:8787</translation>
 <context>
     <name>MemberList</name>
     <message>
-        <location filename="../../src/dialogs/MemberList.cpp" line="+90"/>
+        <location filename="../../src/dialogs/MemberList.cpp" line="+94"/>
         <source>Room members</source>
         <translation>Membrii camerei</translation>
     </message>
@@ -712,7 +740,7 @@ Exemplu: https://serverul.meu:8787</translation>
 <context>
     <name>MessageDelegate</name>
     <message>
-        <location filename="../qml/delegates/MessageDelegate.qml" line="+105"/>
+        <location filename="../qml/delegates/MessageDelegate.qml" line="+109"/>
         <location line="+9"/>
         <source>removed</source>
         <translation type="unfinished"></translation>
@@ -781,7 +809,7 @@ Exemplu: https://serverul.meu:8787</translation>
 <context>
     <name>MessageInput</name>
     <message>
-        <location filename="../qml/MessageInput.qml" line="+38"/>
+        <location filename="../qml/MessageInput.qml" line="+42"/>
         <source>Hang up</source>
         <translation type="unfinished"></translation>
     </message>
@@ -791,22 +819,22 @@ Exemplu: https://serverul.meu:8787</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+25"/>
         <source>Send a file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+42"/>
         <source>Write a message...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+186"/>
+        <location line="+211"/>
         <source>Emoji</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+16"/>
         <source>Send</source>
         <translation type="unfinished"></translation>
     </message>
@@ -814,7 +842,7 @@ Exemplu: https://serverul.meu:8787</translation>
 <context>
     <name>NewVerificationRequest</name>
     <message>
-        <location filename="../qml/device-verification/NewVerificationRequest.qml" line="+7"/>
+        <location filename="../qml/device-verification/NewVerificationRequest.qml" line="+11"/>
         <source>Send Verification Request</source>
         <translation type="unfinished"></translation>
     </message>
@@ -872,7 +900,7 @@ Exemplu: https://serverul.meu:8787</translation>
 <context>
     <name>PlaceCall</name>
     <message>
-        <location filename="../qml/voip/PlaceCall.qml" line="+36"/>
+        <location filename="../qml/voip/PlaceCall.qml" line="+48"/>
         <source>Place a call to %1?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -892,7 +920,12 @@ Exemplu: https://serverul.meu:8787</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location line="+14"/>
+        <source>Screen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -900,7 +933,7 @@ Exemplu: https://serverul.meu:8787</translation>
 <context>
     <name>Placeholder</name>
     <message>
-        <location filename="../qml/delegates/Placeholder.qml" line="+4"/>
+        <location filename="../qml/delegates/Placeholder.qml" line="+8"/>
         <source>unimplemented event: </source>
         <translation>eveniment neimplementat: </translation>
     </message>
@@ -908,7 +941,7 @@ Exemplu: https://serverul.meu:8787</translation>
 <context>
     <name>QCoreApplication</name>
     <message>
-        <location filename="../../src/main.cpp" line="+179"/>
+        <location filename="../../src/main.cpp" line="+167"/>
         <source>Create a unique profile, which allows you to log into several accounts at the same time and start multiple instances of nheko.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -926,7 +959,7 @@ Exemplu: https://serverul.meu:8787</translation>
 <context>
     <name>QuickSwitcher</name>
     <message>
-        <location filename="../../src/QuickSwitcher.cpp" line="+74"/>
+        <location filename="../../src/QuickSwitcher.cpp" line="+62"/>
         <source>Search for a room...</source>
         <translation>Caută o cameră…</translation>
     </message>
@@ -934,18 +967,18 @@ Exemplu: https://serverul.meu:8787</translation>
 <context>
     <name>RegisterPage</name>
     <message>
-        <location filename="../../src/RegisterPage.cpp" line="+89"/>
+        <location filename="../../src/RegisterPage.cpp" line="+77"/>
         <source>Username</source>
         <translation>Nume de utilizator</translation>
     </message>
     <message>
         <location line="+2"/>
-        <location line="+286"/>
+        <location line="+287"/>
         <source>The username must not be empty, and must contain only the characters a-z, 0-9, ., _, =, -, and /.</source>
         <translation>Numele de utilizator nu poate fi gol, și trebuie să conțină doar caracterele a-z, 0-9, ., =, - și /.</translation>
     </message>
     <message>
-        <location line="-282"/>
+        <location line="-283"/>
         <source>Password</source>
         <translation>Parolă</translation>
     </message>
@@ -980,7 +1013,7 @@ Exemplu: https://serverul.meu:8787</translation>
         <translation>Fluxuri de înregistrare nesuportate!</translation>
     </message>
     <message>
-        <location line="+209"/>
+        <location line="+210"/>
         <source>One or more fields have invalid inputs. Please correct those issues and try again.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1003,7 +1036,7 @@ Exemplu: https://serverul.meu:8787</translation>
 <context>
     <name>ReplyPopup</name>
     <message>
-        <location filename="../qml/ReplyPopup.qml" line="+45"/>
+        <location filename="../qml/ReplyPopup.qml" line="+49"/>
         <source>Close</source>
         <translation type="unfinished">ÃŽnchide</translation>
     </message>
@@ -1016,7 +1049,7 @@ Exemplu: https://serverul.meu:8787</translation>
 <context>
     <name>RoomInfo</name>
     <message>
-        <location filename="../../src/Cache.cpp" line="+1861"/>
+        <location filename="../../src/Cache.cpp" line="+1793"/>
         <source>no version stored</source>
         <translation>nicio versiune stocată</translation>
     </message>
@@ -1024,7 +1057,7 @@ Exemplu: https://serverul.meu:8787</translation>
 <context>
     <name>RoomInfoListItem</name>
     <message>
-        <location filename="../../src/RoomInfoListItem.cpp" line="+102"/>
+        <location filename="../../src/RoomInfoListItem.cpp" line="+90"/>
         <source>Leave room</source>
         <translation>Părăsește camera</translation>
     </message>
@@ -1086,10 +1119,116 @@ Exemplu: https://serverul.meu:8787</translation>
         <translation>Refuzare</translation>
     </message>
 </context>
+<context>
+    <name>RoomSettings</name>
+    <message>
+        <location filename="../qml/RoomSettings.qml" line="+204"/>
+        <source>End-to-End Encryption</source>
+        <translation type="unfinished">Criptare Capăt-la-Capăt</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Encryption is currently experimental and things might break unexpectedly. &lt;br&gt;
+                            Please take note that it can&apos;t be disabled afterwards.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>Whether or not the client should respond automatically with the session keys
+                                upon request. Use with caution, this is a temporary measure to test the
+                                E2E implementation until device verification is completed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/ui/RoomSettings.cpp" line="+267"/>
+        <source>Failed to enable encryption: %1</source>
+        <translation type="unfinished">Nu s-a putut activa criptarea: %1</translation>
+    </message>
+    <message>
+        <location line="+228"/>
+        <source>Select an avatar</source>
+        <translation type="unfinished">Selectează un avatar</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>All Files (*)</source>
+        <translation type="unfinished">Toate fișierele (*)</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>The selected file is not an image</source>
+        <translation type="unfinished">Fișierul selectat nu este imagine</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Error while reading file: %1</source>
+        <translation type="unfinished">Eroare întâmpinată la citirea fișierului: %1</translation>
+    </message>
+    <message>
+        <location line="+34"/>
+        <location line="+20"/>
+        <source>Failed to upload image: %s</source>
+        <translation type="unfinished">Nu s-a putut încărca imaginea: %s</translation>
+    </message>
+</context>
+<context>
+    <name>ScreenShare</name>
+    <message>
+        <location filename="../qml/voip/ScreenShare.qml" line="+30"/>
+        <source>Share desktop with %1?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Window:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Frame rate:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Include your camera picture-in-picture</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>Request remote camera</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location line="+9"/>
+        <source>View your callee&apos;s camera like a regular video call</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Hide mouse cursor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Share</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Preview</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>SideBarActions</name>
     <message>
-        <location filename="../../src/SideBarActions.cpp" line="+40"/>
+        <location filename="../../src/SideBarActions.cpp" line="+44"/>
         <source>User settings</source>
         <translation>Setări utilizator</translation>
     </message>
@@ -1117,7 +1256,7 @@ Exemplu: https://serverul.meu:8787</translation>
 <context>
     <name>StatusIndicator</name>
     <message>
-        <location filename="../qml/StatusIndicator.qml" line="+17"/>
+        <location filename="../qml/StatusIndicator.qml" line="+21"/>
         <source>Failed</source>
         <translation>Eșuat</translation>
     </message>
@@ -1140,7 +1279,7 @@ Exemplu: https://serverul.meu:8787</translation>
 <context>
     <name>Success</name>
     <message>
-        <location filename="../qml/device-verification/Success.qml" line="+6"/>
+        <location filename="../qml/device-verification/Success.qml" line="+10"/>
         <source>Successful Verification</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1158,7 +1297,7 @@ Exemplu: https://serverul.meu:8787</translation>
 <context>
     <name>TimelineModel</name>
     <message>
-        <location filename="../../src/timeline/TimelineModel.cpp" line="+895"/>
+        <location filename="../../src/timeline/TimelineModel.cpp" line="+911"/>
         <source>Message redaction failed: %1</source>
         <translation>Redactare mesaj eșuată: %1</translation>
     </message>
@@ -1309,12 +1448,12 @@ Exemplu: https://serverul.meu:8787</translation>
         <translation>%1 și-a redactat ciocănitul.</translation>
     </message>
     <message>
-        <location line="-795"/>
+        <location line="-798"/>
         <source>You joined this room.</source>
         <translation>Te-ai alăturat camerei.</translation>
     </message>
     <message>
-        <location line="+797"/>
+        <location line="+800"/>
         <source>Rejected the knock from %1.</source>
         <translation>Ciocănit refuzat de la %1.</translation>
     </message>
@@ -1338,7 +1477,7 @@ Exemplu: https://serverul.meu:8787</translation>
 <context>
     <name>TimelineRow</name>
     <message>
-        <location filename="../qml/TimelineRow.qml" line="+99"/>
+        <location filename="../qml/TimelineRow.qml" line="+100"/>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1366,7 +1505,7 @@ Exemplu: https://serverul.meu:8787</translation>
 <context>
     <name>TimelineView</name>
     <message>
-        <location filename="../qml/TimelineView.qml" line="+85"/>
+        <location filename="../qml/TimelineView.qml" line="+97"/>
         <source>React</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1416,7 +1555,7 @@ Exemplu: https://serverul.meu:8787</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+61"/>
         <source>No room open</source>
         <translation>Nicio cameră deschisă</translation>
     </message>
@@ -1424,7 +1563,7 @@ Exemplu: https://serverul.meu:8787</translation>
 <context>
     <name>TimelineViewManager</name>
     <message>
-        <location filename="../../src/timeline/TimelineViewManager.cpp" line="+423"/>
+        <location filename="../../src/timeline/TimelineViewManager.cpp" line="+430"/>
         <source>No encrypted private chat found with this user. Create an encrypted private chat with this user and try again.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1432,7 +1571,7 @@ Exemplu: https://serverul.meu:8787</translation>
 <context>
     <name>TopBar</name>
     <message>
-        <location filename="../qml/TopBar.qml" line="+43"/>
+        <location filename="../qml/TopBar.qml" line="+47"/>
         <source>Back to room list</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1471,7 +1610,7 @@ Exemplu: https://serverul.meu:8787</translation>
 <context>
     <name>TrayIcon</name>
     <message>
-        <location filename="../../src/TrayIcon.cpp" line="+122"/>
+        <location filename="../../src/TrayIcon.cpp" line="+110"/>
         <source>Show</source>
         <translation>Arată</translation>
     </message>
@@ -1484,7 +1623,7 @@ Exemplu: https://serverul.meu:8787</translation>
 <context>
     <name>UserInfoWidget</name>
     <message>
-        <location filename="../../src/UserInfoWidget.cpp" line="+95"/>
+        <location filename="../../src/UserInfoWidget.cpp" line="+82"/>
         <source>Logout</source>
         <translation>Deconectare</translation>
     </message>
@@ -1532,7 +1671,7 @@ Exemplu: https://serverul.meu:8787</translation>
 <context>
     <name>UserProfile</name>
     <message>
-        <location filename="../qml/UserProfile.qml" line="+133"/>
+        <location filename="../qml/UserProfile.qml" line="+137"/>
         <source>Verify</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1552,7 +1691,7 @@ Exemplu: https://serverul.meu:8787</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/UserProfile.cpp" line="+296"/>
+        <location filename="../../src/ui/UserProfile.cpp" line="+301"/>
         <source>Select an avatar</source>
         <translation type="unfinished">Selectează un avatar</translation>
     </message>
@@ -1575,7 +1714,7 @@ Exemplu: https://serverul.meu:8787</translation>
 <context>
     <name>UserSettings</name>
     <message>
-        <location filename="../../src/UserSettingsPage.cpp" line="+345"/>
+        <location filename="../../src/UserSettingsPage.cpp" line="+337"/>
         <location filename="../../src/UserSettingsPage.h" line="+183"/>
         <source>Default</source>
         <translation type="unfinished"></translation>
@@ -1584,7 +1723,7 @@ Exemplu: https://serverul.meu:8787</translation>
 <context>
     <name>UserSettingsPage</name>
     <message>
-        <location line="+496"/>
+        <location line="+540"/>
         <source>Minimize to tray</source>
         <translation>Minimizează în bara de notificări</translation>
     </message>
@@ -1800,7 +1939,7 @@ This usually causes the application icon in the task bar to animate in some fash
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+407"/>
+        <location line="+406"/>
         <source>CACHED</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1810,7 +1949,7 @@ This usually causes the application icon in the task bar to animate in some fash
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-461"/>
+        <location line="-460"/>
         <source>Scale factor</source>
         <translation>Factor de dimensiune</translation>
     </message>
@@ -1985,7 +2124,7 @@ This usually causes the application icon in the task bar to animate in some fash
         <translation type="unfinished">Toate fișierele (*)</translation>
     </message>
     <message>
-        <location line="+237"/>
+        <location line="+236"/>
         <source>Open Sessions File</source>
         <translation>Deschide fișierul de sesiuni</translation>
     </message>
@@ -2030,7 +2169,7 @@ This usually causes the application icon in the task bar to animate in some fash
 <context>
     <name>Waiting</name>
     <message>
-        <location filename="../qml/device-verification/Waiting.qml" line="+7"/>
+        <location filename="../qml/device-verification/Waiting.qml" line="+11"/>
         <source>Waiting for other party…</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2058,7 +2197,7 @@ This usually causes the application icon in the task bar to animate in some fash
 <context>
     <name>WelcomePage</name>
     <message>
-        <location filename="../../src/WelcomePage.cpp" line="+46"/>
+        <location filename="../../src/WelcomePage.cpp" line="+34"/>
         <source>Welcome to nheko! The desktop client for the Matrix protocol.</source>
         <translation>Bine ați venit în nheko! Clientul desktop pentru protocolul Matrix.</translation>
     </message>
@@ -2081,7 +2220,7 @@ This usually causes the application icon in the task bar to animate in some fash
 <context>
     <name>descriptiveTime</name>
     <message>
-        <location filename="../../src/Utils.cpp" line="+145"/>
+        <location filename="../../src/Utils.cpp" line="+149"/>
         <source>Yesterday</source>
         <translation>Ieri</translation>
     </message>
@@ -2089,7 +2228,7 @@ This usually causes the application icon in the task bar to animate in some fash
 <context>
     <name>dialogs::CreateRoom</name>
     <message>
-        <location filename="../../src/dialogs/CreateRoom.cpp" line="+36"/>
+        <location filename="../../src/dialogs/CreateRoom.cpp" line="+40"/>
         <source>Create room</source>
         <translation>Crează cameră</translation>
     </message>
@@ -2132,7 +2271,7 @@ This usually causes the application icon in the task bar to animate in some fash
 <context>
     <name>dialogs::FallbackAuth</name>
     <message>
-        <location filename="../../src/dialogs/FallbackAuth.cpp" line="+30"/>
+        <location filename="../../src/dialogs/FallbackAuth.cpp" line="+34"/>
         <source>Open Fallback in Browser</source>
         <translation>Deschide Fallback în Browser</translation>
     </message>
@@ -2155,7 +2294,7 @@ This usually causes the application icon in the task bar to animate in some fash
 <context>
     <name>dialogs::InviteUsers</name>
     <message>
-        <location filename="../../src/dialogs/InviteUsers.cpp" line="+42"/>
+        <location filename="../../src/dialogs/InviteUsers.cpp" line="+46"/>
         <source>Cancel</source>
         <translation>Anulare</translation>
     </message>
@@ -2168,7 +2307,7 @@ This usually causes the application icon in the task bar to animate in some fash
 <context>
     <name>dialogs::JoinRoom</name>
     <message>
-        <location filename="../../src/dialogs/JoinRoom.cpp" line="+30"/>
+        <location filename="../../src/dialogs/JoinRoom.cpp" line="+34"/>
         <source>Join</source>
         <translation>Alăturare</translation>
     </message>
@@ -2186,7 +2325,7 @@ This usually causes the application icon in the task bar to animate in some fash
 <context>
     <name>dialogs::LeaveRoom</name>
     <message>
-        <location filename="../../src/dialogs/LeaveRoom.cpp" line="+31"/>
+        <location filename="../../src/dialogs/LeaveRoom.cpp" line="+35"/>
         <source>Cancel</source>
         <translation>Anulare</translation>
     </message>
@@ -2199,7 +2338,7 @@ This usually causes the application icon in the task bar to animate in some fash
 <context>
     <name>dialogs::Logout</name>
     <message>
-        <location filename="../../src/dialogs/Logout.cpp" line="+47"/>
+        <location filename="../../src/dialogs/Logout.cpp" line="+35"/>
         <source>Cancel</source>
         <translation>Anulare</translation>
     </message>
@@ -2212,7 +2351,7 @@ This usually causes the application icon in the task bar to animate in some fash
 <context>
     <name>dialogs::PreviewUploadOverlay</name>
     <message>
-        <location filename="../../src/dialogs/PreviewUploadOverlay.cpp" line="+41"/>
+        <location filename="../../src/dialogs/PreviewUploadOverlay.cpp" line="+29"/>
         <source>Upload</source>
         <translation>Încărcare</translation>
     </message>
@@ -2234,7 +2373,7 @@ Dimensiune media: %2
 <context>
     <name>dialogs::ReCaptcha</name>
     <message>
-        <location filename="../../src/dialogs/ReCaptcha.cpp" line="+31"/>
+        <location filename="../../src/dialogs/ReCaptcha.cpp" line="+35"/>
         <source>Cancel</source>
         <translation>Anulare</translation>
     </message>
@@ -2252,7 +2391,7 @@ Dimensiune media: %2
 <context>
     <name>dialogs::ReadReceipts</name>
     <message>
-        <location filename="../../src/dialogs/ReadReceipts.cpp" line="+120"/>
+        <location filename="../../src/dialogs/ReadReceipts.cpp" line="+124"/>
         <source>Read receipts</source>
         <translation>Confirmări de citire</translation>
     </message>
@@ -2275,140 +2414,10 @@ Dimensiune media: %2
         <translation>Ieri %1</translation>
     </message>
 </context>
-<context>
-    <name>dialogs::RoomSettings</name>
-    <message>
-        <location filename="../../src/dialogs/RoomSettings.cpp" line="+135"/>
-        <source>Settings</source>
-        <translation>Setări</translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Info</source>
-        <translation>Info</translation>
-    </message>
-    <message>
-        <location line="+11"/>
-        <source>Internal ID</source>
-        <translation>ID intern</translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>Room Version</source>
-        <translation>Versiune cameră</translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Notifications</source>
-        <translation>Notificări</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Muted</source>
-        <translation>Dezactivat</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Mentions only</source>
-        <translation>Doar mențiuni</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>All messages</source>
-        <translation>Toate mesajele</translation>
-    </message>
-    <message>
-        <location line="+97"/>
-        <source>Room access</source>
-        <translation>Acces cameră</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Anyone and guests</source>
-        <translation>Oricine și vizitatori</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Anyone</source>
-        <translation>Oricine are linkul camerei (fără vizitatori)</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Invited users</source>
-        <translation>Utilizatori invitați</translation>
-    </message>
-    <message>
-        <location line="+50"/>
-        <source>Encryption</source>
-        <translation>Criptare</translation>
-    </message>
-    <message>
-        <location line="+31"/>
-        <source>End-to-End Encryption</source>
-        <translation>Criptare Capăt-la-Capăt</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Encryption is currently experimental and things might break unexpectedly. &lt;br&gt;Please take note that it can&apos;t be disabled afterwards.</source>
-        <translation>Criptarea este în prezent experimentală și unele lucruri se pot strica neașteptat. &lt;br&gt;Ține minte că nu poate fi dezactivat ulterior.</translation>
-    </message>
-    <message>
-        <location line="-24"/>
-        <source>Respond to key requests</source>
-        <translation>Răspunde cererilor de chei</translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Whether or not the client should respond automatically with the session keys
- upon request. Use with caution, this is a temporary measure to test the
- E2E implementation until device verification is completed.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message numerus="yes">
-        <location line="+80"/>
-        <source>%n member(s)</source>
-        <translation>
-            <numerusform>%n membru</numerusform>
-            <numerusform>%n membri</numerusform>
-            <numerusform>%n membri</numerusform>
-        </translation>
-    </message>
-    <message>
-        <location line="+142"/>
-        <source>Failed to enable encryption: %1</source>
-        <translation>Nu s-a putut activa criptarea: %1</translation>
-    </message>
-    <message>
-        <location line="+147"/>
-        <source>Select an avatar</source>
-        <translation>Selectează un avatar</translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>All Files (*)</source>
-        <translation>Toate fișierele (*)</translation>
-    </message>
-    <message>
-        <location line="+12"/>
-        <source>The selected file is not an image</source>
-        <translation>Fișierul selectat nu este imagine</translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Error while reading file: %1</source>
-        <translation>Eroare întâmpinată la citirea fișierului: %1</translation>
-    </message>
-    <message>
-        <location line="+35"/>
-        <location line="+20"/>
-        <source>Failed to upload image: %s</source>
-        <translation>Nu s-a putut încărca imaginea: %s</translation>
-    </message>
-</context>
 <context>
     <name>message-description sent:</name>
     <message>
-        <location filename="../../src/Utils.h" line="+108"/>
+        <location filename="../../src/Utils.h" line="+112"/>
         <source>You sent an audio clip</source>
         <translation>Ai trimis un clip audio</translation>
     </message>
@@ -2521,7 +2530,7 @@ Dimensiune media: %2
 <context>
     <name>popups::UserMentions</name>
     <message>
-        <location filename="../../src/popups/UserMentions.cpp" line="+64"/>
+        <location filename="../../src/popups/UserMentions.cpp" line="+68"/>
         <source>This Room</source>
         <translation>Această cameră</translation>
     </message>
diff --git a/resources/langs/nheko_ru.ts b/resources/langs/nheko_ru.ts
index 112e8c8c698fd3668aadf73a19e51016a493cd7c..e764c2597ce6a60fb197178858225fd46687e36c 100644
--- a/resources/langs/nheko_ru.ts
+++ b/resources/langs/nheko_ru.ts
@@ -4,7 +4,7 @@
 <context>
     <name>ActiveCallBar</name>
     <message>
-        <location filename="../qml/voip/ActiveCallBar.qml" line="+66"/>
+        <location filename="../qml/voip/ActiveCallBar.qml" line="+106"/>
         <source>Calling...</source>
         <translation>Вызов...</translation>
     </message>
@@ -15,9 +15,14 @@
         <translation>Соединение...</translation>
     </message>
     <message>
-        <location line="+76"/>
-        <source>Toggle camera view</source>
-        <translation>Сменить вид камеры</translation>
+        <location line="+67"/>
+        <source>You are screen sharing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Hide/Show Picture-in-Picture</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+13"/>
@@ -33,7 +38,7 @@
 <context>
     <name>AwaitingVerificationConfirmation</name>
     <message>
-        <location filename="../qml/device-verification/AwaitingVerificationConfirmation.qml" line="+7"/>
+        <location filename="../qml/device-verification/AwaitingVerificationConfirmation.qml" line="+11"/>
         <source>Awaiting Confirmation</source>
         <translation>Ожидание Подтверждения</translation>
     </message>
@@ -51,7 +56,7 @@
 <context>
     <name>Cache</name>
     <message>
-        <location filename="../../src/Cache.cpp" line="+2084"/>
+        <location filename="../../src/Cache.cpp" line="+2026"/>
         <source>You joined this room.</source>
         <translation>Вы присоединились к этой комнате.</translation>
     </message>
@@ -59,7 +64,7 @@
 <context>
     <name>CallInvite</name>
     <message>
-        <location filename="../qml/voip/CallInvite.qml" line="+66"/>
+        <location filename="../qml/voip/CallInvite.qml" line="+70"/>
         <source>Video Call</source>
         <translation>Видео Звонок</translation>
     </message>
@@ -77,7 +82,7 @@
 <context>
     <name>CallInviteBar</name>
     <message>
-        <location filename="../qml/voip/CallInviteBar.qml" line="+60"/>
+        <location filename="../qml/voip/CallInviteBar.qml" line="+64"/>
         <source>Video Call</source>
         <translation type="unfinished">Видео Звонок</translation>
     </message>
@@ -92,7 +97,7 @@
         <translation type="unfinished">Устройства</translation>
     </message>
     <message>
-        <location line="+11"/>
+        <location line="+10"/>
         <source>Accept</source>
         <translation type="unfinished">Принять</translation>
     </message>
@@ -117,36 +122,55 @@
         <translation type="unfinished">Микрофон не найден.</translation>
     </message>
 </context>
+<context>
+    <name>CallManager</name>
+    <message>
+        <location filename="../../src/CallManager.cpp" line="+521"/>
+        <source>Entire screen</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>ChatPage</name>
     <message>
-        <location filename="../../src/ChatPage.cpp" line="+215"/>
+        <location filename="../../src/ChatPage.cpp" line="+203"/>
         <source>Failed to invite user: %1</source>
         <translation>Не удалось пригласить пользователя: %1</translation>
     </message>
     <message>
         <location line="+4"/>
-        <location line="+797"/>
+        <location line="+806"/>
         <source>Invited user: %1</source>
         <translation>Приглашенный пользователь: %1</translation>
     </message>
     <message>
-        <location line="-500"/>
+        <location line="-510"/>
         <source>Migrating the cache to the current version failed. This can have different reasons. Please open an issue and try to use an older version in the mean time. Alternatively you can try deleting the cache manually.</source>
         <translation>Миграция кэша для текущей версии не удалась. Это может происходить по разным причинам. Пожалуйста сообщите о проблеме и попробуйте временно использовать старую версию. Так-же вы можете попробовать удалить кэш самостоятельно.</translation>
     </message>
     <message>
-        <location line="+456"/>
+        <location line="+413"/>
+        <source>Confirm join</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Do you really want to join %1?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+44"/>
         <source>Room %1 created.</source>
         <translation>Комната %1 создана.</translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+35"/>
+        <location line="+323"/>
         <source>Confirm invite</source>
         <translation>Подтвердите приглашение</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="-322"/>
         <source>Do you really want to invite %1 (%2)?</source>
         <translation>Вы точно хотите пригласить %1 (%2)?</translation>
     </message>
@@ -211,7 +235,12 @@
         <translation>Разблокированный пользователь: %1</translation>
     </message>
     <message>
-        <location line="-582"/>
+        <location line="+226"/>
+        <source>Do you really want to start a private chat with %1?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-818"/>
         <source>Cache migration failed!</source>
         <translation>Миграция кэша не удалась!</translation>
     </message>
@@ -236,7 +265,7 @@
         <translation>Не удалось восстановить сохраненные данные. Пожалуйста, войдите снова.</translation>
     </message>
     <message>
-        <location line="+165"/>
+        <location line="+157"/>
         <source>Failed to setup encryption keys. Server response: %1 %2. Please try again later.</source>
         <translation>Не удалось настроить ключи шифрования. Ответ сервера:%1 %2. Пожалуйста, попробуйте позже.</translation>
     </message>
@@ -247,7 +276,7 @@
         <translation>Повторите попытку входа: %1</translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+47"/>
         <source>Failed to join room: %1</source>
         <translation>Не удалось присоединиться к комнате: %1</translation>
     </message>
@@ -267,12 +296,12 @@
         <translation>Не удалось создать комнату: %1</translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+18"/>
         <source>Failed to leave room: %1</source>
         <translation>Не удалось покинуть комнату: %1</translation>
     </message>
     <message>
-        <location line="+54"/>
+        <location line="+61"/>
         <source>Failed to kick %1 from %2: %3</source>
         <translation type="unfinished"></translation>
     </message>
@@ -280,7 +309,7 @@
 <context>
     <name>CommunitiesListItem</name>
     <message>
-        <location filename="../../src/CommunitiesListItem.cpp" line="+26"/>
+        <location filename="../../src/CommunitiesListItem.cpp" line="+30"/>
         <source>Hide rooms with this tag or from this community</source>
         <translation type="unfinished"></translation>
     </message>
@@ -348,7 +377,7 @@
 <context>
     <name>DigitVerification</name>
     <message>
-        <location filename="../qml/device-verification/DigitVerification.qml" line="+7"/>
+        <location filename="../qml/device-verification/DigitVerification.qml" line="+11"/>
         <source>Verification Code</source>
         <translation>Код для Верификации</translation>
     </message>
@@ -371,7 +400,7 @@
 <context>
     <name>EditModal</name>
     <message>
-        <location filename="../../src/dialogs/RoomSettings.cpp" line="+73"/>
+        <location filename="../../src/ui/RoomSettings.cpp" line="+42"/>
         <source>Apply</source>
         <translation>Применить</translation>
     </message>
@@ -394,7 +423,7 @@
 <context>
     <name>EmojiPicker</name>
     <message>
-        <location filename="../qml/emoji/EmojiPicker.qml" line="+113"/>
+        <location filename="../qml/emoji/EmojiPicker.qml" line="+117"/>
         <location line="+181"/>
         <source>Search</source>
         <translation>Поиск</translation>
@@ -443,7 +472,7 @@
 <context>
     <name>EmojiVerification</name>
     <message>
-        <location filename="../qml/device-verification/EmojiVerification.qml" line="+7"/>
+        <location filename="../qml/device-verification/EmojiVerification.qml" line="+11"/>
         <source>Verification Code</source>
         <translation>Код Верификации</translation>
     </message>
@@ -466,7 +495,7 @@
 <context>
     <name>EncryptionIndicator</name>
     <message>
-        <location filename="../qml/EncryptionIndicator.qml" line="+19"/>
+        <location filename="../qml/EncryptionIndicator.qml" line="+23"/>
         <source>Encrypted</source>
         <translation>Зашифровано</translation>
     </message>
@@ -479,7 +508,7 @@
 <context>
     <name>EventStore</name>
     <message>
-        <location filename="../../src/timeline/EventStore.cpp" line="+612"/>
+        <location filename="../../src/timeline/EventStore.cpp" line="+613"/>
         <source>-- Encrypted Event (No keys found for decryption) --</source>
         <comment>Placeholder, when the message was not decrypted yet or can&apos;t be decrypted.</comment>
         <translation>-- Зашифрованное событие (Нет найдено ключей для дешифрования) --</translation>
@@ -524,7 +553,7 @@
 <context>
     <name>Failed</name>
     <message>
-        <location filename="../qml/device-verification/Failed.qml" line="+7"/>
+        <location filename="../qml/device-verification/Failed.qml" line="+11"/>
         <source>Verification failed</source>
         <translation>Верификация не удалась</translation>
     </message>
@@ -558,7 +587,7 @@
 <context>
     <name>InputBar</name>
     <message>
-        <location filename="../../src/timeline/InputBar.cpp" line="+227"/>
+        <location filename="../../src/timeline/InputBar.cpp" line="+253"/>
         <source>Select a file</source>
         <translation>Выберите файл</translation>
     </message>
@@ -568,7 +597,7 @@
         <translation>Все файлы (*)</translation>
     </message>
     <message>
-        <location line="+384"/>
+        <location line="+371"/>
         <source>Failed to upload media. Please try again.</source>
         <translation>Не удалось загрузить медиа. Пожалуйста попробуйте ещё раз</translation>
     </message>
@@ -576,7 +605,7 @@
 <context>
     <name>InviteeItem</name>
     <message>
-        <location filename="../../src/InviteeItem.cpp" line="+18"/>
+        <location filename="../../src/InviteeItem.cpp" line="+22"/>
         <source>Remove</source>
         <translation>Удалить</translation>
     </message>
@@ -584,7 +613,7 @@
 <context>
     <name>LoginPage</name>
     <message>
-        <location filename="../../src/LoginPage.cpp" line="+92"/>
+        <location filename="../../src/LoginPage.cpp" line="+80"/>
         <source>Matrix ID</source>
         <translation>Идентификатор Matrix</translation>
     </message>
@@ -643,20 +672,19 @@ Example: https://server.my:8787</source>
     </message>
     <message>
         <location line="+19"/>
-        <location line="+218"/>
         <source>LOGIN</source>
         <translation>ВОЙТИ</translation>
     </message>
     <message>
-        <location line="-151"/>
+        <location line="+84"/>
         <location line="+11"/>
-        <location line="+157"/>
+        <location line="+156"/>
         <location line="+11"/>
         <source>You have entered an invalid Matrix ID  e.g @joe:matrix.org</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-132"/>
+        <location line="-131"/>
         <source>Autodiscovery failed. Received malformed response.</source>
         <translation>Автообноружение не удалось. Получен поврежденный ответ.</translation>
     </message>
@@ -681,12 +709,12 @@ Example: https://server.my:8787</source>
         <translation>Произошла неизвестная ошибка. Убедитесь, что домен homeserver действителен.</translation>
     </message>
     <message>
-        <location line="+59"/>
+        <location line="-168"/>
         <source>SSO LOGIN</source>
         <translation>SSO ВХОД</translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+263"/>
         <source>Empty password</source>
         <translation>Пустой пароль</translation>
     </message>
@@ -699,7 +727,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>MemberList</name>
     <message>
-        <location filename="../../src/dialogs/MemberList.cpp" line="+90"/>
+        <location filename="../../src/dialogs/MemberList.cpp" line="+94"/>
         <source>Room members</source>
         <translation>Участники комнаты</translation>
     </message>
@@ -712,7 +740,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>MessageDelegate</name>
     <message>
-        <location filename="../qml/delegates/MessageDelegate.qml" line="+105"/>
+        <location filename="../qml/delegates/MessageDelegate.qml" line="+109"/>
         <location line="+9"/>
         <source>removed</source>
         <translation>убрано</translation>
@@ -781,7 +809,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>MessageInput</name>
     <message>
-        <location filename="../qml/MessageInput.qml" line="+38"/>
+        <location filename="../qml/MessageInput.qml" line="+42"/>
         <source>Hang up</source>
         <translation>Завершить звонок</translation>
     </message>
@@ -791,22 +819,22 @@ Example: https://server.my:8787</source>
         <translation>Позвонить</translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+25"/>
         <source>Send a file</source>
         <translation>Отправить файл</translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+42"/>
         <source>Write a message...</source>
         <translation>Написать сообщение…</translation>
     </message>
     <message>
-        <location line="+186"/>
+        <location line="+211"/>
         <source>Emoji</source>
         <translation>Эмоджи</translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+16"/>
         <source>Send</source>
         <translation>Отправить</translation>
     </message>
@@ -814,7 +842,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>NewVerificationRequest</name>
     <message>
-        <location filename="../qml/device-verification/NewVerificationRequest.qml" line="+7"/>
+        <location filename="../qml/device-verification/NewVerificationRequest.qml" line="+11"/>
         <source>Send Verification Request</source>
         <translation type="unfinished"></translation>
     </message>
@@ -872,7 +900,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>PlaceCall</name>
     <message>
-        <location filename="../qml/voip/PlaceCall.qml" line="+36"/>
+        <location filename="../qml/voip/PlaceCall.qml" line="+48"/>
         <source>Place a call to %1?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -892,7 +920,12 @@ Example: https://server.my:8787</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location line="+14"/>
+        <source>Screen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -900,7 +933,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>Placeholder</name>
     <message>
-        <location filename="../qml/delegates/Placeholder.qml" line="+4"/>
+        <location filename="../qml/delegates/Placeholder.qml" line="+8"/>
         <source>unimplemented event: </source>
         <translation>не реализованное событие</translation>
     </message>
@@ -908,7 +941,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>QCoreApplication</name>
     <message>
-        <location filename="../../src/main.cpp" line="+179"/>
+        <location filename="../../src/main.cpp" line="+167"/>
         <source>Create a unique profile, which allows you to log into several accounts at the same time and start multiple instances of nheko.</source>
         <translation>Создать уникальный профиль, который позволяет вести несколько аккаунтов и запускать множество сущностей nheko. </translation>
     </message>
@@ -926,7 +959,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>QuickSwitcher</name>
     <message>
-        <location filename="../../src/QuickSwitcher.cpp" line="+74"/>
+        <location filename="../../src/QuickSwitcher.cpp" line="+62"/>
         <source>Search for a room...</source>
         <translation>Поиск комнаты…</translation>
     </message>
@@ -934,18 +967,18 @@ Example: https://server.my:8787</source>
 <context>
     <name>RegisterPage</name>
     <message>
-        <location filename="../../src/RegisterPage.cpp" line="+89"/>
+        <location filename="../../src/RegisterPage.cpp" line="+77"/>
         <source>Username</source>
         <translation>Имя пользователя</translation>
     </message>
     <message>
         <location line="+2"/>
-        <location line="+286"/>
+        <location line="+287"/>
         <source>The username must not be empty, and must contain only the characters a-z, 0-9, ., _, =, -, and /.</source>
         <translation>Имя пользователя не должно быть пустым и должно содержать только символы a-z, 0-9, ., _, =, -, и /.</translation>
     </message>
     <message>
-        <location line="-282"/>
+        <location line="-283"/>
         <source>Password</source>
         <translation>Пароль</translation>
     </message>
@@ -980,7 +1013,7 @@ Example: https://server.my:8787</source>
         <translation>Нет поддреживаемых регистрационных потоков</translation>
     </message>
     <message>
-        <location line="+209"/>
+        <location line="+210"/>
         <source>One or more fields have invalid inputs. Please correct those issues and try again.</source>
         <translation>Одно или более полей имеют некорректный ввод. Пожалуйста устраните ошибки и попробуйте снова.</translation>
     </message>
@@ -1003,7 +1036,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>ReplyPopup</name>
     <message>
-        <location filename="../qml/ReplyPopup.qml" line="+45"/>
+        <location filename="../qml/ReplyPopup.qml" line="+49"/>
         <source>Close</source>
         <translation>Закрыть</translation>
     </message>
@@ -1016,7 +1049,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>RoomInfo</name>
     <message>
-        <location filename="../../src/Cache.cpp" line="+1861"/>
+        <location filename="../../src/Cache.cpp" line="+1793"/>
         <source>no version stored</source>
         <translation>нет сохраненной версии</translation>
     </message>
@@ -1024,7 +1057,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>RoomInfoListItem</name>
     <message>
-        <location filename="../../src/RoomInfoListItem.cpp" line="+102"/>
+        <location filename="../../src/RoomInfoListItem.cpp" line="+90"/>
         <source>Leave room</source>
         <translation>Покинуть комнату</translation>
     </message>
@@ -1086,10 +1119,116 @@ Example: https://server.my:8787</source>
         <translation>Отказаться</translation>
     </message>
 </context>
+<context>
+    <name>RoomSettings</name>
+    <message>
+        <location filename="../qml/RoomSettings.qml" line="+204"/>
+        <source>End-to-End Encryption</source>
+        <translation type="unfinished">Сквозное шифрование</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Encryption is currently experimental and things might break unexpectedly. &lt;br&gt;
+                            Please take note that it can&apos;t be disabled afterwards.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>Whether or not the client should respond automatically with the session keys
+                                upon request. Use with caution, this is a temporary measure to test the
+                                E2E implementation until device verification is completed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/ui/RoomSettings.cpp" line="+267"/>
+        <source>Failed to enable encryption: %1</source>
+        <translation type="unfinished">Не удалось включить шифрование: %1</translation>
+    </message>
+    <message>
+        <location line="+228"/>
+        <source>Select an avatar</source>
+        <translation type="unfinished">Выберите аватар</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>All Files (*)</source>
+        <translation type="unfinished">Все файлы (*)</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>The selected file is not an image</source>
+        <translation type="unfinished">Выбранный файл не является картинкой</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Error while reading file: %1</source>
+        <translation type="unfinished">Ошибка во время прочтения файла: %1</translation>
+    </message>
+    <message>
+        <location line="+34"/>
+        <location line="+20"/>
+        <source>Failed to upload image: %s</source>
+        <translation type="unfinished">Не удалось загрузить изображение: %s</translation>
+    </message>
+</context>
+<context>
+    <name>ScreenShare</name>
+    <message>
+        <location filename="../qml/voip/ScreenShare.qml" line="+30"/>
+        <source>Share desktop with %1?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Window:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Frame rate:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Include your camera picture-in-picture</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>Request remote camera</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location line="+9"/>
+        <source>View your callee&apos;s camera like a regular video call</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Hide mouse cursor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Share</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Preview</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>SideBarActions</name>
     <message>
-        <location filename="../../src/SideBarActions.cpp" line="+40"/>
+        <location filename="../../src/SideBarActions.cpp" line="+44"/>
         <source>User settings</source>
         <translation>Пользовательские настройки</translation>
     </message>
@@ -1117,7 +1256,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>StatusIndicator</name>
     <message>
-        <location filename="../qml/StatusIndicator.qml" line="+17"/>
+        <location filename="../qml/StatusIndicator.qml" line="+21"/>
         <source>Failed</source>
         <translation>Не удалоcь</translation>
     </message>
@@ -1140,7 +1279,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>Success</name>
     <message>
-        <location filename="../qml/device-verification/Success.qml" line="+6"/>
+        <location filename="../qml/device-verification/Success.qml" line="+10"/>
         <source>Successful Verification</source>
         <translation>Верификация прошла успешно</translation>
     </message>
@@ -1158,7 +1297,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>TimelineModel</name>
     <message>
-        <location filename="../../src/timeline/TimelineModel.cpp" line="+895"/>
+        <location filename="../../src/timeline/TimelineModel.cpp" line="+911"/>
         <source>Message redaction failed: %1</source>
         <translation>Ошибка редактирования сообщения: %1</translation>
     </message>
@@ -1309,12 +1448,12 @@ Example: https://server.my:8787</source>
         <translation>%1 отредактировал его &quot;стук&quot;.</translation>
     </message>
     <message>
-        <location line="-795"/>
+        <location line="-798"/>
         <source>You joined this room.</source>
         <translation>Вы присоединились к этой комнате.</translation>
     </message>
     <message>
-        <location line="+797"/>
+        <location line="+800"/>
         <source>Rejected the knock from %1.</source>
         <translation>Отверг &quot;стук&quot; от %1</translation>
     </message>
@@ -1338,7 +1477,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>TimelineRow</name>
     <message>
-        <location filename="../qml/TimelineRow.qml" line="+99"/>
+        <location filename="../qml/TimelineRow.qml" line="+100"/>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1366,7 +1505,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>TimelineView</name>
     <message>
-        <location filename="../qml/TimelineView.qml" line="+85"/>
+        <location filename="../qml/TimelineView.qml" line="+97"/>
         <source>React</source>
         <translation>Отреагировать</translation>
     </message>
@@ -1416,7 +1555,7 @@ Example: https://server.my:8787</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+61"/>
         <source>No room open</source>
         <translation>Комната не выбрана</translation>
     </message>
@@ -1424,7 +1563,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>TimelineViewManager</name>
     <message>
-        <location filename="../../src/timeline/TimelineViewManager.cpp" line="+423"/>
+        <location filename="../../src/timeline/TimelineViewManager.cpp" line="+430"/>
         <source>No encrypted private chat found with this user. Create an encrypted private chat with this user and try again.</source>
         <translation>Не найдено личного чата с этим пользователем. Создайте зашифрованный личный чат с этим пользователем и попытайтесь еще раз.</translation>
     </message>
@@ -1432,7 +1571,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>TopBar</name>
     <message>
-        <location filename="../qml/TopBar.qml" line="+43"/>
+        <location filename="../qml/TopBar.qml" line="+47"/>
         <source>Back to room list</source>
         <translation>Вернуться к списку комнат</translation>
     </message>
@@ -1471,7 +1610,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>TrayIcon</name>
     <message>
-        <location filename="../../src/TrayIcon.cpp" line="+122"/>
+        <location filename="../../src/TrayIcon.cpp" line="+110"/>
         <source>Show</source>
         <translation>Показать</translation>
     </message>
@@ -1484,7 +1623,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>UserInfoWidget</name>
     <message>
-        <location filename="../../src/UserInfoWidget.cpp" line="+95"/>
+        <location filename="../../src/UserInfoWidget.cpp" line="+82"/>
         <source>Logout</source>
         <translation>Выйти</translation>
     </message>
@@ -1532,7 +1671,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>UserProfile</name>
     <message>
-        <location filename="../qml/UserProfile.qml" line="+133"/>
+        <location filename="../qml/UserProfile.qml" line="+137"/>
         <source>Verify</source>
         <translation>Верифицировать</translation>
     </message>
@@ -1552,7 +1691,7 @@ Example: https://server.my:8787</source>
         <translation>Выгнать пользователя</translation>
     </message>
     <message>
-        <location filename="../../src/ui/UserProfile.cpp" line="+296"/>
+        <location filename="../../src/ui/UserProfile.cpp" line="+301"/>
         <source>Select an avatar</source>
         <translation type="unfinished">Выберите аватар</translation>
     </message>
@@ -1575,7 +1714,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>UserSettings</name>
     <message>
-        <location filename="../../src/UserSettingsPage.cpp" line="+345"/>
+        <location filename="../../src/UserSettingsPage.cpp" line="+337"/>
         <location filename="../../src/UserSettingsPage.h" line="+183"/>
         <source>Default</source>
         <translation type="unfinished"></translation>
@@ -1584,7 +1723,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>UserSettingsPage</name>
     <message>
-        <location line="+496"/>
+        <location line="+540"/>
         <source>Minimize to tray</source>
         <translation>Сворачивать в системную панель</translation>
     </message>
@@ -1805,7 +1944,7 @@ This usually causes the application icon in the task bar to animate in some fash
         <translation>Делиться ключами с проверенными участниками и устройствами</translation>
     </message>
     <message>
-        <location line="+407"/>
+        <location line="+406"/>
         <source>CACHED</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1815,7 +1954,7 @@ This usually causes the application icon in the task bar to animate in some fash
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-461"/>
+        <location line="-460"/>
         <source>Scale factor</source>
         <translation>Масштаб</translation>
     </message>
@@ -1990,7 +2129,7 @@ This usually causes the application icon in the task bar to animate in some fash
         <translation>Все файлы (*)</translation>
     </message>
     <message>
-        <location line="+237"/>
+        <location line="+236"/>
         <source>Open Sessions File</source>
         <translation>Открыть файл сеансов</translation>
     </message>
@@ -2036,7 +2175,7 @@ This usually causes the application icon in the task bar to animate in some fash
 <context>
     <name>Waiting</name>
     <message>
-        <location filename="../qml/device-verification/Waiting.qml" line="+7"/>
+        <location filename="../qml/device-verification/Waiting.qml" line="+11"/>
         <source>Waiting for other party…</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2064,7 +2203,7 @@ This usually causes the application icon in the task bar to animate in some fash
 <context>
     <name>WelcomePage</name>
     <message>
-        <location filename="../../src/WelcomePage.cpp" line="+46"/>
+        <location filename="../../src/WelcomePage.cpp" line="+34"/>
         <source>Welcome to nheko! The desktop client for the Matrix protocol.</source>
         <translation>Добро пожаловать в nheko, клиент для протокола Matrix!</translation>
     </message>
@@ -2087,7 +2226,7 @@ This usually causes the application icon in the task bar to animate in some fash
 <context>
     <name>descriptiveTime</name>
     <message>
-        <location filename="../../src/Utils.cpp" line="+145"/>
+        <location filename="../../src/Utils.cpp" line="+149"/>
         <source>Yesterday</source>
         <translation>Вчера</translation>
     </message>
@@ -2095,7 +2234,7 @@ This usually causes the application icon in the task bar to animate in some fash
 <context>
     <name>dialogs::CreateRoom</name>
     <message>
-        <location filename="../../src/dialogs/CreateRoom.cpp" line="+36"/>
+        <location filename="../../src/dialogs/CreateRoom.cpp" line="+40"/>
         <source>Create room</source>
         <translation>Создать комнату</translation>
     </message>
@@ -2138,7 +2277,7 @@ This usually causes the application icon in the task bar to animate in some fash
 <context>
     <name>dialogs::FallbackAuth</name>
     <message>
-        <location filename="../../src/dialogs/FallbackAuth.cpp" line="+30"/>
+        <location filename="../../src/dialogs/FallbackAuth.cpp" line="+34"/>
         <source>Open Fallback in Browser</source>
         <translation>Открыть ответ в Браузере</translation>
     </message>
@@ -2161,7 +2300,7 @@ This usually causes the application icon in the task bar to animate in some fash
 <context>
     <name>dialogs::InviteUsers</name>
     <message>
-        <location filename="../../src/dialogs/InviteUsers.cpp" line="+42"/>
+        <location filename="../../src/dialogs/InviteUsers.cpp" line="+46"/>
         <source>Cancel</source>
         <translation>Отмена</translation>
     </message>
@@ -2174,7 +2313,7 @@ This usually causes the application icon in the task bar to animate in some fash
 <context>
     <name>dialogs::JoinRoom</name>
     <message>
-        <location filename="../../src/dialogs/JoinRoom.cpp" line="+30"/>
+        <location filename="../../src/dialogs/JoinRoom.cpp" line="+34"/>
         <source>Join</source>
         <translation>Присоединиться</translation>
     </message>
@@ -2192,7 +2331,7 @@ This usually causes the application icon in the task bar to animate in some fash
 <context>
     <name>dialogs::LeaveRoom</name>
     <message>
-        <location filename="../../src/dialogs/LeaveRoom.cpp" line="+31"/>
+        <location filename="../../src/dialogs/LeaveRoom.cpp" line="+35"/>
         <source>Cancel</source>
         <translation>Отмена</translation>
     </message>
@@ -2205,7 +2344,7 @@ This usually causes the application icon in the task bar to animate in some fash
 <context>
     <name>dialogs::Logout</name>
     <message>
-        <location filename="../../src/dialogs/Logout.cpp" line="+47"/>
+        <location filename="../../src/dialogs/Logout.cpp" line="+35"/>
         <source>Cancel</source>
         <translation>Отмена</translation>
     </message>
@@ -2218,7 +2357,7 @@ This usually causes the application icon in the task bar to animate in some fash
 <context>
     <name>dialogs::PreviewUploadOverlay</name>
     <message>
-        <location filename="../../src/dialogs/PreviewUploadOverlay.cpp" line="+41"/>
+        <location filename="../../src/dialogs/PreviewUploadOverlay.cpp" line="+29"/>
         <source>Upload</source>
         <translation>Загрузить</translation>
     </message>
@@ -2240,7 +2379,7 @@ Media size: %2
 <context>
     <name>dialogs::ReCaptcha</name>
     <message>
-        <location filename="../../src/dialogs/ReCaptcha.cpp" line="+31"/>
+        <location filename="../../src/dialogs/ReCaptcha.cpp" line="+35"/>
         <source>Cancel</source>
         <translation>Отмена</translation>
     </message>
@@ -2258,7 +2397,7 @@ Media size: %2
 <context>
     <name>dialogs::ReadReceipts</name>
     <message>
-        <location filename="../../src/dialogs/ReadReceipts.cpp" line="+120"/>
+        <location filename="../../src/dialogs/ReadReceipts.cpp" line="+124"/>
         <source>Read receipts</source>
         <translation>Просмотреть получателей</translation>
     </message>
@@ -2281,140 +2420,10 @@ Media size: %2
         <translation>Вчера %1</translation>
     </message>
 </context>
-<context>
-    <name>dialogs::RoomSettings</name>
-    <message>
-        <location filename="../../src/dialogs/RoomSettings.cpp" line="+135"/>
-        <source>Settings</source>
-        <translation>Настройки</translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Info</source>
-        <translation>Информация</translation>
-    </message>
-    <message>
-        <location line="+11"/>
-        <source>Internal ID</source>
-        <translation>Внутренний ID</translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>Room Version</source>
-        <translation>Версия Комнаты</translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Notifications</source>
-        <translation>Уведомления</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Muted</source>
-        <translation>Приглушено</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Mentions only</source>
-        <translation>Только упоминания</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>All messages</source>
-        <translation>Все сообщения</translation>
-    </message>
-    <message>
-        <location line="+97"/>
-        <source>Room access</source>
-        <translation>Доступ к комнате</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Anyone and guests</source>
-        <translation>Все включая гостей</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Anyone</source>
-        <translation>Все</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Invited users</source>
-        <translation>Приглашённые пользователи</translation>
-    </message>
-    <message>
-        <location line="+50"/>
-        <source>Encryption</source>
-        <translation>Шифрование</translation>
-    </message>
-    <message>
-        <location line="+31"/>
-        <source>End-to-End Encryption</source>
-        <translation>Сквозное шифрование</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Encryption is currently experimental and things might break unexpectedly. &lt;br&gt;Please take note that it can&apos;t be disabled afterwards.</source>
-        <translation>Шифрование в настоящее время является экспериментальным, поэтому возможны сбои. &lt;br&gt;Пожалуйста, имейте ввиду, что его нельзя отключить впоследствии.</translation>
-    </message>
-    <message>
-        <location line="-24"/>
-        <source>Respond to key requests</source>
-        <translation>Отвечать на запросы на ключ</translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Whether or not the client should respond automatically with the session keys
- upon request. Use with caution, this is a temporary measure to test the
- E2E implementation until device verification is completed.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message numerus="yes">
-        <location line="+80"/>
-        <source>%n member(s)</source>
-        <translation>
-            <numerusform>%n участник</numerusform>
-            <numerusform>%n участника</numerusform>
-            <numerusform>%n участников</numerusform>
-        </translation>
-    </message>
-    <message>
-        <location line="+142"/>
-        <source>Failed to enable encryption: %1</source>
-        <translation>Не удалось включить шифрование: %1</translation>
-    </message>
-    <message>
-        <location line="+147"/>
-        <source>Select an avatar</source>
-        <translation>Выберите аватар</translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>All Files (*)</source>
-        <translation>Все файлы (*)</translation>
-    </message>
-    <message>
-        <location line="+12"/>
-        <source>The selected file is not an image</source>
-        <translation>Выбранный файл не является картинкой</translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Error while reading file: %1</source>
-        <translation>Ошибка во время прочтения файла: %1</translation>
-    </message>
-    <message>
-        <location line="+35"/>
-        <location line="+20"/>
-        <source>Failed to upload image: %s</source>
-        <translation>Не удалось загрузить изображение: %s</translation>
-    </message>
-</context>
 <context>
     <name>message-description sent:</name>
     <message>
-        <location filename="../../src/Utils.h" line="+108"/>
+        <location filename="../../src/Utils.h" line="+112"/>
         <source>You sent an audio clip</source>
         <translation>Вы отправили аудио запись</translation>
     </message>
@@ -2527,7 +2536,7 @@ Media size: %2
 <context>
     <name>popups::UserMentions</name>
     <message>
-        <location filename="../../src/popups/UserMentions.cpp" line="+64"/>
+        <location filename="../../src/popups/UserMentions.cpp" line="+68"/>
         <source>This Room</source>
         <translation>Эта Комната</translation>
     </message>
diff --git a/resources/langs/nheko_si.ts b/resources/langs/nheko_si.ts
index d665081c8a51d93cb0d77e9d1276422f57673e4f..0349970ff4eb1196f6fe3a3b42a6a895131c14ca 100644
--- a/resources/langs/nheko_si.ts
+++ b/resources/langs/nheko_si.ts
@@ -4,7 +4,7 @@
 <context>
     <name>ActiveCallBar</name>
     <message>
-        <location filename="../qml/voip/ActiveCallBar.qml" line="+66"/>
+        <location filename="../qml/voip/ActiveCallBar.qml" line="+106"/>
         <source>Calling...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15,8 +15,13 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+76"/>
-        <source>Toggle camera view</source>
+        <location line="+67"/>
+        <source>You are screen sharing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Hide/Show Picture-in-Picture</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -33,7 +38,7 @@
 <context>
     <name>AwaitingVerificationConfirmation</name>
     <message>
-        <location filename="../qml/device-verification/AwaitingVerificationConfirmation.qml" line="+7"/>
+        <location filename="../qml/device-verification/AwaitingVerificationConfirmation.qml" line="+11"/>
         <source>Awaiting Confirmation</source>
         <translation type="unfinished"></translation>
     </message>
@@ -51,7 +56,7 @@
 <context>
     <name>Cache</name>
     <message>
-        <location filename="../../src/Cache.cpp" line="+2084"/>
+        <location filename="../../src/Cache.cpp" line="+2026"/>
         <source>You joined this room.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -59,7 +64,7 @@
 <context>
     <name>CallInvite</name>
     <message>
-        <location filename="../qml/voip/CallInvite.qml" line="+66"/>
+        <location filename="../qml/voip/CallInvite.qml" line="+70"/>
         <source>Video Call</source>
         <translation type="unfinished"></translation>
     </message>
@@ -77,7 +82,7 @@
 <context>
     <name>CallInviteBar</name>
     <message>
-        <location filename="../qml/voip/CallInviteBar.qml" line="+60"/>
+        <location filename="../qml/voip/CallInviteBar.qml" line="+64"/>
         <source>Video Call</source>
         <translation type="unfinished"></translation>
     </message>
@@ -92,7 +97,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
+        <location line="+10"/>
         <source>Accept</source>
         <translation type="unfinished"></translation>
     </message>
@@ -117,36 +122,55 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>CallManager</name>
+    <message>
+        <location filename="../../src/CallManager.cpp" line="+521"/>
+        <source>Entire screen</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>ChatPage</name>
     <message>
-        <location filename="../../src/ChatPage.cpp" line="+215"/>
+        <location filename="../../src/ChatPage.cpp" line="+203"/>
         <source>Failed to invite user: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+4"/>
-        <location line="+797"/>
+        <location line="+806"/>
         <source>Invited user: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-500"/>
+        <location line="-510"/>
         <source>Migrating the cache to the current version failed. This can have different reasons. Please open an issue and try to use an older version in the mean time. Alternatively you can try deleting the cache manually.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+456"/>
+        <location line="+413"/>
+        <source>Confirm join</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Do you really want to join %1?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+44"/>
         <source>Room %1 created.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+35"/>
+        <location line="+323"/>
         <source>Confirm invite</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="-322"/>
         <source>Do you really want to invite %1 (%2)?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -211,7 +235,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-582"/>
+        <location line="+226"/>
+        <source>Do you really want to start a private chat with %1?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-818"/>
         <source>Cache migration failed!</source>
         <translation type="unfinished"></translation>
     </message>
@@ -236,7 +265,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+165"/>
+        <location line="+157"/>
         <source>Failed to setup encryption keys. Server response: %1 %2. Please try again later.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -247,7 +276,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+47"/>
         <source>Failed to join room: %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -267,12 +296,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+18"/>
         <source>Failed to leave room: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+54"/>
+        <location line="+61"/>
         <source>Failed to kick %1 from %2: %3</source>
         <translation type="unfinished"></translation>
     </message>
@@ -280,7 +309,7 @@
 <context>
     <name>CommunitiesListItem</name>
     <message>
-        <location filename="../../src/CommunitiesListItem.cpp" line="+26"/>
+        <location filename="../../src/CommunitiesListItem.cpp" line="+30"/>
         <source>Hide rooms with this tag or from this community</source>
         <translation type="unfinished"></translation>
     </message>
@@ -348,7 +377,7 @@
 <context>
     <name>DigitVerification</name>
     <message>
-        <location filename="../qml/device-verification/DigitVerification.qml" line="+7"/>
+        <location filename="../qml/device-verification/DigitVerification.qml" line="+11"/>
         <source>Verification Code</source>
         <translation type="unfinished"></translation>
     </message>
@@ -371,7 +400,7 @@
 <context>
     <name>EditModal</name>
     <message>
-        <location filename="../../src/dialogs/RoomSettings.cpp" line="+73"/>
+        <location filename="../../src/ui/RoomSettings.cpp" line="+42"/>
         <source>Apply</source>
         <translation type="unfinished"></translation>
     </message>
@@ -394,7 +423,7 @@
 <context>
     <name>EmojiPicker</name>
     <message>
-        <location filename="../qml/emoji/EmojiPicker.qml" line="+113"/>
+        <location filename="../qml/emoji/EmojiPicker.qml" line="+117"/>
         <location line="+181"/>
         <source>Search</source>
         <translation type="unfinished"></translation>
@@ -443,7 +472,7 @@
 <context>
     <name>EmojiVerification</name>
     <message>
-        <location filename="../qml/device-verification/EmojiVerification.qml" line="+7"/>
+        <location filename="../qml/device-verification/EmojiVerification.qml" line="+11"/>
         <source>Verification Code</source>
         <translation type="unfinished"></translation>
     </message>
@@ -466,7 +495,7 @@
 <context>
     <name>EncryptionIndicator</name>
     <message>
-        <location filename="../qml/EncryptionIndicator.qml" line="+19"/>
+        <location filename="../qml/EncryptionIndicator.qml" line="+23"/>
         <source>Encrypted</source>
         <translation type="unfinished"></translation>
     </message>
@@ -479,7 +508,7 @@
 <context>
     <name>EventStore</name>
     <message>
-        <location filename="../../src/timeline/EventStore.cpp" line="+612"/>
+        <location filename="../../src/timeline/EventStore.cpp" line="+613"/>
         <source>-- Encrypted Event (No keys found for decryption) --</source>
         <comment>Placeholder, when the message was not decrypted yet or can&apos;t be decrypted.</comment>
         <translation type="unfinished"></translation>
@@ -524,7 +553,7 @@
 <context>
     <name>Failed</name>
     <message>
-        <location filename="../qml/device-verification/Failed.qml" line="+7"/>
+        <location filename="../qml/device-verification/Failed.qml" line="+11"/>
         <source>Verification failed</source>
         <translation type="unfinished"></translation>
     </message>
@@ -558,7 +587,7 @@
 <context>
     <name>InputBar</name>
     <message>
-        <location filename="../../src/timeline/InputBar.cpp" line="+227"/>
+        <location filename="../../src/timeline/InputBar.cpp" line="+253"/>
         <source>Select a file</source>
         <translation type="unfinished"></translation>
     </message>
@@ -568,7 +597,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+384"/>
+        <location line="+371"/>
         <source>Failed to upload media. Please try again.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -576,7 +605,7 @@
 <context>
     <name>InviteeItem</name>
     <message>
-        <location filename="../../src/InviteeItem.cpp" line="+18"/>
+        <location filename="../../src/InviteeItem.cpp" line="+22"/>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
@@ -584,7 +613,7 @@
 <context>
     <name>LoginPage</name>
     <message>
-        <location filename="../../src/LoginPage.cpp" line="+92"/>
+        <location filename="../../src/LoginPage.cpp" line="+80"/>
         <source>Matrix ID</source>
         <translation type="unfinished"></translation>
     </message>
@@ -639,20 +668,19 @@ Example: https://server.my:8787</source>
     </message>
     <message>
         <location line="+19"/>
-        <location line="+218"/>
         <source>LOGIN</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-151"/>
+        <location line="+84"/>
         <location line="+11"/>
-        <location line="+157"/>
+        <location line="+156"/>
         <location line="+11"/>
         <source>You have entered an invalid Matrix ID  e.g @joe:matrix.org</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-132"/>
+        <location line="-131"/>
         <source>Autodiscovery failed. Received malformed response.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -677,12 +705,12 @@ Example: https://server.my:8787</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+59"/>
+        <location line="-168"/>
         <source>SSO LOGIN</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+263"/>
         <source>Empty password</source>
         <translation type="unfinished"></translation>
     </message>
@@ -695,7 +723,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>MemberList</name>
     <message>
-        <location filename="../../src/dialogs/MemberList.cpp" line="+90"/>
+        <location filename="../../src/dialogs/MemberList.cpp" line="+94"/>
         <source>Room members</source>
         <translation type="unfinished"></translation>
     </message>
@@ -708,7 +736,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>MessageDelegate</name>
     <message>
-        <location filename="../qml/delegates/MessageDelegate.qml" line="+105"/>
+        <location filename="../qml/delegates/MessageDelegate.qml" line="+109"/>
         <location line="+9"/>
         <source>removed</source>
         <translation type="unfinished"></translation>
@@ -777,7 +805,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>MessageInput</name>
     <message>
-        <location filename="../qml/MessageInput.qml" line="+38"/>
+        <location filename="../qml/MessageInput.qml" line="+42"/>
         <source>Hang up</source>
         <translation type="unfinished"></translation>
     </message>
@@ -787,22 +815,22 @@ Example: https://server.my:8787</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+25"/>
         <source>Send a file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+42"/>
         <source>Write a message...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+186"/>
+        <location line="+211"/>
         <source>Emoji</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+16"/>
         <source>Send</source>
         <translation type="unfinished"></translation>
     </message>
@@ -810,7 +838,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>NewVerificationRequest</name>
     <message>
-        <location filename="../qml/device-verification/NewVerificationRequest.qml" line="+7"/>
+        <location filename="../qml/device-verification/NewVerificationRequest.qml" line="+11"/>
         <source>Send Verification Request</source>
         <translation type="unfinished"></translation>
     </message>
@@ -868,7 +896,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>PlaceCall</name>
     <message>
-        <location filename="../qml/voip/PlaceCall.qml" line="+36"/>
+        <location filename="../qml/voip/PlaceCall.qml" line="+48"/>
         <source>Place a call to %1?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -888,7 +916,12 @@ Example: https://server.my:8787</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location line="+14"/>
+        <source>Screen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -896,7 +929,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>Placeholder</name>
     <message>
-        <location filename="../qml/delegates/Placeholder.qml" line="+4"/>
+        <location filename="../qml/delegates/Placeholder.qml" line="+8"/>
         <source>unimplemented event: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -904,7 +937,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>QCoreApplication</name>
     <message>
-        <location filename="../../src/main.cpp" line="+179"/>
+        <location filename="../../src/main.cpp" line="+167"/>
         <source>Create a unique profile, which allows you to log into several accounts at the same time and start multiple instances of nheko.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -922,7 +955,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>QuickSwitcher</name>
     <message>
-        <location filename="../../src/QuickSwitcher.cpp" line="+74"/>
+        <location filename="../../src/QuickSwitcher.cpp" line="+62"/>
         <source>Search for a room...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -930,18 +963,18 @@ Example: https://server.my:8787</source>
 <context>
     <name>RegisterPage</name>
     <message>
-        <location filename="../../src/RegisterPage.cpp" line="+89"/>
+        <location filename="../../src/RegisterPage.cpp" line="+77"/>
         <source>Username</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+2"/>
-        <location line="+286"/>
+        <location line="+287"/>
         <source>The username must not be empty, and must contain only the characters a-z, 0-9, ., _, =, -, and /.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-282"/>
+        <location line="-283"/>
         <source>Password</source>
         <translation type="unfinished"></translation>
     </message>
@@ -976,7 +1009,7 @@ Example: https://server.my:8787</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+209"/>
+        <location line="+210"/>
         <source>One or more fields have invalid inputs. Please correct those issues and try again.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -999,7 +1032,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>ReplyPopup</name>
     <message>
-        <location filename="../qml/ReplyPopup.qml" line="+45"/>
+        <location filename="../qml/ReplyPopup.qml" line="+49"/>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1012,7 +1045,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>RoomInfo</name>
     <message>
-        <location filename="../../src/Cache.cpp" line="+1861"/>
+        <location filename="../../src/Cache.cpp" line="+1793"/>
         <source>no version stored</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1020,7 +1053,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>RoomInfoListItem</name>
     <message>
-        <location filename="../../src/RoomInfoListItem.cpp" line="+102"/>
+        <location filename="../../src/RoomInfoListItem.cpp" line="+90"/>
         <source>Leave room</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1082,10 +1115,116 @@ Example: https://server.my:8787</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>RoomSettings</name>
+    <message>
+        <location filename="../qml/RoomSettings.qml" line="+204"/>
+        <source>End-to-End Encryption</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Encryption is currently experimental and things might break unexpectedly. &lt;br&gt;
+                            Please take note that it can&apos;t be disabled afterwards.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>Whether or not the client should respond automatically with the session keys
+                                upon request. Use with caution, this is a temporary measure to test the
+                                E2E implementation until device verification is completed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/ui/RoomSettings.cpp" line="+267"/>
+        <source>Failed to enable encryption: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+228"/>
+        <source>Select an avatar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>All Files (*)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>The selected file is not an image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Error while reading file: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+34"/>
+        <location line="+20"/>
+        <source>Failed to upload image: %s</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ScreenShare</name>
+    <message>
+        <location filename="../qml/voip/ScreenShare.qml" line="+30"/>
+        <source>Share desktop with %1?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Window:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Frame rate:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Include your camera picture-in-picture</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>Request remote camera</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location line="+9"/>
+        <source>View your callee&apos;s camera like a regular video call</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Hide mouse cursor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Share</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Preview</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>SideBarActions</name>
     <message>
-        <location filename="../../src/SideBarActions.cpp" line="+40"/>
+        <location filename="../../src/SideBarActions.cpp" line="+44"/>
         <source>User settings</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1113,7 +1252,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>StatusIndicator</name>
     <message>
-        <location filename="../qml/StatusIndicator.qml" line="+17"/>
+        <location filename="../qml/StatusIndicator.qml" line="+21"/>
         <source>Failed</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1136,7 +1275,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>Success</name>
     <message>
-        <location filename="../qml/device-verification/Success.qml" line="+6"/>
+        <location filename="../qml/device-verification/Success.qml" line="+10"/>
         <source>Successful Verification</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1154,7 +1293,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>TimelineModel</name>
     <message>
-        <location filename="../../src/timeline/TimelineModel.cpp" line="+895"/>
+        <location filename="../../src/timeline/TimelineModel.cpp" line="+911"/>
         <source>Message redaction failed: %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1304,12 +1443,12 @@ Example: https://server.my:8787</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-795"/>
+        <location line="-798"/>
         <source>You joined this room.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+797"/>
+        <location line="+800"/>
         <source>Rejected the knock from %1.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1333,7 +1472,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>TimelineRow</name>
     <message>
-        <location filename="../qml/TimelineRow.qml" line="+99"/>
+        <location filename="../qml/TimelineRow.qml" line="+100"/>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1361,7 +1500,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>TimelineView</name>
     <message>
-        <location filename="../qml/TimelineView.qml" line="+85"/>
+        <location filename="../qml/TimelineView.qml" line="+97"/>
         <source>React</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1411,7 +1550,7 @@ Example: https://server.my:8787</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+61"/>
         <source>No room open</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1419,7 +1558,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>TimelineViewManager</name>
     <message>
-        <location filename="../../src/timeline/TimelineViewManager.cpp" line="+423"/>
+        <location filename="../../src/timeline/TimelineViewManager.cpp" line="+430"/>
         <source>No encrypted private chat found with this user. Create an encrypted private chat with this user and try again.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1427,7 +1566,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>TopBar</name>
     <message>
-        <location filename="../qml/TopBar.qml" line="+43"/>
+        <location filename="../qml/TopBar.qml" line="+47"/>
         <source>Back to room list</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1466,7 +1605,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>TrayIcon</name>
     <message>
-        <location filename="../../src/TrayIcon.cpp" line="+122"/>
+        <location filename="../../src/TrayIcon.cpp" line="+110"/>
         <source>Show</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1479,7 +1618,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>UserInfoWidget</name>
     <message>
-        <location filename="../../src/UserInfoWidget.cpp" line="+95"/>
+        <location filename="../../src/UserInfoWidget.cpp" line="+82"/>
         <source>Logout</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1527,7 +1666,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>UserProfile</name>
     <message>
-        <location filename="../qml/UserProfile.qml" line="+133"/>
+        <location filename="../qml/UserProfile.qml" line="+137"/>
         <source>Verify</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1547,7 +1686,7 @@ Example: https://server.my:8787</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/UserProfile.cpp" line="+296"/>
+        <location filename="../../src/ui/UserProfile.cpp" line="+301"/>
         <source>Select an avatar</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1570,7 +1709,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>UserSettings</name>
     <message>
-        <location filename="../../src/UserSettingsPage.cpp" line="+345"/>
+        <location filename="../../src/UserSettingsPage.cpp" line="+337"/>
         <location filename="../../src/UserSettingsPage.h" line="+183"/>
         <source>Default</source>
         <translation type="unfinished"></translation>
@@ -1579,7 +1718,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>UserSettingsPage</name>
     <message>
-        <location line="+496"/>
+        <location line="+540"/>
         <source>Minimize to tray</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1795,7 +1934,7 @@ This usually causes the application icon in the task bar to animate in some fash
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+407"/>
+        <location line="+406"/>
         <source>CACHED</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1805,7 +1944,7 @@ This usually causes the application icon in the task bar to animate in some fash
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-461"/>
+        <location line="-460"/>
         <source>Scale factor</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1980,7 +2119,7 @@ This usually causes the application icon in the task bar to animate in some fash
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+237"/>
+        <location line="+236"/>
         <source>Open Sessions File</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2025,7 +2164,7 @@ This usually causes the application icon in the task bar to animate in some fash
 <context>
     <name>Waiting</name>
     <message>
-        <location filename="../qml/device-verification/Waiting.qml" line="+7"/>
+        <location filename="../qml/device-verification/Waiting.qml" line="+11"/>
         <source>Waiting for other party…</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2053,7 +2192,7 @@ This usually causes the application icon in the task bar to animate in some fash
 <context>
     <name>WelcomePage</name>
     <message>
-        <location filename="../../src/WelcomePage.cpp" line="+46"/>
+        <location filename="../../src/WelcomePage.cpp" line="+34"/>
         <source>Welcome to nheko! The desktop client for the Matrix protocol.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2076,7 +2215,7 @@ This usually causes the application icon in the task bar to animate in some fash
 <context>
     <name>descriptiveTime</name>
     <message>
-        <location filename="../../src/Utils.cpp" line="+145"/>
+        <location filename="../../src/Utils.cpp" line="+149"/>
         <source>Yesterday</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2084,7 +2223,7 @@ This usually causes the application icon in the task bar to animate in some fash
 <context>
     <name>dialogs::CreateRoom</name>
     <message>
-        <location filename="../../src/dialogs/CreateRoom.cpp" line="+36"/>
+        <location filename="../../src/dialogs/CreateRoom.cpp" line="+40"/>
         <source>Create room</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2127,7 +2266,7 @@ This usually causes the application icon in the task bar to animate in some fash
 <context>
     <name>dialogs::FallbackAuth</name>
     <message>
-        <location filename="../../src/dialogs/FallbackAuth.cpp" line="+30"/>
+        <location filename="../../src/dialogs/FallbackAuth.cpp" line="+34"/>
         <source>Open Fallback in Browser</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2150,7 +2289,7 @@ This usually causes the application icon in the task bar to animate in some fash
 <context>
     <name>dialogs::InviteUsers</name>
     <message>
-        <location filename="../../src/dialogs/InviteUsers.cpp" line="+42"/>
+        <location filename="../../src/dialogs/InviteUsers.cpp" line="+46"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2163,7 +2302,7 @@ This usually causes the application icon in the task bar to animate in some fash
 <context>
     <name>dialogs::JoinRoom</name>
     <message>
-        <location filename="../../src/dialogs/JoinRoom.cpp" line="+30"/>
+        <location filename="../../src/dialogs/JoinRoom.cpp" line="+34"/>
         <source>Join</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2181,7 +2320,7 @@ This usually causes the application icon in the task bar to animate in some fash
 <context>
     <name>dialogs::LeaveRoom</name>
     <message>
-        <location filename="../../src/dialogs/LeaveRoom.cpp" line="+31"/>
+        <location filename="../../src/dialogs/LeaveRoom.cpp" line="+35"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2194,7 +2333,7 @@ This usually causes the application icon in the task bar to animate in some fash
 <context>
     <name>dialogs::Logout</name>
     <message>
-        <location filename="../../src/dialogs/Logout.cpp" line="+47"/>
+        <location filename="../../src/dialogs/Logout.cpp" line="+35"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2207,7 +2346,7 @@ This usually causes the application icon in the task bar to animate in some fash
 <context>
     <name>dialogs::PreviewUploadOverlay</name>
     <message>
-        <location filename="../../src/dialogs/PreviewUploadOverlay.cpp" line="+41"/>
+        <location filename="../../src/dialogs/PreviewUploadOverlay.cpp" line="+29"/>
         <source>Upload</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2227,7 +2366,7 @@ Media size: %2
 <context>
     <name>dialogs::ReCaptcha</name>
     <message>
-        <location filename="../../src/dialogs/ReCaptcha.cpp" line="+31"/>
+        <location filename="../../src/dialogs/ReCaptcha.cpp" line="+35"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2245,7 +2384,7 @@ Media size: %2
 <context>
     <name>dialogs::ReadReceipts</name>
     <message>
-        <location filename="../../src/dialogs/ReadReceipts.cpp" line="+120"/>
+        <location filename="../../src/dialogs/ReadReceipts.cpp" line="+124"/>
         <source>Read receipts</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2268,139 +2407,10 @@ Media size: %2
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>dialogs::RoomSettings</name>
-    <message>
-        <location filename="../../src/dialogs/RoomSettings.cpp" line="+135"/>
-        <source>Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Info</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+11"/>
-        <source>Internal ID</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>Room Version</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Notifications</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Muted</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Mentions only</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>All messages</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+97"/>
-        <source>Room access</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Anyone and guests</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Anyone</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Invited users</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+50"/>
-        <source>Encryption</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+31"/>
-        <source>End-to-End Encryption</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Encryption is currently experimental and things might break unexpectedly. &lt;br&gt;Please take note that it can&apos;t be disabled afterwards.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="-24"/>
-        <source>Respond to key requests</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Whether or not the client should respond automatically with the session keys
- upon request. Use with caution, this is a temporary measure to test the
- E2E implementation until device verification is completed.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message numerus="yes">
-        <location line="+80"/>
-        <source>%n member(s)</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
-    </message>
-    <message>
-        <location line="+142"/>
-        <source>Failed to enable encryption: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+147"/>
-        <source>Select an avatar</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>All Files (*)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+12"/>
-        <source>The selected file is not an image</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Error while reading file: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+35"/>
-        <location line="+20"/>
-        <source>Failed to upload image: %s</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>message-description sent:</name>
     <message>
-        <location filename="../../src/Utils.h" line="+108"/>
+        <location filename="../../src/Utils.h" line="+112"/>
         <source>You sent an audio clip</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2513,7 +2523,7 @@ Media size: %2
 <context>
     <name>popups::UserMentions</name>
     <message>
-        <location filename="../../src/popups/UserMentions.cpp" line="+64"/>
+        <location filename="../../src/popups/UserMentions.cpp" line="+68"/>
         <source>This Room</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/resources/langs/nheko_sv.ts b/resources/langs/nheko_sv.ts
index 09dff5de40dde101d710fca19030559e8cc8ebff..f7a913cadf3caab7dce7526d157b660d6ddaa1ba 100644
--- a/resources/langs/nheko_sv.ts
+++ b/resources/langs/nheko_sv.ts
@@ -4,7 +4,7 @@
 <context>
     <name>ActiveCallBar</name>
     <message>
-        <location filename="../qml/voip/ActiveCallBar.qml" line="+66"/>
+        <location filename="../qml/voip/ActiveCallBar.qml" line="+106"/>
         <source>Calling...</source>
         <translation>Ringer upp...</translation>
     </message>
@@ -15,9 +15,14 @@
         <translation>Ansluter...</translation>
     </message>
     <message>
-        <location line="+76"/>
-        <source>Toggle camera view</source>
-        <translation>Byt kamera</translation>
+        <location line="+67"/>
+        <source>You are screen sharing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Hide/Show Picture-in-Picture</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+13"/>
@@ -33,7 +38,7 @@
 <context>
     <name>AwaitingVerificationConfirmation</name>
     <message>
-        <location filename="../qml/device-verification/AwaitingVerificationConfirmation.qml" line="+7"/>
+        <location filename="../qml/device-verification/AwaitingVerificationConfirmation.qml" line="+11"/>
         <source>Awaiting Confirmation</source>
         <translation>Inväntar Bekräftelse</translation>
     </message>
@@ -51,7 +56,7 @@
 <context>
     <name>Cache</name>
     <message>
-        <location filename="../../src/Cache.cpp" line="+2084"/>
+        <location filename="../../src/Cache.cpp" line="+2026"/>
         <source>You joined this room.</source>
         <translation>Du gick med i detta rum.</translation>
     </message>
@@ -59,7 +64,7 @@
 <context>
     <name>CallInvite</name>
     <message>
-        <location filename="../qml/voip/CallInvite.qml" line="+66"/>
+        <location filename="../qml/voip/CallInvite.qml" line="+70"/>
         <source>Video Call</source>
         <translation>Videosamtal</translation>
     </message>
@@ -77,7 +82,7 @@
 <context>
     <name>CallInviteBar</name>
     <message>
-        <location filename="../qml/voip/CallInviteBar.qml" line="+60"/>
+        <location filename="../qml/voip/CallInviteBar.qml" line="+64"/>
         <source>Video Call</source>
         <translation>Videosamtal</translation>
     </message>
@@ -92,7 +97,7 @@
         <translation>Enheter</translation>
     </message>
     <message>
-        <location line="+11"/>
+        <location line="+10"/>
         <source>Accept</source>
         <translation>Godkänn</translation>
     </message>
@@ -117,36 +122,55 @@
         <translation>Ingen mikrofon hittad.</translation>
     </message>
 </context>
+<context>
+    <name>CallManager</name>
+    <message>
+        <location filename="../../src/CallManager.cpp" line="+521"/>
+        <source>Entire screen</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>ChatPage</name>
     <message>
-        <location filename="../../src/ChatPage.cpp" line="+215"/>
+        <location filename="../../src/ChatPage.cpp" line="+203"/>
         <source>Failed to invite user: %1</source>
         <translation>Kunde inte bjuda in användare: %1</translation>
     </message>
     <message>
         <location line="+4"/>
-        <location line="+797"/>
+        <location line="+806"/>
         <source>Invited user: %1</source>
         <translation>Bjöd in användare: %1</translation>
     </message>
     <message>
-        <location line="-500"/>
+        <location line="-510"/>
         <source>Migrating the cache to the current version failed. This can have different reasons. Please open an issue and try to use an older version in the mean time. Alternatively you can try deleting the cache manually.</source>
         <translation>Kunde inte migrera cachen till den nuvarande versionen. Detta kan bero på flera anledningar, vänligen rapportera problemet och prova en äldre version under tiden. Du kan också försöka att manuellt radera cachen.</translation>
     </message>
     <message>
-        <location line="+456"/>
+        <location line="+413"/>
+        <source>Confirm join</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Do you really want to join %1?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+44"/>
         <source>Room %1 created.</source>
         <translation>Rum %1 skapat.</translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+35"/>
+        <location line="+323"/>
         <source>Confirm invite</source>
         <translation>Bekräfta inbjudan</translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="-322"/>
         <source>Do you really want to invite %1 (%2)?</source>
         <translation>Är du säker på att du vill bjuda in %1 (%2)?</translation>
     </message>
@@ -211,7 +235,12 @@
         <translation>Hävde bannlysningen av användare: %1</translation>
     </message>
     <message>
-        <location line="-582"/>
+        <location line="+226"/>
+        <source>Do you really want to start a private chat with %1?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-818"/>
         <source>Cache migration failed!</source>
         <translation>Cache-migration misslyckades!</translation>
     </message>
@@ -236,7 +265,7 @@
         <translation>Kunde inte återställa sparad data. Vänligen logga in på nytt.</translation>
     </message>
     <message>
-        <location line="+165"/>
+        <location line="+157"/>
         <source>Failed to setup encryption keys. Server response: %1 %2. Please try again later.</source>
         <translation>Kunde inte sätta upp krypteringsnycklar. Svar från servern: %1 %2. Vänligen försök igen senare.</translation>
     </message>
@@ -247,7 +276,7 @@
         <translation>Vänligen försök logga in på nytt: %1</translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+47"/>
         <source>Failed to join room: %1</source>
         <translation>Kunde inte gå med i rum: %1</translation>
     </message>
@@ -267,12 +296,12 @@
         <translation>Kunde inte skapa rum: %1</translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+18"/>
         <source>Failed to leave room: %1</source>
         <translation>Kunde inte lämna rum: %1</translation>
     </message>
     <message>
-        <location line="+54"/>
+        <location line="+61"/>
         <source>Failed to kick %1 from %2: %3</source>
         <translation type="unfinished"></translation>
     </message>
@@ -280,7 +309,7 @@
 <context>
     <name>CommunitiesListItem</name>
     <message>
-        <location filename="../../src/CommunitiesListItem.cpp" line="+26"/>
+        <location filename="../../src/CommunitiesListItem.cpp" line="+30"/>
         <source>Hide rooms with this tag or from this community</source>
         <translation type="unfinished"></translation>
     </message>
@@ -348,7 +377,7 @@
 <context>
     <name>DigitVerification</name>
     <message>
-        <location filename="../qml/device-verification/DigitVerification.qml" line="+7"/>
+        <location filename="../qml/device-verification/DigitVerification.qml" line="+11"/>
         <source>Verification Code</source>
         <translation>Verifikationskod</translation>
     </message>
@@ -371,7 +400,7 @@
 <context>
     <name>EditModal</name>
     <message>
-        <location filename="../../src/dialogs/RoomSettings.cpp" line="+73"/>
+        <location filename="../../src/ui/RoomSettings.cpp" line="+42"/>
         <source>Apply</source>
         <translation>Tillämpa</translation>
     </message>
@@ -394,7 +423,7 @@
 <context>
     <name>EmojiPicker</name>
     <message>
-        <location filename="../qml/emoji/EmojiPicker.qml" line="+113"/>
+        <location filename="../qml/emoji/EmojiPicker.qml" line="+117"/>
         <location line="+181"/>
         <source>Search</source>
         <translation>Sök</translation>
@@ -443,7 +472,7 @@
 <context>
     <name>EmojiVerification</name>
     <message>
-        <location filename="../qml/device-verification/EmojiVerification.qml" line="+7"/>
+        <location filename="../qml/device-verification/EmojiVerification.qml" line="+11"/>
         <source>Verification Code</source>
         <translation>Verifikationskod</translation>
     </message>
@@ -466,7 +495,7 @@
 <context>
     <name>EncryptionIndicator</name>
     <message>
-        <location filename="../qml/EncryptionIndicator.qml" line="+19"/>
+        <location filename="../qml/EncryptionIndicator.qml" line="+23"/>
         <source>Encrypted</source>
         <translation>Krypterad</translation>
     </message>
@@ -479,7 +508,7 @@
 <context>
     <name>EventStore</name>
     <message>
-        <location filename="../../src/timeline/EventStore.cpp" line="+612"/>
+        <location filename="../../src/timeline/EventStore.cpp" line="+613"/>
         <source>-- Encrypted Event (No keys found for decryption) --</source>
         <comment>Placeholder, when the message was not decrypted yet or can&apos;t be decrypted.</comment>
         <translation>-- Krypterat Event (Inga nycklar kunde hittas för dekryptering) --</translation>
@@ -524,7 +553,7 @@
 <context>
     <name>Failed</name>
     <message>
-        <location filename="../qml/device-verification/Failed.qml" line="+7"/>
+        <location filename="../qml/device-verification/Failed.qml" line="+11"/>
         <source>Verification failed</source>
         <translation>Verifikation misslyckades</translation>
     </message>
@@ -558,7 +587,7 @@
 <context>
     <name>InputBar</name>
     <message>
-        <location filename="../../src/timeline/InputBar.cpp" line="+227"/>
+        <location filename="../../src/timeline/InputBar.cpp" line="+253"/>
         <source>Select a file</source>
         <translation>Välj en fil</translation>
     </message>
@@ -568,7 +597,7 @@
         <translation>Alla Filer (*)</translation>
     </message>
     <message>
-        <location line="+384"/>
+        <location line="+371"/>
         <source>Failed to upload media. Please try again.</source>
         <translation>Kunde inte ladda upp media. Vänligen försök igen.</translation>
     </message>
@@ -576,7 +605,7 @@
 <context>
     <name>InviteeItem</name>
     <message>
-        <location filename="../../src/InviteeItem.cpp" line="+18"/>
+        <location filename="../../src/InviteeItem.cpp" line="+22"/>
         <source>Remove</source>
         <translation>Ta bort</translation>
     </message>
@@ -584,7 +613,7 @@
 <context>
     <name>LoginPage</name>
     <message>
-        <location filename="../../src/LoginPage.cpp" line="+92"/>
+        <location filename="../../src/LoginPage.cpp" line="+80"/>
         <source>Matrix ID</source>
         <translation>Matrix-ID</translation>
     </message>
@@ -643,20 +672,19 @@ Exempel: https://server.my:8787</translation>
     </message>
     <message>
         <location line="+19"/>
-        <location line="+218"/>
         <source>LOGIN</source>
         <translation>INLOGGNING</translation>
     </message>
     <message>
-        <location line="-151"/>
+        <location line="+84"/>
         <location line="+11"/>
-        <location line="+157"/>
+        <location line="+156"/>
         <location line="+11"/>
         <source>You have entered an invalid Matrix ID  e.g @joe:matrix.org</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-132"/>
+        <location line="-131"/>
         <source>Autodiscovery failed. Received malformed response.</source>
         <translation>Autouppslag misslyckades. Mottog felkonstruerat svar.</translation>
     </message>
@@ -681,12 +709,12 @@ Exempel: https://server.my:8787</translation>
         <translation>Ett okänt fel uppstod. Se till att hemserver-domänen är giltig.</translation>
     </message>
     <message>
-        <location line="+59"/>
+        <location line="-168"/>
         <source>SSO LOGIN</source>
         <translation>SSO INLOGGNING</translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+263"/>
         <source>Empty password</source>
         <translation>Tomt lösenord</translation>
     </message>
@@ -699,7 +727,7 @@ Exempel: https://server.my:8787</translation>
 <context>
     <name>MemberList</name>
     <message>
-        <location filename="../../src/dialogs/MemberList.cpp" line="+90"/>
+        <location filename="../../src/dialogs/MemberList.cpp" line="+94"/>
         <source>Room members</source>
         <translation>Rumsmedlemmar</translation>
     </message>
@@ -712,7 +740,7 @@ Exempel: https://server.my:8787</translation>
 <context>
     <name>MessageDelegate</name>
     <message>
-        <location filename="../qml/delegates/MessageDelegate.qml" line="+123"/>
+        <location filename="../qml/delegates/MessageDelegate.qml" line="+127"/>
         <source>Encryption enabled</source>
         <translation>Kryptering aktiverad</translation>
     </message>
@@ -781,7 +809,7 @@ Exempel: https://server.my:8787</translation>
 <context>
     <name>MessageInput</name>
     <message>
-        <location filename="../qml/MessageInput.qml" line="+38"/>
+        <location filename="../qml/MessageInput.qml" line="+42"/>
         <source>Hang up</source>
         <translation>Lägg på</translation>
     </message>
@@ -791,22 +819,22 @@ Exempel: https://server.my:8787</translation>
         <translation>Ring upp</translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+25"/>
         <source>Send a file</source>
         <translation>Skicka en fil</translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+42"/>
         <source>Write a message...</source>
         <translation>Skriv ett meddelande…</translation>
     </message>
     <message>
-        <location line="+186"/>
+        <location line="+211"/>
         <source>Emoji</source>
         <translation>Emoji</translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+16"/>
         <source>Send</source>
         <translation>Skicka</translation>
     </message>
@@ -814,7 +842,7 @@ Exempel: https://server.my:8787</translation>
 <context>
     <name>NewVerificationRequest</name>
     <message>
-        <location filename="../qml/device-verification/NewVerificationRequest.qml" line="+7"/>
+        <location filename="../qml/device-verification/NewVerificationRequest.qml" line="+11"/>
         <source>Send Verification Request</source>
         <translation>Skicka verifikationsförfrågan</translation>
     </message>
@@ -872,7 +900,7 @@ Exempel: https://server.my:8787</translation>
 <context>
     <name>PlaceCall</name>
     <message>
-        <location filename="../qml/voip/PlaceCall.qml" line="+36"/>
+        <location filename="../qml/voip/PlaceCall.qml" line="+48"/>
         <source>Place a call to %1?</source>
         <translation>Ring upp %1?</translation>
     </message>
@@ -892,7 +920,12 @@ Exempel: https://server.my:8787</translation>
         <translation>Video</translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location line="+14"/>
+        <source>Screen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
         <source>Cancel</source>
         <translation>Avbryt</translation>
     </message>
@@ -900,7 +933,7 @@ Exempel: https://server.my:8787</translation>
 <context>
     <name>Placeholder</name>
     <message>
-        <location filename="../qml/delegates/Placeholder.qml" line="+4"/>
+        <location filename="../qml/delegates/Placeholder.qml" line="+8"/>
         <source>unimplemented event: </source>
         <translation>ej implementerat event: </translation>
     </message>
@@ -908,7 +941,7 @@ Exempel: https://server.my:8787</translation>
 <context>
     <name>QCoreApplication</name>
     <message>
-        <location filename="../../src/main.cpp" line="+179"/>
+        <location filename="../../src/main.cpp" line="+167"/>
         <source>Create a unique profile, which allows you to log into several accounts at the same time and start multiple instances of nheko.</source>
         <translation>Skapa en unik profil, vilket tillåter dig att logga in på flera konton samtidigt och starta flera instanser av Nheko.</translation>
     </message>
@@ -926,7 +959,7 @@ Exempel: https://server.my:8787</translation>
 <context>
     <name>QuickSwitcher</name>
     <message>
-        <location filename="../../src/QuickSwitcher.cpp" line="+74"/>
+        <location filename="../../src/QuickSwitcher.cpp" line="+62"/>
         <source>Search for a room...</source>
         <translation>Sök efter ett rum…</translation>
     </message>
@@ -934,18 +967,18 @@ Exempel: https://server.my:8787</translation>
 <context>
     <name>RegisterPage</name>
     <message>
-        <location filename="../../src/RegisterPage.cpp" line="+89"/>
+        <location filename="../../src/RegisterPage.cpp" line="+77"/>
         <source>Username</source>
         <translation>Användarnamn</translation>
     </message>
     <message>
         <location line="+2"/>
-        <location line="+286"/>
+        <location line="+287"/>
         <source>The username must not be empty, and must contain only the characters a-z, 0-9, ., _, =, -, and /.</source>
         <translation>Användarnamnet kan inte vara tomt, och måste enbart innehålla tecknen a-z, 0-9, ., _, =, -, och /.</translation>
     </message>
     <message>
-        <location line="-282"/>
+        <location line="-283"/>
         <source>Password</source>
         <translation>Lösenord</translation>
     </message>
@@ -980,7 +1013,7 @@ Exempel: https://server.my:8787</translation>
         <translation>Inga stödda registreringsflöden!</translation>
     </message>
     <message>
-        <location line="+209"/>
+        <location line="+210"/>
         <source>One or more fields have invalid inputs. Please correct those issues and try again.</source>
         <translation>Ett eller flera fält har ogiltigt innehåll. Vänligen korrigera problemen och försök igen.</translation>
     </message>
@@ -1003,7 +1036,7 @@ Exempel: https://server.my:8787</translation>
 <context>
     <name>ReplyPopup</name>
     <message>
-        <location filename="../qml/ReplyPopup.qml" line="+45"/>
+        <location filename="../qml/ReplyPopup.qml" line="+49"/>
         <source>Close</source>
         <translation>Stäng</translation>
     </message>
@@ -1016,7 +1049,7 @@ Exempel: https://server.my:8787</translation>
 <context>
     <name>RoomInfo</name>
     <message>
-        <location filename="../../src/Cache.cpp" line="+1861"/>
+        <location filename="../../src/Cache.cpp" line="+1793"/>
         <source>no version stored</source>
         <translation>ingen version lagrad</translation>
     </message>
@@ -1024,7 +1057,7 @@ Exempel: https://server.my:8787</translation>
 <context>
     <name>RoomInfoListItem</name>
     <message>
-        <location filename="../../src/RoomInfoListItem.cpp" line="+102"/>
+        <location filename="../../src/RoomInfoListItem.cpp" line="+90"/>
         <source>Leave room</source>
         <translation>Lämna rum</translation>
     </message>
@@ -1086,10 +1119,116 @@ Exempel: https://server.my:8787</translation>
         <translation>Avvisa</translation>
     </message>
 </context>
+<context>
+    <name>RoomSettings</name>
+    <message>
+        <location filename="../qml/RoomSettings.qml" line="+204"/>
+        <source>End-to-End Encryption</source>
+        <translation type="unfinished">Totalsträckskryptering</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Encryption is currently experimental and things might break unexpectedly. &lt;br&gt;
+                            Please take note that it can&apos;t be disabled afterwards.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>Whether or not the client should respond automatically with the session keys
+                                upon request. Use with caution, this is a temporary measure to test the
+                                E2E implementation until device verification is completed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/ui/RoomSettings.cpp" line="+267"/>
+        <source>Failed to enable encryption: %1</source>
+        <translation type="unfinished">Kunde inte aktivera kryptering: %1</translation>
+    </message>
+    <message>
+        <location line="+228"/>
+        <source>Select an avatar</source>
+        <translation type="unfinished">Välj en avatar</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>All Files (*)</source>
+        <translation type="unfinished">Alla Filer (*)</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>The selected file is not an image</source>
+        <translation type="unfinished">Den valda filen är inte en bild</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Error while reading file: %1</source>
+        <translation type="unfinished">Kunde inte läsa filen: %1</translation>
+    </message>
+    <message>
+        <location line="+34"/>
+        <location line="+20"/>
+        <source>Failed to upload image: %s</source>
+        <translation type="unfinished">Kunde inte ladda upp bilden: %s</translation>
+    </message>
+</context>
+<context>
+    <name>ScreenShare</name>
+    <message>
+        <location filename="../qml/voip/ScreenShare.qml" line="+30"/>
+        <source>Share desktop with %1?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Window:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Frame rate:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Include your camera picture-in-picture</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>Request remote camera</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location line="+9"/>
+        <source>View your callee&apos;s camera like a regular video call</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Hide mouse cursor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Share</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Preview</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Cancel</source>
+        <translation type="unfinished">Avbryt</translation>
+    </message>
+</context>
 <context>
     <name>SideBarActions</name>
     <message>
-        <location filename="../../src/SideBarActions.cpp" line="+40"/>
+        <location filename="../../src/SideBarActions.cpp" line="+44"/>
         <source>User settings</source>
         <translation>Användarinställningar</translation>
     </message>
@@ -1117,7 +1256,7 @@ Exempel: https://server.my:8787</translation>
 <context>
     <name>StatusIndicator</name>
     <message>
-        <location filename="../qml/StatusIndicator.qml" line="+17"/>
+        <location filename="../qml/StatusIndicator.qml" line="+21"/>
         <source>Failed</source>
         <translation>Misslyckat</translation>
     </message>
@@ -1140,7 +1279,7 @@ Exempel: https://server.my:8787</translation>
 <context>
     <name>Success</name>
     <message>
-        <location filename="../qml/device-verification/Success.qml" line="+6"/>
+        <location filename="../qml/device-verification/Success.qml" line="+10"/>
         <source>Successful Verification</source>
         <translation>Lyckad verifikation</translation>
     </message>
@@ -1158,7 +1297,7 @@ Exempel: https://server.my:8787</translation>
 <context>
     <name>TimelineModel</name>
     <message>
-        <location filename="../../src/timeline/TimelineModel.cpp" line="+895"/>
+        <location filename="../../src/timeline/TimelineModel.cpp" line="+911"/>
         <source>Message redaction failed: %1</source>
         <translation>Kunde inte maskera meddelande: %1</translation>
     </message>
@@ -1308,12 +1447,12 @@ Exempel: https://server.my:8787</translation>
         <translation>%1 maskerade sin knackning.</translation>
     </message>
     <message>
-        <location line="-795"/>
+        <location line="-798"/>
         <source>You joined this room.</source>
         <translation>Du gick med i detta rum.</translation>
     </message>
     <message>
-        <location line="+797"/>
+        <location line="+800"/>
         <source>Rejected the knock from %1.</source>
         <translation>Avvisade knackningen från %1.</translation>
     </message>
@@ -1337,7 +1476,7 @@ Exempel: https://server.my:8787</translation>
 <context>
     <name>TimelineRow</name>
     <message>
-        <location filename="../qml/TimelineRow.qml" line="+99"/>
+        <location filename="../qml/TimelineRow.qml" line="+100"/>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1365,7 +1504,7 @@ Exempel: https://server.my:8787</translation>
 <context>
     <name>TimelineView</name>
     <message>
-        <location filename="../qml/TimelineView.qml" line="+85"/>
+        <location filename="../qml/TimelineView.qml" line="+97"/>
         <source>React</source>
         <translation>Reagera</translation>
     </message>
@@ -1415,7 +1554,7 @@ Exempel: https://server.my:8787</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+61"/>
         <source>No room open</source>
         <translation>Inget rum öppet</translation>
     </message>
@@ -1423,7 +1562,7 @@ Exempel: https://server.my:8787</translation>
 <context>
     <name>TimelineViewManager</name>
     <message>
-        <location filename="../../src/timeline/TimelineViewManager.cpp" line="+423"/>
+        <location filename="../../src/timeline/TimelineViewManager.cpp" line="+430"/>
         <source>No encrypted private chat found with this user. Create an encrypted private chat with this user and try again.</source>
         <translation>Ingen krypterad privat chatt med denna användare kunde hittas. Skapa en krypterad privat chatt med användaren och försök igen.</translation>
     </message>
@@ -1431,7 +1570,7 @@ Exempel: https://server.my:8787</translation>
 <context>
     <name>TopBar</name>
     <message>
-        <location filename="../qml/TopBar.qml" line="+43"/>
+        <location filename="../qml/TopBar.qml" line="+47"/>
         <source>Back to room list</source>
         <translation>Tillbaka till rumlista</translation>
     </message>
@@ -1470,7 +1609,7 @@ Exempel: https://server.my:8787</translation>
 <context>
     <name>TrayIcon</name>
     <message>
-        <location filename="../../src/TrayIcon.cpp" line="+122"/>
+        <location filename="../../src/TrayIcon.cpp" line="+110"/>
         <source>Show</source>
         <translation>Visa</translation>
     </message>
@@ -1483,7 +1622,7 @@ Exempel: https://server.my:8787</translation>
 <context>
     <name>UserInfoWidget</name>
     <message>
-        <location filename="../../src/UserInfoWidget.cpp" line="+95"/>
+        <location filename="../../src/UserInfoWidget.cpp" line="+82"/>
         <source>Logout</source>
         <translation>Logga ut</translation>
     </message>
@@ -1531,7 +1670,7 @@ Exempel: https://server.my:8787</translation>
 <context>
     <name>UserProfile</name>
     <message>
-        <location filename="../qml/UserProfile.qml" line="+133"/>
+        <location filename="../qml/UserProfile.qml" line="+137"/>
         <source>Verify</source>
         <translation>Bekräfta</translation>
     </message>
@@ -1551,7 +1690,7 @@ Exempel: https://server.my:8787</translation>
         <translation>Sparka ut användaren</translation>
     </message>
     <message>
-        <location filename="../../src/ui/UserProfile.cpp" line="+296"/>
+        <location filename="../../src/ui/UserProfile.cpp" line="+301"/>
         <source>Select an avatar</source>
         <translation>Välj en avatar</translation>
     </message>
@@ -1574,7 +1713,7 @@ Exempel: https://server.my:8787</translation>
 <context>
     <name>UserSettings</name>
     <message>
-        <location filename="../../src/UserSettingsPage.cpp" line="+345"/>
+        <location filename="../../src/UserSettingsPage.cpp" line="+337"/>
         <location filename="../../src/UserSettingsPage.h" line="+183"/>
         <source>Default</source>
         <translation type="unfinished"></translation>
@@ -1583,7 +1722,7 @@ Exempel: https://server.my:8787</translation>
 <context>
     <name>UserSettingsPage</name>
     <message>
-        <location line="+496"/>
+        <location line="+540"/>
         <source>Minimize to tray</source>
         <translation>Minimera till systemtråg</translation>
     </message>
@@ -1807,7 +1946,7 @@ Detta gör vanligtvis att ikonen i aktivitetsfältet animeras på något sätt.<
         <translation>Dela nycklar med verifierade användare och enheter</translation>
     </message>
     <message>
-        <location line="+407"/>
+        <location line="+406"/>
         <source>CACHED</source>
         <translation>SPARAD</translation>
     </message>
@@ -1817,7 +1956,7 @@ Detta gör vanligtvis att ikonen i aktivitetsfältet animeras på något sätt.<
         <translation>EJ SPARAD</translation>
     </message>
     <message>
-        <location line="-461"/>
+        <location line="-460"/>
         <source>Scale factor</source>
         <translation>Storleksfaktor</translation>
     </message>
@@ -1992,7 +2131,7 @@ Detta gör vanligtvis att ikonen i aktivitetsfältet animeras på något sätt.<
         <translation>Alla Filer (*)</translation>
     </message>
     <message>
-        <location line="+237"/>
+        <location line="+236"/>
         <source>Open Sessions File</source>
         <translation>Öppna sessionsfil</translation>
     </message>
@@ -2037,7 +2176,7 @@ Detta gör vanligtvis att ikonen i aktivitetsfältet animeras på något sätt.<
 <context>
     <name>Waiting</name>
     <message>
-        <location filename="../qml/device-verification/Waiting.qml" line="+7"/>
+        <location filename="../qml/device-verification/Waiting.qml" line="+11"/>
         <source>Waiting for other party…</source>
         <translation>Väntar på motparten…</translation>
     </message>
@@ -2065,7 +2204,7 @@ Detta gör vanligtvis att ikonen i aktivitetsfältet animeras på något sätt.<
 <context>
     <name>WelcomePage</name>
     <message>
-        <location filename="../../src/WelcomePage.cpp" line="+46"/>
+        <location filename="../../src/WelcomePage.cpp" line="+34"/>
         <source>Welcome to nheko! The desktop client for the Matrix protocol.</source>
         <translation>Välkommen till Nheko! Skrivbordsklienten för Matrix-protokollet.</translation>
     </message>
@@ -2088,7 +2227,7 @@ Detta gör vanligtvis att ikonen i aktivitetsfältet animeras på något sätt.<
 <context>
     <name>descriptiveTime</name>
     <message>
-        <location filename="../../src/Utils.cpp" line="+145"/>
+        <location filename="../../src/Utils.cpp" line="+149"/>
         <source>Yesterday</source>
         <translation>Igår</translation>
     </message>
@@ -2096,7 +2235,7 @@ Detta gör vanligtvis att ikonen i aktivitetsfältet animeras på något sätt.<
 <context>
     <name>dialogs::CreateRoom</name>
     <message>
-        <location filename="../../src/dialogs/CreateRoom.cpp" line="+36"/>
+        <location filename="../../src/dialogs/CreateRoom.cpp" line="+40"/>
         <source>Create room</source>
         <translation>Skapa rum</translation>
     </message>
@@ -2139,7 +2278,7 @@ Detta gör vanligtvis att ikonen i aktivitetsfältet animeras på något sätt.<
 <context>
     <name>dialogs::FallbackAuth</name>
     <message>
-        <location filename="../../src/dialogs/FallbackAuth.cpp" line="+30"/>
+        <location filename="../../src/dialogs/FallbackAuth.cpp" line="+34"/>
         <source>Open Fallback in Browser</source>
         <translation>Öppna reserv i webbläsare</translation>
     </message>
@@ -2162,7 +2301,7 @@ Detta gör vanligtvis att ikonen i aktivitetsfältet animeras på något sätt.<
 <context>
     <name>dialogs::InviteUsers</name>
     <message>
-        <location filename="../../src/dialogs/InviteUsers.cpp" line="+42"/>
+        <location filename="../../src/dialogs/InviteUsers.cpp" line="+46"/>
         <source>Cancel</source>
         <translation>Avbryt</translation>
     </message>
@@ -2175,7 +2314,7 @@ Detta gör vanligtvis att ikonen i aktivitetsfältet animeras på något sätt.<
 <context>
     <name>dialogs::JoinRoom</name>
     <message>
-        <location filename="../../src/dialogs/JoinRoom.cpp" line="+30"/>
+        <location filename="../../src/dialogs/JoinRoom.cpp" line="+34"/>
         <source>Join</source>
         <translation>GÃ¥ med</translation>
     </message>
@@ -2193,7 +2332,7 @@ Detta gör vanligtvis att ikonen i aktivitetsfältet animeras på något sätt.<
 <context>
     <name>dialogs::LeaveRoom</name>
     <message>
-        <location filename="../../src/dialogs/LeaveRoom.cpp" line="+31"/>
+        <location filename="../../src/dialogs/LeaveRoom.cpp" line="+35"/>
         <source>Cancel</source>
         <translation>Avbryt</translation>
     </message>
@@ -2206,7 +2345,7 @@ Detta gör vanligtvis att ikonen i aktivitetsfältet animeras på något sätt.<
 <context>
     <name>dialogs::Logout</name>
     <message>
-        <location filename="../../src/dialogs/Logout.cpp" line="+47"/>
+        <location filename="../../src/dialogs/Logout.cpp" line="+35"/>
         <source>Cancel</source>
         <translation>Avbryt</translation>
     </message>
@@ -2219,7 +2358,7 @@ Detta gör vanligtvis att ikonen i aktivitetsfältet animeras på något sätt.<
 <context>
     <name>dialogs::PreviewUploadOverlay</name>
     <message>
-        <location filename="../../src/dialogs/PreviewUploadOverlay.cpp" line="+41"/>
+        <location filename="../../src/dialogs/PreviewUploadOverlay.cpp" line="+29"/>
         <source>Upload</source>
         <translation>Ladda upp</translation>
     </message>
@@ -2241,7 +2380,7 @@ Mediastorlek: %2
 <context>
     <name>dialogs::ReCaptcha</name>
     <message>
-        <location filename="../../src/dialogs/ReCaptcha.cpp" line="+31"/>
+        <location filename="../../src/dialogs/ReCaptcha.cpp" line="+35"/>
         <source>Cancel</source>
         <translation>Avbryt</translation>
     </message>
@@ -2259,7 +2398,7 @@ Mediastorlek: %2
 <context>
     <name>dialogs::ReadReceipts</name>
     <message>
-        <location filename="../../src/dialogs/ReadReceipts.cpp" line="+120"/>
+        <location filename="../../src/dialogs/ReadReceipts.cpp" line="+124"/>
         <source>Read receipts</source>
         <translation>Läskvitton</translation>
     </message>
@@ -2282,139 +2421,10 @@ Mediastorlek: %2
         <translation>Igår %1</translation>
     </message>
 </context>
-<context>
-    <name>dialogs::RoomSettings</name>
-    <message>
-        <location filename="../../src/dialogs/RoomSettings.cpp" line="+135"/>
-        <source>Settings</source>
-        <translation>Inställningar</translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Info</source>
-        <translation>Info</translation>
-    </message>
-    <message>
-        <location line="+11"/>
-        <source>Internal ID</source>
-        <translation>Internt ID</translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>Room Version</source>
-        <translation>Rumversion</translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Notifications</source>
-        <translation>Notifikationer</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Muted</source>
-        <translation>Tystad</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Mentions only</source>
-        <translation>Endast omnämningar</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>All messages</source>
-        <translation>Alla meddelanden</translation>
-    </message>
-    <message>
-        <location line="+97"/>
-        <source>Room access</source>
-        <translation>Rumåtkomst</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Anyone and guests</source>
-        <translation>Alla och gäster</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Anyone</source>
-        <translation>Alla som känner till rummets länk (inga gäster)</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Invited users</source>
-        <translation>Inbjudna användare</translation>
-    </message>
-    <message>
-        <location line="+50"/>
-        <source>Encryption</source>
-        <translation>Kryptering</translation>
-    </message>
-    <message>
-        <location line="+31"/>
-        <source>End-to-End Encryption</source>
-        <translation>Totalsträckskryptering</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Encryption is currently experimental and things might break unexpectedly. &lt;br&gt;Please take note that it can&apos;t be disabled afterwards.</source>
-        <translation>Kryptering är för närvarande experimentell och saker och ting kan oväntat gå sönder. &lt;br&gt;Vänligen notera att det inte kan stängas av det slagits på.</translation>
-    </message>
-    <message>
-        <location line="-24"/>
-        <source>Respond to key requests</source>
-        <translation>Besvara nyckelförfrågningar</translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Whether or not the client should respond automatically with the session keys
- upon request. Use with caution, this is a temporary measure to test the
- E2E implementation until device verification is completed.</source>
-        <translation>Huruvida klienten ska skicka sessionsnycklar automatiskt vid begäran. Använd med försiktighet, detta är en temporär åtgärd för att testa implementationen av totalsträckskryptering tills enhetsverifikation är färdigställd.</translation>
-    </message>
-    <message numerus="yes">
-        <location line="+80"/>
-        <source>%n member(s)</source>
-        <translation>
-            <numerusform>%n medlem</numerusform>
-            <numerusform>%n medlemmar</numerusform>
-        </translation>
-    </message>
-    <message>
-        <location line="+142"/>
-        <source>Failed to enable encryption: %1</source>
-        <translation>Kunde inte aktivera kryptering: %1</translation>
-    </message>
-    <message>
-        <location line="+147"/>
-        <source>Select an avatar</source>
-        <translation>Välj en avatar</translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>All Files (*)</source>
-        <translation>Alla Filer (*)</translation>
-    </message>
-    <message>
-        <location line="+12"/>
-        <source>The selected file is not an image</source>
-        <translation>Den valda filen är inte en bild</translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Error while reading file: %1</source>
-        <translation>Kunde inte läsa filen: %1</translation>
-    </message>
-    <message>
-        <location line="+35"/>
-        <location line="+20"/>
-        <source>Failed to upload image: %s</source>
-        <translation>Kunde inte ladda upp bilden: %s</translation>
-    </message>
-</context>
 <context>
     <name>message-description sent:</name>
     <message>
-        <location filename="../../src/Utils.h" line="+108"/>
+        <location filename="../../src/Utils.h" line="+112"/>
         <source>You sent an audio clip</source>
         <translation>Du skickade ett ljudklipp</translation>
     </message>
@@ -2527,7 +2537,7 @@ Mediastorlek: %2
 <context>
     <name>popups::UserMentions</name>
     <message>
-        <location filename="../../src/popups/UserMentions.cpp" line="+64"/>
+        <location filename="../../src/popups/UserMentions.cpp" line="+68"/>
         <source>This Room</source>
         <translation>Detta Rum</translation>
     </message>
diff --git a/resources/langs/nheko_zh_CN.ts b/resources/langs/nheko_zh_CN.ts
index b371ce70401c032112468e7c34f1430dfa216177..b3281fdf98aaa6f9f8d187aef907a9dc171f6c5e 100644
--- a/resources/langs/nheko_zh_CN.ts
+++ b/resources/langs/nheko_zh_CN.ts
@@ -4,7 +4,7 @@
 <context>
     <name>ActiveCallBar</name>
     <message>
-        <location filename="../qml/voip/ActiveCallBar.qml" line="+66"/>
+        <location filename="../qml/voip/ActiveCallBar.qml" line="+106"/>
         <source>Calling...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -15,8 +15,13 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+76"/>
-        <source>Toggle camera view</source>
+        <location line="+67"/>
+        <source>You are screen sharing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Hide/Show Picture-in-Picture</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -33,7 +38,7 @@
 <context>
     <name>AwaitingVerificationConfirmation</name>
     <message>
-        <location filename="../qml/device-verification/AwaitingVerificationConfirmation.qml" line="+7"/>
+        <location filename="../qml/device-verification/AwaitingVerificationConfirmation.qml" line="+11"/>
         <source>Awaiting Confirmation</source>
         <translation type="unfinished"></translation>
     </message>
@@ -51,7 +56,7 @@
 <context>
     <name>Cache</name>
     <message>
-        <location filename="../../src/Cache.cpp" line="+2084"/>
+        <location filename="../../src/Cache.cpp" line="+2026"/>
         <source>You joined this room.</source>
         <translation>您已加入此房间</translation>
     </message>
@@ -59,7 +64,7 @@
 <context>
     <name>CallInvite</name>
     <message>
-        <location filename="../qml/voip/CallInvite.qml" line="+66"/>
+        <location filename="../qml/voip/CallInvite.qml" line="+70"/>
         <source>Video Call</source>
         <translation type="unfinished"></translation>
     </message>
@@ -77,7 +82,7 @@
 <context>
     <name>CallInviteBar</name>
     <message>
-        <location filename="../qml/voip/CallInviteBar.qml" line="+60"/>
+        <location filename="../qml/voip/CallInviteBar.qml" line="+64"/>
         <source>Video Call</source>
         <translation type="unfinished"></translation>
     </message>
@@ -92,7 +97,7 @@
         <translation type="unfinished">设备</translation>
     </message>
     <message>
-        <location line="+11"/>
+        <location line="+10"/>
         <source>Accept</source>
         <translation type="unfinished">接受</translation>
     </message>
@@ -117,36 +122,55 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>CallManager</name>
+    <message>
+        <location filename="../../src/CallManager.cpp" line="+521"/>
+        <source>Entire screen</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>ChatPage</name>
     <message>
-        <location filename="../../src/ChatPage.cpp" line="+215"/>
+        <location filename="../../src/ChatPage.cpp" line="+203"/>
         <source>Failed to invite user: %1</source>
         <translation>邀请用户失败: %1</translation>
     </message>
     <message>
         <location line="+4"/>
-        <location line="+797"/>
+        <location line="+806"/>
         <source>Invited user: %1</source>
         <translation>邀请已发送: %1</translation>
     </message>
     <message>
-        <location line="-500"/>
+        <location line="-510"/>
         <source>Migrating the cache to the current version failed. This can have different reasons. Please open an issue and try to use an older version in the mean time. Alternatively you can try deleting the cache manually.</source>
         <translation>无法迁移缓存到目前版本，可能有多种原因引发此类问题。您可以新建一个议题并继续使用之前版本，或者您可以尝试手动删除缓存。</translation>
     </message>
     <message>
-        <location line="+456"/>
+        <location line="+413"/>
+        <source>Confirm join</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Do you really want to join %1?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+44"/>
         <source>Room %1 created.</source>
         <translation>房间“%1”已创建</translation>
     </message>
     <message>
-        <location line="+27"/>
+        <location line="+35"/>
+        <location line="+323"/>
         <source>Confirm invite</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+1"/>
+        <location line="-322"/>
         <source>Do you really want to invite %1 (%2)?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -211,7 +235,12 @@
         <translation>解禁用户: %1</translation>
     </message>
     <message>
-        <location line="-582"/>
+        <location line="+226"/>
+        <source>Do you really want to start a private chat with %1?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="-818"/>
         <source>Cache migration failed!</source>
         <translation>缓存迁移失败！</translation>
     </message>
@@ -236,7 +265,7 @@
         <translation>恢复保存的数据失败。请重新登录。</translation>
     </message>
     <message>
-        <location line="+165"/>
+        <location line="+157"/>
         <source>Failed to setup encryption keys. Server response: %1 %2. Please try again later.</source>
         <translation>设置密钥失败。服务器返回信息: %1 %2。请稍后再试。</translation>
     </message>
@@ -247,7 +276,7 @@
         <translation>请尝试再次登录：%1</translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+47"/>
         <source>Failed to join room: %1</source>
         <translation>无法加入房间: %1</translation>
     </message>
@@ -267,12 +296,12 @@
         <translation>创建聊天室失败：%1</translation>
     </message>
     <message>
-        <location line="+17"/>
+        <location line="+18"/>
         <source>Failed to leave room: %1</source>
         <translation>离开聊天室失败：%1</translation>
     </message>
     <message>
-        <location line="+54"/>
+        <location line="+61"/>
         <source>Failed to kick %1 from %2: %3</source>
         <translation type="unfinished"></translation>
     </message>
@@ -280,7 +309,7 @@
 <context>
     <name>CommunitiesListItem</name>
     <message>
-        <location filename="../../src/CommunitiesListItem.cpp" line="+26"/>
+        <location filename="../../src/CommunitiesListItem.cpp" line="+30"/>
         <source>Hide rooms with this tag or from this community</source>
         <translation type="unfinished"></translation>
     </message>
@@ -348,7 +377,7 @@
 <context>
     <name>DigitVerification</name>
     <message>
-        <location filename="../qml/device-verification/DigitVerification.qml" line="+7"/>
+        <location filename="../qml/device-verification/DigitVerification.qml" line="+11"/>
         <source>Verification Code</source>
         <translation type="unfinished"></translation>
     </message>
@@ -371,7 +400,7 @@
 <context>
     <name>EditModal</name>
     <message>
-        <location filename="../../src/dialogs/RoomSettings.cpp" line="+73"/>
+        <location filename="../../src/ui/RoomSettings.cpp" line="+42"/>
         <source>Apply</source>
         <translation>应用</translation>
     </message>
@@ -394,7 +423,7 @@
 <context>
     <name>EmojiPicker</name>
     <message>
-        <location filename="../qml/emoji/EmojiPicker.qml" line="+113"/>
+        <location filename="../qml/emoji/EmojiPicker.qml" line="+117"/>
         <location line="+181"/>
         <source>Search</source>
         <translation type="unfinished"></translation>
@@ -443,7 +472,7 @@
 <context>
     <name>EmojiVerification</name>
     <message>
-        <location filename="../qml/device-verification/EmojiVerification.qml" line="+7"/>
+        <location filename="../qml/device-verification/EmojiVerification.qml" line="+11"/>
         <source>Verification Code</source>
         <translation type="unfinished"></translation>
     </message>
@@ -466,7 +495,7 @@
 <context>
     <name>EncryptionIndicator</name>
     <message>
-        <location filename="../qml/EncryptionIndicator.qml" line="+19"/>
+        <location filename="../qml/EncryptionIndicator.qml" line="+23"/>
         <source>Encrypted</source>
         <translation>已加密</translation>
     </message>
@@ -479,7 +508,7 @@
 <context>
     <name>EventStore</name>
     <message>
-        <location filename="../../src/timeline/EventStore.cpp" line="+612"/>
+        <location filename="../../src/timeline/EventStore.cpp" line="+613"/>
         <source>-- Encrypted Event (No keys found for decryption) --</source>
         <comment>Placeholder, when the message was not decrypted yet or can&apos;t be decrypted.</comment>
         <translation type="unfinished"></translation>
@@ -524,7 +553,7 @@
 <context>
     <name>Failed</name>
     <message>
-        <location filename="../qml/device-verification/Failed.qml" line="+7"/>
+        <location filename="../qml/device-verification/Failed.qml" line="+11"/>
         <source>Verification failed</source>
         <translation type="unfinished"></translation>
     </message>
@@ -558,7 +587,7 @@
 <context>
     <name>InputBar</name>
     <message>
-        <location filename="../../src/timeline/InputBar.cpp" line="+227"/>
+        <location filename="../../src/timeline/InputBar.cpp" line="+253"/>
         <source>Select a file</source>
         <translation type="unfinished">选择一个文件</translation>
     </message>
@@ -568,7 +597,7 @@
         <translation type="unfinished">所有文件（*）</translation>
     </message>
     <message>
-        <location line="+384"/>
+        <location line="+371"/>
         <source>Failed to upload media. Please try again.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -576,7 +605,7 @@
 <context>
     <name>InviteeItem</name>
     <message>
-        <location filename="../../src/InviteeItem.cpp" line="+18"/>
+        <location filename="../../src/InviteeItem.cpp" line="+22"/>
         <source>Remove</source>
         <translation>移除</translation>
     </message>
@@ -584,7 +613,7 @@
 <context>
     <name>LoginPage</name>
     <message>
-        <location filename="../../src/LoginPage.cpp" line="+92"/>
+        <location filename="../../src/LoginPage.cpp" line="+80"/>
         <source>Matrix ID</source>
         <translation></translation>
     </message>
@@ -639,20 +668,19 @@ Example: https://server.my:8787</source>
     </message>
     <message>
         <location line="+19"/>
-        <location line="+218"/>
         <source>LOGIN</source>
         <translation>登录</translation>
     </message>
     <message>
-        <location line="-151"/>
+        <location line="+84"/>
         <location line="+11"/>
-        <location line="+157"/>
+        <location line="+156"/>
         <location line="+11"/>
         <source>You have entered an invalid Matrix ID  e.g @joe:matrix.org</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-132"/>
+        <location line="-131"/>
         <source>Autodiscovery failed. Received malformed response.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -677,12 +705,12 @@ Example: https://server.my:8787</source>
         <translation>发生了一个未知错误。请确认服务器域名合法。</translation>
     </message>
     <message>
-        <location line="+59"/>
+        <location line="-168"/>
         <source>SSO LOGIN</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+37"/>
+        <location line="+263"/>
         <source>Empty password</source>
         <translation>空密码</translation>
     </message>
@@ -695,7 +723,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>MemberList</name>
     <message>
-        <location filename="../../src/dialogs/MemberList.cpp" line="+90"/>
+        <location filename="../../src/dialogs/MemberList.cpp" line="+94"/>
         <source>Room members</source>
         <translation>聊天室成员</translation>
     </message>
@@ -708,7 +736,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>MessageDelegate</name>
     <message>
-        <location filename="../qml/delegates/MessageDelegate.qml" line="+105"/>
+        <location filename="../qml/delegates/MessageDelegate.qml" line="+109"/>
         <location line="+9"/>
         <source>removed</source>
         <translation type="unfinished"></translation>
@@ -777,7 +805,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>MessageInput</name>
     <message>
-        <location filename="../qml/MessageInput.qml" line="+38"/>
+        <location filename="../qml/MessageInput.qml" line="+42"/>
         <source>Hang up</source>
         <translation type="unfinished"></translation>
     </message>
@@ -787,22 +815,22 @@ Example: https://server.my:8787</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+26"/>
+        <location line="+25"/>
         <source>Send a file</source>
         <translation type="unfinished">发送一个文件</translation>
     </message>
     <message>
-        <location line="+60"/>
+        <location line="+42"/>
         <source>Write a message...</source>
         <translation>写一条消息…</translation>
     </message>
     <message>
-        <location line="+186"/>
+        <location line="+211"/>
         <source>Emoji</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+15"/>
+        <location line="+16"/>
         <source>Send</source>
         <translation type="unfinished"></translation>
     </message>
@@ -810,7 +838,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>NewVerificationRequest</name>
     <message>
-        <location filename="../qml/device-verification/NewVerificationRequest.qml" line="+7"/>
+        <location filename="../qml/device-verification/NewVerificationRequest.qml" line="+11"/>
         <source>Send Verification Request</source>
         <translation type="unfinished"></translation>
     </message>
@@ -868,7 +896,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>PlaceCall</name>
     <message>
-        <location filename="../qml/voip/PlaceCall.qml" line="+36"/>
+        <location filename="../qml/voip/PlaceCall.qml" line="+48"/>
         <source>Place a call to %1?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -888,7 +916,12 @@ Example: https://server.my:8787</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+13"/>
+        <location line="+14"/>
+        <source>Screen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+10"/>
         <source>Cancel</source>
         <translation type="unfinished">取消</translation>
     </message>
@@ -896,7 +929,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>Placeholder</name>
     <message>
-        <location filename="../qml/delegates/Placeholder.qml" line="+4"/>
+        <location filename="../qml/delegates/Placeholder.qml" line="+8"/>
         <source>unimplemented event: </source>
         <translation type="unfinished"></translation>
     </message>
@@ -904,7 +937,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>QCoreApplication</name>
     <message>
-        <location filename="../../src/main.cpp" line="+179"/>
+        <location filename="../../src/main.cpp" line="+167"/>
         <source>Create a unique profile, which allows you to log into several accounts at the same time and start multiple instances of nheko.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -922,7 +955,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>QuickSwitcher</name>
     <message>
-        <location filename="../../src/QuickSwitcher.cpp" line="+74"/>
+        <location filename="../../src/QuickSwitcher.cpp" line="+62"/>
         <source>Search for a room...</source>
         <translation>寻找一个聊天室...</translation>
     </message>
@@ -930,18 +963,18 @@ Example: https://server.my:8787</source>
 <context>
     <name>RegisterPage</name>
     <message>
-        <location filename="../../src/RegisterPage.cpp" line="+89"/>
+        <location filename="../../src/RegisterPage.cpp" line="+77"/>
         <source>Username</source>
         <translation>用户名</translation>
     </message>
     <message>
         <location line="+2"/>
-        <location line="+286"/>
+        <location line="+287"/>
         <source>The username must not be empty, and must contain only the characters a-z, 0-9, ., _, =, -, and /.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-282"/>
+        <location line="-283"/>
         <source>Password</source>
         <translation>密码</translation>
     </message>
@@ -976,7 +1009,7 @@ Example: https://server.my:8787</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+209"/>
+        <location line="+210"/>
         <source>One or more fields have invalid inputs. Please correct those issues and try again.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -999,7 +1032,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>ReplyPopup</name>
     <message>
-        <location filename="../qml/ReplyPopup.qml" line="+45"/>
+        <location filename="../qml/ReplyPopup.qml" line="+49"/>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1012,7 +1045,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>RoomInfo</name>
     <message>
-        <location filename="../../src/Cache.cpp" line="+1861"/>
+        <location filename="../../src/Cache.cpp" line="+1793"/>
         <source>no version stored</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1020,7 +1053,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>RoomInfoListItem</name>
     <message>
-        <location filename="../../src/RoomInfoListItem.cpp" line="+102"/>
+        <location filename="../../src/RoomInfoListItem.cpp" line="+90"/>
         <source>Leave room</source>
         <translation>离开聊天室</translation>
     </message>
@@ -1082,10 +1115,116 @@ Example: https://server.my:8787</source>
         <translation>拒绝</translation>
     </message>
 </context>
+<context>
+    <name>RoomSettings</name>
+    <message>
+        <location filename="../qml/RoomSettings.qml" line="+204"/>
+        <source>End-to-End Encryption</source>
+        <translation type="unfinished">端到端加密</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Encryption is currently experimental and things might break unexpectedly. &lt;br&gt;
+                            Please take note that it can&apos;t be disabled afterwards.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>Whether or not the client should respond automatically with the session keys
+                                upon request. Use with caution, this is a temporary measure to test the
+                                E2E implementation until device verification is completed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../src/ui/RoomSettings.cpp" line="+267"/>
+        <source>Failed to enable encryption: %1</source>
+        <translation type="unfinished">启用加密失败：%1</translation>
+    </message>
+    <message>
+        <location line="+228"/>
+        <source>Select an avatar</source>
+        <translation type="unfinished">选择一个头像</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>All Files (*)</source>
+        <translation type="unfinished">所有文件（*）</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>The selected file is not an image</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Error while reading file: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+34"/>
+        <location line="+20"/>
+        <source>Failed to upload image: %s</source>
+        <translation type="unfinished">上传图像失败：%s</translation>
+    </message>
+</context>
+<context>
+    <name>ScreenShare</name>
+    <message>
+        <location filename="../qml/voip/ScreenShare.qml" line="+30"/>
+        <source>Share desktop with %1?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Window:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Frame rate:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Include your camera picture-in-picture</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>Request remote camera</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location line="+9"/>
+        <source>View your callee&apos;s camera like a regular video call</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Hide mouse cursor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Share</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Preview</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Cancel</source>
+        <translation type="unfinished">取消</translation>
+    </message>
+</context>
 <context>
     <name>SideBarActions</name>
     <message>
-        <location filename="../../src/SideBarActions.cpp" line="+40"/>
+        <location filename="../../src/SideBarActions.cpp" line="+44"/>
         <source>User settings</source>
         <translation>用户设置</translation>
     </message>
@@ -1113,7 +1252,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>StatusIndicator</name>
     <message>
-        <location filename="../qml/StatusIndicator.qml" line="+17"/>
+        <location filename="../qml/StatusIndicator.qml" line="+21"/>
         <source>Failed</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1136,7 +1275,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>Success</name>
     <message>
-        <location filename="../qml/device-verification/Success.qml" line="+6"/>
+        <location filename="../qml/device-verification/Success.qml" line="+10"/>
         <source>Successful Verification</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1154,7 +1293,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>TimelineModel</name>
     <message>
-        <location filename="../../src/timeline/TimelineModel.cpp" line="+895"/>
+        <location filename="../../src/timeline/TimelineModel.cpp" line="+911"/>
         <source>Message redaction failed: %1</source>
         <translation type="unfinished">删除消息失败：%1</translation>
     </message>
@@ -1303,12 +1442,12 @@ Example: https://server.my:8787</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-795"/>
+        <location line="-798"/>
         <source>You joined this room.</source>
         <translation type="unfinished">您已加入此房间</translation>
     </message>
     <message>
-        <location line="+797"/>
+        <location line="+800"/>
         <source>Rejected the knock from %1.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1332,7 +1471,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>TimelineRow</name>
     <message>
-        <location filename="../qml/TimelineRow.qml" line="+99"/>
+        <location filename="../qml/TimelineRow.qml" line="+100"/>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1360,7 +1499,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>TimelineView</name>
     <message>
-        <location filename="../qml/TimelineView.qml" line="+85"/>
+        <location filename="../qml/TimelineView.qml" line="+97"/>
         <source>React</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1410,7 +1549,7 @@ Example: https://server.my:8787</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+51"/>
+        <location line="+61"/>
         <source>No room open</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1418,7 +1557,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>TimelineViewManager</name>
     <message>
-        <location filename="../../src/timeline/TimelineViewManager.cpp" line="+423"/>
+        <location filename="../../src/timeline/TimelineViewManager.cpp" line="+430"/>
         <source>No encrypted private chat found with this user. Create an encrypted private chat with this user and try again.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1426,7 +1565,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>TopBar</name>
     <message>
-        <location filename="../qml/TopBar.qml" line="+43"/>
+        <location filename="../qml/TopBar.qml" line="+47"/>
         <source>Back to room list</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1465,7 +1604,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>TrayIcon</name>
     <message>
-        <location filename="../../src/TrayIcon.cpp" line="+122"/>
+        <location filename="../../src/TrayIcon.cpp" line="+110"/>
         <source>Show</source>
         <translation>显示</translation>
     </message>
@@ -1478,7 +1617,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>UserInfoWidget</name>
     <message>
-        <location filename="../../src/UserInfoWidget.cpp" line="+95"/>
+        <location filename="../../src/UserInfoWidget.cpp" line="+82"/>
         <source>Logout</source>
         <translation>登出</translation>
     </message>
@@ -1526,7 +1665,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>UserProfile</name>
     <message>
-        <location filename="../qml/UserProfile.qml" line="+133"/>
+        <location filename="../qml/UserProfile.qml" line="+137"/>
         <source>Verify</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1546,7 +1685,7 @@ Example: https://server.my:8787</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/ui/UserProfile.cpp" line="+296"/>
+        <location filename="../../src/ui/UserProfile.cpp" line="+301"/>
         <source>Select an avatar</source>
         <translation type="unfinished">选择一个头像</translation>
     </message>
@@ -1569,7 +1708,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>UserSettings</name>
     <message>
-        <location filename="../../src/UserSettingsPage.cpp" line="+345"/>
+        <location filename="../../src/UserSettingsPage.cpp" line="+337"/>
         <location filename="../../src/UserSettingsPage.h" line="+183"/>
         <source>Default</source>
         <translation type="unfinished"></translation>
@@ -1578,7 +1717,7 @@ Example: https://server.my:8787</source>
 <context>
     <name>UserSettingsPage</name>
     <message>
-        <location line="+496"/>
+        <location line="+540"/>
         <source>Minimize to tray</source>
         <translation>最小化至托盘</translation>
     </message>
@@ -1794,7 +1933,7 @@ This usually causes the application icon in the task bar to animate in some fash
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+407"/>
+        <location line="+406"/>
         <source>CACHED</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1804,7 +1943,7 @@ This usually causes the application icon in the task bar to animate in some fash
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-461"/>
+        <location line="-460"/>
         <source>Scale factor</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1979,7 +2118,7 @@ This usually causes the application icon in the task bar to animate in some fash
         <translation type="unfinished">所有文件（*）</translation>
     </message>
     <message>
-        <location line="+237"/>
+        <location line="+236"/>
         <source>Open Sessions File</source>
         <translation>打开会话文件</translation>
     </message>
@@ -2024,7 +2163,7 @@ This usually causes the application icon in the task bar to animate in some fash
 <context>
     <name>Waiting</name>
     <message>
-        <location filename="../qml/device-verification/Waiting.qml" line="+7"/>
+        <location filename="../qml/device-verification/Waiting.qml" line="+11"/>
         <source>Waiting for other party…</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2052,7 +2191,7 @@ This usually causes the application icon in the task bar to animate in some fash
 <context>
     <name>WelcomePage</name>
     <message>
-        <location filename="../../src/WelcomePage.cpp" line="+46"/>
+        <location filename="../../src/WelcomePage.cpp" line="+34"/>
         <source>Welcome to nheko! The desktop client for the Matrix protocol.</source>
         <translation>欢迎使用 nheko! Matrix 协议的桌面客户端。</translation>
     </message>
@@ -2075,7 +2214,7 @@ This usually causes the application icon in the task bar to animate in some fash
 <context>
     <name>descriptiveTime</name>
     <message>
-        <location filename="../../src/Utils.cpp" line="+145"/>
+        <location filename="../../src/Utils.cpp" line="+149"/>
         <source>Yesterday</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2083,7 +2222,7 @@ This usually causes the application icon in the task bar to animate in some fash
 <context>
     <name>dialogs::CreateRoom</name>
     <message>
-        <location filename="../../src/dialogs/CreateRoom.cpp" line="+36"/>
+        <location filename="../../src/dialogs/CreateRoom.cpp" line="+40"/>
         <source>Create room</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2126,7 +2265,7 @@ This usually causes the application icon in the task bar to animate in some fash
 <context>
     <name>dialogs::FallbackAuth</name>
     <message>
-        <location filename="../../src/dialogs/FallbackAuth.cpp" line="+30"/>
+        <location filename="../../src/dialogs/FallbackAuth.cpp" line="+34"/>
         <source>Open Fallback in Browser</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2149,7 +2288,7 @@ This usually causes the application icon in the task bar to animate in some fash
 <context>
     <name>dialogs::InviteUsers</name>
     <message>
-        <location filename="../../src/dialogs/InviteUsers.cpp" line="+42"/>
+        <location filename="../../src/dialogs/InviteUsers.cpp" line="+46"/>
         <source>Cancel</source>
         <translation>取消</translation>
     </message>
@@ -2162,7 +2301,7 @@ This usually causes the application icon in the task bar to animate in some fash
 <context>
     <name>dialogs::JoinRoom</name>
     <message>
-        <location filename="../../src/dialogs/JoinRoom.cpp" line="+30"/>
+        <location filename="../../src/dialogs/JoinRoom.cpp" line="+34"/>
         <source>Join</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2180,7 +2319,7 @@ This usually causes the application icon in the task bar to animate in some fash
 <context>
     <name>dialogs::LeaveRoom</name>
     <message>
-        <location filename="../../src/dialogs/LeaveRoom.cpp" line="+31"/>
+        <location filename="../../src/dialogs/LeaveRoom.cpp" line="+35"/>
         <source>Cancel</source>
         <translation>取消</translation>
     </message>
@@ -2193,7 +2332,7 @@ This usually causes the application icon in the task bar to animate in some fash
 <context>
     <name>dialogs::Logout</name>
     <message>
-        <location filename="../../src/dialogs/Logout.cpp" line="+47"/>
+        <location filename="../../src/dialogs/Logout.cpp" line="+35"/>
         <source>Cancel</source>
         <translation>取消</translation>
     </message>
@@ -2206,7 +2345,7 @@ This usually causes the application icon in the task bar to animate in some fash
 <context>
     <name>dialogs::PreviewUploadOverlay</name>
     <message>
-        <location filename="../../src/dialogs/PreviewUploadOverlay.cpp" line="+41"/>
+        <location filename="../../src/dialogs/PreviewUploadOverlay.cpp" line="+29"/>
         <source>Upload</source>
         <translation>上传</translation>
     </message>
@@ -2228,7 +2367,7 @@ Media size: %2
 <context>
     <name>dialogs::ReCaptcha</name>
     <message>
-        <location filename="../../src/dialogs/ReCaptcha.cpp" line="+31"/>
+        <location filename="../../src/dialogs/ReCaptcha.cpp" line="+35"/>
         <source>Cancel</source>
         <translation>取消</translation>
     </message>
@@ -2246,7 +2385,7 @@ Media size: %2
 <context>
     <name>dialogs::ReadReceipts</name>
     <message>
-        <location filename="../../src/dialogs/ReadReceipts.cpp" line="+120"/>
+        <location filename="../../src/dialogs/ReadReceipts.cpp" line="+124"/>
         <source>Read receipts</source>
         <translation>阅读回执</translation>
     </message>
@@ -2269,140 +2408,10 @@ Media size: %2
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>dialogs::RoomSettings</name>
-    <message>
-        <location filename="../../src/dialogs/RoomSettings.cpp" line="+135"/>
-        <source>Settings</source>
-        <translation>设置</translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Info</source>
-        <translation>信息</translation>
-    </message>
-    <message>
-        <location line="+11"/>
-        <source>Internal ID</source>
-        <translation>内部 ID</translation>
-    </message>
-    <message>
-        <location line="+10"/>
-        <source>Room Version</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+4"/>
-        <source>Notifications</source>
-        <translation>通知</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Muted</source>
-        <translation>静默</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Mentions only</source>
-        <translation>只限提及</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>All messages</source>
-        <translation>所有消息</translation>
-    </message>
-    <message>
-        <location line="+97"/>
-        <source>Room access</source>
-        <translation>聊天室访问</translation>
-    </message>
-    <message>
-        <location line="+2"/>
-        <source>Anyone and guests</source>
-        <translation>所有人和访客</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Anyone</source>
-        <translation>所有人</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Invited users</source>
-        <translation>被邀请的用户</translation>
-    </message>
-    <message>
-        <location line="+50"/>
-        <source>Encryption</source>
-        <translation>加密</translation>
-    </message>
-    <message>
-        <location line="+31"/>
-        <source>End-to-End Encryption</source>
-        <translation>端到端加密</translation>
-    </message>
-    <message>
-        <location line="+1"/>
-        <source>Encryption is currently experimental and things might break unexpectedly. &lt;br&gt;Please take note that it can&apos;t be disabled afterwards.</source>
-        <translation>加密正在实验阶段，可能会意外地坏掉。&lt;br&gt;请注意此后无法禁用。</translation>
-    </message>
-    <message>
-        <location line="-24"/>
-        <source>Respond to key requests</source>
-        <translation>回应密钥请求</translation>
-    </message>
-    <message>
-        <location line="+3"/>
-        <source>Whether or not the client should respond automatically with the session keys
- upon request. Use with caution, this is a temporary measure to test the
- E2E implementation until device verification is completed.</source>
-        <translation>客户端是否应该自动在请求时回应会话密钥。
-请谨慎使用，直到设备验证功能完成前，
-这是一个临时的测试端到端加密的方案。</translation>
-    </message>
-    <message numerus="yes">
-        <location line="+80"/>
-        <source>%n member(s)</source>
-        <translation>
-            <numerusform>%n 成员</numerusform>
-        </translation>
-    </message>
-    <message>
-        <location line="+142"/>
-        <source>Failed to enable encryption: %1</source>
-        <translation>启用加密失败：%1</translation>
-    </message>
-    <message>
-        <location line="+147"/>
-        <source>Select an avatar</source>
-        <translation>选择一个头像</translation>
-    </message>
-    <message>
-        <location line="+0"/>
-        <source>All Files (*)</source>
-        <translation>所有文件（*）</translation>
-    </message>
-    <message>
-        <location line="+12"/>
-        <source>The selected file is not an image</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+5"/>
-        <source>Error while reading file: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+35"/>
-        <location line="+20"/>
-        <source>Failed to upload image: %s</source>
-        <translation>上传图像失败：%s</translation>
-    </message>
-</context>
 <context>
     <name>message-description sent:</name>
     <message>
-        <location filename="../../src/Utils.h" line="+108"/>
+        <location filename="../../src/Utils.h" line="+112"/>
         <source>You sent an audio clip</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2515,7 +2524,7 @@ Media size: %2
 <context>
     <name>popups::UserMentions</name>
     <message>
-        <location filename="../../src/popups/UserMentions.cpp" line="+64"/>
+        <location filename="../../src/popups/UserMentions.cpp" line="+68"/>
         <source>This Room</source>
         <translation type="unfinished"></translation>
     </message>