diff --git a/app/i18n/locales/en.json b/app/i18n/locales/en.json
index b9509eee9..30d7a7572 100644
--- a/app/i18n/locales/en.json
+++ b/app/i18n/locales/en.json
@@ -900,5 +900,6 @@
   "Presence_Cap_Warning_Title": "User status temporarily disabled",
   "Presence_Cap_Warning_Description": "Active connections have reached the limit for the workspace, thus the service that handles user status is disabled. It can be re-enabled manually in workspace settings.",
   "Learn_more": "Learn more",
-  "and_N_more": "and {{count}} more"
+  "and_N_more": "and {{count}} more",
+  "Media_auto_download": "Media auto-download"
 }
\ No newline at end of file
diff --git a/app/stacks/InsideStack.tsx b/app/stacks/InsideStack.tsx
index c1ed5fbcf..5422e64f3 100644
--- a/app/stacks/InsideStack.tsx
+++ b/app/stacks/InsideStack.tsx
@@ -46,6 +46,7 @@ import LanguageView from '../views/LanguageView';
 import ThemeView from '../views/ThemeView';
 import DefaultBrowserView from '../views/DefaultBrowserView';
 import ScreenLockConfigView from '../views/ScreenLockConfigView';
+import MediaAutoDownloadView from '../views/MediaAutoDownloadView';
 // Admin Stack
 import AdminPanelView from '../views/AdminPanelView';
 // NewMessage Stack
@@ -179,6 +180,7 @@ const SettingsStackNavigator = () => {
 			<SettingsStack.Screen name='LanguageView' component={LanguageView} />
 			<SettingsStack.Screen name='ThemeView' component={ThemeView} />
 			<SettingsStack.Screen name='DefaultBrowserView' component={DefaultBrowserView} />
+			<SettingsStack.Screen name='MediaAutoDownloadView' component={MediaAutoDownloadView} />
 			<SettingsStack.Screen
 				name='ScreenLockConfigView'
 				component={ScreenLockConfigView}
diff --git a/app/stacks/MasterDetailStack/index.tsx b/app/stacks/MasterDetailStack/index.tsx
index 79d8cdd97..d4fe19e35 100644
--- a/app/stacks/MasterDetailStack/index.tsx
+++ b/app/stacks/MasterDetailStack/index.tsx
@@ -50,6 +50,7 @@ import CreateChannelView from '../../views/CreateChannelView';
 import UserPreferencesView from '../../views/UserPreferencesView';
 import UserNotificationPrefView from '../../views/UserNotificationPreferencesView';
 import SecurityPrivacyView from '../../views/SecurityPrivacyView';
+import MediaAutoDownloadView from '../../views/MediaAutoDownloadView';
 import E2EEncryptionSecurityView from '../../views/E2EEncryptionSecurityView';
 // InsideStackNavigator
 import AttachmentView from '../../views/AttachmentView';
@@ -192,6 +193,7 @@ const ModalStackNavigator = React.memo(({ navigation }: INavigation) => {
 				<ModalStack.Screen name='UserPreferencesView' component={UserPreferencesView} />
 				<ModalStack.Screen name='UserNotificationPrefView' component={UserNotificationPrefView} />
 				<ModalStack.Screen name='SecurityPrivacyView' component={SecurityPrivacyView} />
+				<ModalStack.Screen name='MediaAutoDownloadView' component={MediaAutoDownloadView} />
 				<ModalStack.Screen
 					name='E2EEncryptionSecurityView'
 					component={E2EEncryptionSecurityView}
diff --git a/app/stacks/MasterDetailStack/types.ts b/app/stacks/MasterDetailStack/types.ts
index 42215d5ff..1f1c57298 100644
--- a/app/stacks/MasterDetailStack/types.ts
+++ b/app/stacks/MasterDetailStack/types.ts
@@ -200,6 +200,7 @@ export type ModalStackParamList = {
 	UserPreferencesView: undefined;
 	UserNotificationPrefView: undefined;
 	SecurityPrivacyView: undefined;
+	MediaAutoDownloadView: undefined;
 	E2EEncryptionSecurityView: undefined;
 };
 
diff --git a/app/stacks/types.ts b/app/stacks/types.ts
index 38c75e6f0..ac1b6b091 100644
--- a/app/stacks/types.ts
+++ b/app/stacks/types.ts
@@ -220,6 +220,7 @@ export type SettingsStackParamList = {
 	ScreenLockConfigView: undefined;
 	ProfileView: undefined;
 	DisplayPrefsView: undefined;
+	MediaAutoDownloadView: undefined;
 };
 
 export type AdminPanelStackParamList = {
diff --git a/app/views/MediaAutoDownloadView/index.tsx b/app/views/MediaAutoDownloadView/index.tsx
new file mode 100644
index 000000000..c00f434f7
--- /dev/null
+++ b/app/views/MediaAutoDownloadView/index.tsx
@@ -0,0 +1,35 @@
+import React from 'react';
+import { StackNavigationProp } from '@react-navigation/stack';
+import { useNavigation } from '@react-navigation/native';
+
+import * as List from '../../containers/List';
+import SafeAreaView from '../../containers/SafeAreaView';
+import StatusBar from '../../containers/StatusBar';
+import { SettingsStackParamList } from '../../stacks/types';
+
+const MediaAutoDownload = () => {
+	const navigation = useNavigation<StackNavigationProp<SettingsStackParamList, 'MediaAutoDownloadView'>>();
+
+	return (
+		<SafeAreaView testID='security-privacy-view'>
+			<StatusBar />
+			<List.Container testID='security-privacy-view-list'>
+				<List.Section>
+					<List.Separator />
+					<List.Item
+						title='E2E_Encryption'
+						showActionIndicator
+						onPress={() => {}}
+						// onPress={() => navigateToScreen('E2EEncryptionSecurityView')}
+						testID='security-privacy-view-e2e-encryption'
+					/>
+					<List.Separator />
+					<List.Item title='Screen_lock' showActionIndicator onPress={() => {}} testID='security-privacy-view-screen-lock' />
+					<List.Separator />
+				</List.Section>
+			</List.Container>
+		</SafeAreaView>
+	);
+};
+
+export default MediaAutoDownload;
diff --git a/app/views/SettingsView/index.tsx b/app/views/SettingsView/index.tsx
index 623b5ec17..4d30e0fbb 100644
--- a/app/views/SettingsView/index.tsx
+++ b/app/views/SettingsView/index.tsx
@@ -224,6 +224,13 @@ const SettingsView = (): React.ReactElement => {
 						testID='settings-view-theme'
 					/>
 					<List.Separator />
+					<List.Item
+						title='Media_auto_download'
+						showActionIndicator
+						onPress={() => navigateToScreen('MediaAutoDownloadView')}
+						testID='media-auto-download-view-theme'
+					/>
+					<List.Separator />
 					<List.Item
 						title='Security_and_privacy'
 						showActionIndicator
diff --git a/ios/.xcode.env.local b/ios/.xcode.env.local
new file mode 100644
index 000000000..f27b2ce57
--- /dev/null
+++ b/ios/.xcode.env.local
@@ -0,0 +1 @@
+export NODE_BINARY="/Users/reinaldoneto/.nvm/versions/node/v14.19.3/bin/node"