diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index dc78c1d9ff..7d13cff228 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -4,10 +4,10 @@ Great to have you here! Here are a few ways you can help make this project bette
 
 ## Setting up a development environment
 
-Refer to [React Native environment setup](https://reactnative.dev/docs/environment-setup) to make sure everything is up and running.
-Follow the `React Native CLI Quickstart` section as we don't support Expo managed flow.
+Refer to [React Native environment setup](https://reactnative.dev/docs/set-up-your-environment) to make sure everything is up and running.
 
 *Note: you'll need a MacOS to run iOS apps*
+*Note: We don't support Expo managed flow*
 
 ### How to run
 
@@ -103,8 +103,6 @@ We use [Detox](https://github.com/wix/Detox) framework to end-to-end test our ap
 
 As soon as your changes are ready, you can open a Pull Request.
 
-The title of your PR should be descriptive, including either [NEW], [IMPROVEMENT] or [FIX] at the beginning, e.g. [FIX] App crashing on startup.
+Refer to [Pull request's tags](https://developer.rocket.chat/docs/pull-requests-tags) to write a good PR title.
 
-You may share working results prior to finishing, please include [WIP] in the title. This way anyone can look at your code: you can ask for help within the PR if you don't know how to solve a problem.
-
-Your PR is automatically inspected by various tools, check their response and try to improve your code accordingly. Requests that fail to build or have wrong coding style won't be merged.
+Open your PR as draft before asking for review. Your PR is automatically inspected by various tools, check their response and try to improve your code accordingly. Requests that fail to build or have wrong coding style won't be merged.
\ No newline at end of file
diff --git a/android/app/build.gradle b/android/app/build.gradle
index 31c7158397..1d8925248a 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -93,7 +93,7 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode VERSIONCODE as Integer
-        versionName "4.55.0"
+        versionName "4.57.0"
         vectorDrawables.useSupportLibrary = true
         if (!isFoss) {
             manifestPlaceholders = [BugsnagAPIKey: BugsnagAPIKey as String]
diff --git a/app/containers/ActionSheet/ActionSheetContentWithInputAndSubmit/index.tsx b/app/containers/ActionSheet/ActionSheetContentWithInputAndSubmit/index.tsx
index ae0f2c3bb2..103a61b4ac 100644
--- a/app/containers/ActionSheet/ActionSheetContentWithInputAndSubmit/index.tsx
+++ b/app/containers/ActionSheet/ActionSheetContentWithInputAndSubmit/index.tsx
@@ -12,24 +12,25 @@ import { useActionSheet } from '../Provider';
 
 const styles = StyleSheet.create({
 	subtitleText: {
-		fontSize: 14,
 		...sharedStyles.textRegular,
-		marginBottom: 10
+		fontSize: 16,
+		lineHeight: 24
 	},
 	buttonSeparator: {
-		marginRight: 8
+		marginRight: 12
 	},
 	footerButtonsContainer: {
 		flexDirection: 'row',
 		paddingTop: 16
 	},
 	titleContainerText: {
+		...sharedStyles.textBold,
 		fontSize: 16,
-		...sharedStyles.textSemibold
+		lineHeight: 24
 	},
 	titleContainer: {
 		paddingRight: 80,
-		marginBottom: 16,
+		marginBottom: 12,
 		flexDirection: 'row',
 		alignItems: 'center'
 	}
@@ -53,8 +54,8 @@ const FooterButtons = ({
 					styles.buttonSeparator,
 					{ flex: 1, backgroundColor: cancelBackgroundColor || colors.buttonBackgroundSecondaryDefault }
 				]}
-				color={colors.backdropColor}
 				title={cancelTitle}
+				color={colors.buttonFontSecondary}
 				onPress={cancelAction}
 				testID={`${testID}-cancel`}
 			/>
@@ -120,7 +121,6 @@ const ActionSheetContentWithInputAndSubmit = ({
 				<FormTextInput
 					key={inputConfig.key}
 					value={inputValues[index]}
-					placeholder={inputConfig.placeholder}
 					onChangeText={value => handleInputChange(value, index)}
 					onSubmitEditing={() => {
 						if (index < inputs.length - 1) {
@@ -143,7 +143,6 @@ const ActionSheetContentWithInputAndSubmit = ({
 		return (
 			<FormTextInput
 				value={inputValues[0]}
-				placeholder={placeholder}
 				onChangeText={value => handleInputChange(value, 0)}
 				onSubmitEditing={() => {
 					setTimeout(() => {
@@ -151,9 +150,11 @@ const ActionSheetContentWithInputAndSubmit = ({
 					}, 100);
 					if (inputValues[0]) onSubmit(inputValues[0]);
 				}}
+				accessibilityLabel={placeholder}
 				testID={`${testID}-input`}
 				secureTextEntry={secureTextEntry}
 				bottomSheet={isIOS}
+				containerStyle={{ marginTop: 12, marginBottom: 36 }}
 			/>
 		);
 	};
@@ -164,9 +165,9 @@ const ActionSheetContentWithInputAndSubmit = ({
 	return (
 		<View style={sharedStyles.containerScrollView} testID='action-sheet-content-with-input-and-submit'>
 			<>
-				<View style={styles.titleContainer}>
+				<View accessible accessibilityLabel={title} style={styles.titleContainer}>
 					{iconName ? <CustomIcon name={iconName} size={32} color={iconColor || colors.buttonBackgroundDangerDefault} /> : null}
-					<Text style={[styles.titleContainerText, { color: colors.fontDefault, paddingLeft: iconName ? 16 : 0 }]}>{title}</Text>
+					<Text style={[styles.titleContainerText, { color: colors.fontDefault, paddingLeft: iconName ? 12 : 0 }]}>{title}</Text>
 				</View>
 				{description ? <Text style={[styles.subtitleText, { color: colors.fontTitlesLabels }]}>{description}</Text> : null}
 				{customText}
diff --git a/app/containers/Avatar/AvatarWithEdit.tsx b/app/containers/Avatar/AvatarWithEdit.tsx
index 892f439c1d..a3bcca44c8 100644
--- a/app/containers/Avatar/AvatarWithEdit.tsx
+++ b/app/containers/Avatar/AvatarWithEdit.tsx
@@ -13,7 +13,7 @@ import sharedStyles from '../../views/Styles';
 
 const styles = StyleSheet.create({
 	editAvatarButton: {
-		marginTop: 8,
+		marginTop: 16,
 		paddingVertical: 8,
 		paddingHorizontal: 12,
 		marginBottom: 0,
@@ -67,6 +67,7 @@ const AvatarWithEdit = ({
 			/>
 			{handleEdit && serverVersion && compareServerVersion(serverVersion, 'greaterThanOrEqualTo', '3.6.0') ? (
 				<Button
+					accessibilityLabel={I18n.t('Edit_Room_Photo')}
 					title={I18n.t('Edit')}
 					type='secondary'
 					onPress={handleEdit}
diff --git a/app/containers/Button/index.tsx b/app/containers/Button/index.tsx
index 61be086558..b9e6bf0658 100644
--- a/app/containers/Button/index.tsx
+++ b/app/containers/Button/index.tsx
@@ -38,6 +38,11 @@ const styles = StyleSheet.create({
 		...sharedStyles.textMedium,
 		...sharedStyles.textAlignCenter
 	},
+	smallText: {
+		...sharedStyles.textBold,
+		fontSize: 12,
+		lineHeight: 18
+	},
 	disabled: {
 		opacity: 0.3
 	}
@@ -75,7 +80,11 @@ const Button: React.FC<IButtonProps> = ({
 		style
 	];
 
-	const textStyle = [styles.text, { color: isDisabled ? colors.buttonPrimaryDisabled : resolvedTextColor, fontSize }, styleText];
+	const textStyle = [
+		{ color: isDisabled ? colors.buttonPrimaryDisabled : resolvedTextColor, fontSize },
+		small ? styles.smallText : styles.text,
+		styleText
+	];
 
 	return (
 		<Touchable
diff --git a/app/containers/List/ListInfo.tsx b/app/containers/List/ListInfo.tsx
index 98050d16b6..4fc808da14 100644
--- a/app/containers/List/ListInfo.tsx
+++ b/app/containers/List/ListInfo.tsx
@@ -14,6 +14,7 @@ const styles = StyleSheet.create({
 	},
 	text: {
 		fontSize: 14,
+		lineHeight: 20,
 		...sharedStyles.textRegular
 	}
 });
diff --git a/app/containers/MessageComposer/MessageComposer.tsx b/app/containers/MessageComposer/MessageComposer.tsx
index 9ce3ecf15e..d3a8dd8a2e 100644
--- a/app/containers/MessageComposer/MessageComposer.tsx
+++ b/app/containers/MessageComposer/MessageComposer.tsx
@@ -71,7 +71,8 @@ export const MessageComposer = ({
 		closeEmojiKeyboard,
 		closeSearchEmojiKeyboard,
 		setTrackingViewHeight,
-		setAlsoSendThreadToChannel
+		setAlsoSendThreadToChannel,
+		setAutocompleteParams
 	} = useMessageComposerApi();
 	const recordingAudio = useRecordingAudio();
 	useKeyboardListener(trackingViewRef);
@@ -147,6 +148,9 @@ export const MessageComposer = ({
 			}
 		}
 
+		// Hide autocomplete
+		setAutocompleteParams({ text: '', type: null, params: '' });
+
 		// Text message
 		onSendMessage?.(textFromInput, alsoSendThreadToChannel);
 	};
diff --git a/app/containers/TextInput/FormTextInput.tsx b/app/containers/TextInput/FormTextInput.tsx
index f1c9da893d..f13d6723b5 100644
--- a/app/containers/TextInput/FormTextInput.tsx
+++ b/app/containers/TextInput/FormTextInput.tsx
@@ -1,6 +1,6 @@
-import { BottomSheetTextInput } from '@discord/bottom-sheet';
 import React, { useState } from 'react';
 import { StyleProp, StyleSheet, Text, TextInput as RNTextInput, TextInputProps, TextStyle, View, ViewStyle } from 'react-native';
+import { BottomSheetTextInput } from '@discord/bottom-sheet';
 import Touchable from 'react-native-platform-touchable';
 
 import i18n from '../../i18n';
@@ -9,6 +9,7 @@ import sharedStyles from '../../views/Styles';
 import ActivityIndicator from '../ActivityIndicator';
 import { CustomIcon, TIconsName } from '../CustomIcon';
 import { TextInput } from './TextInput';
+import { isIOS } from '../../lib/methods/helpers';
 
 const styles = StyleSheet.create({
 	error: {
@@ -35,7 +36,7 @@ const styles = StyleSheet.create({
 		paddingHorizontal: 16,
 		paddingVertical: 10,
 		borderWidth: 1,
-		borderRadius: 2
+		borderRadius: 4
 	},
 	inputIconLeft: {
 		paddingLeft: 45
@@ -97,10 +98,13 @@ export const FormTextInput = ({
 	const [showPassword, setShowPassword] = useState(false);
 	const showClearInput = onClearInput && value && value.length > 0;
 	const Input = bottomSheet ? BottomSheetTextInput : TextInput;
+
+	const accessibilityLabelRequired = required ? `, ${i18n.t('Required')}` : '';
+	const accessibilityInputValue = (!secureTextEntry && value && isIOS) || showPassword ? `, ${value}` : '';
 	return (
 		<View
 			accessible
-			accessibilityLabel={`${label} - ${required ? i18n.t('Required') : ''}`}
+			accessibilityLabel={`${label}${accessibilityLabelRequired}${accessibilityInputValue}`}
 			style={[styles.inputContainer, containerStyle]}>
 			{label ? (
 				<Text style={[styles.label, { color: colors.fontTitlesLabels }, error?.error && { color: colors.fontDanger }]}>
@@ -109,7 +113,7 @@ export const FormTextInput = ({
 				</Text>
 			) : null}
 
-			<View style={styles.wrap}>
+			<View accessible style={styles.wrap}>
 				<Input
 					style={[
 						styles.input,
@@ -117,7 +121,7 @@ export const FormTextInput = ({
 						(secureTextEntry || iconRight || showClearInput) && styles.inputIconRight,
 						{
 							backgroundColor: colors.surfaceRoom,
-							borderColor: colors.strokeLight,
+							borderColor: colors.strokeMedium,
 							color: colors.fontTitlesLabels
 						},
 						error?.error && {
@@ -167,7 +171,11 @@ export const FormTextInput = ({
 				) : null}
 
 				{secureTextEntry ? (
-					<Touchable onPress={() => setShowPassword(!showPassword)} style={[styles.iconContainer, styles.iconRight]}>
+					<Touchable
+						style={[styles.iconContainer, styles.iconRight]}
+						accessible
+						accessibilityLabel={showPassword ? i18n.t('Hide_Password') : i18n.t('Show_Password')}
+						onPress={() => setShowPassword(!showPassword)}>
 						<CustomIcon
 							name={showPassword ? 'unread-on-top' : 'unread-on-top-disabled'}
 							testID={testID ? `${testID}-icon-password` : undefined}
diff --git a/app/containers/TwoFactor/index.tsx b/app/containers/TwoFactor/index.tsx
index 376f1fc98a..785df41849 100644
--- a/app/containers/TwoFactor/index.tsx
+++ b/app/containers/TwoFactor/index.tsx
@@ -4,18 +4,20 @@ import isEmpty from 'lodash/isEmpty';
 import { sha256 } from 'js-sha256';
 import Modal from 'react-native-modal';
 import useDeepCompareEffect from 'use-deep-compare-effect';
-import { connect } from 'react-redux';
 
 import { FormTextInput } from '../TextInput';
 import I18n from '../../i18n';
 import EventEmitter from '../../lib/methods/helpers/events';
 import { useTheme } from '../../theme';
-import { themes } from '../../lib/constants';
 import Button from '../Button';
 import sharedStyles from '../../views/Styles';
 import styles from './styles';
-import { IApplicationState } from '../../definitions';
+import { ICredentials } from '../../definitions';
 import { Services } from '../../lib/services';
+import { useAppSelector } from '../../lib/hooks';
+import Toast from '../Toast';
+import { showToast } from '../../lib/methods/helpers/showToast';
+import log from '../../lib/methods/helpers/log';
 
 export const TWO_FACTOR = 'TWO_FACTOR';
 
@@ -32,6 +34,7 @@ interface IMethods {
 }
 
 interface EventListenerMethod {
+	params?: ICredentials;
 	method?: keyof IMethods;
 	submit?: (param: string) => void;
 	cancel?: () => void;
@@ -55,15 +58,31 @@ const methods: IMethods = {
 	}
 };
 
-const TwoFactor = React.memo(({ isMasterDetail }: { isMasterDetail: boolean }) => {
-	const { theme } = useTheme();
+const TwoFactor = React.memo(() => {
+	const { colors } = useTheme();
+	const { isMasterDetail } = useAppSelector(state => ({
+		isMasterDetail: state.app.isMasterDetail as boolean
+	}));
 	const [visible, setVisible] = useState(false);
 	const [data, setData] = useState<EventListenerMethod>({});
 	const [code, setCode] = useState<string>('');
 
 	const method = data.method ? methods[data.method] : null;
 	const isEmail = data.method === 'email';
-	const sendEmail = () => Services.sendEmailCode();
+	const params = data?.params;
+
+	const sendEmail = async () => {
+		try {
+			if (params?.user) {
+				const response = await Services.sendEmailCode(params?.user);
+				if (response.success) {
+					showToast(I18n.t('Two_Factor_Success_message'));
+				}
+			}
+		} catch (e) {
+			log(e);
+		}
+	};
 
 	useDeepCompareEffect(() => {
 		if (!isEmpty(data)) {
@@ -74,7 +93,9 @@ const TwoFactor = React.memo(({ isMasterDetail }: { isMasterDetail: boolean }) =
 		}
 	}, [data]);
 
-	const showTwoFactor = (args: EventListenerMethod) => setData(args);
+	const showTwoFactor = (args: EventListenerMethod) => {
+		setData(args);
+	};
 
 	useEffect(() => {
 		const listener = EventEmitter.addEventListener(TWO_FACTOR, showTwoFactor);
@@ -102,47 +123,58 @@ const TwoFactor = React.memo(({ isMasterDetail }: { isMasterDetail: boolean }) =
 		setData({});
 	};
 
-	const color = themes[theme].fontTitlesLabels;
+	const color = colors.fontTitlesLabels;
 	return (
-		<Modal avoidKeyboard useNativeDriver isVisible={visible} hideModalContentWhileAnimating>
+		<Modal
+			customBackdrop={<View aria-hidden style={[styles.overlay, { backgroundColor: colors.overlayBackground }]} />}
+			avoidKeyboard
+			useNativeDriver
+			isVisible={visible}
+			hideModalContentWhileAnimating>
 			<View style={styles.container} testID='two-factor'>
 				<View
 					style={[
 						styles.content,
 						isMasterDetail && [sharedStyles.modalFormSheet, styles.tablet],
-						{ backgroundColor: themes[theme].surfaceTint }
+						{ backgroundColor: colors.surfaceTint }
 					]}>
 					<Text style={[styles.title, { color }]}>{I18n.t(method?.title || 'Two_Factor_Authentication')}</Text>
 					{method?.text ? <Text style={[styles.subtitle, { color }]}>{I18n.t(method.text)}</Text> : null}
 					<FormTextInput
-						value={code}
-						inputRef={(e: any) => InteractionManager.runAfterInteractions(() => e?.getNativeRef()?.focus())}
 						returnKeyType='send'
 						autoCapitalize='none'
+						testID='two-factor-input'
+						accessibilityLabel={I18n.t(
+							data?.method === 'password' ? 'Label_Input_Two_Factor_Password' : 'Label_Input_Two_Factor_Code'
+						)}
+						value={code}
+						inputRef={(e: any) => InteractionManager.runAfterInteractions(() => e?.getNativeRef()?.focus())}
 						onChangeText={setCode}
 						onSubmitEditing={onSubmit}
 						keyboardType={method?.keyboardType}
 						secureTextEntry={method?.secureTextEntry}
 						error={data.invalid ? { error: 'totp-invalid', reason: I18n.t('Code_or_password_invalid') } : undefined}
-						testID='two-factor-input'
+						containerStyle={styles.containerInput}
 					/>
+
 					{isEmail ? (
-						<Text style={[styles.sendEmail, { color }]} onPress={sendEmail}>
-							{I18n.t('Resend_email')}
-						</Text>
+						<Button
+							small
+							title={I18n.t('Resend_email')}
+							style={[styles.button, { marginTop: 12 }]}
+							type='secondary'
+							onPress={sendEmail}
+						/>
 					) : null}
 					<View style={styles.buttonContainer}>
 						<Button title={I18n.t('Cancel')} type='secondary' style={styles.button} onPress={onCancel} />
 						<Button title={I18n.t('Verify')} type='primary' style={styles.button} onPress={onSubmit} testID='two-factor-send' />
 					</View>
 				</View>
+				<Toast />
 			</View>
 		</Modal>
 	);
 });
 
-const mapStateToProps = (state: IApplicationState) => ({
-	isMasterDetail: state.app.isMasterDetail
-});
-
-export default connect(mapStateToProps)(TwoFactor);
+export default TwoFactor;
diff --git a/app/containers/TwoFactor/styles.ts b/app/containers/TwoFactor/styles.ts
index 1c5c789cb4..c1a401ad7b 100644
--- a/app/containers/TwoFactor/styles.ts
+++ b/app/containers/TwoFactor/styles.ts
@@ -6,7 +6,7 @@ export default StyleSheet.create({
 	container: {
 		flex: 1,
 		justifyContent: 'center',
-		alignItems: 'center'
+		padding: 16
 	},
 	content: {
 		padding: 16,
@@ -15,13 +15,14 @@ export default StyleSheet.create({
 	},
 	title: {
 		fontSize: 16,
-		paddingBottom: 8,
+		lineHeight: 24,
+		marginBottom: 12,
 		...sharedStyles.textBold,
 		...sharedStyles.textAlignCenter
 	},
 	subtitle: {
 		fontSize: 14,
-		paddingBottom: 8,
+		marginBottom: 12,
 		...sharedStyles.textRegular,
 		...sharedStyles.textAlignCenter
 	},
@@ -37,9 +38,18 @@ export default StyleSheet.create({
 	},
 	buttonContainer: {
 		flexDirection: 'row',
-		justifyContent: 'space-between'
+		justifyContent: 'space-between',
+		marginTop: 36
 	},
 	tablet: {
 		height: undefined
+	},
+	overlay: {
+		flex: 1,
+		alignItems: 'center',
+		justifyContent: 'center'
+	},
+	containerInput: {
+		marginBottom: 0
 	}
 });
diff --git a/app/containers/message/Urls.tsx b/app/containers/message/Urls.tsx
index 47b7ad1e5a..06642b6e2b 100644
--- a/app/containers/message/Urls.tsx
+++ b/app/containers/message/Urls.tsx
@@ -4,6 +4,7 @@ import Clipboard from '@react-native-clipboard/clipboard';
 import FastImage from 'react-native-fast-image';
 import { dequal } from 'dequal';
 
+import { useAppSelector } from '../../lib/hooks';
 import Touchable from './Touchable';
 import openLink from '../../lib/methods/helpers/openLink';
 import sharedStyles from '../../views/Styles';
@@ -96,8 +97,8 @@ const UrlImage = ({ image, hasContent }: { image: string; hasContent: boolean })
 			overflow: 'hidden',
 			alignItems: 'center',
 			justifyContent: 'center',
-			...(imageDimensions.width <= 64 && { width: 64 }),
-			...(imageDimensions.height <= 64 && { height: 64 })
+			...imageDimensions.width <= 64 && { width: 64 },
+			...imageDimensions.height <= 64 && { height: 64 }
 		};
 		if (!hasContent) {
 			containerStyle = {
@@ -128,6 +129,7 @@ type TImageLoadedState = 'loading' | 'done' | 'error';
 const Url = ({ url }: { url: IUrl }) => {
 	const { colors, theme } = useTheme();
 	const { baseUrl, user } = useContext(MessageContext);
+	const API_Embed = useAppSelector(state => state.settings.API_Embed);
 	const getImageUrl = () => {
 		const imageUrl = url.image || url.url;
 
@@ -146,7 +148,7 @@ const Url = ({ url }: { url: IUrl }) => {
 
 	const hasContent = !!(url.title || url.description);
 
-	if (!url || url?.ignoreParse) {
+	if (!url || url?.ignoreParse || !API_Embed) {
 		return null;
 	}
 
diff --git a/app/definitions/IRoom.ts b/app/definitions/IRoom.ts
index ddafdad58e..c2858d3450 100644
--- a/app/definitions/IRoom.ts
+++ b/app/definitions/IRoom.ts
@@ -13,6 +13,8 @@ interface IRequestTranscript {
 	subject: string;
 }
 
+export type TUserWaitingForE2EKeys = { userId: string; ts: Date };
+
 export interface IRoom {
 	fname?: string;
 	_id: string;
@@ -34,6 +36,7 @@ export interface IRoom {
 	livechatData?: any;
 	tags?: string[];
 	e2eKeyId?: string;
+	usersWaitingForE2EKeys?: TUserWaitingForE2EKeys[];
 	avatarETag?: string;
 	latest?: string;
 	default?: boolean;
@@ -217,6 +220,7 @@ export interface IServerRoom extends IRocketChatRecord {
 	reactWhenReadOnly?: boolean;
 	joinCodeRequired?: boolean;
 	e2eKeyId?: string;
+	usersWaitingForE2EKeys?: TUserWaitingForE2EKeys[];
 	v?: {
 		_id?: string;
 		token?: string;
diff --git a/app/definitions/ISubscription.ts b/app/definitions/ISubscription.ts
index 90b99a1f07..f7cb3d7408 100644
--- a/app/definitions/ISubscription.ts
+++ b/app/definitions/ISubscription.ts
@@ -3,7 +3,7 @@ import Relation from '@nozbe/watermelondb/Relation';
 
 import { ILastMessage, TMessageModel } from './IMessage';
 import { IRocketChatRecord } from './IRocketChatRecord';
-import { IOmnichannelSource, RoomID, RoomType } from './IRoom';
+import { IOmnichannelSource, RoomID, RoomType, TUserWaitingForE2EKeys } from './IRoom';
 import { IServedBy } from './IServedBy';
 import { TThreadModel } from './IThread';
 import { TThreadMessageModel } from './IThreadMessage';
@@ -35,6 +35,8 @@ export enum ERoomTypes {
 
 type RelationModified<T extends Model> = { fetch(): Promise<T[]> } & Relation<T>;
 
+type OldKey = { e2eKeyId: string; ts: Date; E2EKey: string };
+
 export interface ISubscription {
 	_id: string;
 	id: string;
@@ -93,9 +95,11 @@ export interface ISubscription {
 	livechatData?: any;
 	tags?: string[];
 	E2EKey?: string;
+	oldRoomKeys?: OldKey[];
 	E2ESuggestedKey?: string | null;
 	encrypted?: boolean;
 	e2eKeyId?: string;
+	usersWaitingForE2EKeys?: TUserWaitingForE2EKeys[];
 	avatarETag?: string;
 	teamId?: string;
 	teamMain?: boolean;
@@ -153,7 +157,9 @@ export interface IServerSubscription extends IRocketChatRecord {
 	onHold?: boolean;
 	encrypted?: boolean;
 	E2EKey?: string;
+	oldRoomKeys?: OldKey[];
 	E2ESuggestedKey?: string | null;
+	usersWaitingForE2EKeys?: TUserWaitingForE2EKeys[];
 	unreadAlert?: 'default' | 'all' | 'mentions' | 'nothing';
 
 	fname?: unknown;
diff --git a/app/definitions/rest/v1/e2e.ts b/app/definitions/rest/v1/e2e.ts
index bf4db5b117..202c295826 100644
--- a/app/definitions/rest/v1/e2e.ts
+++ b/app/definitions/rest/v1/e2e.ts
@@ -18,10 +18,21 @@ export type E2eEndpoints = {
 	'e2e.rejectSuggestedGroupKey': {
 		POST: (params: { rid: string }) => {};
 	};
+	'e2e.fetchUsersWaitingForGroupKey': {
+		GET: (params: { roomIds: string[] }) => {
+			usersWaitingForE2EKeys: any;
+		};
+	};
+	'e2e.provideUsersSuggestedGroupKeys': {
+		POST: (params: { usersSuggestedGroupKeys: any }) => void;
+	};
 	'e2e.setRoomKeyID': {
 		POST: (params: { rid: string; keyID: string }) => {};
 	};
 	'e2e.fetchMyKeys': {
 		GET: () => { public_key: string; private_key: string };
 	};
+	'e2e.resetRoomKey': {
+		POST: (params: { rid: string; e2eKey: string; e2eKeyId: string }) => void;
+	};
 };
diff --git a/app/i18n/locales/ar.json b/app/i18n/locales/ar.json
index 52a042aec9..c052fed764 100644
--- a/app/i18n/locales/ar.json
+++ b/app/i18n/locales/ar.json
@@ -50,7 +50,9 @@
   "Change_Language": "تغيير اللغة",
   "Change_language_loading": "تغيير اللغة",
   "changing_avatar": "تغيير الصورة الرمزية",
+  "Channel_hint_private": "لا يمكن للناس الانضمام إلا من خلال دعوتهم",
   "Channel_Name": "اسم القناة",
+  "Channel_Read_Only_Hint": "يمكن لمالكي القنوات فقط إرسال رسائل جديدة",
   "Channels": "قنوات",
   "Chat_closed_by_agent": "المندوب أغلق المحادثة",
   "Chats": "الرسائل",
@@ -123,6 +125,7 @@
   "E2E_How_It_Works_info4": "بإمكانك أيضاً إنشاء كلمة مرور جديدة لمفتاح التشفير في أي وقت عند دخولك بكلمة المرور الحالية لمفتاح التشفير",
   "Edit": "تعديل",
   "Edit_Invite": "تعديل الدعوة",
+  "Edit_Room_Photo": "تحرير صورة غرفة",
   "Edit_Status": "تعديل الحالة",
   "Email": "البريد الإلكتروني",
   "Email_Notification_Mode_All": "لكل إشارة أو رسالة مباشرة",
@@ -160,7 +163,7 @@
   "Files": "ملفات",
   "Finish_recording": "إنهاء التسجيل",
   "Following_thread": "متابعة الموضوع",
-  "For_your_security_you_must_enter_your_current_password_to_continue": "من أجل حمايتك، يجب عليك إدخال كلمة المرور الحالية للمتابعة",
+  "For_your_security_you_must_enter_your_current_password_to_continue": "لأمانك، يجب عليك إدخال كلمة مرور حسابك للمتابعة.",
   "Forgot_password": "هل نسيت كلمة المرور؟",
   "Forgot_password_If_this_email_is_registered": "إن كان البريد الإلكتروني مسجلاً، فسنرسل تعليمات إعادة تعيين كلمة المرور الخاصة بك. إذا لم تتلق بريداً إلكترونياً قريباً، فيرجى العودة والمحاولة مرة أخرى",
   "Forward": "إعادة توجيه",
@@ -173,6 +176,7 @@
   "Get_help": "احصل على المساعدة",
   "Glossary_of_simplified_terms": "مسرد المصطلحات المبسطة",
   "Help": "مساعدة",
+  "Hide_Password": "إخفاء كلمة المرور",
   "Hide_room": "إخفاء",
   "Hide_System_Messages": "إخفاء رسائل النظام",
   "Hide_type_messages": "إخفاء رسائل \"{{type}}\"",
@@ -197,6 +201,8 @@
   "Join_the_given_channel": "انضمام إلى القناة المحددة",
   "Just_invited_people_can_access_this_channel": "يمكن للأشخاص المدعوين فقط الوصول إلى هذه القناة",
   "Just_invited_people_can_access_this_team": "فقط الأشخاص المدعوين يمكنهم الوصول إلى هذا الفريق",
+  "Label_Input_Two_Factor_Code": "كود",
+  "Label_Input_Two_Factor_Password": "كلمة المرور",
   "Language": "اللغة",
   "last_message": "الرسالة الأخيرة",
   "Leave": "مغادرة الغرفة",
@@ -335,6 +341,7 @@
   "Read_External_Permission": "صلاحية قراءة الوسائط",
   "Read_External_Permission_Message": "يحتاج Rocket.chat للوصول إلى الصور والملفات الموجودة على الجهاز",
   "Read_Only": "قراءة فقط",
+  "Read_only_hint": "يمكن لمالكي القنوات فقط إرسال رسائل جديدة",
   "Read_Receipt": "قراءة المستلم",
   "Receive_Group_Mentions": "تلقي إشارات المجموعة",
   "Receive_Group_Mentions_Info": "تلقي @all و @here للإشعارات",
@@ -366,6 +373,7 @@
   "Roles": "أدوار",
   "Room_Info": "معلومات الغرفة",
   "Room_Info_Edit": "تعديل معلومات الغرفة",
+  "Room_Password": "كلمة مرور الغرفة",
   "SAVE": "حفظ",
   "Save": "حفظ",
   "Save_Changes": "حفظ التغيرات",
@@ -407,6 +415,7 @@
   "Share_Link": "مشاركة رابط",
   "Share_this_app": "مشاركة هذا البرنامج",
   "Show_more": "إظهار أكثر",
+  "Show_Password": "عرض كلمة المرور",
   "Show_the_keyboard_shortcut_list": "عرض قائمة اختصارات لوحة المفاتيح",
   "Sign_Up": "تسجيل جديد",
   "Slash_Gimme_Description": "يعرض ༼ つ ◕_◕ ༽つ قبل رسالتك",
@@ -447,6 +456,7 @@
   "Translate": "ترجمة",
   "Try_again": "حاول مجدداً",
   "Two_Factor_Authentication": "المصادقة الثنائية",
+  "Two_Factor_Success_message": "تم إرسال رمز التحقق الثنائي العوامل! يرجى التحقق من بريدك الإلكتروني.",
   "Type_message": "اكتب رسالة",
   "UNARCHIVE": "إلغاء الأرشفة",
   "unarchive": "إلغاء الأرشفة",
diff --git a/app/i18n/locales/bn-IN.json b/app/i18n/locales/bn-IN.json
index 4e52b56584..f9742a4ece 100644
--- a/app/i18n/locales/bn-IN.json
+++ b/app/i18n/locales/bn-IN.json
@@ -94,9 +94,10 @@
   "Channel_hint_encrypted": "শেষ হতে শেষ এনক্রিপ্টেড চ্যানেল। এনক্রিপ্টেড চ্যানেলে অনুসন্ধান কাজ করবে না এবং বিজ্ঞপ্তিগুলি বার্তা সামগ্রী প্রদর্শন করতে পারে না।",
   "Channel_hint_encrypted_not_available": "পাবলিক চ্যানেলের জন্য উপলব্ধ নয়",
   "Channel_hint_not_read_only": "চ্যানেলের সমস্ত ব্যবহারকারী নতুন বার্তা লেখতে পারবে",
-  "Channel_hint_private": "শোধার্থী ব্যবহারকারী এই চ্যানেলে অ্যাক্সেস পাওয়া যাবে",
+  "Channel_hint_private": "মানুষ কেবল আমন্ত্রণের মাধ্যমে যোগ দিতে পারে",
   "Channel_hint_public": "সবাই এই চ্যানেলে অ্যাক্সেস পাবে",
   "Channel_Name": "চ্যানেল নাম",
+  "Channel_Read_Only_Hint": "শুধুমাত্র চ্যানেলের মালিকরা নতুন বার্তা পাঠাতে পারেন",
   "Channels": "চ্যানেলগুলি",
   "Chat_closed_by_agent": "এজেন্ট দ্বারা চ্যাট বন্ধ করা হয়েছে",
   "Chat_is_on_hold": "এই চ্যাটটি অসক্রিয়তার কারণে হোল্ডে আছে",
@@ -222,6 +223,7 @@
   "E2E_How_It_Works_info4": "আপনি যে কোনও ব্রাউজার থেকে একটি নতুন পাসওয়ার্ড সেটআপ করতে পারেন আপনার এনক্রিপশন কীর জন্য সময়ের মধ্যে যে কোনও ব্রাউজারে যাতে আপনি বর্তমানের E2E পাসওয়ার্ড দিয়ে এনটার করেছেন।",
   "Edit": "সম্পাদনা করুন",
   "Edit_Invite": "ইনভাইট সম্পাদনা করুন",
+  "Edit_Room_Photo": "ঘরের ছবি সম্পাদনা করুন",
   "Edit_Status": "স্থিতি সম্পাদনা করুন",
   "Email": "ইমেইল",
   "Email_Notification_Mode_All": "প্রতি উল্লেখ / ডিএম",
@@ -270,7 +272,7 @@
   "Finish_recording": "রেকর্ডিং শেষ করুন",
   "Following": "অনুসরণ",
   "Following_thread": "থ্রেড অনুসরণ করছেন",
-  "For_your_security_you_must_enter_your_current_password_to_continue": "আপনার নিরাপত্তার জন্য, আপনার বর্তমান পাসওয়ার্ড দিতে হবে যাতে আপনি চালিয়ে যান",
+  "For_your_security_you_must_enter_your_current_password_to_continue": "আপনার নিরাপত্তার জন্য, চালিয়ে যেতে হলে আপনাকে আপনার অ্যাকাউন্টের পাসওয়ার্ড প্রবেশ করতে হবে।",
   "Forgot_password": "আপনার পাসওয়ার্ড ভুলে গিয়েছেন?",
   "Forgot_password_If_this_email_is_registered": "যদি এই ইমেইলটি নিবন্ধিত হয়ে থাকে, আমরা আপনাকে কীভাবে আপনার পাসওয়ার্ড রিসেট করতে হয় তা সম্পর্কে নির্দেশনা প্রেরণ করব। যদি আপনি শীঘ্রই একটি ইমেইল পাননি, তবে অনুগ্রহ করে ফিরে আসুন এবং আবার চেষ্টা করুন।",
   "Forward": "ফরোয়ার্ড",
@@ -287,6 +289,7 @@
   "Group_by": "দ্বারা গ্রুপ করুন",
   "Has_left_the_team": "দল ছেড়ে দিয়েছে",
   "Help": "সাহায্য",
+  "Hide_Password": "পাসওয়ার্ড লুকান",
   "Hide_System_Messages": "সিস্টেম বার্তা লুকান",
   "Hide_type_messages": "\"{{type}}\" বার্তা লুকান",
   "How_It_Works": "এটি কীভাবে কাজ করে",
@@ -316,6 +319,8 @@
   "Joined": "যোগদান করেছে",
   "Just_invited_people_can_access_this_channel": "এই চ্যানেলে শুধুমাত্র আমন্ত্রিত ব্যক্তিদের অ্যাক্সেস করতে পারবে",
   "Just_invited_people_can_access_this_team": "এই দলে শুধুমাত্র আমন্ত্রিত ব্যক্তিদের অ্যাক্সেস করতে পারবে",
+  "Label_Input_Two_Factor_Code": "কোড",
+  "Label_Input_Two_Factor_Password": "পাসওয়ার্ড",
   "Language": "ভাষা",
   "last_message": "শেষ বার্তা",
   "Last_owner_team_room": "আপনি এই চ্যানেলের শেষ মালিক। একবার দল থেকে বের হওয়ার পরে, চ্যানেলটি দলের মধ্যে থাকবে কিন্তু আপনি তাকে বাইরে থেকে পরিচালনা করবেন।",
@@ -511,7 +516,7 @@
   "Read_External_Permission": "মিডিয়া অনুমতি পড়া",
   "Read_External_Permission_Message": "Rocket.Chat আপনার ডিভাইসে ফটো, মিডিয়া এবং ফাইল অ্যাক্সেস করতে পারে",
   "Read_Only": "শুধুমাত্র পড়া",
-  "Read_only_hint": "শুধুমাত্র অনুমোদিত ব্যবহারকারীরা নতুন বার্তা লেখতে পারবে",
+  "Read_only_hint": "কেবল চ্যানেল মালিকরা নতুন বার্তা প্রেরণ করতে পারেন",
   "Read_Receipt": "পড়া স্বীকৃতি",
   "Receive_Group_Mentions": "গ্রুপ উল্লেখ প্রাপ্ত করুন",
   "Receive_Group_Mentions_Info": "@all এবং @here উল্লেখ প্রাপ্ত করুন",
@@ -563,6 +568,7 @@
   "Room_Info_Edit": "রুম তথ্য সম্পাদনা",
   "Room_name_changed_to": "রুম নাম পরিবর্তন করেছে: {{name}}",
   "Room_not_found": "রুম পাওয়া যায়নি",
+  "Room_Password": "ঘরের পাসওয়ার্ড",
   "room_removed_read_only_permission": "রিড ওনলি অনুমতি সরানো হয়েছে",
   "room_set_read_only_permission": "রুমটি শুধুমাত্র পড়া হিসেবে সেট করা হয়েছে",
   "room_unarchived": "আনআর্কাইভ করা রুম",
@@ -623,6 +629,7 @@
   "Show_badge_for_mentions": "উল্লেখের জন্য ব্যাজ দেখান",
   "Show_badge_for_mentions_Info": "মুখ্য উল্লেখের জন্য শুধুমাত্র ব্যাজ প্রদর্শন করুন",
   "Show_more": "আরও দেখুন..",
+  "Show_Password": "পাসওয়ার্ড দেখান",
   "Sign_Up": "নিবন্ধন করুন",
   "Skip": "অবগাহন",
   "Sort_by": "দ্বারা সাজানো",
@@ -675,6 +682,7 @@
   "Translate": "অনুবাদ করুন",
   "Try_again": "আবার চেষ্টা করুন",
   "Two_Factor_Authentication": "দুটি ধারণামূলক প্রমাণীকরণ",
+  "Two_Factor_Success_message": "দুই-স্তরের প্রমাণীকরণ কোড পাঠানো হয়েছে! অনুগ্রহ করে আপনার ইমেইল চেক করুন।",
   "Type_message": "বার্তা লিখুন",
   "Types": "ধরণ",
   "UNARCHIVE": "আনআরকাইভ",
diff --git a/app/i18n/locales/cs.json b/app/i18n/locales/cs.json
index b93c4c3ac7..9d88d1b3fe 100644
--- a/app/i18n/locales/cs.json
+++ b/app/i18n/locales/cs.json
@@ -48,7 +48,7 @@
   "announcement": "oznámení",
   "App_users_are_not_allowed_to_log_in_directly": "Uživatelé aplikace se nemohou přihlásit přímo.",
   "Apply_Certificate": "Použít certifikát",
-  "ARCHIVE": "ARCHIV",
+  "ARCHIVE": "Archiv",
   "archive": "archiv",
   "are_typing": "píšou",
   "Are_you_sure_question_mark": "Jsi si jistá?",
@@ -100,9 +100,10 @@
   "Channel_hint_encrypted": "End to end šifrovaný kanál. Vyhledávání nebude fungovat se šifrovanými kanály a oznámení nemusí zobrazovat obsah zpráv.",
   "Channel_hint_encrypted_not_available": "Není k dispozici pro veřejné kanály",
   "Channel_hint_not_read_only": "Všichni uživatelé v kanálu mohou psát nové zprávy",
-  "Channel_hint_private": "K tomuto kanálu mají přístup pouze pozvaní uživatelé",
+  "Channel_hint_private": "Lidé se mohou připojit pouze tím, že byli pozváni",
   "Channel_hint_public": "K tomuto kanálu má přístup každý",
   "Channel_Name": "Název kanálu",
+  "Channel_Read_Only_Hint": "Pouze majitelé kanálů mohou odesílat nové zprávy",
   "Channels": "Kanály",
   "Chat_closed_by_agent": "Chat uzavřen agentem",
   "Chat_is_on_hold": "Tento chat je pozastaven z důvodu nečinnosti",
@@ -240,6 +241,7 @@
   "E2E_How_It_Works_info4": "Nové heslo pro svůj šifrovací klíč můžete také nastavit kdykoli z libovolného prohlížeče, kde jste zadali stávající heslo E2E.",
   "Edit": "Upravit",
   "Edit_Invite": "Upravit pozvánku",
+  "Edit_Room_Photo": "Upravit fotografii místnosti",
   "Edit_Status": "Upravit stav",
   "Email": "E-mailem",
   "Email_Notification_Mode_All": "Každá zmínka/DM",
@@ -289,7 +291,7 @@
   "Finish_recording": "Dokončit nahrávání",
   "Following": "Následující",
   "Following_thread": "Následující vlákno",
-  "For_your_security_you_must_enter_your_current_password_to_continue": "Pro vaši bezpečnost musíte pro pokračování zadat své aktuální heslo",
+  "For_your_security_you_must_enter_your_current_password_to_continue": "Pro vaši bezpečnost musíte zadat heslo k účtu, abyste mohli pokračovat.",
   "Forgot_password": "Zapomněli jste heslo?",
   "Forgot_password_If_this_email_is_registered": "Pokud je tento e-mail zaregistrován, zašleme Vám pokyny, jak obnovit heslo. Pokud e-mail v nejbližší době neobdržíte, vraťte se a zkuste to znovu.",
   "Forward": "Vpřed",
@@ -307,6 +309,7 @@
   "Group_by": "Skupina vytvořená",
   "Has_left_the_team": "opustil tým",
   "Help": "Pomoc",
+  "Hide_Password": "Skrýt heslo",
   "Hide_room": "Skrýt",
   "Hide_System_Messages": "Skrýt systémové zprávy",
   "Hide_type_messages": "Skrýt \"{{type}}\" zprávy",
@@ -346,6 +349,8 @@
   "Jump_to_message": "Přejít na zprávu",
   "Just_invited_people_can_access_this_channel": "K tomuto kanálu mají přístup pouze pozvaní lidé",
   "Just_invited_people_can_access_this_team": "K tomuto týmu mají přístup pouze pozvaní lidé",
+  "Label_Input_Two_Factor_Code": "Kód",
+  "Label_Input_Two_Factor_Password": "Heslo",
   "Language": "Jazyk",
   "last_message": "poslední zpráva",
   "Last_owner_team_room": "Jste posledním vlastníkem tohoto kanálu. Jakmile tým opustíte, kanál zůstane uvnitř týmu, ale budete ho spravovat zvenčí.",
@@ -555,7 +560,7 @@
   "Read_External_Permission": "Povolení ke čtení médií",
   "Read_External_Permission_Message": "Rocket.Chat potřebuje přístup k fotografiím, médiím a souborům ve vašem zařízení",
   "Read_Only": "Pouze ke čtení",
-  "Read_only_hint": "Pouze oprávnění uživatelé mohou psát nové zprávy",
+  "Read_only_hint": "Pouze majitelé kanálů mohou odesílat nové zprávy",
   "Read_Receipt": "Potvrzení o přečtení",
   "Receive_Group_Mentions": "Přijímat zmínky o skupině",
   "Receive_Group_Mentions_Info": "Přijímat @všechny a @zde zmínky",
@@ -589,7 +594,7 @@
   "Required": "Požadováno",
   "Resend": "Přeposlat",
   "Resend_email": "Přeposlat email",
-  "RESET": "RESETOVAT",
+  "RESET": "Resetovat",
   "Reset_password": "Obnovit heslo",
   "resetting_password": "resetování hesla",
   "Resume": "Životopis",
@@ -613,6 +618,7 @@
   "Room_Info_Edit": "Úprava informací o místnosti",
   "Room_name_changed_to": "změnil název místnosti na: {{name}}",
   "Room_not_found": "Pokoj nenalezen",
+  "Room_Password": "Heslo místnosti",
   "room_removed_read_only_permission": "odstraněno oprávnění pouze pro čtení",
   "room_set_read_only_permission": "nastavit místnost pouze pro čtení",
   "room_unarchived": "nearchivovaná místnost",
@@ -674,6 +680,7 @@
   "Show_badge_for_mentions_Info": "Zobrazit odznak pouze pro přímé zmínky",
   "Show_less": "Ukaž méně",
   "Show_more": "Zobrazit více",
+  "Show_Password": "Zobrazit heslo",
   "Show_the_keyboard_shortcut_list": "Zobrazit seznam klávesových zkratek",
   "Sign_Up": "Přihlásit se",
   "Skip": "Přeskočit",
@@ -742,9 +749,10 @@
   "Troubleshooting": "Odstraňování problémů",
   "Try_again": "Zkusit to znovu",
   "Two_Factor_Authentication": "Dvoufaktorové ověřování",
+  "Two_Factor_Success_message": "Byl odeslán dvoufaktorový autentizační kód! Zkontrolujte svůj e-mail.",
   "Type_message": "Zadejte zprávu",
   "Types": "Typy",
-  "UNARCHIVE": "UNARCHIVOVAT",
+  "UNARCHIVE": "Unarchivovat",
   "unarchive": "zrušit archivaci",
   "unauthorized": "Neoprávněný",
   "Unblock": "Odblokovat",
diff --git a/app/i18n/locales/de.json b/app/i18n/locales/de.json
index b044ed5693..04251b8568 100644
--- a/app/i18n/locales/de.json
+++ b/app/i18n/locales/de.json
@@ -45,7 +45,7 @@
   "Announcement": "Ankündigung",
   "announcement": "Ankündigung",
   "Apply_Certificate": "Zertifikat anwenden",
-  "ARCHIVE": "ARCHIV",
+  "ARCHIVE": "Archiv",
   "archive": "Archiv",
   "are_typing": "tippen",
   "Are_you_sure_question_mark": "Sind Sie sicher?",
@@ -89,9 +89,10 @@
   "Channel_hint_encrypted": "Ende-zu-Ende verschlüsselter Kanal. Die Suche funktioniert nicht mit verschlüsselten Channels. In Benachrichtigungen wird der Inhalt der Nachricht möglicherweise nicht angezeigt.",
   "Channel_hint_encrypted_not_available": "Nicht verfügbar in öffentlichen Kanälen",
   "Channel_hint_not_read_only": "Alle Nutzer im Kanal können neue Nachrichten schreiben",
-  "Channel_hint_private": "Nur eingeladene Nutzer können auf diesen Kanal zugreifen",
+  "Channel_hint_private": "Menschen können nur dann durch eingeladen werden",
   "Channel_hint_public": "Jeder kann auf diesen Kanal zugreifen",
   "Channel_Name": "Channel-Name",
+  "Channel_Read_Only_Hint": "Nur Kanalbesitzer können neue Nachrichten senden",
   "Channels": "Channels",
   "Chat_closed_by_agent": "Chat durch den Agenten geschlossen",
   "Chat_is_on_hold": "Dieser Chat ist aufgrund von Inaktivität in der Warteschleife",
@@ -217,6 +218,7 @@
   "E2E_How_It_Works_info4": "Sie können außerdem jederzeit, in jedem Browser, in dem Sie das bestehende Passwort eingegeben haben, ein neues Passwort setzen.",
   "Edit": "Bearbeiten",
   "Edit_Invite": "Einladung bearbeiten",
+  "Edit_Room_Photo": "Zimmerfoto bearbeiten",
   "Edit_Status": "Status ändern",
   "Email": "E-mail",
   "Email_Notification_Mode_All": "Jede Erwähnung/Direktnachricht",
@@ -264,7 +266,7 @@
   "Finish_recording": "Aufnahme neenden",
   "Following": "verfolgte",
   "Following_thread": "Thread folgen",
-  "For_your_security_you_must_enter_your_current_password_to_continue": "Zu Ihrer Sicherheit müssen Sie Ihr aktuelles Passwort eingeben, um fortzufahren",
+  "For_your_security_you_must_enter_your_current_password_to_continue": "Zu Ihrer Sicherheit müssen Sie Ihr Kontopasswort eingeben, um fortzufahren.",
   "Forgot_password": "Passwort vergessen",
   "Forgot_password_If_this_email_is_registered": "Wenn es sich um eine registrierte E-Mail-Adresse handelt, werden wir an diese eine Anleitung zum Zurücksetzen des Passworts senden. Sollten Sie in Kürzen keine E-Mail erhalten, kommen Sie wieder und versuchen Sie es noch einmal.",
   "Forward": "Weiterleiten",
@@ -280,6 +282,7 @@
   "Group_by": "Gruppieren nach",
   "Has_left_the_team": "Hat das Team verlassen",
   "Help": "Hilfe",
+  "Hide_Password": "Passwort verbergen",
   "Hide_room": "Raum verstecken",
   "Hide_System_Messages": "Systemnachrichten ausblenden",
   "Hide_type_messages": "\"{{type}}\"-Nachrichten ausblenden",
@@ -309,6 +312,8 @@
   "Joined": "Beigetreten",
   "Just_invited_people_can_access_this_channel": "Nur eingeladene Personen können auf diesen Kanal zugreifen",
   "Just_invited_people_can_access_this_team": "Nur eingeladene Personen können auf das Team zugreifen",
+  "Label_Input_Two_Factor_Code": "Code",
+  "Label_Input_Two_Factor_Password": "Passwort",
   "Language": "Sprache",
   "last_message": "letzte Nachricht",
   "Last_owner_team_room": "Sie sind der letzte Eigner dieses Channels. Wenn Sie das Team verlassen haben, bleibt der Channel im Team, aber Sie werden ihn von außen verwalten.",
@@ -498,7 +503,7 @@
   "Read_External_Permission": "Lese-Zugriff auf Medien",
   "Read_External_Permission_Message": "Rocket.Chat benötigt Zugriff auf Ihre Fotos, Medien und Dateien auf Ihrem Gerät",
   "Read_Only": "Schreibgeschützt",
-  "Read_only_hint": "Nur autorisierte Benutzer können neue Nachrichten schreiben",
+  "Read_only_hint": "Nur Kanalbesitzer können neue Nachrichten senden",
   "Read_Receipt": "Lesebestätigung",
   "Receive_Group_Mentions": "Gruppen-Benachrichtigungen erhalten",
   "Receive_Group_Mentions_Info": "@all- und @here-Erwähnungen empfangen",
@@ -527,7 +532,7 @@
   "Report": "Melden",
   "Required": "Erforderlich",
   "Resend": "Erneut senden",
-  "RESET": "ZURÜCKSETZEN",
+  "RESET": "Zurücksetzen",
   "Reset_password": "Passwort zurücksetzen",
   "resetting_password": "Passwort zurücksetzen",
   "Resume": "Fortsetzen",
@@ -550,6 +555,7 @@
   "Room_Info": "Room-Info",
   "Room_Info_Edit": "Room-Info bearbeiten",
   "Room_name_changed_to": "hat den Namen des Raumes geändert zu: {{name}}",
+  "Room_Password": "Raumkennwort",
   "room_removed_read_only_permission": "hat die Nur-Lese-Berechtigung entfernt",
   "room_set_read_only_permission": "hat den Raum auf \"Nur Lesen\" gesetzt",
   "room_unarchived": "hat den Raum nicht mehr archiviert",
@@ -609,6 +615,7 @@
   "Show_badge_for_mentions": "Zeige Abzeichen für Erwähnungen",
   "Show_badge_for_mentions_Info": "Zeige Abzeichen nur für direkte Erwähnungen",
   "Show_more": "Mehr anzeigen",
+  "Show_Password": "Passwort anzeigen",
   "Show_the_keyboard_shortcut_list": "Liste der Tastenkombinationen anzeigen",
   "Sign_Up": "Anmelden",
   "Skip": "Überspringen",
@@ -668,9 +675,10 @@
   "Translate": "Übersetzen",
   "Try_again": "Versuchen Sie es nochmal",
   "Two_Factor_Authentication": "Zwei-Faktor-Authentifizierung",
+  "Two_Factor_Success_message": "Zwei-Faktor-Authentifizierungscode gesendet! Bitte überprüfen Sie Ihre E-Mail.",
   "Type_message": "Nachricht schreiben",
   "Types": "Typen",
-  "UNARCHIVE": "WIEDERHERSTELLEN",
+  "UNARCHIVE": "Wiederherstellen",
   "unarchive": "wiederherstellen",
   "unauthorized": "Nicht erlaubt",
   "Unfollowed_thread": "Thread nicht mehr folgen",
diff --git a/app/i18n/locales/en.json b/app/i18n/locales/en.json
index 393f99f4f5..983d5a6102 100644
--- a/app/i18n/locales/en.json
+++ b/app/i18n/locales/en.json
@@ -48,7 +48,7 @@
   "announcement": "announcement",
   "App_users_are_not_allowed_to_log_in_directly": "App users are not allowed to log in directly.",
   "Apply_Certificate": "Apply certificate",
-  "ARCHIVE": "ARCHIVE",
+  "ARCHIVE": "Archive",
   "archive": "archive",
   "are_typing": "are typing",
   "Are_you_sure_question_mark": "Are you sure?",
@@ -101,9 +101,10 @@
   "Channel_hint_encrypted": "End to end encrypted channel. Search will not work with encrypted channels and notifications may not show the messages content.",
   "Channel_hint_encrypted_not_available": "Not available for public channels",
   "Channel_hint_not_read_only": "All users in the channel can write new messages",
-  "Channel_hint_private": "Only invited users can access this channel",
+  "Channel_hint_private": "People can only join by being invited",
   "Channel_hint_public": "Everyone can access this channel",
   "Channel_Name": "Channel name",
+  "Channel_Read_Only_Hint": "Only channel owners can send new messages",
   "Channels": "Channels",
   "Chat_closed_by_agent": "Chat closed by agent",
   "Chat_is_on_hold": "This chat is on hold due to inactivity",
@@ -228,7 +229,7 @@
   "Dont_activate": "Don't activate now",
   "Dont_Have_An_Account": "Don't you have an account?",
   "Downloaded_file": "Downloaded file",
-  "E2E_Encryption": "E2E encryption",
+  "E2E_Encryption": "End-to-end encryption",
   "E2E_encryption_change_password_confirmation": "Yes, change it",
   "E2E_encryption_change_password_description": "You can now create encrypted private groups and direct messages. You may also change existing private groups or DMs to encrypted. \nThis is end to end encryption so the key to encode/decode your messages will not be saved on the workspace. For that reason you need to store your password somewhere safe. You will be required to enter it on other devices you wish to use e2e encryption on.",
   "E2E_encryption_change_password_error": "Error while changing E2E key password!",
@@ -249,6 +250,7 @@
   "e2ee_enabled": "End-to-end encryption is enabled",
   "Edit": "Edit",
   "Edit_Invite": "Edit invite",
+  "Edit_Room_Photo": "Edit room photo",
   "Edit_Status": "Edit status",
   "Email": "E-mail",
   "email": "Email",
@@ -263,6 +265,8 @@
   "Enable_writing_in_room": "Enable writing in room",
   "Enabled": "Enabled",
   "Enabled_E2E_Encryption_for_this_room": "enabled E2E encryption for this room",
+  "Encrypt__room_type__": "Encrypt {{room_type}}",
+  "Encrypt__room_type__info__room_name__": "Ensure only intended recipients can access messages and files in {{room_name}}.",
   "Encrypted": "Encrypted",
   "Encrypted_file": "Encrypted file",
   "Encrypted_message": "Encrypted message",
@@ -270,6 +274,8 @@
   "encrypted_room_title": "{{room_name}} is encrypted",
   "Encryption_error_desc": "It wasn't possible to decode your encryption key to be imported.",
   "Encryption_error_title": "Your encryption password seems wrong",
+  "Encryption_keys_reset": "Encryption keys reset",
+  "Encryption_keys_reset_failed": "Encryption keys reset failed",
   "End_to_end_encrypted_room": "End to end encrypted room",
   "Enter_E2EE_Password": "Enter E2EE password",
   "Enter_E2EE_Password_description": "To access your encrypted channels and direct messages, enter your encryption password. This is not stored on the server, so you’ll need to use it on every device.",
@@ -306,7 +312,7 @@
   "Finish_recording": "Finish recording",
   "Following": "Following",
   "Following_thread": "Following thread",
-  "For_your_security_you_must_enter_your_current_password_to_continue": "For your security, you must enter your current password to continue",
+  "For_your_security_you_must_enter_your_current_password_to_continue": "For your security, you must enter your account password to continue.",
   "Forgot_password": "Forgot your password?",
   "Forgot_password_If_this_email_is_registered": "If this email is registered, we'll send instructions on how to reset your password. If you do not receive an email shortly, please come back and try again.",
   "Forward": "Forward",
@@ -324,6 +330,7 @@
   "Group_by": "Group by",
   "Has_left_the_team": "has left the team",
   "Help": "Help",
+  "Hide_Password": "Hide Password",
   "Hide_room": "Hide",
   "Hide_System_Messages": "Hide system messages",
   "Hide_type_messages": "Hide \"{{type}}\" messages",
@@ -363,6 +370,8 @@
   "Jump_to_message": "Jump to message",
   "Just_invited_people_can_access_this_channel": "Just invited people can access this channel",
   "Just_invited_people_can_access_this_team": "Just invited people can access this team",
+  "Label_Input_Two_Factor_Code": "Code",
+  "Label_Input_Two_Factor_Password": "Password",
   "Language": "Language",
   "last_message": "last message",
   "Last_owner_team_room": "You are the last owner of this channel. Once you leave the team, the channel will be kept inside the team but you will be managing it from outside.",
@@ -575,7 +584,7 @@
   "Read_External_Permission": "Read media permission",
   "Read_External_Permission_Message": "Rocket.Chat needs to access photos, media, and files on your device",
   "Read_Only": "Read only",
-  "Read_only_hint": "Only authorized users can write new messages",
+  "Read_only_hint": "Only channel owners can send new messages",
   "Read_Receipt": "Read receipt",
   "Receive_Group_Mentions": "Receive group mentions",
   "Receive_Group_Mentions_Info": "Receive @all and @here mentions",
@@ -609,8 +618,13 @@
   "Required": "Required",
   "Resend": "Resend",
   "Resend_email": "Resend email",
-  "RESET": "RESET",
+  "RESET": "Reset",
+  "Reset": "Reset",
+  "Reset_encryption_keys": "Reset encryption keys",
+  "Reset_encryption_keys_info__room_type__": "Resetting E2EE keys is only recommend if no {{room_type}} member has a valid key to regain access to the previously encrypted content.",
   "Reset_password": "Reset password",
+  "Reset_room_key_message": "All members may lose access to previously encrypted content.",
+  "Reset_room_key_title": "Reset encryption key",
   "resetting_password": "resetting password",
   "Resume": "Resume",
   "Return_to_waiting_line": "Return to waiting line",
@@ -633,6 +647,7 @@
   "Room_Info_Edit": "Room info edit",
   "Room_name_changed_to": "changed room name to: {{name}}",
   "Room_not_found": "Room not found",
+  "Room_Password": "Room Password",
   "room_removed_read_only_permission": "removed read only permission",
   "room_set_read_only_permission": "set room to read only",
   "room_unarchived": "unarchived room",
@@ -695,6 +710,7 @@
   "Show_badge_for_mentions_Info": "Display badge for direct mentions only",
   "Show_less": "Show less",
   "Show_more": "Show more",
+  "Show_Password": "Show Password",
   "Show_the_keyboard_shortcut_list": "Show the keyboard shortcut list",
   "Sign_Up": "Sign up",
   "Skip": "Skip",
@@ -761,9 +777,10 @@
   "Troubleshooting": "Troubleshooting",
   "Try_again": "Try again",
   "Two_Factor_Authentication": "Two-factor authentication",
+  "Two_Factor_Success_message": "Two-factor authentication code sent! Please check your email.",
   "Type_message": "Type message",
   "Types": "Types",
-  "UNARCHIVE": "UNARCHIVE",
+  "UNARCHIVE": "Unarchive",
   "unarchive": "unarchive",
   "unauthorized": "Unauthorized",
   "Unblock": "Unblock",
diff --git a/app/i18n/locales/es.json b/app/i18n/locales/es.json
index b046dda275..7970f7dd5b 100644
--- a/app/i18n/locales/es.json
+++ b/app/i18n/locales/es.json
@@ -22,7 +22,7 @@
   "Announcement": "Anuncio",
   "announcement": "anuncio",
   "Apply_Certificate": "Aplicar certificado",
-  "ARCHIVE": "FICHERO",
+  "ARCHIVE": "Fichero",
   "archive": "fichero",
   "are_typing": "están escribiendo",
   "Are_you_sure_question_mark": "¿Estás seguro?",
@@ -43,7 +43,9 @@
   "Certificate_password": "Contraseña del certificado",
   "Change_Language": "Cambiar idioma",
   "changing_avatar": "cambiando avatar",
+  "Channel_hint_private": "La gente solo puede unirse al ser invitado",
   "Channel_Name": "Nombre sala",
+  "Channel_Read_Only_Hint": "Solo los propietarios de canales pueden enviar nuevos mensajes",
   "Channels": "Salas",
   "Chats": "Chats",
   "Choose": "Seleccionar",
@@ -89,6 +91,7 @@
   "Do_you_really_want_to_key_this_room_question_mark": "¿Deseas {{key}} de esta sala?",
   "Dont_Have_An_Account": "¿Todavía no tienes una cuenta?",
   "Edit": "Editar",
+  "Edit_Room_Photo": "Foto de la sala de edición",
   "Email": "E-mail",
   "Enable_Auto_Translate": "Permitir Auto-Translate",
   "Error_uploading": "Error en la subida",
@@ -110,7 +113,7 @@
   "Files": "Archivos",
   "Finish_recording": "Finalizar grabación",
   "Following_thread": "Siguiendo hilo",
-  "For_your_security_you_must_enter_your_current_password_to_continue": "Por seguridad, debes introducir tu contraseña para continuar",
+  "For_your_security_you_must_enter_your_current_password_to_continue": "Por su seguridad, debe ingresar la contraseña de su cuenta para continuar.",
   "Forgot_password": "¿Ha olvidado su contraseña?",
   "Forgot_password_If_this_email_is_registered": "Si este email está registrado, te enviaremos las instrucciones para resetear tu contraseña. Si no recibes un email en breve, vuelve aquí e inténtalo de nuevo.",
   "Full_name": "Nombre completo",
@@ -119,6 +122,7 @@
   "Get_link": "Obtener enlace",
   "Glossary_of_simplified_terms": "Glosario de términos simplificados",
   "Help": "Ayuda",
+  "Hide_Password": "Ocultar contraseña",
   "Hide_room": "Ocultar",
   "In_App_And_Desktop": "En la aplicación y en el escritorio",
   "In_App_and_Desktop_Alert_info": "Muestra un banner en la parte superior de la pantalla cuando la aplicación esté abierta y muestra una notificación en el escritorio",
@@ -131,6 +135,8 @@
   "Join": "Conectar",
   "Join_the_given_channel": "Unirse al canal dado",
   "Just_invited_people_can_access_this_channel": "Sólo gente invitada puede acceder a este canal.",
+  "Label_Input_Two_Factor_Code": "Código",
+  "Label_Input_Two_Factor_Password": "Contraseña",
   "Language": "Idioma",
   "last_message": "último mensaje",
   "Learn_more": "Saber más",
@@ -199,6 +205,7 @@
   "Reactions_are_disabled": "Las reacciones están desactivadas",
   "Reactions_are_enabled": "Las reacciones están activadas",
   "Read_Only": "Sólo lectura ",
+  "Read_only_hint": "Solo los propietarios de canales pueden enviar nuevos mensajes",
   "Read_Receipt": "Comprobante de lectura",
   "Receive_Group_Mentions": "Recibir menciones de grupo",
   "Receive_Group_Mentions_Info": "Recibir menciones @all y @here",
@@ -212,13 +219,14 @@
   "Report": "Informe",
   "Required": "Requerido",
   "Resend": "Reenviar",
-  "RESET": "RESET",
+  "RESET": "Reset",
   "Reset_password": "Resetear contraseña",
   "resetting_password": "reseteando contraseña",
   "Rocket_Chat_Documentation": "Documentación de Rocket.Chat",
   "Roles": "Roles",
   "Room_Info": "Información de la sala",
   "Room_Info_Edit": "Editar información de la sala",
+  "Room_Password": "Contraseña de habitación",
   "SAVE": "GUARDAR",
   "Save": "Guardar",
   "Save_Changes": "Guardar cambios",
@@ -245,6 +253,7 @@
   "Settings_succesfully_changed": "¡Configuración cambiada correctamente!",
   "Share": "Compartir",
   "Share_this_app": "Compartir esta aplicación",
+  "Show_Password": "Mostrar contraseña",
   "Show_the_keyboard_shortcut_list": "Mostrar la lista de atajos de teclado",
   "Sign_Up": "Registrarse",
   "Slash_Gimme_Description": "Muestra  (つ ◕_◕) つ  antes de tu mensaje",
@@ -277,8 +286,9 @@
   "Translate": "Traducir",
   "Try_again": "Intentar de nuevo",
   "Two_Factor_Authentication": "Autenticación de doble factor",
+  "Two_Factor_Success_message": "¡Código de autenticación de dos factores enviado! Por favor, revisa tu correo electrónico.",
   "Type_message": "Escribir mensaje",
-  "UNARCHIVE": "DESARCHIVAR",
+  "UNARCHIVE": "Desarchivar",
   "unarchive": "desarchivar",
   "Unfollowed_thread": "Dejar de seguir el hilo",
   "Unmute": "Desmutear",
diff --git a/app/i18n/locales/fi.json b/app/i18n/locales/fi.json
index 354b684c49..246e2cd4ea 100644
--- a/app/i18n/locales/fi.json
+++ b/app/i18n/locales/fi.json
@@ -38,7 +38,7 @@
   "Announcement": "Ilmoitus",
   "announcement": "ilmoitus",
   "Apply_Certificate": "Käytä sertifikaattia",
-  "ARCHIVE": "ARKISTO",
+  "ARCHIVE": "Arkisto",
   "archive": "arkisto",
   "are_typing": "kirjoittavat",
   "Are_you_sure_question_mark": "Oletko varma?",
@@ -79,9 +79,10 @@
   "Channel_hint_encrypted": "Täysin salattu kanava. Haku ei toimi salatuilla kanavilla eikä viestien sisältö välttämättä näy ilmoituksissa.",
   "Channel_hint_encrypted_not_available": "Ei käytettävissä julkisilla kanavilla",
   "Channel_hint_not_read_only": "Kaikki kanavan käyttäjät voivat kirjoittaa uusia viestejä",
-  "Channel_hint_private": "Vain kutsutuilla käyttäjillä on pääsy tälle kanavalle",
+  "Channel_hint_private": "Ihmiset voivat liittyä vain kutsumalla",
   "Channel_hint_public": "Kaikilla on pääsy tälle kanavalle",
   "Channel_Name": "Kanavan nimi",
+  "Channel_Read_Only_Hint": "Vain kanavanomistajat voivat lähettää uusia viestejä",
   "Channels": "Kanavat",
   "Chat_closed_by_agent": "Agentti sulki keskustelun",
   "Chat_is_on_hold": "Tämä keskustelu on pidossa käyttämättömyyden vuoksi",
@@ -202,6 +203,7 @@
   "E2E_How_It_Works_info4": "Voit myös määrittää uuden salasanan salausavaimellesi milloin tahansa missä tahansa selaimessa, jossa olet antanut nykyisen täyden salauksen salasanan.",
   "Edit": "Muokkaa",
   "Edit_Invite": "Muokkaa kutsua",
+  "Edit_Room_Photo": "Muokkaa huonekuvaa",
   "Edit_Status": "Muokkaa tilaa",
   "Email": "Sähköposti",
   "Email_Notification_Mode_All": "Jokainen maininta/SV",
@@ -249,7 +251,7 @@
   "Finish_recording": "Lopeta tallennus",
   "Following": "Seurataan",
   "Following_thread": "Seurataan ketjua",
-  "For_your_security_you_must_enter_your_current_password_to_continue": "Jatka antamalla nykyinen salasanasi turvallisuussyistä",
+  "For_your_security_you_must_enter_your_current_password_to_continue": "Turvallisuutesi vuoksi sinun on syötettävä tilisi salasana jatkaaksesi.",
   "Forgot_password": "Unohditko salasanasi?",
   "Forgot_password_If_this_email_is_registered": "Jos tämä sähköpostiosoite on rekisteröity, lähetämme salasanan nollausohjeet. Jos et saa sähköpostia pian, palaa ja yritä uudelleen.",
   "Forward": "Välitä",
@@ -265,6 +267,7 @@
   "Group_by": "Ryhmittelyperuste",
   "Has_left_the_team": "on poistunut tiimistä",
   "Help": "Apua",
+  "Hide_Password": "Piilota salasana",
   "Hide_room": "Piilota",
   "Hide_System_Messages": "Piilota järjestelmäilmoitukset",
   "Hide_type_messages": "Piilota \"{{type}}\"-viestit",
@@ -291,6 +294,8 @@
   "Joined": "Liitytty",
   "Just_invited_people_can_access_this_channel": "Vain kutsutut ihmiset voivat käyttää tätä kanavaa",
   "Just_invited_people_can_access_this_team": "Vain kutsutut ihmiset voivat käyttää tätä tiimiä",
+  "Label_Input_Two_Factor_Code": "Koodi",
+  "Label_Input_Two_Factor_Password": "Salasana",
   "Language": "Kieli",
   "last_message": "viimeinen viesti",
   "Last_owner_team_room": "Olet tämän kanavan viimeinen omistaja. Kun lähdet tiimistä, kanava säilyy tiimin sisällä, mutta hallinnoit sitä ulkopuolelta.",
@@ -473,7 +478,7 @@
   "Read_External_Permission": "Median lukuoikeus",
   "Read_External_Permission_Message": "Rocket.Chat tarvitsee pääsyn laitteesi valokuviin, mediaan ja tiedostoihin",
   "Read_Only": "Vain luku",
-  "Read_only_hint": "Vain valtuutetut käyttäjät voivat kirjoittaa uusia viestejä",
+  "Read_only_hint": "Vain kanavanomistajat voivat lähettää uusia viestejä",
   "Read_Receipt": "Lukukuittaus",
   "Receive_Group_Mentions": "Vastaanota ryhmämainintoja",
   "Receive_Group_Mentions_Info": "Vastaanota @all- ja @here-maininnat",
@@ -502,7 +507,7 @@
   "Report": "Ilmoita",
   "Required": "Vaadittu",
   "Resend": "Lähetä uudelleen",
-  "RESET": "NOLLAA",
+  "RESET": "Nollaa",
   "Reset_password": "Nollaa salasana",
   "resetting_password": "nollaa salasanaa",
   "Resume": "Jatka",
@@ -525,6 +530,7 @@
   "Room_Info": "Huoneen tiedot",
   "Room_Info_Edit": "Huoneen tietojen muokkaus",
   "Room_name_changed_to": "vaihtoi huoneen nimeksi: {{name}}",
+  "Room_Password": "Huoneen salasana",
   "room_removed_read_only_permission": "poisti vain luku -oikeuden",
   "room_set_read_only_permission": "asetti huoneen vain luku -tilaan",
   "room_unarchived": "palautti huoneen arkistosta",
@@ -584,6 +590,7 @@
   "Show_badge_for_mentions": "Näytä mainintojen merkki",
   "Show_badge_for_mentions_Info": "Näytä vain suorien mainintojen merkki",
   "Show_more": "Näytä lisää",
+  "Show_Password": "Näytä salasana",
   "Show_the_keyboard_shortcut_list": "Näytä pikanäppäinten luettelo",
   "Sign_Up": "Rekisteröidy",
   "Skip": "Ohita",
@@ -643,9 +650,10 @@
   "Translate": "Käännä",
   "Try_again": "Yritä uudelleen",
   "Two_Factor_Authentication": "Kaksivaiheinen tunnistautuminen",
+  "Two_Factor_Success_message": "Kaksivaiheinen todennuskoodi lähetetty! Tarkista sähköpostisi.",
   "Type_message": "Kirjoita viesti",
   "Types": "Tyypit",
-  "UNARCHIVE": "PALAUTA ARKISTOSTA",
+  "UNARCHIVE": "Palauta arkistosta",
   "unarchive": "palauta arkistosta",
   "unauthorized": "Valtuuttamaton",
   "Unfollowed_thread": "Lopetettiin ketjun seuraaminen",
diff --git a/app/i18n/locales/fr.json b/app/i18n/locales/fr.json
index 3c5016f2ce..4978322d51 100644
--- a/app/i18n/locales/fr.json
+++ b/app/i18n/locales/fr.json
@@ -30,7 +30,7 @@
   "Announcement": "Annonce",
   "announcement": "annonce",
   "Apply_Certificate": "Appliquer le certificat",
-  "ARCHIVE": "ARCHIVER",
+  "ARCHIVE": "Archiver",
   "archive": "archiver",
   "are_typing": "sont en train d'écrire",
   "Are_you_sure_question_mark": "Êtes-vous sûr ?",
@@ -59,7 +59,9 @@
   "Change_Language": "Changer la langue",
   "Change_language_loading": "Changement de la langue.",
   "changing_avatar": "changer d'avatar",
+  "Channel_hint_private": "Les gens ne peuvent se joindre qu'en étant invité",
   "Channel_Name": "Nom du canal",
+  "Channel_Read_Only_Hint": "Seuls les propriétaires de canaux peuvent envoyer de nouveaux messages",
   "Channels": "Canaux",
   "Chat_closed_by_agent": "Chat fermé par l'agent",
   "Chat_is_on_hold": "Ce chat est attente pour cause d'inactivité",
@@ -169,6 +171,7 @@
   "E2E_How_It_Works_info4": "Vous pouvez également configurer un nouveau mot de passe pour votre clé de cryptage à tout moment à partir de n'importe quel navigateur dans lequel vous avez entré le mot de passe E2E existant.",
   "Edit": "Modifier",
   "Edit_Invite": "Modifier l'invitation",
+  "Edit_Room_Photo": "Modifier la salle Photo",
   "Edit_Status": "Modifier le statut",
   "Email": "E-mail",
   "Email_Notification_Mode_All": "Chaque mention/MD",
@@ -213,7 +216,7 @@
   "Finish_recording": "Terminer l'enregistrement",
   "Following": "Suivant",
   "Following_thread": "Suivre le fil",
-  "For_your_security_you_must_enter_your_current_password_to_continue": "Pour votre sécurité, vous devez entrer votre mot de passe actuel pour continuer.",
+  "For_your_security_you_must_enter_your_current_password_to_continue": "Pour votre sécurité, vous devez entrer le mot de passe de votre compte pour continuer.",
   "Forgot_password": "Mot de passe oublié ?",
   "Forgot_password_If_this_email_is_registered": "Si cet e-mail est enregistré, nous vous enverrons des instructions pour réinitialiser votre mot de passe. Si vous ne recevez pas d'e-mail sous peu, veuillez revenir et réessayer.",
   "Forward": "Transmettre",
@@ -229,6 +232,7 @@
   "Group_by": "Grouper par",
   "Has_left_the_team": "a quitté l'équipe",
   "Help": "Aide",
+  "Hide_Password": "Masquer le mot de passe",
   "Hide_room": "Masquer",
   "Hide_System_Messages": "Masquer les messages système",
   "Hide_type_messages": "Masquer les messages \"{{type}}\"",
@@ -254,6 +258,8 @@
   "Join_the_given_channel": "Rejoindre le canal indiqué",
   "Just_invited_people_can_access_this_channel": "Seuls les personnes invitées peuvent accéder à ce canal",
   "Just_invited_people_can_access_this_team": "Seules les personnes invitées peuvent accéder à cette équipe",
+  "Label_Input_Two_Factor_Code": "Code",
+  "Label_Input_Two_Factor_Password": "Mot de passe",
   "Language": "Langue",
   "last_message": "dernier message",
   "Last_owner_team_room": "Vous êtes le dernier propriétaire de ce canal. Une fois que vous quittez l'équipe, le canal sera conservé au sein de l'équipe mais vous le gérerez de l'extérieur.",
@@ -432,6 +438,7 @@
   "Read_External_Permission": "Permission de lecture des fichiers",
   "Read_External_Permission_Message": "Rocket.Chat doit accéder aux photos, aux médias et aux fichiers sur votre appareil",
   "Read_Only": "Lecture seule",
+  "Read_only_hint": "Seuls les propriétaires de canaux peuvent envoyer de nouveaux messages",
   "Read_Receipt": "Accusé de réception",
   "Receive_Group_Mentions": "Recevoir des mentions de groupe",
   "Receive_Group_Mentions_Info": "Recevoir des mentions @all et @here",
@@ -456,7 +463,7 @@
   "Report": "Signaler",
   "Required": "Requis",
   "Resend": "Renvoyer",
-  "RESET": "RÉINITIALISER",
+  "RESET": "Réinitialiser",
   "Reset_password": "Réinitialiser le mot de passe",
   "resetting_password": "réinitialisation du mot de passe",
   "Resume": "Reprendre",
@@ -471,6 +478,7 @@
   "Roles": "Rôles",
   "Room_Info": "Info sur le salon",
   "Room_Info_Edit": "Modifier les informations du salon",
+  "Room_Password": "Mot de passe de la salle",
   "room-name-already-exists": "Le nom du salon existe déjà",
   "SAVE": "SAUVEGARDER",
   "Save": "Sauvegarder",
@@ -522,6 +530,7 @@
   "Sharing": "Partager",
   "Shortcut": "Raccourci",
   "Show_more": "Afficher plus",
+  "Show_Password": "Afficher le mot de passe",
   "Show_the_keyboard_shortcut_list": "Afficher la liste des raccourcis clavier",
   "Sign_Up": "S'inscrire",
   "Slash_Gimme_Description": "Affiche ༼ つ ◕_◕ ༽つ avant votre message",
@@ -572,9 +581,10 @@
   "Translate": "Traduire",
   "Try_again": "Réessayer",
   "Two_Factor_Authentication": "Authentification à deux facteurs",
+  "Two_Factor_Success_message": "Code d'authentification à deux facteurs envoyé ! Veuillez vérifier votre e-mail.",
   "Type_message": "Tapez le message",
   "Types": "Types",
-  "UNARCHIVE": "DÉSARCHIVER",
+  "UNARCHIVE": "Désarchiver",
   "unarchive": "désarchiver",
   "unauthorized": "Non autorisé",
   "Unfollowed_thread": "Ne plus suivre ce fil",
diff --git a/app/i18n/locales/hi-IN.json b/app/i18n/locales/hi-IN.json
index dc4875edf1..14c9c1aa13 100644
--- a/app/i18n/locales/hi-IN.json
+++ b/app/i18n/locales/hi-IN.json
@@ -94,9 +94,10 @@
   "Channel_hint_encrypted": "एंड टू एंड एन्क्रिप्टेड चैनल। एंक्रिप्शन चैनल के साथ खोज काम नहीं करेगा और सूचनाएं संदेश की सामग्री नहीं दिखा सकती हैं।",
   "Channel_hint_encrypted_not_available": "सार्वजनिक चैनलों के लिए उपलब्ध नहीं",
   "Channel_hint_not_read_only": "चैनल में सभी उपयोगकर्ताएं नए संदेश लिख सकती हैं",
-  "Channel_hint_private": "केवल आमंत्रित उपयोगकर्ता इस चैनल तक पहुँच सकते हैं",
+  "Channel_hint_private": "लोग केवल आमंत्रित किए जाने पर ही जुड़ सकते हैं",
   "Channel_hint_public": "हर कोई इस चैनल तक पहुँच सकता है",
   "Channel_Name": "चैनल का नाम",
+  "Channel_Read_Only_Hint": "केवल चैनल के मालिक नए संदेश भेज सकते हैं",
   "Channels": "चैनल्स",
   "Chat_closed_by_agent": "एजेंट ने चैट बंद कर दी है",
   "Chat_is_on_hold": "इस चैट को गतिहीनता के कारण होल्ड पर है",
@@ -222,6 +223,7 @@
   "E2E_How_It_Works_info4": "आप अपने इंड-टू-इंड पासवर्ड से पुनः ब्राउज़र में किसी भी स्थान से कभी भी एक नए पासवर्ड को सेटअप कर सकते हैं।",
   "Edit": "संपादित करें",
   "Edit_Invite": "आमंत्रण संपादित करें",
+  "Edit_Room_Photo": "कमरे की तस्वीर संपादित करें",
   "Edit_Status": "स्थिति संपादित करें",
   "Email": "ईमेल",
   "Email_Notification_Mode_All": "हर मेंशन/डीएम",
@@ -270,7 +272,7 @@
   "Finish_recording": "रेकॉर्डिंग समाप्त करें",
   "Following": "फॉलो कर रहा है",
   "Following_thread": "निरंतर थ्रेड",
-  "For_your_security_you_must_enter_your_current_password_to_continue": "आपकी सुरक्षा के लिए, आपको जारी रखने के लिए अपना वर्तमान पासवर्ड दर्ज करना होगा",
+  "For_your_security_you_must_enter_your_current_password_to_continue": "आपकी सुरक्षा के लिए, जारी रखने के लिए आपको अपने खाते का पासवर्ड दर्ज करना होगा।",
   "Forgot_password": "पासवर्ड भूल गए हैं?",
   "Forgot_password_If_this_email_is_registered": "यदि यह ईमेल पंजीकृत है, तो हम आपको पासवर्ड रीसेट करने के लिए निर्देश भेजेंगे। यदि आपको शीघ्रता से एक ईमेल प्राप्त नहीं होता है, तो कृपया वापस आकर पुनः प्रयास करें।",
   "Forward": "आगे बढ़ें",
@@ -287,6 +289,7 @@
   "Group_by": "इसके अनुसार समूहीकृत करें",
   "Has_left_the_team": "टीम छोड़ गया है",
   "Help": "मदद",
+  "Hide_Password": "पासवर्ड छुपाएं",
   "Hide_System_Messages": "सिस्टम संदेश छुपाएं",
   "Hide_type_messages": "\"{{type}}\" संदेश छुपाएं",
   "How_It_Works": "यह कैसे काम करता है",
@@ -316,6 +319,8 @@
   "Joined": "शामिल हो गए",
   "Just_invited_people_can_access_this_channel": "केवल निमंत्रित लोग इस चैनल तक पहुंच सकते हैं",
   "Just_invited_people_can_access_this_team": "केवल निमंत्रित लोग इस टीम तक पहुंच सकते हैं",
+  "Label_Input_Two_Factor_Code": "कोड",
+  "Label_Input_Two_Factor_Password": "पासवर्ड",
   "Language": "भाषा",
   "last_message": "आखिरी संदेश",
   "Last_owner_team_room": "आप इस चैनल के आखिरी मालिक हैं। जब आप टीम छोड़ेंगे, चैनल को टीम के अंदर रखा जाएगा, लेकिन आप इसे बाहर से प्रबंधित करेंगे।",
@@ -511,7 +516,7 @@
   "Read_External_Permission": "मीडिया अनुमति पठन",
   "Read_External_Permission_Message": "रॉकेट.चैट को आपके डिवाइस पर फ़ोटो, मीडिया और फ़ाइल तक पहुंच की आवश्यकता है",
   "Read_Only": "केवल पठन",
-  "Read_only_hint": "केवल अधिकृत उपयोगकर्ताएं नए संदेश लिख सकती हैं",
+  "Read_only_hint": "केवल चैनल के मालिक केवल नए संदेश भेज सकते हैं",
   "Read_Receipt": "पठन प्राप्ति",
   "Receive_Group_Mentions": "समूह उल्लेख प्राप्त करें",
   "Receive_Group_Mentions_Info": "@all और @here उल्लेख प्राप्त करें",
@@ -563,6 +568,7 @@
   "Room_Info_Edit": "कमरे की जानकारी संपादित करें",
   "Room_name_changed_to": "कमरे का नाम बदल गया है: {{name}}",
   "Room_not_found": "कमरा नहीं मिला",
+  "Room_Password": "कमरे का पासवर्ड",
   "room_removed_read_only_permission": "पठन केवल अनुमति हटा दी गई है",
   "room_set_read_only_permission": "कमरे को केवल पठन के लिए सेट किया गया है",
   "room_unarchived": "संग्रहित कमरा को फिर से सक्रिय किया गया",
@@ -623,6 +629,7 @@
   "Show_badge_for_mentions": "उल्लेख के लिए बैज दिखाएं",
   "Show_badge_for_mentions_Info": "केवल सीधे उल्लेखों के लिए बैज दिखाएं",
   "Show_more": "और दिखाएं..",
+  "Show_Password": "पासवर्ड दिखाएं",
   "Sign_Up": "साइन अप",
   "Skip": "छोड़ें",
   "Sort_by": "इसके अनुसार क्रमबद्ध करें",
@@ -675,6 +682,7 @@
   "Translate": "अनुवाद करें",
   "Try_again": "फिर कोशिश करें",
   "Two_Factor_Authentication": "दो-क्रमिक प्रमाणीकरण",
+  "Two_Factor_Success_message": "दो-कारक प्रमाणीकरण कोड भेजा गया! कृपया अपना ईमेल चेक करें।",
   "Type_message": "संदेश टाइप करें",
   "Types": "प्रकार",
   "UNARCHIVE": "अनारकाइव करें",
diff --git a/app/i18n/locales/hu.json b/app/i18n/locales/hu.json
index 35e6dc7687..6816c8c786 100644
--- a/app/i18n/locales/hu.json
+++ b/app/i18n/locales/hu.json
@@ -45,7 +45,7 @@
   "Announcement": "Bejelentés",
   "announcement": "bejelentés",
   "Apply_Certificate": "Tanúsítvány alkalmazása",
-  "ARCHIVE": "ARCHÍVUM",
+  "ARCHIVE": "Archívum",
   "archive": "archívum",
   "are_typing": "éppen ír",
   "Are_you_sure_question_mark": "Biztos vagy benne?",
@@ -94,9 +94,10 @@
   "Channel_hint_encrypted": "Végponttól végpontig titkosított csatorna. A keresés nem működik titkosított csatornákon, és az értesítések nem mutatják az üzenetek tartalmát.",
   "Channel_hint_encrypted_not_available": "Nem érhető el nyilvános csatornáknál",
   "Channel_hint_not_read_only": "A csatorna minden felhasználója írhat új üzeneteket",
-  "Channel_hint_private": "Csak a meghívott felhasználók férhetnek hozzá ehhez a csatornához",
+  "Channel_hint_private": "Az emberek csak meghívással csatlakozhatnak",
   "Channel_hint_public": "Mindenki hozzáférhet ehhez a csatornához",
   "Channel_Name": "Csatorna neve",
+  "Channel_Read_Only_Hint": "Csak a csatornatulajdonosok küldhetnek új üzeneteket",
   "Channels": "Csatornák",
   "Chat_closed_by_agent": "A csevegést az ügyintéző lezárta",
   "Chat_is_on_hold": "Ez a csevegés várakoztatva van inaktivitás miatt",
@@ -222,6 +223,7 @@
   "E2E_How_It_Works_info4": "A titkosítási kulcshoz bármikor beállíthat egy új jelszót is, bármelyik böngészőből, ahová a meglévő E2E jelszót beírta.",
   "Edit": "Szerkesztés",
   "Edit_Invite": "Meghívás szerkesztése",
+  "Edit_Room_Photo": "Szobás fotó szerkesztése",
   "Edit_Status": "Állapot szerkesztése",
   "Email": "E-mail",
   "Email_Notification_Mode_All": "Minden említés/DM ",
@@ -270,7 +272,7 @@
   "Finish_recording": "Rögzítés befejezése",
   "Following": "Követve",
   "Following_thread": "Követett szál",
-  "For_your_security_you_must_enter_your_current_password_to_continue": "A biztonsága érdekében meg kell adnia a jelenlegi jelszavát a folytatáshoz",
+  "For_your_security_you_must_enter_your_current_password_to_continue": "A biztonsága érdekében meg kell adnia a fiókja jelszavát a folytatáshoz.",
   "Forgot_password": "Elfelejtette a jelszavát?",
   "Forgot_password_If_this_email_is_registered": "Ha ez az e-mail-cím regisztrálva van, akkor utasításokat küldünk a jelszó visszaállításához. Ha nem kap rövidesen e-mailt, akkor térjen vissza, és próbálja meg újra.",
   "Forward": "Továbbítás",
@@ -287,6 +289,7 @@
   "Group_by": "Csoportosítás",
   "Has_left_the_team": "elhagyta a csapatot",
   "Help": "Segítség",
+  "Hide_Password": "Jelszó elrejtése",
   "Hide_System_Messages": "Rendszerüzenetek elrejtése",
   "Hide_type_messages": "\"{{type}}\" üzenetek elrejtése",
   "How_It_Works": "Hogyan működik",
@@ -317,6 +320,8 @@
   "Jump_to_message": "Ugrás az üzenethez",
   "Just_invited_people_can_access_this_channel": "Csak a meghívott személyek férhetnek hozzá ehhez a csatornához.",
   "Just_invited_people_can_access_this_team": "Csak meghívott emberek férhetnek hozzá ehhez a csapathoz",
+  "Label_Input_Two_Factor_Code": "Kód",
+  "Label_Input_Two_Factor_Password": "Jelszó",
   "Language": "Nyelv",
   "last_message": "utolsó üzenet",
   "Last_owner_team_room": "Ön az utolsó tulajdonosa ennek a csatornának. Ha elhagyja a csapatot, a csatorna a csapaton belül marad, de Ön kívülről fogja kezelni.",
@@ -512,7 +517,7 @@
   "Read_External_Permission": "Médiaengedély olvasása",
   "Read_External_Permission_Message": "A Rocket.Chat-nek hozzá kell férnie a készülékén lévő fényképekhez, médiához és fájlokhoz",
   "Read_Only": "Csak olvasható",
-  "Read_only_hint": "Csak az engedélyezett felhasználók írhatnak új üzeneteket",
+  "Read_only_hint": "Csak a csatornatulajdonosok küldhetnek új üzeneteket",
   "Read_Receipt": "Olvassa el a nyugtát",
   "Receive_Group_Mentions": "Csoportos említések fogadása",
   "Receive_Group_Mentions_Info": "Az @all és @here említések fogadása",
@@ -564,6 +569,7 @@
   "Room_Info_Edit": "Szoba információ szerkesztés",
   "Room_name_changed_to": "szoba neve megváltoztatva erre: {{name}}",
   "Room_not_found": "Szoba nem található",
+  "Room_Password": "Szoba jelszó",
   "room_removed_read_only_permission": "csak olvasható jogosultság eltávolítva",
   "room_set_read_only_permission": "szoba beállítva csak olvashatóra",
   "room_unarchived": "archiválásból megszüntetett szoba",
@@ -624,6 +630,7 @@
   "Show_badge_for_mentions": "Említések jelvényének megjelenítése",
   "Show_badge_for_mentions_Info": "Jelvény megjelenítése csak a közvetlen említéseknél",
   "Show_more": "Több megjelenítése..",
+  "Show_Password": "Jelszó megjelenítése",
   "Sign_Up": "Feliratkozás",
   "Skip": "Kihagyás",
   "Sort_by": "Rendezés",
@@ -677,9 +684,10 @@
   "Translate": "Fordítás",
   "Try_again": "Próbálja újra",
   "Two_Factor_Authentication": "Kétfaktoros hitelesítés",
+  "Two_Factor_Success_message": "Kétfaktoros hitelesítési kód elküldve! Kérjük, ellenőrizze az emailjét.",
   "Type_message": "Üzenet típusa",
   "Types": "Típusok",
-  "UNARCHIVE": "ARCHIVÁLÁS MEGSZÜNTETÉS",
+  "UNARCHIVE": "Archiválás megszüntetés",
   "unarchive": "Archiválás megszüntetés",
   "unauthorized": "Jogosulatlan",
   "Unfollowed_thread": "Nem követett szál",
diff --git a/app/i18n/locales/it.json b/app/i18n/locales/it.json
index 0e2e90b0aa..c246d9d084 100644
--- a/app/i18n/locales/it.json
+++ b/app/i18n/locales/it.json
@@ -31,7 +31,7 @@
   "Announcement": "Annuncio",
   "announcement": "annuncio",
   "Apply_Certificate": "Applica certificato",
-  "ARCHIVE": "ARCHIVIO",
+  "ARCHIVE": "Archivio",
   "archive": "archivio",
   "are_typing": "stanno scrivendo",
   "Are_you_sure_question_mark": "Sei sicuro?",
@@ -55,7 +55,9 @@
   "Change_Language": "Cambia lingua",
   "Change_language_loading": "Cambiando la lingua.",
   "changing_avatar": "cambio avatar",
+  "Channel_hint_private": "Le persone possono unirsi solo essendo invitati",
   "Channel_Name": "Nome canale",
+  "Channel_Read_Only_Hint": "Solo i proprietari di canali possono inviare nuovi messaggi",
   "Channels": "Canali",
   "Chat_closed_by_agent": "Chat chiusa dall'agente",
   "Chat_started": "Chat avviata",
@@ -147,6 +149,7 @@
   "E2E_How_It_Works_info4": "Puoi impostare una nuova password per la chiave di cifratura in qualsiasi momento da uno dei browser dove hai inserito la password E2E esistente.",
   "Edit": "Modifica",
   "Edit_Invite": "Modifica invito",
+  "Edit_Room_Photo": "Modifica foto della stanza",
   "Edit_Status": "Modifica Stato",
   "Email": "E-mail",
   "Email_Notification_Mode_All": "Ogni Menzione/Messaggio Privato",
@@ -186,7 +189,7 @@
   "Finish_recording": "Termina registrazione",
   "Following": "Seguiti",
   "Following_thread": "Thread seguito",
-  "For_your_security_you_must_enter_your_current_password_to_continue": "Per garantire la sicurezza del tuo account, inserisci la password per continuare.",
+  "For_your_security_you_must_enter_your_current_password_to_continue": "Per la tua sicurezza, devi inserire la password del tuo account per continuare.",
   "Forgot_password": "Password dimenticata",
   "Forgot_password_If_this_email_is_registered": "Se questa e-mail è registrata, manderemo istruzioni su come resettare la tua password. Se non ricevi nulla, torna qui e riprova di nuovo.",
   "Forward": "Inoltra",
@@ -201,6 +204,7 @@
   "Glossary_of_simplified_terms": "Glossario dei termini semplificati",
   "Has_left_the_team": "Ha lasciato il team",
   "Help": "Aiuto",
+  "Hide_Password": "Nascondi Password",
   "Hide_room": "Nascondi il canale",
   "Hide_System_Messages": "Nascondi messaggi di sistema",
   "Hide_type_messages": "Nascondi messaggi di \"{{type}}\"",
@@ -226,6 +230,8 @@
   "Join_the_given_channel": "Entra nel canale specificato",
   "Just_invited_people_can_access_this_channel": "Solo le persone invitate possono accedere a questo canale",
   "Just_invited_people_can_access_this_team": "Solo le persone invitate possono accedere a questo team",
+  "Label_Input_Two_Factor_Code": "Codice",
+  "Label_Input_Two_Factor_Password": "Password",
   "Language": "Lingua",
   "last_message": "ultimo messaggio",
   "Leave": "Lasciare il canale",
@@ -370,6 +376,7 @@
   "Read_External_Permission": "Permesso di Lettura della Memoria",
   "Read_External_Permission_Message": "Rocket.Chat deve accedere alle foto, media, e documenti sul tuo dispositivo",
   "Read_Only": "Sola lettura",
+  "Read_only_hint": "Solo i proprietari di canali possono inviare nuovi messaggi",
   "Read_Receipt": "Conferma di lettura",
   "Receive_Group_Mentions": "Ricevi menzioni di gruppo",
   "Receive_Group_Mentions_Info": "Ricevi menzioni @all e @here",
@@ -387,7 +394,7 @@
   "Report": "Segnala",
   "Required": "Richiesto",
   "Resend": "Invia di nuovo",
-  "RESET": "RIPRISTINA",
+  "RESET": "Ripristina",
   "Reset_password": "Ripristina password",
   "resetting_password": "ripristinando password",
   "Review_app_desc": "Dacci 5 stesse su {{store}}",
@@ -401,6 +408,7 @@
   "Roles": "Ruoli",
   "Room_Info": "Informazioni stanza",
   "Room_Info_Edit": "Modifica informazioni stanza",
+  "Room_Password": "Password della stanza",
   "SAVE": "SALVA",
   "Save": "Salva",
   "Save_Changes": "Salva cambiamenti",
@@ -442,6 +450,7 @@
   "Share_Link": "Condividi link",
   "Share_this_app": "Condividi questa app",
   "Show_more": "Mostra altri",
+  "Show_Password": "Mostra password",
   "Show_the_keyboard_shortcut_list": "Mostra l'elenco delle scorciatoie per la tastiera",
   "Sign_Up": "Registrati",
   "Slash_Gimme_Description": "Displays ༼ つ ◕_◕ ༽つ before your message",
@@ -484,8 +493,9 @@
   "Translate": "Traduci",
   "Try_again": "Riprova",
   "Two_Factor_Authentication": "Autenticazione a due fattori",
+  "Two_Factor_Success_message": "Codice di autenticazione a due fattori inviato! Si prega di controllare la tua email.",
   "Type_message": "Scrivi messaggio",
-  "UNARCHIVE": "RIMUOVI DALL'ARCHIVIO",
+  "UNARCHIVE": "Rimuovi dall'archivio",
   "unarchive": "rimuovi dall'archivio",
   "Unfollowed_thread": "Non segui più il thread",
   "Unignore": "Non ignorare",
diff --git a/app/i18n/locales/ja.json b/app/i18n/locales/ja.json
index 75d6b8ab06..0edcb9ea62 100644
--- a/app/i18n/locales/ja.json
+++ b/app/i18n/locales/ja.json
@@ -49,7 +49,9 @@
   "Change_Language": "言語を変更",
   "Change_language_loading": "言語の変更",
   "changing_avatar": "アバターを変更",
+  "Channel_hint_private": "人々は招待されることによってのみ参加することができます",
   "Channel_Name": "チャンネル名",
+  "Channel_Read_Only_Hint": "チャネル所有者のみが新しいメッセージを送信できます",
   "Channels": "チャンネル",
   "Chat_closed_by_agent": "エージェントが閉じたチャット",
   "Chats": "チャット",
@@ -122,6 +124,7 @@
   "E2E_How_It_Works_info4": "既存のE2Eパスワードを入力した任意のブラウザから、暗号化キーの新しいパスワードをいつでも設定することもできます。",
   "Edit": "編集",
   "Edit_Invite": "編集に招待",
+  "Edit_Room_Photo": "部屋の写真を編集します",
   "Edit_Status": "ステータスを編集する",
   "Email": "メールアドレス",
   "Email_Notification_Mode_All": "すべてのメンション/DM",
@@ -160,7 +163,7 @@
   "Files": "ファイル",
   "Finish_recording": "録音停止",
   "Following_thread": "スレッド更新時に通知",
-  "For_your_security_you_must_enter_your_current_password_to_continue": "セキュリティのため、続けるには現在のパスワードを入力してください。",
+  "For_your_security_you_must_enter_your_current_password_to_continue": "セキュリティのために、続行するにはアカウントのパスワードを入力する必要があります。",
   "Forgot_password": "パスワードを忘れた",
   "Forgot_password_If_this_email_is_registered": "送信したメールアドレスが登録されていれば、パスワードのリセット方法を送信しました。メールアドレスがすぐに来ない場合はやり直してください。",
   "Forward": "転送",
@@ -174,6 +177,7 @@
   "Glossary_of_simplified_terms": "簡易用語集",
   "Has_left_the_team": "チームを退出しました",
   "Help": "助け",
+  "Hide_Password": "パスワードを隠す",
   "Hide_room": "ルームを非表示",
   "Hide_System_Messages": "システムメッセージを非表示にする",
   "Hide_type_messages": "\"{{type}}\"メッセージを非表示にする",
@@ -198,6 +202,8 @@
   "Join_the_given_channel": "指定したチャネルに参加",
   "Just_invited_people_can_access_this_channel": "招待されたユーザーだけがこのチャンネルに参加できます",
   "Just_invited_people_can_access_this_team": "招待されたユーザーのみがこのチームにアクセスできます",
+  "Label_Input_Two_Factor_Code": "コード",
+  "Label_Input_Two_Factor_Password": "パスワード",
   "Language": "言語",
   "last_message": "最後のメッセージ",
   "Leave": "ルームを退出",
@@ -288,6 +294,7 @@
   "Reactions_are_disabled": "リアクションは無効化されています",
   "Reactions_are_enabled": "リアクションは有効化されています",
   "Read_Only": "読み取り専用",
+  "Read_only_hint": "チャネル所有者のみが新しいメッセージを送信できます",
   "Read_Receipt": "レシートを見る",
   "Receive_Group_Mentions": "グループの通知を受け取る",
   "Receive_Group_Mentions_Info": "@all と @here の通知を受け取る",
@@ -316,6 +323,7 @@
   "Roles": "ロール",
   "Room_Info": "ルーム情報",
   "Room_Info_Edit": "ルーム情報を編集",
+  "Room_Password": "部屋のパスワード",
   "SAVE": "保存",
   "Save": "保存",
   "Save_Changes": "変更を保存",
@@ -344,6 +352,7 @@
   "Share": "シェア",
   "Share_Link": "リンクをシェアする",
   "Share_this_app": "このアプリをシェアする",
+  "Show_Password": "パスワードを表示",
   "Show_the_keyboard_shortcut_list": "キーボードショートカットリストを表示",
   "Sign_Up": "登録",
   "Slash_Gimme_Description": "メッセージの前に༼ つ ◕_◕ ༽つを表示",
@@ -377,6 +386,7 @@
   "Translate": "翻訳",
   "Try_again": "再度お試しください。",
   "Two_Factor_Authentication": "２段階認証",
+  "Two_Factor_Success_message": "二要素認証コードが送信されました！メールを確認してください。",
   "Type_message": "メッセージを入力",
   "UNARCHIVE": "アーカイブ解除",
   "unarchive": "アーカイブ解除",
diff --git a/app/i18n/locales/nl.json b/app/i18n/locales/nl.json
index be28da60f3..84b4ad5267 100644
--- a/app/i18n/locales/nl.json
+++ b/app/i18n/locales/nl.json
@@ -30,7 +30,7 @@
   "Announcement": "Aankondiging",
   "announcement": "aankondiging",
   "Apply_Certificate": "Certificaat toepassen",
-  "ARCHIVE": "ARCHIVEER",
+  "ARCHIVE": "Archiveer",
   "archive": "archiveer",
   "are_typing": "zijn aan het typen",
   "Are_you_sure_question_mark": "Weet je het zeker?",
@@ -59,7 +59,9 @@
   "Change_Language": "Taal veranderen",
   "Change_language_loading": "Taal veranderen",
   "changing_avatar": "avatar aan het veranderen",
+  "Channel_hint_private": "Mensen kunnen alleen meedoen door uitgenodigd te worden",
   "Channel_Name": "Kanaal naam",
+  "Channel_Read_Only_Hint": "Alleen kanaaleigenaren kunnen nieuwe berichten verzenden",
   "Channels": "Kanalen",
   "Chat_closed_by_agent": "Chat gesloten door agent",
   "Chat_is_on_hold": "Deze chat staat in de wacht wegens inactiviteit",
@@ -169,6 +171,7 @@
   "E2E_How_It_Works_info4": "Je kan ook op elk moment een nieuw wachtwoord voor uw coderingssleutel instellen vanuit elke browser waarin u het bestaande E2E-wachtwoord hebt ingevoerd.",
   "Edit": "Bewerk",
   "Edit_Invite": "Bewerk uitnodiging",
+  "Edit_Room_Photo": "Roomfoto bewerken",
   "Edit_Status": "Status bewerken",
   "Email": "E-mail",
   "Email_Notification_Mode_All": "Elke vermelding/DM",
@@ -212,8 +215,8 @@
   "Files": "Bestanden",
   "Finish_recording": "Opname beëindigen",
   "Following": "Volgend",
-  "Following_thread": "Volg discussie",
-  "For_your_security_you_must_enter_your_current_password_to_continue": "Voor je veiligheid moet je je huidige wachtwoord invoeren om door te gaan",
+  "Following_thread": "Volg draad",
+  "For_your_security_you_must_enter_your_current_password_to_continue": "Voor uw veiligheid moet u uw accountwachtwoord invoeren om door te gaan.",
   "Forgot_password": "Wachtwoord vergeten?",
   "Forgot_password_If_this_email_is_registered": "Als dit e-mailadres geregistreerd is, sturen we instructies om je wachtwoord opnieuw in te stellen. Als je geen e-mail ontvangt, kom dan terug en probeer het opnieuw.",
   "Forward": "Doorsturen",
@@ -229,6 +232,7 @@
   "Group_by": "Groeperen op",
   "Has_left_the_team": "heeft het team verlaten",
   "Help": "Hulp",
+  "Hide_Password": "Wachtwoord verbergen",
   "Hide_room": "Kamer verbergen",
   "Hide_System_Messages": "Verberg systeemberichten",
   "Hide_type_messages": "Verberg \"{{type}}\" berichten",
@@ -254,6 +258,8 @@
   "Join_the_given_channel": "Word lid van het gegeven kanaal",
   "Just_invited_people_can_access_this_channel": "Alleen uitgenodigde mensen hebben toegang tot dit kanaal",
   "Just_invited_people_can_access_this_team": "Alleen uitgenodigde mensen hebben toegang tot dit team",
+  "Label_Input_Two_Factor_Code": "Code",
+  "Label_Input_Two_Factor_Password": "Wachtwoord",
   "Language": "Taal",
   "last_message": "laatste bericht",
   "Last_owner_team_room": "Je bent de laatste eigenaar van dit kanaal. Zodra u het team verlaat, blijft het kanaal binnen het team, maar beheert u het van buitenaf.",
@@ -368,9 +374,9 @@
   "No_Read_Receipts": "Geen leesbevestigingen",
   "No_results_found": "Geen resultaten gevonden",
   "No_starred_messages": "Geen berichten met ster gemarkeerd",
-  "No_threads": "Er zijn geen discussies",
-  "No_threads_following": "Je volgt geen discussies",
-  "No_threads_unread": "Er zijn geen ongelezen discussies",
+  "No_threads": "Er zijn geen draden",
+  "No_threads_following": "Je volgt geen draden",
+  "No_threads_unread": "Er zijn geen ongelezen draden",
   "Not_RC_Server": "Neem contact op met uw werkruimtebeheerder of zoek in uw e-mailinbox naar een Rocket.Chat werkruimte-uitnodiging.",
   "Nothing": "Niets",
   "Nothing_to_save": "Niets om op te slaan!",
@@ -432,6 +438,7 @@
   "Read_External_Permission": "Lees toestemming voor media",
   "Read_External_Permission_Message": "Rocket.Chat heeft toegang nodig tot foto's, media en bestanden op je apparaat",
   "Read_Only": "Alleen lezen",
+  "Read_only_hint": "Alleen kanaaleigenaren kunnen nieuwe berichten verzenden",
   "Read_Receipt": "Leesbevestiging",
   "Receive_Group_Mentions": "Groepsvermeldingen ontvangen",
   "Receive_Group_Mentions_Info": "Ontvang @all en @here vermeldingen",
@@ -452,11 +459,11 @@
   "replies": "antwoordt",
   "Reply": "Antwoord",
   "reply": "antwoord",
-  "Reply_in_Thread": "Reageer in discussie",
+  "Reply_in_Thread": "Reageer in draad",
   "Report": "Rapporteren",
   "Required": "Vereist",
   "Resend": "Opnieuw verzenden",
-  "RESET": "RESET",
+  "RESET": "Reset",
   "Reset_password": "Wachtwoord resetten",
   "resetting_password": "wachtwoord aan het resetten",
   "Resume": "Hervatten",
@@ -471,6 +478,7 @@
   "Roles": "Rollen",
   "Room_Info": "Kamer info",
   "Room_Info_Edit": "Kamer info bewerken",
+  "Room_Password": "Kamerwachtwoord",
   "room-name-already-exists": "Kamernaam bestaat al",
   "SAVE": "OPSLAAN",
   "Save": "Opslaan",
@@ -522,6 +530,7 @@
   "Sharing": "Delen",
   "Shortcut": "Snelkoppeling",
   "Show_more": "Meer tonen",
+  "Show_Password": "Toon wachtwoord",
   "Show_the_keyboard_shortcut_list": "Toon de lijst met sneltoetsen",
   "Sign_Up": "Registreren",
   "Slash_Gimme_Description": "Geeft ༼ つ ◕_◕ ༽つ weer voor uw bericht",
@@ -572,9 +581,10 @@
   "Translate": "Vertalen",
   "Try_again": "Probeer het opnieuw",
   "Two_Factor_Authentication": "Twee-factor authenticatie",
+  "Two_Factor_Success_message": "Twee-factor authenticatiecode verzonden! Controleer uw e-mail.",
   "Type_message": "Typ bericht",
   "Types": "Soorten",
-  "UNARCHIVE": "DEARCHIVEREN",
+  "UNARCHIVE": "Dearchiveren",
   "unarchive": "dearchiveren",
   "unauthorized": "Onbevoegd",
   "Unfollowed_thread": "Draad ontvolgd",
diff --git a/app/i18n/locales/pt-BR.json b/app/i18n/locales/pt-BR.json
index 20c14b61c4..94940b1861 100644
--- a/app/i18n/locales/pt-BR.json
+++ b/app/i18n/locales/pt-BR.json
@@ -47,7 +47,7 @@
   "announcement": "anúncio",
   "App_users_are_not_allowed_to_log_in_directly": "Usuários do aplicativo não estão autorizados a fazer login diretamente.",
   "Apply_Certificate": "Aplicar certificado",
-  "ARCHIVE": "ARQUIVAR",
+  "ARCHIVE": "Arquivar",
   "archive": "arquivar",
   "are_typing": "estão digitando",
   "Are_you_sure_question_mark": "Você tem certeza?",
@@ -99,9 +99,10 @@
   "Channel_hint_encrypted": "Canal criptografado de ponta a ponta. A pesquisa não funcionará com canais criptografados e as notificações podem não mostrar o conteúdo das mensagens.",
   "Channel_hint_encrypted_not_available": "Indisponível para canais públicos",
   "Channel_hint_not_read_only": "Todos usuários no canal podem enviar mensagens novas",
-  "Channel_hint_private": "Apenas usuários convidados podem acessar este canal",
+  "Channel_hint_private": "As pessoas só podem entrar por meio de convite",
   "Channel_hint_public": "Todos podem acessar este canal",
   "Channel_Name": "Nome do canal",
+  "Channel_Read_Only_Hint": "Apenas os proprietários do canal podem enviar novas mensagens",
   "Channels": "Canais",
   "Chat_closed_by_agent": "Conversa fechada por agente",
   "Chat_is_on_hold": "Esta conversa está em espera devido à inatividade",
@@ -244,6 +245,7 @@
   "E2E_How_It_Works_info4": "Você também pode configurar uma nova senha para sua chave de criptografia a qualquer momento em qualquer navegador em que tenha inserido a senha E2E existente.",
   "Edit": "Editar",
   "Edit_Invite": "Editar convite",
+  "Edit_Room_Photo": "Editar foto da sala",
   "Edit_Status": "Editar status",
   "Email": "E-mail",
   "Email_Notification_Mode_All": "Toda menção / mensagem direta",
@@ -300,7 +302,7 @@
   "Finish_recording": "Encerrar gravação",
   "Following": "Seguindo",
   "Following_thread": "Começou a seguir tópico",
-  "For_your_security_you_must_enter_your_current_password_to_continue": "Para sua segurança, você precisa digitar sua senha",
+  "For_your_security_you_must_enter_your_current_password_to_continue": "Para sua segurança, você deve inserir a senha da sua conta para continuar.",
   "Forgot_password": "Esqueceu sua senha?",
   "Forgot_password_If_this_email_is_registered": "Se este e-mail estiver cadastrado, enviaremos instruções sobre como redefinir sua senha. Se você não receber um e-mail em breve, volte e tente novamente.",
   "Forward": "Encaminhar",
@@ -318,6 +320,7 @@
   "Group_by": "Agrupar por",
   "Has_left_the_team": "saiu do time",
   "Help": "Ajuda",
+  "Hide_Password": "Ocultar senha",
   "Hide_room": "Ocultar",
   "Hide_System_Messages": "Esconder mensagens do sistema",
   "Hide_type_messages": "Esconder mensagens de \"{{type}}\"",
@@ -356,6 +359,8 @@
   "Jump_to_message": "Ir para mensagem",
   "Just_invited_people_can_access_this_channel": "Apenas as pessoas convidadas podem acessar este canal",
   "Just_invited_people_can_access_this_team": "Apenas as pessoas convidadas podem acessar este time",
+  "Label_Input_Two_Factor_Code": "Código",
+  "Label_Input_Two_Factor_Password": "Senha",
   "Language": "Idioma",
   "last_message": "última mensagem",
   "Last_owner_team_room": "Você é o último dono deste canal. Uma vez que você deixe o time, o canal será mantido dentro do time, mas você estará administrando-o de fora.",
@@ -564,7 +569,7 @@
   "Read_External_Permission": "Permissão de acesso à arquivos",
   "Read_External_Permission_Message": "Rocket.Chat precisa acessar fotos, mídia e arquivos no seu dispositivo",
   "Read_Only": "Somente leitura",
-  "Read_only_hint": "Somente usuários autorizados podem escrever novas mensagens",
+  "Read_only_hint": "Somente os proprietários do canal podem enviar novas mensagens",
   "Read_Receipt": "Lida por",
   "Receive_Group_Mentions": "Receber menções de grupo",
   "Receive_Group_Mentions_Info": "Receber menções @all e @here",
@@ -596,7 +601,7 @@
   "Required": "Obrigatório",
   "Resend": "Reenviar",
   "Resend_email": "Reenviar e-mail",
-  "RESET": "RESETAR",
+  "RESET": "Resetar",
   "Reset_password": "Resetar senha",
   "resetting_password": "redefinindo senha",
   "Resume": "Continuar",
@@ -620,6 +625,7 @@
   "Room_Info_Edit": "Editar",
   "Room_name_changed_to": "alterou o nome da sala para: {{name}}",
   "Room_not_found": "Sala não encontrada",
+  "Room_Password": "Senha da sala",
   "room_removed_read_only_permission": "removeu permissão de escrita da sala",
   "room_set_read_only_permission": "adicionou permissão de escrita à sala",
   "room_unarchived": "desarquivou a sala",
@@ -682,6 +688,7 @@
   "Show_badge_for_mentions_Info": "Mostrar contador somente para menções diretas",
   "Show_less": "Mostrar menos",
   "Show_more": "Mostrar mais",
+  "Show_Password": "Mostrar senha",
   "Show_the_keyboard_shortcut_list": "Mostrar a lista de atalhos de teclado",
   "Sign_Up": "Registrar",
   "Skip": "Pular",
@@ -749,9 +756,10 @@
   "Translate": "Traduzir",
   "Try_again": "Tentar novamente",
   "Two_Factor_Authentication": "Autenticação de dois fatores",
+  "Two_Factor_Success_message": "Código de autenticação de dois fatores enviado! Por favor, verifique seu e-mail.",
   "Type_message": "Digitar mensagem",
   "Types": "Tipos",
-  "UNARCHIVE": "DESARQUIVAR",
+  "UNARCHIVE": "Desarquivar",
   "unarchive": "desarquivar",
   "unauthorized": "Não autorizado",
   "Unblock": "Desbloquear",
diff --git a/app/i18n/locales/pt-PT.json b/app/i18n/locales/pt-PT.json
index 1901be246e..49b2b3503a 100644
--- a/app/i18n/locales/pt-PT.json
+++ b/app/i18n/locales/pt-PT.json
@@ -25,7 +25,7 @@
   "Announcement": "Anúncio",
   "announcement": "anúncio",
   "Apply_Certificate": "Aplicar certificado",
-  "ARCHIVE": "ARQUIVAR",
+  "ARCHIVE": "Arquivar",
   "archive": "arquivar",
   "are_typing": "estão a escrever",
   "Are_you_sure_question_mark": "Tem a certeza?",
@@ -47,7 +47,9 @@
   "Certificate_password": "Senha do Certificado",
   "Change_language_loading": "Mudança de idioma.",
   "changing_avatar": "a alterar avatar",
+  "Channel_hint_private": "As pessoas só podem se juntar ao ser convidadas",
   "Channel_Name": "Nome do Canal",
+  "Channel_Read_Only_Hint": "Somente os proprietários de canais podem enviar novas mensagens",
   "Channels": "Canais",
   "Chat_closed_by_agent": "Chat fechado por agente",
   "Chats": "Chats",
@@ -118,6 +120,7 @@
   "E2E_How_It_Works_info4": "Você também pode configurar uma nova senha para sua chave de criptografia a qualquer momento a partir de qualquer navegador que você tenha inserido a senha existente do E2E.",
   "Edit": "Editar",
   "Edit_Invite": "Editar Convite",
+  "Edit_Room_Photo": "Editar foto da sala",
   "Edit_Status": "Editar Status",
   "Email": "E-mail",
   "Email_Notification_Mode_All": "Cada Menção/DM",
@@ -155,7 +158,7 @@
   "Files": "Ficheiros",
   "Finish_recording": "Terminar a gravação",
   "Following_thread": "Seguir discussão",
-  "For_your_security_you_must_enter_your_current_password_to_continue": "Para sua segurança, você deve escrever a sua palavra-passe actual para continuar",
+  "For_your_security_you_must_enter_your_current_password_to_continue": "Para sua segurança, deve introduzir a palavra-passe da sua conta para continuar.",
   "Forgot_password": "Esquecer palavra-passe",
   "Forgot_password_If_this_email_is_registered": "Se este e-mail estiver registado, enviaremos instruções sobre como repor a sua palavra-passe. Se você não receber um e-mail em breve, volte e tente novamente.",
   "Forward": "Reencaminhar",
@@ -169,6 +172,7 @@
   "Get_link": "Obter Ligação",
   "Glossary_of_simplified_terms": "Glossário de termos simplificados",
   "Help": "Ajuda",
+  "Hide_Password": "Ocultar Palavra-passe",
   "Hide_room": "Esconder sala",
   "Hide_System_Messages": "Esconder mensagens do sistema",
   "Hide_type_messages": "Esconder mensagens \"{{type}}\"",
@@ -193,6 +197,8 @@
   "Join_the_given_channel": "Entrar no canal apresentado",
   "Just_invited_people_can_access_this_channel": "Apenas utilizadores convidados podem aceder a este canal",
   "Just_invited_people_can_access_this_team": "Apenas pessoas convidadas podem aceder a esta equipa",
+  "Label_Input_Two_Factor_Code": "Código",
+  "Label_Input_Two_Factor_Password": "Palavra-passe",
   "Language": "Idioma",
   "last_message": "última mensagem",
   "Leave": "Sair",
@@ -306,19 +312,21 @@
   "Read_External_Permission": "Permissão de leitura da média",
   "Read_External_Permission_Message": "Rocket.Chat precisa acessar fotos, média e arquivos em seu dispositivo",
   "Read_Only": "Só de Leitura",
+  "Read_only_hint": "Somente os proprietários do canal podem enviar novas mensagens",
   "Read_Receipt": "Recibos de leitura",
   "Register": "Registar",
   "Remove_someone_from_room": "Remover alguém da sala",
   "Reply": "Responder",
   "Required": "Obrigatório",
   "Resend": "Reenviar",
-  "RESET": "REPOR",
+  "RESET": "Repor",
   "Reset_password": "Repor palavra-passe",
   "resetting_password": "a repor palavra-passe",
   "Rocket_Chat_Documentation": "Documentação do Rocket.Chat",
   "Roles": "Funções",
   "Room_Info": "Informação da Sala",
   "Room_Info_Edit": "Editar Informação da Sala",
+  "Room_Password": "Senha da sala",
   "SAVE": "GUARDAR",
   "Save": "Guardar",
   "Save_Changes": "Guardar Alterações",
@@ -336,6 +344,7 @@
   "Settings": "Definições",
   "Settings_succesfully_changed": "Definições guardadas com sucesso!",
   "Share": "Partilhar",
+  "Show_Password": "Mostrar palavra-passe",
   "Show_the_keyboard_shortcut_list": "Exibe a lista de atalhos do teclado",
   "Sign_Up": "Inscreva-se",
   "Slash_Gimme_Description": "Mostra  (つ ◕_◕) つ  antes de sua mensagem",
@@ -357,7 +366,8 @@
   "topic": "tópico",
   "Try_again": "Tente novamente",
   "Two_Factor_Authentication": "Autenticação 2FA",
-  "UNARCHIVE": "DESARQUIVAR",
+  "Two_Factor_Success_message": "Código de autenticação de dois fatores enviado! Por favor, verifique o seu email.",
+  "UNARCHIVE": "Desarquivar",
   "unarchive": "desarquivar",
   "Unmute": "Retirar silêncio",
   "Unmute_someone_in_room": "Remover silenciar de alguém na sala",
diff --git a/app/i18n/locales/ru.json b/app/i18n/locales/ru.json
index fa4bae9990..7f80ba3bf8 100644
--- a/app/i18n/locales/ru.json
+++ b/app/i18n/locales/ru.json
@@ -36,7 +36,7 @@
   "Announcement": "Объявление",
   "announcement": "объявление",
   "Apply_Certificate": "Применить сертификат",
-  "ARCHIVE": "АРХИВ",
+  "ARCHIVE": "Архив",
   "archive": "архив",
   "are_typing": "печатают",
   "Are_you_sure_question_mark": "Вы уверены?",
@@ -75,9 +75,10 @@
   "Channel_hint_encrypted": "Канал со сквозным шифрованием. Поиск не будет работать в зашифрованных каналах, а уведомления могут не отображать содержание сообщений.",
   "Channel_hint_encrypted_not_available": "Недоступно для публичных каналов",
   "Channel_hint_not_read_only": "Все пользователи канала могут писать новые сообщения",
-  "Channel_hint_private": "Только приглашенные пользователи могут получить доступ к этому каналу",
+  "Channel_hint_private": "Люди могут присоединиться только к приглашению",
   "Channel_hint_public": "У всех есть доступ к этому каналу",
   "Channel_Name": "Название канала",
+  "Channel_Read_Only_Hint": "Только владельцы каналов могут отправлять новые сообщения",
   "Channels": "Каналы",
   "Chat_closed_by_agent": "Чат закрыт агентом",
   "Chat_is_on_hold": "Этот чат находится в режиме удержания из-за неактивности",
@@ -194,6 +195,7 @@
   "E2E_How_It_Works_info4": "Так же Вы можете задать новый пароль для вашего ключа шифрования в любое время при помощи браузера там же, где Вы ввели существующий Е2Е пароль.",
   "Edit": "Правка",
   "Edit_Invite": "Редактировать Приглашение",
+  "Edit_Room_Photo": "Редактировать фото комнаты",
   "Edit_Status": "Изменить статус",
   "Email": "E-mail",
   "Email_Notification_Mode_All": "Каждое Упоминание/Личное сообщение",
@@ -239,7 +241,7 @@
   "Finish_recording": "Завершить запись",
   "Following": "Следить",
   "Following_thread": "Следить за тредом",
-  "For_your_security_you_must_enter_your_current_password_to_continue": "В целях вашей безопасности вы должны ввести свой текущий пароль для продолжения",
+  "For_your_security_you_must_enter_your_current_password_to_continue": "Для вашей безопасности вы должны ввести пароль от вашего аккаунта, чтобы продолжить.",
   "Forgot_password": "Забыли пароль",
   "Forgot_password_If_this_email_is_registered": "Если эта электронная почта зарегистрирована, мы отправим инструкции о том, как сбросить пароль. Если вы не получите письмо в ближайшее время, вернитесь и повторите попытку.",
   "Forward": "Перенаправить",
@@ -255,6 +257,7 @@
   "Group_by": "Группировка",
   "Has_left_the_team": "покинул Команду",
   "Help": "Помощь",
+  "Hide_Password": "Скрыть пароль",
   "Hide_room": "Скрыть комнату",
   "Hide_System_Messages": "Скрыть Системные Сообщения",
   "Hide_type_messages": "Скрыть \"{{type}}\" сообщения",
@@ -281,6 +284,8 @@
   "Joined": "участвовал",
   "Just_invited_people_can_access_this_channel": "Только приглашенные люди могут получить доступ к этому каналу",
   "Just_invited_people_can_access_this_team": "Только приглашенные пользователи могут получить доступ к этой Команде",
+  "Label_Input_Two_Factor_Code": "Код",
+  "Label_Input_Two_Factor_Password": "Пароль",
   "Language": "Язык",
   "last_message": "последнее сообщение",
   "Last_owner_team_room": "Вы последний владелец этого чата. Как только вы покинете Команду, чат будет храниться внутри нее, но вы будете управлять ею снаружи.",
@@ -463,7 +468,7 @@
   "Read_External_Permission": "Разрешение на Чтение Медиа",
   "Read_External_Permission_Message": "Rocket.Chat необходим доступ к фотографиям, медиа и другим файлам на вашем устройстве",
   "Read_Only": "Только для чтения",
-  "Read_only_hint": "Только авторизованные пользователи могут писать новые сообщения",
+  "Read_only_hint": "Только владельцы каналов могут отправлять новые сообщения",
   "Read_Receipt": "Уведомление о прочтении",
   "Receive_Group_Mentions": "Получать групповые уведомления",
   "Receive_Group_Mentions_Info": "Получать @all и @here уведомления",
@@ -489,7 +494,7 @@
   "Report": "Жалоба",
   "Required": "Обязательно",
   "Resend": "Отправить повторно",
-  "RESET": "СБРОС",
+  "RESET": "Сброс",
   "Reset_password": "Сброс пароля",
   "resetting_password": "сброс пароля",
   "Resume": "Возобновить",
@@ -505,6 +510,7 @@
   "Roles": "Роли",
   "Room_Info": "Информация о канале",
   "Room_Info_Edit": "Изменить информацию о чате",
+  "Room_Password": "Пароль комнаты",
   "room-name-already-exists": "Имя чата уже существует",
   "SAVE": "СОХРАНИТЬ",
   "Save": "Сохранить",
@@ -561,6 +567,7 @@
   "Show_badge_for_mentions": "Показать значок для упоминаний",
   "Show_badge_for_mentions_Info": "Отображение значка только для прямых упоминаний",
   "Show_more": "Показать больше",
+  "Show_Password": "Показать пароль",
   "Show_the_keyboard_shortcut_list": "Показывать список горячих клавиш",
   "Sign_Up": "Регистрация",
   "Skip": "Пропустить",
@@ -620,9 +627,10 @@
   "Translate": "Перевести",
   "Try_again": "Попробуйте еще раз",
   "Two_Factor_Authentication": "Двухфакторная аутентификация",
+  "Two_Factor_Success_message": "Код двухфакторной аутентификации отправлен! Пожалуйста, проверьте вашу электронную почту.",
   "Type_message": "Написать сообщение",
   "Types": "Типы",
-  "UNARCHIVE": "РАЗАРХИВИРОВАТЬ",
+  "UNARCHIVE": "Разархивировать",
   "unarchive": "разархивировать",
   "unauthorized": "Неавторизованный",
   "Unfollowed_thread": "Не следить",
diff --git a/app/i18n/locales/sl-SI.json b/app/i18n/locales/sl-SI.json
index de38f19c1a..2de8a4690c 100644
--- a/app/i18n/locales/sl-SI.json
+++ b/app/i18n/locales/sl-SI.json
@@ -34,7 +34,7 @@
   "Announcement": "Obvestilo",
   "announcement": "obvestilo",
   "Apply_Certificate": "Uporabi certifikat",
-  "ARCHIVE": "ARHIV",
+  "ARCHIVE": "Arhiv",
   "archive": "arhiv",
   "are_typing": "pišejo",
   "Are_you_sure_question_mark": "Ste prepričani?",
@@ -63,7 +63,9 @@
   "Change_Language": "Spremeni jezik",
   "Change_language_loading": "Spreminjanje jezika.",
   "changing_avatar": "spreminjanje avatarja",
+  "Channel_hint_private": "Ljudje se lahko pridružijo samo z vabilom",
   "Channel_Name": "Ime kanala",
+  "Channel_Read_Only_Hint": "Samo lastniki kanala lahko pošiljajo nova sporočila",
   "Channels": "Kanali",
   "Chat_closed_by_agent": "Klepet je zaprl agent",
   "Chat_is_on_hold": "Ta klepet zaradi neaktivnosti ni na voljo",
@@ -179,6 +181,7 @@
   "E2E_How_It_Works_info4": "Novo geslo za šifrirni ključ lahko nastavite tudi kadar koli iz katerega koli brskalnika, ki ste ga vnesli obstoječe geslo E2E.",
   "Edit": "Uredi",
   "Edit_Invite": "Uredi povabilo",
+  "Edit_Room_Photo": "Uredi fotografijo sobe",
   "Edit_Status": "Uredi stanje",
   "Email": "E-poštni naslov",
   "Email_Notification_Mode_All": "Vsaka omemba/neposredno sporočilo",
@@ -224,7 +227,7 @@
   "Finish_recording": "Zaključek snemanja",
   "Following": "Sledenje",
   "Following_thread": "Naslednja nit",
-  "For_your_security_you_must_enter_your_current_password_to_continue": "Zaradi svoje varnosti morate za nadaljevanje vnesti trenutno geslo",
+  "For_your_security_you_must_enter_your_current_password_to_continue": "Zaradi vaše varnosti morate vnesti geslo za svoj račun, da nadaljujete.",
   "Forgot_password": "Pozabljeno geslo",
   "Forgot_password_If_this_email_is_registered": "Če je ta elektronski naslov registriran, bomo poslali navodila, kako ponastaviti geslo. Če v kratkem ne prejmete e -pošte, se vrnite in poskusite znova.",
   "Forward": "Posreduj",
@@ -239,6 +242,7 @@
   "Group_by": "Skupina po",
   "Has_left_the_team": "je zapustil ekipo",
   "Help": "Pomoč",
+  "Hide_Password": "Skrij geslo",
   "Hide_room": "Skrij sobo",
   "Hide_System_Messages": "Skrij sistemska sporočila",
   "Hide_type_messages": "Skrij sporočila \"{{type}}\"",
@@ -264,6 +268,8 @@
   "Join_the_given_channel": "Pridružite se določenemu kanalu",
   "Just_invited_people_can_access_this_channel": "Do tega kanala lahko dostopajo samo povabljeni",
   "Just_invited_people_can_access_this_team": "Samo povabljeni ljudje lahko dostopajo do te ekipe",
+  "Label_Input_Two_Factor_Code": "Koda",
+  "Label_Input_Two_Factor_Password": "Geslo",
   "Language": "Jezik",
   "last_message": "Zadnje sporočilo",
   "Last_owner_team_room": "Ste zadnji lastnik tega kanala. Ko zapustite ekipo, bo kanal zadržan v ekipi, vendar ga boste upravljali od zunaj.",
@@ -444,6 +450,7 @@
   "Read_External_Permission": "Dovoljenje za branje medija",
   "Read_External_Permission_Message": "Rocket.Chat potrebuje dostop do fotografij, medijev in datotek v vaši napravi",
   "Read_Only": "Le branje",
+  "Read_only_hint": "Samo lastniki kanalov lahko pošljejo nova sporočila",
   "Read_Receipt": "Preberite potrdilo",
   "Receive_Group_Mentions": "Prejemajte omembe skupine",
   "Receive_Group_Mentions_Info": "Prejemate @all in @Here omembe",
@@ -468,7 +475,7 @@
   "Report": "Poročilo",
   "Required": "Obvezno",
   "Resend": "Ponovno poslati",
-  "RESET": "PONASTAVITI",
+  "RESET": "Ponastaviti",
   "Reset_password": "Ponastavitev gesla",
   "resetting_password": "Ponastavitev gesla",
   "Resume": "Nadaljuj",
@@ -484,6 +491,7 @@
   "Roles": "Vloge",
   "Room_Info": "Informacije o sobi",
   "Room_Info_Edit": "Uredi informacije o sobi",
+  "Room_Password": "Sobno geslo",
   "room-name-already-exists": "Ime sobe že obstaja",
   "SAVE": "Shrani",
   "Save": "Shrani",
@@ -538,6 +546,7 @@
   "Show_badge_for_mentions": "Pokažite značko za omembe",
   "Show_badge_for_mentions_Info": "Prikaz značke samo za neposredne omembe",
   "Show_more": "Prikaži več",
+  "Show_Password": "Pokaži geslo",
   "Show_the_keyboard_shortcut_list": "Prikaži seznam bližnjic na tipkovnici",
   "Sign_Up": "Prijavite se",
   "Slash_Gimme_Description": "Prikaže ༼ つ ◕_◕ ༽つ pred vašim sporočilom",
@@ -587,9 +596,10 @@
   "Translate": "Prevesti",
   "Try_again": "Poskusi ponovno",
   "Two_Factor_Authentication": "Dvofaktorska overjanje",
+  "Two_Factor_Success_message": "Dvofaktorska avtentikacijska koda poslana! Prosimo, preverite svoj e-poštni naslov.",
   "Type_message": "Tip sporočila",
   "Types": "Vrste",
-  "UNARCHIVE": "ODPAKIRATI",
+  "UNARCHIVE": "Odpakirati",
   "unarchive": "Odpakirati",
   "unauthorized": "Nepooblaščen",
   "Unfollowed_thread": "Nit, ki ji nihče ne sledi",
diff --git a/app/i18n/locales/sv.json b/app/i18n/locales/sv.json
index 74b7d4f06b..255fcab589 100644
--- a/app/i18n/locales/sv.json
+++ b/app/i18n/locales/sv.json
@@ -38,7 +38,7 @@
   "Announcement": "Meddelande",
   "announcement": "meddelande",
   "Apply_Certificate": "Tillämpa certifikat",
-  "ARCHIVE": "ARKIV",
+  "ARCHIVE": "Arkiv",
   "archive": "arkiv",
   "are_typing": "skriver",
   "Are_you_sure_question_mark": "Är du säker?",
@@ -79,9 +79,10 @@
   "Channel_hint_encrypted": "End-to-end-krypterad kanal. Sökfunktionen fungerar inte med krypterade kanaler och innehållet i meddelanden kanske inte visas.",
   "Channel_hint_encrypted_not_available": "Inte tillgängligt för offentliga kanaler",
   "Channel_hint_not_read_only": "Alla användare i kanalen kan skriva meddelanden",
-  "Channel_hint_private": "Endast inbjudna användare kan öppna kanalen",
+  "Channel_hint_private": "Människor kan bara gå med genom att bli inbjudna",
   "Channel_hint_public": "Alla kan öppna kanalen",
   "Channel_Name": "Kanalnamn",
+  "Channel_Read_Only_Hint": "Endast kanalägare kan skicka nya meddelanden",
   "Channels": "Kanaler",
   "Chat_closed_by_agent": "Chatten stängdes av agenten",
   "Chat_is_on_hold": "Den här chatten är parkerad på grund av inaktivitet",
@@ -202,6 +203,7 @@
   "E2E_How_It_Works_info4": "Du kan när som helst ställa in ett nytt lösenord för krypteringsnyckeln i en webbläsare där du har angett det befintliga E2E-lösenordet.",
   "Edit": "Redigera",
   "Edit_Invite": "Redigera inbjudan",
+  "Edit_Room_Photo": "Redigera rumsfoto",
   "Edit_Status": "Redigera status",
   "Email": "E-post",
   "Email_Notification_Mode_All": "Varje omnämnande/direktmeddelande",
@@ -248,7 +250,7 @@
   "Finish_recording": "Avsluta inspelningen",
   "Following": "Följer",
   "Following_thread": "Följer tråd",
-  "For_your_security_you_must_enter_your_current_password_to_continue": "För din  egen säkerhet måste du ange ditt nuvarande lösenord för att fortsätta",
+  "For_your_security_you_must_enter_your_current_password_to_continue": "För din säkerhet måste du ange ditt kontolösenord för att fortsätta.",
   "Forgot_password": "Glömt lösenordet?",
   "Forgot_password_If_this_email_is_registered": "Om e-postadressen är registrerad skickar vi anvisningar för hur du återställer lösenordet. Om du inte får ett e-postmeddelande inom kort får du komma tillbaka och försöka igen.",
   "Forward": "Vidarebefordra",
@@ -264,6 +266,7 @@
   "Group_by": "Gruppera per",
   "Has_left_the_team": "har lämnat kanalen",
   "Help": "Hjälp",
+  "Hide_Password": "Dölj lösenord",
   "Hide_room": "Dölj rum",
   "Hide_System_Messages": "Dölj systemmeddelanden",
   "Hide_type_messages": "Dölj meddelanden av typen {{type}}",
@@ -290,6 +293,8 @@
   "Joined": "Anslöt",
   "Just_invited_people_can_access_this_channel": "Endast inbjudna har åtkomst till den här kanalen",
   "Just_invited_people_can_access_this_team": "Endast inbjudna har åtkomst till det här teamet",
+  "Label_Input_Two_Factor_Code": "Kod",
+  "Label_Input_Two_Factor_Password": "Lösenord",
   "Language": "Språk",
   "last_message": "senaste meddelandet",
   "Last_owner_team_room": "Du är den sista ägaren av kanalen. När du har lämnat teamet behålls kanalen i teamet, men du får hantera den utifrån.",
@@ -472,7 +477,7 @@
   "Read_External_Permission": "Behörighet att läsa media",
   "Read_External_Permission_Message": "Rocket.Chat behöver åtkomst till foton, media och filer på enheten",
   "Read_Only": "Skrivskyddat",
-  "Read_only_hint": "Endast behöriga användare kan skriva nya meddelanden",
+  "Read_only_hint": "Endast kanalägare kan skicka nya meddelanden",
   "Read_Receipt": "Läskvitto",
   "Receive_Group_Mentions": "Ta emot gruppomnämnanden",
   "Receive_Group_Mentions_Info": "Ta emot omnämnanden av typen @all och @here",
@@ -501,7 +506,7 @@
   "Report": "Anmäl",
   "Required": "Obligatorisk",
   "Resend": "Skicka igen",
-  "RESET": "ÅTERSTÄLL",
+  "RESET": "Återställ",
   "Reset_password": "Återställ lösenordet",
   "resetting_password": "återställer lösenordet",
   "Resume": "Återuppta",
@@ -524,6 +529,7 @@
   "Room_Info": "Information om rum",
   "Room_Info_Edit": "Redigera information om rum",
   "Room_name_changed_to": "ändrade rummets namn till: {{name}}",
+  "Room_Password": "Rumslösenord",
   "room_removed_read_only_permission": "tog bort behörighet för skrivskyddad åtkomst",
   "room_set_read_only_permission": "skrivskydda rummet",
   "room_unarchived": "avarkiverade rum",
@@ -583,6 +589,7 @@
   "Show_badge_for_mentions": "Visa märke för omnämnanden",
   "Show_badge_for_mentions_Info": "Visa endast märke för direkta omnämnanden",
   "Show_more": "Visa mer",
+  "Show_Password": "Visa lösenord",
   "Show_the_keyboard_shortcut_list": "Visa genvägslistan för tangentbordet",
   "Sign_Up": "Registrera dig",
   "Skip": "Hoppa över",
@@ -642,9 +649,10 @@
   "Translate": "Översätt",
   "Try_again": "Försök igen",
   "Two_Factor_Authentication": "Tvåfaktorsautentisering",
+  "Two_Factor_Success_message": "Tvåfaktorsautentiseringskod skickad! Vänligen kontrollera din e-post.",
   "Type_message": "Skriv meddelande",
   "Types": "Typer",
-  "UNARCHIVE": "AVARKIVERA",
+  "UNARCHIVE": "Avarkivera",
   "unarchive": "avarkivera",
   "unauthorized": "Obehörig",
   "Unfollowed_thread": "Sluta följa tråd",
diff --git a/app/i18n/locales/ta-IN.json b/app/i18n/locales/ta-IN.json
index 3e9e5a52a2..b5e5705d97 100644
--- a/app/i18n/locales/ta-IN.json
+++ b/app/i18n/locales/ta-IN.json
@@ -94,9 +94,10 @@
   "Channel_hint_encrypted": "இறுதியாக குழுவிகள் குழுவிகள் குறியாகிவிடப்பட்டுள்ளன. குறியீடுகளுடன் தேடல் செய்ய முடியாது மற்றும் அறிவிப்புகள் செய்தி உள்ளடக்கங்களைக் காட்டாது.",
   "Channel_hint_encrypted_not_available": "பொது சேனல்களுக்கு கிடைக்காது",
   "Channel_hint_not_read_only": "சேனலிலுள்ள அனைத்து பயனர்களும் புதிய செய்திகளை எழுதலாம்",
-  "Channel_hint_private": "அழைக்கப்பட்ட பயனர்கள் மட்டும் இந்த சேனலுக்கு அணுகலாம்",
+  "Channel_hint_private": "மக்கள் அழைப்பின் மூலம் மட்டும் சேர முடியும்",
   "Channel_hint_public": "அனைத்து பயனர்களும் இந்த சேனலுக்கு அணுகலாம்",
   "Channel_Name": "சேனலின் பெயர்",
+  "Channel_Read_Only_Hint": "சேனல் உரிமையாளர்கள் மட்டுமே புதிய செய்திகளை அனுப்ப முடியும்",
   "Channels": "சேனல்கள்",
   "Chat_closed_by_agent": "ஏஜென்ட் மூடிய உரையாடல்",
   "Chat_is_on_hold": "இந்த உரையாடல் செயலற்றது ஆகின்று உள்ளது",
@@ -222,6 +223,7 @@
   "E2E_How_It_Works_info4": "நீங்கள் ஏற்கனவே உள்ள E2E பாஸ்வேர்டை உள்ளீடு செய்த உலாவியிலிருந்து எந்த பருவமும் புதிய பாஸ்வேர்டை அமைக்கலாம்.",
   "Edit": "திருத்து",
   "Edit_Invite": "அழைப்பை திருத்து",
+  "Edit_Room_Photo": "அறை புகைப்படத்தைத் திருத்து",
   "Edit_Status": "நிலையை திருத்து",
   "Email": "மின்னஞ்சல்",
   "Email_Notification_Mode_All": "எல்லா குறிபாக / தனிப்பட்டது",
@@ -270,7 +272,7 @@
   "Finish_recording": "பதிவு முடிக்கவும்",
   "Following": "பின்பாகம்",
   "Following_thread": "பின்னூட்டம் பின்னுக்குகின்றது",
-  "For_your_security_you_must_enter_your_current_password_to_continue": "உங்களுக்காக பாதுகாக்கத்தக்கது, தொடர உங்கள் தற்போதைய கடவுச்சொல்லை உள்ளிட வேண்டும்",
+  "For_your_security_you_must_enter_your_current_password_to_continue": "உங்கள் பாதுகாப்பிற்காக, தொடர்ந்து செல்ல உங்கள் கணக்கு கடவுச்சொல்லை உள்ளிட வேண்டும்.",
   "Forgot_password": "உங்கள் கடவுச்சொல்லை மறந்துவிட்டீர்களா?",
   "Forgot_password_If_this_email_is_registered": "இந்த மின்னஞ்சல் பதிவு செய்யப்பட்டிருந்தால், உங்கள் கடவுச்சொல் எப்போது மீள்விக்கப்படும் என்று நிருபருக்கு அறிவித்துக் கொள்ளும். குறிப்பாக ஏதேனும் புதிய மின்னஞ்சல் பெறாதால், மீண்டும் மீண்டும் வருகின்று முயற்சிக்கவும்.",
   "Forward": "முன்னேற்று",
@@ -287,6 +289,7 @@
   "Group_by": "குழுப்படுத்து",
   "Has_left_the_team": "குழுவை விட்டுவிட்டார்",
   "Help": "உதவி",
+  "Hide_Password": "கடவுச்சொல்லை மறைக்கவும்",
   "Hide_System_Messages": "அமைப்பு செய்திகளை மறைக்க",
   "Hide_type_messages": "\"{{type}}\" செய்திகளை மறைக்க",
   "How_It_Works": "இது எப்படி வேலை செய்கின்றது",
@@ -316,6 +319,8 @@
   "Joined": "சேர்ந்தன",
   "Just_invited_people_can_access_this_channel": "எந்தவொரு அழைப்பவரும் இந்த சேனலுக்கு அணுகலாம்",
   "Just_invited_people_can_access_this_team": "எந்தவொரு அழைப்பவரும் இந்த அணுகும் குழுக்கு அணுகலாம்",
+  "Label_Input_Two_Factor_Code": "குறியீடு",
+  "Label_Input_Two_Factor_Password": "கடவுச்சொல்",
   "Language": "மொழி",
   "last_message": "கடைசி செய்தி",
   "Last_owner_team_room": "நீங்கள் இந்த சேனலின் கடைசி உரிமையாளர். குழுவிலிருந்து நீங்கள் விடுவிக்கின்றீர்கள் பின்னர், சேனல் குழுவினுள் உள்ளது, ஆனால் நீங்கள் இதை வெளியேறியிருப்பது.",
@@ -511,7 +516,7 @@
   "Read_External_Permission": "மீடியா அனுமதி",
   "Read_External_Permission_Message": "ராக்கெட்.சேட் உங்கள் கருவியில் புகைப்படங்கள், மீடியா மற்றும் கோப்புகளுக்கு அணுகல் பெற விரும்புகின்றது",
   "Read_Only": "மட்டுமே படிக்க முடியும்",
-  "Read_only_hint": "அனுமதிக்கப்பட்ட பயனர்கள் மட்டும் புதிய செய்திகளை எழுதலாம்",
+  "Read_only_hint": "சேனல் உரிமையாளர்கள் மட்டுமே புதிய செய்திகளை அனுப்ப முடியும்",
   "Read_Receipt": "படித்த ரசீது",
   "Receive_Group_Mentions": "குழு குறிப்புகளைப் பெறு",
   "Receive_Group_Mentions_Info": "@all மற்றும் @here குறிப்புகளைப் பெறு",
@@ -563,6 +568,7 @@
   "Room_Info_Edit": "அறை தகவல் திருத்து",
   "Room_name_changed_to": "அறை பெயர் மாற்றினது: {{name}}",
   "Room_not_found": "அறை காணப்படவில்லை",
+  "Room_Password": "அறை கடவுச்சொல்",
   "room_removed_read_only_permission": "மட்டுமே படிக்க அனுமதியை அகற்றினது",
   "room_set_read_only_permission": "அறையை மட்டுமே படிக்க அனுமதியுடன் அமைத்தது",
   "room_unarchived": "கோப்பு சேகரிக்கப்படாத அறை",
@@ -623,6 +629,7 @@
   "Show_badge_for_mentions": "குறிப்பிடல்களுக்கு பாட்ஜ் காட்டு",
   "Show_badge_for_mentions_Info": "உடைந்த குறிப்பிடல்களுக்கு மட்டும் பாட்ஜை காட்டு",
   "Show_more": "மேலும் காட்டு..",
+  "Show_Password": "கடவுச்சொல்லை காட்டு",
   "Sign_Up": "பதிவு செய்",
   "Skip": "தவிர்",
   "Sort_by": "மூலம் வரிசைப்படுத்து",
@@ -675,6 +682,7 @@
   "Translate": "மொழிபெயர்",
   "Try_again": "மீண்டும் முயற்சி செய்",
   "Two_Factor_Authentication": "இரண்டு பரிமாறு அங்கீகாரம்",
+  "Two_Factor_Success_message": "இரண்டு காரணி உறுதிப்படுத்தல் குறியீடு அனுப்பப்பட்டுள்ளது! உங்கள் மின்னஞ்சலை சரிபார்க்கவும்.",
   "Type_message": "செய்தியை தட்டச்சு",
   "Types": "வகைகள்",
   "UNARCHIVE": "அசைவு செய்",
diff --git a/app/i18n/locales/te-IN.json b/app/i18n/locales/te-IN.json
index 4fe2b60ee6..c47f545ce2 100644
--- a/app/i18n/locales/te-IN.json
+++ b/app/i18n/locales/te-IN.json
@@ -222,6 +222,7 @@
   "E2E_How_It_Works_info4": "మీరు అనుమతి పొందకపోతే, మీరు ప్రస్తుతం ఉపయోగించిన E2E పాస్‌వర్డ్ నుండి ఎంక్రిప్షన్ కీకి కొత్త పాస్‌వర్డ్ సెట్ చేయవచ్చు.",
   "Edit": "సవరించు",
   "Edit_Invite": "ఆహ్వానాన్ని సవరించు",
+  "Edit_Room_Photo": "గది ఫోటోను సవరించండి",
   "Edit_Status": "స్థితిని సవరించు",
   "Email": "ఇ-మెయిల్",
   "Email_Notification_Mode_All": "ప్రతి ఉల్లేఖం / DM",
@@ -270,7 +271,7 @@
   "Finish_recording": "రికార్డింగ్ ముగించండి",
   "Following": "అనుసరించుతుంది",
   "Following_thread": "అనుసరించుకోవడానికి థ్రెడ్",
-  "For_your_security_you_must_enter_your_current_password_to_continue": "మీ భద్రతా కోసం, మీరు కొన్ని సమయంగా మీ ప్రస్తుత పాస్‌వర్డ్‌ను నమోదు చేయాలి",
+  "For_your_security_you_must_enter_your_current_password_to_continue": "आपकी सुरक्षा के लिए, जारी रखने के लिए आपको अपने खाते का पासवर्ड दर्ज करना होगा।",
   "Forgot_password": "మీ పాస్‌వర్డ్ మరచిపోయారా?",
   "Forgot_password_If_this_email_is_registered": "ఈ ఇ-మెయిల్ నమోదు చేసినట్లు, మేము మీ పాస్‌వర్డ్‌ను రీసెట్ చేయడానికి సూచనలు పంపబడిపోతాము. మీరు చాలా తక్కువగా ఒక ఇ-మెయిల్ లభిస్తే, దయచేసి మరియువకాయ ప్రయాసించండి.",
   "Forward": "అగ్రగామించండి",
@@ -287,6 +288,7 @@
   "Group_by": "గ్రూప్ చేయండి",
   "Has_left_the_team": "టీమ్ ను వదిలిపోయారు",
   "Help": "సహాయం",
+  "Hide_Password": "पासवर्ड छिपाएं",
   "Hide_System_Messages": "వ్యవస్థ సందేశాలను దాచండి",
   "Hide_type_messages": "{{type}} సందేశాలను దాచండి",
   "How_It_Works": "ఇది ఎలా పని చేస్తుంది",
@@ -316,6 +318,8 @@
   "Joined": "చేరారు",
   "Just_invited_people_can_access_this_channel": "కేవలం ఆమంత్రణపెట్టబడిన వారు ఈ ఛానల్‌కు ప్రవేశించవచ్చు",
   "Just_invited_people_can_access_this_team": "కేవలం ఆమంత్రణపెట్టబడిన వారు ఈ టీమ్‌కు ప్రవేశించవచ్చు",
+  "Label_Input_Two_Factor_Code": "कोड",
+  "Label_Input_Two_Factor_Password": "पासवर्ड",
   "Language": "భాష",
   "last_message": "చివరి సందేశం",
   "Last_owner_team_room": "మీరు ఈ ఛానల్‌కు చివరి యజమాని. మీరు టీమ్ ను విడిచిపోతే, ఛానల్ టీమ్ లో ఉంటుంది కాని మీరు వాడు బాహ్యాంతరం నుండి అదనపుడు నిర్వహిస్తారు.",
@@ -511,7 +515,7 @@
   "Read_External_Permission": "మీడియా అనుమతి",
   "Read_External_Permission_Message": "రాకెట్.చాట్ మీ పరికరాల్లో ఫోటోలను, మీడియాను మరియు ఫైళ్లను ప్రవేశించాలి",
   "Read_Only": "కేవలం చదవడానికి",
-  "Read_only_hint": "కొనసాగించిన వాడాలు మాత్రమే కొత్త సందేశాలను రాయగలరు",
+  "Read_only_hint": "ఛానెల్ యజమానులు మాత్రమే క్రొత్త సందేశాలను పంపగలరు",
   "Read_Receipt": "చదవడానికి సాక్షాత్కారం",
   "Receive_Group_Mentions": "గ్రూప్ స్మరణలు స్వీకరించు",
   "Receive_Group_Mentions_Info": "@all మరియు @here స్మరణలు స్వీకరించు",
@@ -563,6 +567,7 @@
   "Room_Info_Edit": "గది సమాచారం సవరించు",
   "Room_name_changed_to": "గది పేరును మార్చారు: {{name}}",
   "Room_not_found": "కొన్ని కారణాలతో కమ్మిట్ చేయబడినవి లేవు",
+  "Room_Password": "గది పాస్‌వర్డ్",
   "room_removed_read_only_permission": "గదిలో పఠనాధారిత అనుమతిని తొలగించారు",
   "room_set_read_only_permission": "గదిని కేవలం చదవడానికి రూపొందించారు",
   "room_unarchived": "అభిలోఖిత నుండి తీసుకొనబడింది",
@@ -623,6 +628,7 @@
   "Show_badge_for_mentions": "ప్రస్తావనల కోసం బ్యాడ్జ్ చూపించు",
   "Show_badge_for_mentions_Info": "కేవలం సర్వర్ల ఉపయోగించిన ప్రస్తావనల కోసం బ్యాడ్జ్ చూపించాలి",
   "Show_more": "మరింతగా చూపండి..",
+  "Show_Password": "पासवर्ड दिखाएं",
   "Sign_Up": "నమోదు చేయండి",
   "Skip": "స్కిప్",
   "Sort_by": "సార్టు చేయండి",
@@ -675,6 +681,7 @@
   "Translate": "అనువాదం",
   "Try_again": "ప్రయత్నించండి",
   "Two_Factor_Authentication": "రెండు అంశ ప్రామాణీకరణ",
+  "Two_Factor_Success_message": "द्वि-घटक प्रमाणीकरण कोड भेज दिया गया है! कृपया अपना ईमेल जाँचें।",
   "Type_message": "సందేశాన్ని టైప్ చేయండి",
   "Types": "రకాలు",
   "UNARCHIVE": "అనార్కైవ్",
diff --git a/app/i18n/locales/tr.json b/app/i18n/locales/tr.json
index d5e3267542..3970521fe0 100644
--- a/app/i18n/locales/tr.json
+++ b/app/i18n/locales/tr.json
@@ -26,7 +26,7 @@
   "Announcement": "Duyuru",
   "announcement": "duyuru",
   "Apply_Certificate": "Sertifika uygula",
-  "ARCHIVE": "ARŞİVLE",
+  "ARCHIVE": "Arşi̇vle",
   "archive": "arşivle",
   "are_typing": "yazıyor",
   "Are_you_sure_question_mark": "Emin misiniz?",
@@ -49,7 +49,9 @@
   "Change_Language": "Dili değiştir",
   "Change_language_loading": "Dil değiştiriliyor",
   "changing_avatar": "profil fotoğrafı değiştirme",
+  "Channel_hint_private": "İnsanlar sadece davet edilerek katılabilir",
   "Channel_Name": "Kanal Adı",
+  "Channel_Read_Only_Hint": "Yalnızca kanal sahipleri yeni mesajlar gönderebilir",
   "Channels": "Kanallar",
   "Chat_closed_by_agent": "Sohbet temsilci tarafından kapatıldı",
   "Chats": "Sohbetler",
@@ -136,6 +138,7 @@
   "E2E_How_It_Works_info4": "Mevcut Uçtan Uca Şifreleme (E2E) şifresini, herhangi bir tarayıcıdan istediğiniz zaman girdiğiniz şifreleme anahtarınız için yeni bir şifre de ayarlayabilirsiniz.",
   "Edit": "Düzenle",
   "Edit_Invite": "Daveti Düzenle",
+  "Edit_Room_Photo": "Oda fotoğrafını düzenle",
   "Edit_Status": "Durumu Düzenle",
   "Email": "E-posta",
   "Email_Notification_Mode_All": "Tüm Bahsetmeler/Özel İletiler",
@@ -173,7 +176,7 @@
   "Finish_recording": "Kaydı bitir",
   "Following": "Takip ediliyor",
   "Following_thread": "Konu takip ediliyor",
-  "For_your_security_you_must_enter_your_current_password_to_continue": "Güvenliğiniz için, devam etmek için mevcut şifrenizi girmelisiniz",
+  "For_your_security_you_must_enter_your_current_password_to_continue": "Güvenliğiniz için devam etmek üzere hesap şifrenizi girmeniz gerekmektedir.",
   "Forgot_password": "Parolanızı mı unuttunuz?",
   "Forgot_password_If_this_email_is_registered": "Bu e-posta kayıtlıysa, şifrenizi nasıl sıfırlayacağınıza dair talimatlar göndereceğiz. Kısa süre içinde bir e-posta almazsanız, lütfen geri gelin ve tekrar deneyin.",
   "Forward": "İlet",
@@ -187,6 +190,7 @@
   "Get_link": "Bağlantıyı Al",
   "Glossary_of_simplified_terms": "Basitleştirilmiş terimler sözlüğü",
   "Help": "Yardım",
+  "Hide_Password": "Şifreyi Gizle",
   "Hide_room": "Gizle",
   "Hide_System_Messages": "Sistem İletilerını Gizle",
   "Hide_type_messages": "\"{{type}}\" iletilerini gizle",
@@ -211,6 +215,8 @@
   "Join_Code": "Katılım Kodu",
   "Join_the_given_channel": "Verilen kanala katıl",
   "Just_invited_people_can_access_this_channel": "Yalnızca davet edilen kişiler bu kanala erişebilir",
+  "Label_Input_Two_Factor_Code": "Kod",
+  "Label_Input_Two_Factor_Password": "Şifre",
   "Language": "Dil",
   "last_message": "son ileti",
   "Leave": "Odadan ayrıl",
@@ -353,6 +359,7 @@
   "Read_External_Permission": "Medya Okuma İzni ",
   "Read_External_Permission_Message": "Rocket.Chat'in cihazınızdaki fotoğraflara, medyaya ve dosyalara erişmesi gerekiyor",
   "Read_Only": "Yazma Kısıtlı",
+  "Read_only_hint": "Yalnızca kanal sahipleri yeni mesajlar gönderebilir",
   "Read_Receipt": "Okundu Bilgisi",
   "Receive_Group_Mentions": "Grup Bahsetmelerini Al",
   "Receive_Group_Mentions_Info": "Grup bahsetmelerini al",
@@ -370,7 +377,7 @@
   "Report": "Bildir",
   "Required": "Gerekli",
   "Resend": "Yeniden yolla",
-  "RESET": "SIFIRLA",
+  "RESET": "Sifirla",
   "Reset_password": "Şifre sıfırla",
   "resetting_password": "şifre sıfırlanıyor",
   "Review_app_desc": "{{store}} üzerinde bize 5 yıldız verin",
@@ -384,6 +391,7 @@
   "Roles": "Roller",
   "Room_Info": "Oda Bilgisi",
   "Room_Info_Edit": "Oda Bilgilerini Düzenle",
+  "Room_Password": "Oda şifresi",
   "SAVE": "KAYDET",
   "Save": "Kaydet",
   "Save_Changes": "Değişiklikleri Kaydet",
@@ -425,6 +433,7 @@
   "Share_Link": "Bağlantı paylaş",
   "Share_this_app": "Bu uygulamayı paylaş",
   "Show_more": "Daha fazla göster",
+  "Show_Password": "Şifreyi Göster",
   "Show_the_keyboard_shortcut_list": "Klavye kısayol listesini göster",
   "Sign_Up": "Kaydol",
   "Slash_Gimme_Description": "İletilerinizden önce ༼ つ ◕_◕ ༽つ gösterir",
@@ -467,8 +476,9 @@
   "Translate": "Çevir",
   "Try_again": "Tekrar deneyin",
   "Two_Factor_Authentication": "İki faktörlü Kimlik Doğrulama",
+  "Two_Factor_Success_message": "İki faktörlü kimlik doğrulama kodu gönderildi! Lütfen e-postanızı kontrol edin.",
   "Type_message": "İleti yaz",
-  "UNARCHIVE": "ARŞİVDEN ÇIKAR",
+  "UNARCHIVE": "Arşi̇vden çikar",
   "unarchive": "arşivden çıkar",
   "Unfollowed_thread": "Takip edilmeyen başlık",
   "Unignore": "Yok sayma",
diff --git a/app/i18n/locales/zh-CN.json b/app/i18n/locales/zh-CN.json
index 1307389e7b..62a6f36bb1 100644
--- a/app/i18n/locales/zh-CN.json
+++ b/app/i18n/locales/zh-CN.json
@@ -49,7 +49,9 @@
   "Change_Language": "切换语言",
   "Change_language_loading": "切换语言",
   "changing_avatar": "更改头像",
+  "Channel_hint_private": "人们只能被邀请加入",
   "Channel_Name": "频道名",
+  "Channel_Read_Only_Hint": "只有频道所有者可以发送新消息",
   "Channels": "频道",
   "Chat_closed_by_agent": "聊天已被客服关闭",
   "Chats": "聊天",
@@ -132,6 +134,7 @@
   "E2E_How_It_Works_info4": "您也可以随时从已输入既有密码的任何浏览器设定新密码给您的加密金钥。",
   "Edit": "编辑",
   "Edit_Invite": "编辑邀请",
+  "Edit_Room_Photo": "编辑房间照片",
   "Edit_Status": "编辑状态",
   "Email": "邮箱",
   "Email_Notification_Mode_All": "每次被标记或私讯",
@@ -169,7 +172,7 @@
   "Finish_recording": "完成录制",
   "Following": "正在追踪",
   "Following_thread": "追踪的讨论串",
-  "For_your_security_you_must_enter_your_current_password_to_continue": "出于安全考虑，您必须输入您的密码以便继续操作",
+  "For_your_security_you_must_enter_your_current_password_to_continue": "为了您的安全，您必须输入您的账户密码才能继续。",
   "Forgot_password": "忘记密码",
   "Forgot_password_If_this_email_is_registered": "如果这邮箱已注册，我们将发送如何重置密码的说明。如果您没有在短时间内收到电子邮件，请再试一次。",
   "Forward": "转发",
@@ -182,6 +185,7 @@
   "Get_help": "获取帮助",
   "Glossary_of_simplified_terms": "简化术语词汇表",
   "Help": "帮助",
+  "Hide_Password": "隐藏密码",
   "Hide_System_Messages": "隐藏系统信息",
   "Hide_type_messages": "隐藏 \"{{type}}\" 信息",
   "How_It_Works": "运作方式",
@@ -198,6 +202,8 @@
   "is_typing": "正在输入",
   "Join": "加入",
   "Just_invited_people_can_access_this_channel": "仅有被邀请人能进入这个频道",
+  "Label_Input_Two_Factor_Code": "代码",
+  "Label_Input_Two_Factor_Password": "密码",
   "Language": "语言",
   "last_message": "最后一条信息",
   "leave": "离开",
@@ -336,6 +342,7 @@
   "Read_External_Permission": "读取媒体权限",
   "Read_External_Permission_Message": "Rocket.Chat 需要存取您装置上的相片、多媒体及文件",
   "Read_Only": "只读",
+  "Read_only_hint": "只有频道所有者可以发送新消息",
   "Read_Receipt": "查看已读人员",
   "Receive_Group_Mentions": "接收群组提及",
   "Receive_Group_Mentions_Info": "接收@all和@here提及",
@@ -365,6 +372,7 @@
   "Roles": "角色",
   "Room_Info": "聊天室信息",
   "Room_Info_Edit": "聊天室信息编辑",
+  "Room_Password": "房间密码",
   "SAVE": "保存",
   "Save": "保存",
   "Save_Changes": "保存更改",
@@ -406,6 +414,7 @@
   "Share_Link": "分享链接",
   "Share_this_app": "分享此 app",
   "Show_more": "显示更多",
+  "Show_Password": "显示密码",
   "Sign_Up": "注册",
   "Sound": "声音",
   "Star": "标记",
@@ -439,6 +448,7 @@
   "Translate": "翻译",
   "Try_again": "再试一次",
   "Two_Factor_Authentication": "双重认证",
+  "Two_Factor_Success_message": "已发送双因素验证代码！请检查您的电子邮件。",
   "Type_message": "输入信息",
   "UNARCHIVE": "取消封存",
   "unarchive": "取消封存",
diff --git a/app/i18n/locales/zh-TW.json b/app/i18n/locales/zh-TW.json
index 175bafc2ac..ba215bd28e 100644
--- a/app/i18n/locales/zh-TW.json
+++ b/app/i18n/locales/zh-TW.json
@@ -49,7 +49,9 @@
   "Change_Language": "切換語言",
   "Change_language_loading": "切換語言",
   "changing_avatar": "更改大頭貼",
+  "Channel_hint_private": "人們只能被邀請加入",
   "Channel_Name": "頻道名稱",
+  "Channel_Read_Only_Hint": "只有頻道所有者可以發送新消息",
   "Channels": "頻道",
   "Chat_closed_by_agent": "聊天已被客服關閉",
   "Chats": "聊天",
@@ -138,6 +140,7 @@
   "E2E_How_It_Works_info4": "您也可以隨時從已輸入既有密碼的任何瀏覽器設定新密碼給您的加密金鑰。",
   "Edit": "編輯",
   "Edit_Invite": "編輯邀請",
+  "Edit_Room_Photo": "編輯房間照片",
   "Edit_Status": "編輯狀態",
   "Email": "電子郵件",
   "Email_Notification_Mode_All": "每次被標記或私訊",
@@ -177,7 +180,7 @@
   "Finish_recording": "完成錄製",
   "Following": "正在追蹤",
   "Following_thread": "追蹤的討論串",
-  "For_your_security_you_must_enter_your_current_password_to_continue": "為了您的安全，您必須重新輸入密碼才能繼續",
+  "For_your_security_you_must_enter_your_current_password_to_continue": "為了您的安全，您必須輸入您的帳戶密碼以繼續。",
   "Forgot_password": "忘記密碼",
   "Forgot_password_If_this_email_is_registered": "如果此電子郵件已註冊，我們將發送有關如何重設密碼的說明。如果您未在短時間內收到電子郵件，請再試一次。",
   "Forward": "轉發",
@@ -191,6 +194,7 @@
   "Get_link": "取得連結",
   "Glossary_of_simplified_terms": "簡化術語詞彙表",
   "Help": "幫助",
+  "Hide_Password": "隱藏密碼",
   "Hide_room": "隱藏",
   "Hide_System_Messages": "隱藏系統訊息",
   "Hide_type_messages": "隱藏 '{{type}}' 訊息",
@@ -212,6 +216,8 @@
   "Join": "加入",
   "Join_the_given_channel": "加入現有頻道",
   "Just_invited_people_can_access_this_channel": "僅有受邀者能存取此頻道",
+  "Label_Input_Two_Factor_Code": "程式碼",
+  "Label_Input_Two_Factor_Password": "密碼",
   "Language": "語言",
   "last_message": "最後一則訊息",
   "Leave": "離開",
@@ -353,6 +359,7 @@
   "Read_External_Permission": "讀取媒體權限",
   "Read_External_Permission_Message": "Rocket.Chat 需要存取您裝置上的相片、多媒體及檔案",
   "Read_Only": "唯讀",
+  "Read_only_hint": "只有頻道所有者可以發送新消息",
   "Read_Receipt": "查看已讀人員",
   "Receive_Group_Mentions": "接收群組提及",
   "Receive_Group_Mentions_Info": "接收@all和@here提及",
@@ -383,6 +390,7 @@
   "Roles": "角色",
   "Room_Info": "聊天室資訊",
   "Room_Info_Edit": "修改聊天室資訊",
+  "Room_Password": "房間密碼",
   "SAVE": "儲存",
   "Save": "儲存",
   "Save_Changes": "儲存更改",
@@ -424,6 +432,7 @@
   "Share_Link": "分享連結",
   "Share_this_app": "分享此 app",
   "Show_more": "顯示更多",
+  "Show_Password": "顯示密碼",
   "Show_the_keyboard_shortcut_list": "顯示鍵盤快捷鍵列表",
   "Sign_Up": "註冊",
   "Slash_Gimme_Description": "顯示（つ◕_◕）つ之前您的留言",
@@ -467,6 +476,7 @@
   "Translate": "翻譯",
   "Try_again": "再試一次",
   "Two_Factor_Authentication": "雙重認證",
+  "Two_Factor_Success_message": "雙重驗證碼已發送！請檢查您的電子郵件。",
   "Type_message": "輸入訊息",
   "UNARCHIVE": "取消封存",
   "unarchive": "取消封存",
diff --git a/app/lib/constants/colors.ts b/app/lib/constants/colors.ts
index f2af702b7d..345fe39221 100644
--- a/app/lib/constants/colors.ts
+++ b/app/lib/constants/colors.ts
@@ -1,4 +1,5 @@
 const backdropColor = '#000000';
+const overlayBackground = 'rgba(31, 35, 41, 0.65)';
 
 const light = {
 	surfaceLight: '#FFFFFF',
@@ -280,18 +281,21 @@ export const colors = {
 	light: {
 		...light,
 		backdropColor,
+		overlayBackground,
 		backdropOpacity: 0.3,
 		attachmentLoadingOpacity: 0.7
 	},
 	dark: {
 		...dark,
 		backdropColor,
+		overlayBackground,
 		backdropOpacity: 0.9,
 		attachmentLoadingOpacity: 0.3
 	},
 	black: {
 		...black,
 		backdropColor,
+		overlayBackground,
 		backdropOpacity: 0.9,
 		attachmentLoadingOpacity: 0.3
 	}
diff --git a/app/lib/constants/defaultSettings.ts b/app/lib/constants/defaultSettings.ts
index 82f321a073..44402f30b2 100644
--- a/app/lib/constants/defaultSettings.ts
+++ b/app/lib/constants/defaultSettings.ts
@@ -93,6 +93,9 @@ export const defaultSettings = {
 	Accounts_Iframe_api_method: {
 		type: 'valueAsString'
 	},
+	API_Embed: {
+		type: 'valueAsBoolean'
+	},
 	CROWD_Enable: {
 		type: 'valueAsBoolean'
 	},
diff --git a/app/lib/database/model/Subscription.js b/app/lib/database/model/Subscription.js
index cda8faa8f5..97eeed60b1 100644
--- a/app/lib/database/model/Subscription.js
+++ b/app/lib/database/model/Subscription.js
@@ -127,12 +127,16 @@ export default class Subscription extends Model {
 
 	@field('e2e_key') E2EKey;
 
+	@json('old_room_keys', sanitizer) oldRoomKeys;
+
 	@field('e2e_suggested_key') E2ESuggestedKey;
 
 	@field('encrypted') encrypted;
 
 	@field('e2e_key_id') e2eKeyId;
 
+	@json('users_waiting_for_e2e_keys', sanitizer) usersWaitingForE2EKeys;
+
 	@field('avatar_etag') avatarETag;
 
 	@field('team_id') teamId;
@@ -201,9 +205,11 @@ export default class Subscription extends Model {
 			livechatData: this.livechatData,
 			tags: this.tags,
 			E2EKey: this.E2EKey,
+			oldKeys: this.oldKeys,
 			E2ESuggestedKey: this.E2ESuggestedKey,
 			encrypted: this.encrypted,
 			e2eKeyId: this.e2eKeyId,
+			usersWaitingForE2EKeys: this.usersWaitingForE2EKeys,
 			avatarETag: this.avatarETag,
 			teamId: this.teamId,
 			teamMain: this.teamMain,
diff --git a/app/lib/database/model/migrations.js b/app/lib/database/model/migrations.js
index a40ceb0a5b..1fa1c734dc 100644
--- a/app/lib/database/model/migrations.js
+++ b/app/lib/database/model/migrations.js
@@ -310,6 +310,18 @@ export default schemaMigrations({
 					columns: [{ name: 'content', type: 'string', isOptional: true }]
 				})
 			]
+		},
+		{
+			toVersion: 26,
+			steps: [
+				addColumns({
+					table: 'subscriptions',
+					columns: [
+						{ name: 'users_waiting_for_e2e_keys', type: 'string', isOptional: true },
+						{ name: 'old_room_keys', type: 'string', isOptional: true }
+					]
+				})
+			]
 		}
 	]
 });
diff --git a/app/lib/database/schema/app.js b/app/lib/database/schema/app.js
index 73220f11de..0a69c06390 100644
--- a/app/lib/database/schema/app.js
+++ b/app/lib/database/schema/app.js
@@ -1,7 +1,7 @@
 import { appSchema, tableSchema } from '@nozbe/watermelondb';
 
 export default appSchema({
-	version: 25,
+	version: 26,
 	tables: [
 		tableSchema({
 			name: 'subscriptions',
@@ -56,9 +56,11 @@ export default appSchema({
 				{ name: 'livechat_data', type: 'string', isOptional: true },
 				{ name: 'tags', type: 'string', isOptional: true },
 				{ name: 'e2e_key', type: 'string', isOptional: true },
+				{ name: 'old_room_keys', type: 'string', isOptional: true },
 				{ name: 'e2e_suggested_key', type: 'string', isOptional: true },
 				{ name: 'encrypted', type: 'boolean', isOptional: true },
 				{ name: 'e2e_key_id', type: 'string', isOptional: true },
+				{ name: 'users_waiting_for_e2e_keys', type: 'string', isOptional: true },
 				{ name: 'avatar_etag', type: 'string', isOptional: true },
 				{ name: 'team_id', type: 'string', isIndexed: true },
 				{ name: 'team_main', type: 'boolean', isOptional: true }, // Use `Q.notEq(true)` to get false or null
diff --git a/app/lib/encryption/encryption.ts b/app/lib/encryption/encryption.ts
index bb287adc17..924d35262f 100644
--- a/app/lib/encryption/encryption.ts
+++ b/app/lib/encryption/encryption.ts
@@ -3,6 +3,7 @@ import { sanitizedRaw } from '@nozbe/watermelondb/RawRecord';
 import EJSON from 'ejson';
 import { deleteAsync } from 'expo-file-system';
 import SimpleCrypto from 'react-native-simple-crypto';
+import { sampleSize } from 'lodash';
 
 import {
 	IMessage,
@@ -36,9 +37,11 @@ import Deferred from './helpers/deferred';
 import EncryptionRoom from './room';
 import { decryptAESCTR, joinVectorData, randomPassword, splitVectorData, toString, utf8ToBuffer } from './utils';
 
+const ROOM_KEY_EXCHANGE_SIZE = 10;
 class Encryption {
 	ready: boolean;
 	privateKey: string | null;
+	publicKey: string | null;
 	readyPromise: Deferred;
 	userId: string | null;
 	roomInstances: {
@@ -53,15 +56,20 @@ class Encryption {
 			encryptFile: TEncryptFile;
 			encryptUpload: Function;
 			importRoomKey: Function;
+			resetRoomKey: Function;
+			hasSessionKey: () => boolean;
+			encryptGroupKeyForParticipantsWaitingForTheKeys: (params: any) => Promise<any>;
 		};
 	};
 	decryptionFileQueue: IDecryptionFileQueue[];
 	decryptionFileQueueActiveCount: number;
+	keyDistributionInterval: ReturnType<typeof setInterval> | null;
 
 	constructor() {
 		this.userId = '';
 		this.ready = false;
 		this.privateKey = null;
+		this.publicKey = null;
 		this.roomInstances = {};
 		this.readyPromise = new Deferred();
 		this.readyPromise
@@ -73,6 +81,7 @@ class Encryption {
 			});
 		this.decryptionFileQueue = [];
 		this.decryptionFileQueueActiveCount = 0;
+		this.keyDistributionInterval = null;
 	}
 
 	// Initialize Encryption client
@@ -84,6 +93,7 @@ class Encryption {
 		// so they can run parallelized
 		this.decryptPendingSubscriptions();
 		this.decryptPendingMessages();
+		this.initiateKeyDistribution();
 
 		// Mark Encryption client as ready
 		this.readyPromise.resolve();
@@ -105,6 +115,7 @@ class Encryption {
 	stop = () => {
 		this.userId = null;
 		this.privateKey = null;
+		this.publicKey = null;
 		this.roomInstances = {};
 		// Cancel ongoing encryption/decryption requests
 		this.readyPromise.reject();
@@ -139,13 +150,17 @@ class Encryption {
 		}
 
 		const roomE2E = await this.getRoomInstance(rid);
+		if (!roomE2E || !roomE2E?.hasSessionKey()) {
+			return;
+		}
 		return roomE2E.provideKeyToUser(keyId);
 	};
 
 	// Persist keys on UserPreferences
 	persistKeys = async (server: string, publicKey: string, privateKey: string) => {
 		this.privateKey = await SimpleCrypto.RSA.importKey(EJSON.parse(privateKey));
-		UserPreferences.setString(`${server}-${E2E_PUBLIC_KEY}`, EJSON.stringify(publicKey));
+		this.publicKey = EJSON.stringify(publicKey);
+		UserPreferences.setString(`${server}-${E2E_PUBLIC_KEY}`, this.publicKey);
 		UserPreferences.setString(`${server}-${E2E_PRIVATE_KEY}`, privateKey);
 	};
 
@@ -242,33 +257,43 @@ class Encryption {
 
 	// get a encryption room instance
 	getRoomInstance = async (rid: string) => {
-		// Prevent handshake again
-		if (this.roomInstances[rid]?.ready) {
-			return this.roomInstances[rid];
-		}
-
-		// If doesn't have a instance of this room
-		if (!this.roomInstances[rid]) {
+		try {
+			// Prevent handshake again
+			if (this.roomInstances[rid]) {
+				await this.roomInstances[rid].handshake();
+				return this.roomInstances[rid];
+			}
 			this.roomInstances[rid] = new EncryptionRoom(rid, this.userId as string);
-		}
 
-		const roomE2E = this.roomInstances[rid];
+			const roomE2E = this.roomInstances[rid];
 
-		// Start Encryption Room instance handshake
-		await roomE2E.handshake();
+			// Start Encryption Room instance handshake
+			await roomE2E.handshake();
 
-		return roomE2E;
+			return roomE2E;
+		} catch (e) {
+			log(e);
+			return null;
+		}
 	};
 
 	evaluateSuggestedKey = async (rid: string, E2ESuggestedKey: string) => {
 		if (this.privateKey) {
 			try {
 				const roomE2E = await this.getRoomInstance(rid);
-				await roomE2E.importRoomKey(E2ESuggestedKey, this.privateKey);
-				delete this.roomInstances[rid];
+				if (!roomE2E) {
+					return;
+				}
+
+				try {
+					await roomE2E.importRoomKey(E2ESuggestedKey, this.privateKey);
+				} catch (error) {
+					await Services.e2eRejectSuggestedGroupKey(rid);
+					return;
+				}
 				await Services.e2eAcceptSuggestedGroupKey(rid);
 			} catch (e) {
-				await Services.e2eRejectSuggestedGroupKey(rid);
+				console.error(e);
 			}
 		}
 	};
@@ -350,10 +375,7 @@ class Encryption {
 			const subsEncrypted = await subCollection.query(Q.where('e2e_key_id', Q.notEq(null)), Q.where('encrypted', true)).fetch();
 			await Promise.all(
 				subsEncrypted.map(async (sub: TSubscriptionModel) => {
-					const { rid, lastMessage, E2ESuggestedKey } = sub;
-					if (E2ESuggestedKey) {
-						await this.evaluateSuggestedKey(rid, E2ESuggestedKey);
-					}
+					const { rid, lastMessage } = sub;
 					const newSub = await this.decryptSubscription({ rid, lastMessage });
 					try {
 						return sub.prepareUpdate(
@@ -375,6 +397,97 @@ class Encryption {
 		}
 	};
 
+	async getSuggestedE2EEKeys(usersWaitingForE2EKeys: Record<string, { _id: string; public_key: string }[]>) {
+		const roomIds = Object.keys(usersWaitingForE2EKeys);
+		return Object.fromEntries(
+			// @ts-ignore
+			(
+				await Promise.all(
+					roomIds.map(async room => {
+						const roomE2E = await this.getRoomInstance(room);
+						if (!roomE2E || !roomE2E?.hasSessionKey()) {
+							return;
+						}
+						const usersWithKeys = await roomE2E.encryptGroupKeyForParticipantsWaitingForTheKeys(usersWaitingForE2EKeys[room]);
+
+						if (!usersWithKeys) {
+							return;
+						}
+
+						return [room, usersWithKeys];
+					})
+				)
+			).filter(Boolean)
+		);
+	}
+
+	async getSample(roomIds: string[], limit = 3): Promise<string[]> {
+		if (limit === 0) {
+			return [];
+		}
+
+		const randomRoomIds = sampleSize(roomIds, ROOM_KEY_EXCHANGE_SIZE);
+
+		const sampleIds: string[] = [];
+		for await (const roomId of randomRoomIds) {
+			const roomE2E = await this.getRoomInstance(roomId);
+			if (!roomE2E || !roomE2E?.hasSessionKey()) {
+				continue;
+			}
+
+			sampleIds.push(roomId);
+		}
+
+		if (!sampleIds.length && roomIds.length > limit) {
+			return this.getSample(roomIds, limit - 1);
+		}
+
+		return sampleIds;
+	}
+
+	initiateKeyDistribution = async () => {
+		if (this.keyDistributionInterval) {
+			return;
+		}
+
+		const keyDistribution = async () => {
+			const db = database.active;
+			const subCollection = db.get('subscriptions');
+			try {
+				const subscriptions = await subCollection.query(Q.where('users_waiting_for_e2e_keys', Q.notEq(null)));
+				if (subscriptions) {
+					const filteredSubs = subscriptions
+						.filter(sub => sub.usersWaitingForE2EKeys && !sub.usersWaitingForE2EKeys.some(user => user.userId === this.userId))
+						.map(sub => sub.rid);
+
+					const sampleIds = await this.getSample(filteredSubs);
+
+					if (!sampleIds.length) {
+						return;
+					}
+
+					const result = await Services.fetchUsersWaitingForGroupKey(sampleIds);
+					if (!result.success || !Object.keys(result.usersWaitingForE2EKeys).length) {
+						return;
+					}
+
+					const userKeysWithRooms = await this.getSuggestedE2EEKeys(result.usersWaitingForE2EKeys);
+
+					if (!Object.keys(userKeysWithRooms).length) {
+						return;
+					}
+
+					await Services.provideUsersSuggestedGroupKeys(userKeysWithRooms);
+				}
+			} catch (e) {
+				log(e);
+			}
+		};
+
+		await keyDistribution();
+		this.keyDistributionInterval = setInterval(keyDistribution, 10000);
+	};
+
 	// Creating the instance is enough to generate room e2ee key
 	encryptSubscription = (rid: string) => this.getRoomInstance(rid as string);
 
@@ -406,17 +519,14 @@ class Encryption {
 		}
 
 		const { rid } = subscription;
-		const db = database.active;
-		const subCollection = db.get('subscriptions');
-
-		let subRecord;
-		try {
-			subRecord = await subCollection.find(rid as string);
-		} catch {
-			// Do nothing
+		if (!rid) {
+			return subscription;
 		}
+		const subRecord = await getSubscriptionByRoomId(rid);
 
 		try {
+			const db = database.active;
+			const subCollection = db.get('subscriptions');
 			const batch: Model[] = [];
 			// If the subscription doesn't exists yet
 			if (!subRecord) {
@@ -455,6 +565,9 @@ class Encryption {
 
 		// Get a instance using the subscription
 		const roomE2E = await this.getRoomInstance(rid as string);
+		if (!roomE2E) {
+			return;
+		}
 		const decryptedMessage = await roomE2E.decrypt(lastMessage);
 		return {
 			...subscription,
@@ -464,6 +577,9 @@ class Encryption {
 
 	encryptText = async (rid: string, text: string) => {
 		const roomE2E = await this.getRoomInstance(rid);
+		if (!roomE2E || !roomE2E?.hasSessionKey()) {
+			return;
+		}
 		return roomE2E.encryptText(text);
 	};
 
@@ -490,6 +606,9 @@ class Encryption {
 			}
 
 			const roomE2E = await this.getRoomInstance(rid);
+			if (!roomE2E || !roomE2E?.hasSessionKey()) {
+				return;
+			}
 			return roomE2E.encrypt(message);
 		} catch {
 			// Subscription not found
@@ -523,13 +642,15 @@ class Encryption {
 
 		const { rid } = message;
 		const roomE2E = await this.getRoomInstance(rid);
+		if (!roomE2E || !roomE2E?.hasSessionKey()) {
+			return message;
+		}
 		return roomE2E.decrypt(message);
 	};
 
 	decryptFileContent = async (file: IServerAttachment) => {
 		const roomE2E = await this.getRoomInstance(file.rid);
-
-		if (!roomE2E) {
+		if (!roomE2E || !roomE2E?.hasSessionKey()) {
 			return file;
 		}
 
@@ -555,6 +676,9 @@ class Encryption {
 		}
 
 		const roomE2E = await this.getRoomInstance(rid);
+		if (!roomE2E || !roomE2E?.hasSessionKey()) {
+			return { file };
+		}
 		return roomE2E.encryptFile(rid, file);
 	};
 
@@ -608,7 +732,12 @@ class Encryption {
 		Promise.all(messages.map((m: Partial<IMessage>) => this.decryptMessage(m as IMessage)));
 
 	// Decrypt multiple subscriptions
-	decryptSubscriptions = (subscriptions: ISubscription[]) => Promise.all(subscriptions.map(s => this.decryptSubscription(s)));
+	decryptSubscriptions = (subscriptions: ISubscription[]) => {
+		if (!this.ready) {
+			return subscriptions;
+		}
+		return Promise.all(subscriptions.map(s => this.decryptSubscription(s)));
+	};
 
 	// Decrypt multiple files
 	decryptFiles = (files: IServerAttachment[]) => Promise.all(files.map(f => this.decryptFileContent(f)));
diff --git a/app/lib/encryption/helpers/hooks.ts b/app/lib/encryption/helpers/hooks.ts
new file mode 100644
index 0000000000..3386af8987
--- /dev/null
+++ b/app/lib/encryption/helpers/hooks.ts
@@ -0,0 +1,52 @@
+import { compareServerVersion } from '../../methods/helpers';
+import { useAppSelector } from '../../hooks';
+import { TSubscriptionModel } from '../../../definitions';
+
+const isMissingRoomE2EEKey = ({
+	encryptionEnabled,
+	roomEncrypted,
+	E2EKey
+}: {
+	encryptionEnabled: boolean;
+	roomEncrypted: TSubscriptionModel['encrypted'];
+	E2EKey: TSubscriptionModel['E2EKey'];
+}) => (encryptionEnabled && roomEncrypted && !E2EKey) ?? false;
+
+const isE2EEDisabledEncryptedRoom = ({
+	encryptionEnabled,
+	roomEncrypted
+}: {
+	encryptionEnabled: boolean;
+	roomEncrypted: TSubscriptionModel['encrypted'];
+}) => (!encryptionEnabled && roomEncrypted) ?? false;
+
+export const useIsMissingRoomE2EEKey = (roomEncrypted: TSubscriptionModel['encrypted'], E2EKey: TSubscriptionModel['E2EKey']) => {
+	const serverVersion = useAppSelector(state => state.server.version);
+	const e2eeEnabled = useAppSelector(state => state.settings.E2E_Enable);
+	const encryptionEnabled = useAppSelector(state => state.encryption.enabled);
+	if (!e2eeEnabled) {
+		return false;
+	}
+	if (compareServerVersion(serverVersion, 'lowerThan', '6.10.0')) {
+		return false;
+	}
+
+	return isMissingRoomE2EEKey({ encryptionEnabled, roomEncrypted, E2EKey });
+};
+
+export const useHasE2EEWarning = (roomEncrypted: TSubscriptionModel['encrypted'], E2EKey: TSubscriptionModel['E2EKey']) => {
+	const serverVersion = useAppSelector(state => state.server.version);
+	const e2eeEnabled = useAppSelector(state => state.settings.E2E_Enable);
+	const encryptionEnabled = useAppSelector(state => state.encryption.enabled);
+	if (!e2eeEnabled) {
+		return false;
+	}
+	if (compareServerVersion(serverVersion, 'lowerThan', '6.10.0')) {
+		return false;
+	}
+
+	return (
+		isMissingRoomE2EEKey({ encryptionEnabled, roomEncrypted, E2EKey }) ||
+		isE2EEDisabledEncryptedRoom({ encryptionEnabled, roomEncrypted })
+	);
+};
diff --git a/app/lib/encryption/helpers/toggleRoomE2EE.ts b/app/lib/encryption/helpers/toggleRoomE2EE.ts
index 1f63704dde..e9995549d0 100644
--- a/app/lib/encryption/helpers/toggleRoomE2EE.ts
+++ b/app/lib/encryption/helpers/toggleRoomE2EE.ts
@@ -5,6 +5,22 @@ import database from '../../database';
 import { getSubscriptionByRoomId } from '../../database/services/Subscription';
 import log from '../../methods/helpers/log';
 import I18n from '../../../i18n';
+import { TSubscriptionModel } from '../../../definitions';
+
+const optimisticUpdate = async (room: TSubscriptionModel, value: TSubscriptionModel['encrypted']) => {
+	try {
+		const db = database.active;
+
+		// Instantly feedback to the user
+		await db.write(async () => {
+			await room.update(r => {
+				r.encrypted = value;
+			});
+		});
+	} catch {
+		// do nothing
+	}
+};
 
 export const toggleRoomE2EE = async (rid: string): Promise<void> => {
 	const room = await getSubscriptionByRoomId(rid);
@@ -17,34 +33,32 @@ export const toggleRoomE2EE = async (rid: string): Promise<void> => {
 	const message = I18n.t(isEncrypted ? 'Disable_encryption_description' : 'Enable_encryption_description');
 	const confirmationText = I18n.t(isEncrypted ? 'Disable' : 'Enable');
 
+	// Toggle encrypted value
+	const newValue = !room.encrypted;
+
+	// Instantly feedback to the user
+	await optimisticUpdate(room, newValue);
+
 	Alert.alert(
 		title,
 		message,
 		[
 			{
 				text: I18n.t('Cancel'),
-				style: 'cancel'
+				style: 'cancel',
+				onPress: async () => {
+					// Revert to original value
+					await optimisticUpdate(room, !newValue);
+				}
 			},
 			{
 				text: confirmationText,
 				style: isEncrypted ? 'destructive' : 'default',
 				onPress: async () => {
 					try {
-						const db = database.active;
-
-						// Toggle encrypted value
-						const encrypted = !room.encrypted;
-
-						// Instantly feedback to the user
-						await db.write(async () => {
-							await room.update(r => {
-								r.encrypted = encrypted;
-							});
-						});
-
 						try {
 							// Send new room setting value to server
-							const { result } = await Services.saveRoomSettings(rid, { encrypted });
+							const { result } = await Services.saveRoomSettings(rid, { encrypted: newValue });
 							// If it was saved successfully
 							if (result) {
 								return;
@@ -54,11 +68,7 @@ export const toggleRoomE2EE = async (rid: string): Promise<void> => {
 						}
 
 						// If something goes wrong we go back to the previous value
-						await db.write(async () => {
-							await room.update(r => {
-								r.encrypted = room.encrypted;
-							});
-						});
+						await optimisticUpdate(room, !newValue);
 					} catch (e) {
 						log(e);
 					}
diff --git a/app/lib/encryption/room.ts b/app/lib/encryption/room.ts
index 28a4c4470e..4f1f32d049 100644
--- a/app/lib/encryption/room.ts
+++ b/app/lib/encryption/room.ts
@@ -6,10 +6,16 @@ import parse from 'url-parse';
 import { sha256 } from 'js-sha256';
 
 import getSingleMessage from '../methods/getSingleMessage';
-import { IAttachment, IMessage, IUpload, TSendFileMessageFileInfo, IUser, IServerAttachment } from '../../definitions';
+import {
+	IAttachment,
+	IMessage,
+	IUpload,
+	TSendFileMessageFileInfo,
+	IServerAttachment,
+	TSubscriptionModel
+} from '../../definitions';
 import Deferred from './helpers/deferred';
 import { compareServerVersion, debounce } from '../methods/helpers';
-import database from '../database';
 import log from '../methods/helpers/log';
 import {
 	b64ToBuffer,
@@ -33,6 +39,7 @@ import { getMessageUrlRegex } from './helpers/getMessageUrlRegex';
 import { mapMessageFromAPI } from './helpers/mapMessageFromApi';
 import { mapMessageFromDB } from './helpers/mapMessageFromDB';
 import { createQuoteAttachment } from './helpers/createQuoteAttachment';
+import { getSubscriptionByRoomId } from '../database/services/Subscription';
 import { getMessageById } from '../database/services/Message';
 import { TEncryptFileResult, TGetContent } from './definitions';
 import { store } from '../store/auxStore';
@@ -46,6 +53,7 @@ export default class EncryptionRoom {
 	sessionKeyExportedString: string | ByteBuffer;
 	keyID: string;
 	roomKey: ArrayBuffer;
+	subscription: TSubscriptionModel | null;
 
 	constructor(roomId: string, userId: string) {
 		this.ready = false;
@@ -62,6 +70,7 @@ export default class EncryptionRoom {
 			// Mark as established
 			this.establishing = false;
 		});
+		this.subscription = null;
 	}
 
 	// Initialize the E2E room
@@ -77,54 +86,55 @@ export default class EncryptionRoom {
 			return this.readyPromise;
 		}
 
-		const db = database.active;
-		const subCollection = db.get('subscriptions');
-		try {
-			// Find the subscription
-			const subscription = await subCollection.find(this.roomId);
+		if (!this.subscription) {
+			this.subscription = await getSubscriptionByRoomId(this.roomId);
+			if (!this.subscription) {
+				return;
+			}
+		}
 
-			// Similar to Encryption.evaluateSuggestedKey
-			const { E2EKey, e2eKeyId, E2ESuggestedKey } = subscription;
-			if (E2EKey && E2ESuggestedKey && Encryption.privateKey) {
+		// Similar to Encryption.evaluateSuggestedKey
+		const { E2EKey, e2eKeyId, E2ESuggestedKey } = this.subscription;
+		if (E2ESuggestedKey && Encryption.privateKey) {
+			try {
 				try {
+					this.establishing = true;
 					const { keyID, roomKey, sessionKeyExportedString } = await this.importRoomKey(E2ESuggestedKey, Encryption.privateKey);
 					this.keyID = keyID;
 					this.roomKey = roomKey;
 					this.sessionKeyExportedString = sessionKeyExportedString;
-					await Services.e2eAcceptSuggestedGroupKey(this.roomId);
-					this.readyPromise.resolve();
-					return;
-				} catch (e) {
+				} catch (error) {
 					await Services.e2eRejectSuggestedGroupKey(this.roomId);
 				}
-			}
-
-			// If this room has a E2EKey, we import it
-			if (E2EKey && Encryption.privateKey) {
-				// We're establishing a new room encryption client
-				this.establishing = true;
-				const { keyID, roomKey, sessionKeyExportedString } = await this.importRoomKey(E2EKey, Encryption.privateKey);
-				this.keyID = keyID;
-				this.roomKey = roomKey;
-				this.sessionKeyExportedString = sessionKeyExportedString;
+				await Services.e2eAcceptSuggestedGroupKey(this.roomId);
 				this.readyPromise.resolve();
 				return;
+			} catch (e) {
+				log(e);
 			}
+		}
 
-			// If it doesn't have a e2eKeyId, we need to create keys to the room
-			if (!e2eKeyId) {
-				// We're establishing a new room encryption client
-				this.establishing = true;
-				await this.createRoomKey();
-				this.readyPromise.resolve();
-				return;
-			}
+		// If this room has a E2EKey, we import it
+		if (E2EKey && Encryption.privateKey) {
+			this.establishing = true;
+			const { keyID, roomKey, sessionKeyExportedString } = await this.importRoomKey(E2EKey, Encryption.privateKey);
+			this.keyID = keyID;
+			this.roomKey = roomKey;
+			this.sessionKeyExportedString = sessionKeyExportedString;
+			this.readyPromise.resolve();
+			return;
+		}
 
-			// Request a E2EKey for this room to other users
-			await this.requestRoomKey(e2eKeyId);
-		} catch (e) {
-			log(e);
+		// If it doesn't have a e2eKeyId, we need to create keys to the room
+		if (!e2eKeyId) {
+			this.establishing = true;
+			await this.createRoomKey();
+			this.readyPromise.resolve();
+			return;
 		}
+
+		// Request a E2EKey for this room to other users
+		this.requestRoomKey(e2eKeyId);
 	};
 
 	// Import roomKey as an AES Decrypt key
@@ -163,8 +173,9 @@ export default class EncryptionRoom {
 		}
 	};
 
-	// Create a key to a room
-	createRoomKey = async () => {
+	hasSessionKey = () => !!this.sessionKeyExportedString;
+
+	createNewRoomKey = async () => {
 		const key = (await SimpleCrypto.utils.randomBytes(16)) as Uint8Array;
 		this.roomKey = key;
 
@@ -189,12 +200,29 @@ export default class EncryptionRoom {
 		} else {
 			this.keyID = Base64.encode(this.sessionKeyExportedString as string).slice(0, 12);
 		}
+	};
 
+	createRoomKey = async () => {
+		await this.createNewRoomKey();
 		await Services.e2eSetRoomKeyID(this.roomId, this.keyID);
-
-		await this.encryptRoomKey();
+		await this.encryptKeyForOtherParticipants();
 	};
 
+	async resetRoomKey() {
+		if (!Encryption.publicKey) {
+			console.log('Public key not found');
+			return;
+		}
+		try {
+			await this.createNewRoomKey();
+			const e2eNewKeys = { e2eKeyId: this.keyID, e2eKey: await this.encryptRoomKeyForUser(Encryption.publicKey) };
+			return e2eNewKeys;
+		} catch (error) {
+			console.error('Error resetting group key: ', error);
+			throw error;
+		}
+	}
+
 	// Request a key to this room
 	// We're debouncing this function to avoid multiple calls
 	// when you join a room with a lot of messages and nobody
@@ -214,12 +242,37 @@ export default class EncryptionRoom {
 	);
 
 	// Create an encrypted key for this room based on users
-	encryptRoomKey = async () => {
+	encryptKeyForOtherParticipants = async () => {
 		try {
+			const decryptedOldGroupKeys = await this.exportOldRoomKeys(this.subscription?.oldRoomKeys);
 			const result = await Services.e2eGetUsersOfRoomWithoutKey(this.roomId);
 			if (result.success) {
 				const { users } = result;
-				await Promise.all(users.map(user => this.encryptRoomKeyForUser(user)));
+				if (!users.length) {
+					return;
+				}
+				const { version } = store.getState().server;
+				if (compareServerVersion(version, 'greaterThanOrEqualTo', '7.0.0')) {
+					const usersSuggestedGroupKeys = { [this.roomId]: [] as any[] };
+					for await (const user of users) {
+						const key = await this.encryptRoomKeyForUser(user.e2e!.public_key);
+						const oldKeys = await this.encryptOldKeysForParticipant(user.e2e?.public_key, decryptedOldGroupKeys);
+
+						usersSuggestedGroupKeys[this.roomId].push({ _id: user._id, key, ...(oldKeys && { oldKeys }) });
+					}
+					await Services.provideUsersSuggestedGroupKeys(usersSuggestedGroupKeys);
+				} else {
+					await Promise.all(
+						users.map(async user => {
+							if (user.e2e?.public_key) {
+								const key = await this.encryptRoomKeyForUser(user.e2e.public_key);
+								if (key) {
+									await Services.e2eUpdateGroupKey(user?._id, this.roomId, key);
+								}
+							}
+						})
+					);
+				}
 			}
 		} catch (e) {
 			log(e);
@@ -227,12 +280,13 @@ export default class EncryptionRoom {
 	};
 
 	// Encrypt the room key to each user in
-	encryptRoomKeyForUser = async (user: Pick<IUser, '_id' | 'e2e'>) => {
-		if (user?.e2e?.public_key) {
-			const { public_key: publicKey } = user.e2e;
+	encryptRoomKeyForUser = async (publicKey: string) => {
+		try {
 			const userKey = await SimpleCrypto.RSA.importKey(EJSON.parse(publicKey));
 			const encryptedUserKey = await SimpleCrypto.RSA.encrypt(this.sessionKeyExportedString as string, userKey);
-			await Services.e2eUpdateGroupKey(user?._id, this.roomId, this.keyID + encryptedUserKey);
+			return this.keyID + encryptedUserKey;
+		} catch (e) {
+			log(e);
 		}
 	};
 
@@ -244,9 +298,82 @@ export default class EncryptionRoom {
 			return;
 		}
 
-		await this.encryptRoomKey();
+		await this.encryptKeyForOtherParticipants();
 	};
 
+	async encryptOldKeysForParticipant(publicKey: any, oldRoomKeys: any) {
+		if (!oldRoomKeys || oldRoomKeys.length === 0) {
+			return;
+		}
+
+		let userKey;
+
+		try {
+			userKey = await SimpleCrypto.RSA.importKey(EJSON.parse(publicKey));
+		} catch (e) {
+			log(e);
+			return;
+		}
+
+		try {
+			const keys = [];
+			for await (const oldRoomKey of oldRoomKeys) {
+				if (!oldRoomKey.E2EKey) {
+					continue;
+				}
+				const encryptedKey = await SimpleCrypto.RSA.encrypt(oldRoomKey.E2EKey, userKey);
+				const encryptedUserKey = oldRoomKey.e2eKeyId + encryptedKey;
+				keys.push({ ...oldRoomKey, E2EKey: encryptedUserKey });
+			}
+			return keys;
+		} catch (e) {
+			log(e);
+		}
+	}
+
+	async exportOldRoomKeys(oldKeys: any) {
+		if (!oldKeys || oldKeys.length === 0) {
+			return [];
+		}
+
+		const keys = [];
+		for await (const key of oldKeys) {
+			try {
+				if (!key.E2EKey || !Encryption.privateKey) {
+					continue;
+				}
+
+				const { sessionKeyExportedString } = await this.importRoomKey(key.E2EKey, Encryption.privateKey);
+				keys.push({
+					...key,
+					E2EKey: sessionKeyExportedString
+				});
+			} catch (e) {
+				log(e);
+			}
+		}
+
+		return keys;
+	}
+
+	async encryptGroupKeyForParticipantsWaitingForTheKeys(users: any[]) {
+		if (!this.ready) {
+			return;
+		}
+
+		const decryptedOldGroupKeys = await this.exportOldRoomKeys(this.subscription?.oldRoomKeys);
+		const usersWithKeys = await Promise.all(
+			users.map(async user => {
+				const { _id, public_key } = user;
+				const key = await this.encryptRoomKeyForUser(public_key);
+				const oldKeys = await this.encryptOldKeysForParticipant(public_key, decryptedOldGroupKeys);
+				return { _id, key, ...(oldKeys && { oldKeys }) };
+			})
+		);
+
+		return usersWithKeys;
+	}
+
 	// Encrypt text
 	encryptText = async (text: string | ArrayBuffer) => {
 		text = utf8ToBuffer(text as string);
@@ -439,13 +566,7 @@ export default class EncryptionRoom {
 			return null;
 		}
 
-		msg = b64ToBuffer(msg.slice(12) as string);
-		const [vector, cipherText] = splitVectorData(msg);
-
-		const decrypted = await SimpleCrypto.AES.decrypt(cipherText, this.roomKey, vector);
-
-		const m = EJSON.parse(bufferToUtf8(decrypted));
-
+		const m = await this.decryptContent(msg as string);
 		return m.text;
 	};
 
@@ -462,9 +583,20 @@ export default class EncryptionRoom {
 			return null;
 		}
 
+		const keyID = contentBase64.slice(0, 12);
 		const contentBuffer = b64ToBuffer(contentBase64.slice(12) as string);
 		const [vector, cipherText] = splitVectorData(contentBuffer);
-		const decrypted = await SimpleCrypto.AES.decrypt(cipherText, this.roomKey, vector);
+
+		let oldKey;
+		if (keyID !== this.keyID) {
+			const oldRoomKey = this.subscription?.oldRoomKeys?.find((key: any) => key.e2eKeyId === keyID);
+			if (oldRoomKey?.E2EKey && Encryption.privateKey) {
+				const { roomKey } = await this.importRoomKey(oldRoomKey.E2EKey, Encryption.privateKey);
+				oldKey = roomKey;
+			}
+		}
+
+		const decrypted = await SimpleCrypto.AES.decrypt(cipherText, oldKey || this.roomKey, vector);
 		return EJSON.parse(bufferToUtf8(decrypted));
 	};
 
diff --git a/app/lib/methods/helpers/events.ts b/app/lib/methods/helpers/events.ts
index a01f8fcc59..c79632e9d3 100644
--- a/app/lib/methods/helpers/events.ts
+++ b/app/lib/methods/helpers/events.ts
@@ -1,3 +1,4 @@
+import { ICredentials } from '../../../definitions';
 import { IEmitUserInteraction } from '../../../containers/UIKit/interfaces';
 import log from './log';
 
@@ -12,6 +13,7 @@ type TEventEmitterEmmitArgs =
 	| { visible: boolean; onCancel?: null | Function }
 	| { cancel: () => void }
 	| { submit: (param: string) => void }
+	| { params: ICredentials }
 	| IEmitUserInteraction;
 
 class EventEmitter {
diff --git a/app/lib/methods/helpers/mergeSubscriptionsRooms.ts b/app/lib/methods/helpers/mergeSubscriptionsRooms.ts
index 4bd1cefb15..6e9ef7c4c0 100644
--- a/app/lib/methods/helpers/mergeSubscriptionsRooms.ts
+++ b/app/lib/methods/helpers/mergeSubscriptionsRooms.ts
@@ -53,6 +53,7 @@ export const merge = (
 		}
 		mergedSubscription.encrypted = room?.encrypted;
 		mergedSubscription.e2eKeyId = room?.e2eKeyId;
+		mergedSubscription.usersWaitingForE2EKeys = room?.usersWaitingForE2EKeys;
 		mergedSubscription.avatarETag = room?.avatarETag;
 		mergedSubscription.teamId = room?.teamId;
 		mergedSubscription.teamMain = room?.teamMain;
diff --git a/app/lib/methods/loadMissedMessages.ts b/app/lib/methods/loadMissedMessages.ts
index 31be751bfd..30fbf6c45f 100644
--- a/app/lib/methods/loadMissedMessages.ts
+++ b/app/lib/methods/loadMissedMessages.ts
@@ -1,47 +1,129 @@
 import { ILastMessage } from '../../definitions';
+import { compareServerVersion } from './helpers';
+import updateMessages from './updateMessages';
 import log from './helpers/log';
-import database from '../database';
 import sdk from '../services/sdk';
-import updateMessages from './updateMessages';
+import { store } from '../store/auxStore';
+import { getSubscriptionByRoomId } from '../database/services/Subscription';
 
-const getLastUpdate = async (rid: string) => {
+const count = 50;
+
+const syncMessages = async ({ roomId, next, type }: { roomId: string; next: number; type: 'UPDATED' | 'DELETED' }) => {
+	// @ts-ignore // this method dont have type
+	const { result } = await sdk.get('chat.syncMessages', { roomId, next, count, type });
+	return result;
+};
+
+const getSyncMessagesFromCursor = async (
+	roomId: string,
+	lastOpen?: number,
+	updatedNext?: number | null,
+	deletedNext?: number | null
+) => {
 	try {
-		const db = database.active;
-		const subsCollection = db.get('subscriptions');
-		const sub = await subsCollection.find(rid);
-		return sub.lastOpen?.toISOString();
-	} catch (e) {
-		// Do nothing
+		const promises = [];
+
+		if (lastOpen && !updatedNext && !deletedNext) {
+			promises.push(syncMessages({ roomId, next: lastOpen, type: 'UPDATED' }));
+			promises.push(syncMessages({ roomId, next: lastOpen, type: 'DELETED' }));
+		}
+		if (updatedNext) {
+			promises.push(syncMessages({ roomId, next: updatedNext, type: 'UPDATED' }));
+		}
+		if (deletedNext) {
+			promises.push(syncMessages({ roomId, next: deletedNext, type: 'DELETED' }));
+		}
+
+		const [updatedMessages, deletedMessages] = await Promise.all(promises);
+		return {
+			deleted: deletedMessages?.deleted ?? [],
+			deletedNext: deletedMessages?.cursor.next,
+			updated: updatedMessages?.updated ?? [],
+			updatedNext: updatedMessages?.cursor.next
+		};
+	} catch (error) {
+		log(error);
+	}
+};
+
+const getLastUpdate = async (rid: string) => {
+	const sub = await getSubscriptionByRoomId(rid);
+	if (!sub) {
+		return null;
 	}
-	return null;
+	return sub.lastOpen;
 };
 
-async function load({ rid: roomId, lastOpen }: { rid: string; lastOpen?: Date }) {
-	let lastUpdate;
+async function load({
+	rid: roomId,
+	lastOpen,
+	updatedNext,
+	deletedNext
+}: {
+	rid: string;
+	lastOpen?: Date;
+	updatedNext?: number | null;
+	deletedNext?: number | null;
+}) {
+	const { version: serverVersion } = store.getState().server;
+	if (compareServerVersion(serverVersion, 'greaterThanOrEqualTo', '7.1.0')) {
+		let lastOpenTimestamp;
+		if (lastOpen) {
+			lastOpenTimestamp = new Date(lastOpen).getTime();
+		} else {
+			const lastUpdate = await getLastUpdate(roomId);
+			lastOpenTimestamp = lastUpdate?.getTime();
+		}
+		const result = await getSyncMessagesFromCursor(roomId, lastOpenTimestamp, updatedNext, deletedNext);
+		return result;
+	}
+
+	let lastOpenISOString;
 	if (lastOpen) {
-		lastUpdate = new Date(lastOpen).toISOString();
+		lastOpenISOString = new Date(lastOpen).toISOString();
 	} else {
-		lastUpdate = await getLastUpdate(roomId);
+		const lastUpdate = await getLastUpdate(roomId);
+		lastOpenISOString = lastUpdate?.toISOString();
 	}
 	// RC 0.60.0
 	// @ts-ignore // this method dont have type
-	const { result } = await sdk.get('chat.syncMessages', { roomId, lastUpdate });
+	const { result } = await sdk.get('chat.syncMessages', { roomId, lastUpdate: lastOpenISOString });
 	return result;
 }
 
-export function loadMissedMessages(args: { rid: string; lastOpen?: Date }): Promise<void> {
-	return new Promise(async (resolve, reject) => {
-		try {
-			const data = await load({ rid: args.rid, lastOpen: args.lastOpen });
-			if (data) {
-				const { updated, deleted }: { updated: ILastMessage[]; deleted: ILastMessage[] } = data;
-				// @ts-ignore // TODO: remove loaderItem obligatoriness
-				await updateMessages({ rid: args.rid, update: updated, remove: deleted });
+export async function loadMissedMessages(args: {
+	rid: string;
+	lastOpen?: Date;
+	updatedNext?: number | null;
+	deletedNext?: number | null;
+}): Promise<void> {
+	try {
+		const data = await load({
+			rid: args.rid,
+			lastOpen: args.lastOpen,
+			updatedNext: args.updatedNext,
+			deletedNext: args.deletedNext
+		});
+		if (data) {
+			const {
+				updated,
+				updatedNext,
+				deleted,
+				deletedNext
+			}: { updated: ILastMessage[]; deleted: ILastMessage[]; updatedNext: number | null; deletedNext: number | null } = data;
+			// @ts-ignore // TODO: remove loaderItem obligatoriness
+			await updateMessages({ rid: args.rid, update: updated, remove: deleted });
+
+			if (deletedNext || updatedNext) {
+				loadMissedMessages({
+					rid: args.rid,
+					lastOpen: args.lastOpen,
+					updatedNext,
+					deletedNext
+				});
 			}
-			resolve();
-		} catch (e) {
-			log(e);
-			reject(e);
 		}
-	});
+	} catch (e) {
+		log(e);
+	}
 }
diff --git a/app/lib/services/connect.ts b/app/lib/services/connect.ts
index 080375bf58..f62adc07f8 100644
--- a/app/lib/services/connect.ts
+++ b/app/lib/services/connect.ts
@@ -335,7 +335,7 @@ function loginTOTP(params: ICredentials, loginEmailPassword?: boolean, isFromWeb
 			if (e.data?.error && (e.data.error === 'totp-required' || e.data.error === 'totp-invalid')) {
 				const { details } = e.data;
 				try {
-					const code = await twoFactor({ method: details?.method || 'totp', invalid: details?.error === 'totp-invalid' });
+					const code = await twoFactor({ params, method: details?.method || 'totp', invalid: details?.error === 'totp-invalid' });
 
 					if (loginEmailPassword) {
 						store.dispatch(setUser({ username: params.user || params.username }));
diff --git a/app/lib/services/restApi.ts b/app/lib/services/restApi.ts
index b43a8fd6de..c82715aeb4 100644
--- a/app/lib/services/restApi.ts
+++ b/app/lib/services/restApi.ts
@@ -7,7 +7,6 @@ import {
 	IRoom,
 	IRoomNotifications,
 	IServerRoom,
-	IUser,
 	RoomType,
 	SubscriptionType
 } from '../../definitions';
@@ -86,6 +85,11 @@ export const e2eRejectSuggestedGroupKey = (rid: string): Promise<{ success: bool
 	// RC 5.5
 	sdk.post('e2e.rejectSuggestedGroupKey', { rid });
 
+export const fetchUsersWaitingForGroupKey = (roomIds: string[]) => sdk.get('e2e.fetchUsersWaitingForGroupKey', { roomIds });
+
+export const provideUsersSuggestedGroupKeys = (usersSuggestedGroupKeys: any) =>
+	sdk.post('e2e.provideUsersSuggestedGroupKeys', { usersSuggestedGroupKeys });
+
 export const updateJitsiTimeout = (roomId: string) =>
 	// RC 0.74.0
 	sdk.post('video-conference/jitsi.update-timeout', { roomId });
@@ -933,6 +937,11 @@ export function e2eResetOwnKey(): Promise<boolean | {}> {
 	return sdk.methodCallWrapper('e2e.resetOwnE2EKey');
 }
 
+export function e2eResetRoomKey(rid: string, e2eKey: string, e2eKeyId: string): Promise<boolean | {}> {
+	// RC ?
+	return sdk.post('e2e.resetRoomKey', { rid, e2eKey, e2eKeyId });
+}
+
 export const editMessage = async (message: Pick<IMessage, 'id' | 'msg' | 'rid'>) => {
 	const { rid, msg } = await Encryption.encryptMessage(message as IMessage);
 	// RC 0.49.0
@@ -974,11 +983,8 @@ export const pushTest = () => sdk.post('push.test');
 // RC 6.5.0
 export const pushInfo = () => sdk.get('push.info');
 
-export const sendEmailCode = () => {
-	const { username } = reduxStore.getState().login.user as IUser;
-	// RC 3.1.0
-	return sdk.post('users.2fa.sendEmailCode', { emailOrUsername: username });
-};
+// RC 3.1.0
+export const sendEmailCode = (emailOrUsername: string) => sdk.post('users.2fa.sendEmailCode', { emailOrUsername });
 
 export const getRoomMembers = async ({
 	rid,
diff --git a/app/lib/services/twoFactor.ts b/app/lib/services/twoFactor.ts
index 928bf8c3f3..8714828d93 100644
--- a/app/lib/services/twoFactor.ts
+++ b/app/lib/services/twoFactor.ts
@@ -2,17 +2,20 @@ import { settings } from '@rocket.chat/sdk';
 
 import { TWO_FACTOR } from '../../containers/TwoFactor';
 import EventEmitter from '../methods/helpers/events';
+import { ICredentials } from '../../definitions';
 
 interface ITwoFactor {
 	method: string;
 	invalid: boolean;
+	params?: ICredentials;
 }
 
-export const twoFactor = ({ method, invalid }: ITwoFactor): Promise<{ twoFactorCode: string; twoFactorMethod: string }> =>
+export const twoFactor = ({ method, invalid, params }: ITwoFactor): Promise<{ twoFactorCode: string; twoFactorMethod: string }> =>
 	new Promise((resolve, reject) => {
 		EventEmitter.emit(TWO_FACTOR, {
 			method,
 			invalid,
+			params,
 			cancel: () => reject(),
 			submit: (code: string) => {
 				settings.customHeaders = {
diff --git a/app/sagas/login.js b/app/sagas/login.js
index 4f422b50fe..ebd123e579 100644
--- a/app/sagas/login.js
+++ b/app/sagas/login.js
@@ -227,8 +227,8 @@ const handleLoginSuccess = function* handleLoginSuccess({ user }) {
 		getUserPresence(user.id);
 
 		const server = yield select(getServer);
-		yield put(encryptionInit());
 		yield put(roomsRequest());
+		yield put(encryptionInit());
 		yield fork(fetchPermissionsFork);
 		yield fork(fetchCustomEmojisFork);
 		yield fork(fetchRolesFork);
diff --git a/app/stacks/InsideStack.tsx b/app/stacks/InsideStack.tsx
index 45ffcc63b6..ea274d22fe 100644
--- a/app/stacks/InsideStack.tsx
+++ b/app/stacks/InsideStack.tsx
@@ -22,6 +22,7 @@ import MessagesView from '../views/MessagesView';
 import AutoTranslateView from '../views/AutoTranslateView';
 import DirectoryView from '../views/DirectoryView';
 import NotificationPrefView from '../views/NotificationPreferencesView';
+import E2EEToggleRoomView from '../views/E2EEToggleRoomView';
 import ForwardLivechatView from '../views/ForwardLivechatView';
 import CloseLivechatView from '../views/CloseLivechatView';
 import LivechatEditView from '../views/LivechatEditView';
@@ -73,6 +74,7 @@ import AddExistingChannelView from '../views/AddExistingChannelView';
 import SelectListView from '../views/SelectListView';
 import DiscussionsView from '../views/DiscussionsView';
 import ChangeAvatarView from '../views/ChangeAvatarView';
+import LegalView from '../views/LegalView';
 import {
 	AdminPanelStackParamList,
 	ChatsStackParamList,
@@ -122,6 +124,7 @@ const ChatsStackNavigator = () => {
 			{/* @ts-ignore */}
 			<ChatsStack.Screen name='DirectoryView' component={DirectoryView} options={DirectoryView.navigationOptions} />
 			<ChatsStack.Screen name='NotificationPrefView' component={NotificationPrefView} />
+			<ChatsStack.Screen name='E2EEToggleRoomView' component={E2EEToggleRoomView} />
 			<ChatsStack.Screen name='PushTroubleshootView' component={PushTroubleshootView} />
 			<ChatsStack.Screen name='ForwardLivechatView' component={ForwardLivechatView} />
 			{/* @ts-ignore */}
@@ -186,6 +189,8 @@ const SettingsStackNavigator = () => {
 			<SettingsStack.Screen name='DefaultBrowserView' component={DefaultBrowserView} />
 			<SettingsStack.Screen name='MediaAutoDownloadView' component={MediaAutoDownloadView} />
 			<SettingsStack.Screen name='GetHelpView' component={GetHelpView} />
+			{/* @ts-ignore */}
+			<SettingsStack.Screen name='LegalView' component={LegalView} />
 			<SettingsStack.Screen
 				name='ScreenLockConfigView'
 				// @ts-ignore
diff --git a/app/stacks/MasterDetailStack/index.tsx b/app/stacks/MasterDetailStack/index.tsx
index f3d552240c..3792165979 100644
--- a/app/stacks/MasterDetailStack/index.tsx
+++ b/app/stacks/MasterDetailStack/index.tsx
@@ -21,6 +21,7 @@ import MessagesView from '../../views/MessagesView';
 import AutoTranslateView from '../../views/AutoTranslateView';
 import DirectoryView from '../../views/DirectoryView';
 import NotificationPrefView from '../../views/NotificationPreferencesView';
+import E2EEToggleRoomView from '../../views/E2EEToggleRoomView';
 import PushTroubleshootView from '../../views/PushTroubleshootView';
 import ForwardLivechatView from '../../views/ForwardLivechatView';
 import ForwardMessageView from '../../views/ForwardMessageView';
@@ -45,6 +46,7 @@ import NewMessageView from '../../views/NewMessageView';
 import CreateChannelView from '../../views/CreateChannelView';
 import UserPreferencesView from '../../views/UserPreferencesView';
 import UserNotificationPrefView from '../../views/UserNotificationPreferencesView';
+import LegalView from '../../views/LegalView';
 import SecurityPrivacyView from '../../views/SecurityPrivacyView';
 import MediaAutoDownloadView from '../../views/MediaAutoDownloadView';
 import E2EEncryptionSecurityView from '../../views/E2EEncryptionSecurityView';
@@ -141,6 +143,7 @@ const ModalStackNavigator = React.memo(({ navigation }: INavigation) => {
 				/>
 				<ModalStack.Screen name='QueueListView' component={QueueListView} />
 				<ModalStack.Screen name='NotificationPrefView' component={NotificationPrefView} />
+				<ModalStack.Screen name='E2EEToggleRoomView' component={E2EEToggleRoomView} />
 				<ModalStack.Screen name='ForwardMessageView' component={ForwardMessageView} />
 				{/* @ts-ignore */}
 				<ModalStack.Screen name='ForwardLivechatView' component={ForwardLivechatView} />
@@ -166,6 +169,8 @@ const ModalStackNavigator = React.memo(({ navigation }: INavigation) => {
 					options={props => ReadReceiptsView.navigationOptions!({ ...props, isMasterDetail: true })}
 				/>
 				<ModalStack.Screen name='SettingsView' component={SettingsView} />
+				{/* @ts-ignore */}
+				<ModalStack.Screen name='LegalView' component={LegalView} />
 				<ModalStack.Screen name='LanguageView' component={LanguageView} />
 				<ModalStack.Screen name='ThemeView' component={ThemeView} />
 				<ModalStack.Screen name='DefaultBrowserView' component={DefaultBrowserView} />
diff --git a/app/stacks/MasterDetailStack/types.ts b/app/stacks/MasterDetailStack/types.ts
index f6d5c41a05..dca88bac9e 100644
--- a/app/stacks/MasterDetailStack/types.ts
+++ b/app/stacks/MasterDetailStack/types.ts
@@ -117,6 +117,9 @@ export type ModalStackParamList = {
 		rid: string;
 		room: ISubscription;
 	};
+	E2EEToggleRoomView: {
+		rid: string;
+	};
 	ForwardMessageView: {
 		message: TAnyMessageModel;
 	};
@@ -197,6 +200,7 @@ export type ModalStackParamList = {
 	MediaAutoDownloadView: undefined;
 	E2EEncryptionSecurityView: undefined;
 	PushTroubleshootView: undefined;
+	LegalView: undefined;
 	SupportedVersionsWarning: {
 		showCloseButton?: boolean;
 	};
diff --git a/app/stacks/types.ts b/app/stacks/types.ts
index c3c9142216..487483d098 100644
--- a/app/stacks/types.ts
+++ b/app/stacks/types.ts
@@ -28,22 +28,22 @@ export type ChatsStackParamList = {
 	NewMessageStack: undefined;
 	RoomsListView: undefined;
 	RoomView:
-		| {
-				rid: string;
-				t: SubscriptionType;
-				tmid?: string;
-				messageId?: string;
-				name?: string;
-				fname?: string;
-				prid?: string;
-				room?: TSubscriptionModel | { rid: string; t: string; name?: string; fname?: string; prid?: string };
-				jumpToMessageId?: string;
-				jumpToThreadId?: string;
-				roomUserId?: string | null;
-				usedCannedResponse?: string;
-				status?: string;
+	| {
+		rid: string;
+		t: SubscriptionType;
+		tmid?: string;
+		messageId?: string;
+		name?: string;
+		fname?: string;
+		prid?: string;
+		room?: TSubscriptionModel | { rid: string; t: string; name?: string; fname?: string; prid?: string };
+		jumpToMessageId?: string;
+		jumpToThreadId?: string;
+		roomUserId?: string | null;
+		usedCannedResponse?: string;
+		status?: string;
 		  }
-		| undefined; // Navigates back to RoomView already on stack
+	| undefined; // Navigates back to RoomView already on stack
 	RoomActionsView: {
 		room: TSubscriptionModel;
 		member?: any;
@@ -119,6 +119,9 @@ export type ChatsStackParamList = {
 		room: TSubscriptionModel;
 	};
 	DirectoryView: undefined;
+	E2EEToggleRoomView: {
+		rid: string;
+	};
 	NotificationPrefView: {
 		rid: string;
 		room: TSubscriptionModel;
@@ -202,6 +205,7 @@ export type ProfileStackParamList = {
 };
 
 export type SettingsStackParamList = {
+	LegalView: undefined;
 	SettingsView: undefined;
 	SecurityPrivacyView: undefined;
 	E2EEncryptionSecurityView: undefined;
diff --git a/app/views/CreateChannelView/RoomSettings/SwitchItem.tsx b/app/views/CreateChannelView/RoomSettings/SwitchItem.tsx
index 14de43d2b5..cd14ee5abc 100644
--- a/app/views/CreateChannelView/RoomSettings/SwitchItem.tsx
+++ b/app/views/CreateChannelView/RoomSettings/SwitchItem.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { StyleSheet, Text, View, SwitchProps, Pressable } from 'react-native';
+import { StyleSheet, Text, View, SwitchProps } from 'react-native';
 
 import I18n from '../../../i18n';
 import { useTheme } from '../../../theme';
@@ -12,19 +12,20 @@ const styles = StyleSheet.create({
 		alignItems: 'center',
 		justifyContent: 'space-between',
 		flexDirection: 'row',
-		maxHeight: 80,
-		marginBottom: 12
+		maxHeight: 80
 	},
 	switchTextContainer: {
 		flex: 1,
 		marginRight: 8
 	},
 	label: {
-		fontSize: 14,
+		fontSize: 16,
+		lineHeight: 24,
 		...sharedStyles.textMedium
 	},
 	hint: {
 		fontSize: 14,
+		lineHeight: 20,
 		...sharedStyles.textRegular
 	}
 });
@@ -40,21 +41,21 @@ export const SwitchItem = ({ id, value, label, hint, onValueChange, disabled = f
 	const { colors } = useTheme();
 
 	return (
-		<Pressable
-			disabled={disabled}
-			onPress={() => onValueChange(!value)}
-			accessible
-			accessibilityLabel={`${I18n.t(label)}, ${value ? I18n.t('Enabled') : I18n.t('Disabled')}, ${I18n.t(hint)}`}
-			accessibilityRole='switch'>
-			<View style={[styles.switchContainer, { backgroundColor: colors.surfaceRoom }]}>
-				<View style={styles.switchTextContainer}>
-					<Text style={[styles.label, { color: colors.fontTitlesLabels }]}>{I18n.t(label)}</Text>
-					<Text testID={`create-channel-${id}-hint`} style={[styles.hint, { color: colors.fontSecondaryInfo }]}>
-						{I18n.t(hint)}
-					</Text>
-				</View>
-				<Switch value={value} onValueChange={onValueChange} testID={`create-channel-${id}`} disabled={disabled} />
+		<View style={[styles.switchContainer, { backgroundColor: colors.surfaceRoom }]}>
+			<View accessible accessibilityLabel={`${I18n.t(label)}, ${I18n.t(hint)}`} style={styles.switchTextContainer}>
+				<Text style={[styles.label, { color: colors.fontTitlesLabels }]}>{I18n.t(label)}</Text>
+				<Text testID={`create-channel-${id}-hint`} style={[styles.hint, { color: colors.fontSecondaryInfo }]}>
+					{I18n.t(hint)}
+				</Text>
 			</View>
-		</Pressable>
+			<Switch
+				accessibilityRole='switch'
+				accessible
+				value={value}
+				onValueChange={onValueChange}
+				testID={`create-channel-${id}`}
+				disabled={disabled}
+			/>
+		</View>
 	);
 };
diff --git a/app/views/CreateChannelView/RoomSettings/SwitchItemEncrypted.test.tsx b/app/views/CreateChannelView/RoomSettings/SwitchItemEncrypted.test.tsx
index a5f536d5ab..7eeefe93de 100644
--- a/app/views/CreateChannelView/RoomSettings/SwitchItemEncrypted.test.tsx
+++ b/app/views/CreateChannelView/RoomSettings/SwitchItemEncrypted.test.tsx
@@ -45,7 +45,7 @@ describe('SwitchItemEncrypted', () => {
 		const component = screen.queryByTestId(testEncrypted.testSwitchID);
 		expect(component).toBeTruthy();
 	});
-	
+
 	it('should change value of switch', () => {
 		render(
 			<SwitchItemEncrypted
@@ -62,21 +62,7 @@ describe('SwitchItemEncrypted', () => {
 			expect(onPressMock).toHaveReturnedWith({ value: !testEncrypted.encrypted });
 		}
 	});
-	
-	it('label when encrypted and isTeam are false and is a public channel', () => {
-		render(
-			<SwitchItemEncrypted
-				encrypted={testEncrypted.encrypted}
-				encryptionEnabled={testEncrypted.encryptionEnabled}
-				isTeam={testEncrypted.isTeam}
-				onValueChangeEncrypted={value => testEncrypted.onValueChangeEncrypted(value)}
-				type={testEncrypted.type}
-			/>
-		);
-		const component = screen.queryByTestId(testEncrypted.testLabelID);
-		expect(component?.props.children).toBe(i18n.t('Channel_hint_encrypted_not_available'));
-	});
-	
+
 	it('label when encrypted and isTeam are true and is a private team', () => {
 		testEncrypted.isTeam = true;
 		testEncrypted.type = true;
diff --git a/app/views/CreateChannelView/RoomSettings/SwitchItemEncrypted.tsx b/app/views/CreateChannelView/RoomSettings/SwitchItemEncrypted.tsx
index 9cc277c652..c575220dc1 100644
--- a/app/views/CreateChannelView/RoomSettings/SwitchItemEncrypted.tsx
+++ b/app/views/CreateChannelView/RoomSettings/SwitchItemEncrypted.tsx
@@ -28,12 +28,9 @@ export const SwitchItemEncrypted = ({
 	if (isTeam && !type) {
 		hint = 'Team_hint_encrypted_not_available';
 	}
-	if (!isTeam && type) {
+	if (!isTeam) {
 		hint = 'Channel_hint_encrypted';
 	}
-	if (!isTeam && !type) {
-		hint = 'Channel_hint_encrypted_not_available';
-	}
 
 	return (
 		<SwitchItem
diff --git a/app/views/CreateChannelView/RoomSettings/SwitchItemReadOnly.tsx b/app/views/CreateChannelView/RoomSettings/SwitchItemReadOnly.tsx
index 7711879cc7..82beda64f0 100644
--- a/app/views/CreateChannelView/RoomSettings/SwitchItemReadOnly.tsx
+++ b/app/views/CreateChannelView/RoomSettings/SwitchItemReadOnly.tsx
@@ -13,16 +13,13 @@ export const SwitchItemReadOnly = ({
 	onValueChangeReadOnly: (value: boolean) => void;
 	broadcast: boolean;
 }) => {
-	let hint = '';
-	if (readOnly) {
+	let hint = 'Read_only_hint';
+	if (isTeam && readOnly) {
 		hint = 'Read_only_hint';
 	}
 	if (isTeam && !readOnly) {
 		hint = 'Team_hint_not_read_only';
 	}
-	if (!isTeam && !readOnly) {
-		hint = 'Channel_hint_not_read_only';
-	}
 
 	return (
 		<SwitchItem
diff --git a/app/views/CreateChannelView/RoomSettings/SwitchItemType.tsx b/app/views/CreateChannelView/RoomSettings/SwitchItemType.tsx
index 269fce66a8..0a0ede341f 100644
--- a/app/views/CreateChannelView/RoomSettings/SwitchItemType.tsx
+++ b/app/views/CreateChannelView/RoomSettings/SwitchItemType.tsx
@@ -20,12 +20,9 @@ export const SwitchItemType = ({
 	if (isTeam && !type) {
 		hint = 'Team_hint_public';
 	}
-	if (!isTeam && type) {
+	if (!isTeam) {
 		hint = 'Channel_hint_private';
 	}
-	if (!isTeam && !type) {
-		hint = 'Channel_hint_public';
-	}
 
 	return (
 		<SwitchItem id={'type'} value={type} disabled={isDisabled} label={'Private'} hint={hint} onValueChange={onValueChangeType} />
diff --git a/app/views/CreateChannelView/RoomSettings/index.tsx b/app/views/CreateChannelView/RoomSettings/index.tsx
index 74fffbe9a5..8d04517499 100644
--- a/app/views/CreateChannelView/RoomSettings/index.tsx
+++ b/app/views/CreateChannelView/RoomSettings/index.tsx
@@ -1,4 +1,5 @@
 import React, { useCallback, useState } from 'react';
+import { StyleSheet, View } from 'react-native';
 import { UseFormSetValue } from 'react-hook-form';
 
 import { useAppSelector } from '../../../lib/hooks';
@@ -9,6 +10,13 @@ import { SwitchItemReadOnly } from './SwitchItemReadOnly';
 import { SwitchItemEncrypted } from './SwitchItemEncrypted';
 import { IFormData } from '..';
 
+const styles = StyleSheet.create({
+	container: {
+		gap: 12,
+		paddingVertical: 12
+	}
+});
+
 export const RoomSettings = ({
 	isTeam,
 	setValue,
@@ -66,13 +74,20 @@ export const RoomSettings = ({
 	const isDisabled = [createChannelPermission, createPrivateChannelPermission].filter(r => r === true).length <= 1;
 
 	return (
-		<>
+		<View style={styles.container}>
 			<SwitchItemType
 				isTeam={isTeam}
 				type={createPrivateChannelPermission ? type : false}
 				onValueChangeType={onValueChangeType}
 				isDisabled={isDisabled}
 			/>
+			<SwitchItem
+				id={'broadcast'}
+				value={broadcast}
+				label={'Broadcast'}
+				hint={'Broadcast_hint'}
+				onValueChange={onValueChangeBroadcast}
+			/>
 			<SwitchItemReadOnly
 				broadcast={broadcast}
 				isTeam={isTeam}
@@ -86,13 +101,6 @@ export const RoomSettings = ({
 				encrypted={encrypted}
 				onValueChangeEncrypted={onValueChangeEncrypted}
 			/>
-			<SwitchItem
-				id={'broadcast'}
-				value={broadcast}
-				label={'Broadcast'}
-				hint={'Broadcast_hint'}
-				onValueChange={onValueChangeBroadcast}
-			/>
-		</>
+		</View>
 	);
 };
diff --git a/app/views/CreateChannelView/index.tsx b/app/views/CreateChannelView/index.tsx
index 2e8b9d7cb2..3bb9cf3611 100644
--- a/app/views/CreateChannelView/index.tsx
+++ b/app/views/CreateChannelView/index.tsx
@@ -30,7 +30,7 @@ const styles = StyleSheet.create({
 	},
 	containerTextInput: {
 		paddingHorizontal: 16,
-		marginTop: 16
+		marginTop: 32
 	},
 	containerStyle: {
 		marginBottom: 16
@@ -53,7 +53,8 @@ const styles = StyleSheet.create({
 		paddingHorizontal: 16
 	},
 	buttonCreate: {
-		margin: 16
+		marginTop: 32,
+		marginHorizontal: 16
 	}
 });
 
@@ -148,6 +149,7 @@ const CreateChannelView = () => {
 				<ScrollView {...scrollPersistTaps}>
 					<View style={[styles.containerTextInput, { borderColor: colors.strokeLight }]}>
 						<ControlledFormTextInput
+							required
 							label={isTeam ? I18n.t('Team_Name') : I18n.t('Channel_Name')}
 							testID='create-channel-name'
 							returnKeyType='done'
diff --git a/app/views/E2EEToggleRoomView/index.tsx b/app/views/E2EEToggleRoomView/index.tsx
new file mode 100644
index 0000000000..4afb681331
--- /dev/null
+++ b/app/views/E2EEToggleRoomView/index.tsx
@@ -0,0 +1,82 @@
+import { RouteProp, useRoute } from '@react-navigation/native';
+import React, { useLayoutEffect } from 'react';
+
+import * as List from '../../containers/List';
+import SafeAreaView from '../../containers/SafeAreaView';
+import StatusBar from '../../containers/StatusBar';
+import Switch from '../../containers/Switch';
+import I18n from '../../i18n';
+import { useIsMissingRoomE2EEKey } from '../../lib/encryption/helpers/hooks';
+import { toggleRoomE2EE } from '../../lib/encryption/helpers/toggleRoomE2EE';
+import { getRoomTitle } from '../../lib/methods/helpers';
+import { ChatsStackParamList } from '../../stacks/types';
+import { useTheme } from '../../theme';
+import { resetRoomKey } from './resetRoomKey';
+import { useRoom } from './useRoom';
+
+const getRoomTypeI18n = (t?: string, teamMain?: boolean) => {
+	if (teamMain) {
+		return I18n.t('Team');
+	}
+	if (t === 'd') {
+		return I18n.t('Direct_message');
+	}
+	return I18n.t('Channel');
+};
+
+const E2EEToggleRoomView = ({ navigation }: { navigation: any }) => {
+	const route = useRoute<RouteProp<ChatsStackParamList, 'E2EEToggleRoomView'>>();
+	const { rid } = route.params;
+	const { colors } = useTheme();
+	const room = useRoom(rid);
+	const isMissingRoomKey = useIsMissingRoomE2EEKey(room?.encrypted, room?.E2EKey);
+
+	useLayoutEffect(() => {
+		navigation?.setOptions({
+			title: I18n.t('E2E_Encryption')
+		});
+	}, []);
+
+	if (!room) {
+		return null;
+	}
+
+	const roomType = getRoomTypeI18n(room?.t, room?.teamMain);
+	const roomName = getRoomTitle(room);
+
+	return (
+		<SafeAreaView testID='e2ee-toggle-room-view'>
+			<StatusBar />
+			<List.Container>
+				<List.Section>
+					<List.Separator />
+					<List.Item
+						title={I18n.t('Encrypt__room_type__', { room_type: roomType.toLowerCase() })}
+						right={() => <Switch value={room?.encrypted} onValueChange={() => toggleRoomE2EE(rid)} />}
+						translateTitle={false}
+					/>
+					<List.Separator />
+					<List.Info info={I18n.t('Encrypt__room_type__info__room_name__', { room_name: roomName })} translateInfo={false} />
+				</List.Section>
+
+				{isMissingRoomKey ? (
+					<List.Section>
+						<List.Separator />
+						<List.Item
+							title='Reset_encryption_keys'
+							color={colors.fontDanger}
+							onPress={() => resetRoomKey(rid)}
+							testID='e2ee-toggle-room-reset-key'
+						/>
+						<List.Separator />
+						<List.Info
+							info={I18n.t('Reset_encryption_keys_info__room_type__', { room_type: roomType.toLowerCase() })}
+							translateInfo={false}
+						/>
+					</List.Section>
+				) : null}
+			</List.Container>
+		</SafeAreaView>
+	);
+};
+export default E2EEToggleRoomView;
diff --git a/app/views/E2EEToggleRoomView/resetRoomKey.ts b/app/views/E2EEToggleRoomView/resetRoomKey.ts
new file mode 100644
index 0000000000..aac1ed914d
--- /dev/null
+++ b/app/views/E2EEToggleRoomView/resetRoomKey.ts
@@ -0,0 +1,46 @@
+import { Alert } from 'react-native';
+
+import I18n from '../../i18n';
+import { Encryption } from '../../lib/encryption';
+import log from '../../lib/methods/helpers/log';
+import { showToast } from '../../lib/methods/helpers/showToast';
+import { e2eResetRoomKey } from '../../lib/services/restApi';
+
+export const resetRoomKey = (rid: string) => {
+	Alert.alert(
+		I18n.t('Reset_room_key_title'),
+		I18n.t('Reset_room_key_message'),
+		[
+			{
+				text: I18n.t('Cancel'),
+				style: 'cancel'
+			},
+			{
+				text: I18n.t('Reset'),
+				style: 'destructive',
+				onPress: async () => {
+					try {
+						const e2eRoom = await Encryption.getRoomInstance(rid);
+						if (!e2eRoom) {
+							console.log('Encryption room instance not found');
+							return;
+						}
+
+						const { e2eKey, e2eKeyId } = (await e2eRoom.resetRoomKey()) ?? {};
+
+						if (!e2eKey || !e2eKeyId) {
+							return;
+						}
+
+						await e2eResetRoomKey(rid, e2eKey, e2eKeyId);
+						showToast(I18n.t('Encryption_keys_reset'));
+					} catch (e) {
+						log(e);
+						showToast(I18n.t('Encryption_keys_failed'));
+					}
+				}
+			}
+		],
+		{ cancelable: true }
+	);
+};
diff --git a/app/views/E2EEToggleRoomView/useRoom.ts b/app/views/E2EEToggleRoomView/useRoom.ts
new file mode 100644
index 0000000000..9bd7503e54
--- /dev/null
+++ b/app/views/E2EEToggleRoomView/useRoom.ts
@@ -0,0 +1,32 @@
+import { useEffect, useState } from 'react';
+import { Subscription } from 'rxjs';
+
+import { getSubscriptionByRoomId } from '../../lib/database/services/Subscription';
+import { ISubscription } from '../../definitions';
+
+type TResult = ISubscription | null;
+
+export const useRoom = (rid: string): TResult => {
+	const [room, setRoom] = useState<TResult>(null);
+
+	useEffect(() => {
+		let subSubscription: Subscription;
+		getSubscriptionByRoomId(rid).then(sub => {
+			if (!sub) {
+				return;
+			}
+			const observable = sub.observe();
+			subSubscription = observable.subscribe(s => {
+				setRoom(s.asPlain());
+			});
+		});
+
+		return () => {
+			if (subSubscription && subSubscription?.unsubscribe) {
+				subSubscription.unsubscribe();
+			}
+		};
+	}, []);
+
+	return room;
+};
diff --git a/app/views/LegalView.tsx b/app/views/LegalView.tsx
index 8d53fe4a46..22acc4d922 100644
--- a/app/views/LegalView.tsx
+++ b/app/views/LegalView.tsx
@@ -1,4 +1,4 @@
-import React, { useEffect } from 'react';
+import React, { useLayoutEffect } from 'react';
 import { useSelector } from 'react-redux';
 
 import I18n from '../i18n';
@@ -18,7 +18,7 @@ const LegalView = ({ navigation }: ILegalViewProps): React.ReactElement => {
 	const server = useSelector((state: IApplicationState) => state.server.server);
 	const { theme } = useTheme();
 
-	useEffect(() => {
+	useLayoutEffect(() => {
 		navigation.setOptions({
 			title: I18n.t('Legal')
 		});
diff --git a/app/views/NewServerView/index.tsx b/app/views/NewServerView/index.tsx
index 051cf67133..e7d6b9e391 100644
--- a/app/views/NewServerView/index.tsx
+++ b/app/views/NewServerView/index.tsx
@@ -315,7 +315,7 @@ class NewServerView extends React.Component<INewServerViewProps, INewServerViewS
 				style={formContainerStyle}
 				showAppVersion={showBottomInfo}
 				testID='new-server-view'
-				keyboardShouldPersistTaps='never'>
+				keyboardShouldPersistTaps='handled'>
 				<FormContainerInner accessibilityLabel={I18n.t('Add_server')}>
 					<Image
 						style={[
diff --git a/app/views/ProfileView/components/DeleteAccountActionSheetContent/AlertText.tsx b/app/views/ProfileView/components/DeleteAccountActionSheetContent/AlertText.tsx
new file mode 100644
index 0000000000..68fc4d4384
--- /dev/null
+++ b/app/views/ProfileView/components/DeleteAccountActionSheetContent/AlertText.tsx
@@ -0,0 +1,25 @@
+import { StyleSheet, Text, TextStyle } from 'react-native';
+
+import { useTheme } from '../../../../theme';
+import sharedStyles from '../../../Styles';
+
+const styles = StyleSheet.create({
+	text: {
+		...sharedStyles.textRegular,
+		fontSize: 16,
+		lineHeight: 24,
+		marginBottom: 24
+	}
+});
+
+interface IAlertText {
+	text: string;
+	style?: TextStyle;
+}
+
+const AlertText = ({ text, style }: IAlertText) => {
+	const { colors } = useTheme();
+	return <Text style={[styles.text, { color: colors.fontDanger }, style]}>{text}</Text>;
+};
+
+export default AlertText;
diff --git a/app/views/ProfileView/components/DeleteAccountActionSheetContent/index.tsx b/app/views/ProfileView/components/DeleteAccountActionSheetContent/index.tsx
index 681b1af718..ac58a0031b 100644
--- a/app/views/ProfileView/components/DeleteAccountActionSheetContent/index.tsx
+++ b/app/views/ProfileView/components/DeleteAccountActionSheetContent/index.tsx
@@ -1,6 +1,6 @@
 import { sha256 } from 'js-sha256';
 import React from 'react';
-import { Keyboard, Text } from 'react-native';
+import { Keyboard } from 'react-native';
 import { useDispatch } from 'react-redux';
 
 import { deleteAccount } from '../../../../actions/login';
@@ -12,7 +12,7 @@ import { events, logEvent } from '../../../../lib/methods/helpers/log';
 import { deleteOwnAccount } from '../../../../lib/services/restApi';
 import { useTheme } from '../../../../theme';
 import { getTranslations } from './getTranslations';
-import sharedStyles from '../../../Styles';
+import AlertText from './AlertText';
 
 export function DeleteAccountActionSheetContent(): React.ReactElement {
 	const { hideActionSheet, showActionSheet } = useActionSheet();
@@ -68,11 +68,6 @@ export function DeleteAccountActionSheetContent(): React.ReactElement {
 	);
 }
 
-const AlertText = ({ text = '' }) => {
-	const { colors } = useTheme();
-	return <Text style={{ fontSize: 14, ...sharedStyles.textRegular, marginBottom: 10, color: colors.fontDanger }}>{text}</Text>;
-};
-
 function ConfirmDeleteAccountActionSheetContent({ changeOwnerRooms = '', removedRooms = '', password = '' }) {
 	const { hideActionSheet } = useActionSheet();
 	const dispatch = useDispatch();
@@ -90,15 +85,14 @@ function ConfirmDeleteAccountActionSheetContent({ changeOwnerRooms = '', removed
 			description={i18n.t('Deleting_a_user_will_delete_all_messages')}
 			onCancel={hideActionSheet}
 			onSubmit={handleDeleteAccount}
-			placeholder={i18n.t('Password')}
 			testID='room-info-edit-view-name'
 			confirmTitle={i18n.t('Delete_Account_confirm')}
 			confirmBackgroundColor={colors.buttonBackgroundDangerDefault}
 			showInput={false}
 			customText={
 				<>
-					{!!changeOwnerRooms && <AlertText text={changeOwnerRooms} />}
-					{!!removedRooms && <AlertText text={removedRooms} />}
+					{!!changeOwnerRooms && <AlertText text={changeOwnerRooms} style={{ marginTop: 24 }} />}
+					{!!removedRooms && <AlertText text={removedRooms} style={{ marginBottom: 36 }} />}
 				</>
 			}
 		/>
diff --git a/app/views/ReportUserView/index.tsx b/app/views/ReportUserView/index.tsx
index 40214872a4..c79dd72f42 100644
--- a/app/views/ReportUserView/index.tsx
+++ b/app/views/ReportUserView/index.tsx
@@ -78,11 +78,11 @@ const ReportUserView = () => {
 
 	return (
 		<KeyboardView
-			style={{ backgroundColor: colors.surfaceHover }}
+			style={{ backgroundColor: colors.surfaceTint }}
 			contentContainerStyle={styles.container}
 			keyboardVerticalOffset={128}>
-			<SafeAreaView style={[styles.containerView, { backgroundColor: colors.strokeExtraDark }]} testID='report-user-view'>
-				<ScrollView contentContainerStyle={[styles.scroll, { backgroundColor: colors.surfaceHover }]}>
+			<SafeAreaView style={[styles.containerView]} testID='report-user-view'>
+				<ScrollView contentContainerStyle={[styles.scroll, { backgroundColor: colors.surfaceTint }]}>
 					<StatusBar />
 					<UserInfo username={username} name={name} />
 					<ControlledFormTextInput
@@ -97,7 +97,6 @@ const ReportUserView = () => {
 					<Button
 						title={I18n.t('Report')}
 						type='primary'
-						backgroundColor={colors.buttonBackgroundDangerDefault}
 						disabled={!isValid}
 						onPress={handleSubmit(submit)}
 						testID='report-user-view-submit'
diff --git a/app/views/ReportUserView/styles.ts b/app/views/ReportUserView/styles.ts
index 02f040721a..7dbb87d3de 100644
--- a/app/views/ReportUserView/styles.ts
+++ b/app/views/ReportUserView/styles.ts
@@ -10,7 +10,8 @@ export default StyleSheet.create({
 		flex: 1
 	},
 	containerView: {
-		padding: 16
+		paddingHorizontal: 16,
+		paddingTop: 32
 	},
 	containerAvatarAndName: {
 		flexDirection: 'row',
@@ -20,10 +21,11 @@ export default StyleSheet.create({
 	nameText: {
 		marginLeft: 8,
 		fontSize: 16,
-		...sharedStyles.textMedium
+		lineHeight: 24,
+		...sharedStyles.textBold
 	},
 	containerTextInput: {
-		marginBottom: 24
+		marginBottom: 36
 	},
 	textInput: {
 		minHeight: 100,
diff --git a/app/views/RoomActionsView/index.tsx b/app/views/RoomActionsView/index.tsx
index 7f3ed3c8e8..a3fc62249c 100644
--- a/app/views/RoomActionsView/index.tsx
+++ b/app/views/RoomActionsView/index.tsx
@@ -52,9 +52,7 @@ import { ILivechatDepartment } from '../../definitions/ILivechatDepartment';
 import { ILivechatTag } from '../../definitions/ILivechatTag';
 import CallSection from './components/CallSection';
 import { TNavigation } from '../../stacks/stackType';
-import Switch from '../../containers/Switch';
 import * as EncryptionUtils from '../../lib/encryption/utils';
-import { toggleRoomE2EE } from '../../lib/encryption/helpers/toggleRoomE2EE';
 
 type StackType = ChatsStackParamList & TNavigation;
 
@@ -361,19 +359,6 @@ class RoomActionsView extends React.Component<IRoomActionsViewProps, IRoomAction
 		return result;
 	};
 
-	renderEncryptedSwitch = () => {
-		const { room, canToggleEncryption, canEdit } = this.state;
-		const { rid, encrypted } = room;
-		const { serverVersion } = this.props;
-		let hasPermission = false;
-		if (compareServerVersion(serverVersion, 'lowerThan', '3.11.0')) {
-			hasPermission = canEdit;
-		} else {
-			hasPermission = canToggleEncryption;
-		}
-		return <Switch value={encrypted} onValueChange={() => toggleRoomE2EE(rid)} disabled={!hasPermission} />;
-	};
-
 	closeLivechat = async () => {
 		try {
 			const {
@@ -802,21 +787,34 @@ class RoomActionsView extends React.Component<IRoomActionsViewProps, IRoomAction
 	};
 
 	renderE2EEncryption = () => {
-		const { room } = this.state;
-		const { encryptionEnabled } = this.props;
+		const { room, canToggleEncryption, canEdit } = this.state;
 
-		// If this room type can be encrypted
-		// If e2e is enabled
-		if (E2E_ROOM_TYPES[room.t] && encryptionEnabled) {
+		const { serverVersion } = this.props;
+		let hasPermission = false;
+		if (compareServerVersion(serverVersion, 'lowerThan', '3.11.0')) {
+			hasPermission = canEdit;
+		} else {
+			hasPermission = canToggleEncryption;
+		}
+
+		if (E2E_ROOM_TYPES[room.t]) {
 			return (
 				<List.Section>
 					<List.Separator />
 					<List.Item
-						title='Encrypted'
-						testID='room-actions-encrypt'
+						title='E2E_Encryption'
+						subtitle={room.encrypted ? 'Enabled' : 'Disabled'}
 						left={() => <List.Icon name='encrypted' />}
-						right={this.renderEncryptedSwitch}
-						additionalAcessibilityLabel={!!room.encrypted}
+						onPress={() =>
+							this.onPressTouchable({
+								route: 'E2EEToggleRoomView',
+								params: {
+									rid: room.rid
+								}
+							})
+						}
+						disabled={!hasPermission}
+						showActionIndicator
 					/>
 					<List.Separator />
 				</List.Section>
diff --git a/app/views/RoomInfoEditView/SwitchContainer.tsx b/app/views/RoomInfoEditView/SwitchContainer.tsx
index 039487a3b9..867b0e2282 100644
--- a/app/views/RoomInfoEditView/SwitchContainer.tsx
+++ b/app/views/RoomInfoEditView/SwitchContainer.tsx
@@ -1,8 +1,7 @@
 import React, { ReactElement } from 'react';
 import { Text, TextStyle, View, ViewStyle } from 'react-native';
 
-import { TSupportedThemes } from '../../theme';
-import { themes } from '../../lib/constants';
+import { useTheme } from '../../theme';
 import styles from './styles';
 import Switch from '../../containers/Switch';
 
@@ -11,11 +10,8 @@ interface ISwitchContainer {
 	value: boolean;
 	disabled?: boolean;
 	leftLabelPrimary: string;
-	leftLabelSecondary: string;
-	rightLabelPrimary?: string;
-	rightLabelSecondary?: string;
+	leftLabelSecondary?: string;
 	onValueChange: (value: any) => void;
-	theme: TSupportedThemes;
 	testID: string;
 	labelContainerStyle?: ViewStyle;
 	leftLabelStyle?: TextStyle;
@@ -29,41 +25,44 @@ const SwitchContainer: React.FC<ISwitchContainer> = React.memo(
 		onValueChange,
 		leftLabelPrimary,
 		leftLabelSecondary,
-		rightLabelPrimary,
-		rightLabelSecondary,
-		theme,
 		testID,
 		labelContainerStyle,
 		leftLabelStyle
-	}) => (
-		<>
-			<View key='switch-container' style={[styles.switchContainer, !!children && styles.switchMargin]}>
-				{leftLabelPrimary && (
-					<View style={[styles.switchLabelContainer, labelContainerStyle]}>
-						<Text style={[styles.switchLabelPrimary, { color: themes[theme].fontTitlesLabels }, leftLabelStyle]}>
-							{leftLabelPrimary}
-						</Text>
-						<Text style={[styles.switchLabelSecondary, { color: themes[theme].fontTitlesLabels }, leftLabelStyle]}>
-							{leftLabelSecondary}
-						</Text>
-					</View>
-				)}
-				<Switch style={styles.switch} onValueChange={onValueChange} value={value} disabled={disabled} testID={testID} />
-				{rightLabelPrimary && (
-					<View style={[styles.switchLabelContainer, labelContainerStyle]}>
-						<Text style={[styles.switchLabelPrimary, { color: themes[theme].fontTitlesLabels }, leftLabelStyle]}>
-							{rightLabelPrimary}
-						</Text>
-						<Text style={[styles.switchLabelSecondary, { color: themes[theme].fontTitlesLabels }, leftLabelStyle]}>
-							{rightLabelSecondary}
-						</Text>
-					</View>
-				)}
+	}) => {
+		const { colors } = useTheme();
+
+		return (
+			<View>
+				<View key='switch-container' style={[styles.switchContainer, !!children && styles.switchMargin]}>
+					{leftLabelPrimary && (
+						<View
+							accessible
+							accessibilityLabel={`${leftLabelPrimary}. ${leftLabelSecondary ?? ''}. `}
+							style={[styles.switchLabelContainer, labelContainerStyle]}>
+							<Text style={[styles.switchLabelPrimary, { color: colors.fontTitlesLabels }, leftLabelStyle]}>
+								{leftLabelPrimary}
+							</Text>
+							{leftLabelSecondary && (
+								<Text style={[styles.switchLabelSecondary, { color: colors.fontSecondaryInfo }, leftLabelStyle]}>
+									{leftLabelSecondary}
+								</Text>
+							)}
+						</View>
+					)}
+					<Switch
+						accessibilityRole='switch'
+						accessible
+						style={styles.switch}
+						onValueChange={onValueChange}
+						value={value}
+						disabled={disabled}
+						testID={testID}
+					/>
+				</View>
+				{children}
 			</View>
-			{children}
-			<View key='switch-divider' style={[styles.divider, { borderColor: themes[theme].strokeLight }]} />
-		</>
-	)
+		);
+	}
 );
 
 export default SwitchContainer;
diff --git a/app/views/RoomInfoEditView/index.tsx b/app/views/RoomInfoEditView/index.tsx
index 4361da529f..fb05de3439 100644
--- a/app/views/RoomInfoEditView/index.tsx
+++ b/app/views/RoomInfoEditView/index.tsx
@@ -2,7 +2,7 @@ import React from 'react';
 import { Q } from '@nozbe/watermelondb';
 import { BlockContext } from '@rocket.chat/ui-kit';
 import { dequal } from 'dequal';
-import { Alert, Keyboard, ScrollView, Text, TextInput, TouchableOpacity, View, StyleSheet } from 'react-native';
+import { Alert, Keyboard, ScrollView, Text, TextInput, View } from 'react-native';
 import { connect } from 'react-redux';
 import { Subscription } from 'rxjs';
 
@@ -47,6 +47,7 @@ import {
 	random
 } from '../../lib/methods/helpers';
 import { Services } from '../../lib/services';
+import Button from '../../containers/Button';
 
 interface IRoomInfoEditViewState {
 	room: ISubscription;
@@ -517,240 +518,182 @@ class RoomInfoEditView extends React.Component<IRoomInfoEditViewProps, IRoomInfo
 			encrypted
 		} = this.state;
 		const { serverVersion, encryptionEnabled, theme } = this.props;
-		const { buttonBackgroundDangerDefault, fontDanger } = themes[theme];
 
 		return (
 			<KeyboardView
 				style={{ backgroundColor: themes[theme].surfaceRoom }}
 				contentContainerStyle={sharedStyles.container}
-				keyboardVerticalOffset={128}
-			>
+				keyboardVerticalOffset={128}>
 				<StatusBar />
 				<SafeAreaView testID='room-info-edit-view' style={{ backgroundColor: themes[theme].surfaceRoom }}>
 					<ScrollView
 						contentContainerStyle={sharedStyles.containerScrollView}
 						testID='room-info-edit-view-list'
-						{...scrollPersistTaps}
-					>
+						{...scrollPersistTaps}>
 						<View style={styles.avatarContainer}>
 							<AvatarWithEdit type={room.t} text={room.name} rid={room.rid} handleEdit={this.handleEditAvatar} />
 						</View>
-						<FormTextInput
-							inputRef={e => {
-								this.name = e;
-							}}
-							label={I18n.t('Name')}
-							value={name}
-							onChangeText={value => this.setState({ name: value })}
-							onSubmitEditing={() => {
-								this.description?.focus();
-							}}
-							error={nameError}
-							testID='room-info-edit-view-name'
-						/>
-						<FormTextInput
-							inputRef={e => {
-								this.description = e;
-							}}
-							label={I18n.t('Description')}
-							value={description}
-							onChangeText={value => this.setState({ description: value })}
-							onSubmitEditing={() => {
-								this.topic?.focus();
-							}}
-							testID='room-info-edit-view-description'
-						/>
-						<FormTextInput
-							inputRef={e => {
-								this.topic = e;
-							}}
-							label={I18n.t('Topic')}
-							value={topic}
-							onChangeText={value => this.setState({ topic: value })}
-							onSubmitEditing={() => {
-								this.announcement?.focus();
-							}}
-							testID='room-info-edit-view-topic'
-						/>
-						<FormTextInput
-							inputRef={e => {
-								this.announcement = e;
-							}}
-							label={I18n.t('Announcement')}
-							value={announcement}
-							onChangeText={value => this.setState({ announcement: value })}
-							onSubmitEditing={() => {
-								this.joinCode?.focus();
-							}}
-							testID='room-info-edit-view-announcement'
-						/>
-						{/* This TextInput avoid appears the password fill when typing into Announcements TextInput */}
-						<View style={{ height: StyleSheet.hairlineWidth, overflow: 'hidden' }}>
-							<TextInput
-								style={{
-									height: StyleSheet.hairlineWidth
+						<View style={styles.inputs}>
+							<FormTextInput
+								inputRef={e => {
+									this.name = e;
+								}}
+								label={I18n.t('Name')}
+								value={name}
+								onChangeText={value => this.setState({ name: value })}
+								onSubmitEditing={() => {
+									this.topic?.focus();
+								}}
+								error={nameError}
+								testID='room-info-edit-view-name'
+								required
+							/>
+							<FormTextInput
+								inputRef={e => {
+									this.topic = e;
+								}}
+								label={I18n.t('Topic')}
+								value={topic}
+								onChangeText={value => this.setState({ topic: value })}
+								onSubmitEditing={() => {
+									this.announcement?.focus();
 								}}
+								testID='room-info-edit-view-topic'
+							/>
+							<FormTextInput
+								inputRef={e => {
+									this.announcement = e;
+								}}
+								label={I18n.t('Announcement')}
+								value={announcement}
+								onChangeText={value => this.setState({ announcement: value })}
+								onSubmitEditing={() => {
+									this.description?.focus();
+								}}
+								testID='room-info-edit-view-announcement'
+							/>
+							<FormTextInput
+								inputRef={e => {
+									this.description = e;
+								}}
+								label={I18n.t('Description')}
+								value={description}
+								onChangeText={value => this.setState({ description: value })}
+								onSubmitEditing={() => {
+									this.joinCode?.focus();
+								}}
+								testID='room-info-edit-view-description'
 							/>
 						</View>
+
 						<FormTextInput
 							inputRef={e => {
 								this.joinCode = e;
 							}}
-							label={I18n.t('Password')}
+							label={I18n.t('Room_Password')}
 							value={joinCode}
 							onChangeText={value => this.setState({ joinCode: value })}
 							secureTextEntry
 							testID='room-info-edit-view-password'
 						/>
-						<SwitchContainer
-							value={t}
-							leftLabelPrimary={I18n.t('Public')}
-							leftLabelSecondary={
-								room.teamMain ? I18n.t('Everyone_can_access_this_team') : I18n.t('Everyone_can_access_this_channel')
-							}
-							rightLabelPrimary={I18n.t('Private')}
-							rightLabelSecondary={
-								room.teamMain
-									? I18n.t('Just_invited_people_can_access_this_team')
-									: I18n.t('Just_invited_people_can_access_this_channel')
-							}
-							onValueChange={this.toggleRoomType}
-							theme={theme}
-							testID='room-info-edit-view-t'
-						/>
-						<SwitchContainer
-							value={ro}
-							leftLabelPrimary={I18n.t('Collaborative')}
-							leftLabelSecondary={
-								room.teamMain
-									? I18n.t('All_users_in_the_team_can_write_new_messages')
-									: I18n.t('All_users_in_the_channel_can_write_new_messages')
-							}
-							rightLabelPrimary={I18n.t('Read_Only')}
-							rightLabelSecondary={I18n.t('Only_authorized_users_can_write_new_messages')}
-							onValueChange={this.toggleReadOnly}
-							disabled={!permissions['set-readonly'] || room.broadcast}
-							theme={theme}
-							testID='room-info-edit-view-ro'
-						/>
-						{ro && !room.broadcast ? (
+						<View style={styles.switches}>
 							<SwitchContainer
-								value={reactWhenReadOnly as boolean}
-								leftLabelPrimary={I18n.t('No_Reactions')}
-								leftLabelSecondary={I18n.t('Reactions_are_disabled')}
-								rightLabelPrimary={I18n.t('Allow_Reactions')}
-								rightLabelSecondary={I18n.t('Reactions_are_enabled')}
-								onValueChange={this.toggleReactions}
-								disabled={!permissions['set-react-when-readonly']}
-								theme={theme}
-								testID='room-info-edit-view-react-when-ro'
+								value={t}
+								leftLabelPrimary={I18n.t('Public')}
+								leftLabelSecondary={
+									room.teamMain ? I18n.t('Everyone_can_access_this_team') : I18n.t('Everyone_can_access_this_channel')
+								}
+								onValueChange={this.toggleRoomType}
+								testID='room-info-edit-view-t'
 							/>
-						) : null}
-						{room.broadcast
-							? [
-									<Text style={styles.broadcast}>{I18n.t('Broadcast')}</Text>,
-									<View style={[styles.divider, { borderColor: themes[theme].strokeLight }]} />
-							  ]
-							: null}
-						{serverVersion && !compareServerVersion(serverVersion, 'lowerThan', '3.0.0') ? (
+
 							<SwitchContainer
-								value={enableSysMes as boolean}
-								leftLabelPrimary={I18n.t('Hide_System_Messages')}
+								value={ro}
+								leftLabelPrimary={I18n.t('Read_Only')}
 								leftLabelSecondary={
-									enableSysMes
-										? I18n.t('Overwrites_the_server_configuration_and_use_room_config')
-										: I18n.t('Uses_server_configuration')
+									room.teamMain
+										? I18n.t('All_users_in_the_team_can_write_new_messages')
+										: I18n.t('All_users_in_the_channel_can_write_new_messages')
 								}
-								theme={theme}
-								testID='room-info-edit-switch-system-messages'
-								onValueChange={this.toggleHideSystemMessages}
-								labelContainerStyle={styles.hideSystemMessages}
-								leftLabelStyle={styles.systemMessagesLabel}
-							>
-								{this.renderSystemMessages()}
-							</SwitchContainer>
-						) : null}
-						{encryptionEnabled ? (
-							<SwitchContainer
-								value={encrypted as boolean}
-								disabled={!t}
-								leftLabelPrimary={I18n.t('Encrypted')}
-								leftLabelSecondary={I18n.t('End_to_end_encrypted_room')}
-								theme={theme}
-								testID='room-info-edit-switch-encrypted'
-								onValueChange={this.toggleEncrypted}
-								labelContainerStyle={styles.hideSystemMessages}
-								leftLabelStyle={styles.systemMessagesLabel}
+								onValueChange={this.toggleReadOnly}
+								disabled={!permissions['set-readonly'] || room.broadcast}
+								testID='room-info-edit-view-ro'
 							/>
-						) : null}
-						<TouchableOpacity
-							style={[
-								styles.buttonContainer,
-								{ backgroundColor: themes[theme].buttonBackgroundSecondaryDefault },
-								!this.formIsChanged() && styles.buttonContainerDisabled
-							]}
+							{ro && !room.broadcast ? (
+								<SwitchContainer
+									value={reactWhenReadOnly as boolean}
+									leftLabelPrimary={I18n.t('No_Reactions')}
+									leftLabelSecondary={I18n.t('Reactions_are_disabled')}
+									onValueChange={this.toggleReactions}
+									disabled={!permissions['set-react-when-readonly']}
+									testID='room-info-edit-view-react-when-ro'
+								/>
+							) : null}
+							{room.broadcast
+								? [
+										<Text style={styles.broadcast}>{I18n.t('Broadcast')}</Text>,
+										<View style={[styles.divider, { borderColor: themes[theme].strokeLight }]} />
+								  ]
+								: null}
+							{serverVersion && !compareServerVersion(serverVersion, 'lowerThan', '3.0.0') ? (
+								<SwitchContainer
+									value={enableSysMes as boolean}
+									leftLabelPrimary={I18n.t('Hide_System_Messages')}
+									testID='room-info-edit-switch-system-messages'
+									onValueChange={this.toggleHideSystemMessages}
+									labelContainerStyle={styles.hideSystemMessages}
+									leftLabelStyle={styles.systemMessagesLabel}>
+									{this.renderSystemMessages()}
+								</SwitchContainer>
+							) : null}
+							{encryptionEnabled ? (
+								<SwitchContainer
+									value={encrypted as boolean}
+									disabled={!t}
+									leftLabelPrimary={I18n.t('Encrypted')}
+									leftLabelSecondary={I18n.t('End_to_end_encrypted_room')}
+									testID='room-info-edit-switch-encrypted'
+									onValueChange={this.toggleEncrypted}
+									labelContainerStyle={styles.hideSystemMessages}
+									leftLabelStyle={styles.systemMessagesLabel}
+								/>
+							) : null}
+						</View>
+						<Button
+							title={I18n.t('Save_Changes')}
 							onPress={this.submit}
 							disabled={!this.formIsChanged()}
 							testID='room-info-edit-view-submit'
-						>
-							<Text style={[styles.button, { color: themes[theme].fontWhite }]} accessibilityRole='button'>
-								{I18n.t('SAVE')}
-							</Text>
-						</TouchableOpacity>
-						<View style={{ flexDirection: 'row' }}>
-							<TouchableOpacity
-								style={[
-									styles.buttonContainer_inverted,
-									styles.buttonInverted,
-									{ flex: 1, borderColor: themes[theme].fontSecondaryInfo },
-									!this.formIsChanged() && styles.buttonContainerDisabled
-								]}
-								onPress={this.reset}
-								disabled={!this.formIsChanged()}
-								testID='room-info-edit-view-reset'
-							>
-								<Text
-									style={[styles.button, styles.button_inverted, { color: themes[theme].fontDefault }]}
-									accessibilityRole='button'
-								>
-									{I18n.t('RESET')}
-								</Text>
-							</TouchableOpacity>
-							<TouchableOpacity
-								style={[
-									styles.buttonInverted,
-									styles.buttonContainer_inverted,
-									archived
-										? !permissions['unarchive-room'] && sharedStyles.opacity5
-										: !permissions['archive-room'] && sharedStyles.opacity5,
-									{ flex: 1, marginLeft: 10, borderColor: buttonBackgroundDangerDefault }
-								]}
-								onPress={this.toggleArchive}
-								disabled={archived ? !permissions['unarchive-room'] : !permissions['archive-room']}
-								testID={archived ? 'room-info-edit-view-unarchive' : 'room-info-edit-view-archive'}
-							>
-								<Text style={[styles.button, styles.button_inverted, { color: fontDanger }]}>
-									{archived ? I18n.t('UNARCHIVE') : I18n.t('ARCHIVE')}
-								</Text>
-							</TouchableOpacity>
-						</View>
+							style={{ marginBottom: 0 }}
+						/>
 						<View style={[styles.divider, { borderColor: themes[theme].strokeLight }]} />
-						<TouchableOpacity
-							style={[
-								styles.buttonContainer_inverted,
-								styles.buttonContainerLastChild,
-								styles.buttonDanger,
-								{ borderColor: buttonBackgroundDangerDefault },
-								!this.hasDeletePermission() && sharedStyles.opacity5
-							]}
+
+						<Button
+							backgroundColor={themes[theme].buttonBackgroundSecondaryDefault}
+							title={I18n.t('RESET')}
+							onPress={this.reset}
+							disabled={!this.formIsChanged()}
+							testID='room-info-edit-view-reset'
+						/>
+						<Button
+							backgroundColor={themes[theme].buttonBackgroundSecondaryDefault}
+							color={themes[theme].fontTitlesLabels}
+							title={archived ? I18n.t('UNARCHIVE') : I18n.t('ARCHIVE')}
+							onPress={this.toggleArchive}
+							disabled={archived ? !permissions['unarchive-room'] : !permissions['archive-room']}
+							testID={archived ? 'room-info-edit-view-unarchive' : 'room-info-edit-view-archive'}
+							style={{ marginBottom: 0 }}
+						/>
+
+						<View style={[styles.divider, { borderColor: themes[theme].strokeLight }]} />
+						<Button
+							color={themes[theme].buttonFontSecondaryDanger}
+							backgroundColor={themes[theme].buttonBackgroundSecondaryDefault}
+							title={I18n.t('Delete')}
 							onPress={room.teamMain ? this.deleteTeam : this.delete}
 							disabled={!this.hasDeletePermission()}
 							testID='room-info-edit-view-delete'
-						>
-							<Text style={[styles.button, styles.button_inverted, { color: fontDanger }]} accessibilityRole='button'>
-								{I18n.t('DELETE')}
-							</Text>
-						</TouchableOpacity>
+						/>
 					</ScrollView>
 				</SafeAreaView>
 			</KeyboardView>
diff --git a/app/views/RoomInfoEditView/styles.ts b/app/views/RoomInfoEditView/styles.ts
index 1e643b7b6c..1861971e34 100644
--- a/app/views/RoomInfoEditView/styles.ts
+++ b/app/views/RoomInfoEditView/styles.ts
@@ -39,18 +39,17 @@ export default StyleSheet.create({
 	},
 	switchLabelContainer: {
 		flex: 1,
-		paddingHorizontal: 10,
-		alignItems: 'flex-end'
+		alignItems: 'flex-start'
 	},
 	switchLabelPrimary: {
 		fontSize: 16,
-		paddingBottom: 6,
+		lineHeight: 24,
 		...sharedStyles.textRegular
 	},
 	switchLabelSecondary: {
-		fontSize: 12,
-		...sharedStyles.textRegular,
-		textAlign: 'right'
+		fontSize: 14,
+		lineHeight: 20,
+		...sharedStyles.textRegular
 	},
 	switch: {
 		alignSelf: 'center'
@@ -58,7 +57,7 @@ export default StyleSheet.create({
 	divider: {
 		height: StyleSheet.hairlineWidth,
 		borderBottomWidth: StyleSheet.hairlineWidth,
-		marginVertical: 20
+		marginVertical: 12
 	},
 	broadcast: {
 		...sharedStyles.textSemibold,
@@ -76,7 +75,7 @@ export default StyleSheet.create({
 	avatarContainer: {
 		alignItems: 'center',
 		justifyContent: 'center',
-		marginBottom: 32,
+		marginBottom: 16,
 		marginTop: 16
 	},
 	resetButton: {
@@ -85,5 +84,14 @@ export default StyleSheet.create({
 		position: 'absolute',
 		bottom: -8,
 		right: -8
+	},
+	inputs: {
+		flex: 1,
+		gap: 12
+	},
+	switches: {
+		flex: 1,
+		gap: 12,
+		marginBottom: 36
 	}
 });
diff --git a/app/views/RoomInfoView/index.tsx b/app/views/RoomInfoView/index.tsx
index dd8e92f01c..caa66f75d8 100644
--- a/app/views/RoomInfoView/index.tsx
+++ b/app/views/RoomInfoView/index.tsx
@@ -103,6 +103,7 @@ const RoomInfoView = (): React.ReactElement => {
 		const HeaderRight = () => (
 			<HeaderButton.Container>
 				<HeaderButton.Item
+					accessibilityLabel={I18n.t('Room_Info_Edit')}
 					iconName='edit'
 					onPress={() => {
 						if (!room) return;
@@ -196,7 +197,7 @@ const RoomInfoView = (): React.ReactElement => {
 			const sub = subRoom.observe();
 			subscription.current = sub.subscribe(changes => {
 				setRoom(changes.asPlain());
-				setHeader((roomType === SubscriptionType.DIRECT) ? false : canEdit);
+				setHeader(roomType === SubscriptionType.DIRECT ? false : canEdit);
 			});
 		} else {
 			try {
@@ -209,7 +210,7 @@ const RoomInfoView = (): React.ReactElement => {
 			}
 		}
 		setShowEdit(canEdit);
-		setHeader((roomType === SubscriptionType.DIRECT) ? false : canEdit);
+		setHeader(roomType === SubscriptionType.DIRECT ? false : canEdit);
 	};
 
 	const createDirect = () =>
diff --git a/app/views/RoomView/Banner.tsx b/app/views/RoomView/Banner.tsx
index d03f605253..32f9d30cd4 100644
--- a/app/views/RoomView/Banner.tsx
+++ b/app/views/RoomView/Banner.tsx
@@ -32,7 +32,7 @@ const Banner = React.memo(
 						onPress={toggleModal}
 					>
 						<MarkdownPreview msg={text} style={[styles.bannerText]} />
-						<BorderlessButton onPress={closeBanner}>
+						<BorderlessButton onPress={closeBanner} hitSlop={10}>
 							<CustomIcon color={themes[theme].fontSecondaryInfo} name='close' size={20} />
 						</BorderlessButton>
 					</BorderlessButton>
diff --git a/app/views/RoomView/RightButtons.tsx b/app/views/RoomView/RightButtons.tsx
index dae2f343de..51a832594d 100644
--- a/app/views/RoomView/RightButtons.tsx
+++ b/app/views/RoomView/RightButtons.tsx
@@ -22,7 +22,6 @@ import { TNavigation } from '../../stacks/stackType';
 import { ChatsStackParamList } from '../../stacks/types';
 import { HeaderCallButton } from './components';
 import { TColors, TSupportedThemes, withTheme } from '../../theme';
-import { toggleRoomE2EE } from '../../lib/encryption/helpers/toggleRoomE2EE';
 
 interface IRightButtonsProps extends Pick<ISubscription, 't'> {
 	userId?: string;
@@ -79,7 +78,7 @@ class RightButtonsContainer extends Component<IRightButtonsProps, IRigthButtonsS
 	}
 
 	async componentDidMount() {
-		const { tmid, rid } = this.props;
+		const { tmid, rid, hasE2EEWarning } = this.props;
 		const db = database.active;
 		if (tmid) {
 			try {
@@ -98,7 +97,9 @@ class RightButtonsContainer extends Component<IRightButtonsProps, IRigthButtonsS
 				console.log("Can't find subscription to observe.");
 			}
 		}
-		this.setCanToggleEncryption();
+		if (hasE2EEWarning) {
+			this.setCanToggleEncryption();
+		}
 	}
 
 	shouldComponentUpdate(nextProps: IRightButtonsProps, nextState: IRigthButtonsState) {
@@ -161,7 +162,7 @@ class RightButtonsContainer extends Component<IRightButtonsProps, IRigthButtonsS
 
 	componentDidUpdate(prevProps: Readonly<IRightButtonsProps>): void {
 		const { toggleRoomE2EEncryptionPermission } = this.props;
-		if (prevProps.toggleRoomE2EEncryptionPermission !== toggleRoomE2EEncryptionPermission) {
+		if (!dequal(prevProps.toggleRoomE2EEncryptionPermission, toggleRoomE2EEncryptionPermission)) {
 			this.setCanToggleEncryption();
 		}
 	}
@@ -191,6 +192,11 @@ class RightButtonsContainer extends Component<IRightButtonsProps, IRigthButtonsS
 		const subObservable = subRecord.observe();
 		this.subSubscription = subObservable.subscribe(sub => {
 			this.updateSubscription(sub);
+
+			const { hasE2EEWarning } = this.props;
+			if (hasE2EEWarning) {
+				this.setCanToggleEncryption();
+			}
 		});
 	};
 
@@ -391,6 +397,24 @@ class RightButtonsContainer extends Component<IRightButtonsProps, IRigthButtonsS
 		}
 	};
 
+	goE2EEToggleRoomView = () => {
+		logEvent(events.ROOM_GO_SEARCH);
+		const { rid, navigation, isMasterDetail } = this.props;
+		if (!rid) {
+			return;
+		}
+		if (isMasterDetail) {
+			// @ts-ignore TODO: find a way to make this work
+			navigation.navigate('ModalStackNavigator', {
+				screen: 'E2EEToggleRoomView',
+				params: { rid }
+			});
+		} else {
+			// @ts-ignore
+			navigation.navigate('E2EEToggleRoomView', { rid });
+		}
+	};
+
 	toggleFollowThread = () => {
 		logEvent(events.ROOM_TOGGLE_FOLLOW_THREADS);
 		const { isFollowingThread } = this.state;
@@ -442,7 +466,12 @@ class RightButtonsContainer extends Component<IRightButtonsProps, IRigthButtonsS
 		return (
 			<HeaderButton.Container onLayout={this.onLayout}>
 				{hasE2EEWarning ? (
-					<HeaderButton.Item iconName='encrypted' onPress={() => toggleRoomE2EE(rid)} disabled={!canToggleEncryption} />
+					<HeaderButton.Item
+						iconName='encrypted'
+						onPress={this.goE2EEToggleRoomView}
+						disabled={!canToggleEncryption}
+						testID='room-view-header-encryption'
+					/>
 				) : null}
 				{issuesWithNotifications || notificationsDisabled ? (
 					<HeaderButton.Item
diff --git a/app/views/RoomView/index.tsx b/app/views/RoomView/index.tsx
index df4d70b24a..411db9027b 100644
--- a/app/views/RoomView/index.tsx
+++ b/app/views/RoomView/index.tsx
@@ -513,7 +513,6 @@ class RoomView extends React.Component<IRoomViewProps, IRoomViewState> {
 					onPress={this.goRoomActionsView}
 					testID={`room-view-title-${title}`}
 					sourceType={sourceType}
-					disabled={e2eeWarning}
 					rightButtonsWidth={rightButtonsWidth}
 				/>
 			),
@@ -1516,7 +1515,11 @@ class RoomView extends React.Component<IRoomViewProps, IRoomViewState> {
 				}}>
 				<SafeAreaView style={{ backgroundColor: themes[theme].surfaceRoom }} testID='room-view'>
 					<StatusBar />
-					<Banner title={I18n.t('Announcement')} text={announcement} bannerClosed={bannerClosed} closeBanner={this.closeBanner} />
+					{
+						(!this.tmid) ? (
+							<Banner title={I18n.t('Announcement')} text={announcement} bannerClosed={bannerClosed} closeBanner={this.closeBanner} />
+						) : null
+					}
 					<List
 						ref={this.list}
 						listRef={this.flatList}
diff --git a/app/views/SettingsView/index.tsx b/app/views/SettingsView/index.tsx
index 94e25e4c38..1bbe646ac5 100644
--- a/app/views/SettingsView/index.tsx
+++ b/app/views/SettingsView/index.tsx
@@ -259,6 +259,14 @@ const SettingsView = (): React.ReactElement => {
 						left={() => <List.Icon name='arrow-forward' />}
 					/>
 					<List.Separator />
+					<List.Item
+						title='Legal'
+						showActionIndicator
+						onPress={() => navigateToScreen('LegalView')}
+						testID='settings-view-legal'
+						left={() => <List.Icon name='book' />}
+					/>
+					<List.Separator />
 					<List.Item
 						title='Contact_us'
 						onPress={sendEmail}
diff --git a/app/views/Styles.ts b/app/views/Styles.ts
index 6e9ea83739..7ef2b61f03 100644
--- a/app/views/Styles.ts
+++ b/app/views/Styles.ts
@@ -18,8 +18,9 @@ export default StyleSheet.create({
 		flexDirection: 'column'
 	},
 	containerScrollView: {
-		padding: 16,
-		paddingBottom: 30
+		paddingTop: 12,
+		paddingHorizontal: 16,
+		paddingBottom: 24
 	},
 	tabletScreenContent: {
 		justifyContent: 'center',
diff --git a/e2e/helpers/app.ts b/e2e/helpers/app.ts
index 6df4f9718d..73d51d2f98 100644
--- a/e2e/helpers/app.ts
+++ b/e2e/helpers/app.ts
@@ -132,20 +132,28 @@ async function searchRoom(
 	nativeElementAction: keyof Pick<Detox.NativeElementActions, 'typeText' | 'replaceText'> = 'typeText',
 	roomTestID?: string
 ) {
+	const testID = roomTestID || `rooms-list-view-item-${room}`;
 	await waitFor(element(by.id('rooms-list-view')))
 		.toExist()
 		.withTimeout(30000);
-	await tapAndWaitFor(element(by.id('rooms-list-view-search')), element(by.id('rooms-list-view-search-input')), 5000);
-	if (nativeElementAction === 'replaceText') {
-		// trigger the input's onChangeText
-		await element(by.id('rooms-list-view-search-input')).typeText(' ');
+
+	try {
+		await waitFor(element(by.id(testID)))
+			.toBeVisible()
+			.withTimeout(2000);
+		await expect(element(by.id(testID))).toBeVisible();
+	} catch {
+		await tapAndWaitFor(element(by.id('rooms-list-view-search')), element(by.id('rooms-list-view-search-input')), 5000);
+		if (nativeElementAction === 'replaceText') {
+			// trigger the input's onChangeText
+			await element(by.id('rooms-list-view-search-input')).typeText(' ');
+		}
+		await element(by.id('rooms-list-view-search-input'))[nativeElementAction](room);
+		await sleep(500);
+		await waitFor(element(by.id(testID)))
+			.toBeVisible()
+			.withTimeout(60000);
 	}
-	await element(by.id('rooms-list-view-search-input'))[nativeElementAction](room);
-	await sleep(500);
-	await sleep(500);
-	await waitFor(element(by.id(roomTestID || `rooms-list-view-item-${room}`)))
-		.toBeVisible()
-		.withTimeout(60000);
 }
 
 async function navigateToRoom(room: string) {
diff --git a/e2e/helpers/data_setup.ts b/e2e/helpers/data_setup.ts
index d963877b43..b451344a3a 100644
--- a/e2e/helpers/data_setup.ts
+++ b/e2e/helpers/data_setup.ts
@@ -48,6 +48,7 @@ export const createRandomUser = async (customProps?: Object): Promise<ITestUser>
 			email: user.email,
 			...(customProps || {})
 		});
+		console.log(`Created ${user.username} / ${user.password}`);
 		return user;
 	} catch (error) {
 		console.log(JSON.stringify(error));
diff --git a/e2e/tests/assorted/01-e2eencryption.spec.ts b/e2e/tests/assorted/01-e2eencryption.spec.ts
index 369a3cea6d..e17151f70b 100644
--- a/e2e/tests/assorted/01-e2eencryption.spec.ts
+++ b/e2e/tests/assorted/01-e2eencryption.spec.ts
@@ -5,46 +5,45 @@ import {
 	login,
 	sleep,
 	tapBack,
-	logout,
 	platformTypes,
 	TTextMatcher,
 	tapAndWaitFor,
-	expectValidRegisterOrRetry,
 	mockMessage,
 	tryTapping,
-	navigateToRoom
+	navigateToRoom,
+	checkRoomTitle
 } from '../../helpers/app';
-import data from '../../data';
 import { createRandomUser, deleteCreatedUsers, IDeleteCreateUser, ITestUser } from '../../helpers/data_setup';
 import random from '../../helpers/random';
 
-const checkServer = async (server: string) => {
-	const label = `Connected to ${server}`;
-	await waitFor(element(by.id('rooms-list-view-sidebar')))
-		.toBeVisible()
-		.withTimeout(10000);
-	await element(by.id('rooms-list-view-sidebar')).tap();
-	await waitFor(element(by.id('sidebar-view')))
-		.toBeVisible()
-		.withTimeout(2000);
-	await waitFor(element(by.label(label)))
-		.toBeVisible()
-		.withTimeout(60000);
-	await element(by.id('sidebar-close-drawer')).tap();
-};
-
-const checkBanner = async () => {
-	// TODO: Assert 'Save Your Encryption Password'
-	await waitFor(element(by.id('listheader-encryption')))
-		.toExist()
-		.withTimeout(10000);
+let alertButtonType: string;
+let textMatcher: TTextMatcher;
+const newPassword = 'abc';
+const getMessage = (i: number) => `m${i}`;
+
+const loginAs = async (user: ITestUser, enterE2EEPassword = true) => {
+	await device.launchApp({ permissions: { notifications: 'YES' }, delete: true });
+	await navigateToLogin();
+	await login(user.username, user.password);
+
+	if (enterE2EEPassword) {
+		await waitFor(element(by.id('listheader-encryption')))
+			.toBeVisible()
+			.withTimeout(2000);
+		await tapAndWaitFor(element(by.id('listheader-encryption')), element(by.id('e2e-enter-your-password-view')), 2000);
+		await element(by.id('e2e-enter-your-password-view-password')).replaceText(newPassword);
+		await element(by.id('e2e-enter-your-password-view-confirm')).tap();
+		await waitFor(element(by.id('listheader-encryption')))
+			.not.toExist()
+			.withTimeout(10000);
+	}
 };
 
 async function waitForToast() {
 	await sleep(300);
 }
 
-async function navigateSecurityPrivacy() {
+const navToE2EESecurity = async () => {
 	await waitFor(element(by.id('rooms-list-view')))
 		.toBeVisible()
 		.withTimeout(2000);
@@ -63,374 +62,211 @@ async function navigateSecurityPrivacy() {
 	await waitFor(element(by.id('security-privacy-view')))
 		.toBeVisible()
 		.withTimeout(2000);
-}
+	await expect(element(by.id('security-privacy-view-e2e-encryption'))).toExist();
+	await element(by.id('security-privacy-view-e2e-encryption')).tap();
+	await waitFor(element(by.id('e2e-encryption-security-view')))
+		.toBeVisible()
+		.withTimeout(2000);
+	// await expect(element(by.id('e2e-encryption-security-view-password'))).toExist();
+	// await expect(element(by.id('e2e-encryption-security-view-change-password'))).toExist();
+	await expect(element(by.id('e2e-encryption-security-view-reset-key'))).toExist();
+};
+
+const changeE2EEPassword = async () => {
+	await navToE2EESecurity();
+	await element(by.id('e2e-encryption-security-view-password')).replaceText(newPassword);
+	await element(by.id('e2e-encryption-security-view-change-password')).tap();
+	await waitFor(element(by[textMatcher]('Are you sure?')))
+		.toExist()
+		.withTimeout(2000);
+	await expect(element(by[textMatcher]("Make sure you've saved it carefully somewhere else."))).toExist();
+	await element(by[textMatcher]('Yes, change it')).atIndex(0).tap();
+	await waitForToast();
+};
+
+const resetE2EEKey = async () => {
+	await navToE2EESecurity();
+	await element(by.id('e2e-encryption-security-view-reset-key')).tap();
+	await waitFor(element(by[textMatcher]('Are you sure?')))
+		.toExist()
+		.withTimeout(2000);
+	await expect(element(by[textMatcher]("You're going to be logged out."))).toExist();
+	await element(by[textMatcher]('Yes, reset it').and(by.type(alertButtonType))).tap();
+	await waitFor(element(by.id('new-server-view')))
+		.toBeVisible()
+		.withTimeout(60000);
+};
+
+const readMessages = async (count: number) => {
+	for (let i = 0; i < count; i++) {
+		await waitFor(element(by[textMatcher](getMessage(i))).atIndex(0))
+			.toExist()
+			.withTimeout(2000);
+	}
+};
 
 describe('E2E Encryption', () => {
 	const room = `encrypted${random()}`;
-	let user: ITestUser;
-	let otherUser: ITestUser;
-	let mockedMessageText: string;
-	const newPassword = 'abc';
-
-	let alertButtonType: string;
-	let textMatcher: TTextMatcher;
+	let UserA: ITestUser;
+	let UserB: ITestUser;
 
 	const deleteUsersAfterAll: IDeleteCreateUser[] = [];
 
 	beforeAll(async () => {
-		user = await createRandomUser();
-		otherUser = await createRandomUser();
-		await device.launchApp({ permissions: { notifications: 'YES' }, delete: true });
+		UserA = await createRandomUser();
+		UserB = await createRandomUser();
 		({ alertButtonType, textMatcher } = platformTypes[device.getPlatform()]);
-		await navigateToLogin();
-		await login(user.username, user.password);
+		await loginAs(UserB, false);
+		await changeE2EEPassword();
+		await loginAs(UserA, false);
+		await changeE2EEPassword();
 	});
 
 	afterAll(async () => {
 		await deleteCreatedUsers(deleteUsersAfterAll);
 	});
 
-	describe('Banner', () => {
-		describe('Render', () => {
-			it('should have encryption badge', async () => {
-				await checkBanner();
-			});
-		});
-
-		describe('Usage', () => {
-			it('should tap encryption badge and open save password modal', async () => {
-				await element(by.id('listheader-encryption')).tap();
-				await waitFor(element(by.id('e2e-save-password-view')))
-					.toBeVisible()
-					.withTimeout(2000);
-			});
-
-			it('should tap "How it works" and navigate', async () => {
-				await element(by.id('e2e-save-password-view-how-it-works')).tap();
-				await waitFor(element(by.id('e2e-how-it-works-view')))
-					.toBeVisible()
-					.withTimeout(2000);
-				await tapBack();
-			});
-
-			it('should tap "Save my password" and close modal', async () => {
-				await element(by.id('e2e-save-password-view-saved-password')).tap();
-				await sleep(300); // wait for animation
-				await waitFor(element(by.id('rooms-list-view')))
-					.toBeVisible()
-					.withTimeout(2000);
-			});
-
-			it('should create encrypted room', async () => {
-				await element(by.id('rooms-list-view-create-channel')).tap();
-				await waitFor(element(by.id('new-message-view')))
-					.toBeVisible()
-					.withTimeout(5000);
-				await waitFor(element(by.id('new-message-view-create-channel')))
-					.toBeVisible()
-					.withTimeout(2000);
-				await element(by.id('new-message-view-create-channel')).tap();
-				await waitFor(element(by.id('select-users-view')))
-					.toBeVisible()
-					.withTimeout(2000);
-				await element(by.id('select-users-view-search')).replaceText(otherUser.username);
-				await waitFor(element(by.id(`select-users-view-item-${otherUser.username}`)))
-					.toBeVisible()
-					.withTimeout(60000);
-				await element(by.id(`select-users-view-item-${otherUser.username}`)).tap();
-				await waitFor(element(by.id(`selected-user-${otherUser.username}`)))
-					.toBeVisible()
-					.withTimeout(5000);
-				await element(by.id('selected-users-view-submit')).tap();
-				await waitFor(element(by.id('create-channel-view')))
-					.toExist()
-					.withTimeout(5000);
-				await element(by.id('create-channel-name')).replaceText(room);
-				await element(by.id('create-channel-name')).tapReturnKey();
-				await element(by.id('create-channel-encrypted')).longPress();
-				await element(by.id('create-channel-submit')).tap();
-				await waitFor(element(by.id('room-view')))
-					.toBeVisible()
-					.withTimeout(60000);
-				await waitFor(element(by.id(`room-view-title-${room}`)))
-					.toBeVisible()
-					.withTimeout(60000);
-			});
-
-			it('should send message and be able to read it', async () => {
-				mockedMessageText = await mockMessage('message');
-			});
-
-			it('should quote a message and be able to read both', async () => {
-				const mockedMessageTextToQuote = await mockMessage('message to be quote');
-				const quotedMessage = `${mockedMessageTextToQuote}d`;
-				await tryTapping(element(by[textMatcher](mockedMessageTextToQuote)).atIndex(0), 2000, true);
-				await waitFor(element(by.id('action-sheet')))
-					.toExist()
-					.withTimeout(2000);
-				await expect(element(by.id('action-sheet-handle'))).toBeVisible();
-				await element(by.id('action-sheet-handle')).swipe('up', 'fast', 0.5);
-				await element(by[textMatcher]('Quote')).atIndex(0).tap();
-				await element(by.id('message-composer-input')).replaceText(quotedMessage);
-				await waitFor(element(by.id('message-composer-send')))
-					.toExist()
-					.withTimeout(2000);
-				await element(by.id('message-composer-send')).tap();
-				await waitFor(element(by[textMatcher](quotedMessage)).atIndex(0))
-					.toBeVisible()
-					.withTimeout(3000);
-				await waitFor(
-					element(
-						by.id(`reply-${user.name}-${mockedMessageTextToQuote}`).withDescendant(by[textMatcher](mockedMessageTextToQuote))
-					)
-				)
-					.toBeVisible()
-					.withTimeout(3000);
-				await tapBack();
-			});
-		});
-	});
-
-	describe('Security and Privacy', () => {
-		it('should navigate to security privacy', async () => {
-			await waitFor(element(by.id('rooms-list-view')))
+	describe('Create room as UserA and send a message', () => {
+		it('should create encrypted room', async () => {
+			await device.launchApp({ permissions: { notifications: 'YES' }, newInstance: true });
+			await element(by.id('rooms-list-view-create-channel')).tap();
+			await waitFor(element(by.id('new-message-view')))
 				.toBeVisible()
-				.withTimeout(2000);
-			await element(by.id('rooms-list-view-sidebar')).tap();
-			await waitFor(element(by.id('sidebar-view')))
+				.withTimeout(5000);
+			await waitFor(element(by.id('new-message-view-create-channel')))
 				.toBeVisible()
 				.withTimeout(2000);
-			await waitFor(element(by.id('sidebar-settings')))
+			await element(by.id('new-message-view-create-channel')).tap();
+			await waitFor(element(by.id('select-users-view')))
 				.toBeVisible()
 				.withTimeout(2000);
-			await element(by.id('sidebar-settings')).tap();
-			await waitFor(element(by.id('settings-view')))
+			await element(by.id('select-users-view-search')).replaceText(UserB.username);
+			await waitFor(element(by.id(`select-users-view-item-${UserB.username}`)))
 				.toBeVisible()
-				.withTimeout(2000);
-			await element(by.id('settings-view-security-privacy')).tap();
-			await waitFor(element(by.id('security-privacy-view')))
+				.withTimeout(60000);
+			await element(by.id(`select-users-view-item-${UserB.username}`)).tap();
+			await waitFor(element(by.id(`selected-user-${UserB.username}`)))
 				.toBeVisible()
-				.withTimeout(2000);
+				.withTimeout(5000);
+			await element(by.id('selected-users-view-submit')).tap();
+			await waitFor(element(by.id('create-channel-view')))
+				.toExist()
+				.withTimeout(5000);
+			await element(by.id('create-channel-name')).replaceText(room);
+			await element(by.id('create-channel-name')).tapReturnKey();
+			await element(by.id('create-channel-encrypted')).longPress();
+			await element(by.id('create-channel-submit')).tap();
+			await checkRoomTitle(room);
 		});
 
-		it('render', async () => {
-			await expect(element(by.id('security-privacy-view-e2e-encryption'))).toExist();
-			await expect(element(by.id('security-privacy-view-screen-lock'))).toExist();
-			await expect(element(by.id('security-privacy-view-analytics-events'))).toExist();
-			await expect(element(by.id('security-privacy-view-crash-report'))).toExist();
+		it('should send message and be able to read it', async () => {
+			await mockMessage(getMessage(0));
 		});
-	});
 
-	describe('E2E Encryption Security', () => {
-		it('should navigate to e2e encryption security', async () => {
-			await element(by.id('security-privacy-view-e2e-encryption')).tap();
-			await waitFor(element(by.id('e2e-encryption-security-view')))
-				.toBeVisible()
+		it('should quote a message and be able to read both', async () => {
+			const mockedMessageTextToQuote = await mockMessage(getMessage(1));
+			const quotedMessage = getMessage(2);
+			await tryTapping(element(by[textMatcher](mockedMessageTextToQuote)).atIndex(0), 2000, true);
+			await waitFor(element(by.id('action-sheet')))
+				.toExist()
 				.withTimeout(2000);
+			await expect(element(by.id('action-sheet-handle'))).toBeVisible();
+			await element(by.id('action-sheet-handle')).swipe('up', 'fast', 0.5);
+			await element(by[textMatcher]('Quote')).atIndex(0).tap();
+			await element(by.id('message-composer-input')).replaceText(quotedMessage);
+			await waitFor(element(by.id('message-composer-send')))
+				.toExist()
+				.withTimeout(2000);
+			await element(by.id('message-composer-send')).tap();
+			await waitFor(element(by[textMatcher](quotedMessage)).atIndex(0))
+				.toBeVisible()
+				.withTimeout(3000);
+			await waitFor(
+				element(
+					by.id(`reply-${UserA.name}-${mockedMessageTextToQuote}`).withDescendant(by[textMatcher](mockedMessageTextToQuote))
+				)
+			)
+				.toBeVisible()
+				.withTimeout(3000);
+			await tapBack();
 		});
+	});
 
-		describe('Render', () => {
-			it('should have items', async () => {
-				await waitFor(element(by.id('e2e-encryption-security-view')))
-					.toBeVisible()
-					.withTimeout(2000);
-				await expect(element(by.id('e2e-encryption-security-view-password'))).toExist();
-				await expect(element(by.id('e2e-encryption-security-view-change-password'))).toExist();
-				await expect(element(by.id('e2e-encryption-security-view-reset-key'))).toExist();
-			});
+	describe('Login as UserB, get keys and send a message', () => {
+		beforeAll(async () => {
+			await loginAs(UserB);
 		});
 
-		describe('Change password', () => {
-			it('should change password', async () => {
-				await element(by.id('e2e-encryption-security-view-password')).replaceText(newPassword);
-				await element(by.id('e2e-encryption-security-view-change-password')).tap();
-				await waitFor(element(by[textMatcher]('Are you sure?')))
-					.toExist()
-					.withTimeout(2000);
-				await expect(element(by[textMatcher]("Make sure you've saved it carefully somewhere else."))).toExist();
-				await element(by[textMatcher]('Yes, change it')).atIndex(0).tap();
-				await waitForToast();
-			});
-
-			it('should navigate to the room and messages should remain decrypted', async () => {
-				await waitFor(element(by.id('e2e-encryption-security-view')))
-					.toBeVisible()
-					.withTimeout(2000);
-				await tapBack();
-				await waitFor(element(by.id('security-privacy-view')))
-					.toBeVisible()
-					.withTimeout(2000);
-				await tapBack();
-				await waitFor(element(by.id('settings-view')))
-					.toBeVisible()
-					.withTimeout(2000);
-				await element(by.id('settings-view-drawer')).tap();
-				await waitFor(element(by.id('sidebar-view')))
-					.toBeVisible()
-					.withTimeout(2000);
-				await element(by.id('sidebar-chats')).tap();
-				await waitFor(element(by.id('rooms-list-view')))
-					.toBeVisible()
-					.withTimeout(2000);
-				await navigateToRoom(room);
-				await waitFor(element(by[textMatcher](mockedMessageText)).atIndex(0))
-					.toExist()
-					.withTimeout(2000);
-			});
-
-			it('should logout, login and messages should be encrypted', async () => {
-				await tapBack();
-				await waitFor(element(by.id('rooms-list-view')))
-					.toBeVisible()
-					.withTimeout(2000);
-				await logout();
-				await navigateToLogin();
-				await login(user.username, user.password);
-				await navigateToRoom(room);
-				await waitFor(element(by[textMatcher](mockedMessageText)).atIndex(0))
-					.not.toExist()
-					.withTimeout(2000);
-				await waitFor(element(by.id('room-view-encrypted-room')))
-					.toBeVisible()
-					.withTimeout(2000);
-			});
-
-			it('should enter new e2e password and messages should be decrypted', async () => {
-				await tapBack();
-				await waitFor(element(by.id('rooms-list-view')))
-					.toBeVisible()
-					.withTimeout(2000);
-				// TODO: assert 'Enter E2EE Password'
-				await waitFor(element(by.id('listheader-encryption')))
-					.toBeVisible()
-					.withTimeout(2000);
-				await tapAndWaitFor(element(by.id('listheader-encryption')), element(by.id('e2e-enter-your-password-view')), 2000);
-				await element(by.id('e2e-enter-your-password-view-password')).replaceText(newPassword);
-				await element(by.id('e2e-enter-your-password-view-confirm')).tap();
-				await waitFor(element(by.id('listheader-encryption')))
-					.not.toExist()
-					.withTimeout(10000);
-				await navigateToRoom(room);
-				await waitFor(element(by[textMatcher](mockedMessageText)).atIndex(0))
-					.toExist()
-					.withTimeout(2000);
-			});
+		it('should be able to read other messages', async () => {
+			await navigateToRoom(room);
+			await readMessages(3);
 		});
 
-		describe('Reset E2E key', () => {
-			beforeAll(async () => {
-				await tapBack();
-				await waitFor(element(by.id('rooms-list-view')))
-					.toBeVisible()
-					.withTimeout(2000);
-			});
-			it('should reset e2e key', async () => {
-				await navigateSecurityPrivacy();
-				await element(by.id('security-privacy-view-e2e-encryption')).tap();
-				await waitFor(element(by.id('e2e-encryption-security-view')))
-					.toBeVisible()
-					.withTimeout(2000);
-				await element(by.id('e2e-encryption-security-view-reset-key')).tap();
-				await waitFor(element(by[textMatcher]('Are you sure?')))
-					.toExist()
-					.withTimeout(2000);
-				await expect(element(by[textMatcher]("You're going to be logged out."))).toExist();
-				await element(by[textMatcher]('Yes, reset it').and(by.type(alertButtonType))).tap();
-				await sleep(2000);
-
-				// FIXME: The app isn't showing this alert anymore
-				// await waitFor(element(by[textMatcher]("You've been logged out by the server. Please log in again.")))
-				// 	.toExist()
-				// 	.withTimeout(20000);
-				// await element(by[textMatcher]('OK').and(by.type(alertButtonType))).tap();
-				// await waitFor(element(by.id('workspace-view')))
-				// 	.toBeVisible()
-				// 	.withTimeout(10000);
-				// await element(by.id('workspace-view-login')).tap();
-				await navigateToLogin();
-				await waitFor(element(by.id('login-view')))
-					.toBeVisible()
-					.withTimeout(2000);
-				await login(user.username, user.password);
-				// TODO: assert 'Save Your Encryption Password'
-				await waitFor(element(by.id('listheader-encryption')))
-					.toBeVisible()
-					.withTimeout(5000);
-			});
+		it('should send message and be able to read it', async () => {
+			await mockMessage(getMessage(3));
 		});
 	});
 
-	describe('Persist Banner', () => {
-		it('check save banner', async () => {
-			await checkServer(data.server);
-			await checkBanner();
+	describe('Login as UserA, reset user e2ee key, reset room E2EE key and send a message', () => {
+		beforeAll(async () => {
+			await loginAs(UserA, false);
 		});
 
-		it('should add server and create new user', async () => {
-			await sleep(5000);
-			await element(by.id('rooms-list-header-servers-list-button')).tap();
-			await waitFor(element(by.id('rooms-list-header-servers-list')))
-				.toBeVisible()
-				.withTimeout(5000);
-			await element(by.id('rooms-list-header-server-add')).tap();
+		it('should reset user E2EE key, login again and recreate keys', async () => {
+			await resetE2EEKey();
+			await loginAs(UserA, false);
+			await changeE2EEPassword();
+		});
 
-			// TODO: refactor
-			await waitFor(element(by.id('new-server-view')))
+		it('should reset room E2EE key', async () => {
+			await device.launchApp({ permissions: { notifications: 'YES' }, newInstance: true });
+			await navigateToRoom(room);
+			await waitFor(element(by.id('room-view-header-encryption')))
 				.toBeVisible()
-				.withTimeout(60000);
-			await element(by.id('new-server-view-input')).replaceText(`${data.alternateServer}`);
-			await element(by.id('new-server-view-input')).tapReturnKey();
-			await waitFor(element(by.id('workspace-view')))
+				.withTimeout(2000);
+			await element(by.id('room-view-header-encryption')).tap();
+			await waitFor(element(by.id('e2ee-toggle-room-view')))
 				.toBeVisible()
-				.withTimeout(60000);
-			await element(by.id('workspace-view-register')).tap();
-			await waitFor(element(by.id('register-view')))
+				.withTimeout(2000);
+			await waitFor(element(by.id('e2ee-toggle-room-reset-key')))
 				.toBeVisible()
 				.withTimeout(2000);
+			await element(by.id('e2ee-toggle-room-reset-key')).tap();
+			await waitFor(element(by[textMatcher]('Reset encryption key')))
+				.toExist()
+				.withTimeout(2000);
+			await element(by[textMatcher]('Reset')).atIndex(0).tap();
+			await waitForToast();
+			await tapBack();
+			await checkRoomTitle(room);
+		});
 
-			// Register new user
-			const randomUser = data.randomUser();
-			await element(by.id('register-view-name')).replaceText(randomUser.name);
-			await element(by.id('register-view-name')).tapReturnKey();
-			await element(by.id('register-view-username')).replaceText(randomUser.username);
-			await element(by.id('register-view-username')).tapReturnKey();
-			await element(by.id('register-view-email')).replaceText(randomUser.email);
-			await element(by.id('register-view-email')).tapReturnKey();
-			await element(by.id('register-view-password')).replaceText(randomUser.password);
-			await element(by.id('register-view-password')).tapReturnKey();
-			await expectValidRegisterOrRetry(device.getPlatform());
-			deleteUsersAfterAll.push({ server: data.alternateServer, username: randomUser.username });
-
-			await checkServer(data.alternateServer);
+		it('should send message and be able to read it', async () => {
+			await mockMessage(getMessage(4));
 		});
+	});
 
-		it('should change back', async () => {
-			await waitFor(element(by.id('rooms-list-header-servers-list-button')))
-				.toExist()
-				.withTimeout(2000);
-			await element(by.id('rooms-list-header-servers-list-button')).tap();
-			await waitFor(element(by.id('rooms-list-header-servers-list')))
-				.toBeVisible()
-				.withTimeout(5000);
-			await element(by.id(`server-item-${data.server}`)).tap();
-			await waitFor(element(by.id('rooms-list-view')))
-				.toBeVisible()
-				.withTimeout(10000);
-			await checkServer(data.server);
-			await checkBanner();
+	describe('Login as UserB, accept new room key, send a message and read everything', () => {
+		beforeAll(async () => {
+			await loginAs(UserB);
 		});
 
-		it('should reopen the app and have banner', async () => {
-			await device.launchApp({
-				permissions: { notifications: 'YES' },
-				newInstance: true
-			});
-			await waitFor(element(by.id('rooms-list-view')))
-				.toBeVisible()
-				.withTimeout(10000);
-			await checkBanner();
+		it('should send message and be able to read it', async () => {
+			await navigateToRoom(room);
+			await mockMessage(getMessage(5));
+			await readMessages(4);
 		});
 	});
 
-	// TODO: missing request e2ee room key
+	// describe('Login as UserA, accept new room key, send a message and read everything', () => {
+	// 	beforeAll(async () => {
+	// 		await loginAs(UserA);
+	// 	});
+
+	// 	it('should send message and be able to read it', async () => {
+	// 		await navigateToRoom(room);
+	// 		await mockMessage(getMessage(6));
+	// 		await readMessages(5);
+	// 	});
+	// });
 });
diff --git a/e2e/tests/assorted/04-setting.spec.ts b/e2e/tests/assorted/04-setting.spec.ts
index dc178fdfe2..511b4c5ed9 100644
--- a/e2e/tests/assorted/04-setting.spec.ts
+++ b/e2e/tests/assorted/04-setting.spec.ts
@@ -65,10 +65,14 @@ describe('Settings screen', () => {
 			await expect(element(by.id('settings-view-media-auto-download'))).toExist();
 		});
 
-		it('should have licence', async () => {
+		it('should have license', async () => {
 			await expect(element(by.id('settings-view-license'))).toExist();
 		});
 
+		it('should have legal', async () => {
+			await expect(element(by.id('settings-view-legal'))).toExist();
+		});
+
 		it('should have version no', async () => {
 			await expect(element(by.id('settings-view-version'))).toExist();
 		});
@@ -106,5 +110,35 @@ describe('Settings screen', () => {
 				.toExist()
 				.withTimeout(10000);
 		});
+
+		describe('Legal button', () => {
+			it('should navigate to legalview', async () => {
+				await element(by.id('rooms-list-view-sidebar')).tap();
+				await waitFor(element(by.id('sidebar-view')))
+					.toBeVisible()
+					.withTimeout(2000);
+				await waitFor(element(by.id('sidebar-settings')))
+					.toBeVisible()
+					.withTimeout(2000);
+				await element(by.id('sidebar-settings')).tap();
+				await waitFor(element(by.id('settings-view')))
+					.toBeVisible()
+					.withTimeout(2000);
+
+				await expect(element(by.id('settings-view-legal'))).toExist();
+				await element(by.id('settings-view-legal')).tap();
+				await waitFor(element(by.id('legal-view')))
+					.toBeVisible()
+					.withTimeout(4000);
+			});
+
+			it('should have terms of service button', async () => {
+				await expect(element(by.id('legal-terms-button'))).toBeVisible();
+			});
+
+			it('should have privacy policy button', async () => {
+				await expect(element(by.id('legal-privacy-button'))).toBeVisible();
+			});
+		});
 	});
 });
diff --git a/e2e/tests/room/08-roominfo.spec.ts b/e2e/tests/room/08-roominfo.spec.ts
index d309a893c9..eb22772d40 100644
--- a/e2e/tests/room/08-roominfo.spec.ts
+++ b/e2e/tests/room/08-roominfo.spec.ts
@@ -16,7 +16,7 @@ async function navigateToRoomInfo(room: string) {
 }
 
 async function swipe(direction: Detox.Direction) {
-	await element(by.id('room-info-edit-view-list')).swipe(direction);
+	await element(by.id('room-info-edit-view-list')).swipe(direction, 'fast', 1);
 }
 
 async function waitForToast() {
@@ -136,24 +136,26 @@ describe('Room info screen', () => {
 		describe('Usage', () => {
 			it('should reset form', async () => {
 				await element(by.id('room-info-edit-view-name')).replaceText('abc');
-				await element(by.id('room-info-edit-view-description')).replaceText('abc');
+				await element(by.id('room-info-edit-view-name')).tapReturnKey();
 				await element(by.id('room-info-edit-view-topic')).replaceText('abc');
 				await element(by.id('room-info-edit-view-topic')).tapReturnKey();
 				await element(by.id('room-info-edit-view-announcement')).replaceText('abc');
 				await element(by.id('room-info-edit-view-announcement')).tapReturnKey();
+				await element(by.id('room-info-edit-view-description')).replaceText('abc');
+				await element(by.id('room-info-edit-view-description')).tapReturnKey();
 				await element(by.id('room-info-edit-view-password')).replaceText('abc');
 				await element(by.id('room-info-edit-view-password')).tapReturnKey();
-				await swipe('down'); // dismiss keyboard
-				await element(by.id('room-info-edit-view-t')).tap();
 				await swipe('up');
+				await element(by.id('room-info-edit-view-t')).tap();
 				await element(by.id('room-info-edit-view-ro')).tap();
 				await element(by.id('room-info-edit-view-react-when-ro')).tap();
+				await swipe('up');
 				await element(by.id('room-info-edit-view-reset')).tap();
 				// after reset
 				await expect(element(by.id('room-info-edit-view-name'))).toHaveText(room);
-				await expect(element(by.id('room-info-edit-view-description'))).toHaveText('');
 				await expect(element(by.id('room-info-edit-view-topic'))).toHaveText('');
 				await expect(element(by.id('room-info-edit-view-announcement'))).toHaveText('');
+				await expect(element(by.id('room-info-edit-view-description'))).toHaveText('');
 				await expect(element(by.id('room-info-edit-view-password'))).toHaveText('');
 				await expect(element(by.id('room-info-edit-view-t'))).toHaveToggleValue(true);
 				await expect(element(by.id('room-info-edit-view-ro'))).toHaveToggleValue(false);
@@ -183,14 +185,13 @@ describe('Room info screen', () => {
 
 			it('should change room description, topic, announcement', async () => {
 				await sleep(5000); // wait for changes to be applied from socket
-				await element(by.id('room-info-edit-view-description')).replaceText('new description');
 				await element(by.id('room-info-edit-view-topic')).replaceText('new topic');
-				await swipe('down'); // dismiss keyboard
-				// announcement is hide by the keyboard
+				await element(by.id('room-info-edit-view-topic')).tapReturnKey();
 				await element(by.id('room-info-edit-view-announcement')).replaceText('new announcement');
 				await element(by.id('room-info-edit-view-announcement')).tapReturnKey();
+				await element(by.id('room-info-edit-view-description')).replaceText('new description');
+				await element(by.id('room-info-edit-view-description')).tapReturnKey();
 				await element(by.id('room-info-edit-view-password')).tapReturnKey();
-				await swipe('down'); // dismiss keyboard
 				await swipe('up');
 				await element(by.id('room-info-edit-view-submit')).tap();
 				await waitForToast();
@@ -227,9 +228,9 @@ describe('Room info screen', () => {
 			// });
 
 			it('should change room type', async () => {
-				await swipe('down');
-				await element(by.id('room-info-edit-view-t')).tap();
+				await sleep(300);
 				await swipe('up');
+				await element(by.id('room-info-edit-view-t')).tap();
 				await element(by.id('room-info-edit-view-submit')).tap();
 				await waitForToast();
 			});
diff --git a/e2e/tests/team/01-createteam.spec.ts b/e2e/tests/team/01-createteam.spec.ts
index a155ac0cfd..8cce8b17d6 100644
--- a/e2e/tests/team/01-createteam.spec.ts
+++ b/e2e/tests/team/01-createteam.spec.ts
@@ -52,6 +52,7 @@ describe('Create team screen', () => {
 		describe('Usage', () => {
 			it('should create private team', async () => {
 				await element(by.id('create-channel-name')).replaceText(teamName);
+				await element(by.id('create-channel-name')).tapReturnKey();
 				await waitFor(element(by.id('create-channel-submit')))
 					.toExist()
 					.withTimeout(2000);
@@ -85,7 +86,7 @@ describe('Create team screen', () => {
 			await waitFor(element(by.id('room-info-edit-view-list')))
 				.toBeVisible()
 				.withTimeout(2000);
-			await element(by.id('room-info-edit-view-list')).swipe('up');
+			await element(by.id('room-info-edit-view-list')).swipe('up', 'fast', 1);
 			await waitFor(element(by.id('room-info-edit-view-delete')))
 				.toBeVisible()
 				.withTimeout(2000);
diff --git a/ios/RocketChatRN.xcodeproj/project.pbxproj b/ios/RocketChatRN.xcodeproj/project.pbxproj
index a46c257bf1..84579dae51 100644
--- a/ios/RocketChatRN.xcodeproj/project.pbxproj
+++ b/ios/RocketChatRN.xcodeproj/project.pbxproj
@@ -2983,7 +2983,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 4.55.0;
+				MARKETING_VERSION = 4.57.0;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_DEBUG";
@@ -3027,7 +3027,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 4.55.0;
+				MARKETING_VERSION = 4.57.0;
 				MTL_FAST_MATH = YES;
 				OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_RELEASE";
 				PRODUCT_BUNDLE_IDENTIFIER = chat.rocket.reactnative.NotificationService;
diff --git a/ios/RocketChatRN/Info.plist b/ios/RocketChatRN/Info.plist
index 8be4512a87..14c9ce19cb 100644
--- a/ios/RocketChatRN/Info.plist
+++ b/ios/RocketChatRN/Info.plist
@@ -28,7 +28,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>4.55.0</string>
+	<string>4.57.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
diff --git a/ios/SSLPinning/SSLPinning.m b/ios/SSLPinning/SSLPinning.m
index 570f9e7be0..3632476de9 100644
--- a/ios/SSLPinning/SSLPinning.m
+++ b/ios/SSLPinning/SSLPinning.m
@@ -1,3 +1,9 @@
-#import "React/RCTBridgeModule.h"
+#import <React/RCTBridgeModule.h>
+
 @interface RCT_EXTERN_MODULE(SSLPinning, NSObject)
+
+RCT_EXTERN_METHOD(setCertificate:(NSString *)server
+                  :(NSString *)path
+                  :(NSString *)password)
+
 @end
diff --git a/ios/SSLPinning/SSLPinning.swift b/ios/SSLPinning/SSLPinning.swift
index 021d7e1117..d8250a5dbf 100644
--- a/ios/SSLPinning/SSLPinning.swift
+++ b/ios/SSLPinning/SSLPinning.swift
@@ -28,7 +28,7 @@ final class SSLPinning: NSObject {
         }
 
         serversQuery.forEach { server in
-            guard let serverUrlString = server["url"] as? String,
+            guard let serverUrlString = server["id"] as? String,
                   let serverUrl = URL(string: serverUrlString),
                   let clientSSL = mmkv.clientSSL(for: serverUrl) else {
                 return
diff --git a/ios/ShareRocketChatRN/Info.plist b/ios/ShareRocketChatRN/Info.plist
index 171d1ab932..5bd34ec3ad 100644
--- a/ios/ShareRocketChatRN/Info.plist
+++ b/ios/ShareRocketChatRN/Info.plist
@@ -26,7 +26,7 @@
 	<key>CFBundlePackageType</key>
 	<string>XPC!</string>
 	<key>CFBundleShortVersionString</key>
-	<string>4.55.0</string>
+	<string>4.57.0</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>KeychainGroup</key>
diff --git a/package.json b/package.json
index 97a562efde..0891a5667c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "rocket-chat-reactnative",
-	"version": "4.55.0",
+	"version": "4.57.0",
 	"private": true,
 	"scripts": {
 		"start": "react-native start",
diff --git a/yarn.lock b/yarn.lock
index c18900cf33..5b30579881 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3842,8 +3842,8 @@
     tldts "~5.7.112"
 
 "@rocket.chat/sdk@RocketChat/Rocket.Chat.js.SDK#mobile":
-  version "1.3.1-mobile"
-  resolved "https://codeload.github.com/RocketChat/Rocket.Chat.js.SDK/tar.gz/501cd6ceec5f198af288aadc355f2fbbeda2b353"
+  version "1.3.3-mobile"
+  resolved "https://codeload.github.com/RocketChat/Rocket.Chat.js.SDK/tar.gz/b6d2b3f25b0ff8283dd71faf6dae720c47fecd8f"
   dependencies:
     js-sha256 "^0.9.0"
     lru-cache "^4.1.1"