diff --git a/src/App.vue b/src/App.vue
index 99644e408b..4f8f43f1b7 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -8,22 +8,24 @@
 </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'
 
 export default {
 	name: 'App',
 	computed: {
-		...mapGetters([
+		...mapStores(useMainStore),
+		...mapState(useMainStore, [
 			'isExpiredSession',
 		]),
 		hasMailAccounts() {
-			return !!this.$store.getters.accounts.find((account) => !account.isUnified)
+			return !!this.mainStore.accounts.find((account) => !account.isUnified)
 		},
 	},
 	watch: {
diff --git a/src/components/AccountDefaultsSettings.vue b/src/components/AccountDefaultsSettings.vue
index a59f76cd65..9766d0318b 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
 				}
@@ -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
 				}
@@ -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
 				}
@@ -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
 				}
@@ -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
 				}
@@ -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
 				}
diff --git a/src/components/AppSettingsMenu.vue b/src/components/AppSettingsMenu.vue
index 8d47b798ec..7518230603 100755
--- a/src/components/AppSettingsMenu.vue
+++ b/src/components/AppSettingsMenu.vue
@@ -313,6 +313,8 @@ 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 +368,33 @@ export default {
 		}
 	},
 	computed: {
-		...mapGetters([
-			'isFollowUpFeatureAvailable',
-		]),
-		...mapGetters({
-			accounts: 'accounts',
-		}),
+		...mapState(useMainStore, ['accounts', 'isFollowUpFeatureAvailable']),
 		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() {
diff --git a/src/components/Composer.vue b/src/components/Composer.vue
index 0a87822215..e26f27987e 100644
--- a/src/components/Composer.vue
+++ b/src/components/Composer.vue
@@ -495,9 +495,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)
 
@@ -693,11 +694,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
@@ -739,7 +739,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
@@ -880,7 +880,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)
 				}
