diff --git a/src/components/NavigationAccountExpandCollapse.vue b/src/components/NavigationAccountExpandCollapse.vue
index f64a2982f1..6c23f74bf6 100644
--- a/src/components/NavigationAccountExpandCollapse.vue
+++ b/src/components/NavigationAccountExpandCollapse.vue
@@ -35,7 +35,7 @@ export default {
 			} else if (this.account.collapsed && !this.account.showSubscribedOnly) {
 				return t('mail', 'Show all folders')
 			}
-			return t('mail', 'Collapse mailboxes')
+			return t('mail', 'Collapse folders')
 		},
 	},
 	methods: {
diff --git a/src/store/mainStore/actions.js b/src/store/mainStore/actions.js
index 6cc5098356..9511266ec1 100644
--- a/src/store/mainStore/actions.js
+++ b/src/store/mainStore/actions.js
@@ -280,7 +280,7 @@ export default function mainStoreActions() {
 					key,
 					value,
 				})
-				return await savePreference('account-settings', JSON.stringify(this.getAllAccountSettings))
+				return await savePreference('account-settings', JSON.stringify(this.allAccountSettings))
 			})
 		},
 		async deleteAccount(account) {