diff --git a/UI/PreferencesUI/UIxPreferences.m b/UI/PreferencesUI/UIxPreferences.m index 97453e012..07184d001 100644 --- a/UI/PreferencesUI/UIxPreferences.m +++ b/UI/PreferencesUI/UIxPreferences.m @@ -1504,7 +1504,7 @@ static NSArray *reminderValues = nil; [v setObject: [[user userDefaults] mailCertificate] forKey: @"SOGoMailCertificate"]; // - // We sanitize our auxilary mail accounts + // We sanitize our auxiliary mail accounts // accounts = [v objectForKey: @"AuxiliaryMailAccounts"]; if (accounts && [accounts isKindOfClass: [NSArray class]]) diff --git a/UI/WebServerResources/js/Preferences/Preferences.service.js b/UI/WebServerResources/js/Preferences/Preferences.service.js index 4f538fd3d..7c98c2dba 100644 --- a/UI/WebServerResources/js/Preferences/Preferences.service.js +++ b/UI/WebServerResources/js/Preferences/Preferences.service.js @@ -687,6 +687,16 @@ }); }); + // See Account.prototype.$omit + _.forEach(preferences.defaults.AuxiliaryMailAccounts, function (account) { + var identities = []; + _.forEach(account.identities, function (identity) { + if (!identity.isReadOnly) + identities.push(_.pick(identity, ['email', 'fullName', 'replyTo', 'signature', 'isDefault'])); + }); + account.identities = identities; + }); + if (!preferences.defaults.SOGoMailComposeWindowEnabled) delete preferences.defaults.SOGoMailComposeWindow; delete preferences.defaults.SOGoMailComposeWindowEnabled;