diff --git a/src/App.vue b/src/App.vue
index 4f8f43f1b7..c8f67217af 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -48,9 +48,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() {
@@ -59,7 +59,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 9766d0318b..ff6254db51 100644
--- a/src/components/AccountDefaultsSettings.vue
+++ b/src/components/AccountDefaultsSettings.vue
@@ -74,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,
@@ -101,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,
@@ -128,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,
@@ -155,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,
@@ -182,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,
@@ -209,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 7bb0dbba32..40ca89004e 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 703ee899a0..c0ff045de4 100644
--- a/src/components/AccountSettings.vue
+++ b/src/components/AccountSettings.vue
@@ -104,6 +104,8 @@ import CertificateSettings from './CertificateSettings.vue'
 import SearchSettings from './SearchSettings.vue'
 import TrashRetentionSettings from './TrashRetentionSettings.vue'
 import logger from '../logger.js'
+import useMainStore from '../store/mainStore.js'
+import { mapStores } from 'pinia'
 
 export default {
 	name: 'AccountSettings',
@@ -139,6 +141,7 @@ export default {
 		}
 	},
 	computed: {
+		...mapStores(useMainStore),
 		displayName() {
 			return this.account.name
 		},
@@ -151,7 +154,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 7518230603..e77d2601a1 100755
--- a/src/components/AppSettingsMenu.vue
+++ b/src/components/AppSettingsMenu.vue
@@ -312,7 +312,6 @@ 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'
 
@@ -421,7 +420,7 @@ export default {
 			this.showAccountSettings = false
 		},
 		openAccountSettings(accountId) {
-			this.$store.commit('showSettingsForAccount', accountId)
+			this.mainStore.showSettingsForAccountMutation(accountId)
 			this.showSettings = false
 		},
 		checkMailvelope() {
@@ -429,7 +428,7 @@ export default {
 		},
 		async setLayout(layoutMode) {
 			try {
-				await this.$store.dispatch('savePreference', {
+				await this.mainStore.savePreference({
 					key: 'layout-mode',
 					value: layoutMode,
 				})
@@ -443,8 +442,7 @@ export default {
 		onToggleButtonReplies(e) {
 			this.loadingReplySettings = true
 
-			this.$store
-				.dispatch('savePreference', {
+			this.mainStore.savePreference({
 					key: 'reply-mode',
 					value: e.target.checked ? 'bottom' : 'top',
 				})
@@ -456,8 +454,7 @@ export default {
 		onToggleExternalAvatars(e) {
 			this.loadingAvatarSettings = true
 
-			this.$store
-				.dispatch('savePreference', {
+			this.mainStore.savePreference({
 					key: 'external-avatars',
 					value: e.target.checked ? 'true' : 'false',
 				})
@@ -469,8 +466,7 @@ export default {
 		async onToggleSearchPriorityBody(e) {
 			this.loadingPrioritySettings = true
 			try {
-				await this.$store
-					.dispatch('savePreference', {
+				await this.mainStore.savePreference({
 						key: 'search-priority-body',
 						value: e.target.checked ? 'true' : 'false',
 					})
@@ -483,8 +479,7 @@ export default {
 		onToggleCollectData(e) {
 			this.loadingOptOutSettings = true
 
-			this.$store
-				.dispatch('savePreference', {
+			this.mainStore.savePreference({
 					key: 'collect-data',
 					value: e.target.checked ? 'true' : 'false',
 				})
@@ -497,13 +492,11 @@ export default {
 			const previousValue = this.sortOrder
 			try {
 				this.sortOrder = e
-				await this.$store
-					.dispatch('savePreference', {
+				await this.mainStore.savePreference({
 						key: 'sort-order',
 						value: e,
 					})
-				this.$store.commit('removeAllEnvelopes')
-
+				this.mainStore.removeAllEnvelopesMutation()
 			} catch (error) {
 				Logger.error('could not save preferences', { error })
 				this.sortOrder = previousValue
@@ -514,8 +507,7 @@ export default {
 			this.toggleAutoTagging = true
 
 			try {
-				await this.$store
-					.dispatch('savePreference', {
+				await this.mainStore.savePreference({
 						key: 'tag-classified-messages',
 						value: e.target.checked ? 'true' : 'false',
 					})
@@ -529,7 +521,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',
 				})
@@ -540,7 +532,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..c7a3a05ba3 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(useMainState, {
 			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/ComposerSessionIndicator.vue b/src/components/ComposerSessionIndicator.vue
index 3e9a7be0d6..ca4ff9880e 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.showMessageComposer()
 		},
 		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..913fa77157 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,10 +44,12 @@ export default {
 			mode: this.account.editorMode,
 		}
 	},
+	computed: {
+		...mapStores(useMainStore),
+	},
 	watch: {
 		mode(val, oldVal) {
-			this.$store
-				.dispatch('patchAccount', {
+			this.mainStore.patchAccount({
 					account: this.account,
 					data: {
 						editorMode: val,
diff --git a/src/components/Envelope.vue b/src/components/Envelope.vue
index 635a71a9b5..e1dd7bedad 100644
--- a/src/components/Envelope.vue
+++ b/src/components/Envelope.vue
@@ -713,7 +713,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,
@@ -726,23 +726,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 })
 			}
 
 			/**
@@ -762,7 +762,7 @@ export default {
 				await this.$emit('delete', this.data.databaseId)
 			}
 
-			await this.$store.dispatch('toggleEnvelopeJunk', {
+			await this.mainStore.toggleEnvelopeJunk({
 				envelope: this.data,
 				removeEnvelope,
 			})
@@ -774,7 +774,7 @@ export default {
 			this.$emit('delete', this.data.databaseId)
 
 			try {
-				await this.$store.dispatch('deleteThread', {
+				await this.mainStore.deleteThread({
 					envelope: this.data,
 				})
 			} catch (error) {
@@ -808,7 +808,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,
 				})
@@ -822,11 +822,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,
@@ -842,7 +842,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'))
@@ -852,7 +852,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 568bb556e8..5e9f586a65 100644
--- a/src/components/EnvelopeList.vue
+++ b/src/components/EnvelopeList.vue
@@ -419,7 +419,7 @@ export default {
 		markSelectedSeenOrUnseen() {
 			const seen = !this.areAllSelectedRead
 			this.selectedEnvelopes.forEach((envelope) => {
-				this.$store.dispatch('toggleEnvelopeSeen', {
+				this.mainStore.toggleEnvelopeSeen({
 					envelope,
 					seen,
 				})
@@ -428,7 +428,7 @@ export default {
 		},
 		markSelectionImportant() {
 			this.selectedEnvelopes.forEach((envelope) => {
-				this.$store.dispatch('markEnvelopeImportantOrUnimportant', {
+				this.mainStore.markEnvelopeImportantOrUnimportant({
 					envelope,
 					addTag: true,
 				})
@@ -437,7 +437,7 @@ export default {
 		},
 		markSelectionUnimportant() {
 			this.selectedEnvelopes.forEach((envelope) => {
-				this.$store.dispatch('markEnvelopeImportantOrUnimportant', {
+				this.mainStore.markEnvelopeImportantOrUnimportant({
 					envelope,
 					addTag: false,
 				})
@@ -447,9 +447,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),
 					})
 				}
 			}
@@ -458,9 +458,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),
 					})
 				}
 			}
@@ -469,7 +469,7 @@ export default {
 		favoriteOrUnfavoriteAll() {
 			const favFlag = !this.areAllSelectedFavorite
 			this.selectedEnvelopes.forEach((envelope) => {
-				this.$store.dispatch('markEnvelopeFavoriteOrUnfavorite', {
+				this.mainStore.markEnvelopeFavoriteOrUnfavorite({
 					envelope,
 					favFlag,
 				})
@@ -497,7 +497,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 => {
@@ -521,7 +521,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,
@@ -579,7 +579,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 2a8008c1fd..41c359c5ee 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 7ad9332598..3220b553e2 100644
--- a/src/components/InternalAddress.vue
+++ b/src/components/InternalAddress.vue
@@ -108,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,
@@ -121,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 b67f215333..e6f469e5f0 100644
--- a/src/components/Mailbox.vue
+++ b/src/components/Mailbox.vue
@@ -155,7 +155,7 @@ export default {
 		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)
@@ -184,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,
@@ -231,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,
 				})
@@ -304,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) {
@@ -345,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,
 					})
@@ -360,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,
@@ -377,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,
@@ -397,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,
@@ -421,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/MailboxThread.vue b/src/components/MailboxThread.vue
index c17f169bb6..3a577c54a0 100644
--- a/src/components/MailboxThread.vue
+++ b/src/components/MailboxThread.vue
@@ -316,7 +316,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)
@@ -351,7 +351,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,8 +370,7 @@ export default {
 			logger.debug(`Saving mailbox ${this.mailbox.databaseId} as start mailbox`)
 
 			try {
-				await this.$store
-					.dispatch('savePreference', {
+				await this.mainStore.savePreference({
 						key: 'start-mailbox-id',
 						value: this.mailbox.databaseId,
 					})
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 a250f9ab89..4683aee2d3 100644
--- a/src/components/MenuEnvelope.vue
+++ b/src/components/MenuEnvelope.vue
@@ -427,7 +427,7 @@ export default {
 	},
 	methods: {
 		onForward() {
-			this.$store.dispatch('startComposerSession', {
+			this.mainStore.startComposerSession({
 				reply: {
 					mode: 'forward',
 					data: this.envelope,
@@ -443,11 +443,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,
@@ -467,7 +467,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'))
@@ -477,16 +477,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.
@@ -505,7 +505,7 @@ export default {
 				await this.$emit('delete', this.envelope.databaseId)
 			}
 
-			await this.$store.dispatch('toggleEnvelopeJunk', {
+			await this.mainStore.toggleEnvelopeJunk({
 				envelope: this.envelope,
 				removeEnvelope,
 			})
@@ -514,12 +514,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,
@@ -527,7 +527,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/MoveMailboxModal.vue b/src/components/MoveMailboxModal.vue
index 9aa2ce01d4..5bb9c7bcc5 100644
--- a/src/components/MoveMailboxModal.vue
+++ b/src/components/MoveMailboxModal.vue
@@ -54,7 +54,7 @@ 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,
@@ -63,7 +63,7 @@ export default {
 					} else {
 						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/NavigationAccount.vue b/src/components/NavigationAccount.vue
index ea480919a7..b06250d81f 100644
--- a/src/components/NavigationAccount.vue
+++ b/src/components/NavigationAccount.vue
@@ -191,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) {
@@ -226,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
@@ -243,19 +243,16 @@ 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', {
+			this.mainStore.patchAccount({
 					account: this.account,
 					data: {
 						showSubscribedOnly: onlySubscribed,
@@ -297,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..33ccc4b556 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,9 +42,8 @@ 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', {
+				await this.mainStore.toggleAccountCollapsedMutation(this.account.id)
+				await this.mainStore.setAccountSetting({
 						accountId: this.account.id,
 						key: 'collapsed',
 						value: this.account.collapsed,
diff --git a/src/components/NavigationMailbox.vue b/src/components/NavigationMailbox.vue
index 06295e3f87..7f3fd0ce6a 100644
--- a/src/components/NavigationMailbox.vue
+++ b/src/components/NavigationMailbox.vue
@@ -462,7 +462,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,
 				})
@@ -483,8 +483,7 @@ export default {
 		markAsRead() {
 			this.loadingMarkAsRead = true
 
-			this.$store
-				.dispatch('markMailboxRead', {
+			this.mainStore.markMailboxRead({
 					accountId: this.account.id,
 					mailboxId: this.mailbox.databaseId,
 				})
@@ -496,7 +495,7 @@ export default {
 			try {
 				this.changeSubscription = true
 
-				await this.$store.dispatch('changeMailboxSubscription', {
+				await this.mainStore.changeMailboxSubscription({
 					mailbox: this.mailbox,
 					subscribed,
 				})
@@ -511,7 +510,7 @@ export default {
 			try {
 				this.changingSyncInBackground = true
 
-				await this.$store.dispatch('patchMailbox', {
+				await this.mainStore.patchMailbox({
 					mailbox: this.mailbox,
 					attributes: {
 						syncInBackground,
@@ -553,8 +552,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`)
 							})
@@ -577,8 +575,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) {
@@ -604,7 +601,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,
@@ -634,7 +631,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 054f00a488..270b293881 100644
--- a/src/components/NewMessageButtonHeader.vue
+++ b/src/components/NewMessageButtonHeader.vue
@@ -70,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 })
@@ -79,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 688bb26e4a..897ac91956 100644
--- a/src/components/NewMessageModal.vue
+++ b/src/components/NewMessageModal.vue
@@ -131,14 +131,13 @@ 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 useMainStore from '../store/mainStore.js'
-import { mapStores } from 'pinia'
+import { mapStores, mapState } from 'pinia'
 
 export default {
 	name: 'NewMessageModal',
@@ -179,7 +178,7 @@ export default {
 	},
 	computed: {
 		...mapStores(useOutboxStore, useMainStore),
-		...mapGetters(['showMessageComposer', 'getPreference']),
+		...mapState(useMainStore, ['showMessageComposer', 'getPreference']),
 		modalTitle() {
 			if (this.composerMessage.type === 'outbox') {
 				return t('mail', 'Edit message')
@@ -235,7 +234,7 @@ export default {
 		async onMaximize() {
 			this.largerModal = !this.largerModal
 			try {
-				await this.$store.dispatch('savePreference', {
+				await this.mainStore.savePreference({
 					key: 'modalSize',
 					value: this.largerModal ? 'large' : 'normal',
 				})
@@ -271,7 +270,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
 
@@ -284,7 +283,7 @@ export default {
 						idToReturn = id
 					}
 
-					this.$store.commit('setComposerMessageSaved', true)
+					this.mainStore.setComposerMessageSavedMutation(true)
 
 					if (showToast) {
 						if (this.composerMessage.type === 'outbox') {
@@ -300,7 +299,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') {
@@ -410,9 +409,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, {
@@ -447,7 +446,7 @@ export default {
 			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,
@@ -482,7 +481,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) {
@@ -518,13 +517,13 @@ 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.showMessageComposer()
 			} else {
 				console.info('No unsaved changes. See you!')
 			}
@@ -532,20 +531,20 @@ export default {
 		async onMinimize() {
 			this.modalFirstOpen = false
 
-			await this.$store.dispatch('closeMessageComposer')
+			await this.mainStore.closeMessageComposer()
 			if (!this.mainStore.composerMessageIsSaved && this.changed) {
 				await this.onDraft(this.cookedComposerData, { showToast: true })
 			}
 
 		},
 		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/SearchSettings.vue b/src/components/SearchSettings.vue
index f3f6345a20..bcf42b229b 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,10 +32,12 @@ export default {
 			searchBody: this.account.searchBody,
 		}
 	},
+	computed: {
+		...mapStores(useMainStore),
+	}
 	watch: {
 		searchBody(val, oldVal) {
-			this.$store
-				.dispatch('patchAccount', {
+			this.mainStore.patchAccount({
 					account: this.account,
 					data: {
 						searchBody: val,
diff --git a/src/components/SieveAccountForm.vue b/src/components/SieveAccountForm.vue
index bc04e31eb5..f40de56506 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 5e940c1c0c..3fe9b78d74 100644
--- a/src/components/SieveFilterForm.vue
+++ b/src/components/SieveFilterForm.vue
@@ -77,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 47d34599f9..3a8506fdb9 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 7ee9fea20c..c30a105b16 100644
--- a/src/components/TagItem.vue
+++ b/src/components/TagItem.vue
@@ -110,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,
@@ -134,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,
@@ -175,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 41dc9bb46a..f933a7e491 100644
--- a/src/components/TagModal.vue
+++ b/src/components/TagModal.vue
@@ -167,7 +167,7 @@ export default {
 				return
 			}
 			try {
-				await this.$store.dispatch('createTag', {
+				await this.mainStore.createTag({
 					displayName,
 					color: randomColor(displayName),
 				})
@@ -204,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/Thread.vue b/src/components/Thread.vue
index c2efa8ebd7..b30fdbebf0 100644
--- a/src/components/Thread.vue
+++ b/src/components/Thread.vue
@@ -285,7 +285,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 9e42823e8b..2b6a5f3179 100644
--- a/src/components/ThreadEnvelope.vue
+++ b/src/components/ThreadEnvelope.vue
@@ -634,13 +634,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)
 				}
@@ -679,7 +679,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 })
@@ -693,7 +693,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 })
@@ -707,7 +707,7 @@ export default {
 			window.scrollTo({ top })
 		},
 		onReply(body = '', followUp = false) {
-			this.$store.dispatch('startComposerSession', {
+			this.mainStore.startComposerSession({
 				reply: {
 					mode: this.hasMultipleRecipients ? 'replyAll' : 'reply',
 					data: this.envelope,
@@ -717,16 +717,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
@@ -740,7 +740,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) {
@@ -767,7 +767,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,
 				})
@@ -777,7 +777,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/smime/SmimeCertificateModal.vue b/src/components/smime/SmimeCertificateModal.vue
index 14940b9d86..8d148087a4 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..b2fc3de2fb 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,12 @@
  * 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'
 
+const mainStore = useMainStore()
+
 export class DroppableMailbox {
 
 	constructor(el, componentInstance, options) {
@@ -123,7 +125,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/main.js b/src/main.js
index dbe3fa7738..37b4857302 100644
--- a/src/main.js
+++ b/src/main.js
@@ -21,6 +21,7 @@ import { fixAccountId } from './service/AccountService.js'
 import { loadState } from '@nextcloud/initial-state'
 import { createPinia, PiniaVuePlugin } from 'pinia'
 import useOutboxStore from './store/outboxStore.js'
+import useMainStore from './store/mainStore.js'
 
 // eslint-disable-next-line camelcase
 __webpack_nonce__ = btoa(getRequestToken())
@@ -29,6 +30,7 @@ __webpack_public_path__ = generateFilePath('mail', '', 'js/')
 
 Vue.use(PiniaVuePlugin)
 const pinia = createPinia()
+const mainStore = useMainStore()
 
 sync(store, router)
 
@@ -47,66 +49,66 @@ const getPreferenceFromPage = (key) => {
 
 registerDavProperty('nc:share-attributes', { nc: 'http://nextcloud.org/ns' })
 
-store.commit('savePreference', {
+mainStore.savePreferenceMutation({
 	key: 'debug',
 	value: loadState('mail', 'debug', false),
 })
-store.commit('savePreference', {
+mainStore.savePreferenceMutation({
 	key: 'ncVersion',
 	value: loadState('mail', 'ncVersion'),
 })
 
-store.commit('savePreference', {
+mainStore.savePreferenceMutation({
 	key: 'sort-order',
 	value: loadState('mail', 'sort-order', 'newest'),
 })
 
-store.commit('savePreference', {
+mainStore.savePreferenceMutation({
 	key: 'attachment-size-limit',
 	value: Number.parseInt(getPreferenceFromPage('attachment-size-limit'), 10),
 })
-store.commit('savePreference', {
+mainStore.savePreferenceMutation({
 	key: 'version',
 	value: getPreferenceFromPage('config-installed-version'),
 })
-store.commit('savePreference', {
+mainStore.savePreferenceMutation({
 	key: 'external-avatars',
 	value: getPreferenceFromPage('external-avatars'),
 })
-store.commit('savePreference', {
+mainStore.savePreferenceMutation({
 	key: 'collect-data',
 	value: getPreferenceFromPage('collect-data'),
 })
-store.commit('savePreference', {
+mainStore.savePreferenceMutation({
 	key: 'search-priority-body',
 	value: getPreferenceFromPage('search-priority-body'),
 })
 const startMailboxId = getPreferenceFromPage('start-mailbox-id')
-store.commit('savePreference', {
+mainStore.savePreferenceMutation({
 	key: 'start-mailbox-id',
 	value: startMailboxId ? parseInt(startMailboxId, 10) : null,
 })
-store.commit('savePreference', {
+mainStore.savePreferenceMutation({
 	key: 'tag-classified-messages',
 	value: getPreferenceFromPage('tag-classified-messages'),
 })
-store.commit('savePreference', {
+mainStore.savePreferenceMutation({
 	key: 'allow-new-accounts',
 	value: loadState('mail', 'allow-new-accounts', true),
 })
-store.commit('savePreference', {
+mainStore.savePreferenceMutation({
 	key: 'password-is-unavailable',
 	value: loadState('mail', 'password-is-unavailable', false),
 })
-store.commit('savePreference', {
+mainStore.savePreferenceMutation({
 	key: 'layout-mode',
 	value: getPreferenceFromPage('layout-mode'),
 })
-store.commit('savePreference', {
+mainStore.savePreferenceMutation({
 	key: 'follow-up-reminders',
 	value: getPreferenceFromPage('follow-up-reminders'),
 })
-store.commit('savePreference', {
+mainStore.savePreferenceMutation({
 	key: 'internal-addresses',
 	value: loadState('mail', 'internal-addresses', false),
 })
@@ -127,27 +129,27 @@ accounts.map(fixAccountId).forEach((account) => {
 	if (settings) {
 		delete settings.accountId
 		Object.entries(settings).forEach(([key, value]) => {
-			store.commit('setAccountSetting', {
+			mainStore.setAccountSettingMutation({
 				accountId: account.id,
 				key,
 				value,
 			})
 		})
 	}
-	store.commit('addAccount', { ...account, ...settings })
+	mainStore.addAccountMutation({ ...account, ...settings })
 })
 
-tags.forEach(tag => store.commit('addTag', { tag }))
-internalAddressesList.forEach(internalAddress => store.commit('addInternalAddress', internalAddress))
+tags.forEach(tag => mainStore.addTagMutation({ tag }))
+internalAddressesList.forEach(internalAddress => mainStore.addInternalAddressMutation(internalAddress))
 
-store.commit('setScheduledSendingDisabled', disableScheduledSend)
-store.commit('setSnoozeDisabled', disableSnooze)
-store.commit('setGoogleOauthUrl', googleOauthUrl)
-store.commit('setMicrosoftOauthUrl', microsoftOauthUrl)
-store.commit('setFollowUpFeatureAvailable', followUpFeatureAvailable)
+mainStore.setScheduledSendingDisabledMutation(disableScheduledSend)
+mainStore.setSnoozeDisabledMutation(disableSnooze)
+mainStore.setGoogleOauthUrlMutation(googleOauthUrl)
+mainStore.setMicrosoftOauthUrlMutation(microsoftOauthUrl)
+mainStore.setFollowUpFeatureAvailableMutation(followUpFeatureAvailable)
 
 const smimeCertificates = loadState('mail', 'smime-certificates', [])
-store.commit('setSmimeCertificates', smimeCertificates)
+mainStore.setSmimeCertificatesMutation(smimeCertificates)
 
 /* eslint-disable vue/match-component-file-name */
 export default new Vue({
diff --git a/src/store/outboxStore.js b/src/store/outboxStore.js
index 432ac55291..6a0a3602db 100644
--- a/src/store/outboxStore.js
+++ b/src/store/outboxStore.js
@@ -12,7 +12,9 @@ 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'
+
+const mainStore = useMainStore()
 
 export default defineStore('outbox', {
 	state: () => {
@@ -94,7 +96,7 @@ export default defineStore('outbox', {
 			this.addMessageMutation({ message })
 
 			// Future drafts/sends after an error should go through outbox logic
-			store.commit('convertComposerMessageToOutbox', { message }, {
+			mainStore.convertComposerMessageToOutboxMutation({ message }, {
 				root: true,
 			})
 
@@ -107,7 +109,7 @@ export default defineStore('outbox', {
 			this.addMessageMutation({ message })
 
 			// Future drafts/sends after an error should go through outbox logic
-			store.commit('convertComposerMessageToOutbox', { message }, {
+			mainStore.storeconvertComposerMessageToOutbox({ message }, {
 				root: true,
 			})
 
@@ -183,7 +185,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 mainStore.startComposerSession({
 							type: 'outbox',
 							data: {
 								...message,