From b2265433a84d42ee94a3a75cb1c5cdf07d72c39b Mon Sep 17 00:00:00 2001
From: Diego Mello <diegolmello@gmail.com>
Date: Wed, 19 Jun 2024 14:24:10 -0300
Subject: [PATCH 1/2] feat: Disallow users from sending unencrypted messages in
 E2EE rooms (#5600)

---
 app/actions/actionsTypes.ts                   |  9 +-
 app/actions/encryption.ts                     |  6 ++
 app/containers/ActivityIndicator.tsx          |  6 +-
 app/containers/AudioPlayer/PlayButton.tsx     |  8 +-
 app/containers/List/ListItem.tsx              |  7 +-
 app/containers/RoomHeader/RoomHeader.tsx      | 13 ++-
 app/containers/RoomHeader/index.tsx           |  5 +-
 .../SupportedVersionsWarning.tsx              |  2 +-
 app/containers/UIKit/MultiSelect/Items.tsx    |  4 +-
 .../Components/RightIcons/Translated.tsx      |  1 -
 app/containers/message/Content.tsx            |  5 +-
 app/containers/message/Thread.tsx             |  5 +-
 .../OmnichannelHeader/OmnichannelQueue.tsx    |  5 +-
 app/i18n/locales/ar.json                      |  9 +-
 app/i18n/locales/bn-IN.json                   |  9 +-
 app/i18n/locales/de.json                      |  9 +-
 app/i18n/locales/en.json                      | 17 +++-
 app/i18n/locales/fi.json                      |  9 +-
 app/i18n/locales/fr.json                      |  9 +-
 app/i18n/locales/hi-IN.json                   |  9 +-
 app/i18n/locales/hu.json                      |  9 +-
 app/i18n/locales/it.json                      |  9 +-
 app/i18n/locales/ja.json                      |  9 +-
 app/i18n/locales/nl.json                      |  9 +-
 app/i18n/locales/pt-BR.json                   | 15 ++-
 app/i18n/locales/pt-PT.json                   |  9 +-
 app/i18n/locales/ru.json                      |  9 +-
 app/i18n/locales/sl-SI.json                   |  9 +-
 app/i18n/locales/sv.json                      |  9 +-
 app/i18n/locales/ta-IN.json                   |  9 +-
 app/i18n/locales/te-IN.json                   |  9 +-
 app/i18n/locales/tr.json                      |  9 +-
 app/i18n/locales/zh-CN.json                   |  9 +-
 app/i18n/locales/zh-TW.json                   |  9 +-
 app/lib/encryption/constants.ts               |  1 +
 app/lib/encryption/encryption.ts              |  5 +-
 app/lib/encryption/helpers/toggleRoomE2EE.ts  | 70 +++++++++++++
 app/lib/encryption/index.ts                   |  2 +
 app/lib/encryption/room.ts                    | 12 ++-
 app/lib/encryption/utils.ts                   | 39 ++++++++
 app/lib/methods/search.ts                     | 16 ++-
 app/reducers/encryption.test.ts               | 25 ++++-
 app/reducers/encryption.ts                    | 15 ++-
 app/sagas/createChannel.js                    |  5 +
 app/sagas/encryption.js                       |  9 +-
 app/views/AutoTranslateView/index.tsx         |  6 +-
 app/views/ChangePasscodeView.tsx              |  1 -
 .../RoomSettings/SwitchItem.tsx               |  7 +-
 app/views/E2EEnterYourPasswordView.tsx        | 41 +++++++-
 app/views/JitsiMeetView/JitsiAuthModal.tsx    |  4 +-
 app/views/RegisterView.tsx                    |  4 +-
 .../components/CallSection.tsx                |  4 +-
 app/views/RoomActionsView/index.tsx           | 91 +++++++----------
 .../components/RoomInfoButtons.tsx            |  4 +-
 app/views/RoomInfoView/hooks.ts               | 15 +++
 app/views/RoomMembersView/index.tsx           |  4 +-
 app/views/RoomView/RightButtons.tsx           | 71 ++++++++++++--
 .../RoomView/components/EncryptedRoom.tsx     | 98 +++++++++++++++++++
 .../RoomView/components/HeaderCallButton.tsx  |  6 +-
 .../components/MissingRoomE2EEKey.tsx         | 77 +++++++++++++++
 app/views/RoomView/components/index.ts        |  3 +
 app/views/RoomView/constants.ts               |  4 +-
 app/views/RoomView/definitions.ts             |  1 +
 app/views/RoomView/index.tsx                  | 30 +++++-
 app/views/RoomsListView/ListHeader/index.tsx  |  4 +-
 app/views/SecurityPrivacyView.tsx             |  8 +-
 app/views/ShareListView/index.tsx             | 75 +++++++++-----
 e2e/tests/assorted/01-e2eencryption.spec.ts   | 20 ++--
 68 files changed, 819 insertions(+), 237 deletions(-)
 create mode 100644 app/lib/encryption/constants.ts
 create mode 100644 app/lib/encryption/helpers/toggleRoomE2EE.ts
 create mode 100644 app/views/RoomInfoView/hooks.ts
 create mode 100644 app/views/RoomView/components/EncryptedRoom.tsx
 create mode 100644 app/views/RoomView/components/MissingRoomE2EEKey.tsx
 create mode 100644 app/views/RoomView/components/index.ts

diff --git a/app/actions/actionsTypes.ts b/app/actions/actionsTypes.ts
index ae8485ba03..d5399d4577 100644
--- a/app/actions/actionsTypes.ts
+++ b/app/actions/actionsTypes.ts
@@ -81,7 +81,14 @@ export const INVITE_LINKS = createRequestTypes('INVITE_LINKS', [
 export const SETTINGS = createRequestTypes('SETTINGS', ['CLEAR', 'ADD', 'UPDATE']);
 export const APP_STATE = createRequestTypes('APP_STATE', ['FOREGROUND', 'BACKGROUND']);
 export const ENTERPRISE_MODULES = createRequestTypes('ENTERPRISE_MODULES', ['CLEAR', 'SET']);
-export const ENCRYPTION = createRequestTypes('ENCRYPTION', ['INIT', 'STOP', 'DECODE_KEY', 'SET', 'SET_BANNER']);
+export const ENCRYPTION = createRequestTypes('ENCRYPTION', [
+	'INIT',
+	'STOP',
+	'DECODE_KEY',
+	'DECODE_KEY_FAILURE',
+	'SET',
+	'SET_BANNER'
+]);
 
 export const PERMISSIONS = createRequestTypes('PERMISSIONS', ['SET', 'UPDATE']);
 export const ROLES = createRequestTypes('ROLES', ['SET', 'UPDATE', 'REMOVE']);
diff --git a/app/actions/encryption.ts b/app/actions/encryption.ts
index be3fb43fa1..4b06291e64 100644
--- a/app/actions/encryption.ts
+++ b/app/actions/encryption.ts
@@ -50,3 +50,9 @@ export function encryptionDecodeKey(password: string): IEncryptionDecodeKey {
 		password
 	};
 }
+
+export function encryptionDecodeKeyFailure(): Action {
+	return {
+		type: ENCRYPTION.DECODE_KEY_FAILURE
+	};
+}
diff --git a/app/containers/ActivityIndicator.tsx b/app/containers/ActivityIndicator.tsx
index 7469b7f29d..90da8eccf7 100644
--- a/app/containers/ActivityIndicator.tsx
+++ b/app/containers/ActivityIndicator.tsx
@@ -27,7 +27,11 @@ const styles = StyleSheet.create({
 const RCActivityIndicator = ({ absolute, ...props }: IActivityIndicator): React.ReactElement => {
 	const { theme } = useTheme();
 	return (
-		<ActivityIndicator style={[styles.indicator, absolute && styles.absolute]} color={themes[theme].fontSecondaryInfo} {...props} />
+		<ActivityIndicator
+			style={[styles.indicator, absolute && styles.absolute]}
+			color={themes[theme].fontSecondaryInfo}
+			{...props}
+		/>
 	);
 };
 
diff --git a/app/containers/AudioPlayer/PlayButton.tsx b/app/containers/AudioPlayer/PlayButton.tsx
index 6951d249fd..138dc856a7 100644
--- a/app/containers/AudioPlayer/PlayButton.tsx
+++ b/app/containers/AudioPlayer/PlayButton.tsx
@@ -31,7 +31,13 @@ const Icon = ({ audioState, disabled }: { audioState: TAudioState; disabled: boo
 		customIconName = 'play-shape-filled';
 	}
 
-	return <CustomIcon name={customIconName} size={24} color={disabled ? colors.buttonBackgroundPrimaryDisabled : colors.buttonFontPrimary} />;
+	return (
+		<CustomIcon
+			name={customIconName}
+			size={24}
+			color={disabled ? colors.buttonBackgroundPrimaryDisabled : colors.buttonFontPrimary}
+		/>
+	);
 };
 
 const PlayButton = ({ onPress, disabled = false, audioState }: IButton): React.ReactElement => {
diff --git a/app/containers/List/ListItem.tsx b/app/containers/List/ListItem.tsx
index 80026daf2a..79538736ff 100644
--- a/app/containers/List/ListItem.tsx
+++ b/app/containers/List/ListItem.tsx
@@ -100,7 +100,12 @@ const Content = React.memo(
 							{translateTitle && title ? I18n.t(title) : title}
 						</Text>
 						{alert ? (
-							<CustomIcon name='info' size={ICON_SIZE} color={themes[theme].buttonBackgroundDangerDefault} style={styles.alertIcon} />
+							<CustomIcon
+								name='info'
+								size={ICON_SIZE}
+								color={themes[theme].buttonBackgroundDangerDefault}
+								style={styles.alertIcon}
+							/>
 						) : null}
 					</View>
 					{subtitle ? (
diff --git a/app/containers/RoomHeader/RoomHeader.tsx b/app/containers/RoomHeader/RoomHeader.tsx
index 19bbeb3160..bdcdddafeb 100644
--- a/app/containers/RoomHeader/RoomHeader.tsx
+++ b/app/containers/RoomHeader/RoomHeader.tsx
@@ -74,6 +74,7 @@ interface IRoomHeader {
 	onPress: Function;
 	testID?: string;
 	sourceType?: IOmnichannelSource;
+	disabled?: boolean;
 }
 
 const SubTitle = React.memo(({ usersTyping, subtitle, renderFunc, scale }: TRoomHeaderSubTitle) => {
@@ -139,7 +140,8 @@ const Header = React.memo(
 		teamMain,
 		testID,
 		usersTyping = [],
-		sourceType
+		sourceType,
+		disabled
 	}: IRoomHeader) => {
 		const { colors } = useTheme();
 		const portrait = height > width;
@@ -177,8 +179,13 @@ const Header = React.memo(
 				testID='room-header'
 				accessibilityLabel={title}
 				onPress={handleOnPress}
-				style={styles.container}
-				disabled={!!tmid}
+				style={[
+					styles.container,
+					{
+						opacity: disabled ? 0.5 : 1
+					}
+				]}
+				disabled={disabled}
 				hitSlop={HIT_SLOP}>
 				<View style={styles.titleContainer}>
 					{tmid ? null : (
diff --git a/app/containers/RoomHeader/index.tsx b/app/containers/RoomHeader/index.tsx
index 91814380f7..79d261dd9c 100644
--- a/app/containers/RoomHeader/index.tsx
+++ b/app/containers/RoomHeader/index.tsx
@@ -20,6 +20,7 @@ interface IRoomHeaderContainerProps {
 	testID?: string;
 	sourceType?: IOmnichannelSource;
 	visitor?: IVisitor;
+	disabled?: boolean;
 }
 
 const RoomHeaderContainer = React.memo(
@@ -36,7 +37,8 @@ const RoomHeaderContainer = React.memo(
 		tmid,
 		type,
 		sourceType,
-		visitor
+		visitor,
+		disabled
 	}: IRoomHeaderContainerProps) => {
 		let subtitle: string | undefined;
 		let statusVisitor: TUserStatus | undefined;
@@ -86,6 +88,7 @@ const RoomHeaderContainer = React.memo(
 				testID={testID}
 				onPress={onPress}
 				sourceType={sourceType}
+				disabled={disabled}
 			/>
 		);
 	}
diff --git a/app/containers/SupportedVersions/SupportedVersionsWarning.tsx b/app/containers/SupportedVersions/SupportedVersionsWarning.tsx
index 9d67587269..b71b812343 100644
--- a/app/containers/SupportedVersions/SupportedVersionsWarning.tsx
+++ b/app/containers/SupportedVersions/SupportedVersionsWarning.tsx
@@ -52,7 +52,7 @@ export const SupportedVersionsWarning = ({ navigation, route }: { navigation?: a
 			) : null}
 			<Button
 				testID='sv-warn-button'
-				title='Learn more'
+				title={I18n.t('Learn_more')}
 				type='secondary'
 				backgroundColor={colors.surfaceTint}
 				onPress={() => Linking.openURL(message.link || LEARN_MORE_URL)}
diff --git a/app/containers/UIKit/MultiSelect/Items.tsx b/app/containers/UIKit/MultiSelect/Items.tsx
index cbaac4ee5c..604598b2a2 100644
--- a/app/containers/UIKit/MultiSelect/Items.tsx
+++ b/app/containers/UIKit/MultiSelect/Items.tsx
@@ -40,7 +40,9 @@ const Item = ({ item, selected, onSelect }: IItem) => {
 						{textParser([item.text])}
 					</Text>
 				</View>
-				<View style={styles.flexZ}>{selected ? <CustomIcon color={colors.badgeBackgroundLevel2} size={22} name='check' /> : null}</View>
+				<View style={styles.flexZ}>
+					{selected ? <CustomIcon color={colors.badgeBackgroundLevel2} size={22} name='check' /> : null}
+				</View>
 			</View>
 		</Touchable>
 	);
diff --git a/app/containers/message/Components/RightIcons/Translated.tsx b/app/containers/message/Components/RightIcons/Translated.tsx
index 25e3ccc053..1b91cd3511 100644
--- a/app/containers/message/Components/RightIcons/Translated.tsx
+++ b/app/containers/message/Components/RightIcons/Translated.tsx
@@ -5,7 +5,6 @@ import { CustomIcon } from '../../../CustomIcon';
 import styles from '../../styles';
 
 const Translated = memo(({ isTranslated }: { isTranslated: boolean }) => {
-
 	if (!isTranslated) {
 		return null;
 	}
diff --git a/app/containers/message/Content.tsx b/app/containers/message/Content.tsx
index f20f8e8c51..5cfaf8ad94 100644
--- a/app/containers/message/Content.tsx
+++ b/app/containers/message/Content.tsx
@@ -43,7 +43,10 @@ const Content = React.memo(
 
 		if (props.isEncrypted) {
 			content = (
-				<Text style={[styles.textInfo, { color: themes[theme].fontSecondaryInfo }]} accessibilityLabel={I18n.t('Encrypted_message')}>
+				<Text
+					style={[styles.textInfo, { color: themes[theme].fontSecondaryInfo }]}
+					accessibilityLabel={I18n.t('Encrypted_message')}
+				>
 					{I18n.t('Encrypted_message')}
 				</Text>
 			);
diff --git a/app/containers/message/Thread.tsx b/app/containers/message/Thread.tsx
index a965946157..e48fcbaf1d 100644
--- a/app/containers/message/Thread.tsx
+++ b/app/containers/message/Thread.tsx
@@ -20,7 +20,10 @@ const Thread = React.memo(
 
 		return (
 			<View style={styles.buttonContainer}>
-				<View style={[styles.button, { backgroundColor: themes[theme].badgeBackgroundLevel2 }]} testID={`message-thread-button-${msg}`}>
+				<View
+					style={[styles.button, { backgroundColor: themes[theme].badgeBackgroundLevel2 }]}
+					testID={`message-thread-button-${msg}`}
+				>
 					<Text style={[styles.buttonText, { color: themes[theme].fontWhite }]}>{I18n.t('Reply')}</Text>
 				</View>
 				<ThreadDetails
diff --git a/app/ee/omnichannel/containers/OmnichannelHeader/OmnichannelQueue.tsx b/app/ee/omnichannel/containers/OmnichannelHeader/OmnichannelQueue.tsx
index 3cc8320667..b061932b63 100644
--- a/app/ee/omnichannel/containers/OmnichannelHeader/OmnichannelQueue.tsx
+++ b/app/ee/omnichannel/containers/OmnichannelHeader/OmnichannelQueue.tsx
@@ -29,7 +29,10 @@ const OmnichannelQueue = ({ queueSize, onPress }: IOmnichannelQueue) => {
 					<View style={styles.omnichannelRightContainer}>
 						{queueSize ? (
 							<>
-								<UnreadBadge style={[styles.queueIcon, { backgroundColor: themes[theme].badgeBackgroundLevel2 }]} unread={queueSize} />
+								<UnreadBadge
+									style={[styles.queueIcon, { backgroundColor: themes[theme].badgeBackgroundLevel2 }]}
+									unread={queueSize}
+								/>
 								<CustomIcon name='chevron-right' style={styles.actionIndicator} color={themes[theme].fontDefault} size={24} />
 							</>
 						) : (
diff --git a/app/i18n/locales/ar.json b/app/i18n/locales/ar.json
index 09791feea9..e360ee137c 100644
--- a/app/i18n/locales/ar.json
+++ b/app/i18n/locales/ar.json
@@ -124,12 +124,13 @@
   "Enable_Auto_Translate": "تمكين الترجمة التلقائية",
   "Encrypted": "مشفر",
   "Encrypted_message": "رسالة مشفرة",
+  "encrypted_room_description": "أدخل كلمة المرور الخاصة بالتشفير من طرف إلى طرف للوصول.",
+  "encrypted_room_title": "{{room_name}} مشفر",
   "Encryption_error_desc": "تعذر قراءة مفتاح التشفير أثناء الاستيراد",
   "Encryption_error_title": "كلمة المرور المشفرة خاطئة",
   "End_to_end_encrypted_room": "غرفة مشفرة بين الطرفيات",
-  "Enter_Your_E2E_Password": "أدخل كلمة المرور بين الطرفيات",
-  "Enter_Your_Encryption_Password_desc1": "سيمكنك هذا من الوصول لرسائلك المباشرة والمجموعات الخاصة",
-  "Enter_Your_Encryption_Password_desc2": "يجب إدخال كلمة المرور لتشفير وفك تشفير الرسائل المرسلة",
+  "Enter_E2EE_Password": "أدخل كلمة المرور E2EE",
+  "Enter_E2EE_Password_description": "للوصول إلى قنواتك المشفرة والرسائل المباشرة، أدخل كلمة المرور الخاصة بالتشفير. هذا لا يتم تخزينه على الخادم، لذا ستحتاج إلى استخدامه على كل جهاز.",
   "Error_uploading": "خطأ في الرفع",
   "error-action-not-allowed": "غير مسموح بالإجراء {{action}}",
   "error-avatar-invalid-url": "عنوان الصورة الرمزية غير صحيح: {{url}}",
@@ -245,6 +246,8 @@
   "Message_starred": "الرسالة مميزة",
   "Message_unstarred": "الرسالة غير مميزة",
   "messages": "رسائل",
+  "missing_room_e2ee_description": "يجب تحديث مفاتيح التشفير للغرفة، ويجب أن يكون عضو آخر في الغرفة متصلاً بالإنترنت حتى يحدث ذلك.",
+  "missing_room_e2ee_title": "تحقق مرة أخرى بعد بضع لحظات",
   "move": "حرك",
   "Mute": "كتم",
   "Mute_someone_in_room": "كتم صوت شخص ما في الغرفة",
diff --git a/app/i18n/locales/bn-IN.json b/app/i18n/locales/bn-IN.json
index aa2a90a2f5..14ed0f168d 100644
--- a/app/i18n/locales/bn-IN.json
+++ b/app/i18n/locales/bn-IN.json
@@ -227,13 +227,14 @@
   "Enabled_E2E_Encryption_for_this_room": "এই রুমের জন্য E2E এনক্রিপশন সক্রিয় করা হয়েছে",
   "Encrypted": "এনক্রিপ্টেড",
   "Encrypted_message": "এনক্রিপ্টেড বার্তা",
+  "encrypted_room_description": "অ্যাক্সেস করতে আপনার এন্ড-টু-এন্ড এনক্রিপশন পাসওয়ার্ড লিখুন।",
+  "encrypted_room_title": "{{room_name}} এনক্রিপ্ট করা হয়েছে",
   "Encryption_error_desc": "এনক্রিপশন কীটি আমদানি করার জন্য আপনার এনক্রিপশন কীটি ডিকোড করা হতে সম্ভব হয়নি।",
   "Encryption_error_title": "আপনার এনক্রিপশন পাসওয়ার্ড ভুল মনে হচ্ছে",
   "End_to_end_encrypted_room": "শেষ হতে শেষ এনক্রিপ্টেড রুম",
+  "Enter_E2EE_Password": "E2EE পাসওয়ার্ড দিন",
+  "Enter_E2EE_Password_description": "আপনার এনক্রিপ্টেড চ্যানেলগুলি এবং সরাসরি বার্তাগুলি অ্যাক্সেস করতে, আপনার এনক্রিপশন পাসওয়ার্ড লিখুন। এটি সার্ভারে সংরক্ষিত হয় না, তাই আপনাকে প্রতিটি ডিভাইসে এটি ব্যবহার করতে হবে।",
   "Enter_workspace_URL": "ওয়ার্কস্পেস URL লিখুন",
-  "Enter_Your_E2E_Password": "আপনার E2E পাসওয়ার্ড দিন",
-  "Enter_Your_Encryption_Password_desc1": "এটি আপনাকে আপনার এনক্রিপ্টেড প্রাইভেট গ্রুপ এবং ডাইরেক্ট মেসেজে অ্যাক্সেস করতে অনুমতি দেবে।",
-  "Enter_Your_Encryption_Password_desc2": "আপনাকে বার্তা কোড/ডিকোড করতে প্রতিটি স্থানে এই পাসওয়ার্ডটি দিতে হবে যেখানে আপনি চ্যাট ব্যবহার করছেন।",
   "Error_Download_file": "ফাইল ডাউনলোড করতে ত্রুটি",
   "Error_uploading": "আপলোড করার সময় ত্রুটি",
   "error-action-not-allowed": "{{action}} অনুমোদিত নয়",
@@ -391,6 +392,8 @@
   "Message_unstarred": "বার্তা তারকা নয়",
   "messages": "বার্তা",
   "Missed_call": "মিস কল",
+  "missing_room_e2ee_description": "ঘরের জন্য এনক্রিপশন কীগুলি আপডেট করা প্রয়োজন, এর জন্য আরেকজন ঘরের সদস্যকে অনলাইনে থাকতে হবে।",
+  "missing_room_e2ee_title": "কয়েক মুহূর্তের মধ্যে পরীক্ষা করুন",
   "Moderator": "মডারেটর",
   "move": "মুভ করুন",
   "Move_Channel_Paragraph": "একটি চ্যানেলটি একটি দলে চলেয়াও এড়াতে মানে এই চ্যানেলটি দলের সংদর্ভে যোগ হবে, তবে চ্যানেলটির সমস্ত সদস্য, যারা বিশেষ দলের সদস্য নয়, এই চ্যানেলে এখনও অ্যাক্সেস থাকবে, তবে তাদেরকে দলের সদস্য হিসেবে যোগ করা হবে না। \n\nচ্যানেলটির সমস্ত পরিচালনা এখনও এই চ্যানেলটির মালিকদের দ্বারা হয়ে যাবে।\n\nদলের সদস্য এবং হয়তো দলের মালিকরা, যদি এই চ্যানেলের সদস্য না হন, তাদের এই চ্যানেলের অবয়ব হতে পারবে না। \n\nদয়া করে মনে রাখবেন যে দলের মালিক সদস্যদের চ্যানেল থেকে সরাতে পারবেন।",
diff --git a/app/i18n/locales/de.json b/app/i18n/locales/de.json
index ce17de6322..5dfca2a5dc 100644
--- a/app/i18n/locales/de.json
+++ b/app/i18n/locales/de.json
@@ -221,13 +221,14 @@
   "Enabled_E2E_Encryption_for_this_room": "hat E2E-Verschlüsselung für diesen Raum aktiviert",
   "Encrypted": "Verschlüsselt",
   "Encrypted_message": "Verschlüsselte Nachricht",
+  "encrypted_room_description": "Geben Sie Ihr Passwort für die Ende-zu-Ende-Verschlüsselung ein, um Zugang zu erhalten.",
+  "encrypted_room_title": "{{room_name}} ist verschlüsselt",
   "Encryption_error_desc": "Es war nicht möglich, Ihren Verschlüsselungs-Key zu importieren.",
   "Encryption_error_title": "Ihr Verschlüsselungs-Passwort scheint falsch zu sein",
   "End_to_end_encrypted_room": "Ende-zu-Ende-verschlüsselter Raum",
+  "Enter_E2EE_Password": "E2EE-Passwort eingeben",
+  "Enter_E2EE_Password_description": "Um auf Ihre verschlüsselten Kanäle und Direktnachrichten zuzugreifen, geben Sie Ihr Verschlüsselungspasswort ein. Dies wird nicht auf dem Server gespeichert, daher müssen Sie es auf jedem Gerät verwenden.",
   "Enter_workspace_URL": "Arbeitsbereich-URL",
-  "Enter_Your_E2E_Password": "Geben Sie Ihr Ende-zu-Ende-Passwort ein",
-  "Enter_Your_Encryption_Password_desc1": "Das erlaubt Ihnen, auf Ihre verschlüsselten privaten Gruppen und Direktnachrichten zuzugreifen.",
-  "Enter_Your_Encryption_Password_desc2": "Sie müssen das Passwort zur Ver-/Entschlüsselung an jeder Stelle eingeben, an dem Sie diesen Chat verwenden.",
   "Error_Download_file": "Fehler beim Herunterladen der Datei",
   "Error_uploading": "Fehler beim Hochladen",
   "error-action-not-allowed": "{{action}} ist nicht erlaubt",
@@ -382,6 +383,8 @@
   "Message_starred": "Nachricht favorisiert",
   "Message_unstarred": "Nachricht nicht mehr favorisiert",
   "messages": "Nachrichten",
+  "missing_room_e2ee_description": "Die Verschlüsselungsschlüssel für den Raum müssen aktualisiert werden, ein anderer Raummitglied muss online sein, damit dies geschehen kann.",
+  "missing_room_e2ee_title": "Überprüfen Sie in ein paar Momenten zurück",
   "Moderator": "Moderator",
   "move": "verschieben",
   "Move_Channel_Paragraph": "Das Verschieben eines Channels innerhalb eines Teams bedeutet, dass dieser Channel im Kontext des Teams hinzugefügt wird, jedoch haben alle Mitglieder des Channels, die nicht Mitglied des jeweiligen Teams sind, weiterhin Zugriff auf diesen Channel, werden aber nicht als Teammitglieder hinzugefügt \n\nDie gesamte Verwaltung des Channels wird weiterhin von den Eigentümern dieses Channels vorgenommen.\n\nTeammitglieder und sogar Teameigentümer, die nicht Mitglied dieses Channels  sind, haben keinen Zugriff auf den Inhalt des Channels. \n\nBitte beachten Sie, dass der Besitzer des Teams in der Lage ist, Mitglieder aus dem Channel zu entfernen.",
diff --git a/app/i18n/locales/en.json b/app/i18n/locales/en.json
index 54b8ce56c7..09f4e7d619 100644
--- a/app/i18n/locales/en.json
+++ b/app/i18n/locales/en.json
@@ -199,6 +199,9 @@
   "Direct_message_someone": "Direct message someone",
   "Direct_Messages": "Direct messages",
   "Directory": "Directory",
+  "Disable": "Disable",
+  "Disable_encryption_description": "Disabling E2EE compromises privacy. You can re-enable it later if needed. Proceed with caution.",
+  "Disable_encryption_title": "Disable encryption",
   "Disable_writing_in_room": "Disable writing in room",
   "Disabled_E2E_Encryption_for_this_room": "disabled E2E encryption for this room",
   "Discard": "Discard",
@@ -234,6 +237,8 @@
   "E2E_How_It_Works_info2": "This is *end to end encryption* so the key to encode/decode your messages and they will not be saved on the workspace. For that reason *you need to store this password somewhere safe* which you can access later if you may need.",
   "E2E_How_It_Works_info3": "If you proceed, it will be auto generated an E2E password.",
   "E2E_How_It_Works_info4": "You can also setup a new password for your encryption key any time from any browser you have entered the existing E2E password.",
+  "e2ee_disabled": "End-to-end encryption is disabled",
+  "e2ee_enabled": "End-to-end encryption is enabled",
   "Edit": "Edit",
   "Edit_Invite": "Edit invite",
   "Edit_Status": "Edit status",
@@ -241,20 +246,24 @@
   "Email_Notification_Mode_All": "Every mention/DM",
   "Email_Notification_Mode_Disabled": "Disabled",
   "Empty": "Empty",
+  "Enable": "Enable",
   "Enable_Auto_Translate": "Enable auto-translate",
+  "Enable_encryption_description": "Ensure conversations are kept private",
+  "Enable_encryption_title": "Enable encryption",
   "Enable_Message_Parser": "Enable message parser",
   "Enable_writing_in_room": "Enable writing in room",
   "Enabled_E2E_Encryption_for_this_room": "enabled E2E encryption for this room",
   "Encrypted": "Encrypted",
   "Encrypted_message": "Encrypted message",
+  "encrypted_room_description": "Enter your end-to-end encryption password to access.",
+  "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",
   "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.",
   "Enter_the_code": "Enter the code we just emailed you.",
   "Enter_workspace_URL": "Enter workspace URL",
-  "Enter_Your_E2E_Password": "Enter your E2E password",
-  "Enter_Your_Encryption_Password_desc1": "This will allow you to access your encrypted private groups and direct messages.",
-  "Enter_Your_Encryption_Password_desc2": "You need to enter the password to encode/decode messages every place you use the chat.",
   "Error_Download_file": "Error while downloading file",
   "Error_uploading": "Error uploading",
   "error-action-not-allowed": "{{action}} is not allowed",
@@ -429,6 +438,8 @@
   "messages": "messages",
   "Microphone_access_needed_to_record_audio": "Microphone access needed to record audio",
   "Missed_call": "Missed call",
+  "missing_room_e2ee_description": "The encryption keys for the room need to be updated, another room member needs to be online for this to happen.",
+  "missing_room_e2ee_title": "Check back in a few moments",
   "Moderator": "Moderator",
   "move": "move",
   "Move_Channel_Paragraph": "Moving a channel inside a team means that this channel will be added in the team’s context, however, all channel’s members, which are not members of the respective team, will still have access to this channel, but will not be added as team’s members. \n\nAll channel’s management will still be made by the owners of this channel.\n\nTeam’s members and even team’s owners, if not a member of this channel, can not have access to the channel’s content. \n\nPlease notice that the team’s owner will be able remove members from the channel.",
diff --git a/app/i18n/locales/fi.json b/app/i18n/locales/fi.json
index 925badb557..768cf6e09f 100644
--- a/app/i18n/locales/fi.json
+++ b/app/i18n/locales/fi.json
@@ -206,13 +206,14 @@
   "Enabled_E2E_Encryption_for_this_room": "otti täyden salauksen käyttöön tässä huoneessa",
   "Encrypted": "Salattu",
   "Encrypted_message": "Salattu viesti",
+  "encrypted_room_description": "Syötä päästä päähän -salauksen salasanasi päästäksesi käsiksi.",
+  "encrypted_room_title": "{{room_name}} on salattu",
   "Encryption_error_desc": "Tuotavan salausavaimesi salausta ei voitu purkaa.",
   "Encryption_error_title": "Salauksen salasanasi näyttää väärältä",
   "End_to_end_encrypted_room": "Täysin salattu huone",
+  "Enter_E2EE_Password": "Anna E2EE-salasana",
+  "Enter_E2EE_Password_description": "Päästäksesi käsiksi salattuihin kanaviisi ja suoriin viesteihisi, syötä salaus salasanasi. Tätä ei tallenneta palvelimelle, joten sinun on käytettävä sitä jokaisella laitteella.",
   "Enter_workspace_URL": "Anna työtilan URL-osoite",
-  "Enter_Your_E2E_Password": "Anna täyden salauksen salasanasi",
-  "Enter_Your_Encryption_Password_desc1": "Näin pääset käyttämään salattuja yksityisiä ryhmiäsi ja suoria viestejäsi.",
-  "Enter_Your_Encryption_Password_desc2": "Sinun on annettava viestien salauksen / salauksen purkamisen salasana kaikkialla, missä käytät keskustelua.",
   "Error_Download_file": "Virhe ladattaessa tiedostoa",
   "Error_uploading": "Virhe ladattaessa",
   "error-action-not-allowed": "{{action}} ei ole sallittu",
@@ -363,6 +364,8 @@
   "Message_starred": "Viesti merkitty tähdellä",
   "Message_unstarred": "Viestin tähtimerkintä poistettu",
   "messages": "viestiä",
+  "missing_room_e2ee_description": "Huoneen salausavaimet on päivitettävä, toisen huoneen jäsenen on oltava verkossa, jotta tämä voi tapahtua.",
+  "missing_room_e2ee_title": "Tarkista uudelleen muutaman hetken kuluttua",
   "Moderator": "Moderaattori",
   "move": "siirrä",
   "Move_Channel_Paragraph": "Kanavan siirtäminen tiimiin tarkoittaa, että tämä kanava lisätään tiimin kontekstiin. Kaikki kanavan jäsenet, jotka eivät ole vastaavan tiimin jäseniä, pääsevät silti edelleen tälle kanavalle, mutta heitä ei lisätä tiimin jäseniksi. \n\nKanavan omistajat hoitavat edelleen kaiken kanavan hallinnan.\n\nTiimin jäsenillä ja jopa tiimin omistajilla, jotka eivät ole tämän kanavan jäseniä, ei ole pääsyä kanavan sisältöön. \n\nHuomioi, että tiimin omistaja voi poistaa jäseniä kanavalta.",
diff --git a/app/i18n/locales/fr.json b/app/i18n/locales/fr.json
index ab92ef6692..ef66bd48fd 100644
--- a/app/i18n/locales/fr.json
+++ b/app/i18n/locales/fr.json
@@ -172,13 +172,14 @@
   "Enable_Message_Parser": "Activer le parseur de messages",
   "Encrypted": "Crypté",
   "Encrypted_message": "Message crypté",
+  "encrypted_room_description": "Entrez votre mot de passe de cryptage de bout en bout pour accéder.",
+  "encrypted_room_title": "{{room_name}} est crypté",
   "Encryption_error_desc": "Il n'a pas été possible de décoder votre clé de cryptage pour être importé.",
   "Encryption_error_title": "Votre mot de passe de cryptage semble erroné",
   "End_to_end_encrypted_room": "Salon crypté de bout en bout",
+  "Enter_E2EE_Password": "Entrez le mot de passe E2EE",
+  "Enter_E2EE_Password_description": "Pour accéder à vos canaux cryptés et à vos messages directs, entrez votre mot de passe de cryptage. Celui-ci n'est pas stocké sur le serveur, vous devrez donc l'utiliser sur chaque appareil.",
   "Enter_workspace_URL": "Entrez l'URL de l'espace de travail",
-  "Enter_Your_E2E_Password": "Entrez votre mot de passe E2E",
-  "Enter_Your_Encryption_Password_desc1": "Cela vous permettra d'accéder à vos groupes privés cryptés et à vos messages directs.",
-  "Enter_Your_Encryption_Password_desc2": "Vous devez entrer le mot de passe pour coder/décoder les messages à chaque endroit où vous utilisez le chat.",
   "Error_Download_file": "Erreur lors du téléchargement du fichier",
   "Error_uploading": "Erreur lors de l'envoi",
   "error-action-not-allowed": "{{action}} n'est pas autorisé",
@@ -324,6 +325,8 @@
   "Message_starred": "Message suivi",
   "Message_unstarred": "Message non suivi",
   "messages": "messages",
+  "missing_room_e2ee_description": "Les clés de chiffrement de la pièce doivent être mises à jour, un autre membre de la pièce doit être en ligne pour que cela se produise.",
+  "missing_room_e2ee_title": "Revenez dans quelques instants",
   "Moderator": "Modérateur",
   "move": "déplacer",
   "Move_Channel_Paragraph": "Le déplacement d'un canal dans une équipe signifie que ce canal sera ajouté dans le contexte d'équipe. Cependant, tous les membres du canal, qui ne sont pas membres de l'équipe respective, auront toujours accès à ce canal, mais ne seront pas ajoutés comme membres de l'équipe.\n\nLa gestion de tout le canal sera toujours assurée par les propriétaires de ce canal.\n\nLes membres de l'équipe et même les propriétaires de l'équipe, s'ils ne sont pas membres de ce canal, ne peuvent pas avoir accès au contenu du canal.\n\nVeuillez noter que le propriétaire de l'équipe pourra supprimer des membres du canal.",
diff --git a/app/i18n/locales/hi-IN.json b/app/i18n/locales/hi-IN.json
index 8f3fdba41a..52a39d5f24 100644
--- a/app/i18n/locales/hi-IN.json
+++ b/app/i18n/locales/hi-IN.json
@@ -227,13 +227,14 @@
   "Enabled_E2E_Encryption_for_this_room": "इस कक्ष के लिए ईटूई एन्क्रिप्शन सक्षम किया गया है",
   "Encrypted": "एन्क्रिप्टेड",
   "Encrypted_message": "एन्क्रिप्टेड संदेश",
+  "encrypted_room_description": "पहुँचने के लिए अपना एंड-टू-एंड एन्क्रिप्शन पासवर्ड दर्ज करें।",
+  "encrypted_room_title": "{{room_name}} एन्क्रिप्टेड है",
   "Encryption_error_desc": "आपके एन्क्रिप्शन कुंजी को आयात करने के लिए इसे डीकोड करना संभाव नहीं था।",
   "Encryption_error_title": "आपका एन्क्रिप्शन पासवर्ड गलत लगता है",
   "End_to_end_encrypted_room": "इंड-टू-इंड एन्क्रिप्टेड कमरा",
+  "Enter_E2EE_Password": "E2EE पासवर्ड डालें",
+  "Enter_E2EE_Password_description": "अपने एन्क्रिप्टेड चैनल्स और डायरेक्ट मैसेजेस तक पहुँचने के लिए, अपना एन्क्रिप्शन पासवर्ड दर्ज करें। यह सर्वर पर संग्रहीत नहीं होता है, इसलिए आपको इसे हर डिवाइस पर उपयोग करना होगा।",
   "Enter_workspace_URL": "कार्यस्थान URL दर्ज करें",
-  "Enter_Your_E2E_Password": "अपना इंड-टू-इंड पासवर्ड डालें",
-  "Enter_Your_Encryption_Password_desc1": "इससे आप अपने एन्क्रिप्टेड प्राइवेट ग्रुप और सीधे संदेशों तक पहुंच सकते हैं।",
-  "Enter_Your_Encryption_Password_desc2": "आपको संदेश एनकोड/डीकोड करने के लिए हर जगह जब भी चैट का उपयोग करते हैं, तो आपको पासवर्ड डालना होगा।",
   "Error_Download_file": "फ़ाइल डाउनलोड करते समय त्रुटि",
   "Error_uploading": "अपलोड करने में त्रुटि",
   "error-action-not-allowed": "{{action}} की अनुमति नहीं है",
@@ -391,6 +392,8 @@
   "Message_unstarred": "संदेश का स्टार हटाया गया",
   "messages": "संदेश",
   "Missed_call": "कॉल छूट गई है",
+  "missing_room_e2ee_description": "कमरे के लिए एन्क्रिप्शन कुंजियों को अपडेट किया जाना चाहिए, इसके लिए एक और कमरे के सदस्य को ऑनलाइन होना चाहिए।",
+  "missing_room_e2ee_title": "कुछ क्षणों में वापस जाँच करें",
   "Moderator": "मॉडरेटर",
   "move": "हटाएं",
   "Move_Channel_Paragraph": "एक चैनल को टीम के अंदर मूव करना यह अर्थ है कि इस चैनल को टीम के संदर्भ में जोड़ा जाएगा, हालांकि उन सभी चैनल सदस्यों को इस चैनल का उपयोग करने का अधिकार होगा, जो संबंधित टीम के सदस्य नहीं होंगे, लेकिन टीम के सदस्यों के रूप में जोड़ा नहीं जाएगा।",
diff --git a/app/i18n/locales/hu.json b/app/i18n/locales/hu.json
index 91547727d3..ff4bdd2991 100644
--- a/app/i18n/locales/hu.json
+++ b/app/i18n/locales/hu.json
@@ -227,13 +227,14 @@
   "Enabled_E2E_Encryption_for_this_room": "E2E engedélyezve ennél a szobánál",
   "Encrypted": "Titkosítva",
   "Encrypted_message": "Titkosított üzenet",
+  "encrypted_room_description": "Adja meg a végponttól végpontig terjedő titkosítási jelszavát a hozzáféréshez.",
+  "encrypted_room_title": "{{room_name}} titkosítva van",
   "Encryption_error_desc": "Nem sikerült dekódolni az importálandó titkosítási kulcsot.",
   "Encryption_error_title": "A titkosítási jelszó rossznak tűnik",
   "End_to_end_encrypted_room": "Végponttól végpontig titkosított szoba",
+  "Enter_E2EE_Password": "Adja meg az E2EE jelszót",
+  "Enter_E2EE_Password_description": "Az titkosított csatornákhoz és közvetlen üzenetekhez való hozzáféréshez írja be a titkosítási jelszavát. Ez nincs tárolva a szerveren, így minden eszközön használnia kell.",
   "Enter_workspace_URL": "Adja meg a munkaterület URL-címét",
-  "Enter_Your_E2E_Password": "Adja meg az E2E jelszavát",
-  "Enter_Your_Encryption_Password_desc1": "Ez lehetővé teszi a titkosított privát csoportok és közvetlen üzenetek elérését.",
-  "Enter_Your_Encryption_Password_desc2": "Az üzenetek kódolásához/dekódolásához mindenhol meg kell adnia a jelszót, ahol a csevegést használja.",
   "Error_Download_file": "Hiba a fájl letöltése közben",
   "Error_uploading": "Hiba feltöltése",
   "error-action-not-allowed": "A(z) {{action}} tevékenység nem engedélyezett",
@@ -392,6 +393,8 @@
   "Message_unstarred": "Üzenet csillagozásának megszüntetése",
   "messages": "üzenetek",
   "Missed_call": "Nem fogadott hívás",
+  "missing_room_e2ee_description": "A szoba titkosítási kulcsait frissíteni kell, ehhez egy másik szobatagnak online kell lennie.",
+  "missing_room_e2ee_title": "Nézzen vissza néhány perc múlva",
   "Moderator": "Moderátor",
   "move": "mozgatás",
   "Move_Channel_Paragraph": "Egy csatorna áthelyezése egy csapaton belül azt jelenti, hogy ez a csatorna hozzá lesz adva a csapat kontextusához, azonban a csatorna minden olyan tagja, aki nem tagja az adott csapatnak, továbbra is hozzáfér a csatornához, de nem lesz hozzáadva a csapat tagjaként.\n\nA csatorna minden irányítását továbbra is a csatorna tulajdonosai végzik.\n\nA csapat tagjai és még a csapat tulajdonosai sem férhetnek hozzá a csatorna tartalmához, ha nem tagjai ennek a csatornának.\n\nKérjük, vegye figyelembe, hogy a csapat tulajdonosa képes lesz eltávolítani a tagokat a csatornáról.",
diff --git a/app/i18n/locales/it.json b/app/i18n/locales/it.json
index 631810014b..dd13c20f87 100644
--- a/app/i18n/locales/it.json
+++ b/app/i18n/locales/it.json
@@ -148,13 +148,14 @@
   "Enable_Auto_Translate": "Abilita traduzione automatica",
   "Encrypted": "Crittografato",
   "Encrypted_message": "Messaggio crittografato",
+  "encrypted_room_description": "Inserisci la tua password di crittografia end-to-end per accedere.",
+  "encrypted_room_title": "{{room_name}} è criptato",
   "Encryption_error_desc": "Non è stato possibile importare la tua chiave di cifratura.",
   "Encryption_error_title": "La tua password di cifratura sembra errata",
   "End_to_end_encrypted_room": "Stanza crittografata end to end",
+  "Enter_E2EE_Password": "Inserisci la password E2EE",
+  "Enter_E2EE_Password_description": "Per accedere ai tuoi canali criptati e ai messaggi diretti, inserisci la tua password di crittografia. Questa non viene memorizzata sul server, quindi dovrai usarla su ogni dispositivo.",
   "Enter_workspace_URL": "Inserisci la url del workspace",
-  "Enter_Your_E2E_Password": "Inserisci la tua password E2E",
-  "Enter_Your_Encryption_Password_desc1": "Potrai così accedere ai tuoi gruppi privati e messaggi privati crittografati.",
-  "Enter_Your_Encryption_Password_desc2": "Devi inserire la password per cifrare/decifrare i messaggi ovunque usi la chat.",
   "Error_uploading": "Errore nel caricamento di",
   "error-action-not-allowed": "{{action}} non autorizzata",
   "error-avatar-invalid-url": "URL avatar non valido: {{url}}",
@@ -277,6 +278,8 @@
   "Message_starred": "Messaggio importante",
   "Message_unstarred": "Messaggio non importante",
   "messages": "messaggi",
+  "missing_room_e2ee_description": "Le chiavi di crittografia per la stanza devono essere aggiornate, un altro membro della stanza deve essere online affinché ciò avvenga.",
+  "missing_room_e2ee_title": "Ricontrolla tra qualche istante",
   "move": "spostare",
   "Mute": "Silenzia",
   "Mute_someone_in_room": "Silenzia qualcuno nel canale",
diff --git a/app/i18n/locales/ja.json b/app/i18n/locales/ja.json
index 2b352d5635..37593ad945 100644
--- a/app/i18n/locales/ja.json
+++ b/app/i18n/locales/ja.json
@@ -123,12 +123,13 @@
   "Enable_Auto_Translate": "自動翻訳を有効にする",
   "Encrypted": "暗号化済み",
   "Encrypted_message": "暗号化されたメッセージ",
+  "encrypted_room_description": "エンドツーエンドの暗号化パスワードを入力してアクセスしてください。",
+  "encrypted_room_title": "{{room_name}}は暗号化されています",
   "Encryption_error_desc": "暗号化キーをデコードしてインポートできませんでした。",
   "Encryption_error_title": "暗号化パスワードが間違っているようです",
   "End_to_end_encrypted_room": "暗号化されたエンドツーエンドのルーム",
-  "Enter_Your_E2E_Password": "E2Eパスワードを入力してください",
-  "Enter_Your_Encryption_Password_desc1": "これにより、暗号化されたプライベートグループやダイレクトメッセージにアクセスできます。",
-  "Enter_Your_Encryption_Password_desc2": "チャットを利用するたびに、メッセージをエンコード/デコードするためのパスワードを入力する必要があります。",
+  "Enter_E2EE_Password": "E2EEパスワードを入力",
+  "Enter_E2EE_Password_description": "暗号化されたチャンネルとダイレクトメッセージにアクセスするには、暗号化パスワードを入力してください。これはサーバーに保存されないため、すべてのデバイスで使用する必要があります。",
   "Error_uploading": "アップロードエラー",
   "error-action-not-allowed": "{{action}}の権限がありません。",
   "error-avatar-invalid-url": "画像のURLが正しくありません: {{url}}",
@@ -225,6 +226,8 @@
   "Message_removed": "メッセージを除く",
   "Message_Reported": "メッセージを報告しました",
   "messages": "メッセージ",
+  "missing_room_e2ee_description": "部屋の暗号化キーを更新する必要があります。これが行われるためには、別の部屋のメンバーがオンラインである必要があります。",
+  "missing_room_e2ee_title": "数分後にもう一度確認してください",
   "move": "移動",
   "Mute": "ミュート",
   "Mute_someone_in_room": "ルーム内のいずれかのユーザーをミュート",
diff --git a/app/i18n/locales/nl.json b/app/i18n/locales/nl.json
index 869a4c9faf..5503286e08 100644
--- a/app/i18n/locales/nl.json
+++ b/app/i18n/locales/nl.json
@@ -172,13 +172,14 @@
   "Enable_Message_Parser": "Berichtparser inschakelen",
   "Encrypted": "Versleuteld",
   "Encrypted_message": "Versleuteld bericht",
+  "encrypted_room_description": "Voer uw end-to-end encryptiewachtwoord in om toegang te krijgen.",
+  "encrypted_room_title": "{{room_name}} is versleuteld",
   "Encryption_error_desc": "Het was niet mogelijk om uw coderingssleutel te decoderen om te worden geïmporteerd.",
   "Encryption_error_title": "Jouw coderingswachtwoord lijkt verkeerd",
   "End_to_end_encrypted_room": "End-to-end versleutelde kamer",
+  "Enter_E2EE_Password": "Voer E2EE-wachtwoord in",
+  "Enter_E2EE_Password_description": "Om toegang te krijgen tot uw versleutelde kanalen en directe berichten, voert u uw versleutelingswachtwoord in. Dit wordt niet op de server opgeslagen, dus u moet het op elk apparaat gebruiken.",
   "Enter_workspace_URL": "Voer de werkruimte-URL in",
-  "Enter_Your_E2E_Password": "Voer uw E2E-wachtwoord in",
-  "Enter_Your_Encryption_Password_desc1": "Hiermee krijg je toegang tot uw gecodeerde privégroepen en directe berichten.",
-  "Enter_Your_Encryption_Password_desc2": "Op elke plaats waar je de chat gebruikt, moet je het wachtwoord invoeren om berichten te coderen/decoderen.",
   "Error_Download_file": "Fout tijdens het downloaden van bestand",
   "Error_uploading": "Fout bij uploaden",
   "error-action-not-allowed": "{{action}} is niet toegestaan",
@@ -324,6 +325,8 @@
   "Message_starred": "Bericht met ster",
   "Message_unstarred": "Bericht zonder ster",
   "messages": "berichten",
+  "missing_room_e2ee_description": "De versleutelingssleutels voor de kamer moeten worden bijgewerkt, een ander kamerlid moet online zijn om dit te laten gebeuren.",
+  "missing_room_e2ee_title": "Kom over een paar momenten terug",
   "Moderator": "Moderator",
   "move": "verplaatsen",
   "Move_Channel_Paragraph": "Het verplaatsen van een kanaal binnen een team betekent dat dit kanaal wordt toegevoegd in de context van het team. Maar, alle leden van dit kanaal, die geen lid zijn van het respectieve team, zullen nog steeds toegang hebben tot dit kanaal, maar worden niet als teamleden toegevoegd.\n\nHet volledige beheer van dit kanaal wordt nog steeds door de eigenaren van dit kanaal gedaan.\n\nTeamleden en zelfs teameigenaren, wanneer ze geen lid zijn van dit kanaal, hebben geen toegang tot de content van het kanaal.\n\nHou er rekening mee dat de eigenaar van het team de leden uit het kanaal kan verwijderen.",
diff --git a/app/i18n/locales/pt-BR.json b/app/i18n/locales/pt-BR.json
index a4a244e8fe..aabe6935c8 100644
--- a/app/i18n/locales/pt-BR.json
+++ b/app/i18n/locales/pt-BR.json
@@ -196,6 +196,9 @@
   "Direct_message_someone": "Enviar mensagem direta para alguém",
   "Direct_Messages": "Mensagens diretas",
   "Directory": "Diretório",
+  "Disable": "Desabilitar",
+  "Disable_encryption_description": "Desabilitar a criptografia compromete sua privacidade. Você pode reabilitá-la depois se precisar. Continue com cautela.",
+  "Disable_encryption_title": "Desabilitar criptografia",
   "Disable_writing_in_room": "Desabilitar escrita na sala",
   "Disabled_E2E_Encryption_for_this_room": "desabilitou criptografia para essa sala",
   "Discard": "Descartar",
@@ -238,20 +241,24 @@
   "Email_Notification_Mode_All": "Toda menção / mensagem direta",
   "Email_Notification_Mode_Disabled": "Desativado",
   "Empty": "Vazio",
+  "Enable": "Habilitar",
   "Enable_Auto_Translate": "Ativar a tradução automática",
+  "Enable_encryption_description": "Garante a privacidade das suas conversas",
+  "Enable_encryption_title": "Habilitar criptografia",
   "Enable_Message_Parser": "Habilita analisador de mensagem",
   "Enable_writing_in_room": "Permitir escrita na sala",
   "Enabled_E2E_Encryption_for_this_room": "habilitou criptografia para essa sala",
   "Encrypted": "Criptografado",
   "Encrypted_message": "Mensagem criptografada",
+  "encrypted_room_description": "Insira sua senha de criptografia de ponta a ponta para acessar.",
+  "encrypted_room_title": "{{room_name}} está criptografado",
   "Encryption_error_desc": "Não foi possível decodificar sua chave E2E para ser importada.",
   "Encryption_error_title": "Sua senha E2E parece errada",
   "End_to_end_encrypted_room": "Sala criptografada de ponta a ponta",
+  "Enter_E2EE_Password": "Digite a senha E2EE",
+  "Enter_E2EE_Password_description": "Para acessar seus canais criptografados e mensagens diretas, insira sua senha de criptografia. Isso não é armazenado no servidor, então você precisará usá-la em cada dispositivo.",
   "Enter_the_code": "Insira o código que acabamos de enviar por e-mail.",
   "Enter_workspace_URL": "Digite a URL da sua workspace",
-  "Enter_Your_E2E_Password": "Digite sua senha E2E",
-  "Enter_Your_Encryption_Password_desc1": "Isso permitirá que você acesse seus grupos privados e mensagens diretas criptografadas.",
-  "Enter_Your_Encryption_Password_desc2": "Você precisa inserir a senha para codificar/decodificar mensagens em todos os lugares em que usar o chat.",
   "Error_Download_file": "Erro ao baixar o arquivo",
   "Error_uploading": "Erro subindo",
   "error-action-not-allowed": "{{action}} não é permitido",
@@ -424,6 +431,8 @@
   "messages": "mensagens",
   "Microphone_access_needed_to_record_audio": "Acesso ao microfone necessário para gravar áudio",
   "Missed_call": "Chamada perdida",
+  "missing_room_e2ee_description": "As chaves de criptografia da sala precisam ser atualizadas, outro membro da sala precisa estar online para que isso aconteça.",
+  "missing_room_e2ee_title": "Verifique novamente em alguns momentos",
   "Moderator": "Moderador",
   "move": "mover",
   "Move_Channel_Paragraph": "Mover um canal dentro de um time significa que este canal será adicionado no contexto do time, no entanto, todos os membros do canal, que não são membros do respectivo time, ainda terão acesso a este canal, mas não serão adicionados como membros do time. \n\nA gestão de todos os canais continuará a ser feita pelos proprietários deste canal.\n\nOs membros do time e até mesmo os proprietários do time, se não forem membros deste canal, não podem ter acesso ao conteúdo do canal.\n\nPor favor, note que o dono do time poderá remover membros do canal.",
diff --git a/app/i18n/locales/pt-PT.json b/app/i18n/locales/pt-PT.json
index 00733a812e..f789e1f6ab 100644
--- a/app/i18n/locales/pt-PT.json
+++ b/app/i18n/locales/pt-PT.json
@@ -119,12 +119,13 @@
   "Enable_Auto_Translate": "Activar Auto-Tradução",
   "Encrypted": "Encriptado",
   "Encrypted_message": "Mensagem encriptada",
+  "encrypted_room_description": "Insira a sua palavra-passe de encriptação de ponta a ponta para aceder.",
+  "encrypted_room_title": "{{room_name}} está encriptado",
   "Encryption_error_desc": "Não foi possível descodificar a sua chave de encriptação para ser importada.",
   "Encryption_error_title": "A sua senha de encriptação parece errada",
   "End_to_end_encrypted_room": "Sala encriptada de ponta a ponta",
-  "Enter_Your_E2E_Password": "Digite a sua senha E2E",
-  "Enter_Your_Encryption_Password_desc1": "Isto permitir-lhe-á aceder aos seus grupos privados encriptados e às suas mensagens directas.",
-  "Enter_Your_Encryption_Password_desc2": "Você precisa digitar a senha para codificar/descodificar mensagens em cada lugar que você usar o chat.",
+  "Enter_E2EE_Password": "Digite a senha E2EE",
+  "Enter_E2EE_Password_description": "Para aceder aos seus canais encriptados e mensagens diretas, introduza a sua palavra-passe de encriptação. Isto não é armazenado no servidor, pelo que terá de o utilizar em cada dispositivo.",
   "Error_uploading": "Erro ao fazer o envio",
   "error-action-not-allowed": "{{action}} não é permitida",
   "error-avatar-invalid-url": "URL de avatar inválido: {{url}}",
@@ -222,6 +223,8 @@
   "Message_starred": "Mensagem estrelada",
   "Message_unstarred": "Mensagem não estrelada",
   "messages": "mensagens",
+  "missing_room_e2ee_description": "As chaves de criptografia da sala precisam ser atualizadas, outro membro da sala precisa estar online para que isso aconteça.",
+  "missing_room_e2ee_title": "Volte a verificar daqui a alguns momentos",
   "move": "mover",
   "Mute": "Silenciar",
   "Mute_someone_in_room": "Silenciar alguém na sala",
diff --git a/app/i18n/locales/ru.json b/app/i18n/locales/ru.json
index 6c2d619131..e2cc7379c9 100644
--- a/app/i18n/locales/ru.json
+++ b/app/i18n/locales/ru.json
@@ -197,13 +197,14 @@
   "Enable_Message_Parser": "Включить парсер сообщений",
   "Encrypted": "Зашифрован",
   "Encrypted_message": "Зашифрованное сообщение",
+  "encrypted_room_description": "Введите свой пароль для шифрования от конца к концу для доступа.",
+  "encrypted_room_title": "{{room_name}} зашифрован",
   "Encryption_error_desc": "Невозможно расшифровать ваш ключ шифрования, чтобы импортировать его",
   "Encryption_error_title": "Введен не верный пароль шифрования",
   "End_to_end_encrypted_room": "Чат со сквозным шифрованием",
+  "Enter_E2EE_Password": "Введите E2EE Пароль",
+  "Enter_E2EE_Password_description": "Чтобы получить доступ к вашим зашифрованным каналам и прямым сообщениям, введите свой пароль шифрования. Он не хранится на сервере, поэтому вам нужно будет использовать его на каждом устройстве.",
   "Enter_workspace_URL": "Введите URL вашего рабочего пространства",
-  "Enter_Your_E2E_Password": "Введите Ваш E2E Пароль",
-  "Enter_Your_Encryption_Password_desc1": "Вы сможете получить доступ к вашим зашифрованным приватным чатам и личным сообщениям.",
-  "Enter_Your_Encryption_Password_desc2": "Вам нужно ввести пароль для шифрования/расшифровки сообщений в каждом клиенте.",
   "Error_Download_file": "Ошибка при скачивании файла",
   "Error_uploading": "Ошибка загрузки",
   "error-action-not-allowed": "{{action}} не допускается",
@@ -353,6 +354,8 @@
   "Message_starred": "Сообщение отмечено звездой",
   "Message_unstarred": "Отметка сообщения звездой удалена",
   "messages": "сообщения",
+  "missing_room_e2ee_description": "Ключи шифрования для комнаты должны быть обновлены, другой участник комнаты должен быть в сети, чтобы это произошло.",
+  "missing_room_e2ee_title": "Проверьте еще раз через несколько моментов",
   "Moderator": "Модератор",
   "move": "переместить",
   "Move_Channel_Paragraph": "Перемещение канала внутрь Команды означает, что этот канал будет добавлен в контекст Команды, однако все участники канала, которые не являются членами соответствующей Команды, по-прежнему будут иметь доступ к этому каналу, но не будут добавлены как участники Команды \n\nВсе управление каналом по-прежнему будет осуществляться владельцами этого канала.\n\nЧлены Команды и даже владельцы Команды, если они не являются членами этого канала, не могут иметь доступ к содержимому канала \n\nОбратите внимание, что владелец Команды сможет удалять участников с канала.",
diff --git a/app/i18n/locales/sl-SI.json b/app/i18n/locales/sl-SI.json
index dbb3bb08a2..d07e948eb6 100644
--- a/app/i18n/locales/sl-SI.json
+++ b/app/i18n/locales/sl-SI.json
@@ -182,13 +182,14 @@
   "Enable_Message_Parser": "Omogoči razčlenjevalnik sporočil",
   "Encrypted": "Šifrirano",
   "Encrypted_message": "Šifrirano sporočilo",
+  "encrypted_room_description": "Vnesite geslo za šifriranje od konca do konca za dostop.",
+  "encrypted_room_title": "{{room_name}} je šifriran",
   "Encryption_error_desc": "Ni bilo mogoče dekodirati vašega šifrirnega ključa, ki bi ga bilo mogoče uvoziti.",
   "Encryption_error_title": "Vaše šifrirno geslo se zdi napačno",
   "End_to_end_encrypted_room": "Obojestransko (E2E) šifrirane sobe",
+  "Enter_E2EE_Password": "Vnesite geslo E2EE",
+  "Enter_E2EE_Password_description": "Za dostop do vaših šifriranih kanalov in neposrednih sporočil vnesite svoje šifrirno geslo. To ni shranjeno na strežniku, zato ga boste morali uporabljati na vsaki napravi.",
   "Enter_workspace_URL": "Vnesite URL delovnega prostora",
-  "Enter_Your_E2E_Password": "Vnesite svoje geslo E2E",
-  "Enter_Your_Encryption_Password_desc1": "To vam bo omogočilo dostop do šifriranih zasebnih skupin in neposrednih sporočil.",
-  "Enter_Your_Encryption_Password_desc2": "Za kodiranje/dekodiranje sporočil morate vnesti geslo na vsakem mestu, ki ga uporabljate.",
   "Error_Download_file": "Napaka med prenosom datoteke",
   "Error_uploading": "Napaka prenašanja",
   "error-action-not-allowed": "{{action}} ni dovoljena",
@@ -336,6 +337,8 @@
   "Message_starred": "Sporočilo v zvezdi",
   "Message_unstarred": "Sporočilo neokuženo",
   "messages": "Sporočila",
+  "missing_room_e2ee_description": "Ključi za šifriranje sobe morajo biti posodobljeni, drugi član sobe mora biti na spletu, da se to zgodi.",
+  "missing_room_e2ee_title": "Ponovno preverite čez nekaj trenutkov",
   "Moderator": "Moderator",
   "move": "premaknite se",
   "Move_Channel_Paragraph": "Premik kanala znotraj ekipe pomeni, da bo ta kanal dodan v kontekstu ekipe, vendar bodo vsi člani kanala, ki niso člani ustrezne ekipe, še vedno imeli dostop do tega kanala, vendar ne bodo dodani kot člani ekipe.\n\nZ vsemi kanali bodo še vedno upravljali lastniki teh kanalov.\n\nČlani ekipe in celo lastniki ekipe, če ni član tega kanala, ne morejo imeti dostopa do vsebine kanala.\n\nPazite, da bo lastnik ekipe lahko odstranil člane s kanala.",
diff --git a/app/i18n/locales/sv.json b/app/i18n/locales/sv.json
index 2cb25e66f3..d779af5573 100644
--- a/app/i18n/locales/sv.json
+++ b/app/i18n/locales/sv.json
@@ -206,13 +206,14 @@
   "Enabled_E2E_Encryption_for_this_room": "aktivera E2E-kryptering för det här rummet",
   "Encrypted": "Krypterat",
   "Encrypted_message": "Krypterat meddelande",
+  "encrypted_room_description": "Ange ditt lösenord för end-to-end-kryptering för att få tillgång.",
+  "encrypted_room_title": "{{room_name}} är krypterat",
   "Encryption_error_desc": "Det gick inte att avkoda krypteringsnyckeln som skulle importeras.",
   "Encryption_error_title": "Ditt krypteringslösenord verkar vara felaktigt",
   "End_to_end_encrypted_room": "End-to-end-krypterat rum",
+  "Enter_E2EE_Password": "Ange E2EE-lösenord",
+  "Enter_E2EE_Password_description": "För att komma åt dina krypterade kanaler och direkta meddelanden, ange ditt krypteringslösenord. Detta lagras inte på servern, så du måste använda det på varje enhet.",
   "Enter_workspace_URL": "Ange arbetsytans URL",
-  "Enter_Your_E2E_Password": "Ange ditt E2E-lösenord",
-  "Enter_Your_Encryption_Password_desc1": "Det här gör att du kan komma åt dina krypterade privata grupper och direktmeddelanden.",
-  "Enter_Your_Encryption_Password_desc2": "Du måste ange lösenordet för att koda/avkoda meddelanden på varje plats där du använder chatten.",
   "Error_Download_file": "Fel vid nedladdning av fil",
   "Error_uploading": "Fel vid uppladdning",
   "error-action-not-allowed": "{{action}} tillåts inte",
@@ -362,6 +363,8 @@
   "Message_starred": "Meddelandet har stjärnmarkerats",
   "Message_unstarred": "Stjärnmarkering borttagen för meddelande",
   "messages": "meddelanden",
+  "missing_room_e2ee_description": "Krypteringsnycklarna för rummet behöver uppdateras, en annan rummedlem måste vara online för att detta ska hända.",
+  "missing_room_e2ee_title": "Kontrollera igen om några ögonblick",
   "Moderator": "Moderator",
   "move": "flytta",
   "Move_Channel_Paragraph": "Om du flyttar in en kanal i ett team läggs kanalen till i teamets kontext. Alla kanalmedlemmar som inte är medlemmar i respektive team har dock fortfarande åtkomst till kanalen, men läggs inte till som teammedlemmar. \n\nAll kanalhantering görs fortfarande av kanalens ägare.\n\nTeammedlemmar och teamägare som inte är medlemmar i kanalen får inte ha åtkomst till kanalens innehåll. \n\nObs! Teamets ägare kan ta bort medlemmar från kanalen.",
diff --git a/app/i18n/locales/ta-IN.json b/app/i18n/locales/ta-IN.json
index 8a82a051b3..d574c8e2c4 100644
--- a/app/i18n/locales/ta-IN.json
+++ b/app/i18n/locales/ta-IN.json
@@ -227,13 +227,14 @@
   "Enabled_E2E_Encryption_for_this_room": "இந்த அறைக்கு E2E குறியீடு செயல்படுத்தப்பட்டுள்ளது",
   "Encrypted": "என்கிரிப்டு",
   "Encrypted_message": "என்கிரிப்டுக்கப்பட்ட செய்தி",
+  "encrypted_room_description": "அணுகலுக்கு உங்கள் முடிவுக்கு முடிவு குறியாக்க கடவுச்சொல்லை உள்ளிடவும்.",
+  "encrypted_room_title": "{{room_name}} குறியாக்கப்பட்டுள்ளது",
   "Encryption_error_desc": "உங்கள் என்கிரிப்ஷன் கடவுச்சொல் இறக்குமதி செய்ய முடியவில்லை.",
   "Encryption_error_title": "உங்கள் என்கிரிப்ஷன் கடவுச்சொல் தவறாக தோனுஆகின்றது",
   "End_to_end_encrypted_room": "குறிபாக என்று என்கிரிப்டுக்கப்பட்ட அறை",
+  "Enter_E2EE_Password": "E2EE கடவுச்சொல் உள்ளிடவும்",
+  "Enter_E2EE_Password_description": "உங்கள் என்கிரிப்ட் செய்யப்பட்ட சேனல்கள் மற்றும் நேரடி செய்திகளை அணுக, உங்கள் என்கிரிப்ஷன் கடவுச்சொல்லை உள்ளிடவும். இது சர்வரில் சேமிக்கப்படாது, எனவே நீங்கள் ஒவ்வொரு சாதனத்திலும் இதை பயன்படுத்த வேண்டும்.",
   "Enter_workspace_URL": "பணியிடல் இடைக்கு உள்ளூர் URL ஐ உள்ளிடவும்",
-  "Enter_Your_E2E_Password": "உங்கள் E2E கடவுச்சொல் உள்ளிடவும்",
-  "Enter_Your_Encryption_Password_desc1": "இது உங்களுக்கு உங்கள் என்கிரிப்டுக்கப்பட்ட தனிக்கான குழுக்களுக்கு மற்றும் தனிப்பட்ட செய்திகளுக்கு அணுக அனுமதிக்கும்.",
-  "Enter_Your_Encryption_Password_desc2": "நீங்கள் அறிந்திருக்கும் எல்லா இடங்களிலும் செய்தி கட்டுப்பாடு செய்ய கோரப்படுகின்றது.",
   "Error_Download_file": "கோப்பு பதிவிறக்கம் செய்யும் போது பிழை",
   "Error_uploading": "பதிவேற்றுதல் பிழை",
   "error-action-not-allowed": "{{action}} அனுமதி இல்லை",
@@ -391,6 +392,8 @@
   "Message_unstarred": "செய்தி அமைந்துவிடப்படவில்லை",
   "messages": "செய்திகள்",
   "Missed_call": "கால் பிழை",
+  "missing_room_e2ee_description": "அறைக்கான குறியாக்க விசைகள் புதுப்பிக்கப்பட வேண்டும், இது நடக்க மற்றொரு அறை உறுப்பினர் ஆன்லைனில் இருக்க வேண்டும்.",
+  "missing_room_e2ee_title": "சில நிமிடங்களில் மீண்டும் சரிபார்க்கவும்",
   "Moderator": "மொழிபெயர்ப்புக் காரியகம்",
   "move": "நகலெடு",
   "Move_Channel_Paragraph": "சேனலை குழுவிற்கு நகர்த்துவது அதன் சேனலின் சொந்த காரியத்தில் அந்த சேனல் குழுவின் சேனல்களுக்கு சேரப்படும் என்றும், அந்த சேனலின் அனைத்து உறுப்பினர்களும் அந்த சேனலுக்கு அனுமதி பெறும் என்றும் எடுத்துக்கொள்ளப்படும். \n\nஅந்த சேனலின் அனைத்து நிர்வாகங்கள் இன்னும் இந்த சேனலின் உரிமையாளர்களால் செயல்படும்.\n\nகுழுவின் உறுப்பினர்களும் குழுவின் உரிமையாளார்களும், அதன் உறுப்பினராக இல்லையாமல், இந்த சேனலுக்கு அணுகவும் முடியாது. \n\nதயவுசெய்து பார்க்கவும் என்னையும், குழுவின் உரிமையாளார் உறுப்பினர்களை செயலிக்க முடியும்.",
diff --git a/app/i18n/locales/te-IN.json b/app/i18n/locales/te-IN.json
index d5fd62f7d8..1d8a195319 100644
--- a/app/i18n/locales/te-IN.json
+++ b/app/i18n/locales/te-IN.json
@@ -227,13 +227,14 @@
   "Enabled_E2E_Encryption_for_this_room": "ఈ రూమ్‌కు E2E ఎన్క్రిప్షన్ ప్రారంభించబడింది",
   "Encrypted": "ఎన్క్రిప్టెడ్",
   "Encrypted_message": "ఎన్క్రిప్టెడ్ సందేశం",
+  "encrypted_room_description": "ప్రాప్యతకు మీ అంతిమ నుండి అంతిమ ఎన్క్రిప్షన్ పాస్‌వర్డ్‌ను నమోదు చేయండి.",
+  "encrypted_room_title": "{{room_name}} ఎన్క్రిప్ట్ చేయబడింది",
   "Encryption_error_desc": "మీ ఎన్క్రిప్షన్ కీని దిగుమతి చేసుకోవడం సాధ్యమవ్వలేదు.",
   "Encryption_error_title": "మీ ఎన్క్రిప్షన్ పాస్‌వర్డ్ చెల్లింపుగా ఉంది",
   "End_to_end_encrypted_room": "ఎండ్ టు ఎండ్ ఎన్క్రిప్టెడ్ రూం",
+  "Enter_E2EE_Password": "E2EE పాస్‌వర్డ్ నమోదు చేయండి",
+  "Enter_E2EE_Password_description": "మీ ఎన్క్రిప్టెడ్ ఛానెల్స్ మరియు డైరెక్ట్ మెసేజెస్‌ను యాక్సెస్ చేయడానికి, మీ ఎన్క్రిప్షన్ పాస్‌వర్డ్‌ను నమోదు చేయండి. ఇది సర్వర్‌లో నిల్వ చేయబడదు, కాబట్టి మీరు ప్రతి పరికరంపై దీనిని ఉపయోగించాలి.",
   "Enter_workspace_URL": "పనిముటు URL నమోదు చేయండి",
-  "Enter_Your_E2E_Password": "మీ E2E పాస్‌వర్డ్ నమోదు చేయండి",
-  "Enter_Your_Encryption_Password_desc1": "ఇది మీరు ఎన్క్రిప్టెడ్ ప్రైవేట్ గ్రూప్లను మరియు సరాసరి సందేశాలను ప్రాప్తి చేయడానికి అనుమతిస్తుంది.",
-  "Enter_Your_Encryption_Password_desc2": "మీరు చాట్ ఉపయోగిస్తున్న ప్రతి స్థలంలో సందేశాలను ఎన్కోడ్ / డీకోడ్ చేయడానికి పాస్‌వర్డ్ నమోదు చేయాలి.",
   "Error_Download_file": "ఫైల్ డౌన్‌లోడ్ చేస్తున్నప్పుడు తప్పిబాటు",
   "Error_uploading": "అప్‌లోడ్ లోపం",
   "error-action-not-allowed": "{{action}} అనుమతించబడినది కాదు",
@@ -391,6 +392,8 @@
   "Message_unstarred": "సందేశం నకిలీయం తీసివేయబడింది",
   "messages": "సందేశాలు",
   "Missed_call": "మిస్డ్ కాల్",
+  "missing_room_e2ee_description": "గది కోసం ఎన్క్రిప్షన్ కీలు నవీకరించబడాలి, దీని జరగాలంటే మరొక గది సభ్యుడు ఆన్లైన్‌లో ఉండాలి.",
+  "missing_room_e2ee_title": "కొన్ని క్షణాల్లో తిరిగి తనిఖీ చేయండి",
   "Moderator": "మాడరేటర్",
   "move": "తరలించుకో",
   "Move_Channel_Paragraph": "ఛానల్ని టీమ్ కంటెక్స్ట్‌లో ప్రవేశించటం అనేది ఈ ఛానల్లను టీమ్‌కు చేర్చడం అనుకూలంగా ఉండండి, కాని టీమ్ సభ్యులు కాని తమ ఛానల్ యొక్క సభ్యులవిలేనంటే, కాని ఛానల్ సభ్యులకు ఇది అందిస్తారు. \n\nఅన్ని ఛానల్ నిర్వహణ అంగీకరించిన ఈ ఛానల్ యొక్క యజమానులు బాహ్యాంతరం నిర్వహిస్తారు. \n\nటీమ్ సభ్యులు మరియు టీమ్ యజమానులు, ఛానల్ సభ్యులు కాని దరారుగా ఛానల్ యొక్క కంటెంట్‌కు ప్రవేశించలేరు. \n\nదయచేసి గమనించండి టీమ్ యజమానులు సభ్యులను ఛానల్ నుండి తీసివేయడానికి అనుమతి ఉంది.",
diff --git a/app/i18n/locales/tr.json b/app/i18n/locales/tr.json
index 72d1506358..79d28e1941 100644
--- a/app/i18n/locales/tr.json
+++ b/app/i18n/locales/tr.json
@@ -137,13 +137,14 @@
   "Enable_Auto_Translate": "Otomatik Çeviriyi Etkinleştir",
   "Encrypted": "Şifreli",
   "Encrypted_message": "Şifreli ileti",
+  "encrypted_room_description": "Erişmek için uçtan uca şifreleme şifrenizi girin.",
+  "encrypted_room_title": "{{room_name}} şifrelenmiştir",
   "Encryption_error_desc": "İçe aktarılacak şifreleme anahtarınızın kodu çözülemedi.",
   "Encryption_error_title": "Şifreleme şifreniz yanlış görünüyor",
   "End_to_end_encrypted_room": "Uçtan uca şifreli oda",
+  "Enter_E2EE_Password": "E2EE Şifresini Girin",
+  "Enter_E2EE_Password_description": "Şifreli kanallarınıza ve doğrudan mesajlarınıza erişmek için şifreleme şifrenizi girin. Bu, sunucuda saklanmaz, bu nedenle her cihazda kullanmanız gerekir.",
   "Enter_workspace_URL": "Çalışma alanı URL'nizi girin",
-  "Enter_Your_E2E_Password": "Uçtan Uca Şifreleme (E2E) Şifrenizi Girin",
-  "Enter_Your_Encryption_Password_desc1": "Bu, şifrelenmiş özel gruplarınıza ve doğrudan iletilerinize erişmenize izin verecektir.",
-  "Enter_Your_Encryption_Password_desc2": "Sohbeti kullandığınız her yerde iletileri şifrelemek / çözmek için şifre girmeniz gerekir.",
   "Error_uploading": "Yükleme hatası",
   "error-action-not-allowed": "{{action}}'a izin verilmiyor!",
   "error-avatar-invalid-url": "Geçersiz avatar URL'si: {{url}}",
@@ -262,6 +263,8 @@
   "Message_starred": "İletia yıldız eklendi",
   "Message_unstarred": "İletiın yıldızı kaldırıldı",
   "messages": "iletiler",
+  "missing_room_e2ee_description": "Odanın şifreleme anahtarları güncellenmelidir, bunun gerçekleşmesi için başka bir oda üyesinin çevrimiçi olması gerekmektedir.",
+  "missing_room_e2ee_title": "Birkaç an içinde tekrar kontrol edin",
   "Mute": "Sessize Al",
   "Mute_someone_in_room": "Odadaki birini sustur",
   "muted": "sessize alındı",
diff --git a/app/i18n/locales/zh-CN.json b/app/i18n/locales/zh-CN.json
index d2a0d18f4e..def1f53deb 100644
--- a/app/i18n/locales/zh-CN.json
+++ b/app/i18n/locales/zh-CN.json
@@ -133,12 +133,13 @@
   "Enable_Auto_Translate": "开启自动翻译",
   "Encrypted": "已加密",
   "Encrypted_message": "加密信息",
+  "encrypted_room_description": "输入您的端到端加密密码以访问。",
+  "encrypted_room_title": "{{room_name}} 已加密",
   "Encryption_error_desc": "无法使用汇入的加密密钥来解密",
   "Encryption_error_title": "您的加密密码似乎有误",
   "End_to_end_encrypted_room": "E2E 加密聊天室",
-  "Enter_Your_E2E_Password": "输入您的 E2E 密码",
-  "Enter_Your_Encryption_Password_desc1": "这将会允许您存取您的加密私人群组和私訊",
-  "Enter_Your_Encryption_Password_desc2": "您需要在任何使用此聊天的平台输入密码，以编码/解码您的信息",
+  "Enter_E2EE_Password": "输入 E2EE 密码",
+  "Enter_E2EE_Password_description": "要访问您的加密频道和直接消息，请输入您的加密密码。这不会存储在服务器上，因此您需要在每个设备上使用它。",
   "Error_uploading": "错误上传",
   "error-action-not-allowed": "{{action}} 不允許",
   "error-avatar-invalid-url": "无效的头像网址：{{url}}",
@@ -245,6 +246,8 @@
   "Message_starred": "信息被标注",
   "Message_unstarred": "信息被取消标注",
   "messages": "信息",
+  "missing_room_e2ee_description": "房间的加密密钥需要更新，另一位房间成员需要在线才能进行此操作。",
+  "missing_room_e2ee_title": "过几分钟再回来检查",
   "Mute": "静音",
   "muted": "被静音",
   "N_people_reacted": "{{n}} 人回复",
diff --git a/app/i18n/locales/zh-TW.json b/app/i18n/locales/zh-TW.json
index c057c573c1..773f8bc3d4 100644
--- a/app/i18n/locales/zh-TW.json
+++ b/app/i18n/locales/zh-TW.json
@@ -139,12 +139,13 @@
   "Enable_Auto_Translate": "開啟自動翻譯",
   "Encrypted": "已加密",
   "Encrypted_message": "加密訊息",
+  "encrypted_room_description": "輸入您的端對端加密密碼以存取。",
+  "encrypted_room_title": "{{room_name}} 已加密",
   "Encryption_error_desc": "無法使用匯入的加密金鑰來解密",
   "Encryption_error_title": "您的加密密碼似乎有誤",
   "End_to_end_encrypted_room": "E2E 加密聊天室",
-  "Enter_Your_E2E_Password": "輸入您的 E2E 密碼",
-  "Enter_Your_Encryption_Password_desc1": "這將會允許您存取您的加密私人群組和私訊",
-  "Enter_Your_Encryption_Password_desc2": "您需要在任何使用此聊天的平台輸入密碼，以加/解密您的訊息",
+  "Enter_E2EE_Password": "輸入 E2EE 密碼",
+  "Enter_E2EE_Password_description": "要存取您的加密頻道和直接訊息，請輸入您的加密密碼。這不會儲存在伺服器上，因此您需要在每個裝置上使用它。",
   "Error_uploading": "錯誤上傳",
   "error-action-not-allowed": "{{action}} 不允許",
   "error-avatar-invalid-url": "無效的大頭貼網址：{{url}}",
@@ -261,6 +262,8 @@
   "Message_starred": "訊息被標註",
   "Message_unstarred": "訊息被取消標註",
   "messages": "訊息",
+  "missing_room_e2ee_description": "房間的加密密鑰需要更新，另一位房間成員需要在線才能進行此操作。",
+  "missing_room_e2ee_title": "過幾分鐘再回來檢查",
   "Mute": "靜音",
   "Mute_someone_in_room": "在房間中有人靜音",
   "muted": "被靜音",
diff --git a/app/lib/encryption/constants.ts b/app/lib/encryption/constants.ts
new file mode 100644
index 0000000000..15da8e6efa
--- /dev/null
+++ b/app/lib/encryption/constants.ts
@@ -0,0 +1 @@
+export const LEARN_MORE_E2EE_URL = 'https://go.rocket.chat/i/e2ee-guide';
diff --git a/app/lib/encryption/encryption.ts b/app/lib/encryption/encryption.ts
index 927c3b9d0a..7cdf4b9a0c 100644
--- a/app/lib/encryption/encryption.ts
+++ b/app/lib/encryption/encryption.ts
@@ -10,7 +10,7 @@ import Deferred from './helpers/deferred';
 import log from '../methods/helpers/log';
 import { store } from '../store/auxStore';
 import { joinVectorData, randomPassword, splitVectorData, toString, utf8ToBuffer } from './utils';
-import { EncryptionRoom } from './index';
+import EncryptionRoom from './room';
 import { IMessage, ISubscription, TMessageModel, TSubscriptionModel, TThreadMessageModel, TThreadModel } from '../../definitions';
 import {
 	E2E_BANNER_TYPE,
@@ -349,6 +349,9 @@ class Encryption {
 		}
 	};
 
+	// Creating the instance is enough to generate room e2ee key
+	encryptSubscription = (rid: string) => this.getRoomInstance(rid as string);
+
 	// Decrypt a subscription lastMessage
 	decryptSubscription = async (subscription: Partial<ISubscription>) => {
 		// If the subscription doesn't have a lastMessage just return
diff --git a/app/lib/encryption/helpers/toggleRoomE2EE.ts b/app/lib/encryption/helpers/toggleRoomE2EE.ts
new file mode 100644
index 0000000000..1f63704dde
--- /dev/null
+++ b/app/lib/encryption/helpers/toggleRoomE2EE.ts
@@ -0,0 +1,70 @@
+import { Alert } from 'react-native';
+
+import { Services } from '../../services';
+import database from '../../database';
+import { getSubscriptionByRoomId } from '../../database/services/Subscription';
+import log from '../../methods/helpers/log';
+import I18n from '../../../i18n';
+
+export const toggleRoomE2EE = async (rid: string): Promise<void> => {
+	const room = await getSubscriptionByRoomId(rid);
+	if (!room) {
+		return;
+	}
+
+	const isEncrypted = room.encrypted;
+	const title = I18n.t(isEncrypted ? 'Disable_encryption_title' : 'Enable_encryption_title');
+	const message = I18n.t(isEncrypted ? 'Disable_encryption_description' : 'Enable_encryption_description');
+	const confirmationText = I18n.t(isEncrypted ? 'Disable' : 'Enable');
+
+	Alert.alert(
+		title,
+		message,
+		[
+			{
+				text: I18n.t('Cancel'),
+				style: 'cancel'
+			},
+			{
+				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 });
+							// If it was saved successfully
+							if (result) {
+								return;
+							}
+						} catch {
+							// do nothing
+						}
+
+						// If something goes wrong we go back to the previous value
+						await db.write(async () => {
+							await room.update(r => {
+								r.encrypted = room.encrypted;
+							});
+						});
+					} catch (e) {
+						log(e);
+					}
+				}
+			}
+		],
+		{ cancelable: true }
+	);
+};
diff --git a/app/lib/encryption/index.ts b/app/lib/encryption/index.ts
index 9033aa251d..9f2e691450 100644
--- a/app/lib/encryption/index.ts
+++ b/app/lib/encryption/index.ts
@@ -1,4 +1,6 @@
 import Encryption from './encryption';
 import EncryptionRoom from './room';
 
+export * from './constants';
+
 export { Encryption, EncryptionRoom };
diff --git a/app/lib/encryption/room.ts b/app/lib/encryption/room.ts
index 090582a815..2088e70a20 100644
--- a/app/lib/encryption/room.ts
+++ b/app/lib/encryption/room.ts
@@ -177,10 +177,14 @@ export default class EncryptionRoom {
 
 	// Create an encrypted key for this room based on users
 	encryptRoomKey = async () => {
-		const result = await Services.e2eGetUsersOfRoomWithoutKey(this.roomId);
-		if (result.success) {
-			const { users } = result;
-			await Promise.all(users.map(user => this.encryptRoomKeyForUser(user)));
+		try {
+			const result = await Services.e2eGetUsersOfRoomWithoutKey(this.roomId);
+			if (result.success) {
+				const { users } = result;
+				await Promise.all(users.map(user => this.encryptRoomKeyForUser(user)));
+			}
+		} catch (e) {
+			log(e);
 		}
 	};
 
diff --git a/app/lib/encryption/utils.ts b/app/lib/encryption/utils.ts
index 27268bb822..3df3ce48a3 100644
--- a/app/lib/encryption/utils.ts
+++ b/app/lib/encryption/utils.ts
@@ -3,6 +3,7 @@ import SimpleCrypto from 'react-native-simple-crypto';
 
 import { random } from '../methods/helpers';
 import { fromByteArray, toByteArray } from './helpers/base64-js';
+import { TSubscriptionModel } from '../../definitions';
 
 const BASE64URI = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_';
 
@@ -58,3 +59,41 @@ export const toString = (thing: string | ByteBuffer | Buffer | ArrayBuffer | Uin
 	return new ByteBuffer.wrap(thing).toString('binary');
 };
 export const randomPassword = (): string => `${random(3)}-${random(3)}-${random(3)}`.toLowerCase();
+
+// Missing room encryption key
+export const isMissingRoomE2EEKey = ({
+	encryptionEnabled,
+	roomEncrypted,
+	E2EKey
+}: {
+	encryptionEnabled: boolean;
+	roomEncrypted: TSubscriptionModel['encrypted'];
+	E2EKey: TSubscriptionModel['E2EKey'];
+}): boolean => (encryptionEnabled && roomEncrypted && !E2EKey) ?? false;
+
+// Encrypted room, but user session is not encrypted
+export const isE2EEDisabledEncryptedRoom = ({
+	encryptionEnabled,
+	roomEncrypted
+}: {
+	encryptionEnabled: boolean;
+	roomEncrypted: TSubscriptionModel['encrypted'];
+}): boolean => (!encryptionEnabled && roomEncrypted) ?? false;
+
+export const hasE2EEWarning = ({
+	encryptionEnabled,
+	roomEncrypted,
+	E2EKey
+}: {
+	encryptionEnabled: boolean;
+	roomEncrypted: TSubscriptionModel['encrypted'];
+	E2EKey: TSubscriptionModel['E2EKey'];
+}): boolean => {
+	if (isMissingRoomE2EEKey({ encryptionEnabled, roomEncrypted, E2EKey })) {
+		return true;
+	}
+	if (isE2EEDisabledEncryptedRoom({ encryptionEnabled, roomEncrypted })) {
+		return true;
+	}
+	return false;
+};
diff --git a/app/lib/methods/search.ts b/app/lib/methods/search.ts
index 833949e5b6..d892eba161 100644
--- a/app/lib/methods/search.ts
+++ b/app/lib/methods/search.ts
@@ -6,6 +6,7 @@ import { store as reduxStore } from '../store/auxStore';
 import { spotlight } from '../services/restApi';
 import { ISearch, ISearchLocal, IUserMessage, SubscriptionType, TSubscriptionModel } from '../../definitions';
 import { isGroupChat, isReadOnly } from './helpers';
+import { isE2EEDisabledEncryptedRoom, isMissingRoomE2EEKey } from '../encryption/utils';
 
 export type TSearch = ISearchLocal | IUserMessage | ISearch;
 
@@ -46,10 +47,21 @@ export const localSearchSubscription = async ({
 
 	if (filterMessagingAllowed) {
 		const username = reduxStore.getState().login.user.username as string;
+		const encryptionEnabled = reduxStore.getState().encryption.enabled as boolean;
 		const filteredSubscriptions = await Promise.all(
 			subscriptions.map(async item => {
-				const isItemReadOnly = await isReadOnly(item, username);
-				return isItemReadOnly ? null : item;
+				if (await isReadOnly(item, username)) {
+					return null;
+				}
+
+				if (isMissingRoomE2EEKey({ encryptionEnabled, roomEncrypted: item.encrypted, E2EKey: item.E2EKey })) {
+					return null;
+				}
+				if (isE2EEDisabledEncryptedRoom({ encryptionEnabled, roomEncrypted: item.encrypted })) {
+					return null;
+				}
+
+				return item;
 			})
 		);
 		subscriptions = filteredSubscriptions.filter(item => item !== null) as TSubscriptionModel[];
diff --git a/app/reducers/encryption.test.ts b/app/reducers/encryption.test.ts
index 96abe2a7a4..478743faa8 100644
--- a/app/reducers/encryption.test.ts
+++ b/app/reducers/encryption.test.ts
@@ -1,4 +1,10 @@
-import { encryptionSet, encryptionInit, encryptionSetBanner } from '../actions/encryption';
+import {
+	encryptionSet,
+	encryptionInit,
+	encryptionSetBanner,
+	encryptionDecodeKey,
+	encryptionDecodeKeyFailure
+} from '../actions/encryption';
 import { mockedStore } from './mockedStore';
 import { initialState } from './encryption';
 
@@ -11,18 +17,29 @@ describe('test encryption reducer', () => {
 	it('should return modified store after encryptionSet', () => {
 		mockedStore.dispatch(encryptionSet(true, 'BANNER'));
 		const state = mockedStore.getState().encryption;
-		expect(state).toEqual({ banner: 'BANNER', enabled: true });
+		expect(state).toEqual({ banner: 'BANNER', enabled: true, failure: false });
 	});
 
 	it('should return empty store after encryptionInit', () => {
 		mockedStore.dispatch(encryptionInit());
 		const state = mockedStore.getState().encryption;
-		expect(state).toEqual({ banner: '', enabled: false });
+		expect(state).toEqual({ banner: '', enabled: false, failure: false });
 	});
 
 	it('should return initial state after encryptionSetBanner', () => {
 		mockedStore.dispatch(encryptionSetBanner('BANNER_NEW'));
 		const state = mockedStore.getState().encryption;
-		expect(state).toEqual({ banner: 'BANNER_NEW', enabled: false });
+		expect(state).toEqual({ banner: 'BANNER_NEW', enabled: false, failure: false });
+	});
+
+	it('should return decode key state changes', () => {
+		mockedStore.dispatch(encryptionInit());
+		mockedStore.dispatch(encryptionDecodeKey('asd'));
+		const state = mockedStore.getState().encryption;
+		expect(state).toEqual({ ...initialState, failure: false });
+
+		mockedStore.dispatch(encryptionDecodeKeyFailure());
+		const stateF = mockedStore.getState().encryption;
+		expect(stateF).toEqual({ ...initialState, failure: true });
 	});
 });
diff --git a/app/reducers/encryption.ts b/app/reducers/encryption.ts
index 061dc7c946..acba6def3b 100644
--- a/app/reducers/encryption.ts
+++ b/app/reducers/encryption.ts
@@ -5,11 +5,13 @@ export type IBanner = string;
 export interface IEncryption {
 	enabled: boolean;
 	banner: IBanner;
+	failure: boolean;
 }
 
 export const initialState: IEncryption = {
 	enabled: false,
-	banner: ''
+	banner: '',
+	failure: false
 };
 
 export default function encryption(state = initialState, action: TApplicationActions): IEncryption {
@@ -25,6 +27,17 @@ export default function encryption(state = initialState, action: TApplicationAct
 				...state,
 				banner: action.banner
 			};
+		case ENCRYPTION.DECODE_KEY:
+			return {
+				...state,
+				failure: false
+			};
+		case ENCRYPTION.DECODE_KEY_FAILURE:
+			return {
+				...state,
+				enabled: false,
+				failure: true
+			};
 		case ENCRYPTION.INIT:
 			return initialState;
 		default:
diff --git a/app/sagas/createChannel.js b/app/sagas/createChannel.js
index ed81d82ac5..fe81c717d2 100644
--- a/app/sagas/createChannel.js
+++ b/app/sagas/createChannel.js
@@ -9,6 +9,7 @@ import I18n from '../i18n';
 import { events, logEvent } from '../lib/methods/helpers/log';
 import { goRoom } from '../lib/methods/helpers/goRoom';
 import { Services } from '../lib/services';
+import { Encryption } from '../lib/encryption';
 
 const handleRequest = function* handleRequest({ data }) {
 	try {
@@ -65,6 +66,10 @@ const handleRequest = function* handleRequest({ data }) {
 					Object.assign(s, sub);
 				});
 			});
+
+			if (data.encrypted) {
+				Encryption.encryptSubscription(sub.rid);
+			}
 		} catch {
 			// do nothing
 		}
diff --git a/app/sagas/encryption.js b/app/sagas/encryption.js
index 9f1482f162..0b8e3e0e7c 100644
--- a/app/sagas/encryption.js
+++ b/app/sagas/encryption.js
@@ -2,14 +2,11 @@ import EJSON from 'ejson';
 import { put, select, takeLatest } from 'redux-saga/effects';
 
 import { ENCRYPTION } from '../actions/actionsTypes';
-import { encryptionSet } from '../actions/encryption';
+import { encryptionDecodeKeyFailure, encryptionSet } from '../actions/encryption';
 import { Encryption } from '../lib/encryption';
-import Navigation from '../lib/navigation/appNavigation';
 import database from '../lib/database';
 import UserPreferences from '../lib/methods/userPreferences';
 import { getUserSelector } from '../selectors/login';
-import { showErrorAlert } from '../lib/methods/helpers/info';
-import I18n from '../i18n';
 import log from '../lib/methods/helpers/log';
 import { E2E_BANNER_TYPE, E2E_PRIVATE_KEY, E2E_PUBLIC_KEY, E2E_RANDOM_PASSWORD_KEY } from '../lib/constants';
 import { Services } from '../lib/services';
@@ -111,11 +108,9 @@ const handleEncryptionDecodeKey = function* handleEncryptionDecodeKey({ password
 
 		// Hide encryption banner
 		yield put(encryptionSet(true));
-
-		Navigation.back();
 	} catch {
 		// Can't decrypt user private key
-		showErrorAlert(I18n.t('Encryption_error_desc'), I18n.t('Encryption_error_title'));
+		yield put(encryptionDecodeKeyFailure());
 	}
 };
 
diff --git a/app/views/AutoTranslateView/index.tsx b/app/views/AutoTranslateView/index.tsx
index 4525d80ab3..cf93776c63 100644
--- a/app/views/AutoTranslateView/index.tsx
+++ b/app/views/AutoTranslateView/index.tsx
@@ -122,11 +122,7 @@ const AutoTranslateView = (): React.ReactElement => {
 						<List.Item
 							title='Enable_Auto_Translate'
 							right={() => (
-								<Switch
-									testID='auto-translate-view-switch'
-									value={enableAutoTranslate}
-									onValueChange={toggleAutoTranslate}
-								/>
+								<Switch testID='auto-translate-view-switch' value={enableAutoTranslate} onValueChange={toggleAutoTranslate} />
 							)}
 						/>
 						<List.Separator />
diff --git a/app/views/ChangePasscodeView.tsx b/app/views/ChangePasscodeView.tsx
index 0cb63db5c3..bbaa22fff2 100644
--- a/app/views/ChangePasscodeView.tsx
+++ b/app/views/ChangePasscodeView.tsx
@@ -32,7 +32,6 @@ const ChangePasscodeView = React.memo(() => {
 	const [visible, setVisible] = useState(false);
 	const [data, setData] = useState<Partial<IArgs>>({});
 
-
 	useDeepCompareEffect(() => {
 		if (!isEmpty(data)) {
 			setVisible(true);
diff --git a/app/views/CreateChannelView/RoomSettings/SwitchItem.tsx b/app/views/CreateChannelView/RoomSettings/SwitchItem.tsx
index 567cf5dd68..82fadd5e6d 100644
--- a/app/views/CreateChannelView/RoomSettings/SwitchItem.tsx
+++ b/app/views/CreateChannelView/RoomSettings/SwitchItem.tsx
@@ -47,12 +47,7 @@ export const SwitchItem = ({ id, value, label, hint, onValueChange, disabled = f
 					{I18n.t(hint)}
 				</Text>
 			</View>
-			<Switch
-				value={value}
-				onValueChange={onValueChange}
-				testID={`create-channel-${id}`}
-				disabled={disabled}
-			/>
+			<Switch value={value} onValueChange={onValueChange} testID={`create-channel-${id}`} disabled={disabled} />
 		</View>
 	);
 };
diff --git a/app/views/E2EEnterYourPasswordView.tsx b/app/views/E2EEnterYourPasswordView.tsx
index 2c2d242f98..34050ceb6e 100644
--- a/app/views/E2EEnterYourPasswordView.tsx
+++ b/app/views/E2EEnterYourPasswordView.tsx
@@ -1,4 +1,4 @@
-import { useNavigation } from '@react-navigation/native';
+import { useIsFocused, useNavigation } from '@react-navigation/native';
 import React, { useLayoutEffect, useState } from 'react';
 import { ScrollView, StyleSheet, Text } from 'react-native';
 import { useDispatch } from 'react-redux';
@@ -11,14 +11,18 @@ import SafeAreaView from '../containers/SafeAreaView';
 import StatusBar from '../containers/StatusBar';
 import { FormTextInput } from '../containers/TextInput';
 import I18n from '../i18n';
+import { useAppSelector, usePrevious } from '../lib/hooks';
 import { events, logEvent } from '../lib/methods/helpers/log';
 import scrollPersistTaps from '../lib/methods/helpers/scrollPersistTaps';
 import { useTheme } from '../theme';
 import sharedStyles from './Styles';
+import { showToast } from '../lib/methods/helpers/showToast';
+import { showErrorAlert, useDebounce } from '../lib/methods/helpers';
 
 const styles = StyleSheet.create({
 	info: {
 		fontSize: 16,
+		lineHeight: 24,
 		marginVertical: 4,
 		...sharedStyles.textRegular
 	}
@@ -28,12 +32,42 @@ const E2EEnterYourPasswordView = (): React.ReactElement => {
 	const [password, setPassword] = useState('');
 	const { colors } = useTheme();
 	const navigation = useNavigation();
+	const isFocused = useIsFocused();
 	const dispatch = useDispatch();
+	const { enabled: encryptionEnabled, failure: encryptionFailure } = useAppSelector(state => state.encryption);
+	const prevEncryptionFailure = usePrevious(encryptionFailure);
+
+	/**
+	 * If e2ee is enabled, close screen and display success toast.
+	 * Note: Debounce prevents `isFocused` from running another re-render and triggering another toast
+	 */
+	const displayEncryptionEnabled = useDebounce(
+		() => {
+			navigation.goBack();
+			showToast(I18n.t('e2ee_enabled'));
+		},
+		1000,
+		{ leading: true }
+	);
+
+	if (encryptionEnabled) {
+		displayEncryptionEnabled();
+	}
+
+	// Wrong password
+	if (encryptionFailure !== prevEncryptionFailure && encryptionFailure && password) {
+		showErrorAlert(I18n.t('Encryption_error_desc'), I18n.t('Encryption_error_title'));
+	}
+
+	// If screen is closed and e2ee is still disabled, warns the user via toast
+	if (!isFocused && !encryptionEnabled) {
+		showToast(I18n.t('e2ee_disabled'));
+	}
 
 	useLayoutEffect(() => {
 		navigation.setOptions({
 			headerLeft: () => <HeaderButton.CloseModal testID='e2e-enter-your-password-view-close' />,
-			title: I18n.t('Enter_Your_E2E_Password')
+			title: I18n.t('Enter_E2EE_Password')
 		});
 	}, [navigation]);
 
@@ -60,8 +94,7 @@ const E2EEnterYourPasswordView = (): React.ReactElement => {
 						textContentType='password'
 					/>
 					<Button onPress={submit} title={I18n.t('Confirm')} disabled={!password} testID='e2e-enter-your-password-view-confirm' />
-					<Text style={[styles.info, { color: colors.fontDefault }]}>{I18n.t('Enter_Your_Encryption_Password_desc1')}</Text>
-					<Text style={[styles.info, { color: colors.fontDefault }]}>{I18n.t('Enter_Your_Encryption_Password_desc2')}</Text>
+					<Text style={[styles.info, { color: colors.fontDefault }]}>{I18n.t('Enter_E2EE_Password_description')}</Text>
 				</SafeAreaView>
 			</ScrollView>
 		</KeyboardView>
diff --git a/app/views/JitsiMeetView/JitsiAuthModal.tsx b/app/views/JitsiMeetView/JitsiAuthModal.tsx
index 91d860b3cd..b379e97343 100644
--- a/app/views/JitsiMeetView/JitsiAuthModal.tsx
+++ b/app/views/JitsiMeetView/JitsiAuthModal.tsx
@@ -55,7 +55,9 @@ const JitsiAuthModal = ({
 						{i18n.t('Jitsi_authentication_before_making_calls_admin')}
 					</Text>
 				) : (
-					<Text style={[styles.regular, { color: colors.fontTitlesLabels }]}>{i18n.t('Jitsi_authentication_before_making_calls')}</Text>
+					<Text style={[styles.regular, { color: colors.fontTitlesLabels }]}>
+						{i18n.t('Jitsi_authentication_before_making_calls')}
+					</Text>
 				)}
 				{!isAdmin ? (
 					<Text style={[styles.min, { color: colors.fontSecondaryInfo }]}>
diff --git a/app/views/RegisterView.tsx b/app/views/RegisterView.tsx
index 046334c31f..d42d2acf0a 100644
--- a/app/views/RegisterView.tsx
+++ b/app/views/RegisterView.tsx
@@ -230,7 +230,9 @@ class RegisterView extends React.Component<IProps, any> {
 			<FormContainer testID='register-view'>
 				<FormContainerInner>
 					<LoginServices separator />
-					<Text style={[styles.title, sharedStyles.textBold, { color: themes[theme].fontTitlesLabels }]}>{I18n.t('Sign_Up')}</Text>
+					<Text style={[styles.title, sharedStyles.textBold, { color: themes[theme].fontTitlesLabels }]}>
+						{I18n.t('Sign_Up')}
+					</Text>
 					<FormTextInput
 						label={I18n.t('Name')}
 						containerStyle={styles.inputContainer}
diff --git a/app/views/RoomActionsView/components/CallSection.tsx b/app/views/RoomActionsView/components/CallSection.tsx
index be75067a5a..3f7d8408ed 100644
--- a/app/views/RoomActionsView/components/CallSection.tsx
+++ b/app/views/RoomActionsView/components/CallSection.tsx
@@ -3,7 +3,7 @@ import React from 'react';
 import * as List from '../../../containers/List';
 import { useVideoConf } from '../../../lib/hooks/useVideoConf';
 
-export default function CallSection({ rid }: { rid: string }): React.ReactElement | null {
+export default function CallSection({ rid, disabled }: { rid: string; disabled: boolean }): React.ReactElement | null {
 	const { callEnabled, showInitCallActionSheet, disabledTooltip } = useVideoConf(rid);
 	if (callEnabled)
 		return (
@@ -15,7 +15,7 @@ export default function CallSection({ rid }: { rid: string }): React.ReactElemen
 					testID='room-actions-call'
 					left={() => <List.Icon name='phone' />}
 					showActionIndicator
-					disabled={disabledTooltip}
+					disabled={disabledTooltip || disabled}
 				/>
 				<List.Separator />
 			</List.Section>
diff --git a/app/views/RoomActionsView/index.tsx b/app/views/RoomActionsView/index.tsx
index 278aa82300..6b91809d76 100644
--- a/app/views/RoomActionsView/index.tsx
+++ b/app/views/RoomActionsView/index.tsx
@@ -54,6 +54,8 @@ 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;
 
@@ -100,6 +102,7 @@ interface IRoomActionsViewState {
 	canCreateTeam: boolean;
 	canAddChannelToTeam: boolean;
 	canConvertTeam: boolean;
+	hasE2EEWarning: boolean;
 	loading: boolean;
 }
 
@@ -151,13 +154,20 @@ class RoomActionsView extends React.Component<IRoomActionsViewProps, IRoomAction
 			canCreateTeam: false,
 			canAddChannelToTeam: false,
 			canConvertTeam: false,
+			hasE2EEWarning: false,
 			loading: false
 		};
 		if (room && room.observe && room.rid) {
+			const { encryptionEnabled } = this.props;
 			this.roomObservable = room.observe();
 			this.subscription = this.roomObservable.subscribe(changes => {
 				if (this.mounted) {
-					this.setState({ room: changes, membersCount: changes.usersCount });
+					const hasE2EEWarning = EncryptionUtils.hasE2EEWarning({
+						encryptionEnabled,
+						E2EKey: room.E2EKey,
+						roomEncrypted: room.encrypted
+					});
+					this.setState({ room: changes, membersCount: changes.usersCount, hasE2EEWarning });
 				} else {
 					// @ts-ignore
 					this.state.room = changes;
@@ -171,6 +181,7 @@ class RoomActionsView extends React.Component<IRoomActionsViewProps, IRoomAction
 	async componentDidMount() {
 		this.mounted = true;
 		const { room, member } = this.state;
+		const { encryptionEnabled } = this.props;
 		if (room.rid) {
 			if (!room.id) {
 				if (room.t === SubscriptionType.OMNICHANNEL) {
@@ -214,6 +225,11 @@ class RoomActionsView extends React.Component<IRoomActionsViewProps, IRoomAction
 			const canCreateTeam = await this.canCreateTeam();
 			const canAddChannelToTeam = await this.canAddChannelToTeam();
 			const canConvertTeam = await this.canConvertTeam();
+			const hasE2EEWarning = EncryptionUtils.hasE2EEWarning({
+				encryptionEnabled,
+				E2EKey: room.E2EKey,
+				roomEncrypted: room.encrypted
+			});
 
 			this.setState({
 				canAutoTranslate,
@@ -222,7 +238,8 @@ class RoomActionsView extends React.Component<IRoomActionsViewProps, IRoomAction
 				canViewMembers,
 				canCreateTeam,
 				canAddChannelToTeam,
-				canConvertTeam
+				canConvertTeam,
+				hasE2EEWarning
 			});
 		}
 	}
@@ -346,7 +363,7 @@ class RoomActionsView extends React.Component<IRoomActionsViewProps, IRoomAction
 
 	renderEncryptedSwitch = () => {
 		const { room, canToggleEncryption, canEdit } = this.state;
-		const { encrypted } = room;
+		const { rid, encrypted } = room;
 		const { serverVersion } = this.props;
 		let hasPermission = false;
 		if (compareServerVersion(serverVersion, 'lowerThan', '3.11.0')) {
@@ -354,9 +371,7 @@ class RoomActionsView extends React.Component<IRoomActionsViewProps, IRoomAction
 		} else {
 			hasPermission = canToggleEncryption;
 		}
-		return (
-			<Switch value={encrypted} onValueChange={this.toggleEncrypted} disabled={!hasPermission} />
-		);
+		return <Switch value={encrypted} onValueChange={() => toggleRoomE2EE(rid)} disabled={!hasPermission} />;
 	};
 
 	closeLivechat = async () => {
@@ -480,49 +495,6 @@ class RoomActionsView extends React.Component<IRoomActionsViewProps, IRoomAction
 		});
 	};
 
-	toggleEncrypted = async () => {
-		logEvent(events.RA_TOGGLE_ENCRYPTED);
-		const { room } = this.state;
-		const { rid } = room;
-		const db = database.active;
-
-		// Toggle encrypted value
-		const encrypted = !room.encrypted;
-		try {
-			// Instantly feedback to the user
-			await db.write(async () => {
-				await room.update(
-					protectedFunction((r: TSubscriptionModel) => {
-						r.encrypted = encrypted;
-					})
-				);
-			});
-
-			try {
-				// Send new room setting value to server
-				const { result } = await Services.saveRoomSettings(rid, { encrypted });
-				// If it was saved successfully
-				if (result) {
-					return;
-				}
-			} catch {
-				// do nothing
-			}
-
-			// If something goes wrong we go back to the previous value
-			await db.write(async () => {
-				await room.update(
-					protectedFunction((r: TSubscriptionModel) => {
-						r.encrypted = room.encrypted;
-					})
-				);
-			});
-		} catch (e) {
-			logEvent(events.RA_TOGGLE_ENCRYPTED_F);
-			log(e);
-		}
-	};
-
 	handleShare = () => {
 		logEvent(events.RA_SHARE);
 		const { room } = this.state;
@@ -940,7 +912,7 @@ class RoomActionsView extends React.Component<IRoomActionsViewProps, IRoomAction
 	};
 
 	teamChannelActions = (t: string, room: ISubscription) => {
-		const { canEdit, canCreateTeam, canAddChannelToTeam } = this.state;
+		const { canEdit, canCreateTeam, canAddChannelToTeam, hasE2EEWarning } = this.state;
 		const canConvertToTeam = canEdit && canCreateTeam && !room.teamMain;
 		const canMoveToTeam = canEdit && canAddChannelToTeam && !room.teamId;
 
@@ -958,6 +930,7 @@ class RoomActionsView extends React.Component<IRoomActionsViewProps, IRoomAction
 							testID='room-actions-convert-to-team'
 							left={() => <List.Icon name='teams' />}
 							showActionIndicator
+							disabled={hasE2EEWarning}
 						/>
 						<List.Separator />
 					</>
@@ -975,6 +948,7 @@ class RoomActionsView extends React.Component<IRoomActionsViewProps, IRoomAction
 							testID='room-actions-move-to-team'
 							left={() => <List.Icon name='channel-move-to-team' />}
 							showActionIndicator
+							disabled={hasE2EEWarning}
 						/>
 						<List.Separator />
 					</>
@@ -984,7 +958,7 @@ class RoomActionsView extends React.Component<IRoomActionsViewProps, IRoomAction
 	};
 
 	teamToChannelActions = (t: string, room: ISubscription) => {
-		const { canEdit, canConvertTeam, loading } = this.state;
+		const { canEdit, canConvertTeam, loading, hasE2EEWarning } = this.state;
 		const canConvertTeamToChannel = canEdit && canConvertTeam && !!room?.teamMain;
 
 		return (
@@ -993,7 +967,7 @@ class RoomActionsView extends React.Component<IRoomActionsViewProps, IRoomAction
 					<>
 						<List.Item
 							title='Convert_to_Channel'
-							disabled={loading}
+							disabled={loading || hasE2EEWarning}
 							onPress={() =>
 								this.onPressTouchable({
 									event: this.convertTeamToChannel
@@ -1088,7 +1062,7 @@ class RoomActionsView extends React.Component<IRoomActionsViewProps, IRoomAction
 	};
 
 	render() {
-		const { room, membersCount, canViewMembers, joined, canAutoTranslate } = this.state;
+		const { room, membersCount, canViewMembers, joined, canAutoTranslate, hasE2EEWarning } = this.state;
 		const { isMasterDetail, navigation } = this.props;
 		const { rid, t, prid, teamId } = room;
 		const isGroupChatHandler = isGroupChat(room);
@@ -1098,7 +1072,7 @@ class RoomActionsView extends React.Component<IRoomActionsViewProps, IRoomAction
 				<StatusBar />
 				<List.Container testID='room-actions-scrollview'>
 					{this.renderRoomInfo()}
-					<CallSection rid={rid} />
+					<CallSection rid={rid} disabled={hasE2EEWarning} />
 					{this.renderE2EEncryption()}
 					<List.Section>
 						<List.Separator />
@@ -1134,6 +1108,7 @@ class RoomActionsView extends React.Component<IRoomActionsViewProps, IRoomAction
 									testID='room-actions-discussions'
 									left={() => <List.Icon name='discussions' />}
 									showActionIndicator
+									disabled={hasE2EEWarning}
 								/>
 								<List.Separator />
 							</>
@@ -1160,6 +1135,7 @@ class RoomActionsView extends React.Component<IRoomActionsViewProps, IRoomAction
 									testID='room-actions-teams'
 									left={() => <List.Icon name='channel-public' />}
 									showActionIndicator
+									disabled={hasE2EEWarning}
 								/>
 								<List.Separator />
 							</>
@@ -1189,6 +1165,7 @@ class RoomActionsView extends React.Component<IRoomActionsViewProps, IRoomAction
 									testID='room-actions-files'
 									left={() => <List.Icon name='attach' />}
 									showActionIndicator
+									disabled={hasE2EEWarning}
 								/>
 								<List.Separator />
 							</>
@@ -1207,6 +1184,7 @@ class RoomActionsView extends React.Component<IRoomActionsViewProps, IRoomAction
 									testID='room-actions-mentioned'
 									left={() => <List.Icon name='mention' />}
 									showActionIndicator
+									disabled={hasE2EEWarning}
 								/>
 								<List.Separator />
 							</>
@@ -1225,6 +1203,7 @@ class RoomActionsView extends React.Component<IRoomActionsViewProps, IRoomAction
 									testID='room-actions-starred'
 									left={() => <List.Icon name='star' />}
 									showActionIndicator
+									disabled={hasE2EEWarning}
 								/>
 								<List.Separator />
 							</>
@@ -1242,6 +1221,7 @@ class RoomActionsView extends React.Component<IRoomActionsViewProps, IRoomAction
 									testID='room-actions-share'
 									left={() => <List.Icon name='share' />}
 									showActionIndicator
+									disabled={hasE2EEWarning}
 								/>
 								<List.Separator />
 							</>
@@ -1260,6 +1240,7 @@ class RoomActionsView extends React.Component<IRoomActionsViewProps, IRoomAction
 									testID='room-actions-pinned'
 									left={() => <List.Icon name='pin' />}
 									showActionIndicator
+									disabled={hasE2EEWarning}
 								/>
 								<List.Separator />
 							</>
@@ -1278,6 +1259,7 @@ class RoomActionsView extends React.Component<IRoomActionsViewProps, IRoomAction
 									testID='room-actions-auto-translate'
 									left={() => <List.Icon name='language' />}
 									showActionIndicator
+									disabled={hasE2EEWarning}
 								/>
 								<List.Separator />
 							</>
@@ -1296,6 +1278,7 @@ class RoomActionsView extends React.Component<IRoomActionsViewProps, IRoomAction
 									testID='room-actions-notifications'
 									left={() => <List.Icon name='notification' />}
 									showActionIndicator
+									disabled={hasE2EEWarning}
 								/>
 								<List.Separator />
 							</>
diff --git a/app/views/RoomInfoView/components/RoomInfoButtons.tsx b/app/views/RoomInfoView/components/RoomInfoButtons.tsx
index 2f5009ceff..657c29c69f 100644
--- a/app/views/RoomInfoView/components/RoomInfoButtons.tsx
+++ b/app/views/RoomInfoView/components/RoomInfoButtons.tsx
@@ -9,6 +9,7 @@ import { useVideoConf } from '../../../lib/hooks/useVideoConf';
 import { useTheme } from '../../../theme';
 import styles from '../styles';
 import { compareServerVersion } from '../../../lib/methods/helpers';
+import { useE2EEWarning } from '../hooks';
 
 function BaseButton({
 	danger,
@@ -89,6 +90,7 @@ export const RoomInfoButtons = ({
 	const isDirectFromSaved = isDirect && fromRid && room;
 	const isIgnored = room?.ignored?.includes?.(roomUserId || '');
 	const isBlocked = room?.blocker;
+	const hasE2EEWarning = useE2EEWarning(room);
 
 	const renderIgnoreUser = isDirectFromSaved && !isFromDm && !isDmWithMyself;
 	const renderBlockUser = !itsMe && isDirectFromSaved && isFromDm && !isDmWithMyself;
@@ -98,7 +100,7 @@ export const RoomInfoButtons = ({
 	return (
 		<View style={styles.roomButtonsContainer}>
 			<BaseButton onPress={handleCreateDirectMessage} label={i18n.t('Message')} iconName='message' />
-			<CallButton isDirect={isDirect} rid={rid} roomFromRid={!!roomFromRid} />
+			{hasE2EEWarning ? null : <CallButton isDirect={isDirect} rid={rid} roomFromRid={!!roomFromRid} />}
 			<BaseButton
 				onPress={handleIgnoreUser}
 				label={i18n.t(isIgnored ? 'Unignore' : 'Ignore')}
diff --git a/app/views/RoomInfoView/hooks.ts b/app/views/RoomInfoView/hooks.ts
new file mode 100644
index 0000000000..3ec3665032
--- /dev/null
+++ b/app/views/RoomInfoView/hooks.ts
@@ -0,0 +1,15 @@
+import { ISubscription } from '../../definitions';
+import { hasE2EEWarning } from '../../lib/encryption/utils';
+import { useAppSelector } from '../../lib/hooks';
+
+export const useE2EEWarning = (room?: ISubscription): boolean => {
+	const encryptionEnabled = useAppSelector(state => state.encryption.enabled);
+	if (!room) {
+		return false;
+	}
+	return hasE2EEWarning({
+		encryptionEnabled,
+		E2EKey: room.E2EKey,
+		roomEncrypted: room.encrypted
+	});
+};
diff --git a/app/views/RoomMembersView/index.tsx b/app/views/RoomMembersView/index.tsx
index 8142f0cf9a..17429bc49f 100644
--- a/app/views/RoomMembersView/index.tsx
+++ b/app/views/RoomMembersView/index.tsx
@@ -401,7 +401,9 @@ const RoomMembersView = (): React.ReactElement => {
 				onEndReachedThreshold={0.1}
 				onEndReached={() => fetchMembers(state.allUsers)}
 				ListEmptyComponent={() =>
-					state.end ? <Text style={[styles.noResult, { color: colors.fontTitlesLabels }]}>{I18n.t('No_members_found')}</Text> : null
+					state.end ? (
+						<Text style={[styles.noResult, { color: colors.fontTitlesLabels }]}>{I18n.t('No_members_found')}</Text>
+					) : null
 				}
 				{...scrollPersistTaps}
 			/>
diff --git a/app/views/RoomView/RightButtons.tsx b/app/views/RoomView/RightButtons.tsx
index 0c6c343350..3f10ecce42 100644
--- a/app/views/RoomView/RightButtons.tsx
+++ b/app/views/RoomView/RightButtons.tsx
@@ -12,7 +12,7 @@ import { ILivechatDepartment } from '../../definitions/ILivechatDepartment';
 import { ILivechatTag } from '../../definitions/ILivechatTag';
 import i18n from '../../i18n';
 import database from '../../lib/database';
-import { showConfirmationAlert, showErrorAlert } from '../../lib/methods/helpers';
+import { hasPermission, showConfirmationAlert, showErrorAlert } from '../../lib/methods/helpers';
 import { closeLivechat as closeLivechatService } from '../../lib/methods/helpers/closeLivechat';
 import { events, logEvent } from '../../lib/methods/helpers/log';
 import { Services } from '../../lib/services';
@@ -20,8 +20,9 @@ import { onHoldLivechat, returnLivechat } from '../../lib/services/restApi';
 import { getUserSelector } from '../../selectors/login';
 import { TNavigation } from '../../stacks/stackType';
 import { ChatsStackParamList } from '../../stacks/types';
-import HeaderCallButton from './components/HeaderCallButton';
+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;
@@ -48,6 +49,8 @@ interface IRightButtonsProps extends Pick<ISubscription, 't'> {
 	colors?: TColors;
 	issuesWithNotifications: boolean;
 	notificationsDisabled?: boolean;
+	hasE2EEWarning: boolean;
+	toggleRoomE2EEncryptionPermission?: string[];
 }
 
 interface IRigthButtonsState {
@@ -55,6 +58,7 @@ interface IRigthButtonsState {
 	tunread: string[];
 	tunreadUser: string[];
 	tunreadGroup: string[];
+	canToggleEncryption: boolean;
 }
 
 class RightButtonsContainer extends Component<IRightButtonsProps, IRigthButtonsState> {
@@ -68,7 +72,8 @@ class RightButtonsContainer extends Component<IRightButtonsProps, IRigthButtonsS
 			isFollowingThread: true,
 			tunread: [],
 			tunreadUser: [],
-			tunreadGroup: []
+			tunreadGroup: [],
+			canToggleEncryption: false
 		};
 	}
 
@@ -92,11 +97,22 @@ class RightButtonsContainer extends Component<IRightButtonsProps, IRigthButtonsS
 				console.log("Can't find subscription to observe.");
 			}
 		}
+		this.setCanToggleEncryption();
 	}
 
 	shouldComponentUpdate(nextProps: IRightButtonsProps, nextState: IRigthButtonsState) {
-		const { isFollowingThread, tunread, tunreadUser, tunreadGroup } = this.state;
-		const { teamId, status, joined, omnichannelPermissions, theme, issuesWithNotifications, notificationsDisabled } = this.props;
+		const { isFollowingThread, tunread, tunreadUser, tunreadGroup, canToggleEncryption } = this.state;
+		const {
+			teamId,
+			status,
+			joined,
+			omnichannelPermissions,
+			theme,
+			hasE2EEWarning,
+			issuesWithNotifications,
+			notificationsDisabled,
+			toggleRoomE2EEncryptionPermission
+		} = this.props;
 		if (nextProps.teamId !== teamId) {
 			return true;
 		}
@@ -109,6 +125,9 @@ class RightButtonsContainer extends Component<IRightButtonsProps, IRigthButtonsS
 		if (nextProps.theme !== theme) {
 			return true;
 		}
+		if (nextState.canToggleEncryption !== canToggleEncryption) {
+			return true;
+		}
 		if (nextState.isFollowingThread !== isFollowingThread) {
 			return true;
 		}
@@ -118,6 +137,9 @@ class RightButtonsContainer extends Component<IRightButtonsProps, IRigthButtonsS
 		if (nextProps.notificationsDisabled !== notificationsDisabled) {
 			return true;
 		}
+		if (nextProps.hasE2EEWarning !== hasE2EEWarning) {
+			return true;
+		}
 		if (!dequal(nextProps.omnichannelPermissions, omnichannelPermissions)) {
 			return true;
 		}
@@ -130,9 +152,19 @@ class RightButtonsContainer extends Component<IRightButtonsProps, IRigthButtonsS
 		if (!dequal(nextState.tunreadGroup, tunreadGroup)) {
 			return true;
 		}
+		if (!dequal(nextProps.toggleRoomE2EEncryptionPermission, toggleRoomE2EEncryptionPermission)) {
+			return true;
+		}
 		return false;
 	}
 
+	componentDidUpdate(prevProps: Readonly<IRightButtonsProps>): void {
+		const { toggleRoomE2EEncryptionPermission } = this.props;
+		if (prevProps.toggleRoomE2EEncryptionPermission !== toggleRoomE2EEncryptionPermission) {
+			this.setCanToggleEncryption();
+		}
+	}
+
 	componentWillUnmount() {
 		if (this.threadSubscription && this.threadSubscription.unsubscribe) {
 			this.threadSubscription.unsubscribe();
@@ -303,6 +335,15 @@ class RightButtonsContainer extends Component<IRightButtonsProps, IRigthButtonsS
 		showActionSheet({ options });
 	};
 
+	setCanToggleEncryption = async () => {
+		const { rid } = this.props;
+		const { toggleRoomE2EEncryptionPermission } = this.props;
+		const permissions = await hasPermission([toggleRoomE2EEncryptionPermission], rid);
+
+		const canToggleEncryption = permissions[0];
+		this.setState({ canToggleEncryption });
+	};
+
 	navigateToNotificationOrPushTroubleshoot = () => {
 		const { room } = this;
 		const { rid, navigation, isMasterDetail, issuesWithNotifications } = this.props;
@@ -360,8 +401,12 @@ class RightButtonsContainer extends Component<IRightButtonsProps, IRigthButtonsS
 	};
 
 	render() {
-		const { isFollowingThread, tunread, tunreadUser, tunreadGroup } = this.state;
-		const { t, tmid, threadsEnabled, rid, colors, issuesWithNotifications, notificationsDisabled } = this.props;
+		const { isFollowingThread, tunread, tunreadUser, tunreadGroup, canToggleEncryption } = this.state;
+		const { t, tmid, threadsEnabled, rid, colors, issuesWithNotifications, notificationsDisabled, hasE2EEWarning } = this.props;
+
+		if (!rid) {
+			return null;
+		}
 
 		if (t === 'l') {
 			if (!this.isOmnichannelPreview()) {
@@ -386,24 +431,29 @@ class RightButtonsContainer extends Component<IRightButtonsProps, IRigthButtonsS
 		}
 		return (
 			<HeaderButton.Container>
+				{hasE2EEWarning ? (
+					<HeaderButton.Item iconName='encrypted' onPress={() => toggleRoomE2EE(rid)} disabled={!canToggleEncryption} />
+				) : null}
 				{issuesWithNotifications || notificationsDisabled ? (
 					<HeaderButton.Item
 						color={issuesWithNotifications ? colors!.fontDanger : ''}
 						iconName='notification-disabled'
 						onPress={this.navigateToNotificationOrPushTroubleshoot}
 						testID='room-view-push-troubleshoot'
+						disabled={hasE2EEWarning}
 					/>
 				) : null}
-				{rid ? <HeaderCallButton rid={rid} /> : null}
+				{rid ? <HeaderCallButton rid={rid} disabled={hasE2EEWarning} /> : null}
 				{threadsEnabled ? (
 					<HeaderButton.Item
 						iconName='threads'
 						onPress={this.goThreadsView}
 						testID='room-view-header-threads'
 						badge={() => <HeaderButton.BadgeUnread tunread={tunread} tunreadUser={tunreadUser} tunreadGroup={tunreadGroup} />}
+						disabled={hasE2EEWarning}
 					/>
 				) : null}
-				<HeaderButton.Item iconName='search' onPress={this.goSearchView} testID='room-view-search' />
+				<HeaderButton.Item iconName='search' onPress={this.goSearchView} testID='room-view-search' disabled={hasE2EEWarning} />
 			</HeaderButton.Container>
 		);
 	}
@@ -414,7 +464,8 @@ const mapStateToProps = (state: IApplicationState) => ({
 	threadsEnabled: state.settings.Threads_enabled as boolean,
 	isMasterDetail: state.app.isMasterDetail,
 	livechatRequestComment: state.settings.Livechat_request_comment_when_closing_conversation as boolean,
-	issuesWithNotifications: state.troubleshootingNotification.issuesWithNotifications
+	issuesWithNotifications: state.troubleshootingNotification.issuesWithNotifications,
+	toggleRoomE2EEncryptionPermission: state.permissions['toggle-room-e2e-encryption']
 });
 
 export default connect(mapStateToProps)(withTheme(RightButtonsContainer));
diff --git a/app/views/RoomView/components/EncryptedRoom.tsx b/app/views/RoomView/components/EncryptedRoom.tsx
new file mode 100644
index 0000000000..967cdcde48
--- /dev/null
+++ b/app/views/RoomView/components/EncryptedRoom.tsx
@@ -0,0 +1,98 @@
+import React, { ReactElement } from 'react';
+import { Linking, StyleSheet, Text, View } from 'react-native';
+import { StackNavigationProp } from '@react-navigation/stack';
+
+import { ChatsStackParamList } from '../../../stacks/types';
+import { useTheme } from '../../../theme';
+import { CustomIcon } from '../../../containers/CustomIcon';
+import Button from '../../../containers/Button';
+import sharedStyles from '../../Styles';
+import { useAppSelector } from '../../../lib/hooks';
+import { LEARN_MORE_E2EE_URL } from '../../../lib/encryption';
+import I18n from '../../../i18n';
+import { TNavigation } from '../../../stacks/stackType';
+
+const GAP = 32;
+
+export const EncryptedRoom = ({
+	roomName,
+	navigation
+}: {
+	roomName: string;
+	navigation: StackNavigationProp<ChatsStackParamList & TNavigation, 'RoomView'>;
+}): ReactElement => {
+	const { colors } = useTheme();
+	const styles = useStyle();
+	const isMasterDetail = useAppSelector(state => state.app.isMasterDetail);
+
+	const navigate = () => {
+		if (isMasterDetail) {
+			navigation.navigate('ModalStackNavigator', { screen: 'E2EEnterYourPasswordView' });
+		} else {
+			navigation.navigate('E2EEnterYourPasswordStackNavigator', { screen: 'E2EEnterYourPasswordView' });
+		}
+	};
+
+	return (
+		<View style={styles.root} testID='room-view-encrypted-room'>
+			<View style={styles.container}>
+				<View style={styles.textView}>
+					<View style={styles.icon}>
+						<CustomIcon name='encrypted' size={42} color={colors.fontSecondaryInfo} />
+					</View>
+					<Text style={styles.title}>{I18n.t('encrypted_room_title', { room_name: roomName.slice(0, 30) })}</Text>
+					<Text style={styles.description}>{I18n.t('encrypted_room_description')}</Text>
+				</View>
+				<Button title={I18n.t('Enter_E2EE_Password')} onPress={navigate} />
+				<Button
+					title={I18n.t('Learn_more')}
+					type='secondary'
+					backgroundColor={colors.surfaceTint}
+					onPress={() => Linking.openURL(LEARN_MORE_E2EE_URL)}
+				/>
+			</View>
+		</View>
+	);
+};
+
+const useStyle = () => {
+	const { colors } = useTheme();
+	const styles = StyleSheet.create({
+		root: {
+			flex: 1,
+			backgroundColor: colors.surfaceRoom
+		},
+		container: {
+			flex: 1,
+			marginHorizontal: 24,
+			justifyContent: 'center'
+		},
+		textView: { alignItems: 'center' },
+		icon: {
+			width: 58,
+			height: 58,
+			borderRadius: 30,
+			marginBottom: GAP,
+			backgroundColor: colors.surfaceNeutral,
+			alignItems: 'center',
+			justifyContent: 'center'
+		},
+		title: {
+			...sharedStyles.textBold,
+			fontSize: 24,
+			lineHeight: 32,
+			textAlign: 'center',
+			color: colors.fontTitlesLabels,
+			marginBottom: GAP
+		},
+		description: {
+			...sharedStyles.textRegular,
+			fontSize: 16,
+			lineHeight: 24,
+			textAlign: 'center',
+			color: colors.fontDefault,
+			marginBottom: GAP
+		}
+	});
+	return styles;
+};
diff --git a/app/views/RoomView/components/HeaderCallButton.tsx b/app/views/RoomView/components/HeaderCallButton.tsx
index 5f43e9552d..da368e43cd 100644
--- a/app/views/RoomView/components/HeaderCallButton.tsx
+++ b/app/views/RoomView/components/HeaderCallButton.tsx
@@ -3,17 +3,17 @@ import React from 'react';
 import * as HeaderButton from '../../../containers/HeaderButton';
 import { useVideoConf } from '../../../lib/hooks/useVideoConf';
 
-export default function HeaderCallButton({ rid }: { rid: string }): React.ReactElement | null {
+export const HeaderCallButton = ({ rid, disabled }: { rid: string; disabled: boolean }): React.ReactElement | null => {
 	const { showInitCallActionSheet, callEnabled, disabledTooltip } = useVideoConf(rid);
 
 	if (callEnabled)
 		return (
 			<HeaderButton.Item
-				disabled={disabledTooltip}
+				disabled={disabledTooltip || disabled}
 				iconName='phone'
 				onPress={showInitCallActionSheet}
 				testID='room-view-header-call'
 			/>
 		);
 	return null;
-}
+};
diff --git a/app/views/RoomView/components/MissingRoomE2EEKey.tsx b/app/views/RoomView/components/MissingRoomE2EEKey.tsx
new file mode 100644
index 0000000000..1a70d2e49d
--- /dev/null
+++ b/app/views/RoomView/components/MissingRoomE2EEKey.tsx
@@ -0,0 +1,77 @@
+import React, { ReactElement } from 'react';
+import { Linking, StyleSheet, Text, View } from 'react-native';
+
+import { useTheme } from '../../../theme';
+import { CustomIcon } from '../../../containers/CustomIcon';
+import Button from '../../../containers/Button';
+import sharedStyles from '../../Styles';
+import I18n from '../../../i18n';
+import { LEARN_MORE_E2EE_URL } from '../../../lib/encryption';
+
+const GAP = 32;
+
+export const MissingRoomE2EEKey = (): ReactElement => {
+	const { colors } = useTheme();
+	const styles = useStyle();
+	return (
+		<View style={styles.root}>
+			<View style={styles.container}>
+				<View style={styles.textView}>
+					<View style={styles.icon}>
+						<CustomIcon name='clock' size={42} color={colors.fontSecondaryInfo} />
+					</View>
+					<Text style={styles.title}>{I18n.t('missing_room_e2ee_title')}</Text>
+					<Text style={styles.description}>{I18n.t('missing_room_e2ee_description')}</Text>
+				</View>
+				<Button
+					title={I18n.t('Learn_more')}
+					type='secondary'
+					backgroundColor={colors.surfaceTint}
+					onPress={() => Linking.openURL(LEARN_MORE_E2EE_URL)}
+				/>
+			</View>
+		</View>
+	);
+};
+
+const useStyle = () => {
+	const { colors } = useTheme();
+	const styles = StyleSheet.create({
+		root: {
+			flex: 1,
+			backgroundColor: colors.surfaceRoom
+		},
+		container: {
+			flex: 1,
+			marginHorizontal: 24,
+			justifyContent: 'center'
+		},
+		textView: { alignItems: 'center' },
+		icon: {
+			width: 58,
+			height: 58,
+			borderRadius: 30,
+			marginBottom: GAP,
+			backgroundColor: colors.surfaceNeutral,
+			alignItems: 'center',
+			justifyContent: 'center'
+		},
+		title: {
+			...sharedStyles.textBold,
+			fontSize: 24,
+			lineHeight: 32,
+			textAlign: 'center',
+			color: colors.fontTitlesLabels,
+			marginBottom: GAP
+		},
+		description: {
+			...sharedStyles.textRegular,
+			fontSize: 16,
+			lineHeight: 24,
+			textAlign: 'center',
+			color: colors.fontDefault,
+			marginBottom: GAP
+		}
+	});
+	return styles;
+};
diff --git a/app/views/RoomView/components/index.ts b/app/views/RoomView/components/index.ts
new file mode 100644
index 0000000000..68d4054e26
--- /dev/null
+++ b/app/views/RoomView/components/index.ts
@@ -0,0 +1,3 @@
+export * from './EncryptedRoom';
+export * from './HeaderCallButton';
+export * from './MissingRoomE2EEKey';
diff --git a/app/views/RoomView/constants.ts b/app/views/RoomView/constants.ts
index c91d68c6c6..85088e52ba 100644
--- a/app/views/RoomView/constants.ts
+++ b/app/views/RoomView/constants.ts
@@ -41,5 +41,7 @@ export const roomAttrsUpdate = [
 	't',
 	'autoTranslate',
 	'autoTranslateLanguage',
-	'unmuted'
+	'unmuted',
+	'E2EKey',
+	'encrypted'
 ] as TRoomUpdate[];
diff --git a/app/views/RoomView/definitions.ts b/app/views/RoomView/definitions.ts
index 8feadc3d87..ca1b3073f1 100644
--- a/app/views/RoomView/definitions.ts
+++ b/app/views/RoomView/definitions.ts
@@ -23,6 +23,7 @@ export interface IRoomViewProps extends IActionSheetProvider, IBaseScreen<ChatsS
 	viewCannedResponsesPermission?: string[]; // TODO: Check if its the correct type
 	livechatAllowManualOnHold?: boolean;
 	inAppFeedback?: { [key: string]: string };
+	encryptionEnabled: boolean;
 }
 
 export type TStateAttrsUpdate = keyof IRoomViewState;
diff --git a/app/views/RoomView/index.tsx b/app/views/RoomView/index.tsx
index 2404dfec30..f1882c86c7 100644
--- a/app/views/RoomView/index.tsx
+++ b/app/views/RoomView/index.tsx
@@ -98,10 +98,12 @@ import AudioManager from '../../lib/methods/AudioManager';
 import { IListContainerRef, TListRef } from './List/definitions';
 import { getMessageById } from '../../lib/database/services/Message';
 import { getThreadById } from '../../lib/database/services/Thread';
+import { hasE2EEWarning, isE2EEDisabledEncryptedRoom, isMissingRoomE2EEKey } from '../../lib/encryption/utils';
 import { clearInAppFeedback, removeInAppFeedback } from '../../actions/inAppFeedback';
 import UserPreferences from '../../lib/methods/userPreferences';
 import { IRoomViewProps, IRoomViewState } from './definitions';
 import { roomAttrsUpdate, stateAttrsUpdate } from './constants';
+import { EncryptedRoom, MissingRoomE2EEKey } from './components';
 
 class RoomView extends React.Component<IRoomViewProps, IRoomViewState> {
 	private rid?: string;
@@ -244,10 +246,13 @@ class RoomView extends React.Component<IRoomViewProps, IRoomViewState> {
 	shouldComponentUpdate(nextProps: IRoomViewProps, nextState: IRoomViewState) {
 		const { state } = this;
 		const { roomUpdate, member, isOnHold } = state;
-		const { theme, insets, route } = this.props;
+		const { theme, insets, route, encryptionEnabled } = this.props;
 		if (theme !== nextProps.theme) {
 			return true;
 		}
+		if (encryptionEnabled !== nextProps.encryptionEnabled) {
+			return true;
+		}
 		if (member.statusText !== nextState.member.statusText) {
 			return true;
 		}
@@ -412,7 +417,7 @@ class RoomView extends React.Component<IRoomViewProps, IRoomViewState> {
 
 	setHeader = () => {
 		const { room, unreadsCount, roomUserId, joined, canForwardGuest, canReturnQueue, canPlaceLivechatOnHold } = this.state;
-		const { navigation, isMasterDetail, theme, baseUrl, user, route } = this.props;
+		const { navigation, isMasterDetail, theme, baseUrl, user, route, encryptionEnabled } = this.props;
 		const { rid, tmid } = this;
 		if (!room.rid) {
 			return;
@@ -497,6 +502,7 @@ class RoomView extends React.Component<IRoomViewProps, IRoomViewState> {
 					onPress={this.goRoomActionsView}
 					testID={`room-view-title-${title}`}
 					sourceType={sourceType}
+					disabled={!!tmid}
 				/>
 			),
 			headerRight: () => (
@@ -514,6 +520,9 @@ class RoomView extends React.Component<IRoomViewProps, IRoomViewState> {
 					showActionSheet={this.showActionSheet}
 					departmentId={departmentId}
 					notificationsDisabled={iSubRoom?.disableNotifications}
+					hasE2EEWarning={
+						'encrypted' in room && hasE2EEWarning({ encryptionEnabled, E2EKey: room.E2EKey, roomEncrypted: room.encrypted })
+					}
 				/>
 			)
 		});
@@ -1444,7 +1453,7 @@ class RoomView extends React.Component<IRoomViewProps, IRoomViewState> {
 	render() {
 		console.count(`${this.constructor.name}.render calls`);
 		const { room, loading, action, selectedMessages } = this.state;
-		const { user, baseUrl, theme, width, serverVersion } = this.props;
+		const { user, baseUrl, theme, width, serverVersion, navigation, encryptionEnabled } = this.props;
 		const { rid, t } = room;
 		let bannerClosed;
 		let announcement;
@@ -1452,6 +1461,18 @@ class RoomView extends React.Component<IRoomViewProps, IRoomViewState> {
 			({ bannerClosed, announcement } = room);
 		}
 
+		if ('encrypted' in room) {
+			// Missing room encryption key
+			if (isMissingRoomE2EEKey({ encryptionEnabled, roomEncrypted: room.encrypted, E2EKey: room.E2EKey })) {
+				return <MissingRoomE2EEKey />;
+			}
+
+			// Encrypted room, but user session is not encrypted
+			if (isE2EEDisabledEncryptedRoom({ encryptionEnabled, roomEncrypted: room.encrypted })) {
+				return <EncryptedRoom navigation={navigation} roomName={getRoomTitle(room)} />;
+			}
+		}
+
 		return (
 			<RoomContext.Provider
 				value={{
@@ -1508,7 +1529,8 @@ const mapStateToProps = (state: IApplicationState) => ({
 	transferLivechatGuestPermission: state.permissions['transfer-livechat-guest'],
 	viewCannedResponsesPermission: state.permissions['view-canned-responses'],
 	livechatAllowManualOnHold: state.settings.Livechat_allow_manual_on_hold as boolean,
-	inAppFeedback: state.inAppFeedback
+	inAppFeedback: state.inAppFeedback,
+	encryptionEnabled: state.encryption.enabled
 });
 
 export default connect(mapStateToProps)(withDimensions(withTheme(withSafeAreaInsets(withActionSheet(RoomView)))));
diff --git a/app/views/RoomsListView/ListHeader/index.tsx b/app/views/RoomsListView/ListHeader/index.tsx
index 9fea70e864..882637bbd4 100644
--- a/app/views/RoomsListView/ListHeader/index.tsx
+++ b/app/views/RoomsListView/ListHeader/index.tsx
@@ -32,9 +32,7 @@ const ListHeader = React.memo(
 					<>
 						<List.Item
 							title={
-								encryptionBanner === E2E_BANNER_TYPE.REQUEST_PASSWORD
-									? 'Enter_Your_E2E_Password'
-									: 'Save_Your_Encryption_Password'
+								encryptionBanner === E2E_BANNER_TYPE.REQUEST_PASSWORD ? 'Enter_E2EE_Password' : 'Save_Your_Encryption_Password'
 							}
 							left={() => <List.Icon name='encrypted' color={themes[theme].fontWhite} />}
 							underlayColor={themes[theme].strokeHighlight}
diff --git a/app/views/SecurityPrivacyView.tsx b/app/views/SecurityPrivacyView.tsx
index f254e1fc76..db7bdec3dc 100644
--- a/app/views/SecurityPrivacyView.tsx
+++ b/app/views/SecurityPrivacyView.tsx
@@ -98,17 +98,13 @@ const SecurityPrivacyView = ({ navigation }: ISecurityPrivacyViewProps): JSX.Ele
 							<List.Item
 								title='Log_analytics_events'
 								testID='security-privacy-view-analytics-events'
-								right={() => (
-									<Switch value={analyticsEventsState} onValueChange={toggleAnalyticsEvents} />
-								)}
+								right={() => <Switch value={analyticsEventsState} onValueChange={toggleAnalyticsEvents} />}
 							/>
 							<List.Separator />
 							<List.Item
 								title='Send_crash_report'
 								testID='security-privacy-view-crash-report'
-								right={() => (
-									<Switch value={crashReportState} onValueChange={toggleCrashReport} />
-								)}
+								right={() => <Switch value={crashReportState} onValueChange={toggleCrashReport} />}
 							/>
 							<List.Separator />
 							<List.Info info='Crash_report_disclaimer' />
diff --git a/app/views/ShareListView/index.tsx b/app/views/ShareListView/index.tsx
index d57cf9c76a..bdfb0acf05 100644
--- a/app/views/ShareListView/index.tsx
+++ b/app/views/ShareListView/index.tsx
@@ -1,4 +1,5 @@
 import React from 'react';
+import { Dispatch } from 'redux';
 import { StackNavigationProp } from '@react-navigation/stack';
 import { BackHandler, FlatList, Keyboard, ScrollView, Text, View } from 'react-native';
 import ShareExtension from 'rn-extensions-share';
@@ -22,9 +23,11 @@ import SafeAreaView from '../../containers/SafeAreaView';
 import { sanitizeLikeString } from '../../lib/database/utils';
 import styles from './styles';
 import ShareListHeader from './Header';
-import { TServerModel, TSubscriptionModel } from '../../definitions';
+import { IApplicationState, TServerModel, TSubscriptionModel } from '../../definitions';
 import { ShareInsideStackParamList } from '../../definitions/navigationTypes';
 import { getRoomAvatar, isAndroid, isIOS, askAndroidMediaPermissions } from '../../lib/methods/helpers';
+import { encryptionInit } from '../../actions/encryption';
+import { isE2EEDisabledEncryptedRoom, isMissingRoomE2EEKey } from '../../lib/encryption/utils';
 
 interface IDataFromShare {
 	value: string;
@@ -61,6 +64,8 @@ interface IShareListViewProps extends INavigationOption {
 	token: string;
 	userId: string;
 	theme: TSupportedThemes;
+	encryptionEnabled: boolean;
+	dispatch: Dispatch;
 }
 
 const getItemLayout = (data: any, index: number) => ({ length: data.length, offset: ROW_HEIGHT * index, index });
@@ -97,8 +102,9 @@ class ShareListView extends React.Component<IShareListViewProps, IState> {
 	}
 
 	async componentDidMount() {
-		const { server } = this.props;
+		const { dispatch } = this.props;
 		try {
+			dispatch(encryptionInit());
 			const data = (await ShareExtension.data()) as IDataFromShare[];
 			if (isAndroid) {
 				await this.askForPermission(data);
@@ -130,13 +136,13 @@ class ShareListView extends React.Component<IShareListViewProps, IState> {
 			// Do nothing
 		}
 
-		this.getSubscriptions(server);
+		this.getSubscriptions();
 	}
 
-	UNSAFE_componentWillReceiveProps(nextProps: IShareListViewProps) {
-		const { server } = this.props;
-		if (nextProps.server !== server) {
-			this.getSubscriptions(nextProps.server);
+	componentDidUpdate(previousProps: IShareListViewProps) {
+		const { server, encryptionEnabled } = this.props;
+		if (previousProps.server !== server || previousProps.encryptionEnabled !== encryptionEnabled) {
+			this.getSubscriptions();
 		}
 	}
 
@@ -149,13 +155,16 @@ class ShareListView extends React.Component<IShareListViewProps, IState> {
 			return true;
 		}
 
-		const { server, userId } = this.props;
+		const { server, userId, encryptionEnabled } = this.props;
 		if (server !== nextProps.server) {
 			return true;
 		}
 		if (userId !== nextProps.userId) {
 			return true;
 		}
+		if (encryptionEnabled !== nextProps.encryptionEnabled) {
+			return true;
+		}
 
 		const { searchResults } = this.state;
 		if (nextState.searching) {
@@ -223,6 +232,7 @@ class ShareListView extends React.Component<IShareListViewProps, IState> {
 	};
 
 	query = async (text?: string) => {
+		const { encryptionEnabled } = this.props;
 		const db = database.active;
 		const defaultWhereClause = [
 			Q.where('archived', false),
@@ -240,22 +250,34 @@ class ShareListView extends React.Component<IShareListViewProps, IState> {
 			.query(...defaultWhereClause)
 			.fetch()) as TSubscriptionModel[];
 
-		return data.map(item => ({
-			rid: item.rid,
-			t: item.t,
-			name: item.name,
-			fname: item.fname,
-			blocked: item.blocked,
-			blocker: item.blocker,
-			prid: item.prid,
-			uids: item.uids,
-			usernames: item.usernames,
-			topic: item.topic,
-			teamMain: item.teamMain
-		}));
+		return data
+			.map(item => {
+				if (isMissingRoomE2EEKey({ encryptionEnabled, roomEncrypted: item.encrypted, E2EKey: item.E2EKey })) {
+					return null;
+				}
+				if (isE2EEDisabledEncryptedRoom({ encryptionEnabled, roomEncrypted: item.encrypted })) {
+					return null;
+				}
+
+				return {
+					rid: item.rid,
+					t: item.t,
+					name: item.name,
+					fname: item.fname,
+					blocked: item.blocked,
+					blocker: item.blocker,
+					prid: item.prid,
+					uids: item.uids,
+					usernames: item.usernames,
+					topic: item.topic,
+					teamMain: item.teamMain
+				};
+			})
+			.filter(item => !!item);
 	};
 
-	getSubscriptions = async (server: string) => {
+	getSubscriptions = async () => {
+		const { server } = this.props;
 		const serversDB = database.servers;
 
 		if (server) {
@@ -473,10 +495,11 @@ class ShareListView extends React.Component<IShareListViewProps, IState> {
 	};
 }
 
-const mapStateToProps = ({ share }: any) => ({
-	userId: share.user && share.user.id,
-	token: share.user && share.user.token,
-	server: share.server.server
+const mapStateToProps = ({ share, encryption }: IApplicationState) => ({
+	userId: share.user && (share.user.id as string),
+	token: share.user && (share.user.token as string),
+	server: share.server.server as string,
+	encryptionEnabled: encryption.enabled
 });
 
 export default connect(mapStateToProps)(withTheme(ShareListView));
diff --git a/e2e/tests/assorted/01-e2eencryption.spec.ts b/e2e/tests/assorted/01-e2eencryption.spec.ts
index bcea0f1506..34237e4c07 100644
--- a/e2e/tests/assorted/01-e2eencryption.spec.ts
+++ b/e2e/tests/assorted/01-e2eencryption.spec.ts
@@ -5,14 +5,14 @@ import {
 	login,
 	sleep,
 	tapBack,
-	searchRoom,
 	logout,
 	platformTypes,
 	TTextMatcher,
 	tapAndWaitFor,
 	expectValidRegisterOrRetry,
 	mockMessage,
-	tryTapping
+	tryTapping,
+	navigateToRoom
 } from '../../helpers/app';
 import data from '../../data';
 import { createRandomUser, deleteCreatedUsers, IDeleteCreateUser, ITestUser } from '../../helpers/data_setup';
@@ -40,14 +40,6 @@ const checkBanner = async () => {
 		.withTimeout(10000);
 };
 
-async function navigateToRoom(roomName: string) {
-	await searchRoom(`${roomName}`);
-	await element(by.id(`rooms-list-view-item-${roomName}`)).tap();
-	await waitFor(element(by.id('room-view')))
-		.toBeVisible()
-		.withTimeout(5000);
-}
-
 async function waitForToast() {
 	await sleep(300);
 }
@@ -298,7 +290,9 @@ describe('E2E Encryption', () => {
 				await waitFor(element(by[textMatcher](mockedMessageText)).atIndex(0))
 					.not.toExist()
 					.withTimeout(2000);
-				await expect(element(by.label('Encrypted message')).atIndex(0)).toExist();
+				await waitFor(element(by.id('room-view-encrypted-room')))
+					.toBeVisible()
+					.withTimeout(2000);
 			});
 
 			it('should enter new e2e password and messages should be decrypted', async () => {
@@ -306,7 +300,7 @@ describe('E2E Encryption', () => {
 				await waitFor(element(by.id('rooms-list-view')))
 					.toBeVisible()
 					.withTimeout(2000);
-				// TODO: assert 'Enter Your E2E Password'
+				// TODO: assert 'Enter E2EE Password'
 				await waitFor(element(by.id('listheader-encryption')))
 					.toBeVisible()
 					.withTimeout(2000);
@@ -431,4 +425,6 @@ describe('E2E Encryption', () => {
 			await checkBanner();
 		});
 	});
+
+	// TODO: missing request e2ee room key
 });

From 147b014b60be188960b81b91a365d5eb68a07559 Mon Sep 17 00:00:00 2001
From: anirban paul <130109852+anirbanpaulcom@users.noreply.github.com>
Date: Mon, 24 Jun 2024 19:28:58 +0530
Subject: [PATCH 2/2] chore: keep the Save Button Disabled Until the Status
 Value Changes. (#5569)

* SaveButtonDisableFeature

* code formatting

* Update index.tsx

---------

Co-authored-by: Amit Giri <thisisag840@gmail.com>
Co-authored-by: Gleidson Daniel Silva <gleidson10daniel@hotmail.com>
---
 app/views/StatusView/index.tsx | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/views/StatusView/index.tsx b/app/views/StatusView/index.tsx
index 3d4f4f27f3..02b42ead8a 100644
--- a/app/views/StatusView/index.tsx
+++ b/app/views/StatusView/index.tsx
@@ -115,7 +115,12 @@ const StatusView = (): React.ReactElement => {
 				headerLeft: isMasterDetail ? undefined : () => <HeaderButton.CancelModal onPress={goBack} />,
 				headerRight: () => (
 					<HeaderButton.Container>
-						<HeaderButton.Item title={I18n.t('Save')} onPress={submit} testID='status-view-submit' />
+						<HeaderButton.Item
+							title={I18n.t('Save')}
+							onPress={submit}
+							disabled={status === user.status && statusText === user.statusText}
+							testID='status-view-submit'
+						/>
 					</HeaderButton.Container>
 				)
 			});