diff --git a/Classes/LinphoneCoreSettingsStore.m b/Classes/LinphoneCoreSettingsStore.m
index 1964c60f1..be3e07139 100644
--- a/Classes/LinphoneCoreSettingsStore.m
+++ b/Classes/LinphoneCoreSettingsStore.m
@@ -442,7 +442,7 @@
 	{
 		[self setCString:linphone_core_get_file_transfer_server(LC) forKey:@"file_transfer_server_url_preference"];
         int maxSize = linphone_core_get_max_size_for_auto_download_incoming_files(LC);
-        [self setObject:maxSize==0 ? @"Always" : (maxSize==-1 ? @"Nerver" : @"Customize") forKey:@"auto_download_mode"];
+        [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"];
diff --git a/Classes/SettingsView.m b/Classes/SettingsView.m
index 2cbd8e492..6134fed71 100644
--- a/Classes/SettingsView.m
+++ b/Classes/SettingsView.m
@@ -22,6 +22,7 @@
 #import "LinphoneAppDelegate.h"
 #import "PhoneMainView.h"
 #import "Utils.h"
+#import "linphoneapp-Swift.h"
 
 #import "DCRoundSwitch.h"
 
@@ -547,6 +548,7 @@ void update_hash_cbs(LinphoneAccountCreator *creator, LinphoneAccountCreatorStat
 		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{
@@ -554,6 +556,7 @@ void update_hash_cbs(LinphoneAccountCreator *creator, LinphoneAccountCreatorStat
 				}
 			}else{
 				[LinphoneManager.instance lpConfigSetBool:TRUE forKey:@"vfs_enabled_mode"];
+				[VFSUtil setVfsEnabbledWithEnabled:TRUE groupName:kLinphoneMsgNotificationAppGroupId];
 				[hiddenKeys addObject:@"auto_write_to_gallery_mode"];
 			}
 		}