diff --git a/Classes/LinphoneCoreSettingsStore.m b/Classes/LinphoneCoreSettingsStore.m
index be3e07139..3cd4a2f2c 100644
--- a/Classes/LinphoneCoreSettingsStore.m
+++ b/Classes/LinphoneCoreSettingsStore.m
@@ -445,7 +445,7 @@
         [self setObject:maxSize==0 ? @"Always" : (maxSize==-1 ? @"Never" : @"Customize") forKey:@"auto_download_mode"];
         [self setInteger:maxSize forKey:@"auto_download_incoming_files_max_size"];
 		[self setBool:[VFSUtil vfsEnabledWithGroupName:kLinphoneMsgNotificationAppGroupId] forKey:@"vfs_enabled_mode"];
-		[self setBool:[lm lpConfigBoolForKey:@"auto_write_to_gallery_preference" withDefault:YES] forKey:@"auto_write_to_gallery_mode"];
+		[self setBool:[lm lpConfigBoolForKey:@"auto_write_to_gallery_preference" withDefault:NO] forKey:@"auto_write_to_gallery_mode"];
 	}
 
 	// network section
diff --git a/Classes/SettingsView.m b/Classes/SettingsView.m
index 6134fed71..13fe4e93d 100644
--- a/Classes/SettingsView.m
+++ b/Classes/SettingsView.m
@@ -544,19 +544,14 @@ void update_hash_cbs(LinphoneAccountCreator *creator, LinphoneAccountCreatorStat
 			[hiddenKeys addObject:@"auto_download_incoming_files_max_size"];
 		}
     }else if ([@"vfs_enabled_mode" compare:notif.object] == NSOrderedSame) {
-		removeFromHiddenKeys = ![[notif.userInfo objectForKey:@"vfs_enabled_mode"] boolValue];
-		if(![LinphoneManager.instance lpConfigBoolForKey:@"auto_write_to_gallery_mode"]){
-			if(removeFromHiddenKeys){
-				[LinphoneManager.instance lpConfigSetBool:FALSE forKey:@"vfs_enabled_mode"];
-				[VFSUtil setVfsEnabbledWithEnabled:FALSE groupName:kLinphoneMsgNotificationAppGroupId];
-				if([LinphoneManager.instance lpConfigBoolForKey:@"auto_download_mode_is_never"]){
-					[keys addObject:@"auto_write_to_gallery_mode"];
-				}else{
-					[hiddenKeys addObject:@"auto_write_to_gallery_mode"];
-				}
-			}else{
-				[LinphoneManager.instance lpConfigSetBool:TRUE forKey:@"vfs_enabled_mode"];
-				[VFSUtil setVfsEnabbledWithEnabled:TRUE groupName:kLinphoneMsgNotificationAppGroupId];
+		removeFromHiddenKeys = [[notif.userInfo objectForKey:@"vfs_enabled_mode"] boolValue];
+		if(removeFromHiddenKeys){
+			[LinphoneManager.instance lpConfigSetBool:TRUE forKey:@"vfs_enabled_mode"];
+			[hiddenKeys addObject:@"auto_write_to_gallery_mode"];
+			[hiddenKeys addObject:@"vfs_enabled_mode"];
+			[keys addObject:@"vfs_enabled"];
+		}else{
+			if(![LinphoneManager.instance lpConfigBoolForKey:@"auto_download_mode_is_never"]){
 				[hiddenKeys addObject:@"auto_write_to_gallery_mode"];
 			}
 		}
@@ -567,11 +562,9 @@ void update_hash_cbs(LinphoneAccountCreator *creator, LinphoneAccountCreatorStat
 			if(!removeFromHiddenKeys){
 				[LinphoneManager.instance lpConfigSetBool:TRUE forKey:@"auto_write_to_gallery_mode"];
 				[hiddenKeys addObject:@"auto_download_mode"];
-				[hiddenKeys addObject:@"vfs_enabled_mode"];
 			}else{
 				[LinphoneManager.instance lpConfigSetBool:FALSE forKey:@"auto_write_to_gallery_mode"];
 				[keys addObject:@"auto_download_mode"];
-				[keys addObject:@"vfs_enabled_mode"];
 			}
 		}
 	}
@@ -826,6 +819,13 @@ void update_hash_cbs(LinphoneAccountCreator *creator, LinphoneAccountCreatorStat
 	
 	if ([lm lpConfigBoolForKey:@"vfs_enabled_mode"]) {
 		[hiddenKeys addObject:@"auto_write_to_gallery_mode"];
+		[hiddenKeys addObject:@"vfs_enabled_mode"];
+	}else{
+		[hiddenKeys addObject:@"vfs_enabled"];
+	}
+	
+	if ([lm lpConfigBoolForKey:@"auto_write_to_gallery_mode"]) {
+		[hiddenKeys addObject:@"auto_write_to_gallery_mode"];
 	}
 
 	return hiddenKeys;
diff --git a/Settings/InAppSettings.bundle/Advanced.plist b/Settings/InAppSettings.bundle/Advanced.plist
index d2211516c..e9146974e 100644
--- a/Settings/InAppSettings.bundle/Advanced.plist
+++ b/Settings/InAppSettings.bundle/Advanced.plist
@@ -116,6 +116,24 @@
 			<key>Type</key>
 			<string>PSToggleSwitchSpecifier</string>
 		</dict>
+		<dict>
+			<key>DefaultValue</key>
+			<false/>
+			<key>Key</key>
+			<string>vfs_enabled_mode</string>
+			<key>Title</key>
+			<string>Encrypt everything</string>
+			<key>Type</key>
+			<string>PSToggleSwitchSpecifier</string>
+		</dict>
+		<dict>
+			<key>DefaultValue</key>
+			<false/>
+			<key>Key</key>
+			<string>vfs_enabled</string>
+			<key>Title</key>
+			<string>File encryption is enabled</string>
+		</dict>
 		<dict>
 			<key>DefaultValue</key>
 			<true/>
diff --git a/Settings/InAppSettings.bundle/Chat.plist b/Settings/InAppSettings.bundle/Chat.plist
index d5e3c9395..498152fe4 100644
--- a/Settings/InAppSettings.bundle/Chat.plist
+++ b/Settings/InAppSettings.bundle/Chat.plist
@@ -30,16 +30,6 @@
 			<key>DefaultValue</key>
 			<false/>
 			<key>Key</key>
-			<string>vfs_enabled_mode</string>
-			<key>Title</key>
-			<string>Enable VFS</string>
-			<key>Type</key>
-			<string>PSToggleSwitchSpecifier</string>
-		</dict>
-		<dict>
-			<key>DefaultValue</key>
-			<true/>
-			<key>Key</key>
 			<string>auto_write_to_gallery_mode</string>
 			<key>Title</key>
 			<string>Auto write to gallery</string>
diff --git a/Settings/InAppSettings.bundle/fr.lproj/Advanced.strings b/Settings/InAppSettings.bundle/fr.lproj/Advanced.strings
index f2b49a8ee..0831b2440 100644
Binary files a/Settings/InAppSettings.bundle/fr.lproj/Advanced.strings and b/Settings/InAppSettings.bundle/fr.lproj/Advanced.strings differ