diff --git a/package-lock.json b/package-lock.json
index f785352ea5..1325450c55 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -45,6 +45,7 @@
         "@nextcloud/paths": "^2.2.1",
         "@nextcloud/router": "^3.0.1",
         "@nextcloud/vue": "^8.20.0",
+        "@pinia/testing": "^0.1.6",
         "@riophae/vue-treeselect": "^0.4.0",
         "@vue/babel-preset-app": "^5.0.8",
         "address-rfc2822": "^2.2.2",
@@ -5083,6 +5084,47 @@
         "url": "https://opencollective.com/parcel"
       }
     },
+    "node_modules/@pinia/testing": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/@pinia/testing/-/testing-0.1.7.tgz",
+      "integrity": "sha512-xcDq6Ry/kNhZ5bsUMl7DeoFXwdume1NYzDggCiDUDKoPQ6Mo0eH9VU7bJvBtlurqe6byAntWoX5IhVFqWzRz/Q==",
+      "license": "MIT",
+      "dependencies": {
+        "vue-demi": "^0.14.10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/posva"
+      },
+      "peerDependencies": {
+        "pinia": ">=2.2.6"
+      }
+    },
+    "node_modules/@pinia/testing/node_modules/vue-demi": {
+      "version": "0.14.10",
+      "resolved": "https://registry.npmjs.org/vue-demi/-/vue-demi-0.14.10.tgz",
+      "integrity": "sha512-nMZBOwuzabUO0nLgIcc6rycZEebF6eeUfaiQx9+WSk8e29IbLvPU9feI6tqW4kTo3hvoYAJkMh8n8D0fuISphg==",
+      "hasInstallScript": true,
+      "license": "MIT",
+      "bin": {
+        "vue-demi-fix": "bin/vue-demi-fix.js",
+        "vue-demi-switch": "bin/vue-demi-switch.js"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/antfu"
+      },
+      "peerDependencies": {
+        "@vue/composition-api": "^1.0.0-rc.1",
+        "vue": "^3.0.0-0 || ^2.6.0"
+      },
+      "peerDependenciesMeta": {
+        "@vue/composition-api": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/@pkgjs/parseargs": {
       "version": "0.11.0",
       "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz",
diff --git a/package.json b/package.json
index c080a8cee4..961d445718 100644
--- a/package.json
+++ b/package.json
@@ -51,6 +51,7 @@
     "@nextcloud/paths": "^2.2.1",
     "@nextcloud/router": "^3.0.1",
     "@nextcloud/vue": "^8.20.0",
+    "@pinia/testing": "^0.1.6",
     "@riophae/vue-treeselect": "^0.4.0",
     "@vue/babel-preset-app": "^5.0.8",
     "address-rfc2822": "^2.2.2",
diff --git a/src/App.vue b/src/App.vue
index 99644e408b..d321538c83 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -8,22 +8,25 @@
 </template>
 
 <script>
-import { mapGetters } from 'vuex'
 import { showError } from '@nextcloud/dialogs'
 import { translate as t } from '@nextcloud/l10n'
 
 import logger from './logger.js'
 import { matchError } from './errors/match.js'
 import MailboxLockedError from './errors/MailboxLockedError.js'
+import { mapStores, mapState } from 'pinia'
+import useMainStore from './store/mainStore.js'
+import initAfterAppCreation from './init.js'
 
 export default {
 	name: 'App',
 	computed: {
-		...mapGetters([
+		...mapStores(useMainStore),
+		...mapState(useMainStore, [
 			'isExpiredSession',
 		]),
 		hasMailAccounts() {
-			return !!this.$store.getters.accounts.find((account) => !account.isUnified)
+			return !!this.mainStore.getAccounts.find((account) => !account.isUnified)
 		},
 	},
 	watch: {
@@ -38,6 +41,7 @@ export default {
 		},
 	},
 	async mounted() {
+		initAfterAppCreation()
 		// Redirect to setup page if no accounts are configured
 		if (!this.hasMailAccounts) {
 			this.$router.replace({
@@ -46,9 +50,9 @@ export default {
 		}
 
 		this.sync()
-		await this.$store.dispatch('fetchCurrentUserPrincipal')
-		await this.$store.dispatch('loadCollections')
-		this.$store.commit('hasCurrentUserPrincipalAndCollections', true)
+		await this.mainStore.fetchCurrentUserPrincipal()
+		await this.mainStore.loadCollections()
+		this.mainStore.hasCurrentUserPrincipalAndCollectionsMutation(true)
 	},
 	methods: {
 		reload() {
@@ -57,7 +61,7 @@ export default {
 		sync() {
 			setTimeout(async () => {
 				try {
-					await this.$store.dispatch('syncInboxes')
+					await this.mainStore.syncInboxes()
 
 					logger.debug("Inboxes sync'ed in background")
 				} catch (error) {
diff --git a/src/components/AccountDefaultsSettings.vue b/src/components/AccountDefaultsSettings.vue
index a59f76cd65..ff6254db51 100644
--- a/src/components/AccountDefaultsSettings.vue
+++ b/src/components/AccountDefaultsSettings.vue
@@ -41,6 +41,8 @@
 <script>
 import logger from '../logger.js'
 import MailboxInlinePicker from './MailboxInlinePicker.vue'
+import { mapStores } from 'pinia'
+import useMainStore from '../store/mainStore.js'
 
 export default {
 	name: 'AccountDefaultsSettings',
@@ -59,9 +61,10 @@ export default {
 		}
 	},
 	computed: {
+		...mapStores(useMainStore),
 		draftsMailbox: {
 			get() {
-				const mb = this.$store.getters.getMailbox(this.account.draftsMailboxId)
+				const mb = this.mainStore.getMailbox(this.account.draftsMailboxId)
 				if (!mb) {
 					return
 				}
@@ -71,7 +74,7 @@ export default {
 				logger.debug('setting drafts mailbox to ' + draftsMailboxId)
 				this.saving = true
 				try {
-					await this.$store.dispatch('patchAccount', {
+					await this.mainStore.patchAccount({
 						account: this.account,
 						data: {
 							draftsMailboxId,
@@ -88,7 +91,7 @@ export default {
 		},
 		sentMailbox: {
 			get() {
-				const mb = this.$store.getters.getMailbox(this.account.sentMailboxId)
+				const mb = this.mainStore.getMailbox(this.account.sentMailboxId)
 				if (!mb) {
 					return
 				}
@@ -98,7 +101,7 @@ export default {
 				logger.debug('setting sent mailbox to ' + sentMailboxId)
 				this.saving = true
 				try {
-					await this.$store.dispatch('patchAccount', {
+					await this.mainStore.patchAccount({
 						account: this.account,
 						data: {
 							sentMailboxId,
@@ -115,7 +118,7 @@ export default {
 		},
 		trashMailbox: {
 			get() {
-				const mb = this.$store.getters.getMailbox(this.account.trashMailboxId)
+				const mb = this.mainStore.getMailbox(this.account.trashMailboxId)
 				if (!mb) {
 					return
 				}
@@ -125,7 +128,7 @@ export default {
 				logger.debug('setting trash mailbox to ' + trashMailboxId)
 				this.saving = true
 				try {
-					await this.$store.dispatch('patchAccount', {
+					await this.mainStore.patchAccount({
 						account: this.account,
 						data: {
 							trashMailboxId,
@@ -142,7 +145,7 @@ export default {
 		},
 		archiveMailbox: {
 			get() {
-				const mb = this.$store.getters.getMailbox(this.account.archiveMailboxId)
+				const mb = this.mainStore.getMailbox(this.account.archiveMailboxId)
 				if (!mb) {
 					return
 				}
@@ -152,7 +155,7 @@ export default {
 				logger.debug('setting archive mailbox to ' + archiveMailboxId)
 				this.saving = true
 				try {
-					await this.$store.dispatch('patchAccount', {
+					await this.mainStore.patchAccount({
 						account: this.account,
 						data: {
 							archiveMailboxId,
@@ -169,7 +172,7 @@ export default {
 		},
 		junkMailbox: {
 			get() {
-				const mb = this.$store.getters.getMailbox(this.account.junkMailboxId)
+				const mb = this.mainStore.getMailbox(this.account.junkMailboxId)
 				if (!mb) {
 					return
 				}
@@ -179,7 +182,7 @@ export default {
 				logger.debug('setting junk mailbox to ' + junkMailboxId)
 				this.saving = true
 				try {
-					await this.$store.dispatch('patchAccount', {
+					await this.mainStore.patchAccount({
 						account: this.account,
 						data: {
 							junkMailboxId,
@@ -196,7 +199,7 @@ export default {
 		},
 		snoozeMailbox: {
 			get() {
-				const mb = this.$store.getters.getMailbox(this.account.snoozeMailboxId)
+				const mb = this.mainStore.getMailbox(this.account.snoozeMailboxId)
 				if (!mb) {
 					return
 				}
@@ -206,7 +209,7 @@ export default {
 				logger.debug('setting snooze mailbox to ' + snoozeMailboxId)
 				this.saving = true
 				try {
-					await this.$store.dispatch('patchAccount', {
+					await this.mainStore.patchAccount({
 						account: this.account,
 						data: {
 							snoozeMailboxId,
diff --git a/src/components/AccountForm.vue b/src/components/AccountForm.vue
index 833b82d04d..8cad0c3454 100644
--- a/src/components/AccountForm.vue
+++ b/src/components/AccountForm.vue
@@ -239,7 +239,6 @@
 
 <script>
 import { Tab, Tabs } from 'vue-tabs-component'
-import { mapGetters } from 'vuex'
 import { NcButton as ButtonVue, NcLoadingIcon as IconLoading, NcPasswordField, NcInputField, NcCheckboxRadioSwitch } from '@nextcloud/vue'
 import IconCheck from 'vue-material-design-icons/Check.vue'
 import { translate as t } from '@nextcloud/l10n'
@@ -251,6 +250,8 @@ import {
 	testConnectivity,
 } from '../service/AutoConfigService.js'
 import { CONSENT_ABORTED, getUserConsent } from '../integration/oauth.js'
+import useMainStore from '../store/mainStore.js'
+import { mapStores, mapState } from 'pinia'
 
 export default {
 	name: 'AccountForm',
@@ -314,7 +315,8 @@ export default {
 		}
 	},
 	computed: {
-		...mapGetters([
+		...mapStores(useMainStore),
+		...mapState(useMainStore, [
 			'googleOauthUrl',
 			'microsoftOauthUrl',
 		]),
@@ -563,7 +565,7 @@ export default {
 					delete data.smtpPassword
 				}
 				if (!this.account) {
-					const account = await this.$store.dispatch('startAccountSetup', data)
+					const account = await this.mainStore.startAccountSetup(data)
 					if (this.useOauth) {
 						this.loadingMessage = t('mail', 'Awaiting user consent')
 						try {
@@ -584,18 +586,18 @@ export default {
 							}
 						} catch (e) {
 							// Clean up the temporary account before we continue
-							this.$store.dispatch('deleteAccount', account)
+							this.mainStore.deleteAccount(account)
 							logger.info(`Temporary account ${account.id} deleted`)
 							throw e
 						}
 						this.clearFeedback()
 					}
 					this.loadingMessage = t('mail', 'Loading account')
-					await this.$store.dispatch('finishAccountSetup', { account })
+					await this.mainStore.finishAccountSetup({ account })
 					this.$emit('account-created', account)
 				} else {
 					const oldAccountData = this.account
-					const account = await this.$store.dispatch('updateAccount', {
+					const account = await this.mainStore.updateAccount({
 						...data,
 						accountId: this.account.id,
 					})
@@ -619,7 +621,7 @@ export default {
 							}
 						} catch (e) {
 							// Undo changes
-							await this.$store.dispatch('updateAccount', {
+							await this.mainStore.updateAccount({
 								...oldAccountData,
 								accountId: oldAccountData.id,
 							})
diff --git a/src/components/AccountSettings.vue b/src/components/AccountSettings.vue
index 92f106a71d..3a0e3b56c4 100644
--- a/src/components/AccountSettings.vue
+++ b/src/components/AccountSettings.vue
@@ -112,6 +112,8 @@ import SearchSettings from './SearchSettings.vue'
 import TrashRetentionSettings from './TrashRetentionSettings.vue'
 import logger from '../logger.js'
 import MailFilters from './mailFilter/MailFilters.vue'
+import useMainStore from '../store/mainStore.js'
+import { mapStores } from 'pinia'
 
 export default {
 	name: 'AccountSettings',
@@ -148,6 +150,7 @@ export default {
 		}
 	},
 	computed: {
+		...mapStores(useMainStore),
 		displayName() {
 			return this.account.name
 		},
@@ -160,7 +163,7 @@ export default {
 			if (newState === true && this.fetchActiveSieveScript === true) {
 				logger.debug(`Load active sieve script for account ${this.account.accountId}`)
 				this.fetchActiveSieveScript = false
-				this.$store.dispatch('fetchActiveSieveScript', {
+				this.mainStore.fetchActiveSieveScript({
 					accountId: this.account.id,
 				})
 			}
diff --git a/src/components/AliasSettings.vue b/src/components/AliasSettings.vue
index f20cc33023..2f85d0ff66 100644
--- a/src/components/AliasSettings.vue
+++ b/src/components/AliasSettings.vue
@@ -83,6 +83,8 @@ import IconCheck from 'vue-material-design-icons/Check.vue'
 import IconRename from 'vue-material-design-icons/Pencil.vue'
 import logger from '../logger.js'
 import AliasForm from './AliasForm.vue'
+import useMainStore from '../store/mainStore.js'
+import { mapStores } from 'pinia'
 
 export default {
 	name: 'AliasSettings',
@@ -108,6 +110,7 @@ export default {
 		}
 	},
 	computed: {
+		...mapStores(useMainStore),
 		aliases() {
 			return this.account.aliases
 		},
@@ -124,7 +127,7 @@ export default {
 		async createAlias() {
 			this.loading = true
 
-			await this.$store.dispatch('createAlias', {
+			await this.mainStore.createAlias({
 				account: this.account,
 				alias: this.newAlias,
 				name: this.newName,
@@ -147,7 +150,7 @@ export default {
 
 		async updateAlias(aliasId, newAlias) {
 			const alias = this.aliases.find((alias) => alias.id === aliasId)
-			await this.$store.dispatch('updateAlias', {
+			await this.mainStore.updateAlias({
 				account: this.account,
 				aliasId: alias.id,
 				alias: newAlias.alias,
@@ -156,7 +159,7 @@ export default {
 			})
 		},
 		async deleteAlias(aliasId) {
-			await this.$store.dispatch('deleteAlias', {
+			await this.mainStore.deleteAlias({
 				account: this.account,
 				aliasId,
 			})
diff --git a/src/components/AppSettingsMenu.vue b/src/components/AppSettingsMenu.vue
index 8d47b798ec..51496c7e8e 100755
--- a/src/components/AppSettingsMenu.vue
+++ b/src/components/AppSettingsMenu.vue
@@ -22,7 +22,7 @@
 
 				<h6>{{ t('mail', 'Account settings') }}</h6>
 				<p>{{ t('mail', 'Settings for:') }}</p>
-				<li v-for="account in accounts" :key="account.id">
+				<li v-for="account in getAccounts" :key="account.id">
 					<NcButton v-if="account && account.emailAddress"
 						class="app-settings-button"
 						type="secondary"
@@ -235,7 +235,7 @@
 						@change="onToggleAutoTagging">
 					<label for="auto-tagging-toggle">{{ autoTaggingText }}</label>
 				</p>
-				<p v-if="isFollowUpFeatureAvailable" class="app-settings">
+				<p v-if="followUpFeatureAvailable" class="app-settings">
 					<input id="follow-up-reminder-toggle"
 						class="checkbox"
 						type="checkbox"
@@ -312,7 +312,8 @@ import SmimeCertificateModal from './smime/SmimeCertificateModal.vue'
 import TrustedSenders from './TrustedSenders.vue'
 import InternalAddress from './InternalAddress.vue'
 import isMobile from '@nextcloud/vue/dist/Mixins/isMobile.js'
-import { mapGetters } from 'vuex'
+import useMainStore from '../store/mainStore.js'
+import { mapStores, mapState } from 'pinia'
 
 export default {
 	name: 'AppSettingsMenu',
@@ -366,38 +367,34 @@ export default {
 		}
 	},
 	computed: {
-		...mapGetters([
-			'isFollowUpFeatureAvailable',
-		]),
-		...mapGetters({
-			accounts: 'accounts',
-		}),
+		...mapStores(useMainStore),
+		...mapState(useMainStore, ['getAccounts', 'followUpFeatureAvailable']),
 		searchPriorityBody() {
-			return this.$store.getters.getPreference('search-priority-body', 'false') === 'true'
+			return this.mainStore.getPreference('search-priority-body', 'false') === 'true'
 		},
 		useBottomReplies() {
-			return this.$store.getters.getPreference('reply-mode', 'top') === 'bottom'
+			return this.mainStore.getPreference('reply-mode', 'top') === 'bottom'
 		},
 		useExternalAvatars() {
-			return this.$store.getters.getPreference('external-avatars', 'true') === 'true'
+			return this.mainStore.getPreference('external-avatars', 'true') === 'true'
 		},
 		useDataCollection() {
-			return this.$store.getters.getPreference('collect-data', 'true') === 'true'
+			return this.mainStore.getPreference('collect-data', 'true') === 'true'
 		},
 		useAutoTagging() {
-			return this.$store.getters.getPreference('tag-classified-messages', 'true') === 'true'
+			return this.mainStore.getPreference('tag-classified-messages', 'true') === 'true'
 		},
 		useInternalAddresses() {
-			return this.$store.getters.getPreference('internal-addresses', 'false') === 'true'
+			return this.mainStore.getPreference('internal-addresses', 'false') === 'true'
 		},
 		useFollowUpReminders() {
-			return this.$store.getters.getPreference('follow-up-reminders', 'true') === 'true'
+			return this.mainStore.getPreference('follow-up-reminders', 'true') === 'true'
 		},
 		allowNewMailAccounts() {
-			return this.$store.getters.getPreference('allow-new-accounts', true)
+			return this.mainStore.getPreference('allow-new-accounts', true)
 		},
 		layoutMode() {
-			return this.$store.getters.getPreference('layout-mode', 'vertical-split')
+			return this.mainStore.getPreference('layout-mode', 'vertical-split')
 		},
 	},
 	watch: {
@@ -413,7 +410,7 @@ export default {
 		},
 	},
 	mounted() {
-		this.sortOrder = this.$store.getters.getPreference('sort-order', 'newest')
+		this.sortOrder = this.mainStore.getPreference('sort-order', 'newest')
 		document.addEventListener.call(window, 'mailvelope', () => this.checkMailvelope())
 	},
 	updated() {
@@ -424,7 +421,7 @@ export default {
 			this.showAccountSettings = false
 		},
 		openAccountSettings(accountId) {
-			this.$store.commit('showSettingsForAccount', accountId)
+			this.mainStore.showSettingsForAccountMutation(accountId)
 			this.showSettings = false
 		},
 		checkMailvelope() {
@@ -432,7 +429,7 @@ export default {
 		},
 		async setLayout(layoutMode) {
 			try {
-				await this.$store.dispatch('savePreference', {
+				await this.mainStore.savePreference({
 					key: 'layout-mode',
 					value: layoutMode,
 				})
@@ -446,11 +443,10 @@ export default {
 		onToggleButtonReplies(e) {
 			this.loadingReplySettings = true
 
-			this.$store
-				.dispatch('savePreference', {
-					key: 'reply-mode',
-					value: e.target.checked ? 'bottom' : 'top',
-				})
+			this.mainStore.savePreference({
+				key: 'reply-mode',
+				value: e.target.checked ? 'bottom' : 'top',
+			})
 				.catch((error) => Logger.error('could not save preferences', { error }))
 				.then(() => {
 					this.loadingReplySettings = false
@@ -459,11 +455,10 @@ export default {
 		onToggleExternalAvatars(e) {
 			this.loadingAvatarSettings = true
 
-			this.$store
-				.dispatch('savePreference', {
-					key: 'external-avatars',
-					value: e.target.checked ? 'true' : 'false',
-				})
+			this.mainStore.savePreference({
+				key: 'external-avatars',
+				value: e.target.checked ? 'true' : 'false',
+			})
 				.catch((error) => Logger.error('could not save preferences', { error }))
 				.then(() => {
 					this.loadingAvatarSettings = false
@@ -472,11 +467,10 @@ export default {
 		async onToggleSearchPriorityBody(e) {
 			this.loadingPrioritySettings = true
 			try {
-				await this.$store
-					.dispatch('savePreference', {
-						key: 'search-priority-body',
-						value: e.target.checked ? 'true' : 'false',
-					})
+				await this.mainStore.savePreference({
+					key: 'search-priority-body',
+					value: e.target.checked ? 'true' : 'false',
+				})
 			} catch (error) {
 				Logger.error('could not save preferences', { error })
 			} finally {
@@ -486,11 +480,10 @@ export default {
 		onToggleCollectData(e) {
 			this.loadingOptOutSettings = true
 
-			this.$store
-				.dispatch('savePreference', {
-					key: 'collect-data',
-					value: e.target.checked ? 'true' : 'false',
-				})
+			this.mainStore.savePreference({
+				key: 'collect-data',
+				value: e.target.checked ? 'true' : 'false',
+			})
 				.catch((error) => Logger.error('could not save preferences', { error }))
 				.then(() => {
 					this.loadingOptOutSettings = false
@@ -500,13 +493,11 @@ export default {
 			const previousValue = this.sortOrder
 			try {
 				this.sortOrder = e
-				await this.$store
-					.dispatch('savePreference', {
-						key: 'sort-order',
-						value: e,
-					})
-				this.$store.commit('removeAllEnvelopes')
-
+				await this.mainStore.savePreference({
+					key: 'sort-order',
+					value: e,
+				})
+				this.mainStore.removeAllEnvelopesMutation()
 			} catch (error) {
 				Logger.error('could not save preferences', { error })
 				this.sortOrder = previousValue
@@ -517,11 +508,10 @@ export default {
 			this.toggleAutoTagging = true
 
 			try {
-				await this.$store
-					.dispatch('savePreference', {
-						key: 'tag-classified-messages',
-						value: e.target.checked ? 'true' : 'false',
-					})
+				await this.mainStore.savePreference({
+					key: 'tag-classified-messages',
+					value: e.target.checked ? 'true' : 'false',
+				})
 			} catch (error) {
 				Logger.error('could not save preferences', { error })
 
@@ -532,7 +522,7 @@ export default {
 		},
 		async onToggleFollowUpReminders(e) {
 			try {
-				await this.$store.dispatch('savePreference', {
+				await this.mainStore.savePreference({
 					key: 'follow-up-reminders',
 					value: e.target.checked ? 'true' : 'false',
 				})
@@ -543,7 +533,7 @@ export default {
 		},
 		async onToggleInternalAddress(e) {
 			try {
-				await this.$store.dispatch('savePreference', {
+				await this.mainStore.savePreference({
 					key: 'internal-addresses',
 					value: e.target.checked ? 'true' : 'false',
 				})
diff --git a/src/components/CertificateSettings.vue b/src/components/CertificateSettings.vue
index 80d795e540..edb0a88342 100644
--- a/src/components/CertificateSettings.vue
+++ b/src/components/CertificateSettings.vue
@@ -36,10 +36,11 @@
 <script>
 import { NcSelect, NcButton, NcNoteCard } from '@nextcloud/vue'
 import { compareSmimeCertificates } from '../util/smime.js'
-import { mapGetters } from 'vuex'
 import { showError, showSuccess } from '@nextcloud/dialogs'
 import Logger from '../logger.js'
 import moment from '@nextcloud/moment'
+import useMainStore from '../store/mainStore.js'
+import { mapStores, mapState } from 'pinia'
 
 export default {
 	name: 'CertificateSettings',
@@ -61,7 +62,8 @@ export default {
 		}
 	},
 	computed: {
-		...mapGetters({
+		...mapStores(useMainStore),
+		...mapState(useMainStore, {
 			smimeCertificates: 'getSmimeCertificates',
 		}),
 		savedCertificate: {
@@ -133,7 +135,7 @@ export default {
 	methods: {
 		async updateSmimeCertificate() {
 			if (this.alias.isAccountCertificate) {
-				await this.$store.dispatch('updateAccountSmimeCertificate', {
+				await this.mainStore.updateAccountSmimeCertificate({
 					account: this.account,
 					smimeCertificateId: this.certificate.id,
 				}).then(() => {
@@ -144,7 +146,7 @@ export default {
 				},
 				)
 			} else {
-				await this.$store.dispatch('updateAlias', {
+				await this.mainStore.updateAlias({
 					account: this.account,
 					aliasId: this.alias.id,
 					alias: this.alias.alias,
diff --git a/src/components/Composer.vue b/src/components/Composer.vue
index 32d20b9c93..619e1c73f8 100644
--- a/src/components/Composer.vue
+++ b/src/components/Composer.vue
@@ -496,9 +496,10 @@ import { NcReferencePickerModal } from '@nextcloud/vue/dist/Components/NcRichTex
 import Send from 'vue-material-design-icons/Send.vue'
 import SendClock from 'vue-material-design-icons/SendClock.vue'
 import moment from '@nextcloud/moment'
-import { mapGetters } from 'vuex'
 import { TRIGGER_CHANGE_ALIAS, TRIGGER_EDITOR_READY } from '../ckeditor/signature/InsertSignatureCommand.js'
 import { EDITOR_MODE_HTML, EDITOR_MODE_TEXT } from '../store/constants.js'
+import useMainStore from '../store/mainStore.js'
+import { mapStores, mapState } from 'pinia'
 
 const debouncedSearch = debouncePromise(findRecipient, 500)
 
@@ -694,11 +695,10 @@ export default {
 		}
 	},
 	computed: {
-		...mapGetters([
-			'isScheduledSendingDisabled',
-		]),
+		...mapStores(useMainStore),
+		...mapState(useMainStore, ['isScheduledSendingDisabled']),
 		isPickerAvailable() {
-			return parseInt(this.$store.getters.getNcVersion) >= 26
+			return parseInt(this.mainStore.getNcVersion) >= 26
 		},
 		aliases() {
 			let cnt = 0
@@ -740,7 +740,7 @@ export default {
 			return new Date(new Date().setDate(new Date().getDate()))
 		},
 		attachmentSizeLimit() {
-			return this.$store.getters.getPreference('attachment-size-limit')
+			return this.mainStore.getPreference('attachment-size-limit')
 		},
 		selectableRecipients() {
 			return uniqBy('email')(this.newRecipients
@@ -881,7 +881,7 @@ export default {
 			const missingCertificates = []
 
 			this.allRecipients.forEach((recipient) => {
-				const recipientCertificate = this.$store.getters.getSmimeCertificateByEmail(recipient.email)
+				const recipientCertificate = this.mainStore.getSmimeCertificateByEmail(recipient.email)
 				if (!recipientCertificate) {
 					missingCertificates.push(recipient.email)
 				}
@@ -968,7 +968,7 @@ export default {
 
 		// Add messages forwarded as attachments
 		for (const id of this.forwardedMessages) {
-			const env = this.$store.getters.getEnvelope(id)
+			const env = this.mainStore.getEnvelope(id)
 			if (!env) {
 				// TODO: also happens when the composer page is reloaded
 				showError(t('mail', 'Message {id} could not be found', {
@@ -1032,7 +1032,7 @@ export default {
 					return alias.id === this.fromAccount && !alias.aliasId
 				})
 			} else {
-				const currentAccountId = this.$store.getters.getMailbox(this.$route.params.mailboxId)?.accountId
+				const currentAccountId = this.mainStore.getMailbox(this.$route.params.mailboxId)?.accountId
 				if (currentAccountId) {
 					this.selectedAlias = this.aliases.find((alias) => {
 						return alias.id === currentAccountId
@@ -1064,14 +1064,14 @@ export default {
 					this.editorPlainText ? toPlain(this.body) : toHtml(this.body),
 					this.replyTo.from[0],
 					this.replyTo.dateInt,
-					this.$store.getters.getPreference('reply-mode', 'top') === 'top',
+					this.mainStore.getPreference('reply-mode', 'top') === 'top',
 				).value
 			} else if (this.forwardFrom && this.isFirstOpen) {
 				body = buildReplyBody(
 					this.editorPlainText ? toPlain(this.body) : toHtml(this.body),
 					this.forwardFrom.from[0],
 					this.forwardFrom.dateInt,
-					this.$store.getters.getPreference('reply-mode', 'top') === 'top',
+					this.mainStore.getPreference('reply-mode', 'top') === 'top',
 				).value
 			} else {
 				body = this.bodyVal
@@ -1411,7 +1411,7 @@ export default {
 			if (!certificateId) {
 				return undefined
 			}
-			return this.$store.getters.getSmimeCertificate(certificateId)
+			return this.mainStore.getSmimeCertificate(certificateId)
 		},
 
 		/**
diff --git a/src/components/ComposerSessionIndicator.vue b/src/components/ComposerSessionIndicator.vue
index 3e9a7be0d6..52342b7114 100644
--- a/src/components/ComposerSessionIndicator.vue
+++ b/src/components/ComposerSessionIndicator.vue
@@ -38,11 +38,12 @@
 </template>
 
 <script>
-import { mapGetters } from 'vuex'
 import { NcActions, NcActionButton } from '@nextcloud/vue'
 import PencilIcon from 'vue-material-design-icons/Pencil.vue'
 import ArrowExpandIcon from 'vue-material-design-icons/ArrowExpand.vue'
 import CloseIcon from 'vue-material-design-icons/Close.vue'
+import useMainStore from '../store/mainStore.js'
+import { mapStores, mapState } from 'pinia'
 
 export default {
 	name: 'ComposerSessionIndicator',
@@ -59,7 +60,8 @@ export default {
 		}
 	},
 	computed: {
-		...mapGetters(['composerMessage']),
+		...mapStores(useMainStore),
+		...mapState(useMainStore, ['composerMessage']),
 		title() {
 			return this.composerMessage?.data.subject || t('mail', 'Untitled message')
 		},
@@ -73,7 +75,7 @@ export default {
 				return
 			}
 
-			await this.$store.dispatch('showMessageComposer')
+			await this.mainStore.showMessageComposerMutation()
 		},
 		onClose() {
 			if (this.disabled) {
diff --git a/src/components/DeleteTagModal.vue b/src/components/DeleteTagModal.vue
index 4429bd8316..6a6dacda69 100644
--- a/src/components/DeleteTagModal.vue
+++ b/src/components/DeleteTagModal.vue
@@ -13,6 +13,9 @@
 <script>
 import { showSuccess, showInfo } from '@nextcloud/dialogs'
 import ConfirmationModal from './ConfirmationModal.vue'
+import useMainStore from '../store/mainStore.js'
+import { mapStores } from 'pinia'
+
 export default {
 	name: 'DeleteTagModal',
 	components: {
@@ -38,20 +41,23 @@ export default {
 			deleting: false,
 		}
 	},
+	computed: {
+		...mapStores(useMainStore),
+	},
 	methods: {
 		onClose() {
 			this.$emit('close')
 		},
 		removeTag(imapLabel) {
 			this.envelopes.forEach((envelope) => {
-				this.$store.dispatch('removeEnvelopeTag', { envelope, imapLabel })
+				this.mainStore.removeEnvelopeTag({ envelope, imapLabel })
 			})
 		},
 		async deleteTag() {
 			this.deleting = true
 			try {
 				this.removeTag(this.tag.imapLabel)
-				await this.$store.dispatch('deleteTag', {
+				await this.mainStore.deleteTag({
 					tag: this.tag,
 					accountId: this.accountId,
 				})
diff --git a/src/components/EditorSettings.vue b/src/components/EditorSettings.vue
index 4beb46ac61..0fdea3db5f 100644
--- a/src/components/EditorSettings.vue
+++ b/src/components/EditorSettings.vue
@@ -28,6 +28,8 @@
 
 <script>
 import Logger from '../logger.js'
+import useMainStore from '../store/mainStore.js'
+import { mapStores } from 'pinia'
 
 export default {
 	name: 'EditorSettings',
@@ -42,15 +44,17 @@ export default {
 			mode: this.account.editorMode,
 		}
 	},
+	computed: {
+		...mapStores(useMainStore),
+	},
 	watch: {
 		mode(val, oldVal) {
-			this.$store
-				.dispatch('patchAccount', {
-					account: this.account,
-					data: {
-						editorMode: val,
-					},
-				})
+			this.mainStore.patchAccount({
+				account: this.account,
+				data: {
+					editorMode: val,
+				},
+			})
 				.then(() => {
 					Logger.info('editor mode updated')
 				})
diff --git a/src/components/Envelope.vue b/src/components/Envelope.vue
index b4666ec3a9..2c4ac028aa 100644
--- a/src/components/Envelope.vue
+++ b/src/components/Envelope.vue
@@ -380,7 +380,8 @@ import DownloadIcon from 'vue-material-design-icons/Download.vue'
 import CalendarClock from 'vue-material-design-icons/CalendarClock.vue'
 import AlarmIcon from 'vue-material-design-icons/Alarm.vue'
 import moment from '@nextcloud/moment'
-import { mapGetters } from 'vuex'
+import { mapState, mapStores } from 'pinia'
+import useMainStore from '../store/mainStore.js'
 import { FOLLOW_UP_TAG_LABEL } from '../store/constants.js'
 import { translateTagDisplayName } from '../util/tag.js'
 
@@ -481,14 +482,15 @@ export default {
 		window.addEventListener('resize', this.onWindowResize)
 	},
 	computed: {
-		...mapGetters([
+		...mapStores(useMainStore),
+		...mapState(useMainStore, [
 			'isSnoozeDisabled',
 		]),
 		messageLongDate() {
 			return messageDateTime(new Date(this.data.dateInt))
 		},
 		oneLineLayout() {
-			return this.overwriteOneLineMobile ? false : this.$store.getters.getPreference('layout-mode', 'vertical-split') === 'no-split'
+			return this.overwriteOneLineMobile ? false : this.mainStore.getPreference('layout-mode', 'vertical-split') === 'no-split'
 		},
 		hasMultipleRecipients() {
 			if (!this.account) {
@@ -507,7 +509,7 @@ export default {
 		},
 		account() {
 			const accountId = this.data.accountId
-			return this.$store.getters.getAccount(accountId)
+			return this.mainStore.getAccount(accountId)
 		},
 		link() {
 			if (this.draft) {
@@ -568,12 +570,12 @@ export default {
 				|| (this.data.previewText && isPgpText(this.data.previewText)) // PGP/Mailvelope
 		},
 		isImportant() {
-			return this.$store.getters
+			return this.mainStore
 				.getEnvelopeTags(this.data.databaseId)
 				.some((tag) => tag.imapLabel === '$label1')
 		},
 		tags() {
-			let tags = this.$store.getters.getEnvelopeTags(this.data.databaseId).filter(
+			let tags = this.mainStore.getEnvelopeTags(this.data.databaseId).filter(
 				(tag) => tag.imapLabel && tag.imapLabel !== '$label1' && !(tag.displayName.toLowerCase() in hiddenTags),
 			)
 
@@ -635,7 +637,7 @@ export default {
 			return mailboxHasRights(this.mailbox, 'w')
 		},
 		archiveMailbox() {
-			return this.$store.getters.getMailbox(this.account.archiveMailboxId)
+			return this.mainStore.getMailbox(this.account.archiveMailboxId)
 		},
 		isSnoozedMailbox() {
 			return this.mailbox.databaseId === this.account.snoozeMailboxId
@@ -709,7 +711,7 @@ export default {
 		},
 		async onClick(event) {
 			if (!event.ctrlKey && this.draft && !event.defaultPrevented) {
-				await this.$store.dispatch('startComposerSession', {
+				await this.mainStore.startComposerSession({
 					data: {
 						...this.data,
 						draftId: this.data.databaseId,
@@ -722,23 +724,23 @@ export default {
 			this.$emit('select-multiple')
 		},
 		onToggleImportant() {
-			this.$store.dispatch('toggleEnvelopeImportant', this.data)
+			this.mainStore.toggleEnvelopeImportant(this.data)
 		},
 		onToggleFlagged() {
-			this.$store.dispatch('toggleEnvelopeFlagged', this.data)
+			this.mainStore.toggleEnvelopeFlagged(this.data)
 		},
 		onToggleSeen() {
-			this.$store.dispatch('toggleEnvelopeSeen', { envelope: this.data })
+			this.mainStore.toggleEnvelopeSeen({ envelope: this.data })
 		},
 		async onToggleJunk() {
-			const removeEnvelope = await this.$store.dispatch('moveEnvelopeToJunk', this.data)
+			const removeEnvelope = await this.mainStore.moveEnvelopeToJunk(this.data)
 
 			if (this.isImportant) {
-				await this.$store.dispatch('toggleEnvelopeImportant', this.data)
+				await this.mainStore.toggleEnvelopeImportant(this.data)
 			}
 
 			if (!this.data.flags.seen) {
-				await this.$store.dispatch('toggleEnvelopeSeen', { envelope: this.data })
+				await this.mainStore.toggleEnvelopeSeen({ envelope: this.data })
 			}
 
 			/**
@@ -758,7 +760,7 @@ export default {
 				await this.$emit('delete', this.data.databaseId)
 			}
 
-			await this.$store.dispatch('toggleEnvelopeJunk', {
+			await this.mainStore.toggleEnvelopeJunk({
 				envelope: this.data,
 				removeEnvelope,
 			})
@@ -770,7 +772,7 @@ export default {
 			this.$emit('delete', this.data.databaseId)
 
 			try {
-				await this.$store.dispatch('deleteThread', {
+				await this.mainStore.deleteThread({
 					envelope: this.data,
 				})
 			} catch (error) {
@@ -804,7 +806,7 @@ export default {
 			this.$emit('archive', this.data.databaseId)
 
 			try {
-				await this.$store.dispatch('moveThread', {
+				await this.mainStore.moveThread({
 					envelope: this.data,
 					destMailboxId: this.account.archiveMailboxId,
 				})
@@ -818,11 +820,11 @@ export default {
 			this.setSelected(false)
 
 			if (!this.account.snoozeMailboxId) {
-				await this.$store.dispatch('createAndSetSnoozeMailbox', this.account)
+				await this.mainStore.createAndSetSnoozeMailbox(this.account)
 			}
 
 			try {
-				await this.$store.dispatch('snoozeThread', {
+				await this.mainStore.snoozeThread({
 					envelope: this.data,
 					unixTimestamp: timestamp / 1000,
 					destMailboxId: this.account.snoozeMailboxId,
@@ -838,7 +840,7 @@ export default {
 			this.setSelected(false)
 
 			try {
-				await this.$store.dispatch('unSnoozeThread', {
+				await this.mainStore.unSnoozeThread({
 					envelope: this.data,
 				})
 				showSuccess(t('mail', 'Thread was unsnoozed'))
@@ -848,7 +850,7 @@ export default {
 			}
 		},
 		async onOpenEditAsNew() {
-			await this.$store.dispatch('startComposerSession', {
+			await this.mainStore.startComposerSession({
 				templateMessageId: this.data.databaseId,
 				data: this.data,
 			})
diff --git a/src/components/EnvelopeList.vue b/src/components/EnvelopeList.vue
index 361f86a13b..78cc0e3406 100644
--- a/src/components/EnvelopeList.vue
+++ b/src/components/EnvelopeList.vue
@@ -165,6 +165,8 @@ import TagIcon from 'vue-material-design-icons/Tag.vue'
 import TagModal from './TagModal.vue'
 import EmailRead from 'vue-material-design-icons/EmailOpen.vue'
 import EmailUnread from 'vue-material-design-icons/Email.vue'
+import useMainStore from '../store/mainStore.js'
+import { mapStores } from 'pinia'
 
 export default {
 	name: 'EnvelopeList',
@@ -232,8 +234,9 @@ export default {
 		}
 	},
 	computed: {
+		...mapStores(useMainStore),
 		sortOrder() {
-			return this.$store.getters.getPreference('sort-order', 'newest')
+			return this.mainStore.getPreference('sort-order', 'newest')
 		},
 
 		sortedEnvelops() {
@@ -257,7 +260,7 @@ export default {
 		isAtLeastOneSelectedImportant() {
 			// returns true if at least one selected message is marked as important
 			return this.selectedEnvelopes.some((env) => {
-				return this.$store.getters
+				return this.mainStore
 					.getEnvelopeTags(env.databaseId)
 					.some((tag) => tag.imapLabel === '$label1')
 			})
@@ -265,7 +268,7 @@ export default {
 		isAtLeastOneSelectedUnimportant() {
 			// returns true if at least one selected message is not marked as important
 			return this.selectedEnvelopes.some((env) => {
-				return !this.$store.getters
+				return !this.mainStore
 					.getEnvelopeTags(env.databaseId)
 					.some((tag) => tag.imapLabel === '$label1')
 			})
@@ -323,7 +326,7 @@ export default {
 		},
 		markSelectedRead() {
 			this.selectedEnvelopes.forEach((envelope) => {
-				this.$store.dispatch('toggleEnvelopeSeen', {
+				this.mainStore.toggleEnvelopeSeen({
 					envelope,
 					seen: true,
 				})
@@ -332,7 +335,7 @@ export default {
 		},
 		markSelectedUnread() {
 			this.selectedEnvelopes.forEach((envelope) => {
-				this.$store.dispatch('toggleEnvelopeSeen', {
+				this.mainStore.toggleEnvelopeSeen({
 					envelope,
 					seen: false,
 				})
@@ -341,7 +344,7 @@ export default {
 		},
 		markSelectionImportant() {
 			this.selectedEnvelopes.forEach((envelope) => {
-				this.$store.dispatch('markEnvelopeImportantOrUnimportant', {
+				this.mainStore.markEnvelopeImportantOrUnimportant({
 					envelope,
 					addTag: true,
 				})
@@ -350,7 +353,7 @@ export default {
 		},
 		markSelectionUnimportant() {
 			this.selectedEnvelopes.forEach((envelope) => {
-				this.$store.dispatch('markEnvelopeImportantOrUnimportant', {
+				this.mainStore.markEnvelopeImportantOrUnimportant({
 					envelope,
 					addTag: false,
 				})
@@ -360,9 +363,9 @@ export default {
 		async markSelectionJunk() {
 			for (const envelope of this.selectedEnvelopes) {
 				if (!envelope.flags.$junk) {
-					await this.$store.dispatch('toggleEnvelopeJunk', {
+					await this.mainStore.toggleEnvelopeJunk({
 						envelope,
-						removeEnvelope: await this.$store.dispatch('moveEnvelopeToJunk', envelope),
+						removeEnvelope: await this.mainStore.moveEnvelopeToJunk(envelope),
 					})
 				}
 			}
@@ -371,9 +374,9 @@ export default {
 		async markSelectionNotJunk() {
 			for (const envelope of this.selectedEnvelopes) {
 				if (envelope.flags.$junk) {
-					await this.$store.dispatch('toggleEnvelopeJunk', {
+					await this.mainStore.toggleEnvelopeJunk({
 						envelope,
-						removeEnvelope: await this.$store.dispatch('moveEnvelopeToJunk', envelope),
+						removeEnvelope: await this.mainStore.moveEnvelopeToJunk(envelope),
 					})
 				}
 			}
@@ -382,7 +385,7 @@ export default {
 		favoriteAll() {
 			const favFlag = !this.isAtLeastOneSelectedUnFavorite
 			this.selectedEnvelopes.forEach((envelope) => {
-				this.$store.dispatch('markEnvelopeFavoriteOrUnfavorite', {
+				this.mainStore.markEnvelopeFavoriteOrUnfavorite({
 					envelope,
 					favFlag,
 				})
@@ -392,7 +395,7 @@ export default {
 		unFavoriteAll() {
 			const favFlag = !this.isAtLeastOneSelectedFavorite
 			this.selectedEnvelopes.forEach((envelope) => {
-				this.$store.dispatch('markEnvelopeFavoriteOrUnfavorite', {
+				this.mainStore.markEnvelopeFavoriteOrUnfavorite({
 					envelope,
 					favFlag,
 				})
@@ -420,7 +423,7 @@ export default {
 
 			await Promise.all(this.selectedEnvelopes.map(async (envelope) => {
 				logger.info(`deleting thread ${envelope.threadRootId}`)
-				await this.$store.dispatch('deleteThread', {
+				await this.mainStore.deleteThread({
 					envelope,
 				})
 			})).catch(async error => {
@@ -444,7 +447,7 @@ export default {
 				})
 
 				// Get new messages
-				await this.$store.dispatch('fetchNextEnvelopes', {
+				await this.mainStore.fetchNextEnvelopes({
 					mailboxId: this.mailbox.databaseId,
 					query: this.searchQuery,
 					quantity: this.selectedEnvelopes.length,
@@ -505,7 +508,7 @@ export default {
 			this.showTagModal = false
 		},
 		async forwardSelectedAsAttachment() {
-			await this.$store.dispatch('startComposerSession', {
+			await this.mainStore.startComposerSession({
 				forwardedMessages: [...this.selection],
 			})
 			this.unselectAll()
diff --git a/src/components/Imip.vue b/src/components/Imip.vue
index 18203992ff..bc7a5ff725 100644
--- a/src/components/Imip.vue
+++ b/src/components/Imip.vue
@@ -109,7 +109,6 @@ import { NcButton, NcSelect, NcLoadingIcon } from '@nextcloud/vue'
 import CloseIcon from 'vue-material-design-icons/Close.vue'
 import CalendarIcon from 'vue-material-design-icons/Calendar.vue'
 import { getParserManager, Parameter, Property } from '@nextcloud/calendar-js'
-import { mapGetters } from 'vuex'
 import { removeMailtoPrefix } from '../util/eventAttendee.js'
 import logger from '../logger.js'
 import { namespaces as NS } from '@nextcloud/cdav-library'
@@ -119,6 +118,8 @@ import { randomId } from '../util/randomId.js'
 import pLimit from 'p-limit'
 import { flatten } from 'ramda'
 import { showError } from '@nextcloud/dialogs'
+import useMainStore from '../store/mainStore.js'
+import { mapState } from 'pinia'
 
 // iMIP methods
 const REQUEST = 'REQUEST'
@@ -189,7 +190,7 @@ export default {
 		}
 	},
 	computed: {
-		...mapGetters({
+		...mapState(useMainStore, {
 			currentUserPrincipalEmail: 'getCurrentUserPrincipalEmail',
 			clonedWriteableCalendars: 'getClonedWriteableCalendars',
 		}),
diff --git a/src/components/InternalAddress.vue b/src/components/InternalAddress.vue
index 05c8043baf..3220b553e2 100644
--- a/src/components/InternalAddress.vue
+++ b/src/components/InternalAddress.vue
@@ -59,6 +59,8 @@ import IconCancel from '@mdi/svg/svg/cancel.svg'
 import IconCheck from '@mdi/svg/svg/check.svg'
 import logger from '../logger.js'
 import { showError } from '@nextcloud/dialogs'
+import { mapStores } from 'pinia'
+import useMainStore from '../store/mainStore.js'
 
 const sortByAddress = sortBy(prop('address'))
 
@@ -91,8 +93,9 @@ export default {
 		}
 	},
 	computed: {
+		...mapStores(useMainStore),
 		list() {
-			return this.$store.getters.getInternalAddresses
+			return this.mainStore.getInternalAddresses
 		},
 		sortedDomains() {
 			return sortByAddress(this.list.filter(a => a.type === 'domain'))
@@ -105,7 +108,7 @@ export default {
 		async removeInternalAddress(sender) {
 			// Remove the item immediately
 			try {
-				await this.$store.dispatch('removeInternalAddress', { id: sender.id, address: sender.address, type: sender.type })
+				await this.mainStore.removeInternalAddress({ id: sender.id, address: sender.address, type: sender.type })
 			} catch (error) {
 				logger.error(`Could not remove internal address ${sender.email}`, {
 					error,
@@ -118,7 +121,7 @@ export default {
 		async addInternalAddress() {
 			const type = this.checkType()
 			try {
-				await this.$store.dispatch('addInternalAddress', {
+				await this.mainStore.addInternalAddress({
 					address: this.newAddress,
 					type,
 				}).then(async () => {
diff --git a/src/components/Mailbox.vue b/src/components/Mailbox.vue
index 6ef3a9323d..cb37f50f29 100644
--- a/src/components/Mailbox.vue
+++ b/src/components/Mailbox.vue
@@ -46,6 +46,8 @@ import EmptyMailboxSection from './EmptyMailboxSection.vue'
 import { showError, showWarning } from '@nextcloud/dialogs'
 import NoTrashMailboxConfiguredError
 	from '../errors/NoTrashMailboxConfiguredError.js'
+import { mapStores } from 'pinia'
+import useMainStore from '../store/mainStore.js'
 
 export default {
 	name: 'Mailbox',
@@ -103,11 +105,12 @@ export default {
 		}
 	},
 	computed: {
+		...mapStores(useMainStore),
 		sortOrder() {
-			return this.$store.getters.getPreference('sort-order', 'DESC')
+			return this.mainStore.getPreference('sort-order', 'DESC')
 		},
 		envelopes() {
-			return this.$store.getters.getEnvelopes(this.mailbox.databaseId, this.searchQuery)
+			return this.mainStore.getEnvelopes(this.mailbox.databaseId, this.searchQuery)
 		},
 		envelopesToShow() {
 			if (this.paginate === 'manual' && !this.expanded) {
@@ -145,14 +148,14 @@ export default {
 		this.loadMailboxInterval = setInterval(this.loadMailbox, 60000)
 	},
 	async mounted() {
-		if (this.$store.getters.hasFetchedInitialEnvelopes) {
+		if (this.mainStore.hasFetchedInitialEnvelopes) {
 			return
 		}
 
 		await this.loadEnvelopes()
 		logger.debug(`syncing mailbox ${this.mailbox.databaseId} (${this.searchQuery}) after mount`)
 		await this.sync(false)
-		this.$store.commit('setHasFetchedInitialEnvelopes', true)
+		this.mainStore.setHasFetchedInitialEnvelopesMutation(true)
 	},
 	destroyed() {
 		this.bus.off('load-more', this.onScroll)
@@ -181,7 +184,7 @@ export default {
 			this.error = false
 
 			try {
-				const envelopes = await this.$store.dispatch('fetchEnvelopes', {
+				const envelopes = await this.mainStore.fetchEnvelopes({
 					mailboxId: this.mailbox.databaseId,
 					query: this.searchQuery,
 					limit: this.initialPageSize,
@@ -228,7 +231,7 @@ export default {
 			this.loadingMore = true
 
 			try {
-				const envelopes = await this.$store.dispatch('fetchNextEnvelopePage', {
+				const envelopes = await this.mainStore.fetchNextEnvelopePage({
 					mailboxId: this.mailbox.databaseId,
 					query: this.searchQuery,
 				})
@@ -301,7 +304,7 @@ export default {
 				logger.debug('deleting', { env })
 				this.onDelete(env.databaseId)
 				try {
-					await this.$store.dispatch('deleteThread', {
+					await this.mainStore.deleteThread({
 						envelope: env,
 					})
 				} catch (error) {
@@ -342,7 +345,7 @@ export default {
 				logger.debug('archiving', { env })
 				this.onDelete(env.databaseId)
 				try {
-					await this.$store.dispatch('moveThread', {
+					await this.mainStore.moveThread({
 						envelope: env,
 						destMailboxId: this.account.archiveMailboxId,
 					})
@@ -357,7 +360,7 @@ export default {
 				break
 			case 'flag':
 				logger.debug('flagging envelope via shortkey', { env })
-				this.$store.dispatch('toggleEnvelopeFlagged', env).catch((error) =>
+				this.mainStore.toggleEnvelopeFlagged(env).catch((error) =>
 					logger.error('could not flag envelope via shortkey', {
 						env,
 						error,
@@ -374,7 +377,7 @@ export default {
 					return
 				}
 				logger.debug('marking message as seen/unseen via shortkey', { env })
-				this.$store.dispatch('toggleEnvelopeSeen', { envelope: env }).catch((error) =>
+				this.mainStore.toggleEnvelopeSeen({ envelope: env }).catch((error) =>
 					logger.error('could not mark envelope as seen/unseen via shortkey', {
 						env,
 						error,
@@ -394,7 +397,7 @@ export default {
 
 			this.refreshing = true
 			try {
-				await this.$store.dispatch('syncEnvelopes', {
+				await this.mainStore.syncEnvelopes({
 					mailboxId: this.mailbox.databaseId,
 					query: this.searchQuery,
 					init,
@@ -418,7 +421,7 @@ export default {
 		// id: The id of the message being delete
 		onDelete(id) {
 			// Get a new message
-			this.$store.dispatch('fetchNextEnvelopes', {
+			this.mainStore.fetchNextEnvelopes({
 				mailboxId: this.mailbox.databaseId,
 				query: this.searchQuery,
 				quantity: 1,
diff --git a/src/components/MailboxInlinePicker.vue b/src/components/MailboxInlinePicker.vue
index 74d657d38f..30e6e8b1af 100644
--- a/src/components/MailboxInlinePicker.vue
+++ b/src/components/MailboxInlinePicker.vue
@@ -15,6 +15,9 @@ import Treeselect from '@riophae/vue-treeselect'
 import '@riophae/vue-treeselect/dist/vue-treeselect.css'
 import { mailboxHasRights } from '../util/acl.js'
 
+import { mapStores } from 'pinia'
+import useMainStore from '../store/mainStore.js'
+
 export default {
 	name: 'MailboxInlinePicker',
 	components: {
@@ -40,6 +43,7 @@ export default {
 		}
 	},
 	computed: {
+		...mapStores(useMainStore),
 		mailboxes() {
 			return this.getMailboxes()
 		},
@@ -56,9 +60,9 @@ export default {
 		getMailboxes(mailboxId) {
 			let mailboxes = []
 			if (!mailboxId) {
-				mailboxes = this.$store.getters.getMailboxes(this.account.accountId)
+				mailboxes = this.mainStore.getMailboxes(this.account.accountId)
 			} else {
-				mailboxes = this.$store.getters.getSubMailboxes(mailboxId)
+				mailboxes = this.mainStore.getSubMailboxes(mailboxId)
 			}
 			mailboxes = mailboxes.filter(mailbox => mailboxHasRights(mailbox, 'i'))
 			return mailboxes.map((mailbox) => {
diff --git a/src/components/MailboxPicker.vue b/src/components/MailboxPicker.vue
index 8b797e1ec5..abd9978c30 100644
--- a/src/components/MailboxPicker.vue
+++ b/src/components/MailboxPicker.vue
@@ -73,6 +73,8 @@ import IconFolder from 'vue-material-design-icons/Folder.vue'
 import { translate as t } from '@nextcloud/l10n'
 import { translate as translateMailboxName } from '../i18n/MailboxTranslator.js'
 import { mailboxHasRights } from '../util/acl.js'
+import { mapStores } from 'pinia'
+import useMainStore from '../store/mainStore.js'
 
 export default {
 	name: 'MailboxPicker',
@@ -128,11 +130,12 @@ export default {
 		}
 	},
 	computed: {
+		...mapStores(useMainStore),
 		mailboxes() {
 			if (!this.selectedMailboxId) {
-				return this.$store.getters.getMailboxes(this.account.accountId)
+				return this.mainStore.getMailboxes(this.account.accountId)
 			} else {
-				return this.$store.getters.getSubMailboxes(this.selectedMailboxId)
+				return this.mainStore.getSubMailboxes(this.selectedMailboxId)
 			}
 		},
 		filteredMailboxes() {
diff --git a/src/components/MailboxThread.vue b/src/components/MailboxThread.vue
index ea55c9fa8d..2ff05d4d2b 100644
--- a/src/components/MailboxThread.vue
+++ b/src/components/MailboxThread.vue
@@ -133,6 +133,8 @@ import {
 	priorityOtherQuery,
 } from '../util/priorityInbox.js'
 import { detect, html } from '../util/text.js'
+import useMainStore from '../store/mainStore.js'
+import { mapStores } from 'pinia'
 
 const START_MAILBOX_DEBOUNCE = 5 * 1000
 
@@ -187,8 +189,9 @@ export default {
 		}
 	},
 	computed: {
+		...mapStores(useMainStore),
 		layoutMode() {
-			return this.$store.getters.getPreference('layout-mode', 'vertical-split')
+			return this.mainStore.getPreference('layout-mode', 'vertical-split')
 		},
 		horizontalListMinWidth() {
 			return this.layoutMode === 'horizontal-split' ? 40 : 30
@@ -197,19 +200,19 @@ export default {
 			return this.layoutMode === 'horizontal-split' ? 60 : 50
 		},
 		unifiedAccount() {
-			return this.$store.getters.getAccount(UNIFIED_ACCOUNT_ID)
+			return this.mainStore.getAccount(UNIFIED_ACCOUNT_ID)
 		},
 		unifiedInbox() {
-			return this.$store.getters.getMailbox(UNIFIED_INBOX_ID)
+			return this.mainStore.getMailbox(UNIFIED_INBOX_ID)
 		},
 		followUpMailbox() {
-			return this.$store.getters.getMailbox(FOLLOW_UP_MAILBOX_ID)
+			return this.mainStore.getMailbox(FOLLOW_UP_MAILBOX_ID)
 		},
 		/**
 		 * @return {string|undefined}
 		 */
 		followUpQuery() {
-			const tag = this.$store.getters.getFollowUpTag
+			const tag = this.mainStore.getFollowUpTag
 			if (!tag) {
 				logger.warn('No follow-up tag available')
 				return undefined
@@ -222,13 +225,13 @@ export default {
 		},
 		hasEnvelopes() {
 			if (this.mailbox.isPriorityInbox) {
-				return this.$store.getters.getEnvelopes(this.mailbox.databaseId, this.appendToSearch(priorityImportantQuery)).length > 0
-					|| this.$store.getters.getEnvelopes(this.mailbox.databaseId, this.appendToSearch(priorityOtherQuery)).length > 0
+				return this.mainStore.getEnvelopes(this.mailbox.databaseId, this.appendToSearch(priorityImportantQuery)).length > 0
+					|| this.mainStore.getEnvelopes(this.mailbox.databaseId, this.appendToSearch(priorityOtherQuery)).length > 0
 			}
-			return this.$store.getters.getEnvelopes(this.mailbox.databaseId, this.searchQuery).length > 0
+			return this.mainStore.getEnvelopes(this.mailbox.databaseId, this.searchQuery).length > 0
 		},
 		hasImportantEnvelopes() {
-			return this.$store.getters.getEnvelopes(this.unifiedInbox.databaseId, this.appendToSearch(priorityImportantQuery)).length > 0
+			return this.mainStore.getEnvelopes(this.unifiedInbox.databaseId, this.appendToSearch(priorityImportantQuery)).length > 0
 		},
 		/**
 		 * @return {boolean}
@@ -238,7 +241,7 @@ export default {
 				return false
 			}
 
-			return this.$store.getters
+			return this.mainStore
 				.getEnvelopes(FOLLOW_UP_MAILBOX_ID, this.followUpQuery)
 				.length > 0
 		},
@@ -311,9 +314,9 @@ export default {
 	},
 	methods: {
 		async fetchEnvelopes() {
-			const existingEnvelopes = this.$store.getters.getEnvelopes(this.mailbox.databaseId, this.searchQuery || '')
+			const existingEnvelopes = this.mainStore.getEnvelopes(this.mailbox.databaseId, this.searchQuery || '')
 			if (!existingEnvelopes.length) {
-				await this.$store.dispatch('fetchEnvelopes', {
+				await this.mainStore.fetchEnvelopes({
 					mailboxId: this.mailbox.databaseId,
 					query: this.searchQuery || '',
 				})
@@ -322,7 +325,7 @@ export default {
 		async onPriorityMailboxOpened() {
 			logger.debug('Priority inbox was opened')
 
-			await this.$store.dispatch('checkFollowUpReminders', { query: this.followUpQuery })
+			await this.mainStore.checkFollowUpReminders({ query: this.followUpQuery })
 		},
 		deleteMessage(id) {
 			this.bus.emit('delete', id)
@@ -357,7 +360,7 @@ export default {
 				if (this.$route.params.accountId !== 0 && this.$route.params.accountId !== '0') {
 					accountId = parseInt(this.$route.params.accountId, 10)
 				}
-				this.$store.dispatch('startComposerSession', {
+				this.mainStore.startComposerSession({
 					data: {
 						accountId,
 						to: this.stringToRecipients(this.$route.query.to),
@@ -370,18 +373,17 @@ export default {
 			}
 		},
 		async saveStartMailbox() {
-			const currentStartMailboxId = this.$store.getters.getPreference('start-mailbox-id')
+			const currentStartMailboxId = this.mainStore.getPreference('start-mailbox-id')
 			if (currentStartMailboxId === this.mailbox.databaseId) {
 				return
 			}
 			logger.debug(`Saving mailbox ${this.mailbox.databaseId} as start mailbox`)
 
 			try {
-				await this.$store
-					.dispatch('savePreference', {
-						key: 'start-mailbox-id',
-						value: this.mailbox.databaseId,
-					})
+				await this.mainStore.savePreference({
+					key: 'start-mailbox-id',
+					value: this.mailbox.databaseId,
+				})
 			} catch (error) {
 				// Catch and log. This is not critical.
 				logger.warn('Could not update start mailbox id', {
diff --git a/src/components/MdnRequest.vue b/src/components/MdnRequest.vue
index a22bf6cb78..e0071844fb 100644
--- a/src/components/MdnRequest.vue
+++ b/src/components/MdnRequest.vue
@@ -26,6 +26,9 @@ import { sendMdn } from '../service/MessageService.js'
 import { showError } from '@nextcloud/dialogs'
 import { NcButton } from '@nextcloud/vue'
 
+import useMainStore from '../store/mainStore.js'
+import { mapStores } from 'pinia'
+
 export default {
 	name: 'MdnRequest',
 	components: {
@@ -44,6 +47,7 @@ export default {
 		}
 	},
 	computed: {
+		...mapStores(useMainStore),
 		mdnSent() {
 			return this.message.flags.mdnsent
 		},
@@ -55,7 +59,7 @@ export default {
 
 			try {
 				await sendMdn(this.message.databaseId)
-				this.$store.commit('flagEnvelope', { envelope: this.message, flag: 'mdnsent', value: true })
+				this.mainStore.flagEnvelopeMutation({ envelope: this.message, flag: 'mdnsent', value: true })
 			} catch (error) {
 				logger.error('could not send mdn', error)
 				showError(t('mail', 'Could not send mdn'))
diff --git a/src/components/MenuEnvelope.vue b/src/components/MenuEnvelope.vue
index 3dd2c4d180..b7e6c57bfc 100644
--- a/src/components/MenuEnvelope.vue
+++ b/src/components/MenuEnvelope.vue
@@ -231,7 +231,8 @@ import NcActionInput from '@nextcloud/vue/dist/Components/NcActionInput.js'
 import AlarmIcon from 'vue-material-design-icons/Alarm.vue'
 import logger from '../logger.js'
 import moment from '@nextcloud/moment'
-import { mapGetters } from 'vuex'
+import { mapStores, mapState } from 'pinia'
+import useMainStore from '../store/mainStore.js'
 
 export default {
 	name: 'MenuEnvelope',
@@ -294,12 +295,13 @@ export default {
 		}
 	},
 	computed: {
-		...mapGetters([
+		...mapStores(useMainStore),
+		...mapState(useMainStore, [
 			'isSnoozeDisabled',
 		]),
 		account() {
 			const accountId = this.envelope.accountId ?? this.mailbox.accountId
-			return this.$store.getters.getAccount(accountId)
+			return this.mainStore.getAccount(accountId)
 		},
 		hasMultipleRecipients() {
 			if (!this.account) {
@@ -332,7 +334,7 @@ export default {
 			return this.envelope.flags.seen
 		},
 		isImportant() {
-			return this.$store.getters
+			return this.mainStore
 				.getEnvelopeTags(this.envelope.databaseId)
 				.some((tag) => tag.imapLabel === '$label1')
 		},
@@ -409,7 +411,7 @@ export default {
 	},
 	methods: {
 		onForward() {
-			this.$store.dispatch('startComposerSession', {
+			this.mainStore.startComposerSession({
 				reply: {
 					mode: 'forward',
 					data: this.envelope,
@@ -425,11 +427,11 @@ export default {
 			logger.info(`snoozing message ${this.envelope.databaseId}`)
 
 			if (!this.account.snoozeMailboxId) {
-				await this.$store.dispatch('createAndSetSnoozeMailbox', this.account)
+				await this.mainStore.createAndSetSnoozeMailbox(this.account)
 			}
 
 			try {
-				await this.$store.dispatch('snoozeMessage', {
+				await this.mainStore.snoozeMessage({
 					id: this.envelope.databaseId,
 					unixTimestamp: timestamp / 1000,
 					destMailboxId: this.account.snoozeMailboxId,
@@ -449,7 +451,7 @@ export default {
 			logger.info(`unSnoozing message ${this.envelope.databaseId}`)
 
 			try {
-				await this.$store.dispatch('unSnoozeMessage', {
+				await this.mainStore.unSnoozeMessage({
 					id: this.envelope.databaseId,
 				})
 				showSuccess(t('mail', 'Message was unsnoozed'))
@@ -459,16 +461,16 @@ export default {
 			}
 		},
 		onToggleFlagged() {
-			this.$store.dispatch('toggleEnvelopeFlagged', this.envelope)
+			this.mainStore.toggleEnvelopeFlagged(this.envelope)
 		},
 		onToggleImportant() {
-			this.$store.dispatch('toggleEnvelopeImportant', this.envelope)
+			this.mainStore.toggleEnvelopeImportant(this.envelope)
 		},
 		onToggleSeen() {
-			this.$store.dispatch('toggleEnvelopeSeen', { envelope: this.envelope })
+			this.mainStore.toggleEnvelopeSeen({ envelope: this.envelope })
 		},
 		async onToggleJunk() {
-			const removeEnvelope = await this.$store.dispatch('moveEnvelopeToJunk', this.envelope)
+			const removeEnvelope = await this.mainStore.moveEnvelopeToJunk(this.envelope)
 
 			/**
 			 * moveEnvelopeToJunk returns true if the envelope should be moved to a different mailbox.
@@ -487,7 +489,7 @@ export default {
 				await this.$emit('delete', this.envelope.databaseId)
 			}
 
-			await this.$store.dispatch('toggleEnvelopeJunk', {
+			await this.mainStore.toggleEnvelopeJunk({
 				envelope: this.envelope,
 				removeEnvelope,
 			})
@@ -496,12 +498,12 @@ export default {
 			this.$emit('update:selected')
 		},
 		async forwardSelectedAsAttachment() {
-			await this.$store.dispatch('startComposerSession', {
+			await this.mainStore.startComposerSession({
 				forwardedMessages: [this.envelope.databaseId],
 			})
 		},
 		onReply(onlySender = false) {
-			this.$store.dispatch('startComposerSession', {
+			this.mainStore.startComposerSession({
 				reply: {
 					mode: onlySender ? 'reply' : 'replyAll',
 					data: this.envelope,
@@ -509,7 +511,7 @@ export default {
 			})
 		},
 		async onOpenEditAsNew() {
-			await this.$store.dispatch('startComposerSession', {
+			await this.mainStore.startComposerSession({
 				templateMessageId: this.envelope.databaseId,
 				data: this.envelope,
 			})
diff --git a/src/components/Message.vue b/src/components/Message.vue
index d3e6412bc4..04a634badc 100644
--- a/src/components/Message.vue
+++ b/src/components/Message.vue
@@ -77,6 +77,8 @@ import MessagePlainTextBody from './MessagePlainTextBody.vue'
 import Imip from './Imip.vue'
 import LockOffIcon from 'vue-material-design-icons/LockOff.vue'
 import ReplyIcon from 'vue-material-design-icons/Reply.vue'
+import { mapStores } from 'pinia'
+import useMainStore from '../store/mainStore.js'
 
 export default {
 	name: 'Message',
@@ -117,6 +119,7 @@ export default {
 		},
 	},
 	computed: {
+		...mapStores(useMainStore),
 		from() {
 			return this.message.from.length === 0 ? '?' : this.message.from[0].label || this.message.from[0].email
 		},
@@ -135,7 +138,7 @@ export default {
 			return this.message.itineraries ?? []
 		},
 		hasCurrentUserPrincipalAndCollections() {
-			return this.$store.getters.hasCurrentUserPrincipalAndCollections
+			return this.mainStore.hasCurrentUserPrincipalAndCollections
 		},
 	},
 	methods: {
diff --git a/src/components/MoveMailboxModal.vue b/src/components/MoveMailboxModal.vue
index de00ca3e30..5bb9c7bcc5 100644
--- a/src/components/MoveMailboxModal.vue
+++ b/src/components/MoveMailboxModal.vue
@@ -17,6 +17,8 @@
 <script>
 import logger from '../logger.js'
 import MailboxPicker from './MailboxPicker.vue'
+import { mapStores } from 'pinia'
+import useMainStore from '../store/mainStore.js'
 
 export default {
 	name: 'MoveMailboxModal',
@@ -39,6 +41,9 @@ export default {
 			destMailboxId: undefined,
 		}
 	},
+	computed: {
+		...mapStores(useMainStore),
+	},
 	methods: {
 		onClose() {
 			this.$emit('close')
@@ -49,16 +54,16 @@ export default {
 				try {
 					if (!this.destMailboxId) {
 						const newName = this.mailbox.displayName
-						await this.$store.dispatch('renameMailbox', {
+						await this.mainStore.renameMailbox({
 							account: this.account,
 							mailbox: this.mailbox,
 							newName,
 						})
 
 					} else {
-						const destMailbox = this.$store.getters.getMailbox(this.destMailboxId)
+						const destMailbox = this.mainStore.getMailbox(this.destMailboxId)
 						const newName = destMailbox.name + this.mailbox.delimiter + this.mailbox.name
-						await this.$store.dispatch('renameMailbox', {
+						await this.mainStore.renameMailbox({
 							account: this.account,
 							mailbox: this.mailbox,
 							newName,
diff --git a/src/components/MoveModal.vue b/src/components/MoveModal.vue
index 3475d903bb..b676c57621 100644
--- a/src/components/MoveModal.vue
+++ b/src/components/MoveModal.vue
@@ -15,6 +15,8 @@
 <script>
 import logger from '../logger.js'
 import MailboxPicker from './MailboxPicker.vue'
+import useMainStore from '../store/mainStore.js'
+import { mapStores } from 'pinia'
 
 export default {
 	name: 'MoveModal',
@@ -41,6 +43,9 @@ export default {
 			destMailboxId: undefined,
 		}
 	},
+	computed: {
+		...mapStores(useMainStore),
+	},
 	methods: {
 		onClose() {
 			this.$emit('close')
@@ -58,13 +63,13 @@ export default {
 
 				for (const envelope of envelopes) {
 					if (this.moveThread) {
-						await this.$store.dispatch('moveThread', { envelope, destMailboxId: this.destMailboxId })
+						await this.mainStore.moveThread({ envelope, destMailboxId: this.destMailboxId })
 					} else {
-						await this.$store.dispatch('moveMessage', { id: envelope.databaseId, destMailboxId: this.destMailboxId })
+						await this.mainStore.moveMessage({ id: envelope.databaseId, destMailboxId: this.destMailboxId })
 					}
 				}
 
-				await this.$store.dispatch('syncEnvelopes', { mailboxId: this.destMailboxId })
+				await this.mainStore.syncEnvelopes({ mailboxId: this.destMailboxId })
 				this.$emit('move')
 			} catch (error) {
 				logger.error('could not move messages', {
diff --git a/src/components/Navigation.vue b/src/components/Navigation.vue
index fc9d72e74e..fc40129fee 100644
--- a/src/components/Navigation.vue
+++ b/src/components/Navigation.vue
@@ -77,6 +77,7 @@ import IconSetting from 'vue-material-design-icons/Cog.vue'
 import AppSettingsMenu from '../components/AppSettingsMenu.vue'
 import { UNIFIED_ACCOUNT_ID } from '../store/constants.js'
 import useOutboxStore from '../store/outboxStore.js'
+import useMainStore from '../store/mainStore.js'
 import { mapStores } from 'pinia'
 
 export default {
@@ -99,12 +100,12 @@ export default {
 		}
 	},
 	computed: {
-		...mapStores(useOutboxStore),
+		...mapStores(useOutboxStore, useMainStore),
 		menu() {
-			return this.$store.getters.accounts
+			return this.mainStore.getAccounts
 				.filter(account => account.id !== UNIFIED_ACCOUNT_ID)
 				.map(account => {
-					const mailboxes = this.$store.getters.getMailboxes(account.id)
+					const mailboxes = this.mainStore.getMailboxes(account.id)
 					const nonSpecialRoleMailboxes = mailboxes.filter(
 						(mailbox) => this.isCollapsed(account, mailbox),
 					)
@@ -119,10 +120,10 @@ export default {
 				})
 		},
 		unifiedAccount() {
-			return this.$store.getters.getAccount(UNIFIED_ACCOUNT_ID)
+			return this.mainStore.getAccount(UNIFIED_ACCOUNT_ID)
 		},
 		unifiedMailboxes() {
-			return this.$store.getters.getMailboxes(UNIFIED_ACCOUNT_ID)
+			return this.mainStore.getMailboxes(UNIFIED_ACCOUNT_ID)
 		},
 		/**
 		 * Whether the current session is using passwordless authentication.
@@ -130,7 +131,7 @@ export default {
 		 * @return {boolean}
 		 */
 		passwordIsUnavailable() {
-			return this.$store.getters.getPreference('password-is-unavailable', false)
+			return this.mainStore.getPreference('password-is-unavailable', false)
 		},
 		outboxMessages() {
 			return this.outboxStore.getAllMessages
@@ -156,11 +157,11 @@ export default {
 			return true
 		},
 		isFirst(account) {
-			const accounts = this.$store.getters.accounts
+			const accounts = this.mainStore.getAccounts
 			return account === accounts[1]
 		},
 		isLast(account) {
-			const accounts = this.$store.getters.accounts
+			const accounts = this.mainStore.getAccounts
 			return account === accounts[accounts.length - 1]
 		},
 		/**
@@ -172,7 +173,7 @@ export default {
 		 */
 		isDisabled(account) {
 
-			return (this.passwordIsUnavailable && !!account.provisioningId) && !!this.$store.getters.masterPasswordEnabled
+			return (this.passwordIsUnavailable && !!account.provisioningId) && !!this.mainStore.masterPasswordEnabled
 		},
 	},
 }
@@ -207,4 +208,8 @@ to {
 	}
 }
 
+.v-popper__inner {
+	height: unset !important;
+}
+
 </style>
diff --git a/src/components/NavigationAccount.vue b/src/components/NavigationAccount.vue
index e9faef765d..24fe08a8ab 100644
--- a/src/components/NavigationAccount.vue
+++ b/src/components/NavigationAccount.vue
@@ -99,6 +99,9 @@ import MenuDown from 'vue-material-design-icons/ChevronDown.vue'
 import MenuUp from 'vue-material-design-icons/ChevronUp.vue'
 import IconDelete from 'vue-material-design-icons/Delete.vue'
 import { DialogBuilder } from '@nextcloud/dialogs'
+import { mapStores } from 'pinia'
+import useMainStore from '../store/mainStore.js'
+
 export default {
 	name: 'NavigationAccount',
 	components: {
@@ -156,8 +159,9 @@ export default {
 		}
 	},
 	computed: {
+		...mapStores(useMainStore),
 		showSettings() {
-			return this.$store.getters.showSettingsForAccount(this.account.id)
+			return this.mainStore.showSettingsForAccount(this.account.id)
 		},
 		visible() {
 			return this.account.isUnified !== true && this.account.visible !== false
@@ -187,7 +191,7 @@ export default {
 			logger.info('creating mailbox ' + name)
 			this.menuOpen = false
 			try {
-				await this.$store.dispatch('createMailbox', {
+				await this.mainStore.createMailbox({
 					account: this.account, name,
 				})
 			} catch (error) {
@@ -222,7 +226,7 @@ export default {
 						callback: async () => {
 							this.loading.delete = true
 							try {
-								await this.$store.dispatch('deleteAccount', this.account)
+								await this.mainStore.deleteAccount(this.account)
 								logger.info(`account ${id} deleted, redirecting …`)
 
 								// TODO: update store and handle this more efficiently
@@ -239,24 +243,21 @@ export default {
 			await dialog.show()
 		},
 		changeAccountOrderUp() {
-			this.$store
-				.dispatch('moveAccount', { account: this.account, up: true })
+			this.mainStore.moveAccount({ account: this.account, up: true })
 				.catch((error) => logger.error('could not move account up', { error }))
 		},
 		changeAccountOrderDown() {
-			this.$store
-				.dispatch('moveAccount', { account: this.account })
+			this.mainStore.moveAccount({ account: this.account })
 				.catch((error) => logger.error('could not move account down', { error }))
 		},
 		changeShowSubscribedOnly(onlySubscribed) {
 			this.savingShowOnlySubscribed = true
-			this.$store
-				.dispatch('patchAccount', {
-					account: this.account,
-					data: {
-						showSubscribedOnly: onlySubscribed,
-					},
-				})
+			this.mainStore.patchAccount({
+				account: this.account,
+				data: {
+					showSubscribedOnly: onlySubscribed,
+				},
+			})
 				.then(() => {
 					this.savingShowOnlySubscribed = false
 					logger.info('show only subscribed mailboxes updated to ' + onlySubscribed)
@@ -293,9 +294,9 @@ export default {
 		 */
 		showAccountSettings(show) {
 			if (show) {
-				this.$store.commit('showSettingsForAccount', this.account.id)
+				this.mainStore.showSettingsForAccountMutation(this.account.id)
 			} else {
-				this.$store.commit('showSettingsForAccount', null)
+				this.mainStore.showSettingsForAccountMutation(null)
 			}
 		},
 	},
diff --git a/src/components/NavigationAccountExpandCollapse.vue b/src/components/NavigationAccountExpandCollapse.vue
index b73a40df91..af50cd1398 100644
--- a/src/components/NavigationAccountExpandCollapse.vue
+++ b/src/components/NavigationAccountExpandCollapse.vue
@@ -10,6 +10,8 @@
 <script>
 import { NcAppNavigationItem as AppNavigationItem } from '@nextcloud/vue'
 import logger from '../logger.js'
+import useMainStore from '../store/mainStore.js'
+import { mapStores } from 'pinia'
 
 export default {
 	name: 'NavigationAccountExpandCollapse',
@@ -23,6 +25,7 @@ export default {
 		},
 	},
 	computed: {
+		...mapStores(useMainStore),
 		id() {
 			return 'collapse-' + this.account.id
 		},
@@ -39,13 +42,12 @@ export default {
 		async toggleCollapse() {
 			logger.debug('toggling collapsed mailboxes for account ' + this.account.id)
 			try {
-				await this.$store.commit('toggleAccountCollapsed', this.account.id)
-				await this.$store
-					.dispatch('setAccountSetting', {
-						accountId: this.account.id,
-						key: 'collapsed',
-						value: this.account.collapsed,
-					})
+				await this.mainStore.toggleAccountCollapsedMutation(this.account.id)
+				await this.mainStore.setAccountSetting({
+					accountId: this.account.id,
+					key: 'collapsed',
+					value: this.account.collapsed,
+				})
 			} catch (error) {
 				logger.error('could not update account settings', {
 					error,
diff --git a/src/components/NavigationMailbox.vue b/src/components/NavigationMailbox.vue
index e35b80439f..a401cd34dc 100644
--- a/src/components/NavigationMailbox.vue
+++ b/src/components/NavigationMailbox.vue
@@ -216,6 +216,8 @@ import { showInfo, showError } from '@nextcloud/dialogs'
 import { DroppableMailboxDirective as droppableMailbox } from '../directives/drag-and-drop/droppable-mailbox/index.js'
 import dragEventBus from '../directives/drag-and-drop/util/dragEventBus.js'
 import AlarmIcon from 'vue-material-design-icons/Alarm.vue'
+import { mapStores } from 'pinia'
+import useMainStore from '../store/mainStore.js'
 
 export default {
 	name: 'NavigationMailbox',
@@ -290,6 +292,7 @@ export default {
 		}
 	},
 	computed: {
+		...mapStores(useMainStore),
 		visible() {
 			return (
 				(this.account.showSubscribedOnly === false
@@ -325,7 +328,7 @@ export default {
 			return this.subMailboxes.length > 0
 		},
 		subMailboxes() {
-			return this.$store.getters.getSubMailboxes(this.mailbox.databaseId)
+			return this.mainStore.getSubMailboxes(this.mailbox.databaseId)
 		},
 		statsText() {
 			if (this.mailboxStats && 'total' in this.mailboxStats && 'unread' in this.mailboxStats) {
@@ -373,7 +376,7 @@ export default {
 			if (!this.mailbox.isUnified) {
 				return true
 			}
-			return this.mailbox.specialUse.includes('inbox') && this.$store.getters.accounts.length > 2
+			return this.mailbox.specialUse.includes('inbox') && this.mainStore.getAccounts.length > 2
 		},
 		showUnreadCounter() {
 			if (this.filter === 'starred' || this.mailbox.specialRole === 'trash') {
@@ -388,7 +391,7 @@ export default {
 			if (!this.mailbox.myAcls) {
 				return true
 			}
-			const parent = this.$store.getters.getParentMailbox(this.mailbox.databaseId)
+			const parent = this.mainStore.getParentMailbox(this.mailbox.databaseId)
 			if (!parent || !parent.myAcls) {
 				return mailboxHasRights(this.mailbox, 'x')
 			}
@@ -470,7 +473,7 @@ export default {
 			logger.info(`creating mailbox ${withPrefix} as submailbox of ${this.mailbox.databaseId}`)
 			this.menuOpen = false
 			try {
-				await this.$store.dispatch('createMailbox', {
+				await this.mainStore.createMailbox({
 					account: this.account,
 					name: withPrefix,
 				})
@@ -491,11 +494,10 @@ export default {
 		markAsRead() {
 			this.loadingMarkAsRead = true
 
-			this.$store
-				.dispatch('markMailboxRead', {
-					accountId: this.account.id,
-					mailboxId: this.mailbox.databaseId,
-				})
+			this.mainStore.markMailboxRead({
+				accountId: this.account.id,
+				mailboxId: this.mailbox.databaseId,
+			})
 				.then(() => logger.info(`mailbox ${this.mailbox.databaseId} marked as read`))
 				.catch((error) => logger.error(`could not mark mailbox ${this.mailbox.databaseId} as read`, { error }))
 				.then(() => (this.loadingMarkAsRead = false))
@@ -504,7 +506,7 @@ export default {
 			try {
 				this.changeSubscription = true
 
-				await this.$store.dispatch('changeMailboxSubscription', {
+				await this.mainStore.changeMailboxSubscription({
 					mailbox: this.mailbox,
 					subscribed,
 				})
@@ -519,7 +521,7 @@ export default {
 			try {
 				this.changingSyncInBackground = true
 
-				await this.$store.dispatch('patchMailbox', {
+				await this.mainStore.patchMailbox({
 					mailbox: this.mailbox,
 					attributes: {
 						syncInBackground,
@@ -561,8 +563,7 @@ export default {
 				},
 				(result) => {
 					if (result) {
-						return this.$store
-							.dispatch('clearMailbox', { mailbox: this.mailbox })
+						return this.mainStore.clearMailbox({ mailbox: this.mailbox })
 							.then(() => {
 								logger.info(`mailbox ${id} cleared`)
 							})
@@ -585,8 +586,7 @@ export default {
 				},
 				(result) => {
 					if (result) {
-						return this.$store
-							.dispatch('deleteMailbox', { mailbox: this.mailbox })
+						return this.mainStore.deleteMailbox({ mailbox: this.mailbox })
 							.then(() => {
 								logger.info(`mailbox ${id} deleted`)
 								if (parseInt(this.$route.params.mailboxId, 10) === this.mailbox.databaseId) {
@@ -612,7 +612,7 @@ export default {
 				if (this.mailbox.path) {
 					newName = this.mailbox.path + this.mailbox.delimiter + newName
 				}
-				await this.$store.dispatch('renameMailbox', {
+				await this.mainStore.renameMailbox({
 					account: this.account,
 					mailbox: this.mailbox,
 					newName,
@@ -642,7 +642,7 @@ export default {
 			if (accountId !== this.mailbox.accountId) {
 				return
 			}
-			this.$store.commit('expandAccount', accountId)
+			this.mainStore.expandAccountMutation(accountId)
 			this.showSubMailboxes = true
 		},
 		onDragEnd({ accountId }) {
diff --git a/src/components/NewMessageButtonHeader.vue b/src/components/NewMessageButtonHeader.vue
index c156b8df90..270b293881 100644
--- a/src/components/NewMessageButtonHeader.vue
+++ b/src/components/NewMessageButtonHeader.vue
@@ -37,6 +37,8 @@ import IconAdd from 'vue-material-design-icons/Plus.vue'
 import IconRefresh from 'vue-material-design-icons/Refresh.vue'
 import IconLoading from '@nextcloud/vue/dist/Components/NcLoadingIcon.js'
 import logger from '../logger.js'
+import { mapStores } from 'pinia'
+import useMainStore from '../store/mainStore.js'
 
 export default {
 	name: 'NewMessageButtonHeader',
@@ -52,9 +54,10 @@ export default {
 		}
 	},
 	computed: {
+		...mapStores(useMainStore),
 		currentMailbox() {
 			if (this.$route.name === 'message' || this.$route.name === 'mailbox') {
-				return this.$store.getters.getMailbox(this.$route.params.mailboxId)
+				return this.mainStore.getMailbox(this.$route.params.mailboxId)
 			}
 			return undefined
 		},
@@ -67,7 +70,7 @@ export default {
 			}
 			this.refreshing = true
 			try {
-				await this.$store.dispatch('syncEnvelopes', { mailboxId: this.currentMailbox.databaseId })
+				await this.mainStore.syncEnvelopes({ mailboxId: this.currentMailbox.databaseId })
 				logger.debug('Current mailbox is sync\'ing ')
 			} catch (error) {
 				logger.error('could not sync current mailbox', { error })
@@ -76,7 +79,7 @@ export default {
 			}
 		},
 		async onNewMessage() {
-			await this.$store.dispatch('startComposerSession', {
+			await this.mainStore.startComposerSession({
 				isBlankMessage: true,
 			})
 		},
diff --git a/src/components/NewMessageModal.vue b/src/components/NewMessageModal.vue
index a695b113d1..7cc30fb14c 100644
--- a/src/components/NewMessageModal.vue
+++ b/src/components/NewMessageModal.vue
@@ -139,14 +139,14 @@ import NoSentMailboxConfiguredError from '../errors/NoSentMailboxConfiguredError
 import ManyRecipientsError from '../errors/ManyRecipientsError.js'
 import AttachmentMissingError from '../errors/AttachmentMissingError.js'
 import Loading from './Loading.vue'
-import { mapGetters } from 'vuex'
 import MinimizeIcon from 'vue-material-design-icons/Minus.vue'
 import MaximizeIcon from 'vue-material-design-icons/ArrowExpand.vue'
 import DefaultComposerIcon from 'vue-material-design-icons/ArrowCollapse.vue'
 import { deleteDraft, saveDraft, updateDraft } from '../service/DraftService.js'
 import useOutboxStore from '../store/outboxStore.js'
-import { mapStores } from 'pinia'
+import { mapStores, mapState, mapActions } from 'pinia'
 import RecipientInfo from './RecipientInfo.vue'
+import useMainStore from '../store/mainStore.js'
 
 export default {
 	name: 'NewMessageModal',
@@ -193,8 +193,9 @@ export default {
 		}
 	},
 	computed: {
-		...mapStores(useOutboxStore),
-		...mapGetters(['showMessageComposer', 'getPreference']),
+		...mapStores(useOutboxStore, useMainStore),
+		...mapState(useMainStore, ['showMessageComposer']),
+		...mapActions(useMainStore, ['getPreference']),
 		modalTitle() {
 			if (this.composerMessage.type === 'outbox') {
 				return t('mail', 'Edit message')
@@ -220,10 +221,10 @@ export default {
 				&& !this.isMaximized
 		},
 		composerMessage() {
-			return this.$store.getters.composerMessage
+			return this.mainStore.composerMessage
 		},
 		composerData() {
-			return this.$store.getters.composerMessage?.data ?? {}
+			return this.mainStore.composerMessage?.data ?? {}
 		},
 		forwardedMessages() {
 			return this.composerMessage?.options?.forwardedMessages ?? []
@@ -260,7 +261,7 @@ export default {
 		},
 		async openModalSize() {
 			try {
-				const sizePreference = this.$store.getters.getPreference('modalSize')
+				const sizePreference = this.mainStore.getPreference('modalSize')
 				this.largerModal = sizePreference === 'large'
 			} catch (error) {
 				console.error('Error getting modal size preference', error)
@@ -270,7 +271,7 @@ export default {
 			this.isMaximized = !this.isMaximized
 			this.largerModal = !this.largerModal
 			try {
-				await this.$store.dispatch('savePreference', {
+				await this.mainStore.savePreference({
 					key: 'modalSize',
 					value: this.largerModal ? 'large' : 'normal',
 				})
@@ -282,8 +283,8 @@ export default {
 			this.isMaximized = false
 			this.modalFirstOpen = false
 
-			await this.$store.dispatch('closeMessageComposer')
-			if (!this.$store.getters.composerMessageIsSaved && this.changed) {
+			await this.mainStore.hideMessageComposerMutation()
+			if (!this.mainStore.composerMessageIsSaved && this.changed) {
 				await this.onDraft(this.cookedComposerData, { showToast: true })
 			}
 
@@ -316,7 +317,7 @@ export default {
 					if (!id) {
 						const { id } = await saveDraft(dataForServer)
 						dataForServer.id = id
-						await this.$store.dispatch('patchComposerData', { id, draftId: dataForServer.draftId })
+						await this.mainStore.patchComposerData({ id, draftId: dataForServer.draftId })
 						this.canSaveDraft = true
 						this.draftSaved = true
 
@@ -329,7 +330,7 @@ export default {
 						idToReturn = id
 					}
 
-					this.$store.commit('setComposerMessageSaved', true)
+					this.mainStore.setComposerMessageSavedMutation(true)
 
 					if (showToast) {
 						if (this.composerMessage.type === 'outbox') {
@@ -345,7 +346,7 @@ export default {
 				} catch (error) {
 					logger.error('Could not save draft', { error })
 					this.canSaveDraft = false
-					this.$store.commit('setComposerIndicatorDisabled', false)
+					this.mainStore.setComposerIndicatorDisabledMutation(false)
 
 					if (showToast) {
 						if (this.composerMessage.type === 'outbox') {
@@ -455,9 +456,9 @@ export default {
 				}
 				if (dataForServer.id) {
 					// Remove old draft envelope
-					this.$store.commit('removeMessage', { id: dataForServer.id })
+					this.mainStore.removeMessageMutation({ id: dataForServer.id })
 				}
-				await this.$store.dispatch('stopComposerSession')
+				await this.mainStore.stopComposerSession()
 				this.$emit('close')
 			} catch (error) {
 				this.error = await matchError(error, {
@@ -489,10 +490,10 @@ export default {
 			}
 
 			// Sync sent mailbox when it's currently open
-			const account = this.$store.getters.getAccount(data.accountId)
+			const account = this.mainStore.getAccount(data.accountId)
 			if (account && parseInt(this.$route.params.mailboxId, 10) === account.sentMailboxId) {
 				setTimeout(() => {
-					this.$store.dispatch('syncEnvelopes', {
+					this.mainStore.syncEnvelopes({
 						mailboxId: account.sentMailboxId,
 						query: '',
 						init: false,
@@ -527,7 +528,7 @@ export default {
 
 			// It's safe to stop the session and ultimately destroy this component as only data
 			// local this this function is accessed afterwards
-			await this.$store.dispatch('stopComposerSession')
+			await this.mainStore.stopComposerSession()
 
 			try {
 				if (isOutbox) {
@@ -563,25 +564,25 @@ export default {
 		async patchComposerData(data) {
 			this.changed = true
 			this.updateCookedComposerData()
-			await this.$store.dispatch('patchComposerData', data)
+			await this.mainStore.patchComposerData(data)
 		},
 		onBeforeUnload(e) {
 			if (this.canSaveDraft && this.changed) {
 				e.preventDefault()
 				e.returnValue = true
-				this.$store.dispatch('showMessageComposer')
+				this.mainStore.showMessageComposerMutation()
 			} else {
 				console.info('No unsaved changes. See you!')
 			}
 		},
 		async onClose() {
-			this.$store.commit('setComposerIndicatorDisabled', true)
+			this.mainStore.setComposerIndicatorDisabledMutation(true)
 			await this.onMinimize()
 
 			// End the session only if all unsaved changes have been saved
 			if (this.canSaveDraft && ((this.changed && this.draftSaved) || !this.changed)) {
 				logger.debug('Closing composer session due to close button click')
-				await this.$store.dispatch('stopComposerSession', {
+				await this.mainStore.stopComposerSession({
 					restoreOriginalSendAt: true,
 					moveToImap: this.changed,
 					id: this.composerData.id,
diff --git a/src/components/OutOfOfficeForm.vue b/src/components/OutOfOfficeForm.vue
index f873bb3660..a9b66bacf9 100644
--- a/src/components/OutOfOfficeForm.vue
+++ b/src/components/OutOfOfficeForm.vue
@@ -119,6 +119,8 @@ import { generateUrl } from '@nextcloud/router'
 import OpenInNewIcon from 'vue-material-design-icons/OpenInNew.vue'
 import * as OutOfOfficeService from '../service/OutOfOfficeService.js'
 import mitt from 'mitt'
+import { mapStores } from 'pinia'
+import useMainStore from '../store/mainStore.js'
 
 const OOO_DISABLED = 'disabled'
 const OOO_ENABLED = 'enabled'
@@ -162,6 +164,7 @@ export default {
 		}
 	},
 	computed: {
+		...mapStores(useMainStore),
 		/**
 		 * @return {boolean}
 		 */
@@ -270,7 +273,7 @@ export default {
 			try {
 				if (this.followingSystem) {
 					await OutOfOfficeService.followSystem(this.account.id)
-					this.$store.commit('patchAccount', {
+					this.mainStore.patchAccountiMutation({
 						account: this.account,
 						data: {
 							outOfOfficeFollowsSystem: true,
@@ -297,14 +300,14 @@ export default {
 						allowedRecipients: this.aliases,
 					})
 
-					this.$store.commit('patchAccount', {
+					this.mainStore.patchAccountMutation({
 						account: this.account,
 						data: {
 							outOfOfficeFollowsSystem: false,
 						},
 					})
 				}
-				await this.$store.dispatch('fetchActiveSieveScript', { accountId: this.account.id })
+				await this.mainStore.fetchActiveSieveScript({ accountId: this.account.id })
 			} catch (error) {
 				this.errorMessage = error.message
 			} finally {
diff --git a/src/components/OutboxMessageListItem.vue b/src/components/OutboxMessageListItem.vue
index e58c39eee0..faeb0709cc 100644
--- a/src/components/OutboxMessageListItem.vue
+++ b/src/components/OutboxMessageListItem.vue
@@ -173,7 +173,7 @@ export default {
 			if (this.message.editorBody === null) {
 				return
 			}
-			await this.$store.dispatch('startComposerSession', {
+			await this.mainStore.startComposerSession({
 				type: 'outbox',
 				data: {
 					...this.message,
diff --git a/src/components/RecipientListItem.vue b/src/components/RecipientListItem.vue
index 0ead3f2995..1197ed224f 100644
--- a/src/components/RecipientListItem.vue
+++ b/src/components/RecipientListItem.vue
@@ -17,6 +17,9 @@
 <script>
 import { NcListItemIcon as ListItemIcon } from '@nextcloud/vue'
 import Close from 'vue-material-design-icons/Close.vue'
+import { mapStores } from 'pinia'
+import useMainStore from '../store/mainStore.js'
+
 export default {
 	name: 'RecipientListItem',
 	components: {
@@ -34,9 +37,12 @@ export default {
 			isInternal: true,
 		}
 	},
+	computed: {
+		...mapStores(useMainStore),
+	},
 	async mounted() {
-		if (this.$store.getters.getPreference('internal-addresses', 'false') === 'true') {
-			this.isInternal = this.$store.getters.isInternalAddress(this.option.email)
+		if (this.mainStore.getPreference('internal-addresses', 'false') === 'true') {
+			this.isInternal = this.mainStore.isInternalAddress(this.option.email)
 		}
 	},
 	methods: {
diff --git a/src/components/SearchMessages.vue b/src/components/SearchMessages.vue
index acc6620d32..bc904f944e 100644
--- a/src/components/SearchMessages.vue
+++ b/src/components/SearchMessages.vue
@@ -315,6 +315,8 @@ import debouncePromise from 'debounce-promise'
 import { findRecipient } from '../service/AutocompleteService.js'
 import uniqBy from 'lodash/fp/uniqBy.js'
 import { hiddenTags } from './tags.js'
+import { mapStores } from 'pinia'
+import useMainStore from '../store/mainStore.js'
 
 const debouncedSearch = debouncePromise(findRecipient, 500)
 
@@ -378,8 +380,9 @@ export default {
 		}
 	},
 	computed: {
+		...mapStores(useMainStore),
 		tags() {
-			return this.$store.getters.getTags.filter((tag) => !(tag.displayName.toLowerCase() in hiddenTags)).sort((a, b) => {
+			return this.mainStore.getTags.filter((tag) => !(tag.displayName.toLowerCase() in hiddenTags)).sort((a, b) => {
 				if (a.isDefaultTag && !b.isDefaultTag) {
 					return -1
 				}
@@ -401,10 +404,10 @@ export default {
 			}).length > 0
 		},
 		searchBody() {
-			return this.$store.getters.getAccount(this.accountId)?.searchBody || (this.mailbox.databaseId === 'priority' && this.$store.getters.getPreference('search-priority-body', 'false') === 'true')
+			return this.mainStore.getAccount(this.accountId)?.searchBody || (this.mailbox.databaseId === 'priority' && this.mainStore.getPreference('search-priority-body', 'false') === 'true')
 		},
 		account() {
-			return this.$store.getters.getAccount(this.accountId)
+			return this.mainStore.getAccount(this.accountId)
 		},
 		filterData() {
 			return {
diff --git a/src/components/SearchSettings.vue b/src/components/SearchSettings.vue
index f3f6345a20..0f1f1a17e7 100644
--- a/src/components/SearchSettings.vue
+++ b/src/components/SearchSettings.vue
@@ -16,6 +16,8 @@
 
 <script>
 import Logger from '../logger.js'
+import useMainStore from '../store/mainStore.js'
+import { mapStores } from 'pinia'
 
 export default {
 	name: 'SearchSettings',
@@ -30,15 +32,17 @@ export default {
 			searchBody: this.account.searchBody,
 		}
 	},
+	computed: {
+		...mapStores(useMainStore),
+	},
 	watch: {
 		searchBody(val, oldVal) {
-			this.$store
-				.dispatch('patchAccount', {
-					account: this.account,
-					data: {
-						searchBody: val,
-					},
-				})
+			this.mainStore.patchAccount({
+				account: this.account,
+				data: {
+					searchBody: val,
+				},
+			})
 				.then(() => {
 					Logger.info(`Body search ${val ? 'enabled' : 'disabled'}`)
 				})
diff --git a/src/components/SieveAccountForm.vue b/src/components/SieveAccountForm.vue
index 676ac33aa4..ccbc8f1ee9 100644
--- a/src/components/SieveAccountForm.vue
+++ b/src/components/SieveAccountForm.vue
@@ -62,6 +62,9 @@
 
 <script>
 import { NcButton as ButtonVue, NcTextField, NcPasswordField, NcCheckboxRadioSwitch } from '@nextcloud/vue'
+import useMainStore from '../store/mainStore.js'
+import { mapStores } from 'pinia'
+
 export default {
 	name: 'SieveAccountForm',
 	components: {
@@ -91,6 +94,9 @@ export default {
 			errorMessage: '',
 		}
 	},
+	computed: {
+		...mapStores(useMainStore),
+	},
 	methods: {
 		updateSslMode(value) {
 			this.sieveConfig.sieveSslMode = value
@@ -114,12 +120,12 @@ export default {
 			}
 
 			try {
-				await this.$store.dispatch('updateSieveAccount', {
+				await this.mainStore.updateSieveAccount({
 					account: this.account,
 					data: this.sieveConfig,
 				})
 				if (this.sieveConfig.sieveEnabled) {
-					await this.$store.dispatch('fetchActiveSieveScript', {
+					await this.mainStore.fetchActiveSieveScript({
 						accountId: this.account.id,
 					})
 				}
diff --git a/src/components/SieveFilterForm.vue b/src/components/SieveFilterForm.vue
index b9e91f28c0..3fe9b78d74 100644
--- a/src/components/SieveFilterForm.vue
+++ b/src/components/SieveFilterForm.vue
@@ -29,6 +29,9 @@
 <script>
 import { NcButton as ButtonVue, NcLoadingIcon as IconLoading } from '@nextcloud/vue'
 import IconCheck from 'vue-material-design-icons/Check.vue'
+import { mapStores } from 'pinia'
+import useMainStore from '../store/mainStore.js'
+
 export default {
 	name: 'SieveFilterForm',
 	components: {
@@ -50,8 +53,9 @@ export default {
 		}
 	},
 	computed: {
+		...mapStores(useMainStore),
 		scriptData() {
-			return this.$store.getters.getActiveSieveScript(this.account.id)
+			return this.mainStore.getActiveSieveScript(this.account.id)
 		},
 	},
 	watch: {
@@ -73,7 +77,7 @@ export default {
 			this.errorMessage = ''
 
 			try {
-				await this.$store.dispatch('updateActiveSieveScript', {
+				await this.mainStore.updateActiveSieveScript({
 					accountId: this.account.id,
 					scriptData: {
 						...this.scriptData,
diff --git a/src/components/SignatureSettings.vue b/src/components/SignatureSettings.vue
index 740d80daa3..c661d02515 100644
--- a/src/components/SignatureSettings.vue
+++ b/src/components/SignatureSettings.vue
@@ -59,6 +59,8 @@ import mitt from 'mitt'
 
 import { NcSelect, NcButton as ButtonVue, NcLoadingIcon as IconLoading } from '@nextcloud/vue'
 import IconCheck from 'vue-material-design-icons/Check.vue'
+import useMainStore from '../store/mainStore.js'
+import { mapStores } from 'pinia'
 
 export default {
 	name: 'SignatureSettings',
@@ -85,6 +87,7 @@ export default {
 		}
 	},
 	computed: {
+		...mapStores(useMainStore),
 		identities() {
 			const identities = this.account.aliases.map((alias) => {
 				return {
@@ -109,7 +112,7 @@ export default {
 	watch: {
 		async signatureAboveQuote(val, oldVal) {
 			try {
-				await this.$store.dispatch('patchAccount', {
+				await this.mainStore.patchAccount({
 					account: this.account,
 					data: {
 						signatureAboveQuote: val,
@@ -140,19 +143,25 @@ export default {
 		async saveSignature() {
 			this.loading = true
 
-			let dispatchType = 'updateAccountSignature'
 			const payload = {
 				account: this.account,
 				signature: this.signature,
 			}
 
 			if (this.identity.id > -1) {
-				dispatchType = 'updateAliasSignature'
 				payload.aliasId = this.identity.id
+				return this.mainStore.updateAliasSignature(payload)
+					.then(() => {
+						logger.info('signature updated')
+						this.loading = false
+					})
+					.catch((error) => {
+						logger.error('could not update account signature', { error })
+						throw error
+					})
 			}
 
-			return this.$store
-				.dispatch(dispatchType, payload)
+			return this.mainStore.updateAccountSignature(payload)
 				.then(() => {
 					logger.info('signature updated')
 					this.loading = false
diff --git a/src/components/TagItem.vue b/src/components/TagItem.vue
index b0aaa41aab..c30a105b16 100644
--- a/src/components/TagItem.vue
+++ b/src/components/TagItem.vue
@@ -61,6 +61,8 @@ import { showInfo } from '@nextcloud/dialogs'
 import DeleteIcon from 'vue-material-design-icons/Delete.vue'
 import IconEdit from 'vue-material-design-icons/Pencil.vue'
 import { translateTagDisplayName } from '../util/tag.js'
+import { mapStores } from 'pinia'
+import useMainStore from '../store/mainStore.js'
 
 export default {
 	name: 'TagItem',
@@ -96,6 +98,9 @@ export default {
 			renameTagInput: false,
 		}
 	},
+	computed: {
+		...mapStores(useMainStore),
+	},
 	methods: {
 		translateTagDisplayName,
 		deleteTag() {
@@ -105,7 +110,7 @@ export default {
 			this.editColor = newColor
 			this.showSaving = false
 			try {
-				await this.$store.dispatch('updateTag', {
+				await this.mainStore.updateTag({
 					tag: this.tag,
 					displayName: this.tag.displayName,
 					color: newColor,
@@ -129,7 +134,7 @@ export default {
 			const displayName = event.target.querySelector('input[type=text]').value
 
 			try {
-				await this.$store.dispatch('updateTag', {
+				await this.mainStore.updateTag({
 					tag,
 					displayName,
 					color: tag.color,
@@ -161,7 +166,7 @@ export default {
 		isSet(imapLabel) {
 			return this.envelopes.some(
 				(envelope) => (
-					this.$store.getters.getEnvelopeTags(envelope.databaseId).some(
+					this.mainStore.getEnvelopeTags(envelope.databaseId).some(
 						tag => tag.imapLabel === imapLabel,
 					)
 				),
@@ -170,13 +175,13 @@ export default {
 		addTag(imapLabel) {
 			this.isAdded = true
 			this.envelopes.forEach((envelope) => {
-				this.$store.dispatch('addEnvelopeTag', { envelope, imapLabel })
+				this.mainStore.addEnvelopeTag({ envelope, imapLabel })
 			})
 		},
 		removeTag(imapLabel) {
 			this.isAdded = false
 			this.envelopes.forEach((envelope) => {
-				this.$store.dispatch('removeEnvelopeTag', { envelope, imapLabel })
+				this.mainStore.removeEnvelopeTag({ envelope, imapLabel })
 			})
 		},
 	},
diff --git a/src/components/TagModal.vue b/src/components/TagModal.vue
index f7f35522af..f933a7e491 100644
--- a/src/components/TagModal.vue
+++ b/src/components/TagModal.vue
@@ -56,6 +56,8 @@ import IconTag from 'vue-material-design-icons/Tag.vue'
 import IconAdd from 'vue-material-design-icons/Plus.vue'
 import { showError, showInfo } from '@nextcloud/dialogs'
 import { hiddenTags } from './tags.js'
+import { mapStores } from 'pinia'
+import useMainStore from '../store/mainStore.js'
 
 function randomColor() {
 	let randomHexColor = ((1 << 24) * Math.random() | 0).toString(16)
@@ -100,8 +102,9 @@ export default {
 		}
 	},
 	computed: {
+		...mapStores(useMainStore),
 		tags() {
-			return this.$store.getters.getTags.filter((tag) => tag.imapLabel !== '$label1' && !(tag.displayName.toLowerCase() in hiddenTags)).sort((a, b) => {
+			return this.mainStore.getTags.filter((tag) => tag.imapLabel !== '$label1' && !(tag.displayName.toLowerCase() in hiddenTags)).sort((a, b) => {
 				if (a.isDefaultTag && !b.isDefaultTag) {
 					return -1
 				}
@@ -134,7 +137,7 @@ export default {
 		isSet(imapLabel) {
 			return this.envelopes.some(
 				(envelope) => (
-					this.$store.getters.getEnvelopeTags(envelope.databaseId).some(
+					this.mainStore.getEnvelopeTags(envelope.databaseId).some(
 						tag => tag.imapLabel === imapLabel,
 					)
 				),
@@ -155,7 +158,7 @@ export default {
 				showError(this.t('mail', 'Tag name is a hidden system tag'))
 				return
 			}
-			if (this.$store.getters.getTags.some(tag => tag.displayName === displayName)) {
+			if (this.mainStore.getTags.some(tag => tag.displayName === displayName)) {
 				showError(this.t('mail', 'Tag already exists'))
 				return
 			}
@@ -164,7 +167,7 @@ export default {
 				return
 			}
 			try {
-				await this.$store.dispatch('createTag', {
+				await this.mainStore.createTag({
 					displayName,
 					color: randomColor(displayName),
 				})
@@ -201,7 +204,7 @@ export default {
 			const displayName = event.target.querySelector('input[type=text]').value
 
 			try {
-				await this.$store.dispatch('updateTag', {
+				await this.mainStore.updateTag({
 					tag,
 					displayName,
 					color: tag.color,
diff --git a/src/components/TaskModal.vue b/src/components/TaskModal.vue
index 299ef8653e..4411ea56fb 100644
--- a/src/components/TaskModal.vue
+++ b/src/components/TaskModal.vue
@@ -77,6 +77,8 @@ import Task from '../task.js'
 import CalendarPickerOption from './CalendarPickerOption.vue'
 import { showError, showSuccess } from '@nextcloud/dialogs'
 import moment from '@nextcloud/moment'
+import { mapStores } from 'pinia'
+import useMainStore from '../store/mainStore.js'
 
 export default {
 	name: 'TaskModal',
@@ -111,6 +113,7 @@ export default {
 		}
 	},
 	computed: {
+		...mapStores(useMainStore),
 		disabled() {
 			return this.saving || this.calendars.length === 0
 		},
@@ -121,10 +124,10 @@ export default {
 			return this.isAllDay ? 'date' : 'datetime'
 		},
 		tags() {
-			return this.$store.getters.getAllTags
+			return this.mainStore.getAllTags
 		},
 		calendars() {
-			return this.$store.getters.getTaskCalendarsForCurrentUser
+			return this.mainStore.getTaskCalendarsForCurrentUser
 		},
 		calendarChoices() {
 			return this.calendars.map(calendar => ({
@@ -164,7 +167,7 @@ export default {
 			this.$emit('close')
 		},
 		async createTask(taskData) {
-			const task = new Task('BEGIN:VCALENDAR\nVERSION:2.0\nPRODID:-//Nextcloud Mail v' + this.$store.getters.getAppVersion + '\nEND:VCALENDAR', taskData.calendar)
+			const task = new Task('BEGIN:VCALENDAR\nVERSION:2.0\nPRODID:-//Nextcloud Mail v' + this.mainStore.getAppVersion + '\nEND:VCALENDAR', taskData.calendar)
 			task.created = ICAL.Time.now()
 			task.summary = taskData.summary
 			task.hidesubtasks = 0
diff --git a/src/components/Thread.vue b/src/components/Thread.vue
index 18d7f41038..93b488f993 100644
--- a/src/components/Thread.vue
+++ b/src/components/Thread.vue
@@ -75,6 +75,8 @@ import Error from './Error.vue'
 import RecipientBubble from './RecipientBubble.vue'
 import ThreadEnvelope from './ThreadEnvelope.vue'
 import ThreadSummary from './ThreadSummary.vue'
+import { mapStores } from 'pinia'
+import useMainStore from '../store/mainStore.js'
 
 export default {
 	name: 'Thread',
@@ -105,6 +107,7 @@ export default {
 	},
 
 	computed: {
+		...mapStores(useMainStore),
 		moreParticipantsString() {
 			// Returns a number showing the number of thread participants that are not shown in the avatar-header
 			return `+${this.threadParticipants.length - this.participantsToDisplay}`
@@ -113,19 +116,19 @@ export default {
 			return parseInt(this.$route.params.threadId, 10)
 		},
 		thread() {
-			const envelope = this.$store.getters.getEnvelope(this.threadId)
+			const envelope = this.mainStore.getEnvelope(this.threadId)
 			if (envelope === undefined) {
 				return []
 			}
 
-			const envelopes = this.$store.getters.getEnvelopesByThreadRootId(envelope.accountId, envelope.threadRootId)
+			const envelopes = this.mainStore.getEnvelopesByThreadRootId(envelope.accountId, envelope.threadRootId)
 			if (envelopes.length === 0) {
 				return []
 			}
 
-			const currentMailbox = this.$store.getters.getMailbox(envelope.mailboxId)
-			const trashMailbox = this.$store.getters.getMailboxes(envelope.accountId).find(mailbox => mailbox.specialRole === 'trash')
-			const junkMailbox = this.$store.getters.getMailboxes(envelope.accountId).find(mailbox => mailbox.specialRole === 'junk')
+			const currentMailbox = this.mainStore.getMailbox(envelope.mailboxId)
+			const trashMailbox = this.mainStore.getMailboxes(envelope.accountId).find(mailbox => mailbox.specialRole === 'trash')
+			const junkMailbox = this.mainStore.getMailboxes(envelope.accountId).find(mailbox => mailbox.specialRole === 'junk')
 
 			let limitEnvelopesToCurrentMailbox = false
 			const mailboxesToIgnore = []
@@ -283,7 +286,7 @@ export default {
 			const threadId = this.threadId
 
 			try {
-				const thread = await this.$store.dispatch('fetchThread', threadId)
+				const thread = await this.mainStore.fetchThread(threadId)
 				logger.debug(`thread for envelope ${threadId} fetched`, { thread })
 				// TODO: add timeout so that envelope isn't flagged when only viewed
 				//       for a few seconds
diff --git a/src/components/ThreadEnvelope.vue b/src/components/ThreadEnvelope.vue
index 8b20eea3ba..2c30de02d2 100644
--- a/src/components/ThreadEnvelope.vue
+++ b/src/components/ThreadEnvelope.vue
@@ -303,10 +303,11 @@ import axios from '@nextcloud/axios'
 import { generateUrl } from '@nextcloud/router'
 import { loadState } from '@nextcloud/initial-state'
 import useOutboxStore from '../store/outboxStore.js'
-import { mapStores } from 'pinia'
 import moment from '@nextcloud/moment'
 import { translateTagDisplayName } from '../util/tag.js'
 import { FOLLOW_UP_TAG_LABEL } from '../store/constants.js'
+import useMainStore from '../store/mainStore.js'
+import { mapStores } from 'pinia'
 
 // Ternary loading state
 const LOADING_DONE = 0
@@ -404,7 +405,7 @@ export default {
 		}
 	},
 	computed: {
-		...mapStores(useOutboxStore),
+		...mapStores(useOutboxStore, useMainStore),
 		inlineMenuSize() {
 			// eslint-disable-next-line no-unused-expressions
 			const { envelope } = this.$refs
@@ -413,7 +414,7 @@ export default {
 			return Math.floor(spaceToFill / 44)
 		},
 		account() {
-			return this.$store.getters.getAccount(this.envelope.accountId)
+			return this.mainStore.getAccount(this.envelope.accountId)
 		},
 		from() {
 			if (!this.message || !this.message.from.length) {
@@ -450,12 +451,12 @@ export default {
 				&& isPgpText(this.envelope.previewText)
 		},
 		isImportant() {
-			return this.$store.getters
+			return this.mainStore
 				.getEnvelopeTags(this.envelope.databaseId)
 				.find((tag) => tag.imapLabel === '$label1')
 		},
 		tags() {
-			return this.$store.getters.getEnvelopeTags(this.envelope.databaseId).filter(
+			return this.mainStore.getEnvelopeTags(this.envelope.databaseId).filter(
 				(tag) => tag.imapLabel !== '$label1' && !(tag.displayName.toLowerCase() in hiddenTags),
 			)
 		},
@@ -508,10 +509,10 @@ export default {
 			return mailboxHasRights(this.mailbox, 'w')
 		},
 		mailbox() {
-			return this.$store.getters.getMailbox(this.mailboxId)
+			return this.mainStore.getMailbox(this.mailboxId)
 		},
 		archiveMailbox() {
-			return this.$store.getters.getMailbox(this.account.archiveMailboxId)
+			return this.mainStore.getMailbox(this.account.archiveMailboxId)
 		},
 		/**
 		 * @return {{isSigned: (boolean|undefined), signatureIsValid: (boolean|undefined)}}
@@ -553,7 +554,7 @@ export default {
 		 * @return {boolean}
 		 */
 		showFollowUpHeader() {
-			const tags = this.$store.getters.getEnvelopeTags(this.envelope.databaseId)
+			const tags = this.mainStore.getEnvelopeTags(this.envelope.databaseId)
 			return tags.some((tag) => tag.imapLabel === FOLLOW_UP_TAG_LABEL)
 		},
 		/**
@@ -592,8 +593,8 @@ export default {
 			// assume that this is the relevant envelope to be scrolled to.
 			this.$nextTick(() => this.scrollToCurrentEnvelope())
 		}
-		if (this.$store.getters.getPreference('internal-addresses', 'false') === 'true') {
-			this.isInternal = this.$store.getters.isInternalAddress(this.envelope.from[0].email)
+		if (this.mainStore.getPreference('internal-addresses', 'false') === 'true') {
+			this.isInternal = this.mainStore.isInternalAddress(this.envelope.from[0].email)
 		}
 		this.$checkInterval = setInterval(() => {
 			const { envelope } = this.$refs
@@ -628,13 +629,13 @@ export default {
 			logger.debug(`fetching thread message ${this.envelope.databaseId}`)
 
 			try {
-				this.message = await this.$store.dispatch('fetchMessage', this.envelope.databaseId)
+				this.message = await this.mainStore.fetchMessage(this.envelope.databaseId)
 				logger.debug(`message ${this.envelope.databaseId} fetched`, { message: this.message })
 
 				if (!this.envelope.flags.seen && this.hasSeenAcl) {
 					logger.info('Starting timer to mark message as seen/read')
 					this.seenTimer = setTimeout(() => {
-						this.$store.dispatch('toggleEnvelopeSeen', { envelope: this.envelope })
+						this.mainStore.toggleEnvelopeSeen({ envelope: this.envelope })
 						this.seenTimer = undefined
 					}, 2000)
 				}
@@ -673,7 +674,7 @@ export default {
 			logger.debug(`Fetching itineraries for message ${this.envelope.databaseId}`)
 
 			try {
-				const itineraries = await this.$store.dispatch('fetchItineraries', this.envelope.databaseId)
+				const itineraries = await this.mainStore.fetchItineraries(this.envelope.databaseId)
 				logger.debug(`Itineraries of message ${this.envelope.databaseId} fetched`, { itineraries })
 			} catch (error) {
 				logger.error(`Could not fetch itineraries of message ${this.envelope.databaseId}`, { error })
@@ -687,7 +688,7 @@ export default {
 			logger.debug(`Fetching DKIM for message ${this.envelope.databaseId}`)
 
 			try {
-				const dkim = await this.$store.dispatch('fetchDkim', this.envelope.databaseId)
+				const dkim = await this.mainStore.fetchDkim(this.envelope.databaseId)
 				logger.debug(`DKIM of message ${this.envelope.databaseId} fetched`, { dkim })
 			} catch (error) {
 				logger.error(`Could not fetch DKIM of message ${this.envelope.databaseId}`, { error })
@@ -701,7 +702,7 @@ export default {
 			window.scrollTo({ top })
 		},
 		onReply(body = '', followUp = false, replySenderOnly = false) {
-			this.$store.dispatch('startComposerSession', {
+			this.mainStore.startComposerSession({
 				reply: {
 					mode: (this.hasMultipleRecipients && !replySenderOnly) ? 'replyAll' : 'reply',
 					data: this.envelope,
@@ -711,16 +712,16 @@ export default {
 			})
 		},
 		onToggleImportant() {
-			this.$store.dispatch('toggleEnvelopeImportant', this.envelope)
+			this.mainStore.toggleEnvelopeImportant(this.envelope)
 		},
 		onToggleFlagged() {
-			this.$store.dispatch('toggleEnvelopeFlagged', this.envelope)
+			this.mainStore.toggleEnvelopeFlagged(this.envelope)
 		},
 		onToggleJunk() {
-			this.$store.dispatch('toggleEnvelopeJunk', this.envelope)
+			this.mainStore.toggleEnvelopeJunk(this.envelope)
 		},
 		onToggleSeen() {
-			this.$store.dispatch('toggleEnvelopeSeen', { envelope: this.envelope })
+			this.mainStore.toggleEnvelopeSeen({ envelope: this.envelope })
 		},
 		async onDelete() {
 			// Remove from selection first
@@ -734,7 +735,7 @@ export default {
 			logger.info(`deleting message ${this.envelope.databaseId}`)
 
 			try {
-				await this.$store.dispatch('deleteMessage', {
+				await this.mainStore.deleteMessage({
 					id: this.envelope.databaseId,
 				})
 			} catch (error) {
@@ -761,7 +762,7 @@ export default {
 			logger.info(`archiving message ${this.envelope.databaseId}`)
 
 			try {
-				await this.$store.dispatch('moveMessage', {
+				await this.mainStore.moveMessage({
 					id: this.envelope.databaseId,
 					destMailboxId: this.account.archiveMailboxId,
 				})
@@ -771,7 +772,7 @@ export default {
 			}
 		},
 		async onDisableFollowUpReminder() {
-			await this.$store.dispatch('clearFollowUpReminder', {
+			await this.mainStore.clearFollowUpReminder({
 				envelope: this.envelope,
 			})
 		},
diff --git a/src/components/TrashRetentionSettings.vue b/src/components/TrashRetentionSettings.vue
index d1c031055b..6f707230bc 100644
--- a/src/components/TrashRetentionSettings.vue
+++ b/src/components/TrashRetentionSettings.vue
@@ -16,6 +16,8 @@
 
 <script>
 import debounce from 'lodash/fp/debounce.js'
+import useMainStore from '../store/mainStore.js'
+import { mapStores } from 'pinia'
 
 export default {
 	name: 'TrashRetentionSettings',
@@ -31,6 +33,9 @@ export default {
 			debouncedSave: debounce(1000, this.save),
 		}
 	},
+	computed: {
+		...mapStores(useMainStore),
+	},
 	methods: {
 		async save() {
 			let trashRetentionDays = parseInt(this.trashRetentionDays)
@@ -39,7 +44,7 @@ export default {
 				trashRetentionDays = 0
 			}
 
-			await this.$store.dispatch('patchAccount', {
+			await this.mainStore.patchAccount({
 				account: this.account,
 				data: { trashRetentionDays },
 			})
diff --git a/src/components/mailFilter/ActionFileinto.vue b/src/components/mailFilter/ActionFileinto.vue
index 4ea61da394..bd82829c08 100644
--- a/src/components/mailFilter/ActionFileinto.vue
+++ b/src/components/mailFilter/ActionFileinto.vue
@@ -13,6 +13,9 @@
 
 import NcSelect from '@nextcloud/vue/dist/Components/NcSelect.js'
 import { mailboxHasRights } from '../../util/acl.js'
+import { mapStores } from 'pinia'
+import useMainStore from '../../store/mainStore.js'
+
 export default {
 	name: 'ActionFileinto',
 	components: {
@@ -29,11 +32,12 @@ export default {
 		},
 	},
 	computed: {
+		...mapStores(useMainStore),
 		mailbox() {
 			return this.action.mailbox ?? undefined
 		},
 		mailboxes() {
-			const mailboxes = this.$store.getters.getMailboxes(this.account.accountId)
+			const mailboxes = this.mainStore.getMailboxes(this.account.accountId)
 				.filter(mailbox => mailboxHasRights(mailbox, 'i'))
 
 			return mailboxes.map((mailbox) => {
diff --git a/src/components/mailFilter/MailFilters.vue b/src/components/mailFilter/MailFilters.vue
index 8a1a3a6621..0955cb7f10 100644
--- a/src/components/mailFilter/MailFilters.vue
+++ b/src/components/mailFilter/MailFilters.vue
@@ -53,6 +53,7 @@ import { randomId } from '../../util/randomId.js'
 import logger from '../../logger.js'
 import { mapStores } from 'pinia'
 import useMailFilterStore from '../../store/mailFilterStore.js'
+import useMainStore from '../../store/mainStore.js'
 import DeleteIcon from 'vue-material-design-icons/Delete.vue'
 import DeleteModal from './DeleteModal.vue'
 import { showError, showSuccess } from '@nextcloud/dialogs'
@@ -85,12 +86,12 @@ export default {
 		}
 	},
 	computed: {
-		...mapStores(useMailFilterStore),
+		...mapStores(useMailFilterStore, useMainStore),
 		filters() {
 			return this.mailFilterStore.filters
 		},
 		scriptData() {
-			return this.$store.getters.getActiveSieveScript(this.account.id)
+			return this.mainStore.getActiveSieveScript(this.account.id)
 		},
 	},
 	watch: {
@@ -153,7 +154,7 @@ export default {
 				await this.mailFilterStore.update(this.account.id).then(() => {
 					showSuccess(t('mail', 'Filter saved'))
 				})
-				await this.$store.dispatch('fetchActiveSieveScript', { accountId: this.account.id })
+				await this.mainStore.fetchActiveSieveScript({ accountId: this.account.id })
 			} catch (e) {
 				logger.error(e)
 				showError(t('mail', 'Could not save filter'))
@@ -184,7 +185,7 @@ export default {
 				this.loading = false
 			}
 
-			await this.$store.dispatch('fetchActiveSieveScript', { accountId: this.account.id })
+			await this.mainStore.fetchActiveSieveScript({ accountId: this.account.id })
 		},
 		closeModal() {
 			this.currentFilter = null
diff --git a/src/components/smime/SmimeCertificateModal.vue b/src/components/smime/SmimeCertificateModal.vue
index 14940b9d86..427ee3d263 100644
--- a/src/components/smime/SmimeCertificateModal.vue
+++ b/src/components/smime/SmimeCertificateModal.vue
@@ -129,13 +129,14 @@
 </template>
 
 <script>
-import { mapGetters } from 'vuex'
 import { NcButton, NcModal, NcPasswordField, NcEmptyContent } from '@nextcloud/vue'
 import { showError, showSuccess } from '@nextcloud/dialogs'
 import logger from '../../logger.js'
 import moment from '@nextcloud/moment'
 import DeleteIcon from 'vue-material-design-icons/Delete.vue'
 import { convertPkcs12ToPem, InvalidPkcs12CertificateError } from '../../util/pkcs12.js'
+import useMainStore from '../../store/mainStore.js'
+import { mapStores, mapState } from 'pinia'
 
 const TYPE_PKCS12 = 'pkcs12'
 const TYPE_PEM = 'pem'
@@ -164,7 +165,8 @@ export default {
 		}
 	},
 	computed: {
-		...mapGetters({
+		...mapStores(useMainStore),
+		...mapState(useMainStore, {
 			certificates: 'getSmimeCertificates',
 		}),
 		inputFormIsValid() {
@@ -173,11 +175,11 @@ export default {
 	},
 	async mounted() {
 		// Refresh S/MIME certificates for good measure
-		await this.$store.dispatch('fetchSmimeCertificates')
+		await this.mainStore.fetchSmimeCertificates()
 	},
 	methods: {
 		async deleteCertificate(id) {
-			await this.$store.dispatch('deleteSmimeCertificate', id)
+			await this.mainStore.deleteSmimeCertificate(id)
 		},
 		async uploadCertificate() {
 			let certificate = this.$refs.certificate.files[0]
@@ -206,7 +208,7 @@ export default {
 
 			this.loading = true
 			try {
-				await this.$store.dispatch('createSmimeCertificate', {
+				await this.mainStore.createSmimeCertificate({
 					certificate,
 					privateKey,
 				})
diff --git a/src/directives/drag-and-drop/droppable-mailbox/droppable-mailbox.js b/src/directives/drag-and-drop/droppable-mailbox/droppable-mailbox.js
index 275edc369e..f7d1eeeef0 100644
--- a/src/directives/drag-and-drop/droppable-mailbox/droppable-mailbox.js
+++ b/src/directives/drag-and-drop/droppable-mailbox/droppable-mailbox.js
@@ -2,10 +2,15 @@
  * SPDX-FileCopyrightText: 2020 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
-import store from '../../../store/index.js'
+import useMainStore from '../../../store/mainStore.js'
 import logger from '../../../logger.js'
 import dragEventBus from '../util/dragEventBus.js'
 
+import { createPinia, setActivePinia } from 'pinia'
+
+setActivePinia(createPinia())
+const mainStore = useMainStore()
+
 export class DroppableMailbox {
 
 	constructor(el, componentInstance, options) {
@@ -123,7 +128,7 @@ export class DroppableMailbox {
 		item.setAttribute('draggable-envelope', 'pending')
 
 		try {
-			await store.dispatch('moveThread', {
+			await mainStore.moveThread({
 				envelope,
 				destMailboxId: this.options.mailboxId,
 			})
diff --git a/src/http/sessionExpiryHandler.js b/src/http/sessionExpiryHandler.js
index 52391f2af5..8bf8fce5cd 100644
--- a/src/http/sessionExpiryHandler.js
+++ b/src/http/sessionExpiryHandler.js
@@ -4,15 +4,18 @@
  */
 
 import logger from '../logger.js'
+import useMainStore from '../store/mainStore.js'
+
+export async function handleHttpAuthErrors(cb) {
+	const mainStore = useMainStore()
 
-export async function handleHttpAuthErrors(commit, cb) {
 	try {
 		return await cb()
 	} catch (error) {
 		logger.debug('req err', { error, status: error.response?.status, message: error.response?.data?.message })
 		if (error.response?.status === 401 && error.response?.data?.message === 'Current user is not logged in') {
 			logger.warn('Request failed due to expired session')
-			commit('setSessionExpired')
+			mainStore.setSessionExpiredMutation()
 		}
 		throw error
 	}
diff --git a/src/init.js b/src/init.js
new file mode 100644
index 0000000000..b2609ddc11
--- /dev/null
+++ b/src/init.js
@@ -0,0 +1,128 @@
+/**
+ * SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+import { fixAccountId } from './service/AccountService.js'
+import { loadState } from '@nextcloud/initial-state'
+
+import useOutboxStore from './store/outboxStore.js'
+import useMainStore from './store/mainStore.js'
+
+const getPreferenceFromPage = (key) => {
+	const elem = document.getElementById(key)
+	if (!elem) {
+		return
+	}
+	return elem.value
+}
+
+export default function initAfterAppCreation() {
+	console.debug('Init after app creation')
+	const mainStore = useMainStore()
+
+	mainStore.savePreferenceMutation({
+		key: 'debug',
+		value: loadState('mail', 'debug', false),
+	})
+	mainStore.savePreferenceMutation({
+		key: 'ncVersion',
+		value: loadState('mail', 'ncVersion'),
+	})
+
+	mainStore.savePreferenceMutation({
+		key: 'sort-order',
+		value: loadState('mail', 'sort-order', 'newest'),
+	})
+
+	mainStore.savePreferenceMutation({
+		key: 'attachment-size-limit',
+		value: Number.parseInt(getPreferenceFromPage('attachment-size-limit'), 10),
+	})
+	mainStore.savePreferenceMutation({
+		key: 'version',
+		value: getPreferenceFromPage('config-installed-version'),
+	})
+	mainStore.savePreferenceMutation({
+		key: 'external-avatars',
+		value: getPreferenceFromPage('external-avatars'),
+	})
+	mainStore.savePreferenceMutation({
+		key: 'collect-data',
+		value: getPreferenceFromPage('collect-data'),
+	})
+	mainStore.savePreferenceMutation({
+		key: 'search-priority-body',
+		value: getPreferenceFromPage('search-priority-body'),
+	})
+	const startMailboxId = getPreferenceFromPage('start-mailbox-id')
+	mainStore.savePreferenceMutation({
+		key: 'start-mailbox-id',
+		value: startMailboxId ? parseInt(startMailboxId, 10) : null,
+	})
+	mainStore.savePreferenceMutation({
+		key: 'tag-classified-messages',
+		value: getPreferenceFromPage('tag-classified-messages'),
+	})
+	mainStore.savePreferenceMutation({
+		key: 'allow-new-accounts',
+		value: loadState('mail', 'allow-new-accounts', true),
+	})
+	mainStore.savePreferenceMutation({
+		key: 'password-is-unavailable',
+		value: loadState('mail', 'password-is-unavailable', false),
+	})
+	mainStore.savePreferenceMutation({
+		key: 'layout-mode',
+		value: getPreferenceFromPage('layout-mode'),
+	})
+	mainStore.savePreferenceMutation({
+		key: 'follow-up-reminders',
+		value: getPreferenceFromPage('follow-up-reminders'),
+	})
+	mainStore.savePreferenceMutation({
+		key: 'internal-addresses',
+		value: loadState('mail', 'internal-addresses', false),
+	})
+
+	const accountSettings = loadState('mail', 'account-settings')
+	const accounts = loadState('mail', 'accounts', [])
+	const internalAddressesList = loadState('mail', 'internal-addresses-list', [])
+	const tags = loadState('mail', 'tags', [])
+	const outboxMessages = loadState('mail', 'outbox-messages')
+	const disableScheduledSend = loadState('mail', 'disable-scheduled-send')
+	const disableSnooze = loadState('mail', 'disable-snooze')
+	const googleOauthUrl = loadState('mail', 'google-oauth-url', null)
+	const microsoftOauthUrl = loadState('mail', 'microsoft-oauth-url', null)
+	const followUpFeatureAvailable = loadState('mail', 'llm_followup_available', false)
+
+	accounts.map(fixAccountId).forEach((account) => {
+		const settings = accountSettings.find(settings => settings.accountId === account.id)
+		if (settings) {
+			delete settings.accountId
+			Object.entries(settings).forEach(([key, value]) => {
+				mainStore.setAccountSettingMutation({
+					accountId: account.id,
+					key,
+					value,
+				})
+			})
+		}
+		mainStore.addAccountMutation({ ...account, ...settings })
+	})
+
+	tags.forEach(tag => mainStore.addTagMutation({ tag }))
+	internalAddressesList.forEach(internalAddress => mainStore.addInternalAddressMutation(internalAddress))
+
+	mainStore.setScheduledSendingDisabledMutation(disableScheduledSend)
+	mainStore.setSnoozeDisabledMutation(disableSnooze)
+	mainStore.setGoogleOauthUrlMutation(googleOauthUrl)
+	mainStore.setMicrosoftOauthUrlMutation(microsoftOauthUrl)
+	mainStore.setFollowUpFeatureAvailableMutation(followUpFeatureAvailable)
+
+	const smimeCertificates = loadState('mail', 'smime-certificates', [])
+	mainStore.setSmimeCertificatesMutation(smimeCertificates)
+
+	const outboxStore = useOutboxStore()
+	outboxMessages.forEach(message => outboxStore.addMessageMutation({ message }))
+
+}
diff --git a/src/main.js b/src/main.js
index dbe3fa7738..d5ed881b99 100644
--- a/src/main.js
+++ b/src/main.js
@@ -6,7 +6,6 @@
 import Vue from 'vue'
 import { getRequestToken } from '@nextcloud/auth'
 import { registerDavProperty } from '@nextcloud/files'
-import { sync } from 'vuex-router-sync'
 import { generateFilePath } from '@nextcloud/router'
 import '@nextcloud/dialogs/style.css'
 import './directives/drag-and-drop/styles/drag-and-drop.scss'
@@ -16,11 +15,7 @@ import vToolTip from 'v-tooltip'
 import App from './App.vue'
 import Nextcloud from './mixins/Nextcloud.js'
 import router from './router.js'
-import store from './store/index.js'
-import { fixAccountId } from './service/AccountService.js'
-import { loadState } from '@nextcloud/initial-state'
 import { createPinia, PiniaVuePlugin } from 'pinia'
-import useOutboxStore from './store/outboxStore.js'
 
 // eslint-disable-next-line camelcase
 __webpack_nonce__ = btoa(getRequestToken())
@@ -30,134 +25,18 @@ __webpack_public_path__ = generateFilePath('mail', '', 'js/')
 Vue.use(PiniaVuePlugin)
 const pinia = createPinia()
 
-sync(store, router)
-
 Vue.mixin(Nextcloud)
 
 Vue.use(VueShortKey, { prevent: ['input', 'div', 'textarea'] })
 Vue.use(vToolTip)
 
-const getPreferenceFromPage = (key) => {
-	const elem = document.getElementById(key)
-	if (!elem) {
-		return
-	}
-	return elem.value
-}
-
 registerDavProperty('nc:share-attributes', { nc: 'http://nextcloud.org/ns' })
 
-store.commit('savePreference', {
-	key: 'debug',
-	value: loadState('mail', 'debug', false),
-})
-store.commit('savePreference', {
-	key: 'ncVersion',
-	value: loadState('mail', 'ncVersion'),
-})
-
-store.commit('savePreference', {
-	key: 'sort-order',
-	value: loadState('mail', 'sort-order', 'newest'),
-})
-
-store.commit('savePreference', {
-	key: 'attachment-size-limit',
-	value: Number.parseInt(getPreferenceFromPage('attachment-size-limit'), 10),
-})
-store.commit('savePreference', {
-	key: 'version',
-	value: getPreferenceFromPage('config-installed-version'),
-})
-store.commit('savePreference', {
-	key: 'external-avatars',
-	value: getPreferenceFromPage('external-avatars'),
-})
-store.commit('savePreference', {
-	key: 'collect-data',
-	value: getPreferenceFromPage('collect-data'),
-})
-store.commit('savePreference', {
-	key: 'search-priority-body',
-	value: getPreferenceFromPage('search-priority-body'),
-})
-const startMailboxId = getPreferenceFromPage('start-mailbox-id')
-store.commit('savePreference', {
-	key: 'start-mailbox-id',
-	value: startMailboxId ? parseInt(startMailboxId, 10) : null,
-})
-store.commit('savePreference', {
-	key: 'tag-classified-messages',
-	value: getPreferenceFromPage('tag-classified-messages'),
-})
-store.commit('savePreference', {
-	key: 'allow-new-accounts',
-	value: loadState('mail', 'allow-new-accounts', true),
-})
-store.commit('savePreference', {
-	key: 'password-is-unavailable',
-	value: loadState('mail', 'password-is-unavailable', false),
-})
-store.commit('savePreference', {
-	key: 'layout-mode',
-	value: getPreferenceFromPage('layout-mode'),
-})
-store.commit('savePreference', {
-	key: 'follow-up-reminders',
-	value: getPreferenceFromPage('follow-up-reminders'),
-})
-store.commit('savePreference', {
-	key: 'internal-addresses',
-	value: loadState('mail', 'internal-addresses', false),
-})
-
-const accountSettings = loadState('mail', 'account-settings')
-const accounts = loadState('mail', 'accounts', [])
-const internalAddressesList = loadState('mail', 'internal-addresses-list', [])
-const tags = loadState('mail', 'tags', [])
-const outboxMessages = loadState('mail', 'outbox-messages')
-const disableScheduledSend = loadState('mail', 'disable-scheduled-send')
-const disableSnooze = loadState('mail', 'disable-snooze')
-const googleOauthUrl = loadState('mail', 'google-oauth-url', null)
-const microsoftOauthUrl = loadState('mail', 'microsoft-oauth-url', null)
-const followUpFeatureAvailable = loadState('mail', 'llm_followup_available', false)
-
-accounts.map(fixAccountId).forEach((account) => {
-	const settings = accountSettings.find(settings => settings.accountId === account.id)
-	if (settings) {
-		delete settings.accountId
-		Object.entries(settings).forEach(([key, value]) => {
-			store.commit('setAccountSetting', {
-				accountId: account.id,
-				key,
-				value,
-			})
-		})
-	}
-	store.commit('addAccount', { ...account, ...settings })
-})
-
-tags.forEach(tag => store.commit('addTag', { tag }))
-internalAddressesList.forEach(internalAddress => store.commit('addInternalAddress', internalAddress))
-
-store.commit('setScheduledSendingDisabled', disableScheduledSend)
-store.commit('setSnoozeDisabled', disableSnooze)
-store.commit('setGoogleOauthUrl', googleOauthUrl)
-store.commit('setMicrosoftOauthUrl', microsoftOauthUrl)
-store.commit('setFollowUpFeatureAvailable', followUpFeatureAvailable)
-
-const smimeCertificates = loadState('mail', 'smime-certificates', [])
-store.commit('setSmimeCertificates', smimeCertificates)
-
 /* eslint-disable vue/match-component-file-name */
 export default new Vue({
 	el: '#content',
 	name: 'Mail',
 	router,
-	store,
 	pinia,
 	render: (h) => h(App),
 })
-
-const outboxStore = useOutboxStore()
-outboxMessages.forEach(message => outboxStore.addMessageMutation({ message }))
diff --git a/src/store/actions.js b/src/store/actions.js
deleted file mode 100644
index a6324b58cf..0000000000
--- a/src/store/actions.js
+++ /dev/null
@@ -1,1545 +0,0 @@
-/**
- * SPDX-FileCopyrightText: 2019 Nextcloud GmbH and Nextcloud contributors
- * SPDX-License-Identifier: AGPL-3.0-or-later
- */
-
-import flatMapDeep from 'lodash/fp/flatMapDeep.js'
-import orderBy from 'lodash/fp/orderBy.js'
-import {
-	andThen,
-	complement,
-	curry,
-	filter,
-	flatten,
-	gt,
-	lt,
-	identity,
-	last,
-	map,
-	pipe,
-	prop,
-	propEq,
-	slice,
-	tap,
-	where,
-} from 'ramda'
-
-import { savePreference } from '../service/PreferenceService.js'
-import {
-	create as createAccount,
-	deleteAccount,
-	fetch as fetchAccount,
-	fetchAll as fetchAllAccounts,
-	patch as patchAccount,
-	update as updateAccount,
-	updateSignature,
-	updateSmimeCertificate as updateAccountSmimeCertificate,
-} from '../service/AccountService.js'
-import {
-	create as createMailbox,
-	clearMailbox,
-	deleteMailbox,
-	fetchAll as fetchAllMailboxes,
-	markMailboxRead,
-	patchMailbox,
-} from '../service/MailboxService.js'
-import {
-	createEnvelopeTag,
-	deleteMessage,
-	fetchEnvelope,
-	fetchEnvelopes,
-	fetchMessage,
-	fetchMessageDkim,
-	fetchMessageItineraries,
-	fetchThread,
-	moveMessage,
-	removeEnvelopeTag,
-	setEnvelopeFlags,
-	setEnvelopeTag,
-	snoozeMessage,
-	syncEnvelopes,
-	unSnoozeMessage,
-	updateEnvelopeTag,
-	deleteTag,
-} from '../service/MessageService.js'
-import { moveDraft, updateDraft } from '../service/DraftService.js'
-import * as AliasService from '../service/AliasService.js'
-import logger from '../logger.js'
-import { normalizedEnvelopeListId } from './normalization.js'
-import { showNewMessagesNotification } from '../service/NotificationService.js'
-import { matchError } from '../errors/match.js'
-import SyncIncompleteError from '../errors/SyncIncompleteError.js'
-import MailboxLockedError from '../errors/MailboxLockedError.js'
-import { wait } from '../util/wait.js'
-import {
-	getActiveScript,
-	updateAccount as updateSieveAccount,
-	updateActiveScript,
-} from '../service/SieveService.js'
-import { FOLLOW_UP_TAG_LABEL, PAGE_SIZE, UNIFIED_INBOX_ID } from './constants.js'
-import * as ThreadService from '../service/ThreadService.js'
-import {
-	getPrioritySearchQueries,
-	priorityImportantQuery,
-	priorityOtherQuery,
-} from '../util/priorityInbox.js'
-import { html, plain, toPlain } from '../util/text.js'
-import Axios from '@nextcloud/axios'
-import { generateUrl } from '@nextcloud/router'
-import { handleHttpAuthErrors } from '../http/sessionExpiryHandler.js'
-import { showError, showWarning } from '@nextcloud/dialogs'
-import { translate as t } from '@nextcloud/l10n'
-import {
-	buildForwardSubject,
-	buildRecipients as buildReplyRecipients,
-	buildReplySubject,
-} from '../ReplyBuilder.js'
-import DOMPurify from 'dompurify'
-import {
-	getCurrentUserPrincipal,
-	initializeClientForUserView,
-	findAll,
-} from '../service/caldavService.js'
-import * as SmimeCertificateService from '../service/SmimeCertificateService.js'
-import useOutboxStore from './outboxStore.js'
-import * as FollowUpService from '../service/FollowUpService.js'
-import { addInternalAddress, removeInternalAddress } from '../service/InternalAddressService.js'
-
-const sliceToPage = slice(0, PAGE_SIZE)
-
-const findIndividualMailboxes = curry((getMailboxes, specialRole) =>
-	pipe(
-		filter(complement(prop('isUnified'))),
-		map(prop('id')),
-		map(getMailboxes),
-		flatten,
-		filter(propEq(specialRole, 'specialRole')),
-	),
-)
-
-const combineEnvelopeLists = (sortOrder) => {
-	if (sortOrder === 'oldest') {
-		return pipe(flatten, orderBy(prop('dateInt'), 'asc'))
-	}
-
-	return pipe(flatten, orderBy(prop('dateInt'), 'desc'))
-}
-
-export default {
-	savePreference({ commit, getters }, { key, value }) {
-		return handleHttpAuthErrors(commit, async () => {
-			const newValue = await savePreference(key, value)
-			commit('savePreference', {
-				key,
-				value: newValue.value,
-			})
-		})
-	},
-	async fetchAccounts({ commit, getters }) {
-		return handleHttpAuthErrors(commit, async () => {
-			const accounts = await fetchAllAccounts()
-			accounts.forEach((account) => commit('addAccount', account))
-			return getters.accounts
-		})
-	},
-	async fetchAccount({ commit }, id) {
-		return handleHttpAuthErrors(commit, async () => {
-			const account = await fetchAccount(id)
-			commit('addAccount', account)
-			return account
-		})
-	},
-	async startAccountSetup({ commit }, config) {
-		const account = await createAccount(config)
-		logger.debug(`account ${account.id} created`, { account })
-		return account
-	},
-	async finishAccountSetup({ commit }, { account }) {
-		logger.debug(`Fetching mailboxes for account ${account.id},  …`, { account })
-		account.mailboxes = await fetchAllMailboxes(account.id)
-		commit('addAccount', account)
-		logger.debug('New account mailboxes fetched', { account, mailboxes: account.mailboxes })
-		return account
-	},
-	async updateAccount({ commit }, config) {
-		return handleHttpAuthErrors(commit, async () => {
-			const account = await updateAccount(config)
-			logger.debug('account updated', { account })
-			commit('editAccount', account)
-			return account
-		})
-	},
-	async patchAccount({ commit }, { account, data }) {
-		return handleHttpAuthErrors(commit, async () => {
-			const patchedAccount = await patchAccount(account, data)
-			logger.debug('account patched', { account: patchedAccount, data })
-			commit('patchAccount', { account, data })
-			return account
-		})
-	},
-	async updateAccountSignature({ commit }, { account, signature }) {
-		return handleHttpAuthErrors(commit, async () => {
-			await updateSignature(account, signature)
-			logger.debug('account signature updated', { account, signature })
-			const updated = Object.assign({}, account, { signature })
-			commit('editAccount', updated)
-			return account
-		})
-	},
-	async setAccountSetting({ commit, getters }, { accountId, key, value }) {
-		return handleHttpAuthErrors(commit, async () => {
-			commit('setAccountSetting', { accountId, key, value })
-			return await savePreference('account-settings', JSON.stringify(getters.getAllAccountSettings))
-		})
-	},
-	async deleteAccount({ commit }, account) {
-		return handleHttpAuthErrors(commit, async () => {
-			try {
-				await deleteAccount(account.id)
-			} catch (error) {
-				logger.error('could not delete account', { error })
-				throw error
-			}
-		})
-	},
-	async deleteMailbox({ commit }, { mailbox }) {
-		return handleHttpAuthErrors(commit, async () => {
-			await deleteMailbox(mailbox.databaseId)
-			commit('removeMailbox', { id: mailbox.databaseId })
-		})
-	},
-	async clearMailbox({ commit }, { mailbox }) {
-		return handleHttpAuthErrors(commit, async () => {
-			await clearMailbox(mailbox.databaseId)
-			commit('removeEnvelopes', { id: mailbox.databaseId })
-			commit('setMailboxUnreadCount', { id: mailbox.databaseId })
-		})
-	},
-	async createMailbox({ commit }, { account, name }) {
-		return handleHttpAuthErrors(commit, async () => {
-			const prefixed = (account.personalNamespace && !name.startsWith(account.personalNamespace))
-				? account.personalNamespace + name
-				: name
-			const mailbox = await createMailbox(account.id, prefixed)
-			console.debug(`mailbox ${prefixed} created for account ${account.id}`, { mailbox })
-			commit('addMailbox', { account, mailbox })
-			commit('expandAccount', account.id)
-			commit('setAccountSetting', {
-				accountId: account.id,
-				key: 'collapsed',
-				value: false,
-			})
-			return mailbox
-		})
-	},
-	async moveAccount({ commit, getters }, { account, up }) {
-		return handleHttpAuthErrors(commit, async () => {
-			const accounts = getters.accounts
-			const index = accounts.indexOf(account)
-			if (up) {
-				const previous = accounts[index - 1]
-				accounts[index - 1] = account
-				accounts[index] = previous
-			} else {
-				const next = accounts[index + 1]
-				accounts[index + 1] = account
-				accounts[index] = next
-			}
-			return await Promise.all(
-				accounts.map((account, idx) => {
-					if (account.id === 0) {
-						return Promise.resolve()
-					}
-					commit('saveAccountsOrder', { account, order: idx })
-					return patchAccount(account, { order: idx })
-				}),
-			)
-		})
-	},
-	async markMailboxRead({ commit, getters, dispatch }, { accountId, mailboxId }) {
-		return handleHttpAuthErrors(commit, async () => {
-			const mailbox = getters.getMailbox(mailboxId)
-
-			if (mailbox.isUnified) {
-				const findIndividual = findIndividualMailboxes(getters.getMailboxes, mailbox.specialRole)
-				const individualMailboxes = findIndividual(getters.accounts)
-				return Promise.all(
-					individualMailboxes.map((mb) =>
-						dispatch('markMailboxRead', {
-							accountId: mb.accountId,
-							mailboxId: mb.databaseId,
-						}),
-					),
-				)
-			}
-
-			const updated = Object.assign({}, mailbox)
-			updated.unread = 0
-
-			await markMailboxRead(mailboxId)
-			commit('updateMailbox', {
-				mailbox: updated,
-			})
-
-			dispatch('syncEnvelopes', {
-				accountId,
-				mailboxId,
-			})
-		})
-	},
-	async changeMailboxSubscription({ commit }, { mailbox, subscribed }) {
-		return handleHttpAuthErrors(commit, async () => {
-			logger.debug(`toggle subscription for mailbox ${mailbox.databaseId}`, {
-				mailbox,
-				subscribed,
-			})
-			const updated = await patchMailbox(mailbox.databaseId, { subscribed })
-
-			commit('updateMailbox', {
-				mailbox: updated,
-			})
-			logger.debug(`subscription for mailbox ${mailbox.databaseId} updated`, {
-				mailbox,
-				updated,
-			})
-		})
-	},
-	async patchMailbox({ commit }, { mailbox, attributes }) {
-		return handleHttpAuthErrors(commit, async () => {
-			logger.debug('patching mailbox', {
-				mailbox,
-				attributes,
-			})
-
-			const updated = await patchMailbox(mailbox.databaseId, attributes)
-
-			commit('updateMailbox', {
-				mailbox: updated,
-			})
-			logger.debug(`mailbox ${mailbox.databaseId} patched`, {
-				mailbox,
-				updated,
-			})
-		})
-	},
-	async startComposerSession({ dispatch, commit, getters }, {
-		type = 'imap',
-		data = {},
-		reply,
-		forwardedMessages = [],
-		templateMessageId,
-		isBlankMessage = false,
-	}) {
-		// Silently close old session if already saved and show a discard modal otherwise
-		if (getters.composerSessionId && !getters.composerMessageIsSaved) {
-			// TODO: Nice to have: Add button to save current pending message
-			const discard = await new Promise((resolve) => OC.dialogs.confirmDestructive(
-				t('mail', 'There is already a message in progress. All unsaved changes will be lost if you continue!'),
-				t('mail', 'Discard changes'),
-				{
-					type: OC.dialogs.YES_NO_BUTTONS,
-					confirm: t('mail', 'Discard unsaved changes'),
-					confirmClasses: 'error',
-					cancel: t('mail', 'Keep editing message'),
-				},
-				(decision) => {
-					resolve(decision)
-				},
-			))
-			if (!discard) {
-				commit('showMessageComposer')
-				return
-			}
-		}
-
-		return handleHttpAuthErrors(commit, async () => {
-			if (reply) {
-				const original = await dispatch('fetchMessage', reply.data.databaseId)
-
-				// Fetch and transform the body into a rich text object
-				if (original.hasHtmlBody) {
-					const resp = await Axios.get(
-						generateUrl('/apps/mail/api/messages/{id}/html?plain=true', {
-							id: original.databaseId,
-						}),
-					)
-
-					resp.data = DOMPurify.sanitize(resp.data, {
-						FORBID_TAGS: ['style'],
-					})
-
-					data.body = html(resp.data)
-					if (reply.suggestedReply) {
-						data.body.value = `<p>${reply.suggestedReply}<\\p>` + data.body.value
-					}
-				} else {
-					data.body = plain(original.body)
-					if (reply.suggestedReply) {
-						data.body.value = `${reply.suggestedReply}\n` + data.body.value
-					}
-				}
-
-				if (reply.mode === 'reply') {
-					logger.debug('Show simple reply composer', { reply })
-					let to = original.replyTo !== undefined ? original.replyTo : reply.data.from
-					if (reply.followUp) {
-						to = reply.data.to
-					}
-					commit('startComposerSession', {
-						data: {
-							accountId: reply.data.accountId,
-							to,
-							cc: [],
-							subject: buildReplySubject(reply.data.subject),
-							body: data.body,
-							originalBody: data.body,
-							replyTo: reply.data,
-							smartReply: reply.smartReply,
-						},
-					})
-					return
-				} else if (reply.mode === 'replyAll') {
-					logger.debug('Show reply all reply composer', { reply })
-					const account = getters.getAccount(reply.data.accountId)
-					const recipients = buildReplyRecipients(reply.data, {
-						email: account.emailAddress,
-						label: account.name,
-					}, original.replyTo)
-					commit('startComposerSession', {
-						data: {
-							accountId: reply.data.accountId,
-							to: recipients.to,
-							cc: recipients.cc,
-							subject: buildReplySubject(reply.data.subject),
-							body: data.body,
-							originalBody: data.body,
-							replyTo: reply.data,
-						},
-					})
-					return
-				} else if (reply.mode === 'forward') {
-					logger.debug('Show forward composer', { reply })
-					commit('startComposerSession', {
-						data: {
-							accountId: reply.data.accountId,
-							to: [],
-							cc: [],
-							subject: buildForwardSubject(reply.data.subject),
-							body: data.body,
-							originalBody: data.body,
-							forwardFrom: reply.data,
-							attachments: original.attachments.map(attachment => ({
-								...attachment,
-								mailboxId: original.mailboxId,
-								// messageId for attachments is actually the uid
-								uid: attachment.messageId,
-								type: 'message-attachment',
-							})),
-						},
-					})
-					return
-				}
-			} else if (templateMessageId) {
-				const message = await dispatch('fetchMessage', templateMessageId)
-				// Merge the original into any existing data
-				data = {
-					...data,
-					message,
-				}
-
-				// Fetch and transform the body into a rich text object
-				if (message.hasHtmlBody) {
-					const resp = await Axios.get(
-						generateUrl('/apps/mail/api/messages/{id}/html?plain=true', {
-							id: templateMessageId,
-						}),
-					)
-
-					resp.data = DOMPurify.sanitize(resp.data, {
-						FORBID_TAGS: ['style'],
-					})
-
-					data.body = html(resp.data)
-				} else {
-					data.body = plain(message.body)
-				}
-
-				// TODO: implement attachments
-				if (message.attachments.length) {
-					showWarning(t('mail', 'Attachments were not copied. Please add them manually.'))
-				}
-			}
-
-			// Stop schedule when editing outbox messages and backup sendAt timestamp
-			let originalSendAt
-			if (type === 'outbox' && data.id && data.sendAt) {
-				originalSendAt = data.sendAt
-				const message = {
-					...data,
-					body: data.isHtml ? data.body.value : toPlain(data.body).value,
-				}
-				const outboxStore = useOutboxStore()
-				await outboxStore.stopMessage({ message })
-			}
-
-			commit('startComposerSession', {
-				type,
-				data,
-				forwardedMessages,
-				templateMessageId,
-				originalSendAt,
-			})
-
-			// Blank messages can be safely discarded (without saving a draft) until changes are made
-			if (isBlankMessage) {
-				commit('setComposerMessageSaved', true)
-			}
-		})
-	},
-	async stopComposerSession({ commit, dispatch, getters }, { restoreOriginalSendAt = false, moveToImap = false, id } = {}) {
-		return handleHttpAuthErrors(commit, async () => {
-
-			// Restore original sendAt timestamp when requested
-			const message = getters.composerMessage
-			if (restoreOriginalSendAt && message.type === 'outbox' && message.options?.originalSendAt) {
-				const body = message.data.body
-				message.body = message.data.isHtml ? body.value : toPlain(body).value
-				message.sendAt = message.options.originalSendAt
-				updateDraft(message)
-			}
-			if (moveToImap) {
-				 await moveDraft(id)
-			}
-
-			commit('stopComposerSession')
-		})
-	},
-	showMessageComposer({ commit }) {
-		commit('showMessageComposer')
-	},
-	closeMessageComposer({ commit }) {
-		commit('hideMessageComposer')
-	},
-	patchComposerData({ commit }, data) {
-		commit('patchComposerData', data)
-		commit('setComposerMessageSaved', false)
-	},
-	async fetchEnvelope({ commit, getters }, { accountId, id }) {
-		return handleHttpAuthErrors(commit, async () => {
-			const cached = getters.getEnvelope(id)
-			if (cached) {
-				logger.debug(`using cached value for envelope ${id}`)
-				return cached
-			}
-
-			const envelope = await fetchEnvelope(accountId, id)
-			// Only commit if not undefined (not found)
-			if (envelope) {
-				commit('addEnvelopes', {
-					envelopes: [envelope],
-				})
-			}
-
-			// Always use the object from the store
-			return getters.getEnvelope(id)
-		})
-	},
-	fetchEnvelopes({ state, commit, getters, dispatch }, { mailboxId, query, addToUnifiedMailboxes = true }) {
-		return handleHttpAuthErrors(commit, async () => {
-			const mailbox = getters.getMailbox(mailboxId)
-
-			if (mailbox.isUnified) {
-				const fetchIndividualLists = pipe(
-					map((mb) =>
-						dispatch('fetchEnvelopes', {
-							mailboxId: mb.databaseId,
-							query,
-							addToUnifiedMailboxes: false,
-						}),
-					),
-					Promise.all.bind(Promise),
-					andThen(map(sliceToPage)),
-				)
-				const fetchUnifiedEnvelopes = pipe(
-					findIndividualMailboxes(getters.getMailboxes, mailbox.specialRole),
-					fetchIndividualLists,
-					andThen(combineEnvelopeLists(getters.getPreference('sort-order'))),
-					andThen(sliceToPage),
-					andThen(
-						tap((envelopes) =>
-							commit('addEnvelopes', {
-								envelopes,
-								query,
-							}),
-						),
-					),
-				)
-
-				return fetchUnifiedEnvelopes(getters.accounts)
-			}
-
-			return pipe(
-				fetchEnvelopes,
-				andThen(
-					tap((envelopes) =>
-						commit('addEnvelopes', {
-							query,
-							envelopes,
-							addToUnifiedMailboxes,
-						}),
-					),
-				),
-			)(mailbox.accountId, mailboxId, query, undefined, PAGE_SIZE, getters.getPreference('sort-order'))
-		})
-	},
-	async fetchNextEnvelopePage({ commit, getters, dispatch }, { mailboxId, query }) {
-		return handleHttpAuthErrors(commit, async () => {
-			const envelopes = await dispatch('fetchNextEnvelopes', {
-				mailboxId,
-				query,
-				quantity: PAGE_SIZE,
-			})
-			return envelopes
-		})
-	},
-	async fetchNextEnvelopes({ commit, getters, dispatch }, { mailboxId, query, quantity, rec = true, addToUnifiedMailboxes = true }) {
-		return handleHttpAuthErrors(commit, async () => {
-			const mailbox = getters.getMailbox(mailboxId)
-
-			if (mailbox.isUnified) {
-				const getIndivisualLists = curry((query, m) => getters.getEnvelopes(m.databaseId, query))
-				const individualCursor = curry((query, m) =>
-					prop('dateInt', last(getters.getEnvelopes(m.databaseId, query))),
-				)
-				const cursor = individualCursor(query, mailbox)
-
-				if (cursor === undefined) {
-					throw new Error('Unified list has no tail')
-				}
-				const newestFirst = getters.getPreference('sort-order') === 'newest'
-				const nextLocalUnifiedEnvelopes = pipe(
-					findIndividualMailboxes(getters.getMailboxes, mailbox.specialRole),
-					map(getIndivisualLists(query)),
-					combineEnvelopeLists(getters.getPreference('sort-order')),
-					filter(
-						where({
-							dateInt: newestFirst ? gt(cursor) : lt(cursor),
-						}),
-					),
-					slice(0, quantity),
-				)
-				// We know the next envelopes based on local data
-				// We have to fetch individual envelopes only if it ends in the known
-				// next fetch. If it ends after, we have all the relevant data already.
-				const needsFetch = curry((query, nextEnvelopes, mb) => {
-					const c = individualCursor(query, mb)
-					if (nextEnvelopes.length < quantity) {
-						return true
-					}
-
-					if (getters.getPreference('sort-order') === 'newest') {
-						return c >= last(nextEnvelopes).dateInt
-					} else {
-						return c <= last(nextEnvelopes).dateInt
-					}
-				})
-
-				const mailboxesToFetch = (accounts) =>
-					pipe(
-						findIndividualMailboxes(getters.getMailboxes, mailbox.specialRole),
-						tap(mbs => console.info('individual mailboxes', mbs)),
-						filter(needsFetch(query, nextLocalUnifiedEnvelopes(accounts))),
-					)(accounts)
-				const mbs = mailboxesToFetch(getters.accounts)
-
-				if (rec && mbs.length) {
-					logger.debug('not enough local envelopes for the next unified page. ' + mbs.length + ' fetches required', {
-						mailboxes: mbs.map(mb => mb.databaseId),
-					})
-					return pipe(
-						map((mb) =>
-							dispatch('fetchNextEnvelopes', {
-								mailboxId: mb.databaseId,
-								query,
-								quantity,
-								addToUnifiedMailboxes: false,
-							}),
-						),
-						Promise.all.bind(Promise),
-						andThen(() =>
-							dispatch('fetchNextEnvelopes', {
-								mailboxId,
-								query,
-								quantity,
-								rec: false,
-								addToUnifiedMailboxes: true,
-							}),
-						),
-					)(mbs)
-				}
-
-				const envelopes = nextLocalUnifiedEnvelopes(getters.accounts)
-				logger.debug('next unified page can be built locally and consists of ' + envelopes.length + ' envelopes', { addToUnifiedMailboxes })
-				commit('addEnvelopes', {
-					query,
-					envelopes,
-					addToUnifiedMailboxes,
-				})
-				return envelopes
-			}
-
-			const list = mailbox.envelopeLists[normalizedEnvelopeListId(query)]
-			if (list === undefined) {
-				console.warn("envelope list is not defined, can't fetch next envelopes", mailboxId, query)
-				return Promise.resolve([])
-			}
-			const lastEnvelopeId = last(list)
-			if (typeof lastEnvelopeId === 'undefined') {
-				console.error('mailbox is empty', list)
-				return Promise.reject(new Error('Local mailbox has no envelopes, cannot determine cursor'))
-			}
-			const lastEnvelope = getters.getEnvelope(lastEnvelopeId)
-			if (typeof lastEnvelope === 'undefined') {
-				return Promise.reject(new Error('Cannot find last envelope. Required for the mailbox cursor'))
-			}
-
-			return fetchEnvelopes(mailbox.accountId, mailboxId, query, lastEnvelope.dateInt, quantity, getters.getPreference('sort-order')).then((envelopes) => {
-				logger.debug(`fetched ${envelopes.length} messages for mailbox ${mailboxId}`, {
-					envelopes,
-					addToUnifiedMailboxes,
-				})
-				commit('addEnvelopes', {
-					query,
-					envelopes,
-					addToUnifiedMailboxes,
-				})
-				return envelopes
-			})
-		})
-	},
-	syncEnvelopes({ commit, getters, dispatch }, { mailboxId, query, init = false }) {
-		return handleHttpAuthErrors(commit, async () => {
-			logger.debug(`starting mailbox sync of ${mailboxId} (${query})`)
-
-			const mailbox = getters.getMailbox(mailboxId)
-
-			// Skip superfluous requests if using passwordless authentication. They will fail anyway.
-			const passwordIsUnavailable = getters.getPreference('password-is-unavailable', false)
-			const isDisabled = (account) => passwordIsUnavailable && !!account.provisioningId
-
-			if (mailbox.isUnified) {
-				return Promise.all(
-					getters.accounts
-						.filter((account) => !account.isUnified && !isDisabled(account))
-						.map((account) =>
-							Promise.all(
-								getters
-									.getMailboxes(account.id)
-									.filter((mb) => mb.specialRole === mailbox.specialRole)
-									.map((mailbox) =>
-										dispatch('syncEnvelopes', {
-											mailboxId: mailbox.databaseId,
-											query,
-											init,
-										}),
-									),
-							),
-						),
-				)
-			} else if (mailbox.isPriorityInbox && query === undefined) {
-				return Promise.all(
-					getPrioritySearchQueries().map((query) => {
-						return Promise.all(
-							getters.accounts
-								.filter((account) => !account.isUnified && !isDisabled(account))
-								.map((account) =>
-									Promise.all(
-										getters
-											.getMailboxes(account.id)
-											.filter((mb) => mb.specialRole === mailbox.specialRole)
-											.map((mailbox) =>
-												dispatch('syncEnvelopes', {
-													mailboxId: mailbox.databaseId,
-													query,
-													init,
-												}),
-											),
-									),
-								),
-						)
-					}),
-				)
-			}
-
-			const ids = getters.getEnvelopes(mailboxId, query).map((env) => env.databaseId)
-			const lastTimestamp = getters.getPreference('sort-order') === 'newest' ? null : getters.getEnvelopes(mailboxId, query)[0]?.dateInt
-			logger.debug(`mailbox sync of ${mailboxId} (${query}) has ${ids.length} known IDs. ${lastTimestamp} is the last known message timestamp`, { mailbox })
-			return syncEnvelopes(mailbox.accountId, mailboxId, ids, lastTimestamp, query, init, getters.getPreference('sort-order'))
-				.then((syncData) => {
-					logger.debug(`mailbox ${mailboxId} (${query}) synchronized, ${syncData.newMessages.length} new, ${syncData.changedMessages.length} changed and ${syncData.vanishedMessages.length} vanished messages`)
-
-					const unifiedMailbox = getters.getUnifiedMailbox(mailbox.specialRole)
-
-					commit('addEnvelopes', {
-						envelopes: syncData.newMessages,
-						query,
-					})
-
-					syncData.newMessages.forEach((envelope) => {
-						if (unifiedMailbox) {
-							commit('updateEnvelope', {
-								envelope,
-							})
-						}
-					})
-					syncData.changedMessages.forEach((envelope) => {
-						commit('updateEnvelope', {
-							envelope,
-						})
-					})
-					syncData.vanishedMessages.forEach((id) => {
-						commit('removeEnvelope', {
-							id,
-						})
-						// Already removed from unified inbox
-					})
-
-					commit('setMailboxUnreadCount', {
-						id: mailboxId,
-						unread: syncData.stats.unread,
-					})
-
-					return syncData.newMessages
-				})
-				.catch((error) => {
-					return matchError(error, {
-						[SyncIncompleteError.getName()]() {
-							console.warn(`(initial) sync of mailbox ${mailboxId} (${query}) is incomplete, retriggering`)
-							return dispatch('syncEnvelopes', {
-								mailboxId,
-								query,
-								init,
-							})
-						},
-						[MailboxLockedError.getName()](error) {
-							if (init) {
-								logger.info('Sync failed because the mailbox is locked, stopping here because this is an initial sync', { error })
-								throw error
-							}
-
-							logger.info('Sync failed because the mailbox is locked, retriggering', { error })
-							return wait(1500).then(() => dispatch('syncEnvelopes', {
-								mailboxId,
-								query,
-								init,
-							}))
-						},
-						default(error) {
-							console.error('Could not sync envelopes: ' + error.message, error)
-							throw error
-						},
-					})
-				})
-		})
-	},
-	async syncInboxes({ commit, getters, dispatch }) {
-		// Skip superfluous requests if using passwordless authentication. They will fail anyway.
-		const passwordIsUnavailable = getters.getPreference('password-is-unavailable', false)
-		const isDisabled = (account) => passwordIsUnavailable && !!account.provisioningId
-
-		return handleHttpAuthErrors(commit, async () => {
-			const results = await Promise.all(
-				getters.accounts
-					.filter((a) => !a.isUnified && !isDisabled(a))
-					.map((account) => {
-						return Promise.all(
-							getters.getMailboxes(account.id).map(async (mailbox) => {
-								if (mailbox.specialRole !== 'inbox') {
-									return
-								}
-
-								const list = mailbox.envelopeLists[normalizedEnvelopeListId(undefined)]
-								if (list === undefined) {
-									await dispatch('fetchEnvelopes', {
-										mailboxId: mailbox.databaseId,
-									})
-								}
-
-								return await dispatch('syncEnvelopes', {
-									mailboxId: mailbox.databaseId,
-								})
-							}),
-						)
-					}),
-			)
-			const newMessages = flatMapDeep(identity, results).filter((m) => m !== undefined)
-			if (newMessages.length === 0) {
-				return
-			}
-
-			try {
-				// Make sure the priority inbox is updated as well
-				logger.info('updating priority inbox')
-				for (const query of [priorityImportantQuery, priorityOtherQuery]) {
-					logger.info("sync'ing priority inbox section", { query })
-					const mailbox = getters.getMailbox(UNIFIED_INBOX_ID)
-					const list = mailbox.envelopeLists[normalizedEnvelopeListId(query)]
-					if (list === undefined) {
-						await dispatch('fetchEnvelopes', {
-							mailboxId: UNIFIED_INBOX_ID,
-							query,
-						})
-					}
-
-					await dispatch('syncEnvelopes', {
-						mailboxId: UNIFIED_INBOX_ID,
-						query,
-					})
-				}
-			} finally {
-				showNewMessagesNotification(newMessages)
-			}
-		})
-	},
-	toggleEnvelopeFlagged({ commit, getters }, envelope) {
-		return handleHttpAuthErrors(commit, async () => {
-			// Change immediately and switch back on error
-			const oldState = envelope.flags.flagged
-			commit('flagEnvelope', {
-				envelope,
-				flag: 'flagged',
-				value: !oldState,
-			})
-
-			try {
-				await setEnvelopeFlags(envelope.databaseId, {
-					flagged: !oldState,
-				})
-			} catch (error) {
-				logger.error('Could not toggle message flagged state', { error })
-
-				// Revert change
-				commit('flagEnvelope', {
-					envelope,
-					flag: 'flagged',
-					value: oldState,
-				})
-
-				throw error
-			}
-		})
-	},
-	async toggleEnvelopeImportant({ commit, dispatch, getters }, envelope) {
-		return handleHttpAuthErrors(commit, async () => {
-			const importantLabel = '$label1'
-			const hasTag = getters
-				.getEnvelopeTags(envelope.databaseId)
-				.some((tag) => tag.imapLabel === importantLabel)
-			if (hasTag) {
-				await dispatch('removeEnvelopeTag', {
-					envelope,
-					imapLabel: importantLabel,
-				})
-			} else {
-				await dispatch('addEnvelopeTag', {
-					envelope,
-					imapLabel: importantLabel,
-				})
-			}
-		})
-	},
-	async toggleEnvelopeSeen({ commit, getters }, { envelope, seen }) {
-		return handleHttpAuthErrors(commit, async () => {
-			// Change immediately and switch back on error
-			const oldState = envelope.flags.seen
-			const newState = seen === undefined ? !oldState : seen
-			commit('flagEnvelope', {
-				envelope,
-				flag: 'seen',
-				value: newState,
-			})
-
-			try {
-				await setEnvelopeFlags(envelope.databaseId, {
-					seen: newState,
-				})
-			} catch (error) {
-				console.error('could not toggle message seen state', error)
-
-				// Revert change
-				commit('flagEnvelope', {
-					envelope,
-					flag: 'seen',
-					value: oldState,
-				})
-
-				throw error
-			}
-		})
-	},
-	async toggleEnvelopeJunk({ commit, getters }, { envelope, removeEnvelope }) {
-		return handleHttpAuthErrors(commit, async () => {
-			// Change immediately and switch back on error
-			const oldState = envelope.flags.$junk
-			commit('flagEnvelope', {
-				envelope,
-				flag: '$junk',
-				value: !oldState,
-			})
-			commit('flagEnvelope', {
-				envelope,
-				flag: '$notjunk',
-				value: oldState,
-			})
-
-			if (removeEnvelope) {
-				commit('removeEnvelope', { id: envelope.databaseId })
-			}
-
-			try {
-				await setEnvelopeFlags(envelope.databaseId, {
-					$junk: !oldState,
-					$notjunk: oldState,
-				})
-			} catch (error) {
-				console.error('could not toggle message junk state', error)
-
-				if (removeEnvelope) {
-					commit('addEnvelopes', [envelope])
-				}
-
-				// Revert change
-				commit('flagEnvelope', {
-					envelope,
-					flag: '$junk',
-					value: oldState,
-				})
-				commit('flagEnvelope', {
-					envelope,
-					flag: '$notjunk',
-					value: !oldState,
-				})
-
-				throw error
-			}
-		})
-	},
-	async markEnvelopeFavoriteOrUnfavorite({ commit, getters }, { envelope, favFlag }) {
-		return handleHttpAuthErrors(commit, async () => {
-			// Change immediately and switch back on error
-			const oldState = envelope.flags.flagged
-			commit('flagEnvelope', {
-				envelope,
-				flag: 'flagged',
-				value: favFlag,
-			})
-
-			try {
-				await setEnvelopeFlags(envelope.databaseId, {
-					flagged: favFlag,
-				})
-			} catch (error) {
-				console.error('could not favorite/unfavorite message ' + envelope.uid, error)
-
-				// Revert change
-				commit('flagEnvelope', {
-					envelope,
-					flag: 'flagged',
-					value: oldState,
-				})
-
-				throw error
-			}
-		})
-	},
-	async markEnvelopeImportantOrUnimportant({ commit, dispatch, getters }, { envelope, addTag }) {
-		return handleHttpAuthErrors(commit, async () => {
-			const importantLabel = '$label1'
-			const hasTag = getters
-				.getEnvelopeTags(envelope.databaseId)
-				.some((tag) => tag.imapLabel === importantLabel)
-			if (hasTag && !addTag) {
-				await dispatch('removeEnvelopeTag', {
-					envelope,
-					imapLabel: importantLabel,
-				})
-			} else if (!hasTag && addTag) {
-				await dispatch('addEnvelopeTag', {
-					envelope,
-					imapLabel: importantLabel,
-				})
-			}
-		})
-	},
-	async fetchThread({ getters, commit }, id) {
-		return handleHttpAuthErrors(commit, async () => {
-			const thread = await fetchThread(id)
-			commit('addEnvelopeThread', {
-				id,
-				thread,
-			})
-			return thread
-		})
-	},
-	async fetchMessage({ getters, commit }, id) {
-		return handleHttpAuthErrors(commit, async () => {
-			const message = await fetchMessage(id)
-			// Only commit if not undefined (not found)
-			if (message) {
-				commit('addMessage', {
-					message,
-				})
-			}
-			return message
-		})
-	},
-	async fetchItineraries({ commit }, id) {
-		return handleHttpAuthErrors(commit, async () => {
-			const itineraries = await fetchMessageItineraries(id)
-			commit('addMessageItineraries', {
-				id,
-				itineraries,
-			})
-			return itineraries
-		})
-	},
-	async fetchDkim({ commit }, id) {
-		return handleHttpAuthErrors(commit, async () => {
-			const result = await fetchMessageDkim(id)
-			commit('addMessageDkim', {
-				id,
-				result,
-			})
-			return result
-		})
-	},
-	async addInternalAddress({ commit }, { address, type }) {
-		return handleHttpAuthErrors(commit, async () => {
-			const internalAddress = await addInternalAddress(address, type)
-			commit('addInternalAddress', internalAddress)
-			console.debug('internal address added')
-		})
-	},
-	async removeInternalAddress({ commit }, { id, address, type }) {
-		return handleHttpAuthErrors(commit, async () => {
-			try {
-				await removeInternalAddress(address, type)
-				commit('removeInternalAddress', { addressId: id })
-				console.debug('internal address removed')
-			} catch (error) {
-				console.error('could not delete internal address', error)
-				throw error
-			}
-		})
-	},
-	async deleteMessage({ getters, commit }, { id }) {
-		return handleHttpAuthErrors(commit, async () => {
-			commit('removeEnvelope', { id })
-
-			try {
-				await deleteMessage(id)
-				commit('removeMessage', { id })
-				console.debug('message removed')
-			} catch (err) {
-				console.error('could not delete message', err)
-				const envelope = getters.getEnvelope(id)
-				if (envelope) {
-					commit('addEnvelopes', { envelopes: [envelope] })
-				} else {
-					logger.error('could not find envelope', { id })
-				}
-				throw err
-			}
-		})
-	},
-	async createAlias({ commit }, { account, alias, name }) {
-		return handleHttpAuthErrors(commit, async () => {
-			const entity = await AliasService.createAlias(account.id, alias, name)
-			commit('createAlias', {
-				account,
-				alias: entity,
-			})
-		})
-	},
-	async deleteAlias({ commit }, { account, aliasId }) {
-		return handleHttpAuthErrors(commit, async () => {
-			const entity = await AliasService.deleteAlias(account.id, aliasId)
-			commit('deleteAlias', {
-				account,
-				aliasId: entity.id,
-			})
-		})
-	},
-	async updateAlias({ commit }, { account, aliasId, alias, name, smimeCertificateId }) {
-		return handleHttpAuthErrors(commit, async () => {
-			const entity = await AliasService.updateAlias(
-				account.id,
-				aliasId,
-				alias,
-				name,
-				smimeCertificateId,
-			)
-			commit('patchAlias', {
-				account,
-				aliasId: entity.id,
-				data: {
-					alias: entity.alias,
-					name: entity.name,
-					smimeCertificateId: entity.smimeCertificateId,
-				},
-			})
-			commit('editAccount', account)
-		})
-	},
-	async updateAliasSignature({ commit }, { account, aliasId, signature }) {
-		return handleHttpAuthErrors(commit, async () => {
-			const entity = await AliasService.updateSignature(account.id, aliasId, signature)
-			commit('patchAlias', {
-				account,
-				aliasId: entity.id,
-				data: { signature: entity.signature },
-			})
-			commit('editAccount', account)
-		})
-	},
-	async renameMailbox({ commit }, { account, mailbox, newName }) {
-		return handleHttpAuthErrors(commit, async () => {
-			const newMailbox = await patchMailbox(mailbox.databaseId, {
-				name: newName,
-			})
-
-			console.debug(`mailbox ${mailbox.databaseId} renamed to ${newName}`, { mailbox })
-			commit('removeMailbox', { id: mailbox.databaseId })
-			commit('addMailbox', { account, mailbox: newMailbox })
-		})
-	},
-	async moveMessage({ commit }, { id, destMailboxId }) {
-		return handleHttpAuthErrors(commit, async () => {
-			await moveMessage(id, destMailboxId)
-			commit('removeEnvelope', { id })
-			commit('removeMessage', { id })
-		})
-	},
-	async snoozeMessage({ commit }, { id, unixTimestamp, destMailboxId }) {
-		return handleHttpAuthErrors(commit, async () => {
-			await snoozeMessage(id, unixTimestamp, destMailboxId)
-			commit('removeEnvelope', { id })
-			commit('removeMessage', { id })
-		})
-	},
-	async unSnoozeMessage({ commit }, { id }) {
-		return handleHttpAuthErrors(commit, async () => {
-			await unSnoozeMessage(id)
-			commit('removeEnvelope', { id })
-			commit('removeMessage', { id })
-		})
-	},
-	async fetchActiveSieveScript({ commit }, { accountId }) {
-		return handleHttpAuthErrors(commit, async () => {
-			const scriptData = await getActiveScript(accountId)
-			commit('setActiveSieveScript', { accountId, scriptData })
-		})
-	},
-	async updateActiveSieveScript({ commit }, { accountId, scriptData }) {
-		return handleHttpAuthErrors(commit, async () => {
-			await updateActiveScript(accountId, scriptData)
-			commit('setActiveSieveScript', { accountId, scriptData })
-		})
-	},
-	async updateSieveAccount({ commit }, { account, data }) {
-		return handleHttpAuthErrors(commit, async () => {
-			logger.debug(`update sieve settings for account ${account.id}`)
-			try {
-				await updateSieveAccount(account.id, data)
-				commit('patchAccount', { account, data })
-			} catch (error) {
-				logger.error('failed to update sieve account: ', { error })
-				throw error
-			}
-		})
-	},
-	async createTag({ commit }, { displayName, color }) {
-		return handleHttpAuthErrors(commit, async () => {
-			const tag = await createEnvelopeTag(displayName, color)
-			commit('addTag', { tag })
-		})
-
-	},
-	async addEnvelopeTag({ commit, getters }, { envelope, imapLabel }) {
-		return handleHttpAuthErrors(commit, async () => {
-			// TODO: fetch tags indepently of envelopes and only send tag id here
-			const tag = await setEnvelopeTag(envelope.databaseId, imapLabel)
-			if (!getters.getTag(tag.id)) {
-				commit('addTag', { tag })
-			}
-
-			commit('addEnvelopeTag', {
-				envelope,
-				tagId: tag.id,
-			})
-		})
-	},
-	async removeEnvelopeTag({ commit }, { envelope, imapLabel }) {
-		return handleHttpAuthErrors(commit, async () => {
-			const tag = await removeEnvelopeTag(envelope.databaseId, imapLabel)
-			commit('removeEnvelopeTag', {
-				envelope,
-				tagId: tag.id,
-			})
-		})
-	},
-	async updateTag({ commit }, { tag, displayName, color }) {
-		return handleHttpAuthErrors(commit, async () => {
-			await updateEnvelopeTag(tag.id, displayName, color)
-			commit('updateTag', { tag, displayName, color })
-			logger.debug('tag updated', { tag, displayName, color })
-		})
-	},
-	async deleteTag({ commit }, { tag, accountId }) {
-		return handleHttpAuthErrors(commit, async () => {
-			await deleteTag(tag.id, accountId)
-			commit('deleteTag', { tagId: tag.id })
-			logger.debug('tag deleted', { tag })
-		})
-	},
-	async deleteThread({ getters, commit }, { envelope }) {
-		return handleHttpAuthErrors(commit, async () => {
-			commit('removeEnvelope', { id: envelope.databaseId })
-
-			try {
-				await ThreadService.deleteThread(envelope.databaseId)
-				console.debug('thread removed')
-			} catch (e) {
-				commit('addEnvelopes', { envelopes: [envelope] })
-				console.error('could not delete thread', e)
-				throw e
-			}
-		})
-	},
-	async moveThread({ getters, commit }, { envelope, destMailboxId }) {
-		return handleHttpAuthErrors(commit, async () => {
-			commit('removeEnvelope', { id: envelope.databaseId })
-
-			try {
-				await ThreadService.moveThread(envelope.databaseId, destMailboxId)
-				console.debug('thread removed')
-			} catch (e) {
-				commit('addEnvelopes', { envelopes: [envelope] })
-				console.error('could not move thread', e)
-				throw e
-			}
-		})
-	},
-	async snoozeThread({ getters, commit }, { envelope, unixTimestamp, destMailboxId }) {
-		return handleHttpAuthErrors(commit, async () => {
-			try {
-				await ThreadService.snoozeThread(envelope.databaseId, unixTimestamp, destMailboxId)
-				console.debug('thread snoozed')
-			} catch (e) {
-				commit('addEnvelopes', { envelopes: [envelope] })
-				console.error('could not snooze thread', e)
-				throw e
-			}
-			commit('removeEnvelope', { id: envelope.databaseId })
-		})
-	},
-	async unSnoozeThread({ getters, commit }, { envelope }) {
-		return handleHttpAuthErrors(commit, async () => {
-			try {
-				await ThreadService.unSnoozeThread(envelope.databaseId)
-				console.debug('thread unSnoozed')
-			} catch (e) {
-				console.error('could not unsnooze thread', e)
-				throw e
-			}
-			commit('removeEnvelope', { id: envelope.databaseId })
-		})
-	},
-
-	/**
-	 * Retrieve and commit the principal of the current user.
-	 *
-	 * @param {object} context Vuex store context
-	 * @param {Function} context.commit Vuex store mutations
-	 */
-	async fetchCurrentUserPrincipal({ commit }) {
-		return handleHttpAuthErrors(commit, async () => {
-			await initializeClientForUserView()
-			commit('setCurrentUserPrincipal', { currentUserPrincipal: getCurrentUserPrincipal() })
-		})
-	},
-
-	/**
-	 * Retrieve and commit calendars.
-	 *
-	 * @param {object} context Vuex store context
-	 * @param {Function} context.commit Vuex store mutations
-	 * @return {Promise<void>}
-	 */
-	async loadCollections({ commit }) {
-		await handleHttpAuthErrors(commit, async () => {
-			const { calendars } = await findAll()
-			for (const calendar of calendars) {
-				commit('addCalendar', { calendar })
-			}
-		})
-	},
-
-	/**
-	 * Fetch and commit all S/MIME certificate of the current user.
-	 *
-	 * @param {object} context Vuex store context
-	 * @param {Function} context.commit Vuex store mutations
-	 * @return {Promise<void>}
-	 */
-	async fetchSmimeCertificates({ commit }) {
-		return handleHttpAuthErrors(commit, async () => {
-			const certificates = await SmimeCertificateService.fetchAll()
-			commit('setSmimeCertificates', certificates)
-		})
-	},
-
-	/**
-	 * Delete an imported S/MIME certificate.
-	 *
-	 * @param {object} context Vuex store context
-	 * @param {Function} context.commit Vuex store mutations
-	 * @param id The id of the certificate to be deleted
-	 * @return {Promise<void>}
-	 */
-	async deleteSmimeCertificate({ commit }, id) {
-		return handleHttpAuthErrors(commit, async () => {
-			await SmimeCertificateService.deleteCertificate(id)
-			commit('deleteSmimeCertificate', { id })
-		})
-	},
-
-	/**
-	 * Create a new S/MIME certificate and persist it on the backend.
-	 *
-	 * @param {object} context Vuex store context
-	 * @param {Function} context.commit Vuex store mutations
-	 * @param {object} files
-	 * @param {Blob} files.certificate
-	 * @param {Blob=} files.privateKey
-	 * @return {Promise<object>}
-	 */
-	async createSmimeCertificate({ commit }, files) {
-		return handleHttpAuthErrors(commit, async () => {
-			const certificate = await SmimeCertificateService.createCertificate(files)
-			commit('addSmimeCertificate', { certificate })
-			return certificate
-		})
-	},
-
-	/**
-	 * Update the S/MIME certificate of an account.
-	 *
-	 * @param {object} context Vuex store context
-	 * @param {Function} context.commit Vuex store mutations
-	 * @param {Function} context.getters Vuex store getters
-	 * @param {object} data
-	 * @param {object} data.accountId
-	 * @param {number=} data.smimeCertificateId
-	 * @param data.account
-	 * @return {Promise<void>}
-	 */
-	async updateAccountSmimeCertificate({ commit, getters }, { account, smimeCertificateId }) {
-		return handleHttpAuthErrors(commit, async () => {
-			await updateAccountSmimeCertificate(account.id, smimeCertificateId)
-			commit('patchAccount', { account, data: { smimeCertificateId } })
-		})
-	},
-
-	/**
-	 * Should the envelope moved to the junk (or back to inbox)
-	 *
-	 * @param {object} context Vuex store context
-	 * @param {object} context.getters Vuex store getters
-	 * @param {object} envelope envelope object@
-	 * @return {boolean}
-	 */
-	async moveEnvelopeToJunk({ getters }, envelope) {
-		const account = getters.getAccount(envelope.accountId)
-		if (account.junkMailboxId === null) {
-			return false
-		}
-
-		if (!envelope.flags.$junk) {
-			// move message to junk
-			return envelope.mailboxId !== account.junkMailboxId
-		}
-
-		const inbox = getters.getInbox(account.id)
-		if (inbox === undefined) {
-			return false
-		}
-
-		// move message to inbox
-		return envelope.mailboxId !== inbox.databaseId
-	},
-	async createAndSetSnoozeMailbox({ getters, dispatch }, account) {
-		const name = 'Snoozed'
-		let snoozeMailboxId
-
-		try {
-			const createMailboxResponse = await dispatch('createMailbox', { account, name })
-			snoozeMailboxId = createMailboxResponse.databaseId
-			logger.info(`mailbox ${name} created as ${snoozeMailboxId}`)
-		} catch (e) {
-			logger.error('could not create mailbox', { e })
-		}
-
-		if (snoozeMailboxId === undefined) {
-			snoozeMailboxId = getters.findMailboxByName(account.id, name).databaseId
-		}
-
-		if (snoozeMailboxId === undefined) {
-			logger.error('Could not create snooze mailbox')
-			showError(t('mail', 'Could not create snooze mailbox'))
-			return
-		}
-
-		await dispatch('patchAccount', {
-			account,
-			data: {
-				snoozeMailboxId,
-			},
-		})
-	},
-	async setLayout({ commit }, { list }) {
-		try {
-			commit('setOneLineLayout', {
-				list,
-			})
-		} catch (error) {
-			logger.error('Could not set layouts', { error })
-		}
-	},
-	async clearFollowUpReminder({ commit, dispatch }, { envelope }) {
-		await dispatch('removeEnvelopeTag', {
-			envelope,
-			imapLabel: FOLLOW_UP_TAG_LABEL,
-		})
-		commit('removeEnvelopeFromFollowUpMailbox', {
-			id: envelope.databaseId,
-		})
-	},
-	async checkFollowUpReminders({ dispatch, getters }) {
-		const envelopes = getters.getFollowUpReminderEnvelopes
-		const messageIds = envelopes.map((envelope) => envelope.databaseId)
-		if (messageIds.length === 0) {
-			return
-		}
-
-		const data = await FollowUpService.checkMessageIds(messageIds)
-		for (const messageId of data.wasFollowedUp) {
-			const envelope = getters.getEnvelope(messageId)
-			if (!envelope) {
-				continue
-			}
-
-			await dispatch('clearFollowUpReminder', { envelope })
-		}
-	},
-}
diff --git a/src/store/getters.js b/src/store/getters.js
deleted file mode 100644
index f0b8351b88..0000000000
--- a/src/store/getters.js
+++ /dev/null
@@ -1,163 +0,0 @@
-/**
- * SPDX-FileCopyrightText: 2020 Nextcloud GmbH and Nextcloud contributors
- * SPDX-License-Identifier: AGPL-3.0-or-later
- */
-
-import { defaultTo, head, prop, sortBy } from 'ramda'
-
-import { FOLLOW_UP_TAG_LABEL, UNIFIED_ACCOUNT_ID } from './constants.js'
-import { normalizedEnvelopeListId } from './normalization.js'
-import { getCalendarHome } from '../service/caldavService.js'
-import toCalendar from './calendar.js'
-
-export const getters = {
-	getPreference: (state) => (key, def) => {
-		return defaultTo(def, state.preferences[key])
-	},
-	isExpiredSession: (state) => {
-		return state.isExpiredSession
-	},
-	getAccount: (state) => (id) => {
-		return state.accounts[id]
-	},
-	getAllAccountSettings: (state) => {
-		return state.allAccountSettings
-	},
-	accounts: (state) => {
-		return state.accountList.map((id) => state.accounts[id])
-	},
-	getMailbox: (state) => (id) => {
-		return state.mailboxes[id]
-	},
-	getMailboxes: (state) => (accountId) => {
-		return state.accounts[accountId].mailboxes.map((id) => state.mailboxes[id])
-	},
-	getSubMailboxes: (state, getters) => (id) => {
-		const mailbox = getters.getMailbox(id)
-		return mailbox.mailboxes.map((id) => state.mailboxes[id])
-	},
-	getParentMailbox: (state, getters) => (id) => {
-		for (const mailbox of getters.getMailboxes(getters.getMailbox(id).accountId)) {
-			if (mailbox.mailboxes.includes(id)) {
-				return mailbox
-			}
-		}
-		return undefined
-	},
-	getUnifiedMailbox: (state) => (specialRole) => {
-		return head(
-			state.accounts[UNIFIED_ACCOUNT_ID].mailboxes
-				.map((id) => state.mailboxes[id])
-				.filter((mailbox) => mailbox.specialRole === specialRole),
-		)
-	},
-	showMessageComposer: (state) => {
-		return state.showMessageComposer
-	},
-	composerMessage: (state) => {
-		return state.newMessage
-	},
-	composerMessageOptions: (state) => {
-		return state.newMessage?.options
-	},
-	composerMessageIsSaved: (state) => {
-		return state.composerMessageIsSaved
-	},
-	composerSessionId: (state) => {
-		return state.composerSessionId
-	},
-	getEnvelope: (state) => (id) => {
-		return state.envelopes[id]
-	},
-	getEnvelopes: (state, getters) => (mailboxId, query) => {
-		const list = getters.getMailbox(mailboxId).envelopeLists[normalizedEnvelopeListId(query)] || []
-		return list.map((msgId) => state.envelopes[msgId])
-	},
-	getEnvelopesByThreadRootId: (state) => (accountId, threadRootId) => {
-		return sortBy(
-			prop('dateInt'),
-			Object.values(state.envelopes).filter(envelope => envelope.accountId === accountId && envelope.threadRootId === threadRootId),
-		)
-	},
-	getMessage: (state) => (id) => {
-		return state.messages[id]
-	},
-	getEnvelopeThread: (state) => (id) => {
-		const thread = state.envelopes[id]?.thread ?? []
-		const envelopes = thread.map(id => state.envelopes[id])
-		return sortBy(prop('dateInt'), envelopes)
-	},
-	getEnvelopeTags: (state) => (id) => {
-		const tags = state.envelopes[id]?.tags ?? []
-		return tags.map((tagId) => state.tags[tagId])
-	},
-	getTag: (state) => (id) => {
-		return state.tags[id]
-	},
-	isInternalAddress: (state) => (address) => {
-		const domain = address.split('@')[1]
-		return state.internalAddress.some((internalAddress) => internalAddress.address === address || internalAddress.address === domain)
-	},
-	getTags: (state) => {
-		return state.tagList.map(tagId => state.tags[tagId])
-	},
-	getFollowUpTag: (state) => {
-		return Object.values(state.tags).find((tag) => tag.imapLabel === FOLLOW_UP_TAG_LABEL)
-	},
-	getFollowUpReminderEnvelopes: (state) => {
-		return Object.values(state.envelopes)
-			.filter((envelope) => envelope.tags
-				?.map((tagId) => state.tags[tagId])
-				.some((tag) => tag.imapLabel === FOLLOW_UP_TAG_LABEL),
-			)
-	},
-	isScheduledSendingDisabled: (state) => state.isScheduledSendingDisabled,
-	isSnoozeDisabled: (state) => state.isSnoozeDisabled,
-	googleOauthUrl: (state) => state.googleOauthUrl,
-	masterPasswordEnabled: (state) => state.masterPasswordEnabled,
-	microsoftOauthUrl: (state) => state.microsoftOauthUrl,
-	getActiveSieveScript: (state) => (accountId) => state.sieveScript[accountId],
-	getCurrentUserPrincipal: (state) => state.currentUserPrincipal,
-	getCurrentUserPrincipalEmail: (state) => state.currentUserPrincipal?.email,
-	getCalendars: (state) => state.calendars,
-	getClonedWriteableCalendars: (state) => state.calendars.filter(calendar => {
-		return calendar.isWriteable()
-	}).map(calendar => {
-		// Hack: We need to clone all calendars because some methods (e.g. calendarQuery) are
-		// unnecessarily mutating the object and causing vue warnings (if used outside of
-		// mutations).
-		const resourcetype = calendar.resourcetype.find(type => type !== '{DAV:}collection')
-		const calendarHome = getCalendarHome()
-		return new calendarHome._collectionFactoryMapper[resourcetype](
-			calendarHome,
-			calendar._request,
-			calendar._url,
-			calendar._props,
-		)
-	}),
-	getSmimeCertificates: (state) => state.smimeCertificates,
-	getSmimeCertificate: (state) => (id) => state.smimeCertificates.find((cert) => cert.id === id),
-	getSmimeCertificateByEmail: (state) => (email) => state.smimeCertificates.find((cert) => cert.emailAddress === email),
-	getTaskCalendarsForCurrentUser: state => {
-		return state.calendars.filter(calendar => {
-			return calendar.components.includes('VTODO') && calendar.currentUserPrivilegeSet.includes('{DAV:}write')
-		}).map(calendar => toCalendar(calendar))
-	},
-	getNcVersion: (state) => state.preferences?.ncVersion,
-	getAppVersion: (state) => state.preferences?.version,
-	findMailboxBySpecialRole: (state, getters) => (accountId, specialRole) => {
-		return getters.getMailboxes(accountId).find(mailbox => mailbox.specialRole === specialRole)
-	},
-	findMailboxByName: (state, getters) => (accountId, name) => {
-		return getters.getMailboxes(accountId).find(mailbox => mailbox.name === name)
-	},
-	getInbox: (state, getters) => (accountId) => {
-		return getters.findMailboxBySpecialRole(accountId, 'inbox')
-	},
-	isOneLineLayout: (state) => state.list,
-	hasFetchedInitialEnvelopes: (state) => state.hasFetchedInitialEnvelopes,
-	isFollowUpFeatureAvailable: (state) => state.followUpFeatureAvailable,
-	getInternalAddresses: (state) => state.internalAddress?.filter(internalAddress => internalAddress !== undefined),
-	hasCurrentUserPrincipalAndCollections: (state) => state.hasCurrentUserPrincipalAndCollections,
-	showSettingsForAccount: (state) => (accountId) => state.showAccountSettings === accountId,
-}
diff --git a/src/store/index.js b/src/store/index.js
deleted file mode 100644
index 55bfb36d5a..0000000000
--- a/src/store/index.js
+++ /dev/null
@@ -1,118 +0,0 @@
-/**
- * SPDX-FileCopyrightText: 2019 Nextcloud GmbH and Nextcloud contributors
- * SPDX-License-Identifier: AGPL-3.0-or-later
- */
-
-import Vue from 'vue'
-import Vuex, { Store } from 'vuex'
-
-import {
-	UNIFIED_ACCOUNT_ID,
-	UNIFIED_INBOX_ID,
-	PRIORITY_INBOX_ID,
-	FOLLOW_UP_MAILBOX_ID,
-} from './constants.js'
-import actions from './actions.js'
-import { getters } from './getters.js'
-import mutations from './mutations.js'
-
-Vue.use(Vuex)
-
-export default new Store({
-	strict: process.env.NODE_ENV !== 'production',
-	modules: {
-		root: {
-			namespaced: false,
-			state: {
-				isExpiredSession: false,
-				preferences: {},
-				accounts: {
-					[UNIFIED_ACCOUNT_ID]: {
-						id: UNIFIED_ACCOUNT_ID,
-						accountId: UNIFIED_ACCOUNT_ID,
-						isUnified: true,
-						mailboxes: [PRIORITY_INBOX_ID, UNIFIED_INBOX_ID, FOLLOW_UP_MAILBOX_ID],
-						aliases: [],
-						collapsed: false,
-						emailAddress: '',
-						name: '',
-						showSubscribedOnly: false,
-						signatureAboveQuote: false,
-					},
-				},
-				accountList: [UNIFIED_ACCOUNT_ID],
-				allAccountSettings: [],
-				mailboxes: {
-					[UNIFIED_INBOX_ID]: {
-						id: UNIFIED_INBOX_ID,
-						databaseId: UNIFIED_INBOX_ID,
-						accountId: 0,
-						attributes: ['\\subscribed'],
-						isUnified: true,
-						path: '',
-						specialUse: ['inbox'],
-						specialRole: 'inbox',
-						unread: 0,
-						mailboxes: [],
-						envelopeLists: {},
-						name: 'UNIFIED INBOX',
-					},
-					[PRIORITY_INBOX_ID]: {
-						id: PRIORITY_INBOX_ID,
-						databaseId: PRIORITY_INBOX_ID,
-						accountId: 0,
-						attributes: ['\\subscribed'],
-						isPriorityInbox: true,
-						path: '',
-						specialUse: ['inbox'],
-						specialRole: 'inbox',
-						unread: 0,
-						mailboxes: [],
-						envelopeLists: {},
-						name: 'PRIORITY INBOX',
-					},
-					[FOLLOW_UP_MAILBOX_ID]: {
-						id: FOLLOW_UP_MAILBOX_ID,
-						databaseId: FOLLOW_UP_MAILBOX_ID,
-						accountId: 0,
-						attributes: ['\\subscribed'],
-						isUnified: true,
-						path: '',
-						specialUse: ['sent'],
-						specialRole: 'sent',
-						unread: 0,
-						mailboxes: [],
-						envelopeLists: {},
-						name: 'FOLLOW UP REMINDERS',
-					},
-				},
-				envelopes: {},
-				messages: {},
-				newMessage: undefined,
-				showMessageComposer: false,
-				composerMessageIsSaved: false,
-				composerSessionId: undefined,
-				nextComposerSessionId: 1,
-				autocompleteEntries: [],
-				tags: {},
-				tagList: [],
-				isScheduledSendingDisabled: false,
-				isSnoozeDisabled: false,
-				currentUserPrincipal: undefined,
-				googleOauthUrl: null,
-				masterPasswordEnabled: false,
-				sieveScript: {},
-				calendars: [],
-				smimeCertificates: [],
-				hasFetchedInitialEnvelopes: false,
-				followUpFeatureAvailable: false,
-				internalAddress: [],
-				hasCurrentUserPrincipalAndCollections: false,
-				showAccountSettings: null,
-			},
-			getters,
-			mutations,
-			actions,
-		},
-	},
-})
diff --git a/src/store/mainStore.js b/src/store/mainStore.js
new file mode 100644
index 0000000000..f708535664
--- /dev/null
+++ b/src/store/mainStore.js
@@ -0,0 +1,112 @@
+/**
+ * SPDX-FileCopyrightText: 2019 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+import { defineStore } from 'pinia'
+import mapStoreGetters from './mainStore/getters.js'
+import mapStoreActions from './mainStore/actions.js'
+import {
+	FOLLOW_UP_MAILBOX_ID,
+	PRIORITY_INBOX_ID,
+	UNIFIED_ACCOUNT_ID,
+	UNIFIED_INBOX_ID,
+} from './constants.js'
+
+export default defineStore('main', {
+	state: () => {
+		return {
+			isExpiredSession: false,
+			preferences: {},
+			accountsUnmapped: {
+				[UNIFIED_ACCOUNT_ID]: {
+					id: UNIFIED_ACCOUNT_ID,
+					accountId: UNIFIED_ACCOUNT_ID,
+					isUnified: true,
+					mailboxes: [PRIORITY_INBOX_ID, UNIFIED_INBOX_ID, FOLLOW_UP_MAILBOX_ID],
+					aliases: [],
+					collapsed: false,
+					emailAddress: '',
+					name: '',
+					showSubscribedOnly: false,
+					signatureAboveQuote: false,
+				},
+			},
+			accountList: [UNIFIED_ACCOUNT_ID],
+			allAccountSettings: [],
+			mailboxes: {
+				[UNIFIED_INBOX_ID]: {
+					id: UNIFIED_INBOX_ID,
+					databaseId: UNIFIED_INBOX_ID,
+					accountId: 0,
+					attributes: ['\\subscribed'],
+					isUnified: true,
+					path: '',
+					specialUse: ['inbox'],
+					specialRole: 'inbox',
+					unread: 0,
+					mailboxes: [],
+					envelopeLists: {},
+					name: 'UNIFIED INBOX',
+				},
+				[PRIORITY_INBOX_ID]: {
+					id: PRIORITY_INBOX_ID,
+					databaseId: PRIORITY_INBOX_ID,
+					accountId: 0,
+					attributes: ['\\subscribed'],
+					isPriorityInbox: true,
+					path: '',
+					specialUse: ['inbox'],
+					specialRole: 'inbox',
+					unread: 0,
+					mailboxes: [],
+					envelopeLists: {},
+					name: 'PRIORITY INBOX',
+				},
+				[FOLLOW_UP_MAILBOX_ID]: {
+					id: FOLLOW_UP_MAILBOX_ID,
+					databaseId: FOLLOW_UP_MAILBOX_ID,
+					accountId: 0,
+					attributes: ['\\subscribed'],
+					isUnified: true,
+					path: '',
+					specialUse: ['sent'],
+					specialRole: 'sent',
+					unread: 0,
+					mailboxes: [],
+					envelopeLists: {},
+					name: 'FOLLOW UP REMINDERS',
+				},
+			},
+			envelopes: {},
+			messages: {},
+			newMessage: undefined,
+			showMessageComposer: false,
+			composerMessageIsSaved: false,
+			composerSessionId: undefined,
+			nextComposerSessionId: 1,
+			autocompleteEntries: [],
+			tags: {},
+			tagList: [],
+			isScheduledSendingDisabled: false,
+			isSnoozeDisabled: false,
+			currentUserPrincipal: undefined,
+			googleOauthUrl: null,
+			masterPasswordEnabled: false,
+			sieveScript: {},
+			calendars: [],
+			smimeCertificates: [],
+			hasFetchedInitialEnvelopes: false,
+			followUpFeatureAvailable: false,
+			internalAddress: [],
+			hasCurrentUserPrincipalAndCollections: false,
+			showAccountSettings: null,
+		}
+	},
+	getters: {
+		...mapStoreGetters(),
+	},
+	actions: {
+		...mapStoreActions(),
+	},
+})
diff --git a/src/store/mainStore/actions.js b/src/store/mainStore/actions.js
new file mode 100644
index 0000000000..7889e15c8b
--- /dev/null
+++ b/src/store/mainStore/actions.js
@@ -0,0 +1,2380 @@
+/**
+ * SPDX-FileCopyrightText: 2019 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+import flatMapDeep from 'lodash/fp/flatMapDeep.js'
+import orderBy from 'lodash/fp/orderBy.js'
+import {
+	andThen,
+	complement,
+	curry,
+	filter,
+	flatten,
+	gt,
+	lt,
+	identity,
+	last,
+	map,
+	pipe,
+	prop,
+	propEq,
+	slice,
+	tap,
+	where, defaultTo, head, sortBy,
+} from 'ramda'
+
+import { savePreference } from '../../service/PreferenceService.js'
+import {
+	create as createAccount,
+	deleteAccount,
+	fetch as fetchAccount,
+	fetchAll as fetchAllAccounts,
+	patch as patchAccount,
+	update as updateAccount,
+	updateSignature,
+	updateSmimeCertificate as updateAccountSmimeCertificate,
+} from '../../service/AccountService.js'
+import {
+	create as createMailbox,
+	clearMailbox,
+	deleteMailbox,
+	fetchAll as fetchAllMailboxes,
+	markMailboxRead,
+	patchMailbox,
+} from '../../service/MailboxService.js'
+import {
+	createEnvelopeTag,
+	deleteMessage,
+	fetchEnvelope,
+	fetchEnvelopes,
+	fetchMessage,
+	fetchMessageDkim,
+	fetchMessageItineraries,
+	fetchThread,
+	moveMessage,
+	removeEnvelopeTag,
+	setEnvelopeFlags,
+	setEnvelopeTag,
+	snoozeMessage,
+	syncEnvelopes as syncEnvelopesExternal,
+	unSnoozeMessage,
+	updateEnvelopeTag,
+	deleteTag,
+} from '../../service/MessageService.js'
+import { moveDraft, updateDraft } from '../../service/DraftService.js'
+import * as AliasService from '../../service/AliasService.js'
+import logger from '../../logger.js'
+import { normalizedEnvelopeListId } from '../../util/normalization.js'
+import { showNewMessagesNotification } from '../../service/NotificationService.js'
+import { matchError } from '../../errors/match.js'
+import SyncIncompleteError from '../../errors/SyncIncompleteError.js'
+import MailboxLockedError from '../../errors/MailboxLockedError.js'
+import { wait } from '../../util/wait.js'
+import {
+	getActiveScript,
+	updateAccount as updateSieveAccount,
+	updateActiveScript,
+} from '../../service/SieveService.js'
+import {
+	FOLLOW_UP_TAG_LABEL,
+	PAGE_SIZE,
+	UNIFIED_INBOX_ID,
+	FOLLOW_UP_MAILBOX_ID,
+	UNIFIED_ACCOUNT_ID,
+} from '../constants.js'
+import * as ThreadService from '../../service/ThreadService.js'
+import {
+	getPrioritySearchQueries,
+	priorityImportantQuery,
+	priorityOtherQuery,
+} from '../../util/priorityInbox.js'
+import { html, plain, toPlain } from '../../util/text.js'
+import Axios from '@nextcloud/axios'
+import { generateUrl } from '@nextcloud/router'
+import { handleHttpAuthErrors } from '../../http/sessionExpiryHandler.js'
+import { showError, showWarning } from '@nextcloud/dialogs'
+import { translate as t } from '@nextcloud/l10n'
+import {
+	buildForwardSubject,
+	buildRecipients as buildReplyRecipients,
+	buildReplySubject,
+} from '../../ReplyBuilder.js'
+import DOMPurify from 'dompurify'
+import {
+	getCurrentUserPrincipal,
+	initializeClientForUserView,
+	findAll,
+} from '../../service/caldavService.js'
+import * as SmimeCertificateService from '../../service/SmimeCertificateService.js'
+import useOutboxStore from '../outboxStore.js'
+import * as FollowUpService from '../../service/FollowUpService.js'
+import { addInternalAddress, removeInternalAddress } from '../../service/InternalAddressService.js'
+
+import escapeRegExp from 'lodash/fp/escapeRegExp.js'
+import uniq from 'lodash/fp/uniq.js'
+import Vue from 'vue'
+
+import { sortMailboxes } from '../../imap/MailboxSorter.js'
+
+const sliceToPage = slice(0, PAGE_SIZE)
+
+const findIndividualMailboxes = curry((getMailboxes, specialRole) =>
+	pipe(
+		filter(complement(prop('isUnified'))),
+		map(prop('id')),
+		map(getMailboxes),
+		flatten,
+		filter(propEq(specialRole, 'specialRole')),
+	),
+)
+
+const combineEnvelopeLists = (sortOrder) => {
+	if (sortOrder === 'oldest') {
+		return pipe(flatten, orderBy(prop('dateInt'), 'asc'))
+	}
+
+	return pipe(flatten, orderBy(prop('dateInt'), 'desc'))
+}
+
+const addMailboxToState = curry((mailboxes, account, mailbox) => {
+	mailbox.accountId = account.id
+	mailbox.mailboxes = []
+	Vue.set(mailbox, 'envelopeLists', {})
+
+	mainStoreActions().transformMailboxName(account, mailbox)
+
+	Vue.set(mailboxes, mailbox.databaseId, mailbox)
+	const parent = Object.values(mailboxes)
+		.filter(mb => mb.accountId === account.id)
+		.find(mb => mb.name === mailbox.path)
+	if (mailbox.path === '' || !parent) {
+		account.mailboxes.push(mailbox.databaseId)
+	} else {
+		parent.mailboxes.push(mailbox.databaseId)
+	}
+})
+
+export default function mainStoreActions() {
+	return {
+		savePreference({
+			key,
+			value,
+		}) {
+			return handleHttpAuthErrors(async () => {
+				const newValue = await savePreference(key, value)
+				this.savePreferenceMutation({
+					key,
+					value: newValue.value,
+				})
+			})
+		},
+		async fetchAccounts() {
+			return handleHttpAuthErrors(async () => {
+				const accounts = await fetchAllAccounts()
+				accounts.forEach((account) => this.addAccountMutation(account))
+				return this.getAccounts
+			})
+		},
+		async fetchAccount(id) {
+			return handleHttpAuthErrors(async () => {
+				const account = await fetchAccount(id)
+				this.addAccountMutation(account)
+				return account
+			})
+		},
+		async startAccountSetup(config) {
+			const account = await createAccount(config)
+			logger.debug(`account ${account.id} created`, { account })
+			return account
+		},
+		async finishAccountSetup({ account }) {
+			logger.debug(`Fetching mailboxes for account ${account.id},  …`, { account })
+			account.mailboxes = await fetchAllMailboxes(account.id)
+			this.addAccountMutation(account)
+			logger.debug('New account mailboxes fetched', {
+				account,
+				mailboxes: account.mailboxes,
+			})
+			return account
+		},
+		async updateAccount(config) {
+			return handleHttpAuthErrors(async () => {
+				const account = await updateAccount(config)
+				logger.debug('account updated', { account })
+				this.editAccountMutation(account)
+				return account
+			})
+		},
+		async patchAccount({
+			account,
+			data,
+		}) {
+			return handleHttpAuthErrors(async () => {
+				const patchedAccount = await patchAccount(account, data)
+				logger.debug('account patched', {
+					account: patchedAccount,
+					data,
+				})
+				this.patchAccountMutation({
+					account,
+					data,
+				})
+				return account
+			})
+		},
+		async updateAccountSignature({
+			account,
+			signature,
+		}) {
+			return handleHttpAuthErrors(async () => {
+				await updateSignature(account, signature)
+				logger.debug('account signature updated', {
+					account,
+					signature,
+				})
+				const updated = Object.assign({}, account, { signature })
+				this.editAccountMutation(updated)
+				return account
+			})
+		},
+		async setAccountSetting({
+			accountId,
+			key,
+			value,
+		}) {
+			return handleHttpAuthErrors(async () => {
+				this.setAccountSettingMutation({
+					accountId,
+					key,
+					value,
+				})
+				return await savePreference('account-settings', JSON.stringify(this.getAllAccountSettings))
+			})
+		},
+		async deleteAccount(account) {
+			return handleHttpAuthErrors(async () => {
+				try {
+					await deleteAccount(account.id)
+				} catch (error) {
+					logger.error('could not delete account', { error })
+					throw error
+				}
+			})
+		},
+		async deleteMailbox({ mailbox }) {
+			return handleHttpAuthErrors(async () => {
+				await deleteMailbox(mailbox.databaseId)
+				this.removeMailboxMutation({ id: mailbox.databaseId })
+			})
+		},
+		async clearMailbox({ mailbox }) {
+			return handleHttpAuthErrors(async () => {
+				await clearMailbox(mailbox.databaseId)
+				this.removeEnvelopesMutation({ id: mailbox.databaseId })
+				this.setMailboxUnreadCountMutation({ id: mailbox.databaseId })
+			})
+		},
+		async createMailbox({
+			account,
+			name,
+		}) {
+			return handleHttpAuthErrors(async () => {
+				const prefixed = (account.personalNamespace && !name.startsWith(account.personalNamespace))
+					? account.personalNamespace + name
+					: name
+				const mailbox = await createMailbox(account.id, prefixed)
+				console.debug(`mailbox ${prefixed} created for account ${account.id}`, { mailbox })
+				this.addMailboxMutation({
+					account,
+					mailbox,
+				})
+				this.expandAccountMutation(account.id)
+				this.setAccountSettingMutation({
+					accountId: account.id,
+					key: 'collapsed',
+					value: false,
+				})
+				return mailbox
+			})
+		},
+		async moveAccount({
+			account,
+			up,
+		}) {
+			return handleHttpAuthErrors(async () => {
+				const accounts = this.getAccounts
+				const index = accounts.indexOf(account)
+				if (up) {
+					const previous = accounts[index - 1]
+					accounts[index - 1] = account
+					accounts[index] = previous
+				} else {
+					const next = accounts[index + 1]
+					accounts[index + 1] = account
+					accounts[index] = next
+				}
+				return await Promise.all(
+					accounts.map((account, idx) => {
+						if (account.id === 0) {
+							return Promise.resolve()
+						}
+						this.saveAccountsOrderMutation({
+							account,
+							order: idx,
+						})
+						return patchAccount(account, { order: idx })
+					}),
+				)
+			})
+		},
+		async markMailboxRead({
+			accountId,
+			mailboxId,
+		}) {
+			return handleHttpAuthErrors(async () => {
+				const mailbox = this.getMailbox(mailboxId)
+
+				if (mailbox.isUnified) {
+					const findIndividual = findIndividualMailboxes(this.getMailboxes, mailbox.specialRole)
+					const individualMailboxes = findIndividual(this.getAccounts)
+					return Promise.all(
+						individualMailboxes.map((mb) =>
+							this.markMailboxReadMutation({
+								accountId: mb.accountId,
+								mailboxId: mb.databaseId,
+							}),
+						),
+					)
+				}
+
+				const updated = Object.assign({}, mailbox)
+				updated.unread = 0
+
+				await markMailboxRead(mailboxId)
+				this.updateMailboxMutation({
+					mailbox: updated,
+				})
+
+				this.syncEnvelopes({
+					accountId,
+					mailboxId,
+				})
+			})
+		},
+		async changeMailboxSubscription({
+			mailbox,
+			subscribed,
+		}) {
+			return handleHttpAuthErrors(async () => {
+				logger.debug(`toggle subscription for mailbox ${mailbox.databaseId}`, {
+					mailbox,
+					subscribed,
+				})
+				const updated = await patchMailbox(mailbox.databaseId, { subscribed })
+
+				this.updateMailboxMutation({
+					mailbox: updated,
+				})
+				logger.debug(`subscription for mailbox ${mailbox.databaseId} updated`, {
+					mailbox,
+					updated,
+				})
+			})
+		},
+		async patchMailbox({
+			mailbox,
+			attributes,
+		}) {
+			return handleHttpAuthErrors(async () => {
+				logger.debug('patching mailbox', {
+					mailbox,
+					attributes,
+				})
+
+				const updated = await patchMailbox(mailbox.databaseId, attributes)
+
+				this.updateMailboxMutation({
+					mailbox: updated,
+				})
+				logger.debug(`mailbox ${mailbox.databaseId} patched`, {
+					mailbox,
+					updated,
+				})
+			})
+		},
+		async startComposerSession({
+			type = 'imap',
+			data = {},
+			reply,
+			forwardedMessages = [],
+			templateMessageId,
+			isBlankMessage = false,
+		}) {
+			// Silently close old session if already saved and show a discard modal otherwise
+			if (this.composerSessionId && !this.composerMessageIsSaved) {
+				// TODO: Nice to have: Add button to save current pending message
+				const discard = await new Promise((resolve) => OC.dialogs.confirmDestructive(
+					t('mail', 'There is already a message in progress. All unsaved changes will be lost if you continue!'),
+					t('mail', 'Discard changes'),
+					{
+						type: OC.dialogs.YES_NO_BUTTONS,
+						confirm: t('mail', 'Discard unsaved changes'),
+						confirmClasses: 'error',
+						cancel: t('mail', 'Keep editing message'),
+					},
+					(decision) => {
+						resolve(decision)
+					},
+				))
+				if (!discard) {
+					this.showMessageComposer()
+					return
+				}
+			}
+
+			return handleHttpAuthErrors(async () => {
+				if (reply) {
+					const original = await this.fetchMessage(reply.data.databaseId)
+
+					// Fetch and transform the body into a rich text object
+					if (original.hasHtmlBody) {
+						const resp = await Axios.get(
+							generateUrl('/apps/mail/api/messages/{id}/html?plain=true', {
+								id: original.databaseId,
+							}),
+						)
+
+						resp.data = DOMPurify.sanitize(resp.data, {
+							FORBID_TAGS: ['style'],
+						})
+
+						data.body = html(resp.data)
+						if (reply.suggestedReply) {
+							data.body.value = `<p>${reply.suggestedReply}<\\p>` + data.body.value
+						}
+					} else {
+						data.body = plain(original.body)
+						if (reply.suggestedReply) {
+							data.body.value = `${reply.suggestedReply}\n` + data.body.value
+						}
+					}
+
+					if (reply.mode === 'reply') {
+						logger.debug('Show simple reply composer', { reply })
+						let to = original.replyTo !== undefined ? original.replyTo : reply.data.from
+						if (reply.followUp) {
+							to = reply.data.to
+						}
+						this.startComposerSessionMutation({
+							data: {
+								accountId: reply.data.accountId,
+								to,
+								cc: [],
+								subject: buildReplySubject(reply.data.subject),
+								body: data.body,
+								originalBody: data.body,
+								replyTo: reply.data,
+								smartReply: reply.smartReply,
+							},
+						})
+						return
+					} else if (reply.mode === 'replyAll') {
+						logger.debug('Show reply all reply composer', { reply })
+						const account = this.getAccount(reply.data.accountId)
+						const recipients = buildReplyRecipients(reply.data, {
+							email: account.emailAddress,
+							label: account.name,
+						}, original.replyTo)
+						this.startComposerSessionMutation({
+							data: {
+								accountId: reply.data.accountId,
+								to: recipients.to,
+								cc: recipients.cc,
+								subject: buildReplySubject(reply.data.subject),
+								body: data.body,
+								originalBody: data.body,
+								replyTo: reply.data,
+							},
+						})
+						return
+					} else if (reply.mode === 'forward') {
+						logger.debug('Show forward composer', { reply })
+						this.startComposerSessionMutation({
+							data: {
+								accountId: reply.data.accountId,
+								to: [],
+								cc: [],
+								subject: buildForwardSubject(reply.data.subject),
+								body: data.body,
+								originalBody: data.body,
+								forwardFrom: reply.data,
+								attachments: original.attachments.map(attachment => ({
+									...attachment,
+									mailboxId: original.mailboxId,
+									// messageId for attachments is actually the uid
+									uid: attachment.messageId,
+									type: 'message-attachment',
+								})),
+							},
+						})
+						return
+					}
+				} else if (templateMessageId) {
+					const message = await this.fetchMessage(templateMessageId)
+					// Merge the original into any existing data
+					data = {
+						...data,
+						message,
+					}
+
+					// Fetch and transform the body into a rich text object
+					if (message.hasHtmlBody) {
+						const resp = await Axios.get(
+							generateUrl('/apps/mail/api/messages/{id}/html?plain=true', {
+								id: templateMessageId,
+							}),
+						)
+
+						resp.data = DOMPurify.sanitize(resp.data, {
+							FORBID_TAGS: ['style'],
+						})
+
+						data.body = html(resp.data)
+					} else {
+						data.body = plain(message.body)
+					}
+
+					// TODO: implement attachments
+					if (message.attachments.length) {
+						showWarning(t('mail', 'Attachments were not copied. Please add them manually.'))
+					}
+				}
+
+				// Stop schedule when editing outbox messages and backup sendAt timestamp
+				let originalSendAt
+				if (type === 'outbox' && data.id && data.sendAt) {
+					originalSendAt = data.sendAt
+					const message = {
+						...data,
+						body: data.isHtml ? data.body.value : toPlain(data.body).value,
+					}
+					const outboxStore = useOutboxStore()
+					await outboxStore.stopMessage({ message })
+				}
+
+				this.startComposerSessionMutation({
+					type,
+					data,
+					forwardedMessages,
+					templateMessageId,
+					originalSendAt,
+				})
+
+				// Blank messages can be safely discarded (without saving a draft) until changes are made
+				if (isBlankMessage) {
+					this.setComposerMessageSavedMutation(true)
+				}
+			})
+		},
+		async stopComposerSession({
+			restoreOriginalSendAt = false,
+			moveToImap = false,
+			id,
+		} = {}) {
+			return handleHttpAuthErrors(async () => {
+
+				// Restore original sendAt timestamp when requested
+				const message = this.composerMessage
+				if (restoreOriginalSendAt && message.type === 'outbox' && message.options?.originalSendAt) {
+					const body = message.data.body
+					message.body = message.data.isHtml ? body.value : toPlain(body).value
+					message.sendAt = message.options.originalSendAt
+					updateDraft(message)
+				}
+				if (moveToImap) {
+					await moveDraft(id)
+				}
+
+				this.stopComposerSessionMutation()
+			})
+		},
+		patchComposerData(data) {
+			this.patchComposerDataMutation(data)
+			this.setComposerMessageSavedMutation(false)
+		},
+		async fetchEnvelope({
+			accountId,
+			id,
+		}) {
+			return handleHttpAuthErrors(async () => {
+				const cached = this.getEnvelope(id)
+				if (cached) {
+					logger.debug(`using cached value for envelope ${id}`)
+					return cached
+				}
+
+				const envelope = await fetchEnvelope(accountId, id)
+				// Only commit if not undefined (not found)
+				if (envelope) {
+					this.addEnvelopesMutation({
+						envelopes: [envelope],
+					})
+				}
+
+				// Always use the object from the store
+				return this.getEnvelope(id)
+			})
+		},
+		fetchEnvelopes({
+			mailboxId,
+			query,
+			addToUnifiedMailboxes = true,
+		}) {
+			return handleHttpAuthErrors(async () => {
+				const mailbox = this.getMailbox(mailboxId)
+
+				if (mailbox.isUnified) {
+					const fetchIndividualLists = pipe(
+						map((mb) =>
+							this.fetchEnvelopes({
+								mailboxId: mb.databaseId,
+								query,
+								addToUnifiedMailboxes: false,
+							}),
+						),
+						Promise.all.bind(Promise),
+						andThen(map(sliceToPage)),
+					)
+					const fetchUnifiedEnvelopes = pipe(
+						findIndividualMailboxes(this.getMailboxes, mailbox.specialRole),
+						fetchIndividualLists,
+						andThen(combineEnvelopeLists(this.getPreference('sort-order'))),
+						andThen(sliceToPage),
+						andThen(
+							tap((envelopes) =>
+								this.addEnvelopesMutation({
+									envelopes,
+									query,
+								}),
+							),
+						),
+					)
+
+					return fetchUnifiedEnvelopes(this.getAccounts)
+				}
+
+				return pipe(
+					fetchEnvelopes,
+					andThen(
+						tap((envelopes) =>
+							this.addEnvelopesMutation({
+								query,
+								envelopes,
+								addToUnifiedMailboxes,
+							}),
+						),
+					),
+				)(mailbox.accountId, mailboxId, query, undefined, PAGE_SIZE, this.getPreference('sort-order'))
+			})
+		},
+		async fetchNextEnvelopePage({
+			mailboxId,
+			query,
+		}) {
+			return handleHttpAuthErrors(async () => {
+				const envelopes = await this.fetchNextEnvelopes({
+					mailboxId,
+					query,
+					quantity: PAGE_SIZE,
+				})
+				return envelopes
+			})
+		},
+		async fetchNextEnvelopes({
+			mailboxId,
+			query,
+			quantity,
+			rec = true,
+			addToUnifiedMailboxes = true,
+		}) {
+			return handleHttpAuthErrors(async () => {
+				const mailbox = this.getMailbox(mailboxId)
+
+				if (mailbox.isUnified) {
+					const getIndivisualLists = curry((query, m) => this.getEnvelopes(m.databaseId, query))
+					const individualCursor = curry((query, m) =>
+						prop('dateInt', last(this.getEnvelopes(m.databaseId, query))),
+					)
+					const cursor = individualCursor(query, mailbox)
+
+					if (cursor === undefined) {
+						throw new Error('Unified list has no tail')
+					}
+					const newestFirst = this.getPreference('sort-order') === 'newest'
+					const nextLocalUnifiedEnvelopes = pipe(
+						findIndividualMailboxes(this.getMailboxes, mailbox.specialRole),
+						map(getIndivisualLists(query)),
+						combineEnvelopeLists(this.getPreference('sort-order')),
+						filter(
+							where({
+								dateInt: newestFirst ? gt(cursor) : lt(cursor),
+							}),
+						),
+						slice(0, quantity),
+					)
+					// We know the next envelopes based on local data
+					// We have to fetch individual envelopes only if it ends in the known
+					// next fetch. If it ends after, we have all the relevant data already.
+					const needsFetch = curry((query, nextEnvelopes, mb) => {
+						const c = individualCursor(query, mb)
+						if (nextEnvelopes.length < quantity) {
+							return true
+						}
+
+						if (this.getPreference('sort-order') === 'newest') {
+							return c >= last(nextEnvelopes).dateInt
+						} else {
+							return c <= last(nextEnvelopes).dateInt
+						}
+					})
+
+					const mailboxesToFetch = (accounts) =>
+						pipe(
+							findIndividualMailboxes(this.getMailboxes, mailbox.specialRole),
+							tap(mbs => console.info('individual mailboxes', mbs)),
+							filter(needsFetch(query, nextLocalUnifiedEnvelopes(accounts))),
+						)(accounts)
+					const mbs = mailboxesToFetch(this.getAccounts)
+
+					if (rec && mbs.length) {
+						logger.debug('not enough local envelopes for the next unified page. ' + mbs.length + ' fetches required', {
+							mailboxes: mbs.map(mb => mb.databaseId),
+						})
+						return pipe(
+							map((mb) =>
+								this.fetchNextEnvelopes({
+									mailboxId: mb.databaseId,
+									query,
+									quantity,
+									addToUnifiedMailboxes: false,
+								}),
+							),
+							Promise.all.bind(Promise),
+							andThen(() =>
+								this.fetchNextEnvelopes({
+									mailboxId,
+									query,
+									quantity,
+									rec: false,
+									addToUnifiedMailboxes: true,
+								}),
+							),
+						)(mbs)
+					}
+
+					const envelopes = nextLocalUnifiedEnvelopes(this.getAccounts)
+					logger.debug('next unified page can be built locally and consists of ' + envelopes.length + ' envelopes', { addToUnifiedMailboxes })
+					this.addEnvelopesMutation({
+						query,
+						envelopes,
+						addToUnifiedMailboxes,
+					})
+					return envelopes
+				}
+
+				const list = mailbox.envelopeLists[normalizedEnvelopeListId(query)]
+				if (list === undefined) {
+					console.warn("envelope list is not defined, can't fetch next envelopes", mailboxId, query)
+					return Promise.resolve([])
+				}
+				const lastEnvelopeId = last(list)
+				if (typeof lastEnvelopeId === 'undefined') {
+					console.error('mailbox is empty', list)
+					return Promise.reject(new Error('Local mailbox has no envelopes, cannot determine cursor'))
+				}
+				const lastEnvelope = this.getEnvelope(lastEnvelopeId)
+				if (typeof lastEnvelope === 'undefined') {
+					return Promise.reject(new Error('Cannot find last envelope. Required for the mailbox cursor'))
+				}
+
+				return fetchEnvelopes(mailbox.accountId, mailboxId, query, lastEnvelope.dateInt, quantity, this.getPreference('sort-order')).then((envelopes) => {
+					logger.debug(`fetched ${envelopes.length} messages for mailbox ${mailboxId}`, {
+						envelopes,
+						addToUnifiedMailboxes,
+					})
+					this.addEnvelopesMutation({
+						query,
+						envelopes,
+						addToUnifiedMailboxes,
+					})
+					return envelopes
+				})
+			})
+		},
+		syncEnvelopes({
+			mailboxId,
+			query,
+			init = false,
+		}) {
+			return handleHttpAuthErrors(async () => {
+				logger.debug(`starting mailbox sync of ${mailboxId} (${query})`)
+
+				const mailbox = this.getMailbox(mailboxId)
+
+				// Skip superfluous requests if using passwordless authentication. They will fail anyway.
+				const passwordIsUnavailable = this.getPreference('password-is-unavailable', false)
+				const isDisabled = (account) => passwordIsUnavailable && !!account.provisioningId
+
+				if (mailbox.isUnified) {
+					return Promise.all(
+						this.getAccounts
+							.filter((account) => !account.isUnified && !isDisabled(account))
+							.map((account) =>
+								Promise.all(
+									this
+										.getMailboxes(account.id)
+										.filter((mb) => mb.specialRole === mailbox.specialRole)
+										.map((mailbox) =>
+											this.syncEnvelopes({
+												mailboxId: mailbox.databaseId,
+												query,
+												init,
+											}),
+										),
+								),
+							),
+					)
+				} else if (mailbox.isPriorityInbox && query === undefined) {
+					return Promise.all(
+						getPrioritySearchQueries().map((query) => {
+							return Promise.all(
+								this.getAccounts
+									.filter((account) => !account.isUnified && !isDisabled(account))
+									.map((account) =>
+										Promise.all(
+											this
+												.getMailboxes(account.id)
+												.filter((mb) => mb.specialRole === mailbox.specialRole)
+												.map((mailbox) =>
+													this.syncEnvelopes({
+														mailboxId: mailbox.databaseId,
+														query,
+														init,
+													}),
+												),
+										),
+									),
+							)
+						}),
+					)
+				}
+
+				const ids = this.getEnvelopes(mailboxId, query).map((env) => env.databaseId)
+				const lastTimestamp = this.getPreference('sort-order') === 'newest' ? null : this.getEnvelopes(mailboxId, query)[0]?.dateInt
+				logger.debug(`mailbox sync of ${mailboxId} (${query}) has ${ids.length} known IDs. ${lastTimestamp} is the last known message timestamp`, { mailbox })
+				return syncEnvelopesExternal(mailbox.accountId, mailboxId, ids, lastTimestamp, query, init, this.getPreference('sort-order'))
+					.then((syncData) => {
+						logger.debug(`mailbox ${mailboxId} (${query}) synchronized, ${syncData.newMessages.length} new, ${syncData.changedMessages.length} changed and ${syncData.vanishedMessages.length} vanished messages`)
+
+						const unifiedMailbox = this.getUnifiedMailbox(mailbox.specialRole)
+
+						this.addEnvelopesMutation({
+							envelopes: syncData.newMessages,
+							query,
+						})
+
+						syncData.newMessages.forEach((envelope) => {
+							if (unifiedMailbox) {
+								this.updateEnvelopeMutation({
+									envelope,
+								})
+							}
+						})
+						syncData.changedMessages.forEach((envelope) => {
+							this.updateEnvelopeMutation({
+								envelope,
+							})
+						})
+						syncData.vanishedMessages.forEach((id) => {
+							this.removeEnvelopeMutation({
+								id,
+							})
+							// Already removed from unified inbox
+						})
+
+						this.setMailboxUnreadCountMutation({
+							id: mailboxId,
+							unread: syncData.stats.unread,
+						})
+
+						return syncData.newMessages
+					})
+					.catch((error) => {
+						return matchError(error, {
+							[SyncIncompleteError.getName()]() {
+								console.warn(`(initial) sync of mailbox ${mailboxId} (${query}) is incomplete, retriggering`)
+								return this.syncEnvelopes({
+									mailboxId,
+									query,
+									init,
+								})
+							},
+							[MailboxLockedError.getName()](error) {
+								if (init) {
+									logger.info('Sync failed because the mailbox is locked, stopping here because this is an initial sync', { error })
+									throw error
+								}
+
+								logger.info('Sync failed because the mailbox is locked, retriggering', { error })
+								return wait(1500).then(() => this.syncEnvelopes({
+									mailboxId,
+									query,
+									init,
+								}))
+							},
+							default(error) {
+								console.error('Could not sync envelopes: ' + error.message, error)
+								throw error
+							},
+						})
+					})
+			})
+		},
+		async syncInboxes() {
+			// Skip superfluous requests if using passwordless authentication. They will fail anyway.
+			const passwordIsUnavailable = this.getPreference('password-is-unavailable', false)
+			const isDisabled = (account) => passwordIsUnavailable && !!account.provisioningId
+
+			return handleHttpAuthErrors(async () => {
+				const results = await Promise.all(
+					this.getAccounts
+						.filter((a) => !a.isUnified && !isDisabled(a))
+						.map((account) => {
+							return Promise.all(
+								this.getMailboxes(account.id).map(async (mailbox) => {
+									if (mailbox.specialRole !== 'inbox') {
+										return
+									}
+
+									const list = mailbox.envelopeLists[normalizedEnvelopeListId(undefined)]
+									if (list === undefined) {
+										await this.fetchEnvelopes({
+											mailboxId: mailbox.databaseId,
+										})
+									}
+
+									return await this.syncEnvelopes({
+										mailboxId: mailbox.databaseId,
+									})
+								}),
+							)
+						}),
+				)
+				const newMessages = flatMapDeep(identity, results).filter((m) => m !== undefined)
+				if (newMessages.length === 0) {
+					return
+				}
+
+				try {
+					// Make sure the priority inbox is updated as well
+					logger.info('updating priority inbox')
+					for (const query of [priorityImportantQuery, priorityOtherQuery]) {
+						logger.info("sync'ing priority inbox section", { query })
+						const mailbox = this.getMailbox(UNIFIED_INBOX_ID)
+						const list = mailbox.envelopeLists[normalizedEnvelopeListId(query)]
+						if (list === undefined) {
+							await this.fetchEnvelopes({
+								mailboxId: UNIFIED_INBOX_ID,
+								query,
+							})
+						}
+
+						await this.syncEnvelopes({
+							mailboxId: UNIFIED_INBOX_ID,
+							query,
+						})
+					}
+				} finally {
+					showNewMessagesNotification(newMessages)
+				}
+			})
+		},
+		toggleEnvelopeFlagged(envelope) {
+			return handleHttpAuthErrors(async () => {
+				// Change immediately and switch back on error
+				const oldState = envelope.flags.flagged
+				this.flagEnvelopeMutation({
+					envelope,
+					flag: 'flagged',
+					value: !oldState,
+				})
+
+				try {
+					await setEnvelopeFlags(envelope.databaseId, {
+						flagged: !oldState,
+					})
+				} catch (error) {
+					logger.error('Could not toggle message flagged state', { error })
+
+					// Revert change
+					this.flagEnvelopeMutation({
+						envelope,
+						flag: 'flagged',
+						value: oldState,
+					})
+
+					throw error
+				}
+			})
+		},
+		async toggleEnvelopeImportant(envelope) {
+			return handleHttpAuthErrors(async () => {
+				const importantLabel = '$label1'
+				const hasTag = this
+					.getEnvelopeTags(envelope.databaseId)
+					.some((tag) => tag.imapLabel === importantLabel)
+				if (hasTag) {
+					await this.removeEnvelopeTag({
+						envelope,
+						imapLabel: importantLabel,
+					})
+				} else {
+					await this.addEnvelopeTag({
+						envelope,
+						imapLabel: importantLabel,
+					})
+				}
+			})
+		},
+		async toggleEnvelopeSeen({
+			envelope,
+			seen,
+		}) {
+			return handleHttpAuthErrors(async () => {
+				// Change immediately and switch back on error
+				const oldState = envelope.flags.seen
+				const newState = seen === undefined ? !oldState : seen
+				this.flagEnvelopeMutation({
+					envelope,
+					flag: 'seen',
+					value: newState,
+				})
+
+				try {
+					await setEnvelopeFlags(envelope.databaseId, {
+						seen: newState,
+					})
+				} catch (error) {
+					console.error('could not toggle message seen state', error)
+
+					// Revert change
+					this.flagEnvelopeMutation({
+						envelope,
+						flag: 'seen',
+						value: oldState,
+					})
+
+					throw error
+				}
+			})
+		},
+		async toggleEnvelopeJunk({
+			envelope,
+			removeEnvelope,
+		}) {
+			return handleHttpAuthErrors(async () => {
+				// Change immediately and switch back on error
+				const oldState = envelope.flags.$junk
+				this.flagEnvelopeMutation({
+					envelope,
+					flag: '$junk',
+					value: !oldState,
+				})
+				this.flagEnvelopeMutation({
+					envelope,
+					flag: '$notjunk',
+					value: oldState,
+				})
+
+				if (removeEnvelope) {
+					this.removeEnvelopeMutation({ id: envelope.databaseId })
+				}
+
+				try {
+					await setEnvelopeFlags(envelope.databaseId, {
+						$junk: !oldState,
+						$notjunk: oldState,
+					})
+				} catch (error) {
+					console.error('could not toggle message junk state', error)
+
+					if (removeEnvelope) {
+						this.addEnvelopesMutation([envelope])
+					}
+
+					// Revert change
+					this.flagEnvelopeMutation({
+						envelope,
+						flag: '$junk',
+						value: oldState,
+					})
+					this.flagEnvelopeMutation({
+						envelope,
+						flag: '$notjunk',
+						value: !oldState,
+					})
+
+					throw error
+				}
+			})
+		},
+		async markEnvelopeFavoriteOrUnfavorite({
+			envelope,
+			favFlag,
+		}) {
+			return handleHttpAuthErrors(async () => {
+				// Change immediately and switch back on error
+				const oldState = envelope.flags.flagged
+				this.flagEnvelopeMutation({
+					envelope,
+					flag: 'flagged',
+					value: favFlag,
+				})
+
+				try {
+					await setEnvelopeFlags(envelope.databaseId, {
+						flagged: favFlag,
+					})
+				} catch (error) {
+					console.error('could not favorite/unfavorite message ' + envelope.uid, error)
+
+					// Revert change
+					this.flagEnvelopeMutation({
+						envelope,
+						flag: 'flagged',
+						value: oldState,
+					})
+
+					throw error
+				}
+			})
+		},
+		async markEnvelopeImportantOrUnimportant({
+			envelope,
+			addTag,
+		}) {
+			return handleHttpAuthErrors(async () => {
+				const importantLabel = '$label1'
+				const hasTag = this
+					.getEnvelopeTags(envelope.databaseId)
+					.some((tag) => tag.imapLabel === importantLabel)
+				if (hasTag && !addTag) {
+					await this.removeEnvelopeTag({
+						envelope,
+						imapLabel: importantLabel,
+					})
+				} else if (!hasTag && addTag) {
+					await this.addEnvelopeTag({
+						envelope,
+						imapLabel: importantLabel,
+					})
+				}
+			})
+		},
+		async fetchThread(id) {
+			return handleHttpAuthErrors(async () => {
+				const thread = await fetchThread(id)
+				this.addEnvelopeThreadMutation({
+					id,
+					thread,
+				})
+				return thread
+			})
+		},
+		async fetchMessage(id) {
+			return handleHttpAuthErrors(async () => {
+				const message = await fetchMessage(id)
+				// Only commit if not undefined (not found)
+				if (message) {
+					this.addMessageMutation({
+						message,
+					})
+				}
+				return message
+			})
+		},
+		async fetchItineraries(id) {
+			return handleHttpAuthErrors(async () => {
+				const itineraries = await fetchMessageItineraries(id)
+				this.addMessageItinerariesMutation({
+					id,
+					itineraries,
+				})
+				return itineraries
+			})
+		},
+		async fetchDkim(id) {
+			return handleHttpAuthErrors(async () => {
+				const result = await fetchMessageDkim(id)
+				this.addMessageDkimMutation({
+					id,
+					result,
+				})
+				return result
+			})
+		},
+		async addInternalAddress({
+			address,
+			type,
+		}) {
+			return handleHttpAuthErrors(async () => {
+				const internalAddress = await addInternalAddress(address, type)
+				this.addInternalAddressMutation(internalAddress)
+				console.debug('internal address added')
+			})
+		},
+		async removeInternalAddress({
+			id,
+			address,
+			type,
+		}) {
+			return handleHttpAuthErrors(async () => {
+				try {
+					await removeInternalAddress(address, type)
+					this.removeInternalAddressMutation({ addressId: id })
+					console.debug('internal address removed')
+				} catch (error) {
+					console.error('could not delete internal address', error)
+					throw error
+				}
+			})
+		},
+		async deleteMessage({ id }) {
+			return handleHttpAuthErrors(async () => {
+				this.removeEnvelopeMutation({ id })
+
+				try {
+					await deleteMessage(id)
+					this.removeMessageMutation({ id })
+					console.debug('message removed')
+				} catch (err) {
+					console.error('could not delete message', err)
+					const envelope = this.getEnvelope(id)
+					if (envelope) {
+						this.addEnvelopesMutation({ envelopes: [envelope] })
+					} else {
+						logger.error('could not find envelope', { id })
+					}
+					throw err
+				}
+			})
+		},
+		async createAlias({
+			account,
+			alias,
+			name,
+		}) {
+			return handleHttpAuthErrors(async () => {
+				const entity = await AliasService.createAlias(account.id, alias, name)
+				this.createAliasMutation({
+					account,
+					alias: entity,
+				})
+			})
+		},
+		async deleteAlias({
+			account,
+			aliasId,
+		}) {
+			return handleHttpAuthErrors(async () => {
+				const entity = await AliasService.deleteAlias(account.id, aliasId)
+				this.deleteAliasMutation({
+					account,
+					aliasId: entity.id,
+				})
+			})
+		},
+		async updateAlias({
+			account,
+			aliasId,
+			alias,
+			name,
+			smimeCertificateId,
+		}) {
+			return handleHttpAuthErrors(async () => {
+				const entity = await AliasService.updateAlias(
+					account.id,
+					aliasId,
+					alias,
+					name,
+					smimeCertificateId,
+				)
+				this.patchAliasMutation({
+					account,
+					aliasId: entity.id,
+					data: {
+						alias: entity.alias,
+						name: entity.name,
+						smimeCertificateId: entity.smimeCertificateId,
+					},
+				})
+				this.editAccountMutation(account)
+			})
+		},
+		async updateAliasSignature({
+			account,
+			aliasId,
+			signature,
+		}) {
+			return handleHttpAuthErrors(async () => {
+				const entity = await AliasService.updateSignature(account.id, aliasId, signature)
+				this.patchAliasMutation({
+					account,
+					aliasId: entity.id,
+					data: { signature: entity.signature },
+				})
+				this.editAccountMutation(account)
+			})
+		},
+		async renameMailbox({
+			account,
+			mailbox,
+			newName,
+		}) {
+			return handleHttpAuthErrors(async () => {
+				const newMailbox = await patchMailbox(mailbox.databaseId, {
+					name: newName,
+				})
+
+				console.debug(`mailbox ${mailbox.databaseId} renamed to ${newName}`, { mailbox })
+				this.removeMailboxMutation({ id: mailbox.databaseId })
+				this.addMailboxMutation({
+					account,
+					mailbox: newMailbox,
+				})
+			})
+		},
+		async moveMessage({
+			id,
+			destMailboxId,
+		}) {
+			return handleHttpAuthErrors(async () => {
+				await moveMessage(id, destMailboxId)
+				this.removeEnvelopeMutation({ id })
+				this.removeMessageMutation({ id })
+			})
+		},
+		async snoozeMessage({
+			id,
+			unixTimestamp,
+			destMailboxId,
+		}) {
+			return handleHttpAuthErrors(async () => {
+				await snoozeMessage(id, unixTimestamp, destMailboxId)
+				this.removeEnvelopeMutation({ id })
+				this.removeMessageMutation({ id })
+			})
+		},
+		async unSnoozeMessage({ id }) {
+			return handleHttpAuthErrors(async () => {
+				await unSnoozeMessage(id)
+				this.removeEnvelopeMutation({ id })
+				this.removeMessageMutation({ id })
+			})
+		},
+		async fetchActiveSieveScript({ accountId }) {
+			return handleHttpAuthErrors(async () => {
+				const scriptData = await getActiveScript(accountId)
+				this.setActiveSieveScriptMutation({
+					accountId,
+					scriptData,
+				})
+			})
+		},
+		async updateActiveSieveScript({
+			accountId,
+			scriptData,
+		}) {
+			return handleHttpAuthErrors(async () => {
+				await updateActiveScript(accountId, scriptData)
+				this.setActiveSieveScriptMutation({
+					accountId,
+					scriptData,
+				})
+			})
+		},
+		async updateSieveAccount({
+			account,
+			data,
+		}) {
+			return handleHttpAuthErrors(async () => {
+				logger.debug(`update sieve settings for account ${account.id}`)
+				try {
+					await updateSieveAccount(account.id, data)
+					this.patchAccountMutation({
+						account,
+						data,
+					})
+				} catch (error) {
+					logger.error('failed to update sieve account: ', { error })
+					throw error
+				}
+			})
+		},
+		async createTag({
+			displayName,
+			color,
+		}) {
+			return handleHttpAuthErrors(async () => {
+				const tag = await createEnvelopeTag(displayName, color)
+				this.addTagMutation({ tag })
+			})
+
+		},
+		async addEnvelopeTag({
+			envelope,
+			imapLabel,
+		}) {
+			return handleHttpAuthErrors(async () => {
+				// TODO: fetch tags indepently of envelopes and only send tag id here
+				const tag = await setEnvelopeTag(envelope.databaseId, imapLabel)
+				if (!this.getTag(tag.id)) {
+					this.addTagMutation({ tag })
+				}
+
+				this.addEnvelopeTagMutation({
+					envelope,
+					tagId: tag.id,
+				})
+			})
+		},
+		async removeEnvelopeTag({
+			envelope,
+			imapLabel,
+		}) {
+			return handleHttpAuthErrors(async () => {
+				const tag = await removeEnvelopeTag(envelope.databaseId, imapLabel)
+				this.removeEnvelopeTagMutation({
+					envelope,
+					tagId: tag.id,
+				})
+			})
+		},
+		async updateTag({
+			tag,
+			displayName,
+			color,
+		}) {
+			return handleHttpAuthErrors(async () => {
+				await updateEnvelopeTag(tag.id, displayName, color)
+				this.updateTagMutation({
+					tag,
+					displayName,
+					color,
+				})
+				logger.debug('tag updated', {
+					tag,
+					displayName,
+					color,
+				})
+			})
+		},
+		async deleteTag({
+			tag,
+			accountId,
+		}) {
+			return handleHttpAuthErrors(async () => {
+				await deleteTag(tag.id, accountId)
+				this.deleteTagMutation({ tagId: tag.id })
+				logger.debug('tag deleted', { tag })
+			})
+		},
+		async deleteThread({ envelope }) {
+			return handleHttpAuthErrors(async () => {
+				this.removeEnvelopeMutation({ id: envelope.databaseId })
+
+				try {
+					await ThreadService.deleteThread(envelope.databaseId)
+					console.debug('thread removed')
+				} catch (e) {
+					this.addEnvelopesMutation({ envelopes: [envelope] })
+					console.error('could not delete thread', e)
+					throw e
+				}
+			})
+		},
+		async moveThread({
+			envelope,
+			destMailboxId,
+		}) {
+			return handleHttpAuthErrors(async () => {
+				this.removeEnvelopeMutation({ id: envelope.databaseId })
+
+				try {
+					await ThreadService.moveThread(envelope.databaseId, destMailboxId)
+					console.debug('thread removed')
+				} catch (e) {
+					this.addEnvelopesMutation({ envelopes: [envelope] })
+					console.error('could not move thread', e)
+					throw e
+				}
+			})
+		},
+		async snoozeThread({
+			envelope,
+			unixTimestamp,
+			destMailboxId,
+		}) {
+			return handleHttpAuthErrors(async () => {
+				try {
+					await ThreadService.snoozeThread(envelope.databaseId, unixTimestamp, destMailboxId)
+					console.debug('thread snoozed')
+				} catch (e) {
+					this.addEnvelopesMutation({ envelopes: [envelope] })
+					console.error('could not snooze thread', e)
+					throw e
+				}
+				this.removeEnvelopeMutation({ id: envelope.databaseId })
+			})
+		},
+		async unSnoozeThread({ envelope }) {
+			return handleHttpAuthErrors(async () => {
+				try {
+					await ThreadService.unSnoozeThread(envelope.databaseId)
+					console.debug('thread unSnoozed')
+				} catch (e) {
+					console.error('could not unsnooze thread', e)
+					throw e
+				}
+				this.removeEnvelopeMutation({ id: envelope.databaseId })
+			})
+		},
+
+		/**
+		 * Retrieve and commit the principal of the current user.
+		 *
+		 * @param {object} context Vuex store context
+		 * @param {Function} context.commit Vuex store mutations
+		 */
+		async fetchCurrentUserPrincipal() {
+			return handleHttpAuthErrors(async () => {
+				await initializeClientForUserView()
+				this.setCurrentUserPrincipalMutation({ currentUserPrincipal: getCurrentUserPrincipal() })
+			})
+		},
+
+		/**
+		 * Retrieve and commit calendars.
+		 *
+		 * @param {object} context Vuex store context
+		 * @param {Function} context.commit Vuex store mutations
+		 * @return {Promise<void>}
+		 */
+		async loadCollections() {
+			await handleHttpAuthErrors(async () => {
+				const { calendars } = await findAll()
+				for (const calendar of calendars) {
+					this.addCalendarMutation({ calendar })
+				}
+			})
+		},
+
+		/**
+		 * Fetch and commit all S/MIME certificate of the current user.
+		 *
+		 * @param {object} context Vuex store context
+		 * @param {Function} context.commit Vuex store mutations
+		 * @return {Promise<void>}
+		 */
+		async fetchSmimeCertificates() {
+			return handleHttpAuthErrors(async () => {
+				const certificates = await SmimeCertificateService.fetchAll()
+				this.setSmimeCertificatesMutation(certificates)
+			})
+		},
+
+		/**
+		 * Delete an imported S/MIME certificate.
+		 *
+		 * @param {object} context Vuex store context
+		 * @param {Function} context.commit Vuex store mutations
+		 * @param id The id of the certificate to be deleted
+		 * @return {Promise<void>}
+		 */
+		async deleteSmimeCertificate(id) {
+			return handleHttpAuthErrors(async () => {
+				await SmimeCertificateService.deleteCertificate(id)
+				this.deleteSmimeCertificateMutation({ id })
+			})
+		},
+
+		/**
+		 * Create a new S/MIME certificate and persist it on the backend.
+		 *
+		 * @param {object} context Vuex store context
+		 * @param {Function} context.commit Vuex store mutations
+		 * @param {object} files
+		 * @param {Blob} files.certificate
+		 * @param {Blob=} files.privateKey
+		 * @return {Promise<object>}
+		 */
+		async createSmimeCertificate(files) {
+			return handleHttpAuthErrors(async () => {
+				const certificate = await SmimeCertificateService.createCertificate(files)
+				this.addSmimeCertificateMutation({ certificate })
+				return certificate
+			})
+		},
+
+		/**
+		 * Update the S/MIME certificate of an account.
+		 *
+		 * @param {object} context Vuex store context
+		 * @param {Function} context.commit Vuex store mutations
+		 * @param {Function} context.this Vuex store this
+		 * @param {object} data
+		 * @param {object} data.accountId
+		 * @param {number=} data.smimeCertificateId
+		 * @param data.account
+		 * @param context.account
+		 * @param context.smimeCertificateId
+		 * @return {Promise<void>}
+		 */
+		async updateAccountSmimeCertificate({
+			account,
+			smimeCertificateId,
+		}) {
+			return handleHttpAuthErrors(async () => {
+				await updateAccountSmimeCertificate(account.id, smimeCertificateId)
+				this.patchAccountMutation({
+					account,
+					data: { smimeCertificateId },
+				})
+			})
+		},
+
+		/**
+		 * Should the envelope moved to the junk (or back to inbox)
+		 *
+		 * @param {object} context Vuex store context
+		 * @param {object} context.this Vuex store this
+		 * @param {object} envelope envelope object@
+		 * @return {boolean}
+		 */
+		async moveEnvelopeToJunk(envelope) {
+			const account = this.getAccount(envelope.accountId)
+			if (account.junkMailboxId === null) {
+				return false
+			}
+
+			if (!envelope.flags.$junk) {
+				// move message to junk
+				return envelope.mailboxId !== account.junkMailboxId
+			}
+
+			const inbox = this.getInbox(account.id)
+			if (inbox === undefined) {
+				return false
+			}
+
+			// move message to inbox
+			return envelope.mailboxId !== inbox.databaseId
+		},
+		async createAndSetSnoozeMailbox(account) {
+			const name = 'Snoozed'
+			let snoozeMailboxId
+
+			try {
+				const createMailboxResponse = await this.createMailbox({
+					account,
+					name,
+				})
+				snoozeMailboxId = createMailboxResponse.databaseId
+				logger.info(`mailbox ${name} created as ${snoozeMailboxId}`)
+			} catch (e) {
+				logger.error('could not create mailbox', { e })
+			}
+
+			if (snoozeMailboxId === undefined) {
+				snoozeMailboxId = this.findMailboxByName(account.id, name).databaseId
+			}
+
+			if (snoozeMailboxId === undefined) {
+				logger.error('Could not create snooze mailbox')
+				showError(t('mail', 'Could not create snooze mailbox'))
+				return
+			}
+
+			await this.patchAccount({
+				account,
+				data: {
+					snoozeMailboxId,
+				},
+			})
+		},
+		async setLayout({ list }) {
+			try {
+				this.setOneLineLayoutMutation({
+					list,
+				})
+			} catch (error) {
+				logger.error('Could not set layouts', { error })
+			}
+		},
+		async clearFollowUpReminder({ envelope }) {
+			await this.removeEnvelopeTag({
+				envelope,
+				imapLabel: FOLLOW_UP_TAG_LABEL,
+			})
+			this.removeEnvelopeFromFollowUpMailboxMutation({
+				id: envelope.databaseId,
+			})
+		},
+		async checkFollowUpReminders() {
+			const envelopes = this.getFollowUpReminderEnvelopes
+			const messageIds = envelopes.map((envelope) => envelope.databaseId)
+			if (messageIds.length === 0) {
+				return
+			}
+
+			const data = await FollowUpService.checkMessageIds(messageIds)
+			for (const messageId of data.wasFollowedUp) {
+				const envelope = this.getEnvelope(messageId)
+				if (!envelope) {
+					continue
+				}
+
+				await this.clearFollowUpReminder({ envelope })
+			}
+		},
+		transformMailboxName(account, mailbox) {
+			// Add all mailboxes (including submailboxes to state, but only toplevel to account
+			const nameWithoutPrefix = account.personalNamespace
+				? mailbox.name.replace(new RegExp(escapeRegExp(account.personalNamespace)), '')
+				: mailbox.name
+			if (nameWithoutPrefix.includes(mailbox.delimiter)) {
+				/**
+				 * Sub-mailbox, e.g. 'Archive.2020' or 'INBOX.Archive.2020'
+				 */
+				mailbox.displayName = mailbox.name.substring(mailbox.name.lastIndexOf(mailbox.delimiter) + 1)
+				mailbox.path = mailbox.name.substring(0, mailbox.name.lastIndexOf(mailbox.delimiter))
+			} else if (account.personalNamespace && mailbox.name.startsWith(account.personalNamespace)) {
+				/**
+				 * Top-level mailbox, but with a personal namespace, e.g. 'INBOX.Sent'
+				 */
+				mailbox.displayName = nameWithoutPrefix
+				mailbox.path = account.personalNamespace
+			} else {
+				/**
+				 * Top-level mailbox, e.g. 'INBOX' or 'Draft'
+				 */
+				mailbox.displayName = nameWithoutPrefix
+				mailbox.path = ''
+			}
+		},
+
+		sortAccounts(accounts) {
+			accounts.sort((a1, a2) => a1.order - a2.order)
+			return accounts
+		},
+		/**
+		 * Convert envelope tag objects to references and add new tags to global list.
+		 *
+		 * @param {object} envelope envelope with tag objects
+		 */
+		normalizeTags(envelope) {
+			if (Array.isArray(envelope.tags)) {
+				// Tags have been normalized already
+				return
+			}
+
+			const tags = Object
+				.entries(envelope.tags ?? {})
+				.map(([imapLabel, tag]) => {
+					if (!this.tags[tag.id]) {
+						Vue.set(this.tags, tag.id, tag)
+					}
+					if (!this.tagList.includes(tag.id)) {
+						this.tagList.push(tag.id)
+					}
+					return tag.id
+				})
+
+			Vue.set(envelope, 'tags', tags)
+		},
+
+		/**
+		 * Append or replace an envelope id for an existing message list
+		 *
+		 * If the given thread root id exist the message is replaced
+		 * otherwise appended
+		 *
+		 * @param {Array} existing list of envelope ids for a message list
+		 * @param {object} envelope envelope with tag objects
+		 * @return {Array} list of envelope ids
+		 */
+		appendOrReplaceEnvelopeId(existing, envelope) {
+			const index = existing.findIndex((id) => this.envelopes[id].threadRootId === envelope.threadRootId)
+			if (index === -1) {
+				existing.push(envelope.databaseId)
+			} else {
+				existing[index] = envelope.databaseId
+			}
+			return existing
+		},
+		savePreferenceMutation({
+			key,
+			value,
+		}) {
+			Vue.set(this.preferences, key, value)
+		},
+		setSessionExpiredMutation() {
+			this.isExpiredSession = true
+		},
+		addAccountMutation(account) {
+			account.collapsed = account.collapsed ?? true
+
+			Vue.set(this.accountsUnmapped, account.id, account)
+
+			this.accountList.push(account.id)
+
+			const mappedAccounts = this.accountList.map((id) => this.accountsUnmapped[id])
+			this.accountList = this.sortAccounts(mappedAccounts).map((a) => a.id)
+
+			// Save the mailboxes to the store, but only keep IDs in the account's mailboxes list
+			const mailboxes = sortMailboxes(account.mailboxes || [], account)
+			Vue.set(account, 'mailboxes', [])
+			Vue.set(account, 'aliases', account.aliases ?? [])
+
+			mailboxes.map(addMailboxToState(this.mailboxes, account))
+		},
+		editAccountMutation(account) {
+			Vue.set(this.accountsUnmapped, account.id, Object.assign({}, this.accountsUnmapped[account.id], account))
+		},
+		patchAccountMutation({
+			account,
+			data,
+		}) {
+			Vue.set(this.accountsUnmapped, account.id, Object.assign({}, this.accountsUnmapped[account.id], data))
+		},
+		saveAccountsOrderMutation({
+			account,
+			order,
+		}) {
+			Vue.set(account, 'order', order)
+			this.accountList = this
+				.sortAccounts(this.accountList.map((id) => this.accountsUnmapped[id]))
+				.map((a) => a.id)
+		},
+		toggleAccountCollapsedMutation(accountId) {
+			this.accountsUnmapped[accountId].collapsed = !this.accountsUnmapped[accountId].collapsed
+		},
+		expandAccountMutation(accountId) {
+			this.accountsUnmapped[accountId].collapsed = false
+		},
+		setAccountSettingMutation({
+			accountId,
+			key,
+			value,
+		}) {
+			const accountSettings = this.allAccountSettings.find(settings => settings.accountId === accountId)
+			if (accountSettings) {
+				accountSettings[key] = value
+			} else {
+				const newAccountSettings = { accountId }
+				newAccountSettings[key] = value
+				this.allAccountSettings.push(newAccountSettings)
+			}
+		},
+		addMailboxMutation({
+			account,
+			mailbox,
+		}) {
+			addMailboxToState(this.mailboxes, account, mailbox)
+		},
+		updateMailboxMutation({ mailbox }) {
+			const account = this.accountsUnmapped[mailbox.accountId]
+			this.transformMailboxName(account, mailbox)
+			Vue.set(this.mailboxes, mailbox.databaseId, mailbox)
+		},
+		removeMailboxMutation({ id }) {
+			const mailbox = this.mailboxes[id]
+			if (mailbox === undefined) {
+				throw new Error(`Mailbox ${id} does not exist`)
+			}
+			const account = this.accountsUnmapped[mailbox.accountId]
+			if (account === undefined) {
+				throw new Error(`Account ${mailbox.accountId} of mailbox ${id} is unknown`)
+			}
+			Vue.delete(this.mailboxes, id)
+
+			// Travers through the account and the full mailbox tree to find any dangling pointers
+			const removeRec = (parent) => {
+				parent.mailboxes = parent.mailboxes.filter((mbId) => mbId !== id)
+				parent.mailboxes.map(mbid => removeRec(this.mailboxes[mbid]))
+			}
+			removeRec(account)
+		},
+		/**
+		 * Start a new composer session and open the modal.
+		 *
+		 * @param {object} payload Data for the new message
+		 * @param payload.type
+		 * @param payload.data
+		 * @param payload.forwardedMessages
+		 * @param payload.originalSendAt
+		 * @param payload.smartReply
+		 */
+		startComposerSessionMutation({
+			type,
+			data,
+			forwardedMessages,
+			originalSendAt,
+			smartReply,
+		}) {
+			this.composerSessionId = this.nextComposerSessionId
+			this.nextComposerSessionId++
+			this.newMessage = {
+				type,
+				data,
+				options: {
+					forwardedMessages,
+					originalSendAt,
+					smartReply,
+				},
+				indicatorDisabled: false,
+			}
+			this.composerMessageIsSaved = false
+			this.showMessageComposer = true
+		},
+		/**
+		 * Stop current composer session and close the modal.
+		 * This discards all data from the current message.
+		 *
+		 */
+		stopComposerSessionMutation() {
+			this.composerSessionId = undefined
+			this.newMessage = undefined
+			this.showMessageComposer = false
+		},
+		/**
+		 * Show composer modal if there is an ongoing session.
+		 *
+		 */
+		showMessageComposerMutation() {
+			if (this.composerSessionId) {
+				this.showMessageComposer = true
+			}
+		},
+		/**
+		 * Hide composer modal without ending the current session.
+		 *
+		 */
+		hideMessageComposerMutation() {
+			this.showMessageComposer = false
+		},
+		setComposerMessageSavedMutation(saved) {
+			this.composerMessageIsSaved = saved
+		},
+		patchComposerDataMutation(data) {
+			this.newMessage.data = {
+				...this.newMessage.data,
+				...data,
+			}
+		},
+		setComposerIndicatorDisabledMutation(disabled) {
+			this.newMessage.indicatorDisabled = disabled
+		},
+		convertComposerMessageToOutboxMutation({ message }) {
+			if (!this.newMessage) {
+				// If the message is dispatched in the background there is no newMessage data in state
+				return
+			}
+			Vue.set(this.newMessage, 'type', 'outbox')
+			Vue.set(this.newMessage.data, 'id', message.id)
+		},
+		addEnvelopesMutation({
+			query,
+			envelopes,
+			addToUnifiedMailboxes = true,
+		}) {
+			if (envelopes.length === 0) {
+				return
+			}
+
+			const idToDateInt = (id) => this.envelopes[id].dateInt
+
+			const listId = normalizedEnvelopeListId(query)
+			const orderByDateInt = orderBy(idToDateInt, this.preferences['sort-order'] === 'newest' ? 'desc' : 'asc')
+
+			envelopes.forEach((envelope) => {
+				const mailbox = this.mailboxes[envelope.mailboxId]
+				const existing = mailbox.envelopeLists[listId] || []
+				this.normalizeTags(envelope)
+				Vue.set(this.envelopes, envelope.databaseId, Object.assign({}, this.envelopes[envelope.databaseId] || {}, envelope))
+				Vue.set(envelope, 'accountId', mailbox.accountId)
+				Vue.set(mailbox.envelopeLists, listId, uniq(orderByDateInt(this.appendOrReplaceEnvelopeId(existing, envelope))))
+				if (!addToUnifiedMailboxes) {
+					return
+				}
+				const unifiedAccount = this.accountsUnmapped[UNIFIED_ACCOUNT_ID]
+				unifiedAccount.mailboxes
+					.map((mbId) => this.mailboxes[mbId])
+					.filter((mb) => mb.specialRole && mb.specialRole === mailbox.specialRole)
+					.forEach((mailbox) => {
+						const existing = mailbox.envelopeLists[listId] || []
+						Vue.set(
+							mailbox.envelopeLists,
+							listId,
+							uniq(orderByDateInt(existing.concat([envelope.databaseId]))),
+						)
+					})
+			})
+		},
+		updateEnvelopeMutation({ envelope }) {
+			const existing = this.envelopes[envelope.databaseId]
+			if (!existing) {
+				return
+			}
+			this.normalizeTags(envelope)
+			Vue.set(existing, 'flags', envelope.flags)
+			Vue.set(existing, 'tags', envelope.tags)
+		},
+		flagEnvelopeMutation({
+			envelope,
+			flag,
+			value,
+		}) {
+			const mailbox = this.mailboxes[envelope.mailboxId]
+			if (mailbox && flag === 'seen') {
+				const unread = mailbox.unread ?? 0
+				if (envelope.flags[flag] && !value) {
+					Vue.set(mailbox, 'unread', unread + 1)
+				} else if (!envelope.flags[flag] && value) {
+					Vue.set(mailbox, 'unread', Math.max(unread - 1, 0))
+				}
+			}
+			Vue.set(envelope.flags, flag, value)
+		},
+		addTagMutation({ tag }) {
+			Vue.set(this.tags, tag.id, tag)
+			this.tagList.push(tag.id)
+		},
+		addInternalAddressMutation(address) {
+			Vue.set(this.internalAddress, address.id, address)
+		},
+		removeInternalAddressMutation({ addressId }) {
+			this.internalAddress = this.internalAddress.filter((address) => address.id !== addressId)
+		},
+		deleteTagMutation({ tagId }) {
+			this.tagList = this.tagList.filter((id) => id !== tagId)
+			Vue.delete(this.tags, tagId)
+		},
+		addEnvelopeTagMutation({
+			envelope,
+			tagId,
+		}) {
+			Vue.set(envelope, 'tags', uniq([...envelope.tags, tagId]))
+		},
+		updateTagMutation({
+			tag,
+			displayName,
+			color,
+		}) {
+			tag.displayName = displayName
+			tag.color = color
+		},
+		removeEnvelopeTagMutation({
+			envelope,
+			tagId,
+		}) {
+			Vue.set(envelope, 'tags', envelope.tags.filter((id) => id !== tagId))
+		},
+		removeEnvelopeMutation({ id }) {
+			const envelope = this.envelopes[id]
+			if (!envelope) {
+				console.warn('envelope ' + id + ' is unknown, can\'t remove it')
+				return
+			}
+			const mailbox = this.mailboxes[envelope.mailboxId]
+			for (const listId in mailbox.envelopeLists) {
+				if (!Object.hasOwnProperty.call(mailbox.envelopeLists, listId)) {
+					continue
+				}
+				const list = mailbox.envelopeLists[listId]
+				const idx = list.indexOf(id)
+				if (idx < 0) {
+					continue
+				}
+				console.debug('envelope ' + id + ' removed from mailbox list ' + listId)
+				list.splice(idx, 1)
+			}
+
+			if (!envelope.seen && mailbox.unread) {
+				Vue.set(mailbox, 'unread', mailbox.unread - 1)
+			}
+
+			this.accountsUnmapped[UNIFIED_ACCOUNT_ID].mailboxes
+				.map((mailboxId) => this.mailboxes[mailboxId])
+				.filter((mb) => mb.specialRole && mb.specialRole === mailbox.specialRole)
+				.forEach((mailbox) => {
+					for (const listId in mailbox.envelopeLists) {
+						if (!Object.hasOwnProperty.call(mailbox.envelopeLists, listId)) {
+							continue
+						}
+						const list = mailbox.envelopeLists[listId]
+						const idx = list.indexOf(id)
+						if (idx < 0) {
+							console.warn(
+								'envelope does not exist in unified mailbox',
+								mailbox.databaseId,
+								id,
+								listId,
+								list,
+							)
+							continue
+						}
+						console.debug('envelope removed from unified mailbox', mailbox.databaseId, id)
+						list.splice(idx, 1)
+					}
+				})
+
+			// Delete references from other threads
+			for (const [key, env] of Object.entries(this.envelopes)) {
+				if (!env.thread) {
+					continue
+				}
+
+				const thread = env.thread.filter(threadId => threadId !== id)
+				Vue.set(this.envelopes[key], 'thread', thread)
+			}
+
+			Vue.delete(this.envelopes, id)
+		},
+		removeEnvelopesMutation({ id }) {
+			Vue.set(this.mailboxes[id], 'envelopeLists', [])
+		},
+		removeAllEnvelopesMutation() {
+			Object.keys(this.mailboxes).forEach(id => {
+				Vue.set(this.mailboxes[id], 'envelopeLists', [])
+			})
+		},
+		removeEnvelopeFromFollowUpMailboxMutation({ id }) {
+			const filteredLists = {}
+			const mailbox = this.mailboxes[FOLLOW_UP_MAILBOX_ID]
+			for (const listId of Object.keys(mailbox.envelopeLists)) {
+				filteredLists[listId] = mailbox.envelopeLists[listId]
+					.filter((idInList) => id !== idInList)
+			}
+			Vue.set(this.mailboxes[FOLLOW_UP_MAILBOX_ID], 'envelopeLists', filteredLists)
+		},
+		addMessageMutation({ message }) {
+			Vue.set(this.messages, message.databaseId, message)
+		},
+		addMessageItinerariesMutation({
+			id,
+			itineraries,
+		}) {
+			const message = this.messages[id]
+			if (!message) {
+				return
+			}
+			Vue.set(message, 'itineraries', itineraries)
+		},
+		addMessageDkimMutation({
+			id,
+			result,
+		}) {
+			const message = this.messages[id]
+			if (!message) {
+				return
+			}
+			Vue.set(message, 'dkimValid', result.valid)
+		},
+		addEnvelopeThreadMutation({
+			id,
+			thread,
+		}) {
+			// Store the envelopes, merge into any existing object if one exists
+			thread.forEach(e => {
+				this.normalizeTags(e)
+				const mailbox = this.mailboxes[e.mailboxId]
+				Vue.set(e, 'accountId', mailbox.accountId)
+				Vue.set(this.envelopes, e.databaseId, Object.assign({}, this.envelopes[e.databaseId] || {}, e))
+			})
+
+			// Store the references
+			Vue.set(this.envelopes[id], 'thread', thread.map(e => e.databaseId))
+		},
+		removeMessageMutation({ id }) {
+			Vue.delete(this.messages, id)
+		},
+		createAliasMutation({
+			account,
+			alias,
+		}) {
+			account.aliases.push(alias)
+		},
+		deleteAliasMutation({
+			account,
+			aliasId,
+		}) {
+			const index = account.aliases.findIndex(temp => aliasId === temp.id)
+			if (index !== -1) {
+				account.aliases.splice(index, 1)
+			}
+		},
+		patchAliasMutation({
+			account,
+			aliasId,
+			data,
+		}) {
+			const index = account.aliases.findIndex(temp => aliasId === temp.id)
+			if (index !== -1) {
+				account.aliases[index] = Object.assign({}, account.aliases[index], data)
+			}
+		},
+		setMailboxUnreadCountMutation({
+			id,
+			unread,
+		}) {
+			Vue.set(this.mailboxes[id], 'unread', unread ?? 0)
+		},
+		setScheduledSendingDisabledMutation(value) {
+			this.isScheduledSendingDisabled = value
+		},
+		setSnoozeDisabledMutation(value) {
+			this.isSnoozeDisabled = value
+		},
+		setActiveSieveScriptMutation({
+			accountId,
+			scriptData,
+		}) {
+			Vue.set(this.sieveScript, accountId, scriptData)
+		},
+		setCurrentUserPrincipalMutation({ currentUserPrincipal }) {
+			this.currentUserPrincipal = currentUserPrincipal
+		},
+		addCalendarMutation({ calendar }) {
+			this.calendars = [...this.calendars, calendar]
+		},
+		setGoogleOauthUrlMutation(url) {
+			this.googleOauthUrl = url
+		},
+		setMasterPasswordEnabledMutation(value) {
+			this.masterPasswordEnabled = value
+		},
+		setMicrosoftOauthUrlMutation(url) {
+			this.microsoftOauthUrl = url
+		},
+		setSmimeCertificatesMutation(certificates) {
+			this.smimeCertificates = certificates
+		},
+		deleteSmimeCertificateMutation({ id }) {
+			this.smimeCertificates = this.smimeCertificates.filter(cert => cert.id !== id)
+		},
+		addSmimeCertificateMutation({ certificate }) {
+			this.smimeCertificates = [...this.smimeCertificates, certificate]
+		},
+		setOneLineLayoutMutation({ list }) {
+			Vue.set(this, 'list', list)
+		},
+		setHasFetchedInitialEnvelopesMutation(hasFetchedInitialEnvelopes) {
+			this.hasFetchedInitialEnvelopes = hasFetchedInitialEnvelopes
+		},
+		setFollowUpFeatureAvailableMutation(followUpFeatureAvailable) {
+			this.followUpFeatureAvailable = followUpFeatureAvailable
+		},
+		hasCurrentUserPrincipalAndCollectionsMutation(hasCurrentUserPrincipalAndCollections) {
+			this.hasCurrentUserPrincipalAndCollections = hasCurrentUserPrincipalAndCollections
+		},
+		showSettingsForAccountMutation(accountId) {
+			this.showAccountSettings = accountId
+		},
+		getPreference(key, def) {
+			return defaultTo(def, this.preferences[key])
+		},
+		getAccount(id) {
+			return this.accountsUnmapped[id]
+		},
+		getMailbox(id) {
+			return this.mailboxes[id]
+		},
+		getMailboxes(accountId) {
+			return this.accountsUnmapped[accountId].mailboxes.map((id) => this.mailboxes[id])
+		},
+		getSubMailboxes(id) {
+			const mailbox = this.getMailbox(id)
+			return mailbox.mailboxes.map((id) => this.mailboxes[id])
+		},
+		getParentMailbox(id) {
+			for (const mailbox of this.getMailboxes(this.getMailbox(id).accountId)) {
+				if (mailbox.mailboxes.includes(id)) {
+					return mailbox
+				}
+			}
+			return undefined
+		},
+		getUnifiedMailbox(specialRole) {
+			return head(
+				this.accountsUnmapped[UNIFIED_ACCOUNT_ID].mailboxes
+					.map((id) => this.mailboxes[id])
+					.filter((mailbox) => mailbox.specialRole === specialRole),
+			)
+		},
+		getEnvelope(id) {
+			return this.envelopes[id]
+		},
+		getEnvelopes(mailboxId, query) {
+			const list = this.getMailbox(mailboxId).envelopeLists[normalizedEnvelopeListId(query)] || []
+			return list.map((msgId) => this.envelopes[msgId])
+		},
+		getEnvelopesByThreadRootId(accountId, threadRootId) {
+			return sortBy(
+				prop('dateInt'),
+				Object.values(this.envelopes).filter(envelope => envelope.accountId === accountId && envelope.threadRootId === threadRootId),
+			)
+		},
+		getMessage(id) {
+			return this.messages[id]
+		},
+		getEnvelopeThread(id) {
+			const thread = this.envelopes[id]?.thread ?? []
+			const envelopes = thread.map(id => this.envelopes[id])
+			return sortBy(prop('dateInt'), envelopes)
+		},
+		getEnvelopeTags(id) {
+			const tags = this.envelopes[id]?.tags ?? []
+			return tags.map((tagId) => this.tags[tagId])
+		},
+		getTag(id) {
+			return this.tags[id]
+		},
+		isInternalAddress(address) {
+			const domain = address.split('@')[1]
+			return this.internalAddress.some((internalAddress) => internalAddress.address === address || internalAddress.address === domain)
+		},
+		getActiveSieveScript(accountId) {
+			return this.sieveScript[accountId]
+		},
+		getSmimeCertificate(id) {
+			return this.smimeCertificates.find((cert) => cert.id === id)
+		},
+		getSmimeCertificateByEmail(email) {
+			return this.smimeCertificates.find((cert) => cert.emailAddress === email)
+		},
+		findMailboxBySpecialRole(accountId, specialRole) {
+			return this.getMailboxes(accountId).find(mailbox => mailbox.specialRole === specialRole)
+		},
+		findMailboxByName(accountId, name) {
+			return this.getMailboxes(accountId).find(mailbox => mailbox.name === name)
+		},
+		getInbox(accountId) {
+			return this.findMailboxBySpecialRole(accountId, 'inbox')
+		},
+		showSettingsForAccount(accountId) {
+			return this.showAccountSettings === accountId
+		},
+	}
+}
diff --git a/src/store/mainStore/getters.js b/src/store/mainStore/getters.js
new file mode 100644
index 0000000000..ff2d942643
--- /dev/null
+++ b/src/store/mainStore/getters.js
@@ -0,0 +1,64 @@
+/**
+ * SPDX-FileCopyrightText: 2020 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+import { FOLLOW_UP_TAG_LABEL } from '../constants.js'
+import { getCalendarHome } from '../../service/caldavService.js'
+import toCalendar from '../../util/calendar.js'
+
+export default function mainStore() {
+	return {
+		getAccounts: (state) => {
+			return state.accountList.map((id) => state.accountsUnmapped[id])
+		},
+		composerMessage: (state) => {
+			return state.newMessage
+		},
+		composerMessageOptions: (state) => {
+			return state.newMessage?.options
+		},
+		getTags: (state) => {
+			return state.tagList.map(tagId => state.tags[tagId])
+		},
+		getFollowUpTag: (state) => {
+			return Object.values(state.tags).find((tag) => tag.imapLabel === FOLLOW_UP_TAG_LABEL)
+		},
+		getFollowUpReminderEnvelopes: (state) => {
+			return Object.values(state.envelopes)
+				.filter((envelope) => envelope.tags
+					?.map((tagId) => state.tags[tagId])
+					.some((tag) => tag.imapLabel === FOLLOW_UP_TAG_LABEL),
+				)
+		},
+		getCurrentUserPrincipal: (state) => state.currentUserPrincipal,
+		getCurrentUserPrincipalEmail: (state) => state.currentUserPrincipal?.email,
+		getCalendars: (state) => state.calendars,
+		getClonedWriteableCalendars: (state) => state.calendars.filter(calendar => {
+			return calendar.isWriteable()
+		}).map(calendar => {
+			// Hack: We need to clone all calendars because some methods (e.g. calendarQuery) are
+			// unnecessarily mutating the object and causing vue warnings (if used outside of
+			// mutations).
+			const resourcetype = calendar.resourcetype.find(type => type !== '{DAV:}collection')
+			const calendarHome = getCalendarHome()
+			return new calendarHome._collectionFactoryMapper[resourcetype](
+				calendarHome,
+				calendar._request,
+				calendar._url,
+				calendar._props,
+			)
+		}),
+		getSmimeCertificates: (state) => state.smimeCertificates,
+		getTaskCalendarsForCurrentUser: state => {
+			return state.calendars.filter(calendar => {
+				return calendar.components.includes('VTODO') && calendar.currentUserPrivilegeSet.includes('{DAV:}write')
+			}).map(calendar => toCalendar(calendar))
+		},
+		getNcVersion: (state) => state.preferences?.ncVersion,
+		getAppVersion: (state) => state.preferences?.version,
+
+		isOneLineLayout: (state) => state.list,
+		getInternalAddresses: (state) => state.internalAddress?.filter(internalAddress => internalAddress !== undefined),
+	}
+}
diff --git a/src/store/mutations.js b/src/store/mutations.js
deleted file mode 100644
index 60214361e5..0000000000
--- a/src/store/mutations.js
+++ /dev/null
@@ -1,522 +0,0 @@
-/**
- * SPDX-FileCopyrightText: 2019 Nextcloud GmbH and Nextcloud contributors
- * SPDX-License-Identifier: AGPL-3.0-or-later
- */
-
-import { curry } from 'ramda'
-import escapeRegExp from 'lodash/fp/escapeRegExp.js'
-import orderBy from 'lodash/fp/orderBy.js'
-import uniq from 'lodash/fp/uniq.js'
-import Vue from 'vue'
-
-import { sortMailboxes } from '../imap/MailboxSorter.js'
-import { normalizedEnvelopeListId } from './normalization.js'
-import { FOLLOW_UP_MAILBOX_ID, UNIFIED_ACCOUNT_ID } from './constants.js'
-
-const transformMailboxName = (account, mailbox) => {
-	// Add all mailboxes (including submailboxes to state, but only toplevel to account
-	const nameWithoutPrefix = account.personalNamespace
-		? mailbox.name.replace(new RegExp(escapeRegExp(account.personalNamespace)), '')
-		: mailbox.name
-	if (nameWithoutPrefix.includes(mailbox.delimiter)) {
-		/**
-		 * Sub-mailbox, e.g. 'Archive.2020' or 'INBOX.Archive.2020'
-		 */
-		mailbox.displayName = mailbox.name.substring(mailbox.name.lastIndexOf(mailbox.delimiter) + 1)
-		mailbox.path = mailbox.name.substring(0, mailbox.name.lastIndexOf(mailbox.delimiter))
-	} else if (account.personalNamespace && mailbox.name.startsWith(account.personalNamespace)) {
-		/**
-		 * Top-level mailbox, but with a personal namespace, e.g. 'INBOX.Sent'
-		 */
-		mailbox.displayName = nameWithoutPrefix
-		mailbox.path = account.personalNamespace
-	} else {
-		/**
-		 * Top-level mailbox, e.g. 'INBOX' or 'Draft'
-		 */
-		mailbox.displayName = nameWithoutPrefix
-		mailbox.path = ''
-	}
-}
-
-const addMailboxToState = curry((state, account, mailbox) => {
-	mailbox.accountId = account.id
-	mailbox.mailboxes = []
-	Vue.set(mailbox, 'envelopeLists', {})
-
-	transformMailboxName(account, mailbox)
-
-	Vue.set(state.mailboxes, mailbox.databaseId, mailbox)
-	const parent = Object.values(state.mailboxes)
-		.filter(mb => mb.accountId === account.id)
-		.find(mb => mb.name === mailbox.path)
-	if (mailbox.path === '' || !parent) {
-		account.mailboxes.push(mailbox.databaseId)
-	} else {
-		parent.mailboxes.push(mailbox.databaseId)
-	}
-
-})
-
-const sortAccounts = (accounts) => {
-	accounts.sort((a1, a2) => a1.order - a2.order)
-	return accounts
-}
-/**
- * Convert envelope tag objects to references and add new tags to global list.
- *
- * @param {object} state vuex state
- * @param {object} envelope envelope with tag objects
- */
-const normalizeTags = (state, envelope) => {
-	if (Array.isArray(envelope.tags)) {
-		// Tags have been normalized already
-		return
-	}
-
-	const tags = Object
-		.entries(envelope.tags ?? {})
-		.map(([imapLabel, tag]) => {
-			if (!state.tags[tag.id]) {
-				Vue.set(state.tags, tag.id, tag)
-			}
-			if (!state.tagList.includes(tag.id)) {
-				state.tagList.push(tag.id)
-			}
-			return tag.id
-		})
-
-	Vue.set(envelope, 'tags', tags)
-}
-
-/**
- * Append or replace an envelope id for an existing message list
- *
- * If the given thread root id exist the message is replaced
- * otherwise appended
- *
- * @param {object} state vuex state
- * @param {Array} existing list of envelope ids for a message list
- * @param {object} envelope envelope with tag objects
- * @return {Array} list of envelope ids
- */
-const appendOrReplaceEnvelopeId = (state, existing, envelope) => {
-	const index = existing.findIndex((id) => state.envelopes[id].threadRootId === envelope.threadRootId)
-	if (index === -1) {
-		existing.push(envelope.databaseId)
-	} else {
-		existing[index] = envelope.databaseId
-	}
-	return existing
-}
-
-export default {
-	savePreference(state, { key, value }) {
-		Vue.set(state.preferences, key, value)
-	},
-	setSessionExpired(state) {
-		Vue.set(state, 'isExpiredSession', true)
-	},
-	addAccount(state, account) {
-		account.collapsed = account.collapsed ?? true
-		Vue.set(state.accounts, account.id, account)
-		Vue.set(
-			state,
-			'accountList',
-			sortAccounts(state.accountList.concat([account.id]).map((id) => state.accounts[id])).map((a) => a.id),
-		)
-
-		// Save the mailboxes to the store, but only keep IDs in the account's mailboxes list
-		const mailboxes = sortMailboxes(account.mailboxes || [], account)
-		Vue.set(account, 'mailboxes', [])
-		Vue.set(account, 'aliases', account.aliases ?? [])
-		mailboxes.map(addMailboxToState(state, account))
-	},
-	editAccount(state, account) {
-		Vue.set(state.accounts, account.id, Object.assign({}, state.accounts[account.id], account))
-	},
-	patchAccount(state, { account, data }) {
-		Vue.set(state.accounts, account.id, Object.assign({}, state.accounts[account.id], data))
-	},
-	saveAccountsOrder(state, { account, order }) {
-		Vue.set(account, 'order', order)
-		Vue.set(
-			state,
-			'accountList',
-			sortAccounts(state.accountList.map((id) => state.accounts[id])).map((a) => a.id),
-		)
-	},
-	toggleAccountCollapsed(state, accountId) {
-		state.accounts[accountId].collapsed = !state.accounts[accountId].collapsed
-	},
-	expandAccount(state, accountId) {
-		state.accounts[accountId].collapsed = false
-	},
-	setAccountSetting(state, { accountId, key, value }) {
-		const accountSettings = state.allAccountSettings.find(settings => settings.accountId === accountId)
-		if (accountSettings) {
-			accountSettings[key] = value
-		} else {
-			const newAccountSettings = { accountId }
-			newAccountSettings[key] = value
-			state.allAccountSettings.push(newAccountSettings)
-		}
-	},
-	addMailbox(state, { account, mailbox }) {
-		addMailboxToState(state, account, mailbox)
-	},
-	updateMailbox(state, { mailbox }) {
-		const account = state.accounts[mailbox.accountId]
-		transformMailboxName(account, mailbox)
-		Vue.set(state.mailboxes, mailbox.databaseId, mailbox)
-	},
-	removeMailbox(state, { id }) {
-		const mailbox = state.mailboxes[id]
-		if (mailbox === undefined) {
-			throw new Error(`Mailbox ${id} does not exist`)
-		}
-		const account = state.accounts[mailbox.accountId]
-		if (account === undefined) {
-			throw new Error(`Account ${mailbox.accountId} of mailbox ${id} is unknown`)
-		}
-		Vue.delete(state.mailboxes, id)
-
-		// Travers through the account and the full mailbox tree to find any dangling pointers
-		const removeRec = (parent) => {
-			parent.mailboxes = parent.mailboxes.filter((mbId) => mbId !== id)
-			parent.mailboxes.map(mbid => removeRec(state.mailboxes[mbid]))
-		}
-		removeRec(account)
-	},
-	/**
-	 * Start a new composer session and open the modal.
-	 *
-	 * @param {object} state Vuex state
-	 * @param {object} payload Data for the new message
-	 * @param payload.type
-	 * @param payload.data
-	 * @param payload.forwardedMessages
-	 * @param payload.originalSendAt
-	 * @param payload.smartReply
-	 */
-	startComposerSession(state, { type, data, forwardedMessages, originalSendAt, smartReply }) {
-		state.composerSessionId = state.nextComposerSessionId
-		state.nextComposerSessionId++
-		state.newMessage = {
-			type,
-			data,
-			options: {
-				forwardedMessages,
-				originalSendAt,
-				smartReply,
-			},
-			indicatorDisabled: false,
-		}
-		state.composerMessageIsSaved = false
-		state.showMessageComposer = true
-	},
-	/**
-	 * Stop current composer session and close the modal.
-	 * This discards all data from the current message.
-	 *
-	 * @param {object} state Vuex state
-	 */
-	stopComposerSession(state) {
-		state.composerSessionId = undefined
-		state.newMessage = undefined
-		state.showMessageComposer = false
-	},
-	/**
-	 * Show composer modal if there is an ongoing session.
-	 *
-	 * @param {object} state Vuex state
-	 */
-	showMessageComposer(state) {
-		if (state.composerSessionId) {
-			state.showMessageComposer = true
-		}
-	},
-	/**
-	 * Hide composer modal without ending the current session.
-	 *
-	 * @param {object} state Vuex state
-	 */
-	hideMessageComposer(state) {
-		state.showMessageComposer = false
-	},
-	setComposerMessageSaved(state, saved) {
-		state.composerMessageIsSaved = saved
-	},
-	patchComposerData(state, data) {
-		state.newMessage.data = {
-			...state.newMessage.data,
-			...data,
-		}
-	},
-	setComposerIndicatorDisabled(state, disabled) {
-		state.newMessage.indicatorDisabled = disabled
-	},
-	convertComposerMessageToOutbox(state, { message }) {
-		if (!state.newMessage) {
-			// If the message is dispatched in the background there is no newMessage data in state
-			return
-		}
-		Vue.set(state.newMessage, 'type', 'outbox')
-		Vue.set(state.newMessage.data, 'id', message.id)
-	},
-	addEnvelopes(state, { query, envelopes, addToUnifiedMailboxes = true }) {
-		if (envelopes.length === 0) {
-			return
-		}
-
-		const idToDateInt = (id) => state.envelopes[id].dateInt
-
-		const listId = normalizedEnvelopeListId(query)
-		const orderByDateInt = orderBy(idToDateInt, state.preferences['sort-order'] === 'newest' ? 'desc' : 'asc')
-
-		envelopes.forEach((envelope) => {
-			const mailbox = state.mailboxes[envelope.mailboxId]
-			const existing = mailbox.envelopeLists[listId] || []
-			normalizeTags(state, envelope)
-			Vue.set(state.envelopes, envelope.databaseId, Object.assign({}, state.envelopes[envelope.databaseId] || {}, envelope))
-			Vue.set(envelope, 'accountId', mailbox.accountId)
-			Vue.set(mailbox.envelopeLists, listId, uniq(orderByDateInt(appendOrReplaceEnvelopeId(state, existing, envelope))))
-			if (!addToUnifiedMailboxes) {
-				return
-			}
-			const unifiedAccount = state.accounts[UNIFIED_ACCOUNT_ID]
-			unifiedAccount.mailboxes
-				.map((mbId) => state.mailboxes[mbId])
-				.filter((mb) => mb.specialRole && mb.specialRole === mailbox.specialRole)
-				.forEach((mailbox) => {
-					const existing = mailbox.envelopeLists[listId] || []
-					Vue.set(
-						mailbox.envelopeLists,
-						listId,
-						uniq(orderByDateInt(existing.concat([envelope.databaseId]))),
-					)
-				})
-		})
-	},
-	updateEnvelope(state, { envelope }) {
-		const existing = state.envelopes[envelope.databaseId]
-		if (!existing) {
-			return
-		}
-		normalizeTags(state, envelope)
-		Vue.set(existing, 'flags', envelope.flags)
-		Vue.set(existing, 'tags', envelope.tags)
-	},
-	flagEnvelope(state, { envelope, flag, value }) {
-		const mailbox = state.mailboxes[envelope.mailboxId]
-		if (mailbox && flag === 'seen') {
-			const unread = mailbox.unread ?? 0
-			if (envelope.flags[flag] && !value) {
-				Vue.set(mailbox, 'unread', unread + 1)
-			} else if (!envelope.flags[flag] && value) {
-				Vue.set(mailbox, 'unread', Math.max(unread - 1, 0))
-			}
-		}
-		Vue.set(envelope.flags, flag, value)
-	},
-	addTag(state, { tag }) {
-		Vue.set(state.tags, tag.id, tag)
-		state.tagList.push(tag.id)
-	},
-	addInternalAddress(state, address) {
-		Vue.set(state.internalAddress, address.id, address)
-	},
-	removeInternalAddress(state, { addressId }) {
-		state.internalAddress = state.internalAddress.filter((address) => address.id !== addressId)
-	},
-	deleteTag(state, { tagId }) {
-		state.tagList = state.tagList.filter((id) => id !== tagId)
-		Vue.delete(state.tags, tagId)
-	},
-	addEnvelopeTag(state, { envelope, tagId }) {
-		Vue.set(envelope, 'tags', uniq([...envelope.tags, tagId]))
-	},
-	updateTag(state, { tag, displayName, color }) {
-		tag.displayName = displayName
-		tag.color = color
-	},
-	removeEnvelopeTag(state, { envelope, tagId }) {
-		Vue.set(envelope, 'tags', envelope.tags.filter((id) => id !== tagId))
-	},
-	removeEnvelope(state, { id }) {
-		const envelope = state.envelopes[id]
-		if (!envelope) {
-			console.warn('envelope ' + id + ' is unknown, can\'t remove it')
-			return
-		}
-		const mailbox = state.mailboxes[envelope.mailboxId]
-		for (const listId in mailbox.envelopeLists) {
-			if (!Object.hasOwnProperty.call(mailbox.envelopeLists, listId)) {
-				continue
-			}
-			const list = mailbox.envelopeLists[listId]
-			const idx = list.indexOf(id)
-			if (idx < 0) {
-				continue
-			}
-			console.debug('envelope ' + id + ' removed from mailbox list ' + listId)
-			list.splice(idx, 1)
-		}
-
-		if (!envelope.seen && mailbox.unread) {
-			Vue.set(mailbox, 'unread', mailbox.unread - 1)
-		}
-
-		state.accounts[UNIFIED_ACCOUNT_ID].mailboxes
-			.map((mailboxId) => state.mailboxes[mailboxId])
-			.filter((mb) => mb.specialRole && mb.specialRole === mailbox.specialRole)
-			.forEach((mailbox) => {
-				for (const listId in mailbox.envelopeLists) {
-					if (!Object.hasOwnProperty.call(mailbox.envelopeLists, listId)) {
-						continue
-					}
-					const list = mailbox.envelopeLists[listId]
-					const idx = list.indexOf(id)
-					if (idx < 0) {
-						console.warn(
-							'envelope does not exist in unified mailbox',
-							mailbox.databaseId,
-							id,
-							listId,
-							list,
-						)
-						continue
-					}
-					console.debug('envelope removed from unified mailbox', mailbox.databaseId, id)
-					list.splice(idx, 1)
-				}
-			})
-
-		// Delete references from other threads
-		for (const [key, env] of Object.entries(state.envelopes)) {
-			if (!env.thread) {
-				continue
-			}
-
-			const thread = env.thread.filter(threadId => threadId !== id)
-			Vue.set(state.envelopes[key], 'thread', thread)
-		}
-
-		Vue.delete(state.envelopes, id)
-	},
-	removeEnvelopes(state, { id }) {
-		Vue.set(state.mailboxes[id], 'envelopeLists', [])
-	},
-	removeAllEnvelopes(state) {
-		Object.keys(state.mailboxes).forEach(id => {
-			Vue.set(state.mailboxes[id], 'envelopeLists', [])
-		  })
-	},
-	removeEnvelopeFromFollowUpMailbox(state, { id }) {
-		const filteredLists = {}
-		const mailbox = state.mailboxes[FOLLOW_UP_MAILBOX_ID]
-		for (const listId of Object.keys(mailbox.envelopeLists)) {
-			filteredLists[listId] = mailbox.envelopeLists[listId]
-				.filter((idInList) => id !== idInList)
-		}
-		Vue.set(state.mailboxes[FOLLOW_UP_MAILBOX_ID], 'envelopeLists', filteredLists)
-	},
-	addMessage(state, { message }) {
-		Vue.set(state.messages, message.databaseId, message)
-	},
-	addMessageItineraries(state, { id, itineraries }) {
-		const message = state.messages[id]
-		if (!message) {
-			return
-		}
-		Vue.set(message, 'itineraries', itineraries)
-	},
-	addMessageDkim(state, { id, result }) {
-		const message = state.messages[id]
-		if (!message) {
-			return
-		}
-		Vue.set(message, 'dkimValid', result.valid)
-	},
-	addEnvelopeThread(state, { id, thread }) {
-		// Store the envelopes, merge into any existing object if one exists
-		thread.forEach(e => {
-			normalizeTags(state, e)
-			const mailbox = state.mailboxes[e.mailboxId]
-			Vue.set(e, 'accountId', mailbox.accountId)
-			Vue.set(state.envelopes, e.databaseId, Object.assign({}, state.envelopes[e.databaseId] || {}, e))
-		})
-
-		// Store the references
-		Vue.set(state.envelopes[id], 'thread', thread.map(e => e.databaseId))
-	},
-	removeMessage(state, { id }) {
-		Vue.delete(state.messages, id)
-	},
-	createAlias(state, { account, alias }) {
-		account.aliases.push(alias)
-	},
-	deleteAlias(state, { account, aliasId }) {
-		const index = account.aliases.findIndex(temp => aliasId === temp.id)
-		if (index !== -1) {
-			account.aliases.splice(index, 1)
-		}
-	},
-	patchAlias(state, { account, aliasId, data }) {
-		const index = account.aliases.findIndex(temp => aliasId === temp.id)
-		if (index !== -1) {
-			account.aliases[index] = Object.assign({}, account.aliases[index], data)
-		}
-	},
-	setMailboxUnreadCount(state, { id, unread }) {
-		Vue.set(state.mailboxes[id], 'unread', unread ?? 0)
-	},
-	setScheduledSendingDisabled(state, value) {
-		state.isScheduledSendingDisabled = value
-	},
-	setSnoozeDisabled(state, value) {
-		state.isSnoozeDisabled = value
-	},
-	setActiveSieveScript(state, { accountId, scriptData }) {
-		Vue.set(state.sieveScript, accountId, scriptData)
-	},
-	setCurrentUserPrincipal(state, { currentUserPrincipal }) {
-		state.currentUserPrincipal = currentUserPrincipal
-	},
-	addCalendar(state, { calendar }) {
-		state.calendars = [...state.calendars, calendar]
-	},
-	setGoogleOauthUrl(state, url) {
-		state.googleOauthUrl = url
-	},
-	setMasterPasswordEnabled(state, value) {
-		state.masterPasswordEnabled = value
-	},
-	setMicrosoftOauthUrl(state, url) {
-		state.microsoftOauthUrl = url
-	},
-	setSmimeCertificates(state, certificates) {
-		state.smimeCertificates = certificates
-	},
-	deleteSmimeCertificate(state, { id }) {
-		state.smimeCertificates = state.smimeCertificates.filter(cert => cert.id !== id)
-	},
-	addSmimeCertificate(state, { certificate }) {
-		state.smimeCertificates = [...state.smimeCertificates, certificate]
-	},
-	setOneLineLayout(state, { list }) {
-		Vue.set(state, 'list', list)
-	},
-	setHasFetchedInitialEnvelopes(state, hasFetchedInitialEnvelopes) {
-		state.hasFetchedInitialEnvelopes = hasFetchedInitialEnvelopes
-	},
-	setFollowUpFeatureAvailable(state, followUpFeatureAvailable) {
-		state.followUpFeatureAvailable = followUpFeatureAvailable
-	},
-	hasCurrentUserPrincipalAndCollections(state, hasCurrentUserPrincipalAndCollections) {
-		state.hasCurrentUserPrincipalAndCollections = hasCurrentUserPrincipalAndCollections
-	},
-	showSettingsForAccount(state, accountId) {
-		state.showAccountSettings = accountId
-	},
-}
diff --git a/src/store/outboxStore.js b/src/store/outboxStore.js
index 432ac55291..84500cdf7c 100644
--- a/src/store/outboxStore.js
+++ b/src/store/outboxStore.js
@@ -12,13 +12,14 @@ import { showError, showSuccess, showUndo } from '@nextcloud/dialogs'
 import { translate as t } from '@nextcloud/l10n'
 import { html, plain } from '../util/text.js'
 import { UNDO_DELAY } from './constants.js'
-import store from './index.js'
+import useMainStore from './mainStore.js'
 
 export default defineStore('outbox', {
 	state: () => {
 		return {
 			messageList: [],
 			messages: {},
+			mainStore: useMainStore(),
 		}
 	},
 	getters: {
@@ -94,7 +95,7 @@ export default defineStore('outbox', {
 			this.addMessageMutation({ message })
 
 			// Future drafts/sends after an error should go through outbox logic
-			store.commit('convertComposerMessageToOutbox', { message }, {
+			this.mainStore.convertComposerMessageToOutboxMutation({ message }, {
 				root: true,
 			})
 
@@ -107,7 +108,7 @@ export default defineStore('outbox', {
 			this.addMessageMutation({ message })
 
 			// Future drafts/sends after an error should go through outbox logic
-			store.commit('convertComposerMessageToOutbox', { message }, {
+			this.mainStore.convertComposerMessageToOutboxMutation({ message }, {
 				root: true,
 			})
 
@@ -183,7 +184,7 @@ export default defineStore('outbox', {
 						logger.info('Attempting to stop sending message ' + message.id)
 						const stopped = await this.stopMessage({ message })
 						logger.info('Message ' + message.id + ' stopped', { message: stopped })
-						await store.dispatch('startComposerSession', {
+						await this.mainStore.startComposerSession({
 							type: 'outbox',
 							data: {
 								...message,
diff --git a/src/tests/unit/App.spec.js b/src/tests/unit/App.spec.js
index 07b1731fd7..17a74f8acb 100644
--- a/src/tests/unit/App.spec.js
+++ b/src/tests/unit/App.spec.js
@@ -7,30 +7,24 @@ import { createLocalVue, shallowMount } from '@vue/test-utils'
 
 import App from '../../App.vue'
 import Nextcloud from '../../mixins/Nextcloud.js'
-import Vuex from 'vuex'
+import { createPinia, setActivePinia } from 'pinia'
+import useMainStore from '../../store/mainStore.js'
 
 const localVue = createLocalVue()
-localVue.use(Vuex)
 localVue.mixin(Nextcloud)
 
 jest.mock('../../service/AutoConfigService.js')
 
 describe('App', () => {
 
-	let state
-	let getters
 	let store
 	let view
 
 	beforeEach(() => {
-		state = { isExpiredSession: false };
-		getters = {
-			isExpiredSession: (state) => state.isExpiredSession,
-		}
-		store = new Vuex.Store({
-			getters,
-			state,
-		})
+		setActivePinia(createPinia())
+
+		store = useMainStore()
+		store.isExpiredSession = false
 
 		view = shallowMount(App, {
 			store,
@@ -43,7 +37,7 @@ describe('App', () => {
 		view.vm.reload = jest.fn()
 
 		expect(view.vm.isExpiredSession).toBe(false)
-		state.isExpiredSession = true
+		store.isExpiredSession = true
 		expect(view.vm.isExpiredSession).toBe(true)
 	})
 
diff --git a/src/tests/unit/components/AccountForm.vue.spec.js b/src/tests/unit/components/AccountForm.vue.spec.js
index 4426df9666..376ed20525 100644
--- a/src/tests/unit/components/AccountForm.vue.spec.js
+++ b/src/tests/unit/components/AccountForm.vue.spec.js
@@ -3,35 +3,33 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
-import { testConnectivity, queryIspdb, queryMx } from '../../../service/AutoConfigService'
-import {createLocalVue, shallowMount} from '@vue/test-utils'
-import Vuex from 'vuex'
+import { testConnectivity, queryIspdb, queryMx } from '../../../service/AutoConfigService.js'
+import { createLocalVue, shallowMount } from '@vue/test-utils'
+import { createPinia, PiniaVuePlugin } from 'pinia'
+
+import useMainStore from '../../../store/mainStore.js'
 
 import AccountForm from '../../../components/AccountForm.vue'
 import Nextcloud from '../../../mixins/Nextcloud.js'
 
 const localVue = createLocalVue()
 
-localVue.use(Vuex)
 localVue.mixin(Nextcloud)
+localVue.use(PiniaVuePlugin)
+const pinia = createPinia()
+
 
 jest.mock('../../../service/AutoConfigService.js')
 
 describe('AccountForm', () => {
 
 	let save
-	let getters
 	let store
 	let view
 
 	beforeEach(() => {
 		save = jest.fn()
-		getters = {
-			googleOauthUrl: () => () => 'https://google.oauth',
-		}
-		store = new Vuex.Store({
-			getters,
-		})
+
 		view = shallowMount(AccountForm, {
 			propsData: {
 				displayName: 'Tom Turbo',
@@ -39,8 +37,12 @@ describe('AccountForm', () => {
 				save,
 			},
 			localVue,
+			pinia,
 			store,
 		})
+
+		store = useMainStore()
+		store.googleOauthUrl = 'https://google.oauth'
 	})
 
 	it('uses name and email from nextcloud account', () => {
diff --git a/src/tests/unit/components/Composer.vue.spec.js b/src/tests/unit/components/Composer.vue.spec.js
index 30b37477fe..0b27db7b0a 100644
--- a/src/tests/unit/components/Composer.vue.spec.js
+++ b/src/tests/unit/components/Composer.vue.spec.js
@@ -4,46 +4,38 @@
  */
 
 import {createLocalVue, shallowMount} from '@vue/test-utils'
-import Vuex from 'vuex'
 
 import Composer from '../../../components/Composer.vue'
 import Nextcloud from '../../../mixins/Nextcloud.js'
+import { createPinia, PiniaVuePlugin } from 'pinia'
+
+import useMainStore from '../../../store/mainStore.js'
 
 const localVue = createLocalVue()
 
-localVue.use(Vuex)
 localVue.mixin(Nextcloud)
+localVue.use(PiniaVuePlugin)
+const pinia = createPinia()
 
 describe('Composer', () => {
 
-	let actions
-	let getters
 	let store
 
 	beforeEach(() => {
-		Object.defineProperty(window, "firstDay", {
+		Object.defineProperty(window, 'firstDay', {
 			value: 0,
 		})
 
-		actions = {}
-		getters = {
-			accounts: () => [
-				{
-					id: 123,
-					editorMode: 'plaintext',
-					isUnified: false,
-					aliases: [],
-				},
-			],
-			getPreference: () => (key, fallback) => fallback,
-			getAccount: () => ({}),
-			isScheduledSendingDisabled: () => false,
-			getSmimeCertificates: () => [],
-		}
-		store = new Vuex.Store({
-			actions,
-			getters,
+		shallowMount(Composer, {
+			propsData: {
+				isFirstOpen: true,
+				accounts: [],
+			},
+			localVue,
+			pinia,
+			store,
 		})
+		store = useMainStore()
 	})
 
 	it('does not drop the reply message ID', () => {
diff --git a/src/tests/unit/components/ConfirmationModal.vue.spec.js b/src/tests/unit/components/ConfirmationModal.vue.spec.js
index ba90455146..7a77fae082 100644
--- a/src/tests/unit/components/ConfirmationModal.vue.spec.js
+++ b/src/tests/unit/components/ConfirmationModal.vue.spec.js
@@ -4,14 +4,12 @@
  */
 
 import {createLocalVue, shallowMount} from '@vue/test-utils'
-import Vuex from 'vuex'
 
 import ConfirmationModal from '../../../components/ConfirmationModal.vue'
 import Nextcloud from '../../../mixins/Nextcloud.js'
 
 const localVue = createLocalVue()
 
-localVue.use(Vuex)
 localVue.mixin(Nextcloud)
 
 describe('ConfirmationModal', () => {
diff --git a/src/tests/unit/components/Envelope.vue.spec.js b/src/tests/unit/components/Envelope.vue.spec.js
index 9dd9afb0e8..add2432bcf 100644
--- a/src/tests/unit/components/Envelope.vue.spec.js
+++ b/src/tests/unit/components/Envelope.vue.spec.js
@@ -3,11 +3,13 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
-import {createLocalVue, shallowMount} from '@vue/test-utils'
+import { createLocalVue, shallowMount } from '@vue/test-utils'
+import { createPinia, setActivePinia } from 'pinia'
 
 import Nextcloud from '../../../mixins/Nextcloud.js'
 import Envelope from '../../../components/Envelope.vue'
-import Vuex from 'vuex';
+
+import useMainStore from '../../../store/mainStore.js'
 
 const localVue = createLocalVue()
 const $route = {
@@ -16,31 +18,19 @@ const $route = {
 	},
 }
 
-localVue.use(Vuex)
+const pinia = createPinia()
+
 localVue.mixin(Nextcloud)
 
 describe('Envelope', () => {
-	let actions
-	let getters
 	let store
 
 	beforeEach(() => {
-		actions = {}
-		getters = {
-			accounts: () => [
-				{
-					id: 123,
-				},
-			],
-			getAccount: () => (id) => ({}),
-			getEnvelopeTags: () => (id) => ([]),
-			getMailbox: () => (id) => ({}),
-			getPreference: () => (key, defaultValue) => defaultValue,
-		}
-		store = new Vuex.Store({
-			actions,
-			getters,
-		})
+		setActivePinia(createPinia())
+
+		store = useMainStore()
+
+		store.accountsUnmapped[123] = { sentMailboxId: '1' }
 	})
 	it('allows toggling seen flag without ACLs', () => {
 		const view = shallowMount(Envelope, {
@@ -50,14 +40,14 @@ describe('Envelope', () => {
 			propsData: {
 				data: {
 					accountId: 123,
-					from: [{email:'info@test.com'}],
-					flags: { seen:false, flagged:false, $junk:false, answered:false, hasAttachments:false, draft:false },
+					from: [{ email: 'info@test.com' }],
+					flags: { seen: false, flagged: false, $junk: false, answered: false, hasAttachments: false, draft: false },
 				},
-				account: {sentMailboxId:'1'},
+				account: { sentMailboxId: '1' },
 				mailbox: {
 					myAcls: undefined,
-					databaseId:'3',
-					specialRole:'',
+					databaseId: '3',
+					specialRole: '',
 				},
 			},
 			store,
@@ -68,24 +58,25 @@ describe('Envelope', () => {
 	})
 
 	it('disallows toggling seen flag without s ACL right', () => {
+
 		const view = shallowMount(Envelope, {
 			mocks: {
 				$route,
 			},
 			propsData: {
-				account: {sentMailboxId:'1'},
 				mailbox: {
-					specialRole:'',
-					databaseId:'3',
+					specialRole: '',
+					databaseId: '3',
 					myAcls: 'x',
 				},
 				data: {
 					accountId: 123,
-					from: [{email:'info@test.com'}],
-					flags: { seen:false, flagged:false, $junk:false, answered:false, hasAttachments:false, draft:false },
+					from: [{ email: 'info@test.com' }],
+					flags: { seen: false, flagged: false, $junk: false, answered: false, hasAttachments: false, draft: false },
 				},
 			},
 			store,
+			pinia,
 			localVue,
 		})
 
@@ -98,16 +89,15 @@ describe('Envelope', () => {
 				$route,
 			},
 			propsData: {
-				account: {sentMailboxId:'1'},
 				mailbox: {
-					specialRole:'',
-					databaseId:'3',
+					specialRole: '',
+					databaseId: '3',
 					myAcls: 's',
 				},
 				data: {
 					accountId: 123,
-					from: [{email:'info@test.com'}],
-					flags: { seen:false, flagged:false, $junk:false, answered:false, hasAttachments:false, draft:false },
+					from: [{ email: 'info@test.com' }],
+					flags: { seen: false, flagged: false, $junk: false, answered: false, hasAttachments: false, draft: false },
 				},
 			},
 			store,
@@ -122,16 +112,15 @@ describe('Envelope', () => {
 				$route,
 			},
 			propsData: {
-				account: {sentMailboxId:'1'},
 				mailbox: {
-					specialRole:'',
-					databaseId:'3',
+					specialRole: '',
+					databaseId: '3',
 					myAcls: undefined,
 				},
 				data: {
 					accountId: 123,
-					from: [{email:'info@test.com'}],
-					flags: { seen:false, flagged:false, $junk:false, answered:false, hasAttachments:false, draft:false },
+					from: [{ email: 'info@test.com' }],
+					flags: { seen: false, flagged: false, $junk: false, answered: false, hasAttachments: false, draft: false },
 				},
 			},
 			computed: {
@@ -152,16 +141,15 @@ describe('Envelope', () => {
 				$route,
 			},
 			propsData: {
-				account: {sentMailboxId:'1'},
 				mailbox: {
-					specialRole:'',
-					databaseId:'3',
+					specialRole: '',
+					databaseId: '3',
 					myAcls: 'te',
 				},
 				data: {
 					accountId: 123,
-					from: [{email:'info@test.com'}],
-					flags: { seen:false, flagged:false, $junk:false, answered:false, hasAttachments:false, draft:false },
+					from: [{ email: 'info@test.com' }],
+					flags: { seen: false, flagged: false, $junk: false, answered: false, hasAttachments: false, draft: false },
 				},
 			},
 			computed: {
@@ -182,16 +170,15 @@ describe('Envelope', () => {
 				$route,
 			},
 			propsData: {
-				account: {sentMailboxId:'1'},
 				mailbox: {
-					specialRole:'',
-					databaseId:'3',
+					specialRole: '',
+					databaseId: '3',
 					myAcls: 'te',
 				},
 				data: {
 					accountId: 123,
-					from: [{email:'info@test.com'}],
-					flags: { seen:false, flagged:false, $junk:false, answered:false, hasAttachments:false, draft:false },
+					from: [{ email: 'info@test.com' }],
+					flags: { seen: false, flagged: false, $junk: false, answered: false, hasAttachments: false, draft: false },
 				},
 			},
 			computed: {
@@ -212,16 +199,15 @@ describe('Envelope', () => {
 				$route,
 			},
 			propsData: {
-				account: {sentMailboxId:'1'},
 				mailbox: {
-					specialRole:'',
-					databaseId:'3',
+					specialRole: '',
+					databaseId: '3',
 					myAcls: undefined,
 				},
 				data: {
 					accountId: 123,
-					from: [{email:'info@test.com'}],
-					flags: { seen:false, flagged:false, $junk:false, answered:false, hasAttachments:false, draft:false },
+					from: [{ email: 'info@test.com' }],
+					flags: { seen: false, flagged: false, $junk: false, answered: false, hasAttachments: false, draft: false },
 				},
 			},
 			computed: {
@@ -242,16 +228,15 @@ describe('Envelope', () => {
 				$route,
 			},
 			propsData: {
-				account: {sentMailboxId:'1'},
 				mailbox: {
-					specialRole:'',
-					databaseId:'3',
+					specialRole: '',
+					databaseId: '3',
 					myAcls: 'x',
 				},
 				data: {
 					accountId: 123,
-					from: [{email:'info@test.com'}],
-					flags: { seen:false, flagged:false, $junk:false, answered:false, hasAttachments:false, draft:false },
+					from: [{ email: 'info@test.com' }],
+					flags: { seen: false, flagged: false, $junk: false, answered: false, hasAttachments: false, draft: false },
 				},
 			},
 			store,
@@ -261,23 +246,21 @@ describe('Envelope', () => {
 		expect(view.vm.hasArchiveAcl).toBe(false)
 	})
 
-
 	it('allows toggling delete action without ACLs', () => {
 		const view = shallowMount(Envelope, {
 			mocks: {
 				$route,
 			},
 			propsData: {
-				account: {sentMailboxId:'1'},
 				mailbox: {
-					specialRole:'',
-					databaseId:'3',
+					specialRole: '',
+					databaseId: '3',
 					myAcls: undefined,
 				},
 				data: {
 					accountId: 123,
-					from: [{email:'info@test.com'}],
-					flags: { seen:false, flagged:false, $junk:false, answered:false, hasAttachments:false, draft:false },
+					from: [{ email: 'info@test.com' }],
+					flags: { seen: false, flagged: false, $junk: false, answered: false, hasAttachments: false, draft: false },
 
 				},
 			},
@@ -293,16 +276,15 @@ describe('Envelope', () => {
 				$route,
 			},
 			propsData: {
-				account: {sentMailboxId:'1'},
 				mailbox: {
-					specialRole:'',
-					databaseId:'3',
+					specialRole: '',
+					databaseId: '3',
 					myAcls: 's',
 				},
 				data: {
 					accountId: 123,
-					from: [{email:'info@test.com'}],
-					flags: { seen:false, flagged:false, $junk:false, answered:false, hasAttachments:false, draft:false },
+					from: [{ email: 'info@test.com' }],
+					flags: { seen: false, flagged: false, $junk: false, answered: false, hasAttachments: false, draft: false },
 
 				},
 			},
@@ -318,16 +300,15 @@ describe('Envelope', () => {
 				$route,
 			},
 			propsData: {
-				account: {sentMailboxId:'1'},
 				mailbox: {
-					specialRole:'',
-					databaseId:'3',
-					sentMailboxId:'1',
+					specialRole: '',
+					databaseId: '3',
+					sentMailboxId: '1',
 				},
 				data: {
 					accountId: 123,
-					from: [{email:'info@test.com'}],
-					flags: { seen:false, flagged:false, $junk:false, answered:false, hasAttachments:false, draft:false },
+					from: [{ email: 'info@test.com' }],
+					flags: { seen: false, flagged: false, $junk: false, answered: false, hasAttachments: false, draft: false },
 				},
 			},
 			store,
@@ -342,16 +323,15 @@ describe('Envelope', () => {
 				$route,
 			},
 			propsData: {
-				account: {sentMailboxId:'1'},
 				mailbox: {
-					specialRole:'',
-					databaseId:'3',
+					specialRole: '',
+					databaseId: '3',
 					myAcls: 'w',
 				},
 				data: {
 					accountId: 123,
-					from: [{email:'info@test.com'}],
-					flags: { seen:false, flagged:false, $junk:false, answered:false, hasAttachments:false, draft:false },
+					from: [{ email: 'info@test.com' }],
+					flags: { seen: false, flagged: false, $junk: false, answered: false, hasAttachments: false, draft: false },
 				},
 			},
 			store,
@@ -366,16 +346,15 @@ describe('Envelope', () => {
 				$route,
 			},
 			propsData: {
-				account: {sentMailboxId:'1'},
 				mailbox: {
-					specialRole:'',
-					databaseId:'3',
+					specialRole: '',
+					databaseId: '3',
 					myAcls: 's',
 				},
 				data: {
 					accountId: 123,
-					from: [{email:'info@test.com'}],
-					flags: { seen:false, flagged:false, $junk:false, answered:false, hasAttachments:false, draft:false },
+					from: [{ email: 'info@test.com' }],
+					flags: { seen: false, flagged: false, $junk: false, answered: false, hasAttachments: false, draft: false },
 				},
 			},
 			store,
@@ -390,16 +369,15 @@ describe('Envelope', () => {
 				$route,
 			},
 			propsData: {
-				account: {sentMailboxId:'1'},
 				mailbox: {
-					specialRole:'',
-					databaseId:'3',
+					specialRole: '',
+					databaseId: '3',
 					myAcls: undefined,
 				},
 				data: {
 					accountId: 123,
-					from: [{email:'info@test.com'}],
-					flags: { seen:false, flagged:false, $junk:false, answered:false, hasAttachments:false, draft:false },
+					from: [{ email: 'info@test.com' }],
+					flags: { seen: false, flagged: false, $junk: false, answered: false, hasAttachments: false, draft: false },
 				},
 			},
 			store,
diff --git a/src/tests/unit/components/EventModal.vue.spec.js b/src/tests/unit/components/EventModal.vue.spec.js
index 326aecbcdd..156f1bbc56 100644
--- a/src/tests/unit/components/EventModal.vue.spec.js
+++ b/src/tests/unit/components/EventModal.vue.spec.js
@@ -4,7 +4,6 @@
  */
 
 import { createLocalVue, shallowMount } from '@vue/test-utils'
-import { loadState } from '@nextcloud/initial-state'
 
 import Nextcloud from '../../../mixins/Nextcloud.js'
 import EventModal from '../../../components/EventModal.vue'
diff --git a/src/tests/unit/components/NavigationMailbox.vue.spec.js b/src/tests/unit/components/NavigationMailbox.vue.spec.js
index b152b0ec25..b6b1545ff4 100644
--- a/src/tests/unit/components/NavigationMailbox.vue.spec.js
+++ b/src/tests/unit/components/NavigationMailbox.vue.spec.js
@@ -4,34 +4,29 @@
  */
 
 import {createLocalVue, shallowMount} from '@vue/test-utils'
-import Vuex from 'vuex'
+import { PiniaVuePlugin, setActivePinia } from 'pinia'
+import { createTestingPinia } from '@pinia/testing'
 
 import NavigationMailbox from '../../../components/NavigationMailbox.vue'
 import Nextcloud from '../../../mixins/Nextcloud.js'
 
+import useMainStore from '../../../store/mainStore.js'
+
 const localVue = createLocalVue()
+localVue.use(PiniaVuePlugin)
 
-localVue.use(Vuex)
 localVue.mixin(Nextcloud)
 
 describe('NavigationMailbox', () => {
 
-	let actions
-	let getters
+	const subMailboxes = []
 	let store
-	let parentMailbox = undefined
-	let subMailboxes = []
 
 	beforeEach(() => {
-		actions = {}
-		getters = {
-			getSubMailboxes: () => () => subMailboxes,
-			getParentMailbox: () => (id) => parentMailbox,
-		}
-		store = new Vuex.Store({
-			actions,
-			getters,
-		})
+		setActivePinia(createTestingPinia())
+		store = useMainStore()
+
+		store.getSubMailboxes = jest.fn().mockReturnValue([])
 	})
 
 	it('shows no counter', () => {
@@ -42,7 +37,6 @@ describe('NavigationMailbox', () => {
 					unread: 0,
 				},
 			},
-			store,
 			localVue,
 		})
 
@@ -61,7 +55,6 @@ describe('NavigationMailbox', () => {
 					unread: 3,
 				},
 			},
-			store,
 			localVue,
 		})
 
@@ -79,6 +72,7 @@ describe('NavigationMailbox', () => {
 		subMailboxes.push({
 			unread: 0,
 		})
+		store.getSubMailboxes = jest.fn().mockReturnValue(subMailboxes)
 		const view = shallowMount(NavigationMailbox, {
 			propsData: {
 				account: {},
@@ -86,7 +80,6 @@ describe('NavigationMailbox', () => {
 					unread: 0,
 				},
 			},
-			store,
 			localVue,
 		})
 
@@ -102,7 +95,6 @@ describe('NavigationMailbox', () => {
 					myAcls: undefined,
 				},
 			},
-			store,
 			localVue,
 		})
 
@@ -110,9 +102,9 @@ describe('NavigationMailbox', () => {
 	})
 
 	it('allows rename with missing ACLs on parent', () => {
-		parentMailbox = {
+		store.getParentMailbox = jest.fn().mockReturnValue({
 			myAcls: undefined,
-		}
+		})
 		const view = shallowMount(NavigationMailbox, {
 			propsData: {
 				account: {},
@@ -120,7 +112,6 @@ describe('NavigationMailbox', () => {
 					myAcls: 'x',
 				},
 			},
-			store,
 			localVue,
 		})
 
@@ -135,7 +126,6 @@ describe('NavigationMailbox', () => {
 					myAcls: 'x',
 				},
 			},
-			store,
 			localVue,
 		})
 
@@ -150,7 +140,6 @@ describe('NavigationMailbox', () => {
 					myAcls: 's',
 				},
 			},
-			store,
 			localVue,
 		})
 
@@ -158,9 +147,10 @@ describe('NavigationMailbox', () => {
 	})
 
 	it('disallows rename without k ACL right on parent', () => {
-		parentMailbox = {
+		store.getParentMailbox = jest.fn().mockReturnValue({
 			myAcls: 'x',
-		}
+		})
+
 		const view = shallowMount(NavigationMailbox, {
 			propsData: {
 				account: {},
@@ -168,7 +158,6 @@ describe('NavigationMailbox', () => {
 					myAcls: 'x',
 				},
 			},
-			store,
 			localVue,
 		})
 
@@ -176,9 +165,6 @@ describe('NavigationMailbox', () => {
 	})
 
 	it('allows rename with k ACL right on parent', () => {
-		parentMailbox = {
-			myAcls: 'k',
-		}
 		const view = shallowMount(NavigationMailbox, {
 			propsData: {
 				account: {},
@@ -186,7 +172,6 @@ describe('NavigationMailbox', () => {
 					myAcls: 'x',
 				},
 			},
-			store,
 			localVue,
 		})
 
@@ -201,7 +186,6 @@ describe('NavigationMailbox', () => {
 					myAcls: undefined,
 				},
 			},
-			store,
 			localVue,
 		})
 
@@ -216,7 +200,6 @@ describe('NavigationMailbox', () => {
 					myAcls: 'x',
 				},
 			},
-			store,
 			localVue,
 		})
 
@@ -231,7 +214,6 @@ describe('NavigationMailbox', () => {
 					myAcls: 's',
 				},
 			},
-			store,
 			localVue,
 		})
 
@@ -245,7 +227,6 @@ describe('NavigationMailbox', () => {
 					myAcls: undefined,
 				},
 			},
-			store,
 			localVue,
 		})
 
@@ -259,7 +240,6 @@ describe('NavigationMailbox', () => {
 					myAcls: 'x',
 				},
 			},
-			store,
 			localVue,
 		})
 
@@ -273,7 +253,6 @@ describe('NavigationMailbox', () => {
 					myAcls: 'k',
 				},
 			},
-			store,
 			localVue,
 		})
 
@@ -289,7 +268,6 @@ describe('NavigationMailbox', () => {
 					myAcls: undefined,
 				},
 			},
-			store,
 			localVue,
 		})
 
@@ -303,7 +281,6 @@ describe('NavigationMailbox', () => {
 					myAcls: 's',
 				},
 			},
-			store,
 			localVue,
 		})
 
@@ -317,7 +294,6 @@ describe('NavigationMailbox', () => {
 					myAcls: 'x',
 				},
 			},
-			store,
 			localVue,
 		})
 
diff --git a/src/tests/unit/components/PickerPlugin.vue.spec.js b/src/tests/unit/components/PickerPlugin.vue.spec.js
index eba7539045..67dc771825 100644
--- a/src/tests/unit/components/PickerPlugin.vue.spec.js
+++ b/src/tests/unit/components/PickerPlugin.vue.spec.js
@@ -7,29 +7,27 @@ import VirtualTestEditor from '../../virtualtesteditor.js'
 import ParagraphPlugin from '@ckeditor/ckeditor5-paragraph/src/paragraph'
 import PickerPlugin from '../../../ckeditor/smartpicker/PickerPlugin.js'
 
-
 describe('PickerPlugin', () => {
 
-		it('Insert an item and remove trigger symbol', async() => {
-			const text = '<p>Hello /</p>'
-			const expected = '<p>Hello I am a link</p>'
-
-			const editor = await VirtualTestEditor.create({
-				initialData: text,
-				plugins: [ParagraphPlugin, PickerPlugin],
-			})
-
-			editor.model.change(writer => {
-				writer.setSelection(editor.model.document.getRoot(), 'end')
-			})
+	it('Insert an item and remove trigger symbol', async () => {
+		const text = '<p>Hello /</p>'
+		const expected = '<p>Hello I am a link</p>'
 
-			editor.execute('insertItem',
-				'I am a link',
-				'/',
-			)
+		const editor = await VirtualTestEditor.create({
+			initialData: text,
+			plugins: [ParagraphPlugin, PickerPlugin],
+		})
 
-			expect(editor.getData()).toEqual(expected)
+		editor.model.change(writer => {
+			writer.setSelection(editor.model.document.getRoot(), 'end')
 		})
 
+		editor.execute('insertItem',
+			'I am a link',
+			'/',
+		)
+
+		expect(editor.getData()).toEqual(expected)
+	})
 
 })
diff --git a/src/tests/unit/components/SignatureSettings.vue.spec.js b/src/tests/unit/components/SignatureSettings.vue.spec.js
index 17a2d8f10a..80aa8cfd92 100644
--- a/src/tests/unit/components/SignatureSettings.vue.spec.js
+++ b/src/tests/unit/components/SignatureSettings.vue.spec.js
@@ -4,13 +4,11 @@
  */
 
 import {createLocalVue, shallowMount} from '@vue/test-utils'
-import Vuex from 'vuex'
 import Nextcloud from '../../../mixins/Nextcloud.js'
 import SignatureSettings from '../../../components/SignatureSettings.vue'
 
 const localVue = createLocalVue()
 
-localVue.use(Vuex)
 localVue.mixin(Nextcloud)
 
 describe('SignatureSettings', () => {
diff --git a/src/tests/unit/components/TextEditor.spec.js b/src/tests/unit/components/TextEditor.spec.js
index 980d47b3d8..e574f1a9b4 100644
--- a/src/tests/unit/components/TextEditor.spec.js
+++ b/src/tests/unit/components/TextEditor.spec.js
@@ -4,7 +4,6 @@
  */
 
 import {createLocalVue, shallowMount} from '@vue/test-utils'
-import Vuex from 'vuex'
 import mitt from 'mitt'
 
 import Nextcloud from '../../../mixins/Nextcloud.js'
@@ -15,7 +14,6 @@ import MailPlugin from '../../../ckeditor/mail/MailPlugin.js'
 
 const localVue = createLocalVue()
 
-localVue.use(Vuex)
 localVue.mixin(Nextcloud)
 
 describe('TextEditor', () => {
diff --git a/src/tests/unit/components/Thread.vue.spec.js b/src/tests/unit/components/Thread.vue.spec.js
index 3ad00e29ef..69b829b8d1 100644
--- a/src/tests/unit/components/Thread.vue.spec.js
+++ b/src/tests/unit/components/Thread.vue.spec.js
@@ -3,224 +3,218 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
-import {createLocalVue, shallowMount} from '@vue/test-utils'
+import { createLocalVue, shallowMount } from '@vue/test-utils'
 
 import Nextcloud from '../../../mixins/Nextcloud.js'
 import Thread from '../../../components/Thread.vue'
-import Vuex from 'vuex'
+import { createPinia, setActivePinia } from 'pinia'
+
+import useMainStore from '../../../store/mainStore.js'
 
 const localVue = createLocalVue()
 
-localVue.use(Vuex)
 localVue.mixin(Nextcloud)
 
 describe('Thread', () => {
-	let actions
-	let getters
 	let store
 
 	beforeEach(() => {
-		actions = {
-			fetchThread: () => {
-				return []
-			},
-		},
-		getters = {
-			getEnvelope: () => (id) => {
-				if (id === 200) {
-					return {
+		setActivePinia(createPinia())
+
+		store = useMainStore()
+		store.getEnvelope = jest.fn().mockImplementation((id) => {
+			if (id === 200) {
+				return {
+					accountId: 100,
+					threadRootId: '123-456-789',
+					mailboxId: 10,
+				}
+			}
+			if (id === 300) {
+				return {
+					accountId: 200,
+					threadRootId: '456-789-123',
+					mailboxId: 20,
+				}
+			}
+			if (id === 301) {
+				return {
+					accountId: 200,
+					threadRootId: '456-789-123',
+					mailboxId: 22,
+				}
+			}
+			if (id === 302) {
+				return {
+					accountId: 200,
+					threadRootId: '456-789-123',
+					mailboxId: 23,
+				}
+			}
+			return undefined
+		})
+
+		store.getEnvelopesByThreadRootId = jest.fn().mockImplementation((accountId, threadRootId) => {
+			if (threadRootId === '123-456-789') {
+				return [
+					{
 						accountId: 100,
 						threadRootId: '123-456-789',
 						mailboxId: 10,
-					}
-				}
-				if (id === 300) {
-					return {
+						databaseId: 1001,
+						from: [],
+						to: [],
+						cc: [],
+					},
+					{
+						accountId: 100,
+						threadRootId: '123-456-789',
+						mailboxId: 11,
+						databaseId: 1002,
+						from: [],
+						to: [],
+						cc: [],
+					},
+					{
+						accountId: 100,
+						threadRootId: '123-456-789',
+						mailboxId: 10,
+						databaseId: 1003,
+						from: [],
+						to: [],
+						cc: [],
+					},
+				]
+			}
+			if (threadRootId === '456-789-123') {
+				return [
+					{
 						accountId: 200,
 						threadRootId: '456-789-123',
 						mailboxId: 20,
-					}
-				}
-				if (id === 301) {
-					return {
+						databaseId: 2001,
+						from: [],
+						to: [],
+						cc: [],
+					},
+					{
+						accountId: 200,
+						threadRootId: '456-789-123',
+						mailboxId: 21,
+						databaseId: 2002,
+						from: [],
+						to: [],
+						cc: [],
+					},
+					{
+						accountId: 200,
+						threadRootId: '456-789-123',
+						mailboxId: 20,
+						databaseId: 2003,
+						from: [],
+						to: [],
+						cc: [],
+					},
+					{
 						accountId: 200,
 						threadRootId: '456-789-123',
 						mailboxId: 22,
-					}
-				}
-				if (id === 302) {
-					return {
+						databaseId: 2004,
+						from: [],
+						to: [],
+						cc: [],
+					},
+					{
 						accountId: 200,
 						threadRootId: '456-789-123',
 						mailboxId: 23,
-					}
+						databaseId: 2005,
+						from: [],
+						to: [],
+						cc: [],
+					},
+				]
+			}
+			return []
+
+		})
+
+		store.getMailbox = jest.fn().mockImplementation((id) => {
+			if (id === 10) {
+				return {
+					databaseId: 10,
+					name: 'INBOX',
+					accountId: 100,
+					specialRole: 'inbox',
 				}
-				return undefined
-			},
-			getEnvelopesByThreadRootId: () => (accountId, threadRootId) => {
-				if (threadRootId === '123-456-789') {
-					return [
-						{
-							accountId: 100,
-							threadRootId: '123-456-789',
-							mailboxId: 10,
-							databaseId: 1001,
-							from: [],
-							to: [],
-							cc: [],
-						},
-						{
-							accountId: 100,
-							threadRootId: '123-456-789',
-							mailboxId: 11,
-							databaseId: 1002,
-							from: [],
-							to: [],
-							cc: [],
-						},
-						{
-							accountId: 100,
-							threadRootId: '123-456-789',
-							mailboxId: 10,
-							databaseId: 1003,
-							from: [],
-							to: [],
-							cc: [],
-						},
-					]
+			}
+			if (id === 20) {
+				return {
+					databaseId: 20,
+					name: 'INBOX',
+					accountId: 200,
+					specialRole: 'inbox',
+				}
+			}
+			if (id === 22) {
+				return {
+					databaseId: 22,
+					name: 'Trash',
+					accountId: 200,
+					specialRole: 'trash',
 				}
-				if (threadRootId === '456-789-123') {
-					return [
-						{
-							accountId: 200,
-							threadRootId: '456-789-123',
-							mailboxId: 20,
-							databaseId: 2001,
-							from: [],
-							to: [],
-							cc: [],
-						},
-						{
-							accountId: 200,
-							threadRootId: '456-789-123',
-							mailboxId: 21,
-							databaseId: 2002,
-							from: [],
-							to: [],
-							cc: [],
-						},
-						{
-							accountId: 200,
-							threadRootId: '456-789-123',
-							mailboxId: 20,
-							databaseId: 2003,
-							from: [],
-							to: [],
-							cc: [],
-						},
-						{
-							accountId: 200,
-							threadRootId: '456-789-123',
-							mailboxId: 22,
-							databaseId: 2004,
-							from: [],
-							to: [],
-							cc: [],
-						},
-						{
-							accountId: 200,
-							threadRootId: '456-789-123',
-							mailboxId: 23,
-							databaseId: 2005,
-							from: [],
-							to: [],
-							cc: [],
-						},
-					]
+			}
+			if (id === 23) {
+				return {
+					databaseId: 23,
+					name: 'Junk',
+					accountId: 200,
+					specialRole: 'junk',
 				}
-				return []
+			}
+			return undefined
+		})
 
-			},
-			getMailbox: () => (id) => {
-				if (id === 10) {
-					return {
+		store.getMailboxes = jest.fn().mockImplementation((accountId) => {
+			if (accountId === 100) {
+				return [
+					{
 						databaseId: 10,
 						name: 'INBOX',
-						accountId: 100,
 						specialRole: 'inbox',
-					}
-				}
-				if (id === 20) {
-					return {
+					},
+					{
+						databaseId: 11,
+						name: 'Test',
+						specialRole: '',
+					},
+				]
+			}
+			if (accountId === 200) {
+				return [
+					{
 						databaseId: 20,
 						name: 'INBOX',
-						accountId: 200,
 						specialRole: 'inbox',
-					}
-				}
-				if (id === 22) {
-					return {
+					},
+					{
+						databaseId: 21,
+						name: 'Test',
+						specialRole: '',
+					},
+					{
 						databaseId: 22,
 						name: 'Trash',
-						accountId: 200,
 						specialRole: 'trash',
-					}
-				}
-				if (id === 23) {
-					return {
+					},
+					{
 						databaseId: 23,
 						name: 'Junk',
-						accountId: 200,
 						specialRole: 'junk',
-					}
-				}
-				return undefined
-			},
-			getMailboxes: () => (accountId) => {
-				if (accountId === 100) {
-					return [
-						{
-							databaseId: 10,
-							name: 'INBOX',
-							specialRole: 'inbox',
-						},
-						{
-							databaseId: 11,
-							name: 'Test',
-							specialRole: '',
-						},
-					]
-				}
-				if (accountId === 200) {
-					return [
-						{
-							databaseId: 20,
-							name: 'INBOX',
-							specialRole: 'inbox',
-						},
-						{
-							databaseId: 21,
-							name: 'Test',
-							specialRole: '',
-						},
-						{
-							databaseId: 22,
-							name: 'Trash',
-							specialRole: 'trash',
-						},
-						{
-							databaseId: 23,
-							name: 'Junk',
-							specialRole: 'junk',
-						},
-					]
-				}
-				return []
-			},
-		}
-		store = new Vuex.Store({
-			actions,
-			getters,
+					},
+				]
+			}
+			return []
 		})
 	})
 
@@ -285,7 +279,7 @@ describe('Thread', () => {
 			localVue,
 		})
 
-		const envelopes = view.vm.thread;
+		const envelopes = view.vm.thread
 		expect(envelopes).toHaveLength(1)
 		expect(envelopes[0].mailboxId).toBe(22)
 	})
@@ -303,7 +297,7 @@ describe('Thread', () => {
 			localVue,
 		})
 
-		const envelopes = view.vm.thread;
+		const envelopes = view.vm.thread
 		expect(envelopes).toHaveLength(1)
 		expect(envelopes[0].mailboxId).toBe(23)
 	})
diff --git a/src/tests/unit/components/ThreadEnvelope.vue.spec.js b/src/tests/unit/components/ThreadEnvelope.vue.spec.js
index 41ccc0692b..6049e5cb6b 100644
--- a/src/tests/unit/components/ThreadEnvelope.vue.spec.js
+++ b/src/tests/unit/components/ThreadEnvelope.vue.spec.js
@@ -4,37 +4,19 @@
  */
 
 import {createLocalVue, shallowMount} from '@vue/test-utils'
+import { createPinia, setActivePinia } from 'pinia'
 
 import Nextcloud from '../../../mixins/Nextcloud.js'
 import ThreadEnvelope from '../../../components/ThreadEnvelope.vue'
-import Vuex from 'vuex'
 
 const localVue = createLocalVue()
 
-localVue.use(Vuex)
 localVue.mixin(Nextcloud)
 
 describe('ThreadEnvelope', () => {
-	let actions
-	let getters
-	let store
 
 	beforeEach(() => {
-		actions = {}
-		getters = {
-			accounts: () => [
-				{
-					id: 123,
-				},
-			],
-			getAccount: () => (id) => ({}),
-			getEnvelopeTags: () => (id) => ([]),
-			getMailbox: () => (id) => ({}),
-		}
-		store = new Vuex.Store({
-			actions,
-			getters,
-		})
+		setActivePinia(createPinia())
 	})
 
 	it('allows toggling seen flag without ACLs', () => {
@@ -58,7 +40,6 @@ describe('ThreadEnvelope', () => {
 					return { myAcls: undefined }
 				},
 			},
-			store,
 			localVue,
 		})
 
@@ -86,7 +67,6 @@ describe('ThreadEnvelope', () => {
 					return { myAcls: 'x' }
 				},
 			},
-			store,
 			localVue,
 		})
 
@@ -114,7 +94,6 @@ describe('ThreadEnvelope', () => {
 					return { myAcls: 's' }
 				},
 			},
-			store,
 			localVue,
 		})
 
@@ -144,7 +123,6 @@ describe('ThreadEnvelope', () => {
 					return { myAcls: undefined }
 				},
 			},
-			store,
 			localVue,
 		})
 
@@ -175,7 +153,6 @@ describe('ThreadEnvelope', () => {
 					return { myAcls: 'i' }
 				},
 			},
-			store,
 			localVue,
 		})
 
@@ -206,7 +183,6 @@ describe('ThreadEnvelope', () => {
 					return { myAcls: undefined }
 				},
 			},
-			store,
 			localVue,
 		})
 
@@ -237,7 +213,6 @@ describe('ThreadEnvelope', () => {
 					return { }
 				},
 			},
-			store,
 			localVue,
 		})
 
@@ -265,7 +240,6 @@ describe('ThreadEnvelope', () => {
 					return { myAcls: 'x' }
 				},
 			},
-			store,
 			localVue,
 		})
 
@@ -294,7 +268,6 @@ describe('ThreadEnvelope', () => {
 					return { myAcls: undefined }
 				},
 			},
-			store,
 			localVue,
 		})
 
@@ -321,7 +294,6 @@ describe('ThreadEnvelope', () => {
 					return { myAcls: 's' }
 				},
 			},
-			store,
 			localVue,
 		})
 
@@ -348,7 +320,6 @@ describe('ThreadEnvelope', () => {
 					return { myAcls: 'te' }
 				},
 			},
-			store,
 			localVue,
 		})
 
@@ -382,7 +353,6 @@ describe('ThreadEnvelope', () => {
 					return { myAcls: 'w' }
 				},
 			},
-			store,
 			localVue,
 		})
 
@@ -420,7 +390,6 @@ describe('ThreadEnvelope', () => {
 					return { }
 				},
 			},
-			store,
 			localVue,
 		})
 
@@ -457,7 +426,6 @@ describe('ThreadEnvelope', () => {
 					return { }
 				},
 			},
-			store,
 			localVue,
 		})
 
diff --git a/src/tests/unit/http/sessionExpiryHandler.spec.js b/src/tests/unit/http/sessionExpiryHandler.spec.js
index d12663c409..3f87f21b93 100644
--- a/src/tests/unit/http/sessionExpiryHandler.spec.js
+++ b/src/tests/unit/http/sessionExpiryHandler.spec.js
@@ -1,66 +1,75 @@
 /**
- * SPDX-FileCopyrightText: 2022 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-FileCopyrightText: 2022-2024 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
 import { handleHttpAuthErrors } from '../../../http/sessionExpiryHandler.js'
+import { createPinia, setActivePinia } from 'pinia'
+import useMainStore from '../../../store/mainStore.js'
 
 describe('sessionExpiryHandler', () => {
+	beforeEach(() => {
+		setActivePinia(createPinia())
+	})
+
 	it('does not influence successful requests', async () => {
-		const commit = jest.fn()
+		const mainStore = useMainStore()
+		mainStore.isExpiredSession = false
 
-		await handleHttpAuthErrors(commit, () => {})
+		await handleHttpAuthErrors(async () => {})
 
-		expect(commit).not.toHaveBeenCalled()
+		expect(mainStore.isExpiredSession).toBe(false)
 	})
 
 	it('ignores other 401s', async () => {
-		const commit = jest.fn()
-		let exception
+		const mainStore = useMainStore()
+		mainStore.isExpiredSession = false
+
+		const exception = {
+			response: {
+				status: 401,
+				data: {
+					message: 'Bonjour',
+				},
+			},
+		}
 
+		let actualException
 		try {
-			await handleHttpAuthErrors(commit, () => {
-				throw {
-					response: {
-						status: 401,
-						data: {
-							message: 'Bonjour',
-						},
-					},
-				}
+			await handleHttpAuthErrors(async () => {
+				throw exception
 			})
 		} catch (e) {
-			exception = e
+			actualException = e
 		}
 
-		// Is this our exception?
-		expect(exception.response?.status === 401)
-		expect(commit).not.toHaveBeenCalled()
+		expect(actualException).toBe(exception)
+		expect(mainStore.isExpiredSession).toBe(false)
 	})
 
 	it('handles relevant 401s', async () => {
-		const commit = jest.fn()
-		let exception
+		const mainStore = useMainStore()
+		mainStore.isExpiredSession = false
 
+		const exception = {
+			response: {
+				status: 401,
+				data: {
+					message: 'Current user is not logged in',
+				},
+			},
+		}
+
+		let actualException
 		try {
-			await handleHttpAuthErrors(commit, () => {
-				throw {
-					response: {
-						status: 401,
-						data: {
-							message: 'Current user is not logged in',
-						},
-					},
-				}
+			await handleHttpAuthErrors(() => {
+				throw exception
 			})
 		} catch (e) {
-			exception = e
+			actualException = e
 		}
 
-		// Is this our exception?
-		expect(exception.response?.status === 401)
-		expect(commit).toHaveBeenCalled()
+		expect(actualException).toBe(exception)
+		expect(mainStore.isExpiredSession).toBe(true)
 	})
-
 })
-
diff --git a/src/tests/unit/store/actions.spec.js b/src/tests/unit/store/actions.spec.js
index aeefb476f4..418d498540 100644
--- a/src/tests/unit/store/actions.spec.js
+++ b/src/tests/unit/store/actions.spec.js
@@ -1,63 +1,68 @@
 /**
- * SPDX-FileCopyrightText: 2020 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-FileCopyrightText: 2020-2024 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
-import { curry, prop, range, reverse } from 'ramda'
-import orderBy from 'lodash/fp/orderBy.js'
+import { curry, range, reverse } from 'ramda'
 
-import actions from '../../../store/actions'
-import * as MailboxService from '../../../service/MailboxService'
-import * as MessageService from '../../../service/MessageService'
-import * as NotificationService from '../../../service/NotificationService'
-import { UNIFIED_ACCOUNT_ID, UNIFIED_INBOX_ID, PAGE_SIZE } from '../../../store/constants'
+import * as MailboxService from '../../../service/MailboxService.js'
+import * as MessageService from '../../../service/MessageService.js'
+import * as NotificationService from '../../../service/NotificationService.js'
+import { UNIFIED_INBOX_ID, PAGE_SIZE } from '../../../store/constants.js'
+import { normalizedEnvelopeListId } from '../../../util/normalization.js'
+
+import { createPinia, setActivePinia } from 'pinia'
+
+import useMainStore from '../../../store/mainStore.js'
 
 jest.mock('../../../service/MailboxService.js')
 jest.mock('../../../service/MessageService.js')
 jest.mock('../../../service/NotificationService.js')
+jest.mock('../../../util/normalization.js', () => ({
+	__esModule: true,
+	// Supply a default list id ('') to prevent annoying errors
+	normalizedEnvelopeListId: jest.fn(() => ''),
+}))
 
 const mockEnvelope = curry((mailboxId, uid) => ({
+	databaseId: mailboxId * 1000 + uid,
 	mailboxId,
 	uid,
 	dateInt: uid * 10000,
+	threadRootId: Math.random().toString(),
 }))
 
 describe('Vuex store actions', () => {
-	let context
+	let store
 
 	beforeEach(() => {
-		context = {
-			commit: jest.fn(),
-			dispatch: jest.fn(),
-			getters: {
-				accounts: [],
-				getAccount: jest.fn(),
-				getInbox: jest.fn(),
-				getMailbox: jest.fn(),
-				getMailboxes: jest.fn(),
-				getEnvelope: jest.fn(),
-				getEnvelopes: jest.fn(),
-				getPreference: jest.fn(),
-			},
-		}
+		setActivePinia(createPinia())
+
+		store = useMainStore()
+	})
+
+	afterEach(() => {
+		jest.clearAllMocks()
 	})
 
 	it('creates a mailbox', async () => {
 		const account = {
 			id: 13,
 			personalNamespace: '',
+			mailboxes: [],
 		}
 		const name = 'Important'
 		const mailbox = {
-			'name': 'Important',
+			name: 'Important',
 		}
+
+		store.addAccountMutation(account)
+
 		MailboxService.create.mockResolvedValue(mailbox)
 
-		const result = await actions.createMailbox(context, {account, name})
+		const result = await store.createMailbox({ account, name })
 
 		expect(result).toEqual(mailbox)
-		expect(context.commit).toHaveBeenCalledTimes(3)
-		expect(context.commit).toBeCalledWith('addMailbox', { account, mailbox})
 		expect(MailboxService.create).toHaveBeenCalledWith(13, 'Important')
 	})
 
@@ -65,18 +70,20 @@ describe('Vuex store actions', () => {
 		const account = {
 			id: 13,
 			personalNamespace: '',
+			mailboxes: [],
 		}
 		const name = 'Archive.2020'
 		const mailbox = {
-			'name': 'Archive.2020',
+			name: 'Archive.2020',
 		}
+
+		store.addAccountMutation(account)
+
 		MailboxService.create.mockResolvedValue(mailbox)
 
-		const result = await actions.createMailbox(context, {account, name})
+		const result = await store.createMailbox({ account, name })
 
 		expect(result).toEqual(mailbox)
-		expect(context.commit).toHaveBeenCalledTimes(3)
-		expect(context.commit).toBeCalledWith('addMailbox', { account, mailbox})
 		expect(MailboxService.create).toHaveBeenCalledWith(13, 'Archive.2020')
 	})
 
@@ -84,18 +91,20 @@ describe('Vuex store actions', () => {
 		const account = {
 			id: 13,
 			personalNamespace: 'INBOX.',
+			mailboxes: [],
 		}
 		const name = 'Important'
 		const mailbox = {
-			'name': 'INBOX.Important',
+			name: 'INBOX.Important',
 		}
+
+		store.addAccountMutation(account)
+
 		MailboxService.create.mockResolvedValue(mailbox)
 
-		const result = await actions.createMailbox(context, {account, name})
+		const result = await store.createMailbox({ account, name })
 
 		expect(result).toEqual(mailbox)
-		expect(context.commit).toHaveBeenCalledTimes(3)
-		expect(context.commit).toBeCalledWith('addMailbox', { account, mailbox})
 		expect(MailboxService.create).toHaveBeenCalledWith(13, 'INBOX.Important')
 	})
 
@@ -103,27 +112,25 @@ describe('Vuex store actions', () => {
 		const account = {
 			id: 13,
 			personalNamespace: 'INBOX.',
+			mailboxes: [],
 		}
 		const name = 'INBOX.Archive.2020'
 		const mailbox = {
-			'name': 'INBOX.Archive.2020',
+			name: 'INBOX.Archive.2020',
 		}
+
+		store.addAccountMutation(account)
+
 		MailboxService.create.mockResolvedValue(mailbox)
 
-		const result = await actions.createMailbox(context, {account, name})
+		const result = await store.createMailbox({ account, name })
 
 		expect(result).toEqual(mailbox)
-		expect(context.commit).toHaveBeenCalledTimes(3)
-		expect(context.commit).toBeCalledWith('addMailbox', { account, mailbox})
 		expect(MailboxService.create).toHaveBeenCalledWith(13, 'INBOX.Archive.2020')
 	})
 
 	it('combines unified inbox even if no inboxes are present', async() => {
-		context.getters.getMailbox.mockReturnValueOnce({
-			isUnified: true,
-		})
-
-		const envelopes = await actions.fetchEnvelopes(context, {
+		const envelopes = await store.fetchEnvelopes({
 			mailboxId: UNIFIED_INBOX_ID,
 		})
 
@@ -131,43 +138,47 @@ describe('Vuex store actions', () => {
 	})
 
 	it('creates a unified page from one mailbox', async() => {
-		context.getters.accounts.push({
+		const account = {
 			id: 13,
-		})
-		context.getters.getMailbox.mockReturnValueOnce({
-			isUnified: true,
-			specialRole: 'inbox',
-			databaseId: UNIFIED_INBOX_ID,
-		})
-		context.getters.getMailboxes.mockReturnValueOnce([
-			{
+			personalNamespace: 'INBOX.',
+			mailboxes: [],
+		}
+
+		store.addAccountMutation(account)
+		store.addMailboxMutation({
+			account,
+			mailbox: {
 				id: 'INBOX',
+				name: 'INBOX',
 				databaseId: 21,
 				accountId: 13,
 				specialRole: 'inbox',
 			},
-			{
+		})
+		store.addMailboxMutation({
+			account,
+			mailbox: {
 				id: 'Drafts',
+				name: 'Drafts',
 				databaseId: 22,
 				accountId: 13,
 				specialRole: 'draft',
 			},
-		])
-		context.dispatch.mockReturnValueOnce([
-				{
-					databaseId: 123,
-					mailboxId: 21,
-					uid: 321,
-					subject: 'msg1',
-				},
-			])
+		})
+
+		store.addEnvelopesMutation = jest.fn()
 
-		const envelopes = await actions.fetchEnvelopes(context, {
+		MessageService.fetchEnvelopes.mockReturnValueOnce(Promise.resolve([{
+			databaseId: 123,
+			mailboxId: 21,
+			uid: 321,
+			subject: 'msg1',
+		}]))
+
+		const envelopes = await store.fetchEnvelopes({
 			mailboxId: UNIFIED_INBOX_ID,
 		})
 
-		expect(context.getters.getMailbox).toHaveBeenCalledWith(UNIFIED_INBOX_ID)
-		expect(context.getters.getMailboxes).toHaveBeenCalledWith(13)
 		expect(envelopes).toEqual([
 			{
 				databaseId: 123,
@@ -176,12 +187,7 @@ describe('Vuex store actions', () => {
 				subject: 'msg1',
 			},
 		])
-		expect(context.dispatch).toBeCalledWith('fetchEnvelopes', {
-			mailboxId: 21,
-			query: undefined,
-			addToUnifiedMailboxes: false,
-		})
-		expect(context.commit).toBeCalledWith('addEnvelopes', {
+		expect(store.addEnvelopesMutation).toBeCalledWith({
 			envelopes: [{
 				databaseId: 123,
 				mailboxId: 21,
@@ -193,321 +199,403 @@ describe('Vuex store actions', () => {
 	})
 
 	it('fetches the next individual page', async() => {
-		context.getters.accounts.push({
-			accountId: 13,
+		const msgs1 = reverse(range(30, 40))
+		const page1 = reverse(range(10, 30))
+
+		const account13 = {
+			id: 13,
+		}
+
+		store.preferences['sort-order'] = 'newest'
+
+		store.addAccountMutation(account13)
+		store.addMailboxMutation({
+			account: account13,
+			mailbox: {
+				name: 'INBOX',
+				databaseId: 11,
+				specialRole: 'inbox',
+			},
 		})
-		context.getters.getMailbox.mockReturnValueOnce({
-			name: 'INBOX',
-			databaseId: 11,
-			accountId: 13,
-			specialRole: 'inbox',
-			envelopeLists: {
-				'': reverse(range(21, 40)),
+		store.addMailboxMutation({
+			account: account13,
+			mailbox: {
+				name: 'Drafts',
+				databaseId: 12,
+				specialRole: 'draft',
 			},
 		})
-		context.getters.getEnvelope.mockReturnValueOnce(mockEnvelope(11, 1))
-		MessageService.fetchEnvelopes.mockResolvedValue(Promise.resolve(
-			reverse(
-				range(1, 21).map((n) => ({
-					uid: n,
-					dateInt: n * 10000,
-				}))
-			)
-		))
-
-		await actions.fetchNextEnvelopes(context, {
-			mailboxId: 13,
+
+		// Add initial envelopes
+		store.addEnvelopesMutation({
+			envelopes: msgs1.map(mockEnvelope(11)),
+			addToUnifiedMailboxes: true,
+		})
+
+		// Mock fetching next pages
+		MessageService.fetchEnvelopes.mockImplementation(async (accountId, mailboxId) => {
+			if (accountId !== 13 || mailboxId !== 11) {
+				return []
+			}
+
+			return page1.map(mockEnvelope(11))
+		})
+
+		await store.fetchNextEnvelopePage({
+			mailboxId: UNIFIED_INBOX_ID,
 			quantity: PAGE_SIZE,
 		})
 
-		expect(MessageService.fetchEnvelopes).toHaveBeenCalled()
+		expect(MessageService.fetchEnvelopes).toHaveBeenCalledTimes(1)
+		expect(MessageService.fetchEnvelopes)
+			.toHaveBeenNthCalledWith(1, 13, 11, undefined, 300000, PAGE_SIZE, 'newest')
+		expect(store.mailboxes[UNIFIED_INBOX_ID].envelopeLists[''].toSorted()).toEqual(
+			[
+				// Initial envelopes
+				...msgs1.map(mockEnvelope(11)),
+
+				// Fetched page for mailbox 11
+				...page1.map(mockEnvelope(11)),
+			].map(e => e.databaseId).sort(),
+		)
+		expect(store.mailboxes[11].envelopeLists[''].toSorted()).toEqual(
+			[
+				// Initial envelopes
+				...msgs1.map(mockEnvelope(11)),
+
+				// Fetched page for mailbox 11
+				...page1.map(mockEnvelope(11)),
+			].map(e => e.databaseId).sort(),
+		)
 	})
 
-	it('builds the next unified page with local data', async() => {
-		const page1 = reverse(range(25, 30))
-		const page2 = reverse(range(30, 35))
-		const msgs1 = reverse(range(10, 30))
-		const msgs2 = reverse(range(5, 35))
-		context.getters.accounts.push({
+	it('builds the next unified page with local data', async () => {
+		const msgs1 = reverse(range(20, 70))
+		const page1 = reverse(range(50, 60))
+
+		const account13 = {
 			id: 13,
-		})
-		context.getters.accounts.push({
-			id: 26,
-		})
-		context.getters.getMailbox.mockReturnValueOnce({
-			isUnified: true,
-			specialRole: 'inbox',
-			accountId: UNIFIED_ACCOUNT_ID,
-			databaseId: UNIFIED_INBOX_ID,
-		})
-		context.getters.getMailboxes.mockReturnValueOnce([
-			{
+		}
+
+		store.preferences['sort-order'] = 'newest'
+
+		store.addAccountMutation(account13)
+		store.addMailboxMutation({
+			account: account13,
+			mailbox: {
 				name: 'INBOX',
 				databaseId: 11,
 				specialRole: 'inbox',
 			},
-			{
+		})
+		store.addMailboxMutation({
+			account: account13,
+			mailbox: {
 				name: 'Drafts',
 				databaseId: 12,
 				specialRole: 'draft',
 			},
-		])
-		context.getters.getMailboxes.mockReturnValueOnce([
-			{
-				name: 'INBOX',
-				databaseId: 21,
-				accountId: 26,
-				specialRole: 'inbox',
-			},
-			{
-				name: 'Drafts',
-				databaseId: 22,
-				accountId: 26,
-				specialRole: 'draft',
-			},
-		])
-		context.getters.getEnvelopes.mockReturnValueOnce(
-				orderBy(
-					prop('dateInt'),
-					'desc',
-					page1.map(mockEnvelope(11)).concat(page2.map(mockEnvelope(21)))
-				)
-			)
-		context.getters.getEnvelopes.mockReturnValueOnce(msgs1.map(mockEnvelope(11)))
-		context.getters.getEnvelopes.mockReturnValueOnce(msgs2.map(mockEnvelope(21)))
-
-		await actions.fetchNextEnvelopes(context, {
+		})
+
+		// Add initial envelopes
+		store.addEnvelopesMutation({
+			envelopes: msgs1.map(mockEnvelope(11)),
+			addToUnifiedMailboxes: false,
+		})
+
+		// Also add some envelopes to the unified mailbox
+		store.addEnvelopesMutation({
+			envelopes: page1.map(mockEnvelope(11)),
+			addToUnifiedMailboxes: true,
+		})
+
+		// Mock fetching next pages (not called but makes failures easier to understand)
+		MessageService.fetchEnvelopes.mockImplementation(async () => {
+			throw new Error('Tried to fetch messages')
+		})
+
+		await store.fetchNextEnvelopePage({
 			mailboxId: UNIFIED_INBOX_ID,
 			quantity: PAGE_SIZE,
 		})
 
-		expect(context.getters.getMailbox).toHaveBeenCalledWith(UNIFIED_INBOX_ID)
-		expect(context.getters.getMailboxes).toHaveBeenCalledWith(13)
-		expect(context.getters.getMailboxes).toHaveBeenCalledWith(26)
-		expect(context.getters.getEnvelopes).toHaveBeenCalledTimes(3)
-		expect(context.getters.getEnvelopes).toHaveBeenCalledWith(UNIFIED_INBOX_ID, undefined)
-		expect(context.getters.getEnvelopes).toHaveBeenCalledWith(11, undefined)
-		expect(context.getters.getEnvelopes).toHaveBeenCalledWith(21, undefined)
+		expect(MessageService.fetchEnvelopes).not.toHaveBeenCalled()
+		expect(store.mailboxes[UNIFIED_INBOX_ID].envelopeLists[''].toSorted()).toEqual(
+			[
+				// Initial envelopes
+				...page1.map(mockEnvelope(11)),
+
+				// Envelopes loaded from local state
+				...range(30, 50).map(mockEnvelope(11)),
+			].map(e => e.databaseId).sort(),
+		)
 	})
 
-	it('builds the next unified page with partial fetch', async() => {
-		const page1 = reverse(range(25, 30))
-		const page2 = reverse(range(30, 35))
-		const msgs1 = reverse(range(25, 30))
-		const msgs2 = reverse(range(5, 35))
-		context.getters.accounts.push({
+	it('builds the next unified page with partial fetch', async () => {
+		const page1 = reverse(range(30, 35))
+		const page2 = reverse(range(25, 30))
+		const msgs2 = reverse(range(60, 70))
+
+		const account13 = {
 			id: 13,
-		})
-		context.getters.accounts.push({
+		}
+		const account26 = {
 			id: 26,
-		})
-		context.getters.getMailbox.mockReturnValueOnce({
-			isUnified: true,
-			databaseId: UNIFIED_INBOX_ID,
-			specialRole: 'inbox',
-			accountId: UNIFIED_ACCOUNT_ID,
-			id: UNIFIED_INBOX_ID,
-		})
-		context.getters.getMailboxes.mockReturnValueOnce([
-			{
+		}
+
+		store.preferences['sort-order'] = 'newest'
+
+		store.addAccountMutation(account13)
+		store.addAccountMutation(account26)
+		store.addMailboxMutation({
+			account: account13,
+			mailbox: {
 				name: 'INBOX',
 				databaseId: 11,
 				specialRole: 'inbox',
 			},
-			{
+		})
+		store.addMailboxMutation({
+			account: account13,
+			mailbox: {
 				name: 'Drafts',
 				databaseId: 12,
 				specialRole: 'draft',
 			},
-		])
-		context.getters.getMailboxes.mockReturnValueOnce([
-			{
+		})
+		store.addMailboxMutation({
+			account: account26,
+			mailbox: {
 				name: 'INBOX',
 				databaseId: 21,
-				accountId: 26,
 				specialRole: 'inbox',
 			},
-			{
+		})
+		store.addMailboxMutation({
+			account: account26,
+			mailbox: {
 				name: 'Drafts',
 				databaseId: 22,
-				accountId: 26,
 				specialRole: 'draft',
 			},
-		])
-		context.getters.getEnvelopes.mockReturnValueOnce(
-				orderBy(
-					prop('dateInt'),
-					'desc',
-					page1.map(mockEnvelope(11)).concat(page2.map(mockEnvelope(12)))
-				)
-			)
-		context.getters.getEnvelopes.mockReturnValueOnce(msgs1.map(mockEnvelope(11)))
-		context.getters.getEnvelopes.mockReturnValueOnce(msgs2.map(mockEnvelope(21)))
-
-		await actions.fetchNextEnvelopes(context, {
+		})
+
+		// Add initial pages
+		store.addEnvelopesMutation({
+			envelopes: page1.map(mockEnvelope(11)),
+		})
+		store.addEnvelopesMutation({
+			envelopes: msgs2.map(mockEnvelope(21)),
+		})
+
+		// Mock fetching next pages
+		MessageService.fetchEnvelopes.mockImplementation(
+			async (
+				accountId,
+				mailboxId,
+				query,
+				cursor,
+				limit,
+				sortOrder,
+			) => {
+				if (accountId !== 13 || mailboxId !== 11) {
+					return []
+				}
+
+				expect(sortOrder).toBe('newest')
+				return page2.map(mockEnvelope(11)).filter(e => e.dateInt < cursor).slice(0, limit)
+			},
+		)
+
+		await store.fetchNextEnvelopePage({
 			mailboxId: UNIFIED_INBOX_ID,
 			quantity: PAGE_SIZE,
 		})
 
-		expect(context.getters.getMailbox).toHaveBeenCalledWith(UNIFIED_INBOX_ID)
-		expect(context.getters.getEnvelopes).toHaveBeenCalledWith(UNIFIED_INBOX_ID, undefined)
-		expect(context.getters.getEnvelopes).toHaveBeenCalledWith(11, undefined)
-		expect(context.getters.getEnvelopes).toHaveBeenCalledWith(21, undefined)
+		expect(MessageService.fetchEnvelopes).toHaveBeenCalledTimes(2)
+		expect(MessageService.fetchEnvelopes)
+			.toHaveBeenNthCalledWith(1, 13, 11, undefined, 300000, PAGE_SIZE, 'newest')
+		expect(MessageService.fetchEnvelopes)
+			.toHaveBeenNthCalledWith(2, 26, 21, undefined, 600000, PAGE_SIZE, 'newest')
+		expect(store.mailboxes[UNIFIED_INBOX_ID].envelopeLists[''].toSorted()).toEqual(
+			[
+				// Initial envelopes
+				...page1.map(mockEnvelope(11)),
+				...msgs2.map(mockEnvelope(21)),
+
+				// Fetched page for mailbox 11
+				...page2.map(mockEnvelope(11)),
+			].map(e => e.databaseId).sort(),
+		)
+		expect(store.mailboxes[11].envelopeLists[''].toSorted()).toEqual(
+			[
+				// Initial envelopes
+				...page1.map(mockEnvelope(11)),
+
+				// Fetched page for mailbox 11
+				...page2.map(mockEnvelope(11)),
+			].map(e => e.databaseId).sort(),
+		)
+		expect(store.mailboxes[21].envelopeLists[''].toSorted())
+			.toEqual(msgs2.map(mockEnvelope(21)).map(e => e.databaseId).toSorted())
 	})
 
 	describe('inbox sync', () => {
-		beforeEach(() => {
-
-		})
-
-		it('fetches the inbox first', async() => {
-			context.getters.accounts.push({
+		it('fetches the inbox first', async () => {
+			const account13 = {
 				id: 13,
-			})
-			context.getters.accounts.push({
+			}
+			const account26 = {
 				id: 26,
-			})
-			context.getters.getMailbox.mockReturnValueOnce({
-				isUnified: true,
-				specialRole: 'inbox',
-				accountId: UNIFIED_ACCOUNT_ID,
-				id: UNIFIED_INBOX_ID,
-			})
-			context.getters.getMailboxes.mockReturnValueOnce([
-				{
+			}
+
+			store.addAccountMutation(account13)
+			store.addAccountMutation(account26)
+			store.addMailboxMutation({
+				account: account13,
+				mailbox: {
 					name: 'INBOX',
 					databaseId: 11,
 					specialRole: 'inbox',
-					envelopeLists: {},
 				},
-				{
+			})
+			store.addMailboxMutation({
+				account: account13,
+				mailbox: {
 					name: 'Drafts',
 					databaseId: 12,
 					specialRole: 'draft',
-					envelopeLists: {},
 				},
-			])
-			context.getters.getMailboxes.mockReturnValueOnce([
-				{
+			})
+			store.addMailboxMutation({
+				account: account26,
+				mailbox: {
 					name: 'INBOX',
 					databaseId: 21,
-					accountId: 26,
 					specialRole: 'inbox',
-					envelopeLists: {},
 				},
-				{
+			})
+			store.addMailboxMutation({
+				account: account26,
+				mailbox: {
 					name: 'Drafts',
 					databaseId: 22,
-					accountId: 26,
 					specialRole: 'draft',
-					envelopeLists: {},
 				},
-			])
+			})
 
-			await actions.syncInboxes(context)
+			store.fetchEnvelopes = jest.fn(async () => {})
+			store.syncEnvelopes = jest.fn(async () => {})
 
-			expect(context.getters.getMailboxes).toHaveBeenCalledTimes(2)
-			expect(context.dispatch).toHaveBeenCalledTimes(4) // 2 fetch + 2 sync
-			expect(context.dispatch).toBeCalledWith('fetchEnvelopes', {
-				mailboxId: 11,
-			})
-			expect(context.dispatch).toBeCalledWith('syncEnvelopes', {
+			await store.syncInboxes()
+
+			expect(store.fetchEnvelopes).toHaveBeenCalledTimes(2)
+			expect(store.fetchEnvelopes).toHaveBeenNthCalledWith(1, {
 				mailboxId: 11,
 			})
-			expect(context.dispatch).toBeCalledWith('fetchEnvelopes', {
+			expect(store.fetchEnvelopes).toHaveBeenNthCalledWith(2, {
 				mailboxId: 21,
 			})
-			expect(context.dispatch).toBeCalledWith('syncEnvelopes', {
+
+			expect(store.syncEnvelopes).toHaveBeenCalledTimes(2)
+			expect(store.syncEnvelopes).toHaveBeenNthCalledWith(1, {
+				mailboxId: 11,
+			})
+			expect(store.syncEnvelopes).toHaveBeenNthCalledWith(2, {
 				mailboxId: 21,
 			})
+
 			// We can't detect new messages here
-			expect(NotificationService.showNewMessagesNotification).not.toHaveBeenCalled
+			expect(NotificationService.showNewMessagesNotification).not.toHaveBeenCalled()
 		})
 
-		it('syncs each individual mailbox', async() => {
-			context.getters.accounts.push({
+		it('syncs each individual mailbox', async () => {
+			const account13 = {
 				id: 13,
-			})
-			context.getters.accounts.push({
+			}
+			const account26 = {
 				id: 26,
-			})
-			context.getters.getMailbox.mockReturnValue({
-				isUnified: true,
-				specialRole: 'inbox',
-				accountId: UNIFIED_ACCOUNT_ID,
-				id: UNIFIED_INBOX_ID,
-				envelopeLists: {
-					'': [],
-				},
-			})
-			context.getters.getMailboxes.mockReturnValueOnce([
-				{
+			}
+
+			store.addAccountMutation(account13)
+			store.addAccountMutation(account26)
+			store.addMailboxMutation({
+				account: account13,
+				mailbox: {
 					name: 'INBOX',
 					databaseId: 11,
 					specialRole: 'inbox',
-					envelopeLists: {
-						'': [],
-					},
 				},
-				{
+			})
+			store.addMailboxMutation({
+				account: account13,
+				mailbox: {
 					name: 'Drafts',
 					databaseId: 12,
 					specialRole: 'draft',
-					envelopeLists: {
-						'': [],
-					},
 				},
-			])
-			context.getters.getMailboxes.mockReturnValueOnce([
-				{
+			})
+			store.addMailboxMutation({
+				account: account26,
+				mailbox: {
 					name: 'INBOX',
 					databaseId: 21,
-					accountId: 26,
 					specialRole: 'inbox',
-					envelopeLists: {
-						'': [],
-					},
 				},
-				{
+			})
+			store.addMailboxMutation({
+				account: account26,
+				mailbox: {
 					name: 'Drafts',
 					databaseId: 22,
-					accountId: 26,
 					specialRole: 'draft',
-					envelopeLists: {
-						'': [],
-					},
 				},
-			])
-			context.dispatch
-				.mockReturnValueOnce(Promise.resolve([{ id: 123 }, { id: 321 }]))
+			})
 
-			await actions.syncInboxes(context)
+			// Mock a pseudo envelope list for each mailbox to simulate existing mailboxes with
+			// envelopes (and make sure that store.fetchEnvelopes() is not called).
+			const envelopeListId = Symbol()
+			normalizedEnvelopeListId.mockReturnValue(envelopeListId)
+			for (const mailbox of Object.values(store.mailboxes)) {
+				mailbox.envelopeLists[envelopeListId] = {}
+			}
 
-			expect(context.getters.getMailbox).toHaveBeenCalledWith(UNIFIED_INBOX_ID)
-			expect(context.getters.getMailboxes).toHaveBeenCalledTimes(2)
-			expect(context.dispatch).toHaveBeenCalledWith('syncEnvelopes', {
-				mailboxId: 11,
-			})
-			//expect(context.dispatch).have.been
-			expect(context.dispatch).toBeCalledWith('syncEnvelopes', {
+			store.fetchEnvelopes = jest.fn(async () => {})
+			store.syncEnvelopes = jest.fn(async () => [{ id: 123 }, { id: 321 }])
+
+			await store.syncInboxes()
+
+			expect(store.fetchEnvelopes).not.toHaveBeenCalled()
+			expect(store.syncEnvelopes).toHaveBeenCalledTimes(4)
+			expect(store.syncEnvelopes).toHaveBeenNthCalledWith(1, {
 				mailboxId: 11,
 			})
-			expect(context.dispatch).toBeCalledWith('syncEnvelopes', {
+			expect(store.syncEnvelopes).toHaveBeenNthCalledWith(2, {
 				mailboxId: 21,
 			})
+			expect(store.syncEnvelopes).toHaveBeenNthCalledWith(3, {
+				mailboxId: UNIFIED_INBOX_ID,
+				query: 'is:pi-important',
+			})
+			expect(store.syncEnvelopes).toHaveBeenNthCalledWith(4, {
+				mailboxId: UNIFIED_INBOX_ID,
+				query: 'is:pi-other',
+			})
 			// Here we expect notifications
-			expect(NotificationService.showNewMessagesNotification).toHaveBeenCalled
+			expect(NotificationService.showNewMessagesNotification).toHaveBeenCalled()
 		})
 	})
 
-	it('should move message to junk, no mailbox configured', async() => {
-		context.getters.getAccount.mockReturnValueOnce({
+	it('should move message to junk, no mailbox configured', async () => {
+		store.addAccountMutation({
+			id: 42,
 			junkMailboxId: null,
 		})
 
-		const removeEnvelope = await actions.moveEnvelopeToJunk(context, {
+		const removeEnvelope = await store.moveEnvelopeToJunk({
+			accountId: 42,
 			flags: {
-				$junk: false,
+				$junk: true,
 			},
 			mailboxId: 1,
 		})
@@ -515,46 +603,41 @@ describe('Vuex store actions', () => {
 		expect(removeEnvelope).toBeFalsy()
 	})
 
-	it('should move message to inbox', async() => {
-		context.getters.getAccount.mockReturnValueOnce({
+	it('should move message to inbox', async () => {
+		const account = {
+			id: 42,
 			junkMailboxId: 10,
-		})
-		context.getters.getInbox.mockReturnValueOnce({
-			databaseId: 1,
-		})
+		}
 
-		const removeEnvelope = await actions.moveEnvelopeToJunk(context, {
-			flags: {
-				$junk: true,
+		store.addAccountMutation(account)
+		store.addMailboxMutation({
+			account,
+			mailbox: {
+				databaseId: 1,
+				specialRole: 'inbox',
+				name: 'INBOX',
 			},
-			mailboxId: 10,
 		})
 
-		expect(removeEnvelope).toBeTruthy()
-	})
-
-	it('should move message to inbox, inbox not found', async() => {
-		context.getters.getAccount.mockReturnValueOnce({
-			junkMailboxId: 10,
-		})
-		context.getters.getInbox.mockReturnValueOnce(undefined)
-
-		const removeEnvelope = await actions.moveEnvelopeToJunk(context, {
+		const removeEnvelope = await store.moveEnvelopeToJunk({
+			accountId: 42,
 			flags: {
 				$junk: true,
 			},
 			mailboxId: 10,
 		})
 
-		expect(removeEnvelope).toBeFalsy()
+		expect(removeEnvelope).toBeTruthy()
 	})
 
-	it('should not move messages', async() => {
-		context.getters.getAccount.mockReturnValueOnce({
-			junkMailboxId: null,
+	it('should move message to inbox, inbox not found', async () => {
+		store.addAccountMutation({
+			id: 42,
+			junkMailboxId: 10,
 		})
 
-		const removeEnvelope = await actions.moveEnvelopeToJunk(context, {
+		const removeEnvelope = await store.moveEnvelopeToJunk({
+			accountId: 42,
 			flags: {
 				$junk: true,
 			},
diff --git a/src/tests/unit/store/getters.spec.js b/src/tests/unit/store/getters.spec.js
index eb90326fc1..5c9f397356 100644
--- a/src/tests/unit/store/getters.spec.js
+++ b/src/tests/unit/store/getters.spec.js
@@ -3,18 +3,17 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
-import { curry, mapObjIndexed } from 'ramda'
+import { setActivePinia } from 'pinia'
+import { createTestingPinia } from '@pinia/testing'
+import useMainStore from '../../../store/mainStore.js'
 
-import { getters } from '../../../store/getters'
-
-const bindGetterToState = curry((getters, state, num, key) => getters[key](state, getters))
-
-describe('Vuex store getters', () => {
-	let state
-	let bindGetters
+describe('Pinia main store getters', () => {
+	let store
 
 	beforeEach(() => {
-		state = {
+		setActivePinia(createTestingPinia({ stubActions: false }))
+		store = useMainStore()
+		store.$patch({
 			isExpiredSession: false,
 			accountList: [],
 			accounts: {},
@@ -24,57 +23,51 @@ describe('Vuex store getters', () => {
 			tagList: [],
 			tags: {},
 			calendars: [],
-		}
-		bindGetters = () => mapObjIndexed(bindGetterToState(getters, state), getters)
+		})
 	})
 
 	it('gets session expiry', () => {
-		const getters = bindGetters()
-
-		expect(getters.isExpiredSession).toEqual(false)
+		expect(store.isExpiredSession).toEqual(false)
 	})
 	it('gets all accounts', () => {
-		state.accountList.push('13')
-		state.accounts[13] = {
+		store.accountList.push('13')
+		store.accountsUnmapped[13] = {
 			accountId: 13,
 		}
-		const getters = bindGetters()
 
-		const accounts = getters.accounts
+		const accounts = store.accountsUnmapped
 
-		expect(accounts).toEqual([
+		expect(accounts['13']).toEqual(
 			{
 				accountId: 13,
 			},
-		])
+		)
 	})
 	it('gets a specific account', () => {
-		state.accountList.push('13')
-		state.accounts[13] = {
+		store.accountList.push('13')
+		store.accountsUnmapped[13] = {
 			accountId: 13,
 		}
-		const getters = bindGetters()
 
-		const accounts = getters.getAccount(13)
+		const accounts = store.getAccount(13)
 
 		expect(accounts).toEqual({
 			accountId: 13,
 		})
 	})
 	it('returns an envelope\'s empty thread', () => {
-		state.envelopes[1] = {
+		store.envelopes[1] = {
 			databaseId: 1,
 			uid: 101,
 			mailboxId: 13,
 		}
-		const getters = bindGetters()
 
-		const thread = getters.getEnvelopeThread(1)
+		const thread = store.getEnvelopeThread(1)
 
 		expect(thread.length).toEqual(0)
 	})
 	it('returns an envelope\'s empty thread', () => {
-		state.envelopes[1] = {
+		store.envelopes[1] = {
 			databaseId: 1,
 			uid: 101,
 			mailboxId: 13,
@@ -84,19 +77,18 @@ describe('Vuex store getters', () => {
 				3,
 			],
 		}
-		state.envelopes[2] = {
+		store.envelopes[2] = {
 			databaseId: 1,
 			uid: 101,
 			mailboxId: 13,
 		}
-		state.envelopes[3] = {
+		store.envelopes[3] = {
 			databaseId: 1,
 			uid: 101,
 			mailboxId: 13,
 		}
-		const getters = bindGetters()
 
-		const thread = getters.getEnvelopeThread(1)
+		const thread = store.getEnvelopeThread(1)
 
 		expect(thread.length).toBeGreaterThanOrEqual(1)
 		expect(thread).toEqual([
@@ -124,44 +116,43 @@ describe('Vuex store getters', () => {
 	})
 
 	it('return envelopes by thread root id', () => {
-		state.envelopes[0] = {
+		store.envelopes[0] = {
 			accountId: 1,
 			databaseId: 1,
 			uid: 101,
 			mailboxId: 13,
 			threadRootId: '123-456-789',
 		}
-		state.envelopes[1] = {
+		store.envelopes[1] = {
 			accountId: 1,
 			databaseId: 2,
 			uid: 102,
 			mailboxId: 13,
 			threadRootId: '123-456-789',
 		}
-		state.envelopes[2] = {
+		store.envelopes[2] = {
 			accountId: 1,
 			databaseId: 3,
 			uid: 103,
 			mailboxId: 13,
 			threadRootId: '234-567-890',
 		}
-		state.envelopes[3] = {
+		store.envelopes[3] = {
 			accountId: 1,
 			databaseId: 4,
 			uid: 104,
 			mailboxId: 13,
 			threadRootId: '234-567-890',
 		}
-		state.envelopes[4] = {
+		store.envelopes[4] = {
 			accountId: 2,
 			databaseId: 5,
 			uid: 105,
 			mailboxId: 23,
 			threadRootId: '123-456-789',
 		}
-		const getters = bindGetters()
 
-		const envelopesA = getters.getEnvelopesByThreadRootId(1, '123-456-789')
+		const envelopesA = store.getEnvelopesByThreadRootId(1, '123-456-789')
 		expect(envelopesA.length).toEqual(2)
 		expect(envelopesA).toEqual([
 			{
@@ -180,56 +171,52 @@ describe('Vuex store getters', () => {
 			},
 		])
 
-		const envelopesB = getters.getEnvelopesByThreadRootId('345-678-901')
+		const envelopesB = store.getEnvelopesByThreadRootId('345-678-901')
 		expect(envelopesB.length).toEqual(0)
 	})
 
 	it('find mailbox by special role: inbox', () => {
-		const mockedGetters = {
-			getMailboxes: () => [
-				{
-					name: 'Test',
-					specialRole: 0,
-				},
-				{
-					name: 'INBOX',
-					specialRole: 'inbox',
-				},
-				{
-					name: 'Trash',
-					specialRole: 'trash',
-				},
-			],
-		}
+		store.getMailboxes = jest.fn().mockReturnValue([
+			{
+				name: 'Test',
+				specialRole: 0,
+			},
+			{
+				name: 'INBOX',
+				specialRole: 'inbox',
+			},
+			{
+				name: 'Trash',
+				specialRole: 'trash',
+			},
+		])
 
-		const result = getters.findMailboxBySpecialRole(state, mockedGetters)('100', 'inbox')
+		const result = store.findMailboxBySpecialRole('100', 'inbox')
 
 		expect(result).toEqual({
 			name: 'INBOX',
 			specialRole: 'inbox',
-		});
+		})
 	})
 
 	it('find mailbox by special role: undefined', () => {
-		const mockedGetters = {
-			getMailboxes: () => [
-				{
-					name: 'Test',
-					specialRole: 0,
-				},
-				{
-					name: 'INBOX',
-					specialRole: 'inbox',
-				},
-				{
-					name: 'Trash',
-					specialRole: 'trash',
-				},
-			],
-		}
+		store.getMailboxes = jest.fn().mockReturnValue([
+			{
+				name: 'Test',
+				specialRole: 0,
+			},
+			{
+				name: 'INBOX',
+				specialRole: 'inbox',
+			},
+			{
+				name: 'Trash',
+				specialRole: 'trash',
+			},
+		])
 
-		const result = getters.findMailboxBySpecialRole(state, mockedGetters)('100', 'drafts')
+		const result = store.findMailboxBySpecialRole('100', 'drafts')
 
-		expect(result).toEqual(undefined);
+		expect(result).toEqual(undefined)
 	})
 })
diff --git a/src/tests/unit/store/mutations.spec.js b/src/tests/unit/store/mutations.spec.js
index b83fc789d7..af2fe610ed 100644
--- a/src/tests/unit/store/mutations.spec.js
+++ b/src/tests/unit/store/mutations.spec.js
@@ -3,34 +3,43 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
-import mutations from '../../../store/mutations.js'
 import {
 	PRIORITY_INBOX_ID,
 	UNIFIED_ACCOUNT_ID,
 	UNIFIED_INBOX_ID,
 } from '../../../store/constants.js'
 
-describe('Vuex store mutations', () => {
-	it('adds an account with no mailboxes', () => {
-		const state = {
+import { setActivePinia } from 'pinia'
+import { createTestingPinia } from '@pinia/testing'
+import useMainStore from '../../../store/mainStore.js'
+
+describe('Pinia store mutations', () => {
+	let store
+
+	beforeEach(() => {
+		setActivePinia(createTestingPinia({ stubActions: false }))
+		store = useMainStore()
+		store.$patch({
 			accountList: [],
 			accounts: {},
 			envelopes: {},
 			mailboxes: {},
 			tagList: [],
 			tags: {},
-		}
+		})
+	})
 
-		mutations.addAccount(state, {
+	it('adds an account with no mailboxes', () => {
+		store.addAccountMutation({
 			accountId: 13,
 			id: 13,
 			mailboxes: [],
 			aliases: [],
 		})
 
-		expect(state).toEqual({
+		expect(store).toMatchObject({
 			accountList: [13],
-			accounts: {
+			accountsUnmapped: {
 				13: {
 					accountId: 13,
 					id: 13,
@@ -47,16 +56,7 @@ describe('Vuex store mutations', () => {
 	})
 
 	it('adds an account with one level of mailboxes', () => {
-		const state = {
-			accountList: [],
-			accounts: {},
-			envelopes: {},
-			mailboxes: {},
-			tagList: [],
-			tags: {},
-		}
-
-		mutations.addAccount(state, {
+		store.addAccountMutation({
 			accountId: 13,
 			id: 13,
 			mailboxes: [
@@ -69,9 +69,9 @@ describe('Vuex store mutations', () => {
 			aliases: [],
 		})
 
-		expect(state).toEqual({
+		expect(store).toMatchObject({
 			accountList: [13],
-			accounts: {
+			accountsUnmapped: {
 				13: {
 					accountId: 13,
 					id: 13,
@@ -101,16 +101,7 @@ describe('Vuex store mutations', () => {
 	})
 
 	it('adds an account with a personal namespace', () => {
-		const state = {
-			accountList: [],
-			accounts: {},
-			envelopes: {},
-			mailboxes: {},
-			tagList: [],
-			tags: {},
-		}
-
-		mutations.addAccount(state, {
+		store.addAccountMutation({
 			accountId: 13,
 			id: 13,
 			mailboxes: [
@@ -133,9 +124,9 @@ describe('Vuex store mutations', () => {
 			personalNamespace: 'INBOX.',
 		})
 
-		expect(state).toEqual({
+		expect(store).toMatchObject({
 			accountList: [13],
-			accounts: {
+			accountsUnmapped: {
 				13: {
 					accountId: 13,
 					id: 13,
@@ -181,16 +172,7 @@ describe('Vuex store mutations', () => {
 	})
 
 	it('adds an account with two levels of mailboxes', () => {
-		const state = {
-			accountList: [],
-			accounts: {},
-			envelopes: {},
-			mailboxes: {},
-			tagList: [],
-			tags: {},
-		}
-
-		mutations.addAccount(state, {
+		store.addAccountMutation({
 			accountId: 13,
 			id: 13,
 			mailboxes: [
@@ -212,9 +194,9 @@ describe('Vuex store mutations', () => {
 			aliases: [],
 		})
 
-		expect(state).toEqual({
+		expect(store).toMatchObject({
 			accountList: [13],
-			accounts: {
+			accountsUnmapped: {
 				13: {
 					accountId: 13,
 					id: 13,
@@ -260,16 +242,7 @@ describe('Vuex store mutations', () => {
 	})
 
 	it('adds an account with three levels of mailboxes', () => {
-		const state = {
-			accountList: [],
-			accounts: {},
-			envelopes: {},
-			mailboxes: {},
-			tagList: [],
-			tags: {},
-		}
-
-		mutations.addAccount(state, {
+		store.addAccountMutation({
 			accountId: 13,
 			id: 13,
 			mailboxes: [
@@ -298,9 +271,9 @@ describe('Vuex store mutations', () => {
 			aliases: [],
 		})
 
-		expect(state).toEqual({
+		expect(store).toMatchObject({
 			accountList: [13],
-			accounts: {
+			accountsUnmapped: {
 				13: {
 					accountId: 13,
 					id: 13,
@@ -368,9 +341,9 @@ describe('Vuex store mutations', () => {
 			],
 			collapsed: true,
 		}
-		const state = {
+		store.$patch({
 			accountList: [13],
-			accounts: {
+			accountsUnmapped: {
 				13: account,
 			},
 			envelopes: {},
@@ -390,10 +363,9 @@ describe('Vuex store mutations', () => {
 			},
 			tagList: [],
 			tags: {},
-		}
+		})
 
-		mutations.addMailbox(
-			state,
+		store.addMailboxMutation(
 			{
 				account,
 				mailbox: {
@@ -405,9 +377,9 @@ describe('Vuex store mutations', () => {
 				},
 			})
 
-		expect(state).toEqual({
+		expect(store).toMatchObject({
 			accountList: [13],
-			accounts: {
+			accountsUnmapped: {
 				13: {
 					accountId: 13,
 					id: 13,
@@ -459,9 +431,9 @@ describe('Vuex store mutations', () => {
 			],
 			collapsed: true,
 		}
-		const state = {
+		store.$patch({
 			accountList: [13],
-			accounts: {
+			accountsUnmapped: {
 				13: account,
 			},
 			envelopes: {},
@@ -481,24 +453,22 @@ describe('Vuex store mutations', () => {
 			},
 			tagList: [],
 			tags: {},
-		}
+		})
 
-		mutations.addMailbox(
-			state,
-			{
-				account,
-				mailbox: {
-					databaseId: 346,
-					name: 'Archive.2020',
-					delimiter: '.',
-					specialUse: ['archive'],
-					specialRole: 'archive',
-				},
-			})
+		store.addMailboxMutation({
+			account,
+			mailbox: {
+				databaseId: 346,
+				name: 'Archive.2020',
+				delimiter: '.',
+				specialUse: ['archive'],
+				specialRole: 'archive',
+			},
+		})
 
-		expect(state).toEqual({
+		expect(store).toMatchObject({
 			accountList: [13],
-			accounts: {
+			accountsUnmapped: {
 				13: {
 					accountId: 13,
 					id: 13,
@@ -543,8 +513,8 @@ describe('Vuex store mutations', () => {
 	})
 
 	it('removes a mailbox', () => {
-		const state = {
-			accounts: {
+		store.$patch({
+			accountsUnmapped: {
 				13: {
 					accountId: 13,
 					id: 13,
@@ -561,14 +531,14 @@ describe('Vuex store mutations', () => {
 			},
 			tagList: [],
 			tags: {},
-		}
+		})
 
-		mutations.removeMailbox(state, {
+		store.removeMailboxMutation({
 			id: 27,
 		})
 
-		expect(state).toEqual({
-			accounts: {
+		expect(store).toMatchObject({
+			accountsUnmapped: {
 				13: {
 					accountId: 13,
 					id: 13,
@@ -582,8 +552,8 @@ describe('Vuex store mutations', () => {
 	})
 
 	it('removes a sub-mailbox', () => {
-		const state = {
-			accounts: {
+		store.$patch({
+			accountsUnmapped: {
 				13: {
 					accountId: 13,
 					id: 13,
@@ -606,14 +576,14 @@ describe('Vuex store mutations', () => {
 			},
 			tagList: [],
 			tags: {},
-		}
+		})
 
-		mutations.removeMailbox(state, {
+		store.removeMailboxMutation({
 			id: 28,
 		})
 
-		expect(state).toEqual({
-			accounts: {
+		expect(store).toMatchObject({
+			accountsUnmapped: {
 				13: {
 					accountId: 13,
 					id: 13,
@@ -634,8 +604,8 @@ describe('Vuex store mutations', () => {
 	})
 
 	it('adds envelopes', () => {
-		const state = {
-			accounts: {
+		store.$patch({
+			accountsUnmapped: {
 				[UNIFIED_ACCOUNT_ID]: {
 					accountId: UNIFIED_ACCOUNT_ID,
 					id: UNIFIED_ACCOUNT_ID,
@@ -652,10 +622,10 @@ describe('Vuex store mutations', () => {
 			},
 			tagList: [],
 			tags: {},
-			preferences:{'sort-order': 'newest'} ,
-		}
+			preferences: { 'sort-order': 'newest' },
+		})
 
-		mutations.addEnvelopes(state, {
+		store.addEnvelopesMutation({
 			query: undefined,
 			envelopes: [{
 				mailboxId: 27,
@@ -666,8 +636,8 @@ describe('Vuex store mutations', () => {
 			}],
 		})
 
-		expect(state).toEqual({
-			accounts: {
+		expect(store).toMatchObject({
+			accountsUnmapped: {
 				[UNIFIED_ACCOUNT_ID]: {
 					accountId: UNIFIED_ACCOUNT_ID,
 					id: UNIFIED_ACCOUNT_ID,
@@ -695,13 +665,13 @@ describe('Vuex store mutations', () => {
 			},
 			tagList: [],
 			tags: {},
-			preferences:{'sort-order': 'newest'} ,
+			preferences: { 'sort-order': 'newest' },
 		})
 	})
 
 	it('adds envelopes with overlapping timestamps', () => {
-		const state = {
-			accounts: {
+		store.$patch({
+			accountsUnmapped: {
 				[UNIFIED_ACCOUNT_ID]: {
 					accountId: UNIFIED_ACCOUNT_ID,
 					id: UNIFIED_ACCOUNT_ID,
@@ -718,10 +688,10 @@ describe('Vuex store mutations', () => {
 			},
 			tagList: [],
 			tags: {},
-			preferences:{'sort-order': 'newest'} ,
-		}
+			preferences: { 'sort-order': 'newest' },
+		})
 
-		mutations.addEnvelopes(state, {
+		store.addEnvelopesMutation({
 			query: undefined,
 			envelopes: [{
 				mailboxId: 27,
@@ -732,9 +702,9 @@ describe('Vuex store mutations', () => {
 				threadRootId: '123-456-789',
 			}],
 		})
-		mutations.addEnvelopes(state, {
+		store.addEnvelopesMutation({
 			query: undefined,
-			envelopes:[ {
+			envelopes: [{
 				mailboxId: 27,
 				databaseId: 12346,
 				id: 124,
@@ -744,8 +714,8 @@ describe('Vuex store mutations', () => {
 			}],
 		})
 
-		expect(state).toEqual({
-			accounts: {
+		expect(store).toMatchObject({
+			accountsUnmapped: {
 				[UNIFIED_ACCOUNT_ID]: {
 					accountId: UNIFIED_ACCOUNT_ID,
 					id: UNIFIED_ACCOUNT_ID,
@@ -783,13 +753,13 @@ describe('Vuex store mutations', () => {
 			},
 			tagList: [],
 			tags: {},
-			preferences:{'sort-order': 'newest'} ,
+			preferences: { 'sort-order': 'newest' },
 		})
 	})
 
 	it('adds new envelopes to the unified inbox as well', () => {
-		const state = {
-			accounts: {
+		store.$patch({
+			accountsUnmapped: {
 				[UNIFIED_ACCOUNT_ID]: {
 					accountId: UNIFIED_ACCOUNT_ID,
 					id: UNIFIED_ACCOUNT_ID,
@@ -812,10 +782,10 @@ describe('Vuex store mutations', () => {
 			},
 			tagList: [],
 			tags: {},
-			preferences:{'sort-order': 'newest'} ,
-		}
+			preferences: { 'sort-order': 'newest' },
+		})
 
-		mutations.addEnvelopes(state, {
+		store.addEnvelopesMutation({
 			query: undefined,
 			envelopes: [{
 				mailboxId: 27,
@@ -825,8 +795,8 @@ describe('Vuex store mutations', () => {
 			}],
 		})
 
-		expect(state).toEqual({
-			accounts: {
+		expect(store).toMatchObject({
+			accountsUnmapped: {
 				[UNIFIED_ACCOUNT_ID]: {
 					accountId: UNIFIED_ACCOUNT_ID,
 					id: UNIFIED_ACCOUNT_ID,
@@ -861,13 +831,13 @@ describe('Vuex store mutations', () => {
 			},
 			tagList: [],
 			tags: {},
-			preferences:{'sort-order': 'newest'} ,
+			preferences: { 'sort-order': 'newest' },
 		})
 	})
 
 	it('removes an envelope', () => {
-		const state = {
-			accounts: {
+		store.$patch({
+			accountsUnmapped: {
 				[UNIFIED_ACCOUNT_ID]: {
 					accountId: UNIFIED_ACCOUNT_ID,
 					id: UNIFIED_ACCOUNT_ID,
@@ -914,14 +884,14 @@ describe('Vuex store mutations', () => {
 			},
 			tagList: [],
 			tags: {},
-		}
+		})
 
-		mutations.removeEnvelope(state, {
+		store.removeEnvelopeMutation({
 			id: 12345,
 		})
 
-		expect(state).toEqual({
-			accounts: {
+		expect(store).toMatchObject({
+			accountsUnmapped: {
 				[UNIFIED_ACCOUNT_ID]: {
 					accountId: UNIFIED_ACCOUNT_ID,
 					id: UNIFIED_ACCOUNT_ID,
@@ -972,7 +942,7 @@ describe('Vuex store mutations', () => {
 			mailboxId: 27,
 			uid: 12345,
 		}
-		const state = {
+		store.$patch({
 			mailboxes: {
 				27: {
 					databaseId: 27,
@@ -984,9 +954,9 @@ describe('Vuex store mutations', () => {
 			},
 			tagList: [],
 			tags: {},
-		}
+		})
 
-		mutations.addEnvelopeThread(state, {
+		store.addEnvelopeThreadMutation({
 			id: 123,
 			thread: [
 				{
@@ -1007,7 +977,7 @@ describe('Vuex store mutations', () => {
 			],
 		})
 
-		expect(state).toEqual({
+		expect(store).toMatchObject({
 			mailboxes: {
 				27: {
 					databaseId: 27,
@@ -1048,8 +1018,8 @@ describe('Vuex store mutations', () => {
 	})
 
 	it('normalizes tags from envelopes', () => {
-		const state = {
-			accounts: {
+		store.$patch({
+			accountsUnmapped: {
 				[UNIFIED_ACCOUNT_ID]: {
 					accountId: UNIFIED_ACCOUNT_ID,
 					id: UNIFIED_ACCOUNT_ID,
@@ -1066,12 +1036,12 @@ describe('Vuex store mutations', () => {
 			},
 			tagList: [],
 			tags: {},
-			preferences:{'sort-order': 'newest'} ,
-		}
+			preferences: { 'sort-order': 'newest' },
+		})
 
-		mutations.addEnvelopes(state, {
+		store.addEnvelopesMutation({
 			query: undefined,
-			envelopes:[ {
+			envelopes: [{
 				mailboxId: 27,
 				databaseId: 12345,
 				id: 123,
@@ -1090,8 +1060,8 @@ describe('Vuex store mutations', () => {
 			}],
 		})
 
-		expect(state).toEqual({
-			accounts: {
+		expect(store).toMatchObject({
+			accountsUnmapped: {
 				[UNIFIED_ACCOUNT_ID]: {
 					accountId: UNIFIED_ACCOUNT_ID,
 					id: UNIFIED_ACCOUNT_ID,
@@ -1130,7 +1100,7 @@ describe('Vuex store mutations', () => {
 					isDefaultTag: true,
 				},
 			},
-			preferences:{'sort-order': 'newest'} ,
+			preferences: { 'sort-order': 'newest' },
 		})
 	})
 
@@ -1148,7 +1118,7 @@ describe('Vuex store mutations', () => {
 			mailboxId: 27,
 			uid: 12345,
 		}
-		const state = {
+		store.$patch({
 			mailboxes: {
 				27: {
 					databaseId: 27,
@@ -1161,9 +1131,9 @@ describe('Vuex store mutations', () => {
 			// State contains old version of envelope with no label
 			tagList: [],
 			tags: {},
-		}
+		})
 
-		mutations.addEnvelopeThread(state, {
+		store.addEnvelopeThreadMutation({
 			id: 123,
 			thread: [
 				{
@@ -1185,7 +1155,7 @@ describe('Vuex store mutations', () => {
 			],
 		})
 
-		expect(state).toEqual({
+		expect(store).toMatchObject({
 			mailboxes: {
 				27: {
 					databaseId: 27,
@@ -1235,7 +1205,7 @@ describe('Vuex store mutations', () => {
 			uid: 12345,
 			accountId: 1,
 		}
-		const state = {
+		store.$patch({
 			mailboxes: {
 				27: {
 					databaseId: 27,
@@ -1248,9 +1218,9 @@ describe('Vuex store mutations', () => {
 			// State contains old version of envelope with no label
 			tagList: [],
 			tags: {},
-		}
+		})
 
-		mutations.updateEnvelope(state, {
+		store.updateEnvelopeMutation({
 			envelope: {
 				...envelope,
 				tags: {
@@ -1266,7 +1236,7 @@ describe('Vuex store mutations', () => {
 			},
 		})
 
-		expect(state).toEqual({
+		expect(store).toMatchObject({
 			mailboxes: {
 				27: {
 					databaseId: 27,
@@ -1316,21 +1286,21 @@ describe('Vuex store mutations', () => {
 			uid: 321,
 			tags: [tag.id],
 		}
-		const state = {
+		store.$patch({
 			envelopes: {
 				[envelope.databaseId]: envelope,
 			},
 			tags: {
 				[tag.id]: tag,
 			},
-		}
+		})
 
-		mutations.removeEnvelopeTag(state, {
+		store.removeEnvelopeTagMutation({
 			envelope,
 			tagId: tag.id,
 		})
 
-		expect(state).toEqual({
+		expect(store).toMatchObject({
 			envelopes: {
 				12345: {
 					mailboxId: 27,
@@ -1364,21 +1334,21 @@ describe('Vuex store mutations', () => {
 			uid: 321,
 			tags: [],
 		}
-		const state = {
+		store.$patch({
 			envelopes: {
 				[envelope.databaseId]: envelope,
 			},
 			tags: {
 				[tag.id]: tag,
 			},
-		}
+		})
 
-		mutations.addEnvelopeTag(state, {
+		store.addEnvelopeTagMutation({
 			envelope,
 			tagId: tag.id,
 		})
 
-		expect(state).toEqual({
+		expect(store).toMatchObject({
 			envelopes: {
 				12345: {
 					mailboxId: 27,
@@ -1396,12 +1366,12 @@ describe('Vuex store mutations', () => {
 	})
 
 	it('adds a global tag', () => {
-		const state = {
+		store.$patch({
 			tagList: [],
 			tags: {},
-		}
+		})
 
-		mutations.addTag(state, {
+		store.addTagMutation({
 			tag: {
 				id: 1,
 				userId: 'user',
@@ -1412,7 +1382,7 @@ describe('Vuex store mutations', () => {
 			},
 		})
 
-		expect(state).toEqual({
+		expect(store).toMatchObject({
 			tagList: [
 				1,
 			],
@@ -1430,7 +1400,7 @@ describe('Vuex store mutations', () => {
 	})
 
 	it('replace envelope for existing thread root id', () => {
-		const state = {
+		store.$patch({
 			accounts: {
 				[UNIFIED_ACCOUNT_ID]: {
 					accountId: UNIFIED_ACCOUNT_ID,
@@ -1448,10 +1418,10 @@ describe('Vuex store mutations', () => {
 			},
 			tagList: [],
 			tags: {},
-			preferences:{'sort-order': 'newest'} ,
-		}
+			preferences: { 'sort-order': 'newest' },
+		})
 
-		mutations.addEnvelopes(state, {
+		store.addEnvelopesMutation({
 			query: undefined,
 			envelopes: [{
 				mailboxId: 27,
@@ -1463,11 +1433,11 @@ describe('Vuex store mutations', () => {
 			}],
 		})
 
-		expect(state.mailboxes[27].envelopeLists[''].length).toEqual(1)
+		expect(store.mailboxes[27].envelopeLists[''].length).toEqual(1)
 
-		mutations.addEnvelopes(state, {
+		store.addEnvelopesMutation({
 			query: undefined,
-			envelopes:[ {
+			envelopes: [{
 				mailboxId: 27,
 				databaseId: 12347,
 				id: 234,
@@ -1477,6 +1447,6 @@ describe('Vuex store mutations', () => {
 			}],
 		})
 
-		expect(state.mailboxes[27].envelopeLists[''].length).toEqual(1)
+		expect(store.mailboxes[27].envelopeLists[''].length).toEqual(1)
 	})
 })
diff --git a/src/store/calendar.js b/src/util/calendar.js
similarity index 100%
rename from src/store/calendar.js
rename to src/util/calendar.js
diff --git a/src/store/normalization.js b/src/util/normalization.js
similarity index 100%
rename from src/store/normalization.js
rename to src/util/normalization.js
diff --git a/src/views/Home.vue b/src/views/Home.vue
index 12a7bc0b86..636c61c67a 100644
--- a/src/views/Home.vue
+++ b/src/views/Home.vue
@@ -30,7 +30,8 @@ import MailboxThread from '../components/MailboxThread.vue'
 import Navigation from '../components/Navigation.vue'
 import Outbox from '../components/Outbox.vue'
 import ComposerSessionIndicator from '../components/ComposerSessionIndicator.vue'
-import { mapGetters } from 'vuex'
+import { mapStores, mapState } from 'pinia'
+import useMainStore from '../store/mainStore.js'
 
 export default {
 	name: 'Home',
@@ -50,12 +51,13 @@ export default {
 		}
 	},
 	computed: {
-		...mapGetters(['composerSessionId']),
+		...mapStores(useMainStore),
+		...mapState(useMainStore, ['composerSessionId']),
 		activeAccount() {
-			return this.$store.getters.getAccount(this.activeMailbox?.accountId)
+			return this.mainStore.getAccount(this.activeMailbox?.accountId)
 		},
 		activeMailbox() {
-			return this.$store.getters.getMailbox(this.$route.params.mailboxId)
+			return this.mainStore.getMailbox(this.$route.params.mailboxId)
 		},
 		menu() {
 			return this.buildMenu()
@@ -81,7 +83,7 @@ export default {
 		},
 	},
 	async beforeMount() {
-		const accounts = this.$store.getters.accounts.filter((a) => !a.isUnified)
+		const accounts = this.mainStore.getAccounts.filter((a) => !a.isUnified)
 		this.accounts = await Promise.all(
 			 accounts.map(async (account) => {
 				return { ...account, connectionStatus: await testAccountConnection(account.id) }
@@ -89,9 +91,9 @@ export default {
 
 	},
 	created() {
-		const accounts = this.$store.getters.accounts
-		let startMailboxId = this.$store.getters.getPreference('start-mailbox-id')
-		if (startMailboxId && !this.$store.getters.getMailbox(startMailboxId)) {
+		const accounts = this.mainStore.getAccounts
+		let startMailboxId = this.mainStore.getPreference('start-mailbox-id')
+		if (startMailboxId && !this.mainStore.getMailbox(startMailboxId)) {
 			// The start ID is set but the mailbox doesn't exist anymore
 			startMailboxId = null
 		}
@@ -108,7 +110,7 @@ export default {
 			// Show first account
 			const firstAccount = accounts[0]
 			// FIXME: this assumes that there's at least one mailbox
-			const firstMailbox = this.$store.getters.getMailboxes(firstAccount.id)[0]
+			const firstMailbox = this.mainStore.getMailboxes(firstAccount.id)[0]
 
 			console.debug('loading first mailbox of first account', firstAccount.id, firstMailbox.databaseId)
 
@@ -132,7 +134,7 @@ export default {
 			// Show first account
 			const firstAccount = accounts[0]
 			// FIXME: this assumes that there's at least one mailbox
-			const firstMailbox = this.$store.getters.getMailboxes(firstAccount.id)[0]
+			const firstMailbox = this.mainStore.getMailboxes(firstAccount.id)[0]
 
 			console.debug('loading composer with first account and mailbox', firstAccount.id, firstMailbox.id)
 
diff --git a/src/views/Setup.vue b/src/views/Setup.vue
index 72df59d686..09dab7222f 100644
--- a/src/views/Setup.vue
+++ b/src/views/Setup.vue
@@ -34,6 +34,8 @@ import AccountForm from '../components/AccountForm.vue'
 import IconMail from 'vue-material-design-icons/Email.vue'
 import Navigation from '../components/Navigation.vue'
 import logger from '../logger.js'
+import { mapStores } from 'pinia'
+import useMainStore from '../store/mainStore.js'
 
 export default {
 	name: 'Setup',
@@ -54,8 +56,9 @@ export default {
 		}
 	},
 	computed: {
+		...mapStores(useMainStore),
 		hasAccounts() {
-			return this.$store.getters.accounts.length > 1
+			return this.mainStore.getAccounts.length > 1
 		},
 	},
 	methods: {