@@ -967,7 +967,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', {
@@ -1031,7 +1031,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
@@ -1063,14 +1063,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
@@ -1405,7 +1405,7 @@ export default {
 			if (!certificateId) {
 				return undefined
 			}
-			return this.$store.getters.getSmimeCertificate(certificateId)
+			return this.mainStore.getSmimeCertificate(certificateId)
 		},
 
 		/**
diff --git a/src/components/Envelope.vue b/src/components/Envelope.vue
index 6a965aa56d..635a71a9b5 100644
--- a/src/components/Envelope.vue
+++ b/src/components/Envelope.vue
@@ -384,7 +384,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'
 
@@ -483,14 +484,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) {
@@ -509,7 +511,7 @@ export default {
 		},
 		account() {
 			const accountId = this.data.accountId
-			return this.$store.getters.getAccount(accountId)
+			return this.mainStore.getAccount(accountId)
 		},
 		link() {
 			if (this.draft) {
@@ -570,12 +572,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),
 			)
 
@@ -637,7 +639,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
diff --git a/src/components/EnvelopeList.vue b/src/components/EnvelopeList.vue
index dfb04846b1..568bb556e8 100644
--- a/src/components/EnvelopeList.vue
+++ b/src/components/EnvelopeList.vue
@@ -266,6 +266,8 @@ import ShareIcon from 'vue-material-design-icons/Share.vue'
 import AlertOctagonIcon from 'vue-material-design-icons/AlertOctagon.vue'
 import TagIcon from 'vue-material-design-icons/Tag.vue'
 import TagModal from './TagModal.vue'
+import useMainStore from '../store/mainStore.js'
+import { mapStores } from 'pinia'
 
 export default {
 	name: 'EnvelopeList',
@@ -328,8 +330,9 @@ export default {
 		}
 	},
 	computed: {
+		...mapStores(useMainStore),
 		sortOrder() {
-			return this.$store.getters.getPreference('sort-order', 'newest')
+			return this.mainStore.getPreference('sort-order', 'newest')
 		},
 
 		sortedEnvelops() {
@@ -351,7 +354,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')
 			})
@@ -359,7 +362,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')
 			})
diff --git a/src/components/InternalAddress.vue b/src/components/InternalAddress.vue
index 05c8043baf..7ad9332598 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'))
diff --git a/src/components/Mailbox.vue b/src/components/Mailbox.vue
index efa8b73209..b67f215333 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,7 +148,7 @@ export default {
 		this.loadMailboxInterval = setInterval(this.loadMailbox, 60000)
 	},
 	async mounted() {
-		if (this.$store.getters.hasFetchedInitialEnvelopes) {
+		if (this.mainStore.hasFetchedInitialEnvelopes) {
 			return
 		}
 
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 e9c9b24533..c17f169bb6 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}
@@ -244,7 +247,7 @@ export default {
 				return false
 			}
 
-			return this.$store.getters
+			return this.mainStore
 				.getEnvelopes(FOLLOW_UP_MAILBOX_ID, this.followUpQuery)
 				.length > 0
 		},
@@ -360,7 +363,7 @@ 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
 			}
diff --git a/src/components/MenuEnvelope.vue b/src/components/MenuEnvelope.vue
index e89b5fa713..a250f9ab89 100644
--- a/src/components/MenuEnvelope.vue
+++ b/src/components/MenuEnvelope.vue
@@ -242,7 +242,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',
@@ -310,12 +311,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) {
@@ -348,7 +350,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')
 		},
diff --git a/src/components/Message.vue b/src/components/Message.vue
index 11e87cf6be..2fdf6942d4 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
 		},
@@ -132,7 +135,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..9aa2ce01d4 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')
@@ -56,7 +61,7 @@ export default {
 						})
 
 					} 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', {
 							account: this.account,
diff --git a/src/components/Navigation.vue b/src/components/Navigation.vue
index fc9d72e74e..80a059c6c8 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.accounts
 				.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.accounts
 			return account === accounts[1]
 		},
 		isLast(account) {
-			const accounts = this.$store.getters.accounts
+			const accounts = this.mainStore.accounts
 			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
 		},
 	},
 }
diff --git a/src/components/NavigationAccount.vue b/src/components/NavigationAccount.vue
index a10ee64109..ea480919a7 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
diff --git a/src/components/NavigationMailbox.vue b/src/components/NavigationMailbox.vue
index 004616443a..06295e3f87 100644
--- a/src/components/NavigationMailbox.vue
+++ b/src/components/NavigationMailbox.vue
@@ -207,6 +207,8 @@ import { showInfo } 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',
@@ -279,6 +281,7 @@ export default {
 		}
 	},
 	computed: {
+		...mapStores(useMainStore),
 		visible() {
 			return (
 				(this.account.showSubscribedOnly === false
@@ -314,7 +317,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) {
@@ -362,7 +365,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.accounts.length > 2
 		},
 		showUnreadCounter() {
 			if (this.filter === 'starred' || this.mailbox.specialRole === 'trash') {
@@ -377,7 +380,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')
 			}
diff --git a/src/components/NewMessageButtonHeader.vue b/src/components/NewMessageButtonHeader.vue
index c156b8df90..054f00a488 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
 		},
diff --git a/src/components/NewMessageModal.vue b/src/components/NewMessageModal.vue
index 0beb0d2dcf..688bb26e4a 100644
--- a/src/components/NewMessageModal.vue
+++ b/src/components/NewMessageModal.vue
@@ -137,6 +137,7 @@ 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'
 
 export default {
@@ -177,7 +178,7 @@ export default {
 		}
 	},
 	computed: {
-		...mapStores(useOutboxStore),
+		...mapStores(useOutboxStore, useMainStore),
 		...mapGetters(['showMessageComposer', 'getPreference']),
 		modalTitle() {
 			if (this.composerMessage.type === 'outbox') {
@@ -195,10 +196,10 @@ export default {
 			return t('mail', 'New message')
 		},
 		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 ?? []
@@ -225,7 +226,7 @@ export default {
 	methods: {
 		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)
@@ -443,7 +444,7 @@ 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', {
@@ -532,7 +533,7 @@ export default {
 			this.modalFirstOpen = false
 
 			await this.$store.dispatch('closeMessageComposer')
-			if (!this.$store.getters.composerMessageIsSaved && this.changed) {
+			if (!this.mainStore.composerMessageIsSaved && this.changed) {
 				await this.onDraft(this.cookedComposerData, { showToast: true })
 			}
 
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 ceaf71e6a6..8b5c6bbfdf 100644
--- a/src/components/SearchMessages.vue
+++ b/src/components/SearchMessages.vue
@@ -306,6 +306,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)
 
@@ -368,8 +370,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
 				}
@@ -391,10 +394,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/SieveFilterForm.vue b/src/components/SieveFilterForm.vue
index b9e91f28c0..5e940c1c0c 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: {
diff --git a/src/components/TagItem.vue b/src/components/TagItem.vue
index b0aaa41aab..7ee9fea20c 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() {
@@ -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,
 					)
 				),
diff --git a/src/components/TagModal.vue b/src/components/TagModal.vue
index f7f35522af..41dc9bb46a 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
 			}
diff --git a/src/components/TaskModal.vue b/src/components/TaskModal.vue
index 0b66d0bd76..d8f13509db 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 d193889ee3..c2efa8ebd7 100644
--- a/src/components/Thread.vue
+++ b/src/components/Thread.vue
@@ -74,6 +74,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',
@@ -104,6 +106,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}`
@@ -112,19 +115,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 = []
diff --git a/src/components/ThreadEnvelope.vue b/src/components/ThreadEnvelope.vue
index fc501a8a8b..9e42823e8b 100644
--- a/src/components/ThreadEnvelope.vue
+++ b/src/components/ThreadEnvelope.vue
@@ -302,10 +302,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
@@ -403,7 +404,7 @@ export default {
 		}
 	},
 	computed: {
-		...mapStores(useOutboxStore),
+		...mapStores(useOutboxStore, useMainStore),
 		inlineMenuSize() {
 			// eslint-disable-next-line no-unused-expressions
 			const { envelope } = this.$refs
@@ -412,7 +413,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) {
@@ -449,12 +450,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),
 			)
 		},
@@ -507,10 +508,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)}}
@@ -558,7 +559,7 @@ export default {
 				return false
 			}
 
-			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)
 		},
 		/**
@@ -597,8 +598,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
diff --git a/src/store/mainStore/getters.js b/src/store/mainStore/getters.js
index ecd3d8a3a7..45b13ce688 100644
--- a/src/store/mainStore/getters.js
+++ b/src/store/mainStore/getters.js
@@ -10,7 +10,7 @@ import { normalizedEnvelopeListId } from '../../util/normalization.js'
 import { getCalendarHome } from '../../service/caldavService.js'
 import toCalendar from '../../util/calendar.js'
 
-export default function mainStoreGetters() {
+export default function mainStoreGetters() {	
 	return {
 		getPreference: (state) => (key, def) => {
 			return defaultTo(def, state.preferences[key])
@@ -21,9 +21,6 @@ export default function mainStoreGetters() {
 		getAccount: (state) => (id) => {
 			return state.accounts[id]
 		},
-		getAllAccountSettings: (state) => {
-			return state.allAccountSettings
-		},
 		accounts: (state) => {
 			return state.accountList.map((id) => state.accounts[id])
 		},
diff --git a/src/views/Home.vue b/src/views/Home.vue
index 12a7bc0b86..c3a1b7d119 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.accounts.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.accounts
+		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..8bbcb34441 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.accounts.length > 1
 		},
 	},
 	methods: {