diff --git a/changelog/unreleased/change-message-handling b/changelog/unreleased/change-message-handling
new file mode 100644
index 00000000000..384ad1108d5
--- /dev/null
+++ b/changelog/unreleased/change-message-handling
@@ -0,0 +1,8 @@
+Change: Message handling to pinia
+
+BREAKING CHANGE for developers: Messages are no longer stored in a vuex store but in pinia instead. This means to display a message in the UI, you need to use the new `useMessages` composable.
+
+For more details please see the linked PR down below.
+
+https://github.com/owncloud/web/pull/10309
+https://github.com/owncloud/web/issues/10210
diff --git a/packages/web-app-admin-settings/src/components/General/AppearanceSection.vue b/packages/web-app-admin-settings/src/components/General/AppearanceSection.vue
index c064257c9f0..bd055b59027 100644
--- a/packages/web-app-admin-settings/src/components/General/AppearanceSection.vue
+++ b/packages/web-app-admin-settings/src/components/General/AppearanceSection.vue
@@ -65,7 +65,7 @@ export default defineComponent({
 
     const logoInput: VNodeRef = ref(null)
 
-    const { actions: resetLogoActions } = useGeneralActionsResetLogo({ store })
+    const { actions: resetLogoActions } = useGeneralActionsResetLogo()
     const { actions: uploadLogoActions, uploadImage } = useGeneralActionsUploadLogo({
       imageInput: logoInput
     })
diff --git a/packages/web-app-admin-settings/src/components/Groups/ContextActions.vue b/packages/web-app-admin-settings/src/components/Groups/ContextActions.vue
index da27eecda6b..3472522b68e 100644
--- a/packages/web-app-admin-settings/src/components/Groups/ContextActions.vue
+++ b/packages/web-app-admin-settings/src/components/Groups/ContextActions.vue
@@ -24,7 +24,7 @@ export default defineComponent({
   setup(props) {
     const store = useStore()
     const { actions: showDetailsActions } = useActionsShowDetails()
-    const { actions: deleteActions } = useGroupActionsDelete({ store })
+    const { actions: deleteActions } = useGroupActionsDelete()
     const { actions: editActions } = useGroupActionsEdit()
 
     const menuItemsPrimaryActions = computed(() =>
diff --git a/packages/web-app-admin-settings/src/components/Groups/CreateGroupModal.vue b/packages/web-app-admin-settings/src/components/Groups/CreateGroupModal.vue
index da1bb2c796e..28a7936c37a 100644
--- a/packages/web-app-admin-settings/src/components/Groups/CreateGroupModal.vue
+++ b/packages/web-app-admin-settings/src/components/Groups/CreateGroupModal.vue
@@ -17,7 +17,7 @@
 import { useGettext } from 'vue3-gettext'
 import { computed, defineComponent, ref, PropType, unref, watch } from 'vue'
 import { Group } from '@ownclouders/web-client/src/generated'
-import { MaybeRef, Modal, useClientService, useEventBus, useStore } from '@ownclouders/web-pkg'
+import { MaybeRef, Modal, useClientService, useEventBus, useMessages } from '@ownclouders/web-pkg'
 
 export default defineComponent({
   name: 'CreateGroupModal',
@@ -27,7 +27,7 @@ export default defineComponent({
   emits: ['confirm', 'update:confirmDisabled'],
   setup(props, { emit, expose }) {
     const { $gettext } = useGettext()
-    const store = useStore()
+    const { showMessage, showErrorMessage } = useMessages()
     const eventBus = useEventBus()
     const clientService = useClientService()
 
@@ -61,15 +61,13 @@ export default defineComponent({
       try {
         const client = clientService.graphAuthenticated
         const response = await client.groups.createGroup(unref(group))
-        store.dispatch('showMessage', {
-          title: $gettext('Group was created successfully')
-        })
+        showMessage({ title: $gettext('Group was created successfully') })
         eventBus.publish('app.admin-settings.groups.add', { ...response?.data, members: [] })
       } catch (error) {
         console.error(error)
-        store.dispatch('showErrorMessage', {
+        showErrorMessage({
           title: $gettext('Failed to create group'),
-          error
+          errors: [error]
         })
       }
     }
diff --git a/packages/web-app-admin-settings/src/components/Users/AddToGroupsModal.vue b/packages/web-app-admin-settings/src/components/Users/AddToGroupsModal.vue
index bf656e28494..9027c195f29 100644
--- a/packages/web-app-admin-settings/src/components/Users/AddToGroupsModal.vue
+++ b/packages/web-app-admin-settings/src/components/Users/AddToGroupsModal.vue
@@ -12,11 +12,11 @@ import { useGettext } from 'vue3-gettext'
 import { Group, User } from '@ownclouders/web-client/src/generated'
 import GroupSelect from './GroupSelect.vue'
 import {
-  useStore,
   useEventBus,
   useClientService,
   useConfigurationManager,
-  Modal
+  Modal,
+  useMessages
 } from '@ownclouders/web-pkg'
 
 export default defineComponent({
@@ -35,7 +35,7 @@ export default defineComponent({
   },
   emits: ['update:confirmDisabled'],
   setup(props, { emit, expose }) {
-    const store = useStore()
+    const { showMessage, showErrorMessage } = useMessages()
     const clientService = useClientService()
     const configurationManager = useConfigurationManager()
     const eventBus = useEventBus()
@@ -75,7 +75,7 @@ export default defineComponent({
           'Group assignments already added',
           props.users.length * unref(selectedOptions).length
         )
-        store.dispatch('showMessage', { title })
+        showMessage({ title })
         return
       }
 
@@ -95,7 +95,7 @@ export default defineComponent({
                 { groupAssignmentCount: succeeded.length.toString() },
                 true
               )
-        store.dispatch('showMessage', { title })
+        showMessage({ title })
       }
 
       const failed = results.filter((r) => r.status === 'rejected')
@@ -114,7 +114,7 @@ export default defineComponent({
                 { groupAssignmentCount: failed.length.toString() },
                 true
               )
-        store.dispatch('showErrorMessage', {
+        showErrorMessage({
           title,
           errors: (failed as PromiseRejectedResult[]).map((f) => f.reason)
         })
diff --git a/packages/web-app-admin-settings/src/components/Users/ContextActions.vue b/packages/web-app-admin-settings/src/components/Users/ContextActions.vue
index 367a3bd748e..0a42c5e81c2 100644
--- a/packages/web-app-admin-settings/src/components/Users/ContextActions.vue
+++ b/packages/web-app-admin-settings/src/components/Users/ContextActions.vue
@@ -33,7 +33,7 @@ export default defineComponent({
     const { actions: showDetailsActions } = useActionsShowDetails()
     const { actions: editQuotaActions } = useUserActionsEditQuota()
     const { actions: userEditActions } = useUserActionsEdit()
-    const { actions: userDeleteActions } = useUserActionsDelete({ store })
+    const { actions: userDeleteActions } = useUserActionsDelete()
 
     const menuItemsPrimaryActions = computed(() =>
       [...unref(userEditActions), ...unref(userDeleteActions)].filter((item) =>
diff --git a/packages/web-app-admin-settings/src/components/Users/CreateUserModal.vue b/packages/web-app-admin-settings/src/components/Users/CreateUserModal.vue
index 426c18117a2..0bf4eb496fc 100644
--- a/packages/web-app-admin-settings/src/components/Users/CreateUserModal.vue
+++ b/packages/web-app-admin-settings/src/components/Users/CreateUserModal.vue
@@ -47,14 +47,14 @@
 import { useGettext } from 'vue3-gettext'
 import { computed, defineComponent, ref, unref, PropType, watch } from 'vue'
 import * as EmailValidator from 'email-validator'
-import { Modal, useClientService, useEventBus, useStore } from '@ownclouders/web-pkg'
+import { Modal, useClientService, useEventBus, useMessages } from '@ownclouders/web-pkg'
 
 export default defineComponent({
   name: 'CreateUserModal',
   props: { modal: { type: Object as PropType<Modal>, required: true } },
   emits: ['confirm', 'update:confirmDisabled'],
   setup(props, { emit, expose }) {
-    const store = useStore()
+    const { showMessage, showErrorMessage } = useMessages()
     const eventBus = useEventBus()
     const clientService = useClientService()
     const { $gettext } = useGettext()
@@ -111,15 +111,13 @@ export default defineComponent({
         const { data } = await client.users.createUser(unref(user))
         const { id: createdUserId } = data
         const { data: createdUser } = await client.users.getUser(createdUserId)
-        store.dispatch('showMessage', {
-          title: $gettext('User was created successfully')
-        })
+        showMessage({ title: $gettext('User was created successfully') })
         eventBus.publish('app.admin-settings.users.add', createdUser)
       } catch (error) {
         console.error(error)
-        store.dispatch('showErrorMessage', {
+        showErrorMessage({
           title: $gettext('Failed to create user'),
-          error
+          errors: [error]
         })
       }
     }
diff --git a/packages/web-app-admin-settings/src/components/Users/LoginModal.vue b/packages/web-app-admin-settings/src/components/Users/LoginModal.vue
index 956a36dc2af..4fca3d1241f 100644
--- a/packages/web-app-admin-settings/src/components/Users/LoginModal.vue
+++ b/packages/web-app-admin-settings/src/components/Users/LoginModal.vue
@@ -17,7 +17,13 @@
 import { computed, defineComponent, onMounted, PropType, ref, unref, watch } from 'vue'
 import { useGettext } from 'vue3-gettext'
 import { User } from '@ownclouders/web-client/src/generated'
-import { useClientService, useStore, useEventBus, useUserStore, Modal } from '@ownclouders/web-pkg'
+import {
+  useClientService,
+  useEventBus,
+  useUserStore,
+  Modal,
+  useMessages
+} from '@ownclouders/web-pkg'
 
 type LoginOption = {
   label: string
@@ -35,7 +41,7 @@ export default defineComponent({
   },
   emits: ['update:confirmDisabled'],
   setup(props, { emit, expose }) {
-    const store = useStore()
+    const { showMessage, showErrorMessage } = useMessages()
     const clientService = useClientService()
     const eventBus = useEventBus()
     const { $gettext, $ngettext } = useGettext()
@@ -93,7 +99,7 @@ export default defineComponent({
                 { userCount: succeeded.length.toString() },
                 true
               )
-        store.dispatch('showMessage', { title })
+        showMessage({ title })
       }
 
       const failed = results.filter((r) => r.status === 'rejected')
@@ -112,7 +118,7 @@ export default defineComponent({
                 { userCount: failed.length.toString() },
                 true
               )
-        store.dispatch('showErrorMessage', {
+        showErrorMessage({
           title,
           errors: (failed as PromiseRejectedResult[]).map((f) => f.reason)
         })
diff --git a/packages/web-app-admin-settings/src/components/Users/RemoveFromGroupsModal.vue b/packages/web-app-admin-settings/src/components/Users/RemoveFromGroupsModal.vue
index a56cf7e85ce..38a7a42b39e 100644
--- a/packages/web-app-admin-settings/src/components/Users/RemoveFromGroupsModal.vue
+++ b/packages/web-app-admin-settings/src/components/Users/RemoveFromGroupsModal.vue
@@ -11,7 +11,7 @@ import { defineComponent, PropType, ref, unref, watch } from 'vue'
 import { useGettext } from 'vue3-gettext'
 import { Group, User } from '@ownclouders/web-client/src/generated'
 import GroupSelect from './GroupSelect.vue'
-import { useStore, useEventBus, useClientService, Modal } from '@ownclouders/web-pkg'
+import { useEventBus, useClientService, Modal, useMessages } from '@ownclouders/web-pkg'
 
 export default defineComponent({
   name: 'RemoveFromGroupsModal',
@@ -29,7 +29,7 @@ export default defineComponent({
   },
   emits: ['update:confirmDisabled'],
   setup(props, { emit, expose }) {
-    const store = useStore()
+    const { showMessage, showErrorMessage } = useMessages()
     const clientService = useClientService()
     const eventBus = useEventBus()
     const { $gettext, $ngettext } = useGettext()
@@ -68,7 +68,7 @@ export default defineComponent({
           'Group assignments already removed',
           props.users.length * unref(selectedOptions).length
         )
-        store.dispatch('showMessage', { title })
+        showMessage({ title })
         return
       }
 
@@ -88,7 +88,7 @@ export default defineComponent({
                 { groupAssignmentCount: succeeded.length.toString() },
                 true
               )
-        store.dispatch('showMessage', { title })
+        showMessage({ title })
       }
 
       const failed = results.filter((r) => r.status === 'rejected')
@@ -107,7 +107,7 @@ export default defineComponent({
                 { groupAssignmentCount: failed.length.toString() },
                 true
               )
-        store.dispatch('showErrorMessage', {
+        showErrorMessage({
           title,
           errors: (failed as PromiseRejectedResult[]).map((f) => f.reason)
         })
diff --git a/packages/web-app-admin-settings/src/composables/actions/general/useGeneralActionsResetLogo.ts b/packages/web-app-admin-settings/src/composables/actions/general/useGeneralActionsResetLogo.ts
index e9c5f663589..f10f7b2b97b 100644
--- a/packages/web-app-admin-settings/src/composables/actions/general/useGeneralActionsResetLogo.ts
+++ b/packages/web-app-admin-settings/src/composables/actions/general/useGeneralActionsResetLogo.ts
@@ -1,11 +1,10 @@
-import { Store } from 'vuex'
 import { useGettext } from 'vue3-gettext'
 import { computed } from 'vue'
-import { useAbility, useClientService, useRouter, useStore } from '@ownclouders/web-pkg'
+import { useAbility, useClientService, useMessages, useRouter } from '@ownclouders/web-pkg'
 import { Action } from '@ownclouders/web-pkg'
 
-export const useGeneralActionsResetLogo = ({ store }: { store?: Store<any> }) => {
-  store = store || useStore()
+export const useGeneralActionsResetLogo = () => {
+  const { showMessage, showErrorMessage } = useMessages()
   const { $gettext } = useGettext()
   const ability = useAbility()
   const clientService = useClientService()
@@ -15,17 +14,15 @@ export const useGeneralActionsResetLogo = ({ store }: { store?: Store<any> }) =>
     try {
       const httpClient = clientService.httpAuthenticated
       await httpClient.delete('/branding/logo')
-      store.dispatch('showMessage', {
-        title: $gettext('Logo was reset successfully. Reloading page...')
-      })
+      showMessage({ title: $gettext('Logo was reset successfully. Reloading page...') })
       setTimeout(() => {
         router.go(0)
       }, 1000)
     } catch (e) {
       console.error(e)
-      store.dispatch('showErrorMessage', {
+      showErrorMessage({
         title: $gettext('Failed to reset logo'),
-        error: e
+        errors: [e]
       })
     }
   }
diff --git a/packages/web-app-admin-settings/src/composables/actions/general/useGeneralActionsUploadLogo.ts b/packages/web-app-admin-settings/src/composables/actions/general/useGeneralActionsUploadLogo.ts
index ab4c052c0ef..cc1d726706e 100644
--- a/packages/web-app-admin-settings/src/composables/actions/general/useGeneralActionsUploadLogo.ts
+++ b/packages/web-app-admin-settings/src/composables/actions/general/useGeneralActionsUploadLogo.ts
@@ -1,18 +1,11 @@
-import { Store } from 'vuex'
 import { supportedLogoMimeTypes } from '../../../defaults'
 import { computed, VNodeRef, unref } from 'vue'
-import { Action } from '@ownclouders/web-pkg'
-import { useAbility, useClientService, useRouter, useStore } from '@ownclouders/web-pkg'
+import { Action, useMessages } from '@ownclouders/web-pkg'
+import { useAbility, useClientService, useRouter } from '@ownclouders/web-pkg'
 import { useGettext } from 'vue3-gettext'
 
-export const useGeneralActionsUploadLogo = ({
-  store,
-  imageInput
-}: {
-  store?: Store<any>
-  imageInput: VNodeRef
-}) => {
-  store = store || useStore()
+export const useGeneralActionsUploadLogo = ({ imageInput }: { imageInput: VNodeRef }) => {
+  const { showMessage, showErrorMessage } = useMessages()
   const { $gettext } = useGettext()
   const ability = useAbility()
   const clientService = useClientService()
@@ -26,9 +19,7 @@ export const useGeneralActionsUploadLogo = ({
     }
 
     if (!supportedLogoMimeTypes.includes(file.type)) {
-      return store.dispatch('showErrorMessage', {
-        title: $gettext('The file type is unsupported')
-      })
+      return showErrorMessage({ title: $gettext('The file type is unsupported') })
     }
 
     try {
@@ -40,17 +31,15 @@ export const useGeneralActionsUploadLogo = ({
           'Content-Type': 'multipart/form-data'
         }
       })
-      store.dispatch('showMessage', {
-        title: $gettext('Logo was uploaded successfully')
-      })
+      showMessage({ title: $gettext('Logo was uploaded successfully') })
       setTimeout(() => {
         router.go(0)
       }, 1000)
     } catch (e) {
       console.error(e)
-      store.dispatch('showErrorMessage', {
+      showErrorMessage({
         title: $gettext('Failed to upload logo'),
-        error: e
+        errors: [e]
       })
     }
   }
diff --git a/packages/web-app-admin-settings/src/composables/actions/groups/useGroupActionsDelete.ts b/packages/web-app-admin-settings/src/composables/actions/groups/useGroupActionsDelete.ts
index 6055f227325..ccd7cd4a165 100644
--- a/packages/web-app-admin-settings/src/composables/actions/groups/useGroupActionsDelete.ts
+++ b/packages/web-app-admin-settings/src/composables/actions/groups/useGroupActionsDelete.ts
@@ -1,13 +1,12 @@
 import { computed } from 'vue'
-import { Store } from 'vuex'
-import { eventBus, useModals } from '@ownclouders/web-pkg'
-import { useClientService, useStore } from '@ownclouders/web-pkg'
+import { eventBus, useMessages, useModals } from '@ownclouders/web-pkg'
+import { useClientService } from '@ownclouders/web-pkg'
 import { GroupAction, GroupActionOptions } from '@ownclouders/web-pkg'
 import { useGettext } from 'vue3-gettext'
 import { Group } from '@ownclouders/web-client/src/generated'
 
-export const useGroupActionsDelete = ({ store }: { store?: Store<any> }) => {
-  store = store || useStore()
+export const useGroupActionsDelete = () => {
+  const { showMessage, showErrorMessage } = useMessages()
   const { $gettext, $ngettext } = useGettext()
   const clientService = useClientService()
   const { dispatchModal } = useModals()
@@ -29,7 +28,7 @@ export const useGroupActionsDelete = ({ store }: { store?: Store<any> }) => {
               { groupCount: succeeded.length.toString() },
               true
             )
-      store.dispatch('showMessage', { title })
+      showMessage({ title })
     }
 
     const failed = results.filter((r) => r.status === 'rejected')
@@ -46,7 +45,7 @@ export const useGroupActionsDelete = ({ store }: { store?: Store<any> }) => {
               { groupCount: failed.length.toString() },
               true
             )
-      store.dispatch('showErrorMessage', {
+      showErrorMessage({
         title,
         errors: (failed as PromiseRejectedResult[]).map((f) => f.reason)
       })
diff --git a/packages/web-app-admin-settings/src/composables/actions/users/useUserActionsDelete.ts b/packages/web-app-admin-settings/src/composables/actions/users/useUserActionsDelete.ts
index 8dc8f3aadeb..5ee86c78f29 100644
--- a/packages/web-app-admin-settings/src/composables/actions/users/useUserActionsDelete.ts
+++ b/packages/web-app-admin-settings/src/composables/actions/users/useUserActionsDelete.ts
@@ -1,13 +1,17 @@
 import { computed, unref } from 'vue'
-import { Store } from 'vuex'
-import { eventBus, useCapabilityDeleteUsersDisabled, useModals } from '@ownclouders/web-pkg'
-import { useClientService, useStore } from '@ownclouders/web-pkg'
+import {
+  eventBus,
+  useCapabilityDeleteUsersDisabled,
+  useMessages,
+  useModals
+} from '@ownclouders/web-pkg'
+import { useClientService } from '@ownclouders/web-pkg'
 import { UserAction, UserActionOptions } from '@ownclouders/web-pkg'
 import { useGettext } from 'vue3-gettext'
 import { User } from '@ownclouders/web-client/src/generated'
 
-export const useUserActionsDelete = ({ store }: { store?: Store<any> }) => {
-  store = store || useStore()
+export const useUserActionsDelete = () => {
+  const { showMessage, showErrorMessage } = useMessages()
   const { $gettext, $ngettext } = useGettext()
   const clientService = useClientService()
   const { dispatchModal } = useModals()
@@ -29,7 +33,7 @@ export const useUserActionsDelete = ({ store }: { store?: Store<any> }) => {
               { userCount: succeeded.length.toString() },
               true
             )
-      store.dispatch('showMessage', { title })
+      showMessage({ title })
     }
 
     const failed = results.filter((r) => r.status === 'rejected')
@@ -46,7 +50,7 @@ export const useUserActionsDelete = ({ store }: { store?: Store<any> }) => {
               { userCount: failed.length.toString() },
               true
             )
-      store.dispatch('showErrorMessage', {
+      showErrorMessage({
         title,
         errors: (failed as PromiseRejectedResult[]).map((f) => f.reason)
       })
diff --git a/packages/web-app-admin-settings/src/views/Groups.vue b/packages/web-app-admin-settings/src/views/Groups.vue
index 05a03d8a181..e8bc9027bce 100644
--- a/packages/web-app-admin-settings/src/views/Groups.vue
+++ b/packages/web-app-admin-settings/src/views/Groups.vue
@@ -71,6 +71,7 @@ import {
   eventBus,
   queryItemAsString,
   useClientService,
+  useMessages,
   useRouteQuery,
   useSideBar,
   useStore
@@ -94,6 +95,7 @@ export default defineComponent({
   },
   setup() {
     const store = useStore()
+    const { showErrorMessage } = useMessages()
     const groups = ref([])
     const template = ref()
     const selectedGroups = ref([])
@@ -124,7 +126,7 @@ export default defineComponent({
       })
     })
 
-    const { actions: deleteActions } = useGroupActionsDelete({ store })
+    const { actions: deleteActions } = useGroupActionsDelete()
     const batchActions = computed(() => {
       return [...unref(deleteActions)].filter((item) =>
         item.isEnabled({ resources: unref(selectedGroups) })
@@ -151,9 +153,9 @@ export default defineComponent({
         return updatedGroup
       } catch (error) {
         console.error(error)
-        store.dispatch('showErrorMessage', {
+        showErrorMessage({
           title: $gettext('Failed to edit group'),
-          error
+          errors: [error]
         })
       }
     }
diff --git a/packages/web-app-admin-settings/src/views/Users.vue b/packages/web-app-admin-settings/src/views/Users.vue
index 61d4a90e881..1c77fcccd59 100644
--- a/packages/web-app-admin-settings/src/views/Users.vue
+++ b/packages/web-app-admin-settings/src/views/Users.vue
@@ -163,7 +163,8 @@ import {
   useStore,
   SideBarPanel,
   SideBarPanelContext,
-  useUserStore
+  useUserStore,
+  useMessages
 } from '@ownclouders/web-pkg'
 import {
   computed,
@@ -197,6 +198,7 @@ export default defineComponent({
     const router = useRouter()
     const route = useRoute()
     const store = useStore()
+    const { showErrorMessage } = useMessages()
     const accessToken = useAccessToken({ store })
     const clientService = useClientService()
     const configurationManager = useConfigurationManager()
@@ -219,7 +221,7 @@ export default defineComponent({
     const { actions: createUserActions } = useUserActionsCreateUser()
     const createUserAction = computed(() => unref(createUserActions)[0])
 
-    const { actions: deleteActions } = useUserActionsDelete({ store })
+    const { actions: deleteActions } = useUserActionsDelete()
     const { actions: removeFromGroupsActions } = useUserActionsRemoveFromGroups({
       groups: writableGroups
     })
@@ -523,9 +525,9 @@ export default defineComponent({
         return updatedUser
       } catch (error) {
         console.error(error)
-        store.dispatch('showErrorMessage', {
+        showErrorMessage({
           title: $gettext('Failed to edit user'),
-          error
+          errors: [error]
         })
       }
     }
diff --git a/packages/web-app-admin-settings/tests/unit/components/Groups/CreateGroupModal.spec.ts b/packages/web-app-admin-settings/tests/unit/components/Groups/CreateGroupModal.spec.ts
index d2b34e85ae7..25e8ce24ab6 100644
--- a/packages/web-app-admin-settings/tests/unit/components/Groups/CreateGroupModal.spec.ts
+++ b/packages/web-app-admin-settings/tests/unit/components/Groups/CreateGroupModal.spec.ts
@@ -10,7 +10,7 @@ import {
 } from 'web-test-helpers'
 import { mock } from 'jest-mock-extended'
 import { AxiosResponse } from 'axios'
-import { Modal, eventBus } from '@ownclouders/web-pkg'
+import { Modal, eventBus, useMessages } from '@ownclouders/web-pkg'
 
 describe('CreateGroupModal', () => {
   describe('computed method "isFormInvalid"', () => {
@@ -60,18 +60,19 @@ describe('CreateGroupModal', () => {
   describe('method "onConfirm"', () => {
     it('should not create group if form is invalid', async () => {
       jest.spyOn(console, 'error').mockImplementation(() => undefined)
-      const { wrapper, storeOptions } = getWrapper()
+      const { wrapper } = getWrapper()
 
       const eventSpy = jest.spyOn(eventBus, 'publish')
       try {
         await wrapper.vm.onConfirm()
       } catch (error) {}
 
-      expect(storeOptions.actions.showMessage).not.toHaveBeenCalled()
+      const { showMessage } = useMessages()
+      expect(showMessage).not.toHaveBeenCalled()
       expect(eventSpy).not.toHaveBeenCalled()
     })
     it('should create group on success', async () => {
-      const { wrapper, mocks, storeOptions } = getWrapper()
+      const { wrapper, mocks } = getWrapper()
       mocks.$clientService.graphAuthenticated.groups.getGroup.mockRejectedValueOnce(new Error(''))
 
       wrapper.vm.group.displayName = 'foo bar'
@@ -84,14 +85,15 @@ describe('CreateGroupModal', () => {
       const eventSpy = jest.spyOn(eventBus, 'publish')
       await wrapper.vm.onConfirm()
 
-      expect(storeOptions.actions.showMessage).toHaveBeenCalled()
+      const { showMessage } = useMessages()
+      expect(showMessage).toHaveBeenCalled()
       expect(eventSpy).toHaveBeenCalled()
     })
 
     it('should show message on error', async () => {
       jest.spyOn(console, 'error').mockImplementation(() => undefined)
 
-      const { wrapper, mocks, storeOptions } = getWrapper()
+      const { wrapper, mocks } = getWrapper()
       mocks.$clientService.graphAuthenticated.groups.getGroup.mockRejectedValue(new Error(''))
 
       wrapper.vm.group.displayName = 'foo bar'
@@ -103,7 +105,8 @@ describe('CreateGroupModal', () => {
       const eventSpy = jest.spyOn(eventBus, 'publish')
       await wrapper.vm.onConfirm()
 
-      expect(storeOptions.actions.showErrorMessage).toHaveBeenCalled()
+      const { showErrorMessage } = useMessages()
+      expect(showErrorMessage).toHaveBeenCalled()
       expect(eventSpy).not.toHaveBeenCalled()
     })
   })
diff --git a/packages/web-app-admin-settings/tests/unit/components/Users/AddToGroupsModal.spec.ts b/packages/web-app-admin-settings/tests/unit/components/Users/AddToGroupsModal.spec.ts
index 0585443c88e..a9bfe450282 100644
--- a/packages/web-app-admin-settings/tests/unit/components/Users/AddToGroupsModal.spec.ts
+++ b/packages/web-app-admin-settings/tests/unit/components/Users/AddToGroupsModal.spec.ts
@@ -1,15 +1,13 @@
 import AddToGroupsModal from '../../../../src/components/Users/AddToGroupsModal.vue'
 import {
-  createStore,
   defaultComponentMocks,
   defaultPlugins,
-  defaultStoreMockOptions,
   mockAxiosResolve,
   shallowMount
 } from 'web-test-helpers'
 import { mock } from 'jest-mock-extended'
 import { Group, User } from '@ownclouders/web-client/src/generated'
-import { Modal, eventBus } from '@ownclouders/web-pkg'
+import { Modal, eventBus, useMessages } from '@ownclouders/web-pkg'
 
 describe('AddToGroupsModal', () => {
   it('renders the input', () => {
@@ -21,7 +19,7 @@ describe('AddToGroupsModal', () => {
     it('adds all users to the given groups', async () => {
       const users = [mock<User>({ memberOf: [] }), mock<User>({ memberOf: [] })]
       const groups = [mock<Group>(), mock<Group>()]
-      const { wrapper, mocks, storeOptions } = getWrapper({ users, groups })
+      const { wrapper, mocks } = getWrapper({ users, groups })
       mocks.$clientService.graphAuthenticated.groups.addMember.mockResolvedValue(undefined)
       mocks.$clientService.graphAuthenticated.users.getUser.mockResolvedValue(
         mockAxiosResolve({ id: 'e3515ffb-d264-4dfc-8506-6c239f6673b5' })
@@ -31,7 +29,8 @@ describe('AddToGroupsModal', () => {
       const eventSpy = jest.spyOn(eventBus, 'publish')
 
       await wrapper.vm.onConfirm()
-      expect(storeOptions.actions.showMessage).toHaveBeenCalled()
+      const { showMessage } = useMessages()
+      expect(showMessage).toHaveBeenCalled()
       expect(eventSpy).toHaveBeenCalled()
     })
 
@@ -40,7 +39,7 @@ describe('AddToGroupsModal', () => {
 
       const users = [mock<User>({ memberOf: [] }), mock<User>({ memberOf: [] })]
       const groups = [mock<Group>(), mock<Group>()]
-      const { wrapper, mocks, storeOptions } = getWrapper({ users, groups })
+      const { wrapper, mocks } = getWrapper({ users, groups })
       mocks.$clientService.graphAuthenticated.groups.addMember.mockRejectedValue(new Error(''))
       mocks.$clientService.graphAuthenticated.users.getUser.mockRejectedValue(new Error(''))
 
@@ -48,7 +47,8 @@ describe('AddToGroupsModal', () => {
       const eventSpy = jest.spyOn(eventBus, 'publish')
 
       await wrapper.vm.onConfirm()
-      expect(storeOptions.actions.showErrorMessage).toHaveBeenCalled()
+      const { showErrorMessage } = useMessages()
+      expect(showErrorMessage).toHaveBeenCalled()
       expect(eventSpy).not.toHaveBeenCalled()
     })
   })
@@ -56,12 +56,9 @@ describe('AddToGroupsModal', () => {
 
 function getWrapper({ users = [mock<User>()], groups = [mock<Group>()] } = {}) {
   const mocks = defaultComponentMocks()
-  const storeOptions = defaultStoreMockOptions
-  const store = createStore(storeOptions)
 
   return {
     mocks,
-    storeOptions,
     wrapper: shallowMount(AddToGroupsModal, {
       props: {
         modal: mock<Modal>(),
@@ -70,7 +67,7 @@ function getWrapper({ users = [mock<User>()], groups = [mock<Group>()] } = {}) {
       },
       global: {
         provide: mocks,
-        plugins: [...defaultPlugins(), store],
+        plugins: [...defaultPlugins()],
         stubs: { GroupSelect: true }
       }
     })
diff --git a/packages/web-app-admin-settings/tests/unit/components/Users/CreateUserModal.spec.ts b/packages/web-app-admin-settings/tests/unit/components/Users/CreateUserModal.spec.ts
index 971df49a7ec..add4090d547 100644
--- a/packages/web-app-admin-settings/tests/unit/components/Users/CreateUserModal.spec.ts
+++ b/packages/web-app-admin-settings/tests/unit/components/Users/CreateUserModal.spec.ts
@@ -1,16 +1,14 @@
 import CreateUserModal from '../../../../src/components/Users/CreateUserModal.vue'
 import {
-  createStore,
   defaultComponentMocks,
   defaultPlugins,
-  defaultStoreMockOptions,
   mockAxiosReject,
   mockAxiosResolve,
   shallowMount
 } from 'web-test-helpers'
 import { mock } from 'jest-mock-extended'
 import { AxiosResponse } from 'axios'
-import { Modal, eventBus } from '@ownclouders/web-pkg'
+import { Modal, eventBus, useMessages } from '@ownclouders/web-pkg'
 
 describe('CreateUserModal', () => {
   describe('computed method "isFormInvalid"', () => {
@@ -117,18 +115,19 @@ describe('CreateUserModal', () => {
   describe('method "onConfirm"', () => {
     it('should not create user if form is invalid', async () => {
       jest.spyOn(console, 'error').mockImplementation(() => undefined)
-      const { wrapper, storeOptions } = getWrapper()
+      const { wrapper } = getWrapper()
 
       const eventSpy = jest.spyOn(eventBus, 'publish')
       try {
         await wrapper.vm.onConfirm()
       } catch (error) {}
 
-      expect(storeOptions.actions.showMessage).not.toHaveBeenCalled()
+      const { showMessage } = useMessages()
+      expect(showMessage).not.toHaveBeenCalled()
       expect(eventSpy).not.toHaveBeenCalled()
     })
     it('should create user on success', async () => {
-      const { wrapper, mocks, storeOptions } = getWrapper()
+      const { wrapper, mocks } = getWrapper()
       mocks.$clientService.graphAuthenticated.users.getUser.mockRejectedValueOnce(new Error(''))
 
       wrapper.vm.user.onPremisesSamAccountName = 'foo'
@@ -150,14 +149,15 @@ describe('CreateUserModal', () => {
       const eventSpy = jest.spyOn(eventBus, 'publish')
       await wrapper.vm.onConfirm()
 
-      expect(storeOptions.actions.showMessage).toHaveBeenCalled()
+      const { showMessage } = useMessages()
+      expect(showMessage).toHaveBeenCalled()
       expect(eventSpy).toHaveBeenCalled()
     })
 
     it('should show message on error', async () => {
       jest.spyOn(console, 'error').mockImplementation(() => undefined)
 
-      const { wrapper, mocks, storeOptions } = getWrapper()
+      const { wrapper, mocks } = getWrapper()
       mocks.$clientService.graphAuthenticated.users.getUser.mockRejectedValue(new Error(''))
 
       wrapper.vm.user.onPremisesSamAccountName = 'foo'
@@ -175,7 +175,8 @@ describe('CreateUserModal', () => {
       const eventSpy = jest.spyOn(eventBus, 'publish')
       await wrapper.vm.onConfirm()
 
-      expect(storeOptions.actions.showErrorMessage).toHaveBeenCalled()
+      const { showErrorMessage } = useMessages()
+      expect(showErrorMessage).toHaveBeenCalled()
       expect(eventSpy).not.toHaveBeenCalled()
     })
   })
@@ -183,12 +184,9 @@ describe('CreateUserModal', () => {
 
 function getWrapper() {
   const mocks = defaultComponentMocks()
-  const storeOptions = defaultStoreMockOptions
-  const store = createStore(storeOptions)
 
   return {
     mocks,
-    storeOptions,
     wrapper: shallowMount(CreateUserModal, {
       props: {
         modal: mock<Modal>()
@@ -196,7 +194,7 @@ function getWrapper() {
       global: {
         mocks,
         provide: mocks,
-        plugins: [...defaultPlugins(), store]
+        plugins: [...defaultPlugins()]
       }
     })
   }
diff --git a/packages/web-app-admin-settings/tests/unit/components/Users/LoginModal.spec.ts b/packages/web-app-admin-settings/tests/unit/components/Users/LoginModal.spec.ts
index 5b9e34cb61a..c474c276ea6 100644
--- a/packages/web-app-admin-settings/tests/unit/components/Users/LoginModal.spec.ts
+++ b/packages/web-app-admin-settings/tests/unit/components/Users/LoginModal.spec.ts
@@ -1,15 +1,13 @@
 import LoginModal from '../../../../src/components/Users/LoginModal.vue'
 import {
-  createStore,
   defaultComponentMocks,
   defaultPlugins,
-  defaultStoreMockOptions,
   mockAxiosResolve,
   shallowMount
 } from 'web-test-helpers'
 import { mock } from 'jest-mock-extended'
 import { User } from '@ownclouders/web-client/src/generated'
-import { Modal, eventBus } from '@ownclouders/web-pkg'
+import { Modal, eventBus, useMessages } from '@ownclouders/web-pkg'
 
 describe('LoginModal', () => {
   it('renders the input including two options', () => {
@@ -23,7 +21,7 @@ describe('LoginModal', () => {
   describe('method "onConfirm"', () => {
     it('updates the login for all given users', async () => {
       const users = [mock<User>(), mock<User>()]
-      const { wrapper, mocks, storeOptions } = getWrapper(users)
+      const { wrapper, mocks } = getWrapper(users)
       mocks.$clientService.graphAuthenticated.users.editUser.mockResolvedValue(
         mockAxiosResolve({ id: 'e3515ffb-d264-4dfc-8506-6c239f6673b5' })
       )
@@ -34,7 +32,8 @@ describe('LoginModal', () => {
       const eventSpy = jest.spyOn(eventBus, 'publish')
 
       await wrapper.vm.onConfirm()
-      expect(storeOptions.actions.showMessage).toHaveBeenCalled()
+      const { showMessage } = useMessages()
+      expect(showMessage).toHaveBeenCalled()
       expect(eventSpy).toHaveBeenCalled()
       expect(mocks.$clientService.graphAuthenticated.users.editUser).toHaveBeenCalledTimes(
         users.length
@@ -57,24 +56,22 @@ describe('LoginModal', () => {
       jest.spyOn(console, 'error').mockImplementation(() => undefined)
 
       const users = [mock<User>(), mock<User>()]
-      const { wrapper, mocks, storeOptions } = getWrapper(users)
+      const { wrapper, mocks } = getWrapper(users)
       mocks.$clientService.graphAuthenticated.users.editUser.mockRejectedValue(new Error(''))
       mocks.$clientService.graphAuthenticated.users.getUser.mockRejectedValue(new Error(''))
 
       await wrapper.vm.onConfirm()
-      expect(storeOptions.actions.showErrorMessage).toHaveBeenCalled()
+      const { showErrorMessage } = useMessages()
+      expect(showErrorMessage).toHaveBeenCalled()
     })
   })
 })
 
 function getWrapper(users = [mock<User>()]) {
   const mocks = defaultComponentMocks()
-  const storeOptions = defaultStoreMockOptions
-  const store = createStore(storeOptions)
 
   return {
     mocks,
-    storeOptions,
     wrapper: shallowMount(LoginModal, {
       props: {
         modal: mock<Modal>(),
@@ -82,7 +79,7 @@ function getWrapper(users = [mock<User>()]) {
       },
       global: {
         provide: mocks,
-        plugins: [...defaultPlugins(), store]
+        plugins: [...defaultPlugins()]
       }
     })
   }
diff --git a/packages/web-app-admin-settings/tests/unit/components/Users/RemoveFromGroupsModal.spec.ts b/packages/web-app-admin-settings/tests/unit/components/Users/RemoveFromGroupsModal.spec.ts
index fe29c754eb2..9dfaf30d60d 100644
--- a/packages/web-app-admin-settings/tests/unit/components/Users/RemoveFromGroupsModal.spec.ts
+++ b/packages/web-app-admin-settings/tests/unit/components/Users/RemoveFromGroupsModal.spec.ts
@@ -1,15 +1,13 @@
 import RemoveFromGroupsModal from '../../../../src/components/Users/RemoveFromGroupsModal.vue'
 import {
-  createStore,
   defaultComponentMocks,
   defaultPlugins,
-  defaultStoreMockOptions,
   mockAxiosResolve,
   shallowMount
 } from 'web-test-helpers'
 import { mock } from 'jest-mock-extended'
 import { Group, User } from '@ownclouders/web-client/src/generated'
-import { Modal, eventBus } from '@ownclouders/web-pkg'
+import { Modal, eventBus, useMessages } from '@ownclouders/web-pkg'
 
 describe('RemoveFromGroupsModal', () => {
   it('renders the input', () => {
@@ -24,7 +22,7 @@ describe('RemoveFromGroupsModal', () => {
         mock<User>({ memberOf: [{ id: '1' }] })
       ]
       const groups = [mock<Group>({ id: '1' })]
-      const { wrapper, mocks, storeOptions } = getWrapper({ users, groups })
+      const { wrapper, mocks } = getWrapper({ users, groups })
       mocks.$clientService.graphAuthenticated.groups.deleteMember.mockResolvedValue(undefined)
       mocks.$clientService.graphAuthenticated.users.getUser.mockResolvedValue(
         mockAxiosResolve({ id: 'e3515ffb-d264-4dfc-8506-6c239f6673b5' })
@@ -34,7 +32,8 @@ describe('RemoveFromGroupsModal', () => {
       const eventSpy = jest.spyOn(eventBus, 'publish')
 
       await wrapper.vm.onConfirm()
-      expect(storeOptions.actions.showMessage).toHaveBeenCalled()
+      const { showMessage } = useMessages()
+      expect(showMessage).toHaveBeenCalled()
       expect(eventSpy).toHaveBeenCalled()
     })
 
@@ -46,7 +45,7 @@ describe('RemoveFromGroupsModal', () => {
         mock<User>({ memberOf: [{ id: '1' }] })
       ]
       const groups = [mock<Group>({ id: '1' })]
-      const { wrapper, mocks, storeOptions } = getWrapper({ users, groups })
+      const { wrapper, mocks } = getWrapper({ users, groups })
       mocks.$clientService.graphAuthenticated.groups.deleteMember.mockRejectedValue(new Error(''))
       mocks.$clientService.graphAuthenticated.users.getUser.mockRejectedValue(new Error(''))
 
@@ -54,7 +53,8 @@ describe('RemoveFromGroupsModal', () => {
       const eventSpy = jest.spyOn(eventBus, 'publish')
 
       await wrapper.vm.onConfirm()
-      expect(storeOptions.actions.showErrorMessage).toHaveBeenCalled()
+      const { showErrorMessage } = useMessages()
+      expect(showErrorMessage).toHaveBeenCalled()
       expect(eventSpy).not.toHaveBeenCalled()
     })
   })
@@ -62,12 +62,9 @@ describe('RemoveFromGroupsModal', () => {
 
 function getWrapper({ users = [mock<User>()], groups = [mock<Group>()] } = {}) {
   const mocks = defaultComponentMocks()
-  const storeOptions = defaultStoreMockOptions
-  const store = createStore(storeOptions)
 
   return {
     mocks,
-    storeOptions,
     wrapper: shallowMount(RemoveFromGroupsModal, {
       props: {
         modal: mock<Modal>(),
@@ -76,7 +73,7 @@ function getWrapper({ users = [mock<User>()], groups = [mock<Group>()] } = {}) {
       },
       global: {
         provide: mocks,
-        plugins: [...defaultPlugins(), store],
+        plugins: [...defaultPlugins()],
         stubs: { GroupSelect: true }
       }
     })
diff --git a/packages/web-app-admin-settings/tests/unit/composables/actions/general/useGeneralActionsResetLogo.spec.ts b/packages/web-app-admin-settings/tests/unit/composables/actions/general/useGeneralActionsResetLogo.spec.ts
index 0fe5cd347ee..0b9e425ea89 100644
--- a/packages/web-app-admin-settings/tests/unit/composables/actions/general/useGeneralActionsResetLogo.spec.ts
+++ b/packages/web-app-admin-settings/tests/unit/composables/actions/general/useGeneralActionsResetLogo.spec.ts
@@ -1,9 +1,8 @@
+import { useMessages } from '@ownclouders/web-pkg'
 import { useGeneralActionsResetLogo } from '../../../../../src/composables/actions/general/useGeneralActionsResetLogo'
 import { mock } from 'jest-mock-extended'
 import { unref } from 'vue'
 import {
-  createStore,
-  defaultStoreMockOptions,
   defaultComponentMocks,
   RouteLocation,
   mockAxiosResolve,
@@ -17,12 +16,13 @@ describe('resetLogo', () => {
   describe('handler', () => {
     it('should show message on request success', () => {
       getWrapper({
-        setup: async ({ actions }, { storeOptions, clientService, router }) => {
+        setup: async ({ actions }, { clientService, router }) => {
           clientService.httpAuthenticated.delete.mockImplementation(() => mockAxiosResolve())
           await unref(actions)[0].handler()
           jest.runAllTimers()
           expect(router.go).toHaveBeenCalledTimes(1)
-          expect(storeOptions.actions.showMessage).toHaveBeenCalledTimes(1)
+          const { showMessage } = useMessages()
+          expect(showMessage).toHaveBeenCalledTimes(1)
         }
       })
     })
@@ -30,12 +30,13 @@ describe('resetLogo', () => {
     it('should show message on request error', () => {
       jest.spyOn(console, 'error').mockImplementation(() => undefined)
       getWrapper({
-        setup: async ({ actions }, { storeOptions, clientService, router }) => {
+        setup: async ({ actions }, { clientService, router }) => {
           clientService.httpAuthenticated.delete.mockRejectedValue(() => mockAxiosReject())
           await unref(actions)[0].handler()
           jest.runAllTimers()
           expect(router.go).toHaveBeenCalledTimes(0)
-          expect(storeOptions.actions.showErrorMessage).toHaveBeenCalledTimes(1)
+          const { showErrorMessage } = useMessages()
+          expect(showErrorMessage).toHaveBeenCalledTimes(1)
         }
       })
     })
@@ -48,33 +49,27 @@ function getWrapper({
   setup: (
     instance: ReturnType<typeof useGeneralActionsResetLogo>,
     {
-      storeOptions,
       clientService,
       router
     }: {
-      storeOptions: typeof defaultStoreMockOptions
       clientService: ReturnType<typeof defaultComponentMocks>['$clientService']
       router: ReturnType<typeof defaultComponentMocks>['$router']
     }
   ) => void
 }) {
-  const storeOptions = defaultStoreMockOptions
-  const store = createStore(storeOptions)
   const mocks = defaultComponentMocks({
     currentRoute: mock<RouteLocation>({ name: 'admin-settings-general' })
   })
   return {
     wrapper: getComposableWrapper(
       () => {
-        const instance = useGeneralActionsResetLogo({ store })
+        const instance = useGeneralActionsResetLogo()
         setup(instance, {
-          storeOptions,
           clientService: mocks.$clientService,
           router: mocks.$router
         })
       },
       {
-        store,
         mocks,
         provide: mocks
       }
diff --git a/packages/web-app-admin-settings/tests/unit/composables/actions/general/useGeneralActionsUploadLogo.spec.ts b/packages/web-app-admin-settings/tests/unit/composables/actions/general/useGeneralActionsUploadLogo.spec.ts
index b244b85b739..81683f82376 100644
--- a/packages/web-app-admin-settings/tests/unit/composables/actions/general/useGeneralActionsUploadLogo.spec.ts
+++ b/packages/web-app-admin-settings/tests/unit/composables/actions/general/useGeneralActionsUploadLogo.spec.ts
@@ -1,9 +1,8 @@
+import { useMessages } from '@ownclouders/web-pkg'
 import { useGeneralActionsUploadLogo } from '../../../../../src/composables/actions/general/useGeneralActionsUploadLogo'
 import { mock } from 'jest-mock-extended'
 import { VNodeRef } from 'vue'
 import {
-  createStore,
-  defaultStoreMockOptions,
   defaultComponentMocks,
   RouteLocation,
   mockAxiosResolve,
@@ -17,7 +16,7 @@ describe('uploadImage', () => {
   describe('method "uploadImage"', () => {
     it('should show message on request success', () => {
       getWrapper({
-        setup: async ({ uploadImage }, { storeOptions, clientService, router }) => {
+        setup: async ({ uploadImage }, { clientService, router }) => {
           clientService.httpAuthenticated.post.mockImplementation(() => mockAxiosResolve())
           await uploadImage({
             currentTarget: {
@@ -26,7 +25,8 @@ describe('uploadImage', () => {
           } as unknown as InputEvent)
           jest.runAllTimers()
           expect(router.go).toHaveBeenCalledTimes(1)
-          expect(storeOptions.actions.showMessage).toHaveBeenCalledTimes(1)
+          const { showMessage } = useMessages()
+          expect(showMessage).toHaveBeenCalledTimes(1)
         }
       })
     })
@@ -34,7 +34,7 @@ describe('uploadImage', () => {
     it('should show message on request error', () => {
       jest.spyOn(console, 'error').mockImplementation(() => undefined)
       getWrapper({
-        setup: async ({ uploadImage }, { storeOptions, clientService, router }) => {
+        setup: async ({ uploadImage }, { clientService, router }) => {
           clientService.httpAuthenticated.post.mockRejectedValue(() => mockAxiosReject())
           await uploadImage({
             currentTarget: {
@@ -43,7 +43,8 @@ describe('uploadImage', () => {
           } as unknown as InputEvent)
           jest.runAllTimers()
           expect(router.go).toHaveBeenCalledTimes(0)
-          expect(storeOptions.actions.showErrorMessage).toHaveBeenCalledTimes(1)
+          const { showErrorMessage } = useMessages()
+          expect(showErrorMessage).toHaveBeenCalledTimes(1)
         }
       })
     })
@@ -51,14 +52,15 @@ describe('uploadImage', () => {
     it('should show message on invalid mimeType', () => {
       jest.spyOn(console, 'error').mockImplementation(() => undefined)
       getWrapper({
-        setup: async ({ uploadImage }, { storeOptions, clientService }) => {
+        setup: async ({ uploadImage }, { clientService }) => {
           await uploadImage({
             currentTarget: {
               files: [{ name: 'text.txt', type: 'text/plain' }]
             }
           } as unknown as InputEvent)
           expect(clientService.httpAuthenticated.post).toHaveBeenCalledTimes(0)
-          expect(storeOptions.actions.showErrorMessage).toHaveBeenCalledTimes(1)
+          const { showErrorMessage } = useMessages()
+          expect(showErrorMessage).toHaveBeenCalledTimes(1)
         }
       })
     })
@@ -72,19 +74,15 @@ function getWrapper({
     instance: ReturnType<typeof useGeneralActionsUploadLogo>,
     {
       imageInput,
-      storeOptions,
       clientService,
       router
     }: {
       imageInput: VNodeRef
-      storeOptions: typeof defaultStoreMockOptions
       clientService: ReturnType<typeof defaultComponentMocks>['$clientService']
       router: ReturnType<typeof defaultComponentMocks>['$router']
     }
   ) => void
 }) {
-  const storeOptions = defaultStoreMockOptions
-  const store = createStore(storeOptions)
   const mocks = defaultComponentMocks({
     currentRoute: mock<RouteLocation>({ name: 'admin-settings-general' })
   })
@@ -93,16 +91,14 @@ function getWrapper({
     wrapper: getComposableWrapper(
       () => {
         const imageInput = mock<VNodeRef>()
-        const instance = useGeneralActionsUploadLogo({ store, imageInput })
+        const instance = useGeneralActionsUploadLogo({ imageInput })
         setup(instance, {
           imageInput,
-          storeOptions,
           clientService: mocks.$clientService,
           router: mocks.$router
         })
       },
       {
-        store,
         mocks,
         provide: mocks
       }
diff --git a/packages/web-app-admin-settings/tests/unit/composables/actions/groups/useGroupActionsDelete.spec.ts b/packages/web-app-admin-settings/tests/unit/composables/actions/groups/useGroupActionsDelete.spec.ts
index c0cf7e8c98c..d617bddc3b7 100644
--- a/packages/web-app-admin-settings/tests/unit/composables/actions/groups/useGroupActionsDelete.spec.ts
+++ b/packages/web-app-admin-settings/tests/unit/composables/actions/groups/useGroupActionsDelete.spec.ts
@@ -83,7 +83,7 @@ function getWrapper({
   return {
     wrapper: getComposableWrapper(
       () => {
-        const instance = useGroupActionsDelete({ store })
+        const instance = useGroupActionsDelete()
         setup(instance, { storeOptions, clientService: mocks.$clientService })
       },
       { store, mocks, provide: mocks }
diff --git a/packages/web-app-admin-settings/tests/unit/composables/actions/users/useUserActionsDelete.spec.ts b/packages/web-app-admin-settings/tests/unit/composables/actions/users/useUserActionsDelete.spec.ts
index 04dc9590eb0..320716fb5ff 100644
--- a/packages/web-app-admin-settings/tests/unit/composables/actions/users/useUserActionsDelete.spec.ts
+++ b/packages/web-app-admin-settings/tests/unit/composables/actions/users/useUserActionsDelete.spec.ts
@@ -79,7 +79,7 @@ function getWrapper({
   return {
     wrapper: getComposableWrapper(
       () => {
-        const instance = useUserActionsDelete({ store })
+        const instance = useUserActionsDelete()
         setup(instance, { storeOptions, clientService: mocks.$clientService })
       },
       { store, mocks, provide: mocks }
diff --git a/packages/web-app-admin-settings/tests/unit/views/Groups.spec.ts b/packages/web-app-admin-settings/tests/unit/views/Groups.spec.ts
index 668060b925e..d7a86c2c7c7 100644
--- a/packages/web-app-admin-settings/tests/unit/views/Groups.spec.ts
+++ b/packages/web-app-admin-settings/tests/unit/views/Groups.spec.ts
@@ -1,7 +1,7 @@
 import Groups from '../../../src/views/Groups.vue'
 import { mockAxiosResolve, mockAxiosReject } from 'web-test-helpers/src/mocks'
 import { mock, mockDeep } from 'jest-mock-extended'
-import { ClientService, eventBus } from '@ownclouders/web-pkg'
+import { ClientService, eventBus, useMessages } from '@ownclouders/web-pkg'
 import {
   createStore,
   defaultComponentMocks,
@@ -53,10 +53,11 @@ describe('Groups view', () => {
       jest.spyOn(console, 'error').mockImplementation(() => undefined)
       const clientService = getClientServiceMock()
       clientService.graphAuthenticated.groups.editGroup.mockImplementation(() => mockAxiosReject())
-      const { wrapper, storeOptions } = getWrapper({ clientService })
+      const { wrapper } = getWrapper({ clientService })
       await wrapper.vm.onEditGroup({})
 
-      expect(storeOptions.actions.showErrorMessage).toHaveBeenCalled()
+      const { showErrorMessage } = useMessages()
+      expect(showErrorMessage).toHaveBeenCalled()
     })
   })
 
diff --git a/packages/web-app-admin-settings/tests/unit/views/Users.spec.ts b/packages/web-app-admin-settings/tests/unit/views/Users.spec.ts
index df0ab1e4a26..1bc28aab7e0 100644
--- a/packages/web-app-admin-settings/tests/unit/views/Users.spec.ts
+++ b/packages/web-app-admin-settings/tests/unit/views/Users.spec.ts
@@ -4,7 +4,8 @@ import {
   UserAction,
   eventBus,
   useAppDefaults,
-  useConfigurationManager
+  useConfigurationManager,
+  useMessages
 } from '@ownclouders/web-pkg'
 import { mock, mockDeep } from 'jest-mock-extended'
 import { mockAxiosResolve, mockAxiosReject } from 'web-test-helpers/src/mocks'
@@ -257,14 +258,15 @@ describe('Users view', () => {
       jest.spyOn(console, 'error').mockImplementation(() => undefined)
       const clientService = getClientService()
       clientService.graphAuthenticated.users.editUser.mockImplementation(() => mockAxiosReject())
-      const { wrapper, storeOptions } = getMountedWrapper({ clientService })
+      const { wrapper } = getMountedWrapper({ clientService })
 
       await wrapper.vm.loadResourcesTask.last
       await wrapper.vm.onEditUser({
         editUser: {}
       })
 
-      expect(storeOptions.actions.showErrorMessage).toHaveBeenCalled()
+      const { showErrorMessage } = useMessages()
+      expect(showErrorMessage).toHaveBeenCalled()
     })
   })
 
diff --git a/packages/web-app-external/src/App.vue b/packages/web-app-external/src/App.vue
index 16457192ef8..f490d15bb24 100644
--- a/packages/web-app-external/src/App.vue
+++ b/packages/web-app-external/src/App.vue
@@ -34,6 +34,7 @@ import {
   isSameResource,
   queryItemAsString,
   useConfigurationManager,
+  useMessages,
   useRequest,
   useRouteQuery,
   useStore
@@ -55,6 +56,7 @@ export default defineComponent({
   setup(props, { emit }) {
     const language = useGettext()
     const store = useStore()
+    const { showErrorMessage } = useMessages()
     const configurationManager = useConfigurationManager()
 
     const { $gettext } = language
@@ -80,19 +82,17 @@ export default defineComponent({
     })
 
     const errorPopup = (error) => {
-      store.dispatch('showErrorMessage', {
+      showErrorMessage({
         title: $gettext('An error occurred'),
         desc: error,
-        error
+        errors: [error]
       })
     }
 
     const loadAppUrl = useTask(function* (signal, viewMode: string) {
       try {
         if (props.isReadOnly && viewMode === 'write') {
-          store.dispatch('showErrorMessage', {
-            title: $gettext('Cannot open file in edit mode as it is read-only')
-          })
+          showErrorMessage({ title: $gettext('Cannot open file in edit mode as it is read-only') })
           return
         }
 
diff --git a/packages/web-app-files/src/HandleUpload.ts b/packages/web-app-files/src/HandleUpload.ts
index fcdf316da34..856aa67cd36 100644
--- a/packages/web-app-files/src/HandleUpload.ts
+++ b/packages/web-app-files/src/HandleUpload.ts
@@ -10,7 +10,7 @@ import { RouteLocationNormalizedLoaded } from 'vue-router'
 import { Resource, SpaceResource } from '@ownclouders/web-client/src'
 import { urlJoin } from '@ownclouders/web-client/src/utils'
 import { ResourceConflict } from './helpers/resource'
-import { UserStore, locationPublicLink } from '@ownclouders/web-pkg'
+import { MessageStore, UserStore, locationPublicLink } from '@ownclouders/web-pkg'
 import { locationSpacesGeneric, UppyService, UppyResource } from '@ownclouders/web-pkg'
 import { isPersonalSpaceResource, isShareSpaceResource } from '@ownclouders/web-client/src/helpers'
 import { ClientService, queryItemAsString } from '@ownclouders/web-pkg'
@@ -22,6 +22,7 @@ export interface HandleUploadOptions {
   route: Ref<RouteLocationNormalizedLoaded>
   store: Store<any>
   userStore: UserStore
+  messageStore: MessageStore
   uppyService: UppyService
   id?: string
   space?: SpaceResource
@@ -51,6 +52,7 @@ export class HandleUpload extends BasePlugin {
   space: SpaceResource
   store: Store<any>
   userStore: UserStore
+  messageStore: MessageStore
   uppyService: UppyService
   quotaCheckEnabled: boolean
   directoryTreeCreateEnabled: boolean
@@ -69,6 +71,7 @@ export class HandleUpload extends BasePlugin {
     this.space = opts.space
     this.store = opts.store
     this.userStore = opts.userStore
+    this.messageStore = opts.messageStore
     this.uppyService = opts.uppyService
 
     this.quotaCheckEnabled = opts.quotaCheckEnabled ?? true
@@ -246,7 +249,7 @@ export class HandleUpload extends BasePlugin {
           spaceName = $gettext('Personal')
         }
 
-        this.store.dispatch('showErrorMessage', {
+        this.messageStore.showErrorMessage({
           title: $gettext('Not enough quota'),
           desc: $gettext(
             'There is not enough quota on %{spaceName}, you need additional %{missingSpace} to upload these files',
diff --git a/packages/web-app-files/src/components/AppBar/CreateAndUpload.vue b/packages/web-app-files/src/components/AppBar/CreateAndUpload.vue
index 73afe031460..1f5ba208a70 100644
--- a/packages/web-app-files/src/components/AppBar/CreateAndUpload.vue
+++ b/packages/web-app-files/src/components/AppBar/CreateAndUpload.vue
@@ -192,6 +192,7 @@ import {
   isLocationSpacesActive,
   useFileActions,
   useFileActionsCreateNewShortcut,
+  useMessages,
   useUserStore
 } from '@ownclouders/web-pkg'
 import { useActiveLocation } from '@ownclouders/web-pkg'
@@ -265,6 +266,7 @@ export default defineComponent({
     const clientService = useClientService()
     const store = useStore()
     const userStore = useUserStore()
+    const messageStore = useMessages()
     const route = useRoute()
     const language = useGettext()
     const hasSpaces = useCapabilitySpacesEnabled(store)
@@ -281,6 +283,7 @@ export default defineComponent({
         space: props.space,
         store,
         userStore,
+        messageStore,
         uppyService
       })
     }
diff --git a/packages/web-app-files/src/components/AppBar/CreateSpace.vue b/packages/web-app-files/src/components/AppBar/CreateSpace.vue
index ca6248cbbcb..74a5eb9d58f 100644
--- a/packages/web-app-files/src/components/AppBar/CreateSpace.vue
+++ b/packages/web-app-files/src/components/AppBar/CreateSpace.vue
@@ -16,11 +16,18 @@
 <script lang="ts">
 import { defineComponent } from 'vue'
 import { useGettext } from 'vue3-gettext'
-import { useModals, useCreateSpace, useSpaceHelpers, useStore } from '@ownclouders/web-pkg'
+import {
+  useModals,
+  useCreateSpace,
+  useSpaceHelpers,
+  useStore,
+  useMessages
+} from '@ownclouders/web-pkg'
 
 export default defineComponent({
   setup() {
     const store = useStore()
+    const { showMessage, showErrorMessage } = useMessages()
     const { $gettext } = useGettext()
     const { createSpace } = useCreateSpace()
     const { checkSpaceNameModalInput } = useSpaceHelpers()
@@ -31,14 +38,12 @@ export default defineComponent({
         const createdSpace = await createSpace(name)
         store.commit('Files/UPSERT_RESOURCE', createdSpace)
         store.commit('runtime/spaces/UPSERT_SPACE', createdSpace)
-        store.dispatch('showMessage', {
-          title: $gettext('Space was created successfully')
-        })
+        showMessage({ title: $gettext('Space was created successfully') })
       } catch (error) {
         console.error(error)
-        store.dispatch('showErrorMessage', {
+        showErrorMessage({
           title: $gettext('Creating space failed…'),
-          error
+          errors: [error]
         })
       }
     }
diff --git a/packages/web-app-files/src/components/EmbedActions/EmbedActions.vue b/packages/web-app-files/src/components/EmbedActions/EmbedActions.vue
index 2ce3a4ae150..4a0d5f3c2a4 100644
--- a/packages/web-app-files/src/components/EmbedActions/EmbedActions.vue
+++ b/packages/web-app-files/src/components/EmbedActions/EmbedActions.vue
@@ -54,7 +54,7 @@ export default {
       return store.getters['Files/selectedFiles']
     })
 
-    const { actions: createLinkActions } = useFileActionsCreateLink({ store, enforceModal: true })
+    const { actions: createLinkActions } = useFileActionsCreateLink({ enforceModal: true })
     const createLinkAction = computed<FileAction>(() => unref(createLinkActions)[0])
 
     const areSelectActionsDisabled = computed<boolean>(() => selectedFiles.value.length < 1)
diff --git a/packages/web-app-files/src/components/FilesList/ResourceTiles.vue b/packages/web-app-files/src/components/FilesList/ResourceTiles.vue
index 24f7e35e546..2990ca41d9f 100644
--- a/packages/web-app-files/src/components/FilesList/ResourceTiles.vue
+++ b/packages/web-app-files/src/components/FilesList/ResourceTiles.vue
@@ -132,6 +132,7 @@ import {
   ImageDimension,
   SortDir,
   SortField,
+  useMessages,
   useResourceRouteResolver,
   useStore,
   useTileSize,
@@ -197,6 +198,7 @@ export default defineComponent({
   emits: ['fileClick', 'fileDropped', 'rowMounted', 'sort', 'update:selectedIds'],
   setup(props, context) {
     const store = useStore()
+    const { showMessage } = useMessages()
     const { $gettext } = useGettext()
 
     const areFileExtensionsShown = computed(() => store.state.Files.areFileExtensionsShown)
@@ -241,7 +243,7 @@ export default defineComponent({
 
     const emitTileClick = (resource) => {
       if (resource.disabled && resource.type === 'space') {
-        store.dispatch('showMessage', {
+        showMessage({
           title: $gettext('Disabled spaces cannot be entered'),
           status: 'warning'
         })
diff --git a/packages/web-app-files/src/components/Modals/SetLinkPasswordModal.vue b/packages/web-app-files/src/components/Modals/SetLinkPasswordModal.vue
index 2c987de4f82..746b3da2a49 100644
--- a/packages/web-app-files/src/components/Modals/SetLinkPasswordModal.vue
+++ b/packages/web-app-files/src/components/Modals/SetLinkPasswordModal.vue
@@ -19,7 +19,13 @@
 <script lang="ts">
 import { defineComponent, ref, unref, PropType } from 'vue'
 import { useGettext } from 'vue3-gettext'
-import { Modal, useClientService, usePasswordPolicyService, useStore } from '@ownclouders/web-pkg'
+import {
+  Modal,
+  useClientService,
+  useMessages,
+  usePasswordPolicyService,
+  useStore
+} from '@ownclouders/web-pkg'
 import { Share } from '@ownclouders/web-client/src/helpers'
 
 export default defineComponent({
@@ -31,6 +37,7 @@ export default defineComponent({
   emits: ['confirm', 'update:confirmDisabled'],
   setup(props, { expose }) {
     const store = useStore()
+    const { showMessage, showErrorMessage } = useMessages()
     const clientService = useClientService()
     const passwordPolicyService = usePasswordPolicyService()
     const { $gettext } = useGettext()
@@ -50,9 +57,7 @@ export default defineComponent({
           client: clientService.owncloudSdk,
           params: { ...props.link, password: unref(password) }
         })
-        store.dispatch('showMessage', {
-          title: $gettext('Link was updated successfully')
-        })
+        showMessage({ title: $gettext('Link was updated successfully') })
       } catch (e) {
         // Human-readable error message is provided, for example when password is on banned list
         if (e.statusCode === 400) {
@@ -60,9 +65,9 @@ export default defineComponent({
           return Promise.reject()
         }
 
-        store.dispatch('showErrorMessage', {
+        showErrorMessage({
           title: $gettext('Failed to update link'),
-          error: e
+          errors: [e]
         })
       }
     }
diff --git a/packages/web-app-files/src/components/SideBar/Details/TagsSelect.vue b/packages/web-app-files/src/components/SideBar/Details/TagsSelect.vue
index 3290f87780a..1b2a300fe39 100644
--- a/packages/web-app-files/src/components/SideBar/Details/TagsSelect.vue
+++ b/packages/web-app-files/src/components/SideBar/Details/TagsSelect.vue
@@ -76,6 +76,7 @@ import {
   isLocationPublicActive,
   SideBarEventTopics,
   useClientService,
+  useMessages,
   useRouter,
   useStore
 } from '@ownclouders/web-pkg'
@@ -112,6 +113,7 @@ export default defineComponent({
   },
   setup(props) {
     const store = useStore()
+    const { showErrorMessage } = useMessages()
     const clientService = useClientService()
     const router = useRouter()
 
@@ -216,9 +218,9 @@ export default defineComponent({
         allTags.push(...tagsToAdd)
       } catch (e) {
         console.error(e)
-        store.dispatch('showErrorMessage', {
+        showErrorMessage({
           title: $gettext('Failed to edit tags'),
-          error: e
+          errors: [e]
         })
       }
     }
diff --git a/packages/web-app-files/src/components/SideBar/PrivateLinkItem.vue b/packages/web-app-files/src/components/SideBar/PrivateLinkItem.vue
index 19da1e6e873..bc8c7d38c18 100644
--- a/packages/web-app-files/src/components/SideBar/PrivateLinkItem.vue
+++ b/packages/web-app-files/src/components/SideBar/PrivateLinkItem.vue
@@ -23,14 +23,14 @@
 import { computed, defineComponent, inject, unref } from 'vue'
 import { useClipboard } from '@vueuse/core'
 import { Resource } from '@ownclouders/web-client'
-import { useStore } from '@ownclouders/web-pkg'
+import { useMessages } from '@ownclouders/web-pkg'
 import { useGettext } from 'vue3-gettext'
 
 export default defineComponent({
   name: 'PrivateLinkItem',
   setup() {
     const { $gettext } = useGettext()
-    const store = useStore<any>()
+    const { showMessage, showErrorMessage } = useMessages()
     const resource = inject<Resource>('resource')
     const privateLink = computed(() => unref(resource))
 
@@ -42,7 +42,7 @@ export default defineComponent({
 
     const copyLinkToClipboard = () => {
       copy(unref(privateLink).privateLink)
-      store.dispatch('showMessage', {
+      showMessage({
         title: $gettext('Private link copied'),
         desc: $gettext('The private link has been copied to your clipboard.')
       })
diff --git a/packages/web-app-files/src/components/SideBar/Shares/Collaborators/InviteCollaborator/InviteCollaboratorForm.vue b/packages/web-app-files/src/components/SideBar/Shares/Collaborators/InviteCollaborator/InviteCollaboratorForm.vue
index 659e731c8c6..cc716af0dd6 100644
--- a/packages/web-app-files/src/components/SideBar/Shares/Collaborators/InviteCollaborator/InviteCollaboratorForm.vue
+++ b/packages/web-app-files/src/components/SideBar/Shares/Collaborators/InviteCollaborator/InviteCollaboratorForm.vue
@@ -156,7 +156,8 @@ import {
   useClientService,
   useConfigurationManager,
   useStore,
-  useUserStore
+  useUserStore,
+  useMessages
 } from '@ownclouders/web-pkg'
 
 import { computed, defineComponent, inject, ref, unref, watch, onMounted } from 'vue'
@@ -276,6 +277,7 @@ export default defineComponent({
       notifyEnabled,
       federatedUsers,
       createSharesConcurrentRequests,
+      ...useMessages(),
 
       // CERN
       accountType,
@@ -351,7 +353,6 @@ export default defineComponent({
   },
 
   methods: {
-    ...mapActions(['showMessage', 'showErrorMessage']),
     ...mapActions('Files', ['addShare']),
     ...mapActions('runtime/spaces', ['addSpaceMember']),
 
@@ -550,7 +551,7 @@ export default defineComponent({
           title: this.$gettext('Failed to add share for "%{displayName}"', {
             displayName: e.displayName
           }),
-          error: e.error
+          errors: [e.error]
         })
       })
 
diff --git a/packages/web-app-files/src/components/SideBar/Shares/Collaborators/ListItem.vue b/packages/web-app-files/src/components/SideBar/Shares/Collaborators/ListItem.vue
index e1f88a5208f..4d0897841da 100644
--- a/packages/web-app-files/src/components/SideBar/Shares/Collaborators/ListItem.vue
+++ b/packages/web-app-files/src/components/SideBar/Shares/Collaborators/ListItem.vue
@@ -139,8 +139,8 @@ import {
   queryItemAsString,
   useCapabilityFilesSharingResharing,
   useCapabilityFilesSharingResharingDefault,
+  useMessages,
   useModals,
-  useStore,
   useUserStore
 } from '@ownclouders/web-pkg'
 import { extractDomSelector } from '@ownclouders/web-client/src/helpers/resource'
@@ -186,7 +186,7 @@ export default defineComponent({
   },
   emits: ['onDelete', 'onSetDeny'],
   setup(props, { emit }) {
-    const store = useStore()
+    const { showMessage, showErrorMessage } = useMessages()
     const userStore = useUserStore()
     const clientService = useClientService()
     const { $gettext } = useGettext()
@@ -217,17 +217,17 @@ export default defineComponent({
     const notifyShare = async () => {
       try {
         const response = await clientService.owncloudSdk.shares.notifyShare(props.share.id)
-        store.dispatch('showMessage', {
+        showMessage({
           title: $gettext('Success'),
           desc: $gettext('Email reminder sent to %{ recipient }', { recipient: response[0] }),
           status: 'success'
         })
       } catch (error) {
         console.error(error)
-        store.dispatch('showErrorMessage', {
+        showErrorMessage({
           title: $gettext('An error occurred'),
           desc: $gettext('Email notification could not be sent'),
-          error
+          errors: [error]
         })
       }
     }
@@ -239,7 +239,9 @@ export default defineComponent({
       clientService,
       sharedParentDir,
       setDenyShare,
-      showNotifyShareModal
+      showNotifyShareModal,
+      showMessage,
+      showErrorMessage
     }
   },
   computed: {
@@ -415,7 +417,6 @@ export default defineComponent({
     }
   },
   methods: {
-    ...mapActions(['showMessage', 'showErrorMessage']),
     ...mapActions('Files', ['changeShare']),
     ...mapActions('runtime/spaces', ['changeSpaceMember']),
 
@@ -438,7 +439,7 @@ export default defineComponent({
         console.error(e)
         this.showErrorMessage({
           title: this.$gettext('Failed to apply new permissions'),
-          error: e
+          errors: [e]
         })
       }
     },
@@ -452,7 +453,7 @@ export default defineComponent({
         console.error(e)
         this.showErrorMessage({
           title: this.$gettext('Failed to apply expiration date'),
-          error: e
+          errors: [e]
         })
       }
     },
@@ -481,7 +482,7 @@ export default defineComponent({
         console.error(e)
         this.showErrorMessage({
           title: this.$gettext('Error while editing the share.'),
-          error: e
+          errors: [e]
         })
       }
     }
diff --git a/packages/web-app-files/src/components/SideBar/Shares/FileLinks.vue b/packages/web-app-files/src/components/SideBar/Shares/FileLinks.vue
index 5113999b442..b1a897c0c16 100644
--- a/packages/web-app-files/src/components/SideBar/Shares/FileLinks.vue
+++ b/packages/web-app-files/src/components/SideBar/Shares/FileLinks.vue
@@ -129,7 +129,8 @@ import {
   FileAction,
   useClientService,
   useModals,
-  useUserStore
+  useUserStore,
+  useMessages
 } from '@ownclouders/web-pkg'
 import { shareViaLinkHelp, shareViaIndirectLinkHelp } from '../../../helpers/contextualHelpers'
 import {
@@ -166,6 +167,7 @@ export default defineComponent({
   },
   setup() {
     const store = useStore()
+    const { showMessage, showErrorMessage } = useMessages()
     const userStore = useUserStore()
     const { $gettext } = useGettext()
     const ability = useAbility()
@@ -177,7 +179,7 @@ export default defineComponent({
     const { defaultLinkPermissions } = useDefaultLinkPermissions()
     const { dispatchModal } = useModals()
 
-    const { actions: createLinkActions } = useFileActionsCreateLink({ store })
+    const { actions: createLinkActions } = useFileActionsCreateLink()
     const createLinkAction = computed<FileAction>(() =>
       unref(createLinkActions).find(({ name }) => name === 'create-links')
     )
@@ -255,13 +257,11 @@ export default defineComponent({
           client: clientService.owncloudSdk,
           params
         })
-        store.dispatch('showMessage', {
-          title: $gettext('Link was updated successfully')
-        })
+        showMessage({ title: $gettext('Link was updated successfully') })
       } catch (e) {
-        store.dispatch('showErrorMessage', {
+        showErrorMessage({
           title: $gettext('Failed to update link'),
-          error: e
+          errors: [e]
         })
       }
     }
@@ -300,7 +300,9 @@ export default defineComponent({
       showPasswordModal,
       defaultLinkPermissions,
       addNewLink,
-      dispatchModal
+      dispatchModal,
+      showMessage,
+      showErrorMessage
     }
   },
   computed: {
@@ -382,7 +384,6 @@ export default defineComponent({
   },
   methods: {
     ...mapActions('Files', ['addLink', 'updateLink', 'removeLink']),
-    ...mapActions(['showMessage', 'showErrorMessage']),
     ...mapMutations('Files', ['REMOVE_FILES']),
 
     toggleLinkListCollapsed() {
@@ -542,7 +543,7 @@ export default defineComponent({
         console.error(e)
         this.showErrorMessage({
           title: this.$gettext('Failed to delete link'),
-          error: e
+          errors: [e]
         })
       }
     },
diff --git a/packages/web-app-files/src/components/SideBar/Shares/FileShares.vue b/packages/web-app-files/src/components/SideBar/Shares/FileShares.vue
index ac8fc2c6c09..3e012f304e3 100644
--- a/packages/web-app-files/src/components/SideBar/Shares/FileShares.vue
+++ b/packages/web-app-files/src/components/SideBar/Shares/FileShares.vue
@@ -98,7 +98,8 @@ import {
   useCapabilityFilesSharingCanDenyAccess,
   useGetMatchingSpace,
   useModals,
-  useUserStore
+  useUserStore,
+  useMessages
 } from '@ownclouders/web-pkg'
 import { isLocationSharesActive } from '@ownclouders/web-pkg'
 import { textUtils } from '../../../helpers/textUtils'
@@ -189,7 +190,8 @@ export default defineComponent({
       hasShareCanDenyAccess: useCapabilityFilesSharingCanDenyAccess(),
       getSharedAncestor,
       configurationManager,
-      dispatchModal
+      dispatchModal,
+      ...useMessages()
     }
   },
   computed: {
@@ -304,7 +306,6 @@ export default defineComponent({
   },
   methods: {
     ...mapActions('Files', ['deleteShare', 'addShare']),
-    ...mapActions(['showMessage', 'showErrorMessage']),
     ...mapMutations('Files', ['REMOVE_FILES']),
 
     getDeniedShare(collaborator: Share): Share {
@@ -410,7 +411,7 @@ export default defineComponent({
           console.error(e)
           this.showErrorMessage({
             title: this.$gettext('Failed to deny access'),
-            error: e
+            errors: [e]
           })
         }
       } else {
@@ -432,7 +433,7 @@ export default defineComponent({
           console.error(e)
           this.showErrorMessage({
             title: this.$gettext('Failed to grant access'),
-            error: e
+            errors: [e]
           })
         }
       }
@@ -478,7 +479,7 @@ export default defineComponent({
         console.error(error)
         this.showErrorMessage({
           title: this.$gettext('Failed to remove share'),
-          error
+          errors: [error]
         })
       }
     },
diff --git a/packages/web-app-files/src/components/SideBar/Shares/Links/NameAndCopy.vue b/packages/web-app-files/src/components/SideBar/Shares/Links/NameAndCopy.vue
index 9b908b69143..ca613126837 100644
--- a/packages/web-app-files/src/components/SideBar/Shares/Links/NameAndCopy.vue
+++ b/packages/web-app-files/src/components/SideBar/Shares/Links/NameAndCopy.vue
@@ -29,7 +29,7 @@
 
 <script lang="ts">
 import { defineComponent } from 'vue'
-import { useStore } from '@ownclouders/web-pkg'
+import { useMessages } from '@ownclouders/web-pkg'
 import { useClipboard } from '@vueuse/core'
 import { useGettext } from 'vue3-gettext'
 
@@ -43,7 +43,7 @@ export default defineComponent({
   },
   setup(props) {
     const { $gettext } = useGettext()
-    const store = useStore<any>()
+    const { showMessage } = useMessages()
 
     const {
       copy,
@@ -53,7 +53,7 @@ export default defineComponent({
 
     const copyLinkToClipboard = () => {
       copy(props.link.url)
-      store.dispatch('showMessage', {
+      showMessage({
         title: props.link.quicklink
           ? $gettext('The link has been copied to your clipboard.')
           : $gettext('The link "%{linkName}" has been copied to your clipboard.', {
diff --git a/packages/web-app-files/src/components/SideBar/Shares/SpaceMembers.vue b/packages/web-app-files/src/components/SideBar/Shares/SpaceMembers.vue
index 6d11e58a852..40206af2db3 100644
--- a/packages/web-app-files/src/components/SideBar/Shares/SpaceMembers.vue
+++ b/packages/web-app-files/src/components/SideBar/Shares/SpaceMembers.vue
@@ -70,6 +70,7 @@ import { spaceRoleManager } from '@ownclouders/web-client/src/helpers/share'
 import {
   createLocationSpaces,
   isLocationSpacesActive,
+  useMessages,
   useModals,
   useUserStore
 } from '@ownclouders/web-pkg'
@@ -99,7 +100,8 @@ export default defineComponent({
       clientService,
       configurationManager,
       resource: inject<Ref<ProjectSpaceResource>>('resource'),
-      dispatchModal
+      dispatchModal,
+      ...useMessages()
     }
   },
   data: () => {
@@ -153,7 +155,6 @@ export default defineComponent({
   },
   methods: {
     ...mapActions('runtime/spaces', ['deleteSpaceMember']),
-    ...mapActions(['showMessage', 'showErrorMessage']),
 
     filter(collection, term) {
       if (!(term || '').trim()) {
@@ -220,7 +221,7 @@ export default defineComponent({
         console.error(error)
         this.showErrorMessage({
           title: this.$gettext('Failed to remove share'),
-          error
+          errors: [error]
         })
       }
     }
diff --git a/packages/web-app-files/src/composables/actions/spaces/useSpaceActionsUploadImage.ts b/packages/web-app-files/src/composables/actions/spaces/useSpaceActionsUploadImage.ts
index d512a6f62c9..1faa6e05008 100644
--- a/packages/web-app-files/src/composables/actions/spaces/useSpaceActionsUploadImage.ts
+++ b/packages/web-app-files/src/composables/actions/spaces/useSpaceActionsUploadImage.ts
@@ -7,7 +7,8 @@ import {
   useLoadingService,
   useStore,
   usePreviewService,
-  useUserStore
+  useUserStore,
+  useMessages
 } from '@ownclouders/web-pkg'
 import { eventBus } from '@ownclouders/web-pkg'
 import { useGettext } from 'vue3-gettext'
@@ -24,6 +25,7 @@ export const useSpaceActionsUploadImage = ({
 }) => {
   store = store || useStore()
   const userStore = useUserStore()
+  const { showMessage, showErrorMessage } = useMessages()
   const { $gettext } = useGettext()
   const clientService = useClientService()
   const loadingService = useLoadingService()
@@ -49,9 +51,7 @@ export const useSpaceActionsUploadImage = ({
     }
 
     if (!previewService.isMimetypeSupported(file.type, true)) {
-      return store.dispatch('showErrorMessage', {
-        title: $gettext('The file type is unsupported')
-      })
+      return showErrorMessage({ title: $gettext('The file type is unsupported') })
     }
 
     try {
@@ -108,15 +108,13 @@ export const useSpaceActionsUploadImage = ({
           field: 'spaceImageData',
           value: data.special.find((special) => special.specialFolder.name === 'image')
         })
-        await store.dispatch('showMessage', {
-          title: $gettext('Space image was uploaded successfully')
-        })
+        showMessage({ title: $gettext('Space image was uploaded successfully') })
         eventBus.publish('app.files.spaces.uploaded-image', buildSpace(data))
       } catch (error) {
         console.error(error)
-        await store.dispatch('showErrorMessage', {
+        showErrorMessage({
           title: $gettext('Failed to upload space image'),
-          error
+          errors: [error]
         })
       }
     })
diff --git a/packages/web-app-files/src/composables/keyboardActions/useKeyboardTableActions.ts b/packages/web-app-files/src/composables/keyboardActions/useKeyboardTableActions.ts
index fb1fb27f04d..37f51d698ea 100644
--- a/packages/web-app-files/src/composables/keyboardActions/useKeyboardTableActions.ts
+++ b/packages/web-app-files/src/composables/keyboardActions/useKeyboardTableActions.ts
@@ -1,15 +1,17 @@
-import { Key, KeyboardActions, ModifierKey } from '@ownclouders/web-pkg'
+import { Key, KeyboardActions, ModifierKey, useMessages } from '@ownclouders/web-pkg'
 import { useStore } from '@ownclouders/web-pkg'
 import { useGettext } from 'vue3-gettext'
 
 export const useKeyboardTableActions = (keyActions: KeyboardActions) => {
   const store = useStore()
+  const messageStore = useMessages()
   const language = useGettext()
 
   keyActions.bindKeyAction({ modifier: ModifierKey.Ctrl, primary: Key.C }, () => {
     store.dispatch('Files/copySelectedFiles', {
       ...language,
-      resources: store.getters['Files/selectedFiles']
+      resources: store.getters['Files/selectedFiles'],
+      messageStore
     })
   })
 }
diff --git a/packages/web-app-files/src/composables/keyboardActions/useKeyboardTableSpaceActions.ts b/packages/web-app-files/src/composables/keyboardActions/useKeyboardTableSpaceActions.ts
index 122d478710f..2ffbf615e2e 100644
--- a/packages/web-app-files/src/composables/keyboardActions/useKeyboardTableSpaceActions.ts
+++ b/packages/web-app-files/src/composables/keyboardActions/useKeyboardTableSpaceActions.ts
@@ -1,4 +1,4 @@
-import { Key, KeyboardActions, ModifierKey } from '@ownclouders/web-pkg'
+import { Key, KeyboardActions, ModifierKey, useMessages } from '@ownclouders/web-pkg'
 import { SpaceResource } from '@ownclouders/web-client'
 import { useStore } from '@ownclouders/web-pkg'
 import { useGettext } from 'vue3-gettext'
@@ -7,6 +7,7 @@ import { useFileActionsPaste } from '@ownclouders/web-pkg'
 
 export const useKeyboardTableSpaceActions = (keyActions: KeyboardActions, space: SpaceResource) => {
   const store = useStore()
+  const messageStore = useMessages()
   const language = useGettext()
 
   const { actions: pasteFileActions } = useFileActionsPaste({ store })
@@ -16,7 +17,8 @@ export const useKeyboardTableSpaceActions = (keyActions: KeyboardActions, space:
     store.dispatch('Files/copySelectedFiles', {
       ...language,
       space: space,
-      resources: store.getters['Files/selectedFiles']
+      resources: store.getters['Files/selectedFiles'],
+      messageStore
     })
   })
 
@@ -28,7 +30,8 @@ export const useKeyboardTableSpaceActions = (keyActions: KeyboardActions, space:
     store.dispatch('Files/cutSelectedFiles', {
       ...language,
       space: space,
-      resources: store.getters['Files/selectedFiles']
+      resources: store.getters['Files/selectedFiles'],
+      messageStore
     })
   })
 }
diff --git a/packages/web-app-files/src/helpers/resource/actions/transfer.ts b/packages/web-app-files/src/helpers/resource/actions/transfer.ts
index 47952c43377..d015a1540de 100644
--- a/packages/web-app-files/src/helpers/resource/actions/transfer.ts
+++ b/packages/web-app-files/src/helpers/resource/actions/transfer.ts
@@ -1,7 +1,12 @@
 import { Resource } from '@ownclouders/web-client'
 import { basename, join } from 'path'
 import { SpaceResource } from '@ownclouders/web-client/src/helpers'
-import { ClientService, LoadingService, LoadingTaskCallbackArguments } from '@ownclouders/web-pkg'
+import {
+  ClientService,
+  LoadingService,
+  LoadingTaskCallbackArguments,
+  useMessages
+} from '@ownclouders/web-pkg'
 import {
   ConflictDialog,
   ResolveStrategy,
@@ -20,8 +25,6 @@ export class ResourceTransfer extends ConflictDialog {
     private targetFolder: Resource,
     private clientService: ClientService,
     private loadingService: LoadingService,
-    showMessage: (data: object) => void,
-    showErrorMessage: (data: object) => void,
     $gettext: (
       msgid: string,
       parameters?: {
@@ -39,7 +42,7 @@ export class ResourceTransfer extends ConflictDialog {
       disableHtmlEscaping?: boolean
     ) => string
   ) {
-    super(showMessage, showErrorMessage, $gettext, $ngettext)
+    super($gettext, $ngettext)
   }
 
   hasRecursion(): boolean {
@@ -58,7 +61,8 @@ export class ResourceTransfer extends ConflictDialog {
       "You can't paste the selected files at this location because you can't paste an item into itself.",
       count
     )
-    this.showErrorMessage({ title })
+    const messageStore = useMessages()
+    messageStore.showErrorMessage({ title })
   }
 
   showResultMessage(errors, movedResources: Array<Resource>, transferType: TransferType) {
@@ -83,10 +87,8 @@ export class ResourceTransfer extends ConflictDialog {
               { count: count.toString() },
               true
             )
-      this.showMessage({
-        title,
-        status: 'success'
-      })
+      const messageStore = useMessages()
+      messageStore.showMessage({ title, status: 'success' })
       return
     }
     let title =
@@ -99,10 +101,8 @@ export class ResourceTransfer extends ConflictDialog {
           ? this.$gettext('Failed to copy "%{name}"', { name: errors[0]?.resourceName }, true)
           : this.$gettext('Failed to move "%{name}"', { name: errors[0]?.resourceName }, true)
     }
-    this.showErrorMessage({
-      title,
-      errors
-    })
+    const messageStore = useMessages()
+    messageStore.showErrorMessage({ title, errors })
   }
 
   async perform(transferType: TransferType): Promise<Resource[]> {
diff --git a/packages/web-app-files/src/helpers/resource/actions/upload.ts b/packages/web-app-files/src/helpers/resource/actions/upload.ts
index ca0452fb1d3..d1ec1fd02a8 100644
--- a/packages/web-app-files/src/helpers/resource/actions/upload.ts
+++ b/packages/web-app-files/src/helpers/resource/actions/upload.ts
@@ -20,12 +20,7 @@ export class ResourceConflict extends ConflictDialog {
 
   constructor(store: Store<any>, language: Language) {
     const { $gettext, $ngettext } = language
-    super(
-      (msg) => store.dispatch('showMessage', msg),
-      (msg) => store.dispatch('showErrorMessage', msg),
-      $gettext,
-      $ngettext
-    )
+    super($gettext, $ngettext)
 
     this.store = store
   }
diff --git a/packages/web-app-files/src/store/actions.ts b/packages/web-app-files/src/store/actions.ts
index 4e9a84034a8..cf32c88adf5 100644
--- a/packages/web-app-files/src/store/actions.ts
+++ b/packages/web-app-files/src/store/actions.ts
@@ -1,6 +1,6 @@
 import PQueue from 'p-queue'
 
-import { getParentPaths } from '@ownclouders/web-pkg'
+import { MessageStore, getParentPaths } from '@ownclouders/web-pkg'
 import {
   buildShare,
   buildCollaboratorShare,
@@ -45,48 +45,34 @@ export default {
       context.commit('ADD_FILE_SELECTION', file)
     }
   },
-  copySelectedFiles(context, options: { resources: Resource[] } & Language) {
+  copySelectedFiles(
+    context,
+    options: { resources: Resource[]; messageStore: MessageStore } & Language
+  ) {
     const { $gettext } = options
     context.commit('CLIPBOARD_SELECTED', options)
     context.commit('SET_CLIPBOARD_ACTION', ClipboardActions.Copy)
-    context.dispatch(
-      'showMessage',
-      {
-        title: $gettext('Copied to clipboard!'),
-        status: 'success'
-      },
-      { root: true }
-    )
+    options.messageStore.showMessage({ title: $gettext('Copied to clipboard!'), status: 'success' })
   },
-  cutSelectedFiles(context, options: { space: SpaceResource; resources: Resource[] } & Language) {
+  cutSelectedFiles(
+    context,
+    options: {
+      space: SpaceResource
+      resources: Resource[]
+      messageStore: MessageStore
+    } & Language
+  ) {
     const { $gettext } = options
     context.commit('CLIPBOARD_SELECTED', options)
     context.commit('SET_CLIPBOARD_ACTION', ClipboardActions.Cut)
-    context.dispatch(
-      'showMessage',
-      {
-        title: $gettext('Cut to clipboard!'),
-        status: 'success'
-      },
-      { root: true }
-    )
+    options.messageStore.showMessage({ title: $gettext('Cut to clipboard!'), status: 'success' })
   },
   clearClipboardFiles(context) {
     context.commit('CLEAR_CLIPBOARD')
   },
-  async pasteSelectedFiles(
+  pasteSelectedFiles(
     context,
-    {
-      targetSpace,
-      clientService,
-      loadingService,
-      showMessage,
-      showErrorMessage,
-      $gettext,
-      $ngettext,
-      sourceSpace,
-      resources
-    }
+    { targetSpace, clientService, loadingService, $gettext, $ngettext, sourceSpace, resources }
   ) {
     const copyMove = new ResourceTransfer(
       sourceSpace,
@@ -95,8 +81,6 @@ export default {
       context.state.currentFolder,
       clientService,
       loadingService,
-      showMessage,
-      showErrorMessage,
       $gettext,
       $ngettext
     )
@@ -161,6 +145,7 @@ export default {
       clientService: ClientService
       loadingCallbackArgs: LoadingTaskCallbackArguments
       firstRun: boolean
+      messageStore: MessageStore
     } & Language
   ) {
     const {
@@ -196,14 +181,7 @@ export default {
 
             title = $gettext('Failed to delete "%{file}" - the file is locked', { file: file.name })
           }
-          context.dispatch(
-            'showErrorMessage',
-            {
-              title,
-              error
-            },
-            { root: true }
-          )
+          options.messageStore.showErrorMessage({ title, errors: [error] })
         })
         .finally(() => {
           setProgress({ total: files.length, current: i + 1 })
@@ -227,7 +205,7 @@ export default {
                 { itemCount: removedFiles.length.toString() },
                 true
               )
-        context.dispatch('showMessage', { title }, { root: true })
+        options.messageStore.showMessage({ title })
       }
     })
   },
diff --git a/packages/web-app-files/src/views/FilesDrop.vue b/packages/web-app-files/src/views/FilesDrop.vue
index 7374fe93928..925235558b2 100644
--- a/packages/web-app-files/src/views/FilesDrop.vue
+++ b/packages/web-app-files/src/views/FilesDrop.vue
@@ -40,6 +40,7 @@ import { mapGetters } from 'vuex'
 import {
   createLocationPublic,
   createLocationSpaces,
+  useMessages,
   useThemeStore,
   useUserStore
 } from '@ownclouders/web-pkg'
@@ -85,6 +86,7 @@ export default defineComponent({
     const uppyService = useService<UppyService>('$uppyService')
     const store = useStore()
     const userStore = useUserStore()
+    const messageStore = useMessages()
     const themeStore = useThemeStore()
     const router = useRouter()
     const route = useRoute()
@@ -113,6 +115,7 @@ export default defineComponent({
         route,
         store,
         userStore,
+        messageStore,
         uppyService,
         quotaCheckEnabled: false,
         directoryTreeCreateEnabled: false,
diff --git a/packages/web-app-files/src/views/spaces/GenericSpace.vue b/packages/web-app-files/src/views/spaces/GenericSpace.vue
index 26d8edd7d57..04344882879 100644
--- a/packages/web-app-files/src/views/spaces/GenericSpace.vue
+++ b/packages/web-app-files/src/views/spaces/GenericSpace.vue
@@ -608,7 +608,6 @@ export default defineComponent({
 
   methods: {
     ...mapActions('Files', ['loadPreview']),
-    ...mapActions(['showMessage', 'showErrorMessage']),
     ...mapMutations('Files', ['REMOVE_FILES', 'REMOVE_FILES_FROM_SEARCHED', 'RESET_SELECTION']),
 
     async fileDropped(fileTarget) {
@@ -653,8 +652,6 @@ export default defineComponent({
         targetFolder,
         this.$clientService,
         this.$loadingService,
-        this.showMessage,
-        this.showErrorMessage,
         this.$gettext,
         this.$ngettext
       )
diff --git a/packages/web-app-files/tests/unit/HandleUpload.spec.ts b/packages/web-app-files/tests/unit/HandleUpload.spec.ts
index df52784a128..56eb55d33c3 100644
--- a/packages/web-app-files/tests/unit/HandleUpload.spec.ts
+++ b/packages/web-app-files/tests/unit/HandleUpload.spec.ts
@@ -9,7 +9,8 @@ import {
   UppyService,
   UppyResource,
   locationSpacesGeneric,
-  useUserStore
+  useUserStore,
+  useMessages
 } from '@ownclouders/web-pkg'
 import { Language } from 'vue3-gettext'
 import { ResourceConflict } from 'web-app-files/src/helpers/resource/actions'
@@ -283,6 +284,7 @@ const getWrapper = ({
     route: ref(route),
     store,
     userStore: useUserStore(createTestingPinia()),
+    messageStore: useMessages(createTestingPinia()),
     space: mock<SpaceResource>(),
     uppyService: mock<UppyService>(),
     conflictHandlingEnabled,
diff --git a/packages/web-app-files/tests/unit/components/AppBar/CreateSpace.spec.ts b/packages/web-app-files/tests/unit/components/AppBar/CreateSpace.spec.ts
index ca6f7386032..1405c6a98c5 100644
--- a/packages/web-app-files/tests/unit/components/AppBar/CreateSpace.spec.ts
+++ b/packages/web-app-files/tests/unit/components/AppBar/CreateSpace.spec.ts
@@ -9,7 +9,7 @@ import {
   defaultStoreMockOptions,
   defaultComponentMocks
 } from 'web-test-helpers'
-import { useModals } from '@ownclouders/web-pkg'
+import { useMessages, useModals } from '@ownclouders/web-pkg'
 import { unref } from 'vue'
 
 const selectors = {
@@ -45,7 +45,7 @@ describe('CreateSpace component', () => {
     })
     it('shows a message when an error occurred', async () => {
       jest.spyOn(console, 'error').mockImplementation(() => undefined)
-      const { wrapper, mocks, storeOptions } = getWrapper()
+      const { wrapper, mocks } = getWrapper()
       const { modals } = useModals()
       await wrapper.find(selectors.newSpaceBtn).trigger('click')
 
@@ -53,7 +53,8 @@ describe('CreateSpace component', () => {
       graphMock.drives.createDrive.mockRejectedValue({})
       await unref(modals)[0].onConfirm('New Space')
 
-      expect(storeOptions.actions.showErrorMessage).toHaveBeenCalled()
+      const { showErrorMessage } = useMessages()
+      expect(showErrorMessage).toHaveBeenCalled()
     })
   })
 })
diff --git a/packages/web-app-files/tests/unit/components/Modals/SetLinkPasswordModal.spec.ts b/packages/web-app-files/tests/unit/components/Modals/SetLinkPasswordModal.spec.ts
index d411fc7de58..9cc99c7ad59 100644
--- a/packages/web-app-files/tests/unit/components/Modals/SetLinkPasswordModal.spec.ts
+++ b/packages/web-app-files/tests/unit/components/Modals/SetLinkPasswordModal.spec.ts
@@ -7,7 +7,7 @@ import {
   defaultStoreMockOptions,
   shallowMount
 } from 'web-test-helpers'
-import { Modal } from '@ownclouders/web-pkg'
+import { Modal, useMessages } from '@ownclouders/web-pkg'
 
 describe('SetLinkPasswordModal', () => {
   it('should render a text input field for the password', () => {
@@ -21,14 +21,16 @@ describe('SetLinkPasswordModal', () => {
       await wrapper.vm.onConfirm()
 
       expect(storeOptions.modules.Files.actions.updateLink).toHaveBeenCalled()
-      expect(storeOptions.actions.showMessage).toHaveBeenCalled()
+      const { showMessage } = useMessages()
+      expect(showMessage).toHaveBeenCalled()
     })
     it('shows an error message on error', async () => {
       const { wrapper, storeOptions } = getWrapper()
       storeOptions.modules.Files.actions.updateLink.mockRejectedValue(new Error(''))
       await wrapper.vm.onConfirm()
 
-      expect(storeOptions.actions.showErrorMessage).toHaveBeenCalled()
+      const { showErrorMessage } = useMessages()
+      expect(showErrorMessage).toHaveBeenCalled()
     })
   })
 })
diff --git a/packages/web-app-files/tests/unit/components/SideBar/PrivateLinkItem.spec.ts b/packages/web-app-files/tests/unit/components/SideBar/PrivateLinkItem.spec.ts
index 0156da519aa..d9717297da7 100644
--- a/packages/web-app-files/tests/unit/components/SideBar/PrivateLinkItem.spec.ts
+++ b/packages/web-app-files/tests/unit/components/SideBar/PrivateLinkItem.spec.ts
@@ -1,7 +1,8 @@
 import { mock } from 'jest-mock-extended'
 import { Resource } from '@ownclouders/web-client'
-import { createStore, defaultPlugins, mount, defaultStoreMockOptions } from 'web-test-helpers'
+import { defaultPlugins, mount } from 'web-test-helpers'
 import PrivateLinkItem from 'web-app-files/src/components/SideBar/PrivateLinkItem.vue'
+import { useMessages } from '@ownclouders/web-pkg'
 
 jest.useFakeTimers()
 
@@ -27,13 +28,14 @@ describe('PrivateLinkItem', () => {
       }
     })
 
-    const { wrapper, storeOptions } = getWrapper()
-    expect(storeOptions.actions.showMessage).not.toHaveBeenCalled()
+    const { wrapper } = getWrapper()
+    const { showMessage } = useMessages()
+    expect(showMessage).not.toHaveBeenCalled()
 
     await wrapper.trigger('click')
     expect(wrapper.html()).toMatchSnapshot()
     expect(window.navigator.clipboard.writeText).toHaveBeenCalledWith(folder.privateLink)
-    expect(storeOptions.actions.showMessage).toHaveBeenCalledTimes(1)
+    expect(showMessage).toHaveBeenCalledTimes(1)
 
     jest.advanceTimersByTime(550)
 
@@ -44,14 +46,10 @@ describe('PrivateLinkItem', () => {
 })
 
 function getWrapper() {
-  const storeOptions = { ...defaultStoreMockOptions }
-  storeOptions.getters.capabilities.mockImplementation(() => ({ files: { privateLinks: true } }))
-  const store = createStore(storeOptions)
   return {
-    storeOptions,
     wrapper: mount(PrivateLinkItem, {
       global: {
-        plugins: [...defaultPlugins(), store],
+        plugins: [...defaultPlugins()],
         provide: {
           resource: folder
         }
diff --git a/packages/web-app-files/tests/unit/components/SideBar/Shares/Links/NameAndCopy.spec.ts b/packages/web-app-files/tests/unit/components/SideBar/Shares/Links/NameAndCopy.spec.ts
index 33c20cb44ef..45d4d8d3ebb 100644
--- a/packages/web-app-files/tests/unit/components/SideBar/Shares/Links/NameAndCopy.spec.ts
+++ b/packages/web-app-files/tests/unit/components/SideBar/Shares/Links/NameAndCopy.spec.ts
@@ -1,5 +1,6 @@
+import { useMessages } from '@ownclouders/web-pkg'
 import NameAndCopy from 'web-app-files/src/components/SideBar/Shares/Links/NameAndCopy.vue'
-import { createStore, defaultPlugins, mount, defaultStoreMockOptions } from 'web-test-helpers'
+import { defaultPlugins, mount } from 'web-test-helpers'
 
 jest.useFakeTimers()
 
@@ -22,13 +23,14 @@ describe('NameAndCopy', () => {
       }
     })
 
-    const { wrapper, storeOptions } = getWrapper()
-    expect(storeOptions.actions.showMessage).not.toHaveBeenCalled()
+    const { wrapper } = getWrapper()
+    const { showMessage } = useMessages()
+    expect(showMessage).not.toHaveBeenCalled()
 
     await wrapper.find('.oc-files-public-link-copy-url').trigger('click')
     expect(window.navigator.clipboard.writeText).toHaveBeenCalledWith(exampleLink.url)
     expect(wrapper.html()).toMatchSnapshot()
-    expect(storeOptions.actions.showMessage).toHaveBeenCalledTimes(1)
+    expect(showMessage).toHaveBeenCalledTimes(1)
 
     jest.advanceTimersByTime(550)
 
@@ -39,17 +41,13 @@ describe('NameAndCopy', () => {
 })
 
 function getWrapper() {
-  const storeOptions = defaultStoreMockOptions
-  storeOptions.getters.capabilities.mockImplementation(() => ({ files: { privateLinks: true } }))
-  const store = createStore(storeOptions)
   return {
-    storeOptions,
     wrapper: mount(NameAndCopy, {
       props: {
         link: exampleLink
       },
       global: {
-        plugins: [...defaultPlugins(), store],
+        plugins: [...defaultPlugins()],
         directives: {
           'oc-tooltip': jest.fn()
         }
diff --git a/packages/web-app-files/tests/unit/components/SideBar/TagsSelect.spec.ts b/packages/web-app-files/tests/unit/components/SideBar/TagsSelect.spec.ts
index f414ad72b5a..7a565477382 100644
--- a/packages/web-app-files/tests/unit/components/SideBar/TagsSelect.spec.ts
+++ b/packages/web-app-files/tests/unit/components/SideBar/TagsSelect.spec.ts
@@ -9,7 +9,7 @@ import {
 import TagsSelect from 'web-app-files/src/components/SideBar/Details/TagsSelect.vue'
 import { mockDeep } from 'jest-mock-extended'
 import { Resource } from '@ownclouders/web-client'
-import { ClientService, eventBus } from '@ownclouders/web-pkg'
+import { ClientService, eventBus, useMessages } from '@ownclouders/web-pkg'
 
 jest.mock('@ownclouders/web-pkg', () => ({
   ...jest.requireActual('@ownclouders/web-pkg'),
@@ -121,12 +121,13 @@ describe('Tag Select', () => {
       .mockRejectedValue(new Error())
     const resource = mockDeep<Resource>({ tags: ['a'] })
     const eventStub = jest.spyOn(eventBus, 'publish')
-    const { wrapper, storeOptions } = createWrapper(resource, clientService)
+    const { wrapper } = createWrapper(resource, clientService)
     wrapper.vm.selectedTags.push('b')
     await wrapper.vm.save(wrapper.vm.selectedTags)
     expect(assignTagsStub).toHaveBeenCalled()
     expect(eventStub).not.toHaveBeenCalled()
-    expect(storeOptions.actions.showErrorMessage).toHaveBeenCalled()
+    const { showErrorMessage } = useMessages()
+    expect(showErrorMessage).toHaveBeenCalledTimes(1)
   })
 
   it('does not accept tags consisting of blanks only', () => {
diff --git a/packages/web-app-files/tests/unit/composables/actions/spaces/useSpaceActionsUploadImage.spec.ts b/packages/web-app-files/tests/unit/composables/actions/spaces/useSpaceActionsUploadImage.spec.ts
index 8649dbe1ba6..93e4d071822 100644
--- a/packages/web-app-files/tests/unit/composables/actions/spaces/useSpaceActionsUploadImage.spec.ts
+++ b/packages/web-app-files/tests/unit/composables/actions/spaces/useSpaceActionsUploadImage.spec.ts
@@ -9,7 +9,7 @@ import {
   mockAxiosResolve
 } from 'web-test-helpers'
 import { unref, VNodeRef } from 'vue'
-import { eventBus, useStore } from '@ownclouders/web-pkg'
+import { eventBus, useMessages, useStore } from '@ownclouders/web-pkg'
 import { Resource, SpaceResource } from '@ownclouders/web-client/src'
 import { Drive } from '@ownclouders/web-client/src/generated'
 
@@ -17,7 +17,7 @@ describe('uploadImage', () => {
   describe('method "uploadImageSpace"', () => {
     it('should show message on success', () => {
       getWrapper({
-        setup: async ({ uploadImageSpace }, { storeOptions, clientService }) => {
+        setup: async ({ uploadImageSpace }, { clientService }) => {
           const busStub = jest.spyOn(eventBus, 'publish')
           const driveMock = mock<Drive>({ special: [{ specialFolder: { name: 'image' } }] })
           clientService.graphAuthenticated.drives.updateDrive.mockResolvedValue(
@@ -44,7 +44,8 @@ describe('uploadImage', () => {
           })
 
           expect(busStub).toHaveBeenCalledWith('app.files.spaces.uploaded-image', expect.anything())
-          expect(storeOptions.actions.showMessage).toHaveBeenCalledTimes(1)
+          const { showMessage } = useMessages()
+          expect(showMessage).toHaveBeenCalledTimes(1)
         }
       })
     })
@@ -52,7 +53,7 @@ describe('uploadImage', () => {
     it('should show showErrorMessage on error', () => {
       jest.spyOn(console, 'error').mockImplementation(() => undefined)
       getWrapper({
-        setup: async ({ uploadImageSpace }, { storeOptions, clientService }) => {
+        setup: async ({ uploadImageSpace }, { clientService }) => {
           clientService.webdav.putFileContents.mockRejectedValue(new Error(''))
 
           await uploadImageSpace({
@@ -68,7 +69,8 @@ describe('uploadImage', () => {
             }
           })
 
-          expect(storeOptions.actions.showErrorMessage).toHaveBeenCalledTimes(1)
+          const { showErrorMessage } = useMessages()
+          expect(showErrorMessage).toHaveBeenCalledTimes(1)
         }
       })
     })
diff --git a/packages/web-app-files/tests/unit/helpers/resource/resourcesTransfer.spec.ts b/packages/web-app-files/tests/unit/helpers/resource/resourcesTransfer.spec.ts
index 881c823c033..c7d914105cd 100644
--- a/packages/web-app-files/tests/unit/helpers/resource/resourcesTransfer.spec.ts
+++ b/packages/web-app-files/tests/unit/helpers/resource/resourcesTransfer.spec.ts
@@ -5,6 +5,7 @@ import { mock, mockDeep, mockReset } from 'jest-mock-extended'
 import { buildSpace, Resource } from '@ownclouders/web-client/src/helpers'
 import { ListFilesResult } from '@ownclouders/web-client/src/webdav/listFiles'
 import { Drive } from '@ownclouders/web-client/src/generated'
+import { createTestingPinia } from 'web-test-helpers'
 
 const clientServiceMock = mockDeep<ClientService>()
 const loadingServiceMock = mock<LoadingService>({
@@ -19,6 +20,7 @@ let targetFolder
 
 describe('resourcesTransfer', () => {
   beforeEach(() => {
+    createTestingPinia()
     mockReset(clientServiceMock)
     resourcesToMove = [
       {
@@ -65,8 +67,6 @@ describe('resourcesTransfer', () => {
       clientServiceMock,
       loadingServiceMock,
       jest.fn(),
-      jest.fn(),
-      jest.fn(),
       jest.fn()
     )
     const result = await resourcesTransfer.perform(TransferType.COPY)
@@ -92,8 +92,6 @@ describe('resourcesTransfer', () => {
           clientServiceMock,
           loadingServiceMock,
           jest.fn(),
-          jest.fn(),
-          jest.fn(),
           jest.fn()
         )
         const movedResources = await resourcesTransfer.perform(action)
@@ -130,8 +128,6 @@ describe('resourcesTransfer', () => {
       clientServiceMock,
       loadingServiceMock,
       jest.fn(),
-      jest.fn(),
-      jest.fn(),
       jest.fn()
     )
     resourcesTransfer.resolveFileExists = jest
@@ -158,8 +154,6 @@ describe('resourcesTransfer', () => {
       clientServiceMock,
       loadingServiceMock,
       jest.fn(),
-      jest.fn(),
-      jest.fn(),
       jest.fn()
     )
     const namingClash = await resourcesTransfer.isOverwritingParentFolder(
diff --git a/packages/web-app-ocm/src/extensions.ts b/packages/web-app-ocm/src/extensions.ts
index 4f29f4882bf..07f416736b6 100644
--- a/packages/web-app-ocm/src/extensions.ts
+++ b/packages/web-app-ocm/src/extensions.ts
@@ -2,8 +2,7 @@ import {
   FileActionOptions,
   useClientService,
   useConfigurationManager,
-  useRouter,
-  useStore,
+  useMessages,
   useWindowOpen
 } from '@ownclouders/web-pkg'
 import { useGettext } from 'vue3-gettext'
@@ -13,8 +12,7 @@ import { ApplicationSetupOptions } from '@ownclouders/web-pkg'
 import { OCM_PROVIDER_ID } from '@ownclouders/web-client/src/helpers'
 
 export const extensions = (options: ApplicationSetupOptions) => {
-  const store = useStore()
-  const router = useRouter()
+  const { showErrorMessage } = useMessages()
   const clientService = useClientService()
   const configurationManager = useConfigurationManager()
   const { $gettext } = useGettext()
@@ -34,17 +32,17 @@ export const extensions = (options: ApplicationSetupOptions) => {
       if (data.app_url) {
         openUrl(data.app_url)
       } else {
-        return store.dispatch('showErrorMessage', {
+        showErrorMessage({
           title: $gettext('An error occurred'),
           desc: $gettext("Couldn't open remotely")
         })
       }
     } catch (error) {
       console.log(error)
-      return store.dispatch('showErrorMessage', {
+      showErrorMessage({
         title: $gettext('An error occurred'),
         desc: $gettext("Couldn't open remotely"),
-        error
+        errors: [error]
       })
     }
   }
diff --git a/packages/web-app-ocm/src/views/App.vue b/packages/web-app-ocm/src/views/App.vue
index ee3e5c16f69..10b0252dc8d 100644
--- a/packages/web-app-ocm/src/views/App.vue
+++ b/packages/web-app-ocm/src/views/App.vue
@@ -25,7 +25,12 @@ import { defineComponent, onMounted, onUnmounted, ref, unref, Ref } from 'vue'
 import ConnectionsPanel from './ConnectionsPanel.vue'
 import IncomingInvitations from './IncomingInvitations.vue'
 import OutgoingInvitations from './OutgoingInvitations.vue'
-import { useClientService, useScrollTo, useStore, FederatedConnection } from '@ownclouders/web-pkg'
+import {
+  useClientService,
+  useScrollTo,
+  FederatedConnection,
+  useMessages
+} from '@ownclouders/web-pkg'
 import { useGettext } from 'vue3-gettext'
 import { buildConnection } from '../functions'
 
@@ -36,7 +41,7 @@ export default defineComponent({
     ConnectionsPanel
   },
   setup() {
-    const store = useStore()
+    const { showMessage } = useMessages()
     const { scrollToResource } = useScrollTo()
     const clientSerivce = useClientService()
     const { $gettext } = useGettext()
@@ -68,7 +73,7 @@ export default defineComponent({
         )
         if (unref(highlightedConnections).length === 1) {
           scrollToResource(unref(highlightedConnections)[0].id)
-          store.dispatch('showMessage', {
+          showMessage({
             title: $gettext('New federated connection'),
             status: 'success',
             desc: $gettext('You can share with and recieve shares from %{user} now', {
@@ -80,7 +85,7 @@ export default defineComponent({
             .map((c) => c.display_name)
             .join(', ')
 
-          store.dispatch('showMessage', {
+          showMessage({
             title: $gettext('New federated connections'),
             status: 'success',
             desc: $gettext('You can share with and receive shares from %{ connections } now', {
diff --git a/packages/web-app-ocm/src/views/IncomingInvitations.vue b/packages/web-app-ocm/src/views/IncomingInvitations.vue
index 0dd38cedd3c..1017e9a3b6d 100644
--- a/packages/web-app-ocm/src/views/IncomingInvitations.vue
+++ b/packages/web-app-ocm/src/views/IncomingInvitations.vue
@@ -66,7 +66,8 @@ import {
   useClientService,
   useRoute,
   useRouter,
-  useConfigurationManager
+  useConfigurationManager,
+  useMessages
 } from '@ownclouders/web-pkg'
 import { $gettext } from '@ownclouders/web-pkg/src/router/utils'
 import { useGettext } from 'vue3-gettext'
@@ -77,6 +78,7 @@ export default defineComponent({
   emits: ['highlightNewConnections'],
   setup(props, { emit }) {
     const store = useStore()
+    const { showErrorMessage } = useMessages()
     const router = useRouter()
     const clientService = useClientService()
     const configurationManager = useConfigurationManager()
@@ -103,10 +105,10 @@ export default defineComponent({
 
     const errorPopup = (error: Error) => {
       console.error(error)
-      store.dispatch('showErrorMessage', {
+      showErrorMessage({
         title: $gettext('Error'),
         desc: $gettext('An error occurred'),
-        error
+        errors: [error]
       })
     }
     const acceptInvite = async () => {
diff --git a/packages/web-app-ocm/src/views/OutgoingInvitations.vue b/packages/web-app-ocm/src/views/OutgoingInvitations.vue
index e999605471b..1785794b9a0 100644
--- a/packages/web-app-ocm/src/views/OutgoingInvitations.vue
+++ b/packages/web-app-ocm/src/views/OutgoingInvitations.vue
@@ -110,7 +110,7 @@ import {
   NoContentMessage,
   AppLoadingSpinner,
   useClientService,
-  useStore
+  useMessages
 } from '@ownclouders/web-pkg'
 import { useGettext } from 'vue3-gettext'
 import { inviteListSchema, inviteSchema } from '../schemas'
@@ -130,7 +130,7 @@ export default defineComponent({
     AppLoadingSpinner
   },
   setup() {
-    const store = useStore()
+    const { showMessage, showErrorMessage } = useMessages()
     const clientService = useClientService()
     const { $gettext } = useGettext()
 
@@ -224,7 +224,7 @@ export default defineComponent({
             }),
             ...(tokenInfo.description && { description: tokenInfo.description })
           })
-          store.dispatch('showMessage', {
+          showMessage({
             title: $gettext('Success'),
             status: 'success',
             desc: recipient
@@ -276,24 +276,24 @@ export default defineComponent({
 
     const copyLink = (rowData) => {
       navigator.clipboard.writeText(rowData.item.link)
-      store.dispatch('showMessage', {
+      showMessage({
         title: $gettext('Invition link copied'),
         desc: $gettext('Invitation link has been copied to your clipboard.')
       })
     }
     const copyToken = (rowData) => {
       navigator.clipboard.writeText(rowData.item.token)
-      store.dispatch('showMessage', {
+      showMessage({
         title: $gettext('Invite token copied'),
         desc: $gettext('Invite token has been copied to your clipboard.')
       })
     }
     const errorPopup = (error: Error) => {
       console.error(error)
-      store.dispatch('showErrorMessage', {
+      showErrorMessage({
         title: $gettext('Error'),
         desc: $gettext('An error occurred when generating the token'),
-        error
+        errors: [error]
       })
     }
 
diff --git a/packages/web-pkg/src/components/AppTemplates/AppWrapper.vue b/packages/web-pkg/src/components/AppTemplates/AppWrapper.vue
index 7919dca8a00..e23896eb915 100644
--- a/packages/web-pkg/src/components/AppTemplates/AppWrapper.vue
+++ b/packages/web-pkg/src/components/AppTemplates/AppWrapper.vue
@@ -52,7 +52,8 @@ import {
   useStore,
   useSelectedResources,
   useSideBar,
-  useModals
+  useModals,
+  useMessages
 } from '../../composables'
 import {
   Action,
@@ -104,6 +105,7 @@ export default defineComponent({
   setup(props) {
     const { $gettext } = useGettext()
     const store = useStore()
+    const { showMessage, showErrorMessage } = useMessages()
     const router = useRouter()
     const currentRoute = useRoute()
     const clientService = useClientService()
@@ -290,17 +292,15 @@ export default defineComponent({
 
     const errorPopup = (error: HttpError) => {
       console.error(error)
-      store.dispatch('showErrorMessage', {
+      showErrorMessage({
         title: $gettext('An error occurred'),
         desc: error.message,
-        error
+        errors: [error]
       })
     }
 
     const autosavePopup = () => {
-      store.dispatch('showMessage', {
-        title: $gettext('File autosaved')
-      })
+      showMessage({ title: $gettext('File autosaved') })
     }
 
     const saveFileTask = useTask(function* () {
diff --git a/packages/web-pkg/src/components/CreateShortcutModal.vue b/packages/web-pkg/src/components/CreateShortcutModal.vue
index b9ab054c841..2b5efcb0f90 100644
--- a/packages/web-pkg/src/components/CreateShortcutModal.vue
+++ b/packages/web-pkg/src/components/CreateShortcutModal.vue
@@ -94,6 +94,7 @@ import {
   Modal,
   useClientService,
   useFolderLink,
+  useMessages,
   useRouter,
   useSearch,
   useStore
@@ -128,6 +129,7 @@ export default defineComponent({
     const clientService = useClientService()
     const { $gettext } = useGettext()
     const store = useStore()
+    const { showMessage, showErrorMessage } = useMessages()
     const router = useRouter()
     const { search } = useSearch()
     const {
@@ -335,14 +337,12 @@ export default defineComponent({
           content
         })
         store.commit('Files/UPSERT_RESOURCE', resource)
-        store.dispatch('showMessage', {
-          title: $gettext('Shortcut was created successfully')
-        })
+        showMessage({ title: $gettext('Shortcut was created successfully') })
       } catch (e) {
         console.error(e)
-        store.dispatch('showErrorMessage', {
+        showErrorMessage({
           title: $gettext('Failed to create shortcut'),
-          error: e
+          errors: [e]
         })
       }
     }
diff --git a/packages/web-pkg/src/components/FilesList/ContextActions.vue b/packages/web-pkg/src/components/FilesList/ContextActions.vue
index 776894a1abe..e24bd6b1f44 100644
--- a/packages/web-pkg/src/components/FilesList/ContextActions.vue
+++ b/packages/web-pkg/src/components/FilesList/ContextActions.vue
@@ -56,7 +56,7 @@ export default defineComponent({
     const { actions: acceptShareActions } = useFileActionsAcceptShare({ store })
     const { actions: hideShareActions } = useFileActionsToggleHideShare({ store })
     const { actions: copyActions } = useFileActionsCopy({ store })
-    const { actions: createQuickLinkActions } = useFileActionsCopyQuickLink({ store })
+    const { actions: createQuickLinkActions } = useFileActionsCopyQuickLink()
     const { actions: declineShareActions } = useFileActionsDeclineShare({ store })
     const { actions: deleteActions } = useFileActionsDelete({ store })
     const { actions: downloadArchiveActions } = useFileActionsDownloadArchive({ store })
@@ -75,7 +75,7 @@ export default defineComponent({
       store
     })
     const { actions: showSharesActions } = useFileActionsShowShares({ store })
-    const { actions: openShortcutActions } = useFileActionsOpenShortcut({ store })
+    const { actions: openShortcutActions } = useFileActionsOpenShortcut()
 
     const extensionRegistry = useExtensionRegistry()
     const extensionContextActions = computed(() => {
diff --git a/packages/web-pkg/src/components/Spaces/QuotaModal.vue b/packages/web-pkg/src/components/Spaces/QuotaModal.vue
index cb41746ac89..3c72443627a 100644
--- a/packages/web-pkg/src/components/Spaces/QuotaModal.vue
+++ b/packages/web-pkg/src/components/Spaces/QuotaModal.vue
@@ -21,7 +21,12 @@ import { computed, defineComponent, unref, PropType, ref, onMounted, watch } fro
 import { useGettext } from 'vue3-gettext'
 import QuotaSelect from '../QuotaSelect.vue'
 import { SpaceResource } from '@ownclouders/web-client/src'
-import { Modal, useCapabilitySpacesMaxQuota, useClientService } from '../../composables'
+import {
+  Modal,
+  useCapabilitySpacesMaxQuota,
+  useClientService,
+  useMessages
+} from '../../composables'
 import { useRouter } from '../../composables/router'
 import { eventBus } from '../../services'
 import { useStore } from '../../composables'
@@ -58,6 +63,7 @@ export default defineComponent({
   emits: ['update:confirmDisabled'],
   setup(props, { emit, expose }) {
     const store = useStore()
+    const { showMessage, showErrorMessage } = useMessages()
     const { $gettext, $ngettext } = useGettext()
     const clientService = useClientService()
     const router = useRouter()
@@ -154,13 +160,13 @@ export default defineComponent({
       const results = await Promise.allSettled<Array<unknown>>(requests)
       const succeeded = results.filter((r) => r.status === 'fulfilled')
       if (succeeded.length) {
-        store.dispatch('showMessage', { title: getSuccessMessage(succeeded.length) })
+        showMessage({ title: getSuccessMessage(succeeded.length) })
       }
       const errors = results.filter((r) => r.status === 'rejected')
       if (errors.length) {
         console.error(errors)
         errors.forEach(console.error)
-        store.dispatch('showErrorMessage', {
+        showErrorMessage({
           title: getErrorMessage(errors.length),
           errors: (errors as PromiseRejectedResult[]).map((f) => f.reason)
         })
diff --git a/packages/web-pkg/src/components/Spaces/ReadmeContentModal.vue b/packages/web-pkg/src/components/Spaces/ReadmeContentModal.vue
index fc187581200..e92029c5969 100644
--- a/packages/web-pkg/src/components/Spaces/ReadmeContentModal.vue
+++ b/packages/web-pkg/src/components/Spaces/ReadmeContentModal.vue
@@ -12,7 +12,7 @@ import { defineComponent, PropType, onMounted, ref, unref } from 'vue'
 import { useGettext } from 'vue3-gettext'
 import { SpaceResource } from '@ownclouders/web-client/src'
 import { getRelativeSpecialFolderSpacePath } from '@ownclouders/web-client/src/helpers'
-import { Modal, useClientService, useStore } from '../../composables'
+import { Modal, useClientService, useMessages, useStore } from '../../composables'
 
 export default defineComponent({
   name: 'SpaceReadmeContentModal',
@@ -25,6 +25,7 @@ export default defineComponent({
   },
   setup(props, { expose }) {
     const store = useStore()
+    const { showMessage, showErrorMessage } = useMessages()
     const { $gettext } = useGettext()
     const clientService = useClientService()
 
@@ -42,14 +43,12 @@ export default defineComponent({
           field: 'spaceReadmeData',
           value: { ...props.space.spaceReadmeData, ...{ etag: readmeMetaData.etag } }
         })
-        store.dispatch('showMessage', {
-          title: $gettext('Space description was edited successfully')
-        })
+        showMessage({ title: $gettext('Space description was edited successfully') })
       } catch (error) {
         console.error(error)
-        store.dispatch('showErrorMessage', {
+        showErrorMessage({
           title: $gettext('Failed to edit space description'),
-          error
+          errors: [error]
         })
       }
     }
diff --git a/packages/web-pkg/src/composables/actions/files/useFileActions.ts b/packages/web-pkg/src/composables/actions/files/useFileActions.ts
index fb71e2cebf0..4b2ebc9bf13 100644
--- a/packages/web-pkg/src/composables/actions/files/useFileActions.ts
+++ b/packages/web-pkg/src/composables/actions/files/useFileActions.ts
@@ -67,7 +67,7 @@ export const useFileActions = ({ store }: { store?: Store<any> } = {}) => {
   const { actions: renameActions } = useFileActionsRename({ store })
   const { actions: restoreActions } = useFileActionsRestore({ store })
   const { actions: createSpaceFromResource } = useFileActionsCreateSpaceFromResource({ store })
-  const { actions: openShortcutActions } = useFileActionsOpenShortcut({ store })
+  const { actions: openShortcutActions } = useFileActionsOpenShortcut()
 
   const systemActions = computed((): Action[] => [
     ...unref(openShortcutActions),
diff --git a/packages/web-pkg/src/composables/actions/files/useFileActionsAcceptShare.ts b/packages/web-pkg/src/composables/actions/files/useFileActionsAcceptShare.ts
index ead7dcf68de..38d7f079333 100644
--- a/packages/web-pkg/src/composables/actions/files/useFileActionsAcceptShare.ts
+++ b/packages/web-pkg/src/composables/actions/files/useFileActionsAcceptShare.ts
@@ -13,9 +13,11 @@ import { useStore } from '../../store'
 import { computed, unref } from 'vue'
 import { useGettext } from 'vue3-gettext'
 import { FileAction, FileActionOptions } from '../../actions'
+import { useMessages } from '../../piniaStores'
 
 export const useFileActionsAcceptShare = ({ store }: { store?: Store<any> } = {}) => {
   store = store || useStore()
+  const { showMessage, showErrorMessage } = useMessages()
   const router = useRouter()
   const { $gettext, $ngettext } = useGettext()
 
@@ -60,7 +62,7 @@ export const useFileActionsAcceptShare = ({ store }: { store?: Store<any> } = {}
       store.dispatch('Files/resetFileSelection')
 
       if (isLocationSpacesActive(router, 'files-spaces-generic')) {
-        store.dispatch('showMessage', {
+        showMessage({
           title: $ngettext(
             'Sync for the selected share was enabled successfully',
             'Sync for the selected shares was enabled successfully',
@@ -72,7 +74,7 @@ export const useFileActionsAcceptShare = ({ store }: { store?: Store<any> } = {}
       return
     }
 
-    store.dispatch('showErrorMessage', {
+    showErrorMessage({
       title: $ngettext(
         'Failed to enable sync for the the selected share',
         'Failed to enable sync for the selected shares',
diff --git a/packages/web-pkg/src/composables/actions/files/useFileActionsCopy.ts b/packages/web-pkg/src/composables/actions/files/useFileActionsCopy.ts
index 418671054f3..e35dbae83e9 100644
--- a/packages/web-pkg/src/composables/actions/files/useFileActionsCopy.ts
+++ b/packages/web-pkg/src/composables/actions/files/useFileActionsCopy.ts
@@ -11,9 +11,11 @@ import { FileAction, FileActionOptions } from '../types'
 import { isProjectSpaceResource } from '@ownclouders/web-client/src/helpers'
 import { useRouter } from '../../router'
 import { useStore } from '../../store'
+import { useMessages } from '../../piniaStores'
 
 export const useFileActionsCopy = ({ store }: { store?: Store<any> } = {}) => {
   store = store || useStore()
+  const messageStore = useMessages()
   const router = useRouter()
 
   const language = useGettext()
@@ -37,7 +39,7 @@ export const useFileActionsCopy = ({ store }: { store?: Store<any> } = {}) => {
       resources = resources.filter((r) => !isProjectSpaceResource(r))
     }
 
-    store.dispatch('Files/copySelectedFiles', { ...language, space, resources })
+    store.dispatch('Files/copySelectedFiles', { ...language, space, resources, messageStore })
   }
 
   const actions = computed((): FileAction[] => {
diff --git a/packages/web-pkg/src/composables/actions/files/useFileActionsCopyQuicklink.ts b/packages/web-pkg/src/composables/actions/files/useFileActionsCopyQuicklink.ts
index 406928e37d3..455a85aca5a 100644
--- a/packages/web-pkg/src/composables/actions/files/useFileActionsCopyQuicklink.ts
+++ b/packages/web-pkg/src/composables/actions/files/useFileActionsCopyQuicklink.ts
@@ -8,17 +8,16 @@ import { isLocationSharesActive } from '../../../router'
 import { computed, unref } from 'vue'
 import { useClientService } from '../../clientService'
 import { useRouter } from '../../router'
-import { useStore } from '../../store'
 import { useGettext } from 'vue3-gettext'
-import { Store } from 'vuex'
 import { FileAction, FileActionOptions } from '../types'
 import { useCanShare } from '../../shares'
 import { useClipboard } from '../../clipboard'
 import { Resource } from '@ownclouders/web-client'
 import { useFileActionsCreateLink } from './useFileActionsCreateLink'
+import { useMessages } from '../../piniaStores'
 
-export const useFileActionsCopyQuickLink = ({ store }: { store?: Store<any> } = {}) => {
-  store = store || useStore()
+export const useFileActionsCopyQuickLink = () => {
+  const { showMessage, showErrorMessage } = useMessages()
   const router = useRouter()
   const language = useGettext()
   const { $gettext } = language
@@ -36,7 +35,6 @@ export const useFileActionsCopyQuickLink = ({ store }: { store?: Store<any> } =
   }
 
   const { actions: createLinkActions } = useFileActionsCreateLink({
-    store,
     onLinkCreatedCallback,
     showMessages: false
   })
@@ -47,14 +45,12 @@ export const useFileActionsCopyQuickLink = ({ store }: { store?: Store<any> } =
   const copyQuickLinkToClipboard = async (url: string) => {
     try {
       await copyToClipboard(url)
-      return store.dispatch('showMessage', {
-        title: $gettext('The link has been copied to your clipboard.')
-      })
+      showMessage({ title: $gettext('The link has been copied to your clipboard.') })
     } catch (e) {
       console.error(e)
-      return store.dispatch('showErrorMessage', {
+      showErrorMessage({
         title: $gettext('Copy link failed'),
-        error: e
+        errors: [e]
       })
     }
   }
diff --git a/packages/web-pkg/src/composables/actions/files/useFileActionsCreateLink.ts b/packages/web-pkg/src/composables/actions/files/useFileActionsCreateLink.ts
index 146b54f7902..4bd53c17745 100644
--- a/packages/web-pkg/src/composables/actions/files/useFileActionsCreateLink.ts
+++ b/packages/web-pkg/src/composables/actions/files/useFileActionsCreateLink.ts
@@ -1,4 +1,3 @@
-import { Store } from 'vuex'
 import { computed, unref } from 'vue'
 import { useGettext } from 'vue3-gettext'
 import { FileAction, FileActionOptions } from '../../actions'
@@ -12,20 +11,19 @@ import {
 import { useCapabilityFilesSharingPublicPasswordEnforcedFor } from '../../capability'
 import { useCreateLink, useDefaultLinkPermissions } from '../../links'
 import { useLoadingService } from '../../loadingService'
-import { useModals, useUserStore } from '../../piniaStores'
+import { useMessages, useModals, useUserStore } from '../../piniaStores'
 
 export const useFileActionsCreateLink = ({
-  store,
   enforceModal = false,
   showMessages = true,
   onLinkCreatedCallback = undefined
 }: {
-  store?: Store<any>
   enforceModal?: boolean
   showMessages?: boolean
   onLinkCreatedCallback?: (result: PromiseSettledResult<Share>[]) => Promise<void> | void
 } = {}) => {
   const userStore = useUserStore()
+  const { showMessage, showErrorMessage } = useMessages()
   const { $gettext, $ngettext } = useGettext()
   const ability = useAbility()
   const loadingService = useLoadingService()
@@ -39,7 +37,7 @@ export const useFileActionsCreateLink = ({
       (val): val is PromiseFulfilledResult<Share> => val.status === 'fulfilled'
     )
     if (succeeded.length && showMessages) {
-      store.dispatch('showMessage', {
+      showMessage({
         title: $ngettext(
           'Link has been created successfully',
           'Links have been created successfully',
@@ -50,7 +48,7 @@ export const useFileActionsCreateLink = ({
 
     const failed = result.filter(({ status }) => status === 'rejected')
     if (failed.length) {
-      store.dispatch('showErrorMessage', {
+      showErrorMessage({
         errors: (failed as PromiseRejectedResult[]).map(({ reason }) => reason),
         title: $ngettext('Failed to create link', 'Failed to create links', failed.length)
       })
diff --git a/packages/web-pkg/src/composables/actions/files/useFileActionsCreateNewFile.ts b/packages/web-pkg/src/composables/actions/files/useFileActionsCreateNewFile.ts
index 46c7f2c0469..b6a3537744f 100644
--- a/packages/web-pkg/src/composables/actions/files/useFileActionsCreateNewFile.ts
+++ b/packages/web-pkg/src/composables/actions/files/useFileActionsCreateNewFile.ts
@@ -21,7 +21,7 @@ import { urlJoin } from '@ownclouders/web-client/src/utils'
 import { configurationManager } from '../../../configuration'
 import { stringify } from 'qs'
 import { AncestorMetaData } from '../../../types'
-import { useModals, useUserStore } from '../../piniaStores'
+import { useMessages, useModals, useUserStore } from '../../piniaStores'
 
 export const useFileActionsCreateNewFile = ({
   store,
@@ -35,6 +35,7 @@ export const useFileActionsCreateNewFile = ({
   mimetypesAllowedForCreation?: Ref<any> // FIXME: type?
 } = {}) => {
   store = store || useStore()
+  const { showMessage, showErrorMessage } = useMessages()
   const userStore = useUserStore()
   const router = useRouter()
   const { $gettext } = useGettext()
@@ -110,14 +111,12 @@ export const useFileActionsCreateNewFile = ({
       }
       triggerDefaultAction({ space: space, resources: [resource] })
       store.commit('Files/UPSERT_RESOURCE', resource)
-      store.dispatch('showMessage', {
-        title: $gettext('"%{fileName}" was created successfully', { fileName })
-      })
+      showMessage({ title: $gettext('"%{fileName}" was created successfully', { fileName }) })
     } catch (error) {
       console.error(error)
-      store.dispatch('showErrorMessage', {
+      showErrorMessage({
         title: $gettext('Failed to create file'),
-        error
+        errors: [error]
       })
     }
   }
@@ -156,14 +155,12 @@ export const useFileActionsCreateNewFile = ({
         return
       }
 
-      store.dispatch('showMessage', {
-        title: $gettext('"%{fileName}" was created successfully', { fileName })
-      })
+      showMessage({ title: $gettext('"%{fileName}" was created successfully', { fileName }) })
     } catch (error) {
       console.error(error)
-      store.dispatch('showErrorMessage', {
+      showErrorMessage({
         title: $gettext('Failed to create file'),
-        error
+        errors: [error]
       })
     }
   }
diff --git a/packages/web-pkg/src/composables/actions/files/useFileActionsCreateNewFolder.ts b/packages/web-pkg/src/composables/actions/files/useFileActionsCreateNewFolder.ts
index 3a74f34c883..93cd7c10a7e 100644
--- a/packages/web-pkg/src/composables/actions/files/useFileActionsCreateNewFolder.ts
+++ b/packages/web-pkg/src/composables/actions/files/useFileActionsCreateNewFolder.ts
@@ -13,13 +13,14 @@ import { isLocationSpacesActive } from '../../../router'
 import { getIndicators } from '../../../helpers/statusIndicators'
 import { useScrollTo } from '../../scrollTo'
 import { AncestorMetaData } from '../../../types'
-import { useModals } from '../../../composables/piniaStores'
+import { useMessages, useModals } from '../../../composables/piniaStores'
 
 export const useFileActionsCreateNewFolder = ({
   store,
   space
 }: { store?: Store<any>; space?: SpaceResource } = {}) => {
   store = store || useStore()
+  const { showMessage, showErrorMessage } = useMessages()
   const router = useRouter()
   const { dispatchModal } = useModals()
   const { $gettext } = useGettext()
@@ -77,17 +78,15 @@ export const useFileActionsCreateNewFolder = ({
 
       store.commit('Files/UPSERT_RESOURCE', resource)
 
-      store.dispatch('showMessage', {
-        title: $gettext('"%{folderName}" was created successfully', { folderName })
-      })
+      showMessage({ title: $gettext('"%{folderName}" was created successfully', { folderName }) })
 
       await nextTick()
       scrollToResource(resource.id, { forceScroll: true, topbarElement: 'files-app-bar' })
     } catch (error) {
       console.error(error)
-      store.dispatch('showErrorMessage', {
+      showErrorMessage({
         title: $gettext('Failed to create folder'),
-        error
+        errors: [error]
       })
     }
   }
diff --git a/packages/web-pkg/src/composables/actions/files/useFileActionsCreateSpaceFromResource.ts b/packages/web-pkg/src/composables/actions/files/useFileActionsCreateSpaceFromResource.ts
index c32a08354b1..befd4559d1a 100644
--- a/packages/web-pkg/src/composables/actions/files/useFileActionsCreateSpaceFromResource.ts
+++ b/packages/web-pkg/src/composables/actions/files/useFileActionsCreateSpaceFromResource.ts
@@ -11,10 +11,11 @@ import { isLocationSpacesActive } from '../../../router'
 import { useCreateSpace } from '../../spaces'
 import { useSpaceHelpers } from '../../spaces'
 import PQueue from 'p-queue'
-import { useModals } from '../../piniaStores'
+import { useMessages, useModals } from '../../piniaStores'
 import { useConfigurationManager } from '../../configuration'
 
 export const useFileActionsCreateSpaceFromResource = ({ store }: { store?: Store<any> } = {}) => {
+  const { showMessage, showErrorMessage } = useMessages()
   const { can } = useAbility()
   const { $gettext, $ngettext } = useGettext()
   const { createSpace } = useCreateSpace()
@@ -49,14 +50,12 @@ export const useFileActionsCreateSpaceFromResource = ({ store }: { store?: Store
 
       await Promise.all(copyOps)
       store.dispatch('Files/resetFileSelection')
-      store.dispatch('showMessage', {
-        title: $gettext('Space was created successfully')
-      })
+      showMessage({ title: $gettext('Space was created successfully') })
     } catch (error) {
       console.error(error)
-      store.dispatch('showErrorMessage', {
+      showErrorMessage({
         title: $gettext('Creating space failed…'),
-        error
+        errors: [error]
       })
     }
   }
diff --git a/packages/web-pkg/src/composables/actions/files/useFileActionsDeclineShare.ts b/packages/web-pkg/src/composables/actions/files/useFileActionsDeclineShare.ts
index f82e397a97a..13ff4fd0a54 100644
--- a/packages/web-pkg/src/composables/actions/files/useFileActionsDeclineShare.ts
+++ b/packages/web-pkg/src/composables/actions/files/useFileActionsDeclineShare.ts
@@ -16,9 +16,11 @@ import { useStore } from '../../store'
 import { computed, unref } from 'vue'
 import { useGettext } from 'vue3-gettext'
 import { FileAction, FileActionOptions } from '../types'
+import { useMessages } from '../../piniaStores'
 
 export const useFileActionsDeclineShare = ({ store }: { store?: Store<any> } = {}) => {
   store = store || useStore()
+  const { showMessage, showErrorMessage } = useMessages()
   const router = useRouter()
   const { $gettext, $ngettext } = useGettext()
 
@@ -61,7 +63,7 @@ export const useFileActionsDeclineShare = ({ store }: { store?: Store<any> } = {
 
     if (errors.length === 0) {
       if (isLocationSpacesActive(router, 'files-spaces-generic')) {
-        store.dispatch('showMessage', {
+        showMessage({
           title: $ngettext(
             'Sync for the selected share was disabled successfully',
             'Sync for the selected shares was disabled successfully',
@@ -74,7 +76,7 @@ export const useFileActionsDeclineShare = ({ store }: { store?: Store<any> } = {
       return
     }
 
-    store.dispatch('showErrorMessage', {
+    showErrorMessage({
       title: $ngettext(
         'Failed to disable sync for the the selected share',
         'Failed to disable sync for the selected shares',
diff --git a/packages/web-pkg/src/composables/actions/files/useFileActionsDownloadArchive.ts b/packages/web-pkg/src/composables/actions/files/useFileActionsDownloadArchive.ts
index 80028b38fc3..3d479f458d2 100644
--- a/packages/web-pkg/src/composables/actions/files/useFileActionsDownloadArchive.ts
+++ b/packages/web-pkg/src/composables/actions/files/useFileActionsDownloadArchive.ts
@@ -23,9 +23,11 @@ import { FileAction, FileActionOptions } from '../types'
 import { useGettext } from 'vue3-gettext'
 import { useArchiverService } from '../../archiverService'
 import { formatFileSize } from '../../../helpers/filesize'
+import { useMessages } from '../../piniaStores'
 
 export const useFileActionsDownloadArchive = ({ store }: { store?: Store<any> } = {}) => {
   store = store || useStore()
+  const { showErrorMessage } = useMessages()
   const router = useRouter()
   const loadingService = useLoadingService()
   const archiverService = useArchiverService()
@@ -59,13 +61,13 @@ export const useFileActionsDownloadArchive = ({ store }: { store?: Store<any> }
       })
       .catch((e) => {
         console.error(e)
-        store.dispatch('showErrorMessage', {
+        showErrorMessage({
           title: $ngettext(
             'Failed to download the selected folder.', // on single selection only available for folders
             'Failed to download the selected files.', // on multi selection available for files+folders
             resources.length
           ),
-          error: e
+          errors: [e]
         })
       })
   }
diff --git a/packages/web-pkg/src/composables/actions/files/useFileActionsEmptyTrashBin.ts b/packages/web-pkg/src/composables/actions/files/useFileActionsEmptyTrashBin.ts
index 0dcedc5ff76..be5810b5272 100644
--- a/packages/web-pkg/src/composables/actions/files/useFileActionsEmptyTrashBin.ts
+++ b/packages/web-pkg/src/composables/actions/files/useFileActionsEmptyTrashBin.ts
@@ -10,10 +10,11 @@ import { useStore } from '../../store'
 
 import { useGettext } from 'vue3-gettext'
 import { FileAction, FileActionOptions } from '../types'
-import { useModals, useUserStore } from '../../piniaStores'
+import { useMessages, useModals, useUserStore } from '../../piniaStores'
 
 export const useFileActionsEmptyTrashBin = ({ store }: { store?: Store<any> } = {}) => {
   store = store || useStore()
+  const { showMessage, showErrorMessage } = useMessages()
   const userStore = useUserStore()
   const router = useRouter()
   const { $gettext } = useGettext()
@@ -25,16 +26,14 @@ export const useFileActionsEmptyTrashBin = ({ store }: { store?: Store<any> } =
     return clientService.webdav
       .clearTrashBin(space)
       .then(() => {
-        store.dispatch('showMessage', {
-          title: $gettext('All deleted files were removed')
-        })
+        showMessage({ title: $gettext('All deleted files were removed') })
         store.dispatch('Files/clearTrashBin')
       })
       .catch((error) => {
         console.error(error)
-        store.dispatch('showErrorMessage', {
+        showErrorMessage({
           title: $gettext('Failed to empty trash bin'),
-          error
+          errors: [error]
         })
       })
   }
diff --git a/packages/web-pkg/src/composables/actions/files/useFileActionsFavorite.ts b/packages/web-pkg/src/composables/actions/files/useFileActionsFavorite.ts
index 468d3a57f6b..0bf88e41f65 100644
--- a/packages/web-pkg/src/composables/actions/files/useFileActionsFavorite.ts
+++ b/packages/web-pkg/src/composables/actions/files/useFileActionsFavorite.ts
@@ -9,9 +9,11 @@ import { useStore } from '../../store'
 import { useRouter } from '../../router'
 import { useClientService } from '../../clientService'
 import { useAbility } from '../../ability'
+import { useMessages } from '../../piniaStores'
 
 export const useFileActionsFavorite = ({ store }: { store?: Store<any> } = {}) => {
   store = store || useStore()
+  const { showErrorMessage } = useMessages()
   const router = useRouter()
   const { $gettext } = useGettext()
   const clientService = useClientService()
@@ -31,10 +33,7 @@ export const useFileActionsFavorite = ({ store }: { store?: Store<any> } = {}) =
           { file: resources[0].name },
           true
         )
-        store.dispatch('showErrorMessage', {
-          title,
-          error
-        })
+        showErrorMessage({ title, errors: [error] })
       })
   }
 
diff --git a/packages/web-pkg/src/composables/actions/files/useFileActionsMove.ts b/packages/web-pkg/src/composables/actions/files/useFileActionsMove.ts
index 55a32ff0975..61d3544f567 100644
--- a/packages/web-pkg/src/composables/actions/files/useFileActionsMove.ts
+++ b/packages/web-pkg/src/composables/actions/files/useFileActionsMove.ts
@@ -10,9 +10,11 @@ import { ActionOptions, FileAction } from '../types'
 import { computed, unref } from 'vue'
 import { useRouter } from '../../router'
 import { useStore } from '../../store'
+import { useMessages } from '../../piniaStores'
 
 export const useFileActionsMove = ({ store }: { store?: Store<any> } = {}) => {
   store = store || useStore()
+  const messageStore = useMessages()
   const router = useRouter()
   const language = useGettext()
   const { $gettext } = language
@@ -29,7 +31,7 @@ export const useFileActionsMove = ({ store }: { store?: Store<any> } = {}) => {
   })
 
   const handler = ({ space, resources }: ActionOptions) => {
-    store.dispatch('Files/cutSelectedFiles', { ...language, space, resources })
+    store.dispatch('Files/cutSelectedFiles', { ...language, space, resources, messageStore })
   }
   const actions = computed((): FileAction[] => [
     {
diff --git a/packages/web-pkg/src/composables/actions/files/useFileActionsOpenShortcut.ts b/packages/web-pkg/src/composables/actions/files/useFileActionsOpenShortcut.ts
index c8605e1082f..ec3759c32cb 100644
--- a/packages/web-pkg/src/composables/actions/files/useFileActionsOpenShortcut.ts
+++ b/packages/web-pkg/src/composables/actions/files/useFileActionsOpenShortcut.ts
@@ -10,11 +10,12 @@ import { FileAction, FileActionOptions } from '../types'
 import { useIsSearchActive } from '../helpers'
 import { computed, unref } from 'vue'
 import { useGettext } from 'vue3-gettext'
-import { Store } from 'vuex'
 import { useClientService } from '../../clientService'
 import DOMPurify from 'dompurify'
+import { useMessages } from '../../piniaStores'
 
-export const useFileActionsOpenShortcut = ({ store }: { store?: Store<any> } = {}) => {
+export const useFileActionsOpenShortcut = () => {
+  const { showErrorMessage } = useMessages()
   const router = useRouter()
   const { $gettext } = useGettext()
   const isFilesAppActive = useIsFilesAppActive()
@@ -51,9 +52,9 @@ export const useFileActionsOpenShortcut = ({ store }: { store?: Store<any> } = {
       window.open(url)
     } catch (e) {
       console.error(e)
-      store.dispatch('showErrorMessage', {
+      showErrorMessage({
         title: $gettext('Failed to open shortcut'),
-        error: e
+        errors: [e]
       })
     }
   }
diff --git a/packages/web-pkg/src/composables/actions/files/useFileActionsPaste.ts b/packages/web-pkg/src/composables/actions/files/useFileActionsPaste.ts
index b6575a0cdd6..ca13a620d4c 100644
--- a/packages/web-pkg/src/composables/actions/files/useFileActionsPaste.ts
+++ b/packages/web-pkg/src/composables/actions/files/useFileActionsPaste.ts
@@ -58,8 +58,6 @@ export const useFileActionsPaste = ({ store }: { store?: Store<any> } = {}) => {
           resources: resourcesToCopy,
           clientService,
           loadingService,
-          showMessage: (...args) => store.dispatch('showMessage', ...args),
-          showErrorMessage: (...args) => store.dispatch('showErrorMessage', ...args),
           $gettext,
           $ngettext
         })
diff --git a/packages/web-pkg/src/composables/actions/files/useFileActionsRename.ts b/packages/web-pkg/src/composables/actions/files/useFileActionsRename.ts
index c6057e97a16..7ea7b14a032 100644
--- a/packages/web-pkg/src/composables/actions/files/useFileActionsRename.ts
+++ b/packages/web-pkg/src/composables/actions/files/useFileActionsRename.ts
@@ -19,10 +19,11 @@ import { useStore } from '../../store'
 import { useGettext } from 'vue3-gettext'
 import { FileAction, FileActionOptions } from '../types'
 import { useCapabilityFilesSharingCanRename } from '../../capability'
-import { useModals } from '../../piniaStores'
+import { useMessages, useModals } from '../../piniaStores'
 
 export const useFileActionsRename = ({ store }: { store?: Store<any> } = {}) => {
   store = store || useStore()
+  const { showErrorMessage } = useMessages()
   const router = useRouter()
   const { $gettext } = useGettext()
   const clientService = useClientService()
@@ -136,10 +137,7 @@ export const useFileActionsRename = ({ store }: { store?: Store<any> } = {}) =>
           true
         )
       }
-      store.dispatch('showErrorMessage', {
-        title,
-        error
-      })
+      showErrorMessage({ title, errors: [error] })
     }
   }
 
diff --git a/packages/web-pkg/src/composables/actions/files/useFileActionsRestore.ts b/packages/web-pkg/src/composables/actions/files/useFileActionsRestore.ts
index d440c1b07a7..25df3ea9a9d 100644
--- a/packages/web-pkg/src/composables/actions/files/useFileActionsRestore.ts
+++ b/packages/web-pkg/src/composables/actions/files/useFileActionsRestore.ts
@@ -24,10 +24,11 @@ import { computed, unref } from 'vue'
 import { useGettext } from 'vue3-gettext'
 import { FileAction, FileActionOptions } from '../types'
 import { LoadingTaskCallbackArguments } from '../../../services'
-import { useUserStore } from '../../piniaStores'
+import { useMessages, useUserStore } from '../../piniaStores'
 
 export const useFileActionsRestore = ({ store }: { store?: Store<any> } = {}) => {
   store = store || useStore()
+  const { showMessage, showErrorMessage } = useMessages()
   const userStore = useUserStore()
   const router = useRouter()
   const { $gettext, $ngettext } = useGettext()
@@ -93,12 +94,7 @@ export const useFileActionsRestore = ({ store }: { store?: Store<any> } = {}) =>
         continue
       }
       const remainingConflictCount = allConflictsCount - count
-      const conflictDialog = new ConflictDialog(
-        (...args) => store.dispatch('showMessage', ...args),
-        (...args) => store.dispatch('showErrorMessage', ...args),
-        $gettext,
-        $ngettext
-      )
+      const conflictDialog = new ConflictDialog($gettext, $ngettext)
       const resolvedConflict: ResolveConflict = await conflictDialog.resolveFileExists(
         { name: conflict.name, isFolder } as Resource,
         remainingConflictCount,
@@ -191,9 +187,7 @@ export const useFileActionsRestore = ({ store }: { store?: Store<any> } = {}) =>
           resourceCount: restoredResources.length.toString()
         })
       }
-      store.dispatch('showMessage', {
-        title
-      })
+      showMessage({ title })
     }
 
     // failure handler (for partial and full failure)
@@ -207,10 +201,7 @@ export const useFileActionsRestore = ({ store }: { store?: Store<any> } = {}) =>
         translateParams.resourceCount = failedResources.length
         translated = $gettext('Failed to restore %{resourceCount} files', translateParams, true)
       }
-      store.dispatch('showErrorMessage', {
-        title: translated,
-        errors
-      })
+      showErrorMessage({ title: translated, errors })
     }
 
     // Reload quota
diff --git a/packages/web-pkg/src/composables/actions/files/useFileActionsSetImage.ts b/packages/web-pkg/src/composables/actions/files/useFileActionsSetImage.ts
index 2cdfc742d54..73bf10d6166 100644
--- a/packages/web-pkg/src/composables/actions/files/useFileActionsSetImage.ts
+++ b/packages/web-pkg/src/composables/actions/files/useFileActionsSetImage.ts
@@ -10,10 +10,11 @@ import { computed } from 'vue'
 import { FileAction, FileActionOptions } from '../types'
 import { Drive } from '@ownclouders/web-client/src/generated'
 import { buildSpace } from '@ownclouders/web-client/src/helpers'
-import { useUserStore } from '../../piniaStores'
+import { useMessages, useUserStore } from '../../piniaStores'
 
 export const useFileActionsSetImage = ({ store }: { store?: Store<any> } = {}) => {
   store = store || useStore()
+  const { showMessage, showErrorMessage } = useMessages()
   const userStore = useUserStore()
   const router = useRouter()
   const { $gettext } = useGettext()
@@ -68,14 +69,12 @@ export const useFileActionsSetImage = ({ store }: { store?: Store<any> } = {}) =
         value: buildSpace(updatedDriveData).spaceImageData
       })
 
-      store.dispatch('showMessage', {
-        title: $gettext('Space image was set successfully')
-      })
+      showMessage({ title: $gettext('Space image was set successfully') })
     } catch (error) {
       console.error(error)
-      store.dispatch('showErrorMessage', {
+      showErrorMessage({
         title: $gettext('Failed to set space image'),
-        error
+        errors: [error]
       })
     }
   }
diff --git a/packages/web-pkg/src/composables/actions/files/useFileActionsSetReadme.ts b/packages/web-pkg/src/composables/actions/files/useFileActionsSetReadme.ts
index ab1f07e68b0..a23598b051c 100644
--- a/packages/web-pkg/src/composables/actions/files/useFileActionsSetReadme.ts
+++ b/packages/web-pkg/src/composables/actions/files/useFileActionsSetReadme.ts
@@ -7,10 +7,11 @@ import { useStore } from '../../store'
 import { FileAction, FileActionOptions } from '../types'
 import { Drive } from '@ownclouders/web-client/src/generated'
 import { buildSpace } from '@ownclouders/web-client/src/helpers'
-import { useUserStore } from '../../piniaStores'
+import { useMessages, useUserStore } from '../../piniaStores'
 
 export const useFileActionsSetReadme = ({ store }: { store?: Store<any> } = {}) => {
   store = store || useStore()
+  const { showMessage, showErrorMessage } = useMessages()
   const userStore = useUserStore()
   const router = useRouter()
   const { $gettext } = useGettext()
@@ -52,14 +53,12 @@ export const useFileActionsSetReadme = ({ store }: { store?: Store<any> } = {})
         field: 'spaceReadmeData',
         value: buildSpace(updatedDriveData).spaceReadmeData
       })
-      store.dispatch('showMessage', {
-        title: $gettext('Space description was set successfully')
-      })
+      showMessage({ title: $gettext('Space description was set successfully') })
     } catch (error) {
       console.error(error)
-      store.dispatch('showErrorMessage', {
+      showErrorMessage({
         title: $gettext('Failed to set space description'),
-        error
+        errors: [error]
       })
     }
   }
diff --git a/packages/web-pkg/src/composables/actions/files/useFileActionsToggleHideShare.ts b/packages/web-pkg/src/composables/actions/files/useFileActionsToggleHideShare.ts
index cb82adee704..22f25d39387 100644
--- a/packages/web-pkg/src/composables/actions/files/useFileActionsToggleHideShare.ts
+++ b/packages/web-pkg/src/composables/actions/files/useFileActionsToggleHideShare.ts
@@ -12,9 +12,11 @@ import { useStore } from '../../store'
 import { computed, unref } from 'vue'
 import { useGettext } from 'vue3-gettext'
 import { FileAction, FileActionOptions } from '../../actions'
+import { useMessages } from '../../piniaStores'
 
 export const useFileActionsToggleHideShare = ({ store }: { store?: Store<any> } = {}) => {
   store = store || useStore()
+  const { showMessage, showErrorMessage } = useMessages()
   const router = useRouter()
   const { $gettext } = useGettext()
 
@@ -61,7 +63,7 @@ export const useFileActionsToggleHideShare = ({ store }: { store?: Store<any> }
 
     if (errors.length === 0) {
       store.dispatch('Files/resetFileSelection')
-      store.dispatch('showMessage', {
+      showMessage({
         title: hidden
           ? $gettext('The share was hidden successfully')
           : $gettext('The share was unhidden successfully')
@@ -70,7 +72,7 @@ export const useFileActionsToggleHideShare = ({ store }: { store?: Store<any> }
       return
     }
 
-    store.dispatch('showErrorMessage', {
+    showErrorMessage({
       title: hidden
         ? $gettext('Failed to hide the share')
         : $gettext('Failed to unhide share share'),
diff --git a/packages/web-pkg/src/composables/actions/helpers/useFileActionsDeleteResources.ts b/packages/web-pkg/src/composables/actions/helpers/useFileActionsDeleteResources.ts
index e2175f7270c..2978dbb5944 100644
--- a/packages/web-pkg/src/composables/actions/helpers/useFileActionsDeleteResources.ts
+++ b/packages/web-pkg/src/composables/actions/helpers/useFileActionsDeleteResources.ts
@@ -17,12 +17,13 @@ import { useRouter } from '../../router'
 import { useStore } from '../../store'
 import { useGettext } from 'vue3-gettext'
 import { ref } from 'vue'
-import { useModals, useUserStore } from '../../piniaStores'
+import { useMessages, useModals } from '../../piniaStores'
 import { useConfigurationManager } from '../../configuration'
 
 export const useFileActionsDeleteResources = ({ store }: { store?: Store<any> }) => {
   store = store || useStore()
-  const userStore = useUserStore()
+  const messageStore = useMessages()
+  const { showMessage, showErrorMessage } = messageStore
   const router = useRouter()
   const language = useGettext()
   const { getMatchingSpace } = useGetMatchingSpace()
@@ -30,7 +31,6 @@ export const useFileActionsDeleteResources = ({ store }: { store?: Store<any> })
   const hasSpacesEnabled = useCapabilitySpacesEnabled()
   const clientService = useClientService()
   const loadingService = useLoadingService()
-  const { owncloudSdk } = clientService
   const { dispatchModal } = useModals()
   const configurationManager = useConfigurationManager()
 
@@ -121,9 +121,7 @@ export const useFileActionsDeleteResources = ({ store }: { store?: Store<any> })
           { file: resource.name },
           true
         )
-        store.dispatch('showMessage', {
-          title: translated
-        })
+        showMessage({ title: translated })
       })
       .catch((error) => {
         if (error.statusCode === 423) {
@@ -137,9 +135,9 @@ export const useFileActionsDeleteResources = ({ store }: { store?: Store<any> })
 
         console.error(error)
         const translated = $gettext('Failed to delete "%{file}"', { file: resource.name }, true)
-        store.dispatch('showErrorMessage', {
+        showErrorMessage({
           title: translated,
-          error
+          errors: [error]
         })
       })
   }
@@ -187,7 +185,8 @@ export const useFileActionsDeleteResources = ({ store }: { store?: Store<any> })
                 space: spaceForDeletion,
                 files: resourcesForDeletion,
                 clientService,
-                loadingCallbackArgs
+                loadingCallbackArgs,
+                messageStore
               })
               .then(async () => {
                 // Load quota
diff --git a/packages/web-pkg/src/composables/actions/spaces/useSpaceActionsDelete.ts b/packages/web-pkg/src/composables/actions/spaces/useSpaceActionsDelete.ts
index 145edd26728..7deb1b9e2dc 100644
--- a/packages/web-pkg/src/composables/actions/spaces/useSpaceActionsDelete.ts
+++ b/packages/web-pkg/src/composables/actions/spaces/useSpaceActionsDelete.ts
@@ -9,10 +9,11 @@ import { useStore } from '../../store'
 import { SpaceAction, SpaceActionOptions } from '../types'
 import { Store } from 'vuex'
 import { isProjectSpaceResource } from '@ownclouders/web-client/src/helpers'
-import { useModals, useUserStore } from '../../piniaStores'
+import { useMessages, useModals, useUserStore } from '../../piniaStores'
 
 export const useSpaceActionsDelete = ({ store }: { store?: Store<any> } = {}) => {
   store = store || useStore()
+  const { showMessage, showErrorMessage } = useMessages()
   const userStore = useUserStore()
   const { $gettext, $ngettext } = useGettext()
   const ability = useAbility()
@@ -49,7 +50,7 @@ export const useSpaceActionsDelete = ({ store }: { store?: Store<any> } = {}) =>
               { spaceCount: succeeded.length.toString() },
               true
             )
-      store.dispatch('showMessage', { title })
+      showMessage({ title })
     }
 
     const failed = results.filter((r) => r.status === 'rejected')
@@ -66,7 +67,7 @@ export const useSpaceActionsDelete = ({ store }: { store?: Store<any> } = {}) =>
               { spaceCount: failed.length.toString() },
               true
             )
-      store.dispatch('showErrorMessage', {
+      showErrorMessage({
         title,
         errors: (failed as PromiseRejectedResult[]).map((f) => f.reason)
       })
diff --git a/packages/web-pkg/src/composables/actions/spaces/useSpaceActionsDisable.ts b/packages/web-pkg/src/composables/actions/spaces/useSpaceActionsDisable.ts
index b4b306ebfa6..e9002b53172 100644
--- a/packages/web-pkg/src/composables/actions/spaces/useSpaceActionsDisable.ts
+++ b/packages/web-pkg/src/composables/actions/spaces/useSpaceActionsDisable.ts
@@ -8,10 +8,11 @@ import { useAbility } from '../../ability'
 import { useClientService } from '../../clientService'
 import { Store } from 'vuex'
 import { isProjectSpaceResource } from '@ownclouders/web-client/src/helpers'
-import { useModals, useUserStore } from '../../piniaStores'
+import { useMessages, useModals, useUserStore } from '../../piniaStores'
 
 export const useSpaceActionsDisable = ({ store }: { store?: Store<any> } = {}) => {
   store = store || useStore()
+  const { showMessage, showErrorMessage } = useMessages()
   const userStore = useUserStore()
   const { $gettext, $ngettext } = useGettext()
   const ability = useAbility()
@@ -61,7 +62,7 @@ export const useSpaceActionsDisable = ({ store }: { store?: Store<any> } = {}) =
               { spaceCount: succeeded.length.toString() },
               true
             )
-      store.dispatch('showMessage', { title })
+      showMessage({ title })
     }
 
     const failed = results.filter((r) => r.status === 'rejected')
@@ -78,7 +79,7 @@ export const useSpaceActionsDisable = ({ store }: { store?: Store<any> } = {}) =
               { spaceCount: failed.length.toString() },
               true
             )
-      store.dispatch('showErrorMessage', {
+      showErrorMessage({
         title,
         errors: (failed as PromiseRejectedResult[]).map((f) => f.reason)
       })
diff --git a/packages/web-pkg/src/composables/actions/spaces/useSpaceActionsDuplicate.ts b/packages/web-pkg/src/composables/actions/spaces/useSpaceActionsDuplicate.ts
index eda3fce41dd..98d9c2601d0 100644
--- a/packages/web-pkg/src/composables/actions/spaces/useSpaceActionsDuplicate.ts
+++ b/packages/web-pkg/src/composables/actions/spaces/useSpaceActionsDuplicate.ts
@@ -14,6 +14,7 @@ import PQueue from 'p-queue'
 import { useRouter } from '../../router'
 import { isLocationSpacesActive } from '../../../router'
 import { useConfigurationManager } from '../../configuration'
+import { useMessages } from '../../piniaStores'
 
 export const useSpaceActionsDuplicate = ({
   store
@@ -21,6 +22,7 @@ export const useSpaceActionsDuplicate = ({
   store?: Store<any>
 } = {}) => {
   store = store || useStore()
+  const { showMessage, showErrorMessage } = useMessages()
   const router = useRouter()
   const { $gettext } = useGettext()
   const ability = useAbility()
@@ -110,16 +112,16 @@ export const useSpaceActionsDuplicate = ({
         store.commit('Files/UPSERT_RESOURCE', duplicatedSpace)
       }
 
-      store.dispatch('showMessage', {
+      showMessage({
         title: $gettext('Space "%{space}" was duplicated successfully', {
           space: existingSpace.name
         })
       })
     } catch (error) {
       console.error(error)
-      store.dispatch('showErrorMessage', {
+      showErrorMessage({
         title: $gettext('Failed to duplicate space "%{space}"', { space: existingSpace.name }),
-        error
+        errors: [error]
       })
     }
   }
diff --git a/packages/web-pkg/src/composables/actions/spaces/useSpaceActionsEditDescription.ts b/packages/web-pkg/src/composables/actions/spaces/useSpaceActionsEditDescription.ts
index e9d45b2816d..104749259ac 100644
--- a/packages/web-pkg/src/composables/actions/spaces/useSpaceActionsEditDescription.ts
+++ b/packages/web-pkg/src/composables/actions/spaces/useSpaceActionsEditDescription.ts
@@ -8,10 +8,11 @@ import { useStore } from '../../store'
 import { useGettext } from 'vue3-gettext'
 import { Store } from 'vuex'
 import { SpaceResource } from '@ownclouders/web-client/src'
-import { useModals, useUserStore } from '../../piniaStores'
+import { useMessages, useModals, useUserStore } from '../../piniaStores'
 
 export const useSpaceActionsEditDescription = ({ store }: { store?: Store<any> } = {}) => {
   store = store || useStore()
+  const { showMessage, showErrorMessage } = useMessages()
   const userStore = useUserStore()
   const { $gettext } = useGettext()
   const ability = useAbility()
@@ -32,15 +33,13 @@ export const useSpaceActionsEditDescription = ({ store }: { store?: Store<any> }
         if (unref(route).name === 'admin-settings-spaces') {
           space.description = description
         }
-        store.dispatch('showMessage', {
-          title: $gettext('Space subtitle was changed successfully')
-        })
+        showMessage({ title: $gettext('Space subtitle was changed successfully') })
       })
       .catch((error) => {
         console.error(error)
-        store.dispatch('showErrorMessage', {
+        showErrorMessage({
           title: $gettext('Failed to change space subtitle'),
-          error
+          errors: [error]
         })
       })
   }
diff --git a/packages/web-pkg/src/composables/actions/spaces/useSpaceActionsRename.ts b/packages/web-pkg/src/composables/actions/spaces/useSpaceActionsRename.ts
index d3baaa6a3a1..8fd4503cb43 100644
--- a/packages/web-pkg/src/composables/actions/spaces/useSpaceActionsRename.ts
+++ b/packages/web-pkg/src/composables/actions/spaces/useSpaceActionsRename.ts
@@ -8,10 +8,11 @@ import { useRoute } from '../../router'
 import { useStore } from '../../store'
 import { SpaceAction, SpaceActionOptions } from '../types'
 import { SpaceResource } from '@ownclouders/web-client'
-import { useModals, useUserStore } from '../../piniaStores'
+import { useMessages, useModals, useUserStore } from '../../piniaStores'
 
 export const useSpaceActionsRename = ({ store }: { store?: Store<any> } = {}) => {
   store = store || useStore()
+  const { showMessage, showErrorMessage } = useMessages()
   const userStore = useUserStore()
   const { $gettext } = useGettext()
   const ability = useAbility()
@@ -33,15 +34,13 @@ export const useSpaceActionsRename = ({ store }: { store?: Store<any> } = {}) =>
           field: 'name',
           value: name
         })
-        store.dispatch('showMessage', {
-          title: $gettext('Space name was changed successfully')
-        })
+        showMessage({ title: $gettext('Space name was changed successfully') })
       })
       .catch((error) => {
         console.error(error)
-        store.dispatch('showErrorMessage', {
+        showErrorMessage({
           title: $gettext('Failed to rename space'),
-          error
+          errors: [error]
         })
       })
   }
diff --git a/packages/web-pkg/src/composables/actions/spaces/useSpaceActionsRestore.ts b/packages/web-pkg/src/composables/actions/spaces/useSpaceActionsRestore.ts
index 943e7028786..c35533e67aa 100644
--- a/packages/web-pkg/src/composables/actions/spaces/useSpaceActionsRestore.ts
+++ b/packages/web-pkg/src/composables/actions/spaces/useSpaceActionsRestore.ts
@@ -9,10 +9,11 @@ import { useLoadingService } from '../../loadingService'
 import { useStore } from '../../store'
 import { useGettext } from 'vue3-gettext'
 import { isProjectSpaceResource } from '@ownclouders/web-client/src/helpers'
-import { useModals, useUserStore } from '../../piniaStores'
+import { useMessages, useModals, useUserStore } from '../../piniaStores'
 
 export const useSpaceActionsRestore = ({ store }: { store?: Store<any> } = {}) => {
   store = store || useStore()
+  const { showMessage, showErrorMessage } = useMessages()
   const userStore = useUserStore()
   const { $gettext, $ngettext } = useGettext()
   const ability = useAbility()
@@ -68,7 +69,7 @@ export const useSpaceActionsRestore = ({ store }: { store?: Store<any> } = {}) =
               { spaceCount: succeeded.length.toString() },
               true
             )
-      store.dispatch('showMessage', { title })
+      showMessage({ title })
     }
 
     const failed = results.filter((r) => r.status === 'rejected')
@@ -85,7 +86,7 @@ export const useSpaceActionsRestore = ({ store }: { store?: Store<any> } = {}) =
               { spaceCount: failed.length.toString() },
               true
             )
-      store.dispatch('showErrorMessage', {
+      showErrorMessage({
         title,
         errors: (failed as PromiseRejectedResult[]).map((f) => f.reason)
       })
diff --git a/packages/web-pkg/src/composables/actions/useWindowOpen.ts b/packages/web-pkg/src/composables/actions/useWindowOpen.ts
index 75819570295..957464b668a 100644
--- a/packages/web-pkg/src/composables/actions/useWindowOpen.ts
+++ b/packages/web-pkg/src/composables/actions/useWindowOpen.ts
@@ -1,15 +1,15 @@
 import { useGettext } from 'vue3-gettext'
-import { useStore } from '../store'
+import { useMessages } from '../piniaStores'
 
 export const useWindowOpen = () => {
   const { $gettext } = useGettext()
-  const store = useStore()
+  const { showMessage } = useMessages()
 
   const openUrl = (url: string, target?: string, shouldFocus?: boolean) => {
     const win = window.open(url, target)
 
     if (!win) {
-      store.dispatch('showMessage', {
+      showMessage({
         title: $gettext('Pop-up and redirect block detected'),
         timeout: 20,
         status: 'warning',
diff --git a/packages/web-pkg/src/composables/download/useDownloadFile.ts b/packages/web-pkg/src/composables/download/useDownloadFile.ts
index 8861d2dda9c..1b7b2b2dbbe 100644
--- a/packages/web-pkg/src/composables/download/useDownloadFile.ts
+++ b/packages/web-pkg/src/composables/download/useDownloadFile.ts
@@ -7,6 +7,7 @@ import { useGettext } from 'vue3-gettext'
 import { useCapabilityCoreSupportUrlSigning } from '../capability'
 import { Store } from 'vuex'
 import { ClientService } from '../../services'
+import { useMessages } from '../piniaStores'
 
 export interface DownloadFileOptions {
   store?: Store<any>
@@ -15,6 +16,7 @@ export interface DownloadFileOptions {
 
 export const useDownloadFile = (options?: DownloadFileOptions) => {
   const store = options?.store || useStore()
+  const { showErrorMessage } = useMessages()
   const isPublicLinkContext = usePublicLinkContext({ store })
   const isUrlSigningEnabled = useCapabilityCoreSupportUrlSigning()
   const clientService = options?.clientService || useClientService()
@@ -48,10 +50,10 @@ export const useDownloadFile = (options?: DownloadFileOptions) => {
         }
       } catch (e) {
         console.error(e)
-        store.dispatch('showErrorMessage', {
+        showErrorMessage({
           title: $gettext('Download failed'),
           desc: $gettext('File could not be located'),
-          error: e
+          errors: [e]
         })
       }
       return
diff --git a/packages/web-pkg/src/composables/piniaStores/index.ts b/packages/web-pkg/src/composables/piniaStores/index.ts
index fb5c630b18a..544adedd993 100644
--- a/packages/web-pkg/src/composables/piniaStores/index.ts
+++ b/packages/web-pkg/src/composables/piniaStores/index.ts
@@ -1,4 +1,5 @@
 export * from './extensionRegistry'
+export * from './messages'
 export * from './modals'
 export * from './theme'
 export * from './user'
diff --git a/packages/web-pkg/src/composables/piniaStores/messages.ts b/packages/web-pkg/src/composables/piniaStores/messages.ts
new file mode 100644
index 00000000000..4aa91b7fcfe
--- /dev/null
+++ b/packages/web-pkg/src/composables/piniaStores/messages.ts
@@ -0,0 +1,78 @@
+import { defineStore } from 'pinia'
+import { v4 as uuidV4 } from 'uuid'
+import { ref, unref } from 'vue'
+
+export interface Message {
+  id: string
+  title: string
+  desc?: string
+  errors?: Error[]
+  errorLogContent?: string
+  timeout?: number
+  status?: string
+}
+
+export const useMessages = defineStore('messages', () => {
+  const messages = ref<Message[]>([])
+
+  const showMessage = (data: Omit<Message, 'id'>) => {
+    const message = { ...data, id: uuidV4() as string }
+    messages.value.push(message)
+    return message
+  }
+
+  const getXRequestIdsFromErrors = (errors: Message['errors']) => {
+    const getXRequestID = (error: any): string | null => {
+      /**
+       * x-request-id response headers might be very nested in ownCloud SDK,
+       * only remove records if you are sure they aren't valid anymore.
+       * FIXME: remove/simplify as soon as SDK has been removed
+       */
+      if (error.response?.res?.res?.headers?.['x-request-id']) {
+        return error.response.res.res.headers['x-request-id']
+      }
+      if (error.response?.headers?.map?.['x-request-id']) {
+        return error.response.headers.map['x-request-id']
+      }
+      if (error.response?.res?.headers?.['x-request-id']) {
+        return error.response.res.headers['x-request-id']
+      }
+      if (error.response?.headers?.['x-request-id']) {
+        return error.response.headers['x-request-id']
+      }
+      return null
+    }
+
+    return errors
+      .map((error) => getXRequestID(error))
+      .filter((xRequestId) => xRequestId !== null)
+      .map((item) => `X-Request-Id: ${item}`)
+      .join('\r\n')
+  }
+
+  const showErrorMessage = (data: Omit<Message, 'id'>) => {
+    const message = {
+      id: uuidV4() as string,
+      status: 'danger',
+      timeout: 0,
+      ...(data.errors && { errorLogContent: getXRequestIdsFromErrors(data.errors) }),
+      ...data
+    }
+
+    messages.value.push(message)
+    return message
+  }
+
+  const removeMessage = (message: Message) => {
+    messages.value = unref(messages).filter(({ id }) => message.id !== id)
+  }
+
+  return {
+    messages,
+    showMessage,
+    showErrorMessage,
+    removeMessage
+  }
+})
+
+export type MessageStore = ReturnType<typeof useMessages>
diff --git a/packages/web-pkg/src/configuration/manager.ts b/packages/web-pkg/src/configuration/manager.ts
index 0730ac25e8e..37798e16632 100644
--- a/packages/web-pkg/src/configuration/manager.ts
+++ b/packages/web-pkg/src/configuration/manager.ts
@@ -118,6 +118,11 @@ export class ConfigurationManager {
     set(this.optionsConfiguration, 'loginUrl', get(options, 'loginUrl', ''))
     set(this.optionsConfiguration, 'disabledExtensions', get(options, 'disabledExtensions', []))
     set(this.optionsConfiguration, 'isRunningOnEos', get(options, 'isRunningOnEos', false))
+    set(
+      this.optionsConfiguration,
+      'topCenterNotifications',
+      get(options, 'topCenterNotifications', false)
+    )
     set(
       this.optionsConfiguration,
       'userListRequiresFilter',
diff --git a/packages/web-pkg/src/configuration/types.ts b/packages/web-pkg/src/configuration/types.ts
index 18eb16d1c18..f9afeed9fb6 100644
--- a/packages/web-pkg/src/configuration/types.ts
+++ b/packages/web-pkg/src/configuration/types.ts
@@ -23,6 +23,7 @@ export interface OptionsConfiguration {
   loginUrl?: string
   contextHelpersReadMore?: boolean
   contextHelpers?: boolean
+  topCenterNotifications?: boolean
   openAppsInTab?: boolean
   openLinksWithDefaultApp?: boolean
   tokenStorageLocal?: boolean
diff --git a/packages/web-pkg/src/helpers/resource/conflictHandling/conflictDialog.ts b/packages/web-pkg/src/helpers/resource/conflictHandling/conflictDialog.ts
index 61f448bd44a..a6cc657c88d 100644
--- a/packages/web-pkg/src/helpers/resource/conflictHandling/conflictDialog.ts
+++ b/packages/web-pkg/src/helpers/resource/conflictHandling/conflictDialog.ts
@@ -12,8 +12,6 @@ export interface FileConflict {
 export class ConflictDialog {
   /* eslint-disable no-useless-constructor */
   constructor(
-    protected showMessage: (data: object) => void,
-    protected showErrorMessage: (data: object) => void,
     protected $gettext: (
       msgid: string,
       parameters?: {
diff --git a/packages/web-pkg/tests/unit/components/CreateShortcutModal.spec.ts b/packages/web-pkg/tests/unit/components/CreateShortcutModal.spec.ts
index 6ed081488ec..351f3b0561f 100644
--- a/packages/web-pkg/tests/unit/components/CreateShortcutModal.spec.ts
+++ b/packages/web-pkg/tests/unit/components/CreateShortcutModal.spec.ts
@@ -13,6 +13,7 @@ import { mock, mockDeep } from 'jest-mock-extended'
 import { FileResource } from '@ownclouders/web-client/src/helpers'
 import { SearchResource } from '@ownclouders/web-client/src/webdav/search'
 import { ConfigurationManager } from '../../../src'
+import { useMessages } from '../../../src/composables/piniaStores'
 
 jest.mock('../../../src/composables/configuration/useConfigurationManager', () => ({
   useConfigurationManager: () =>
@@ -31,14 +32,16 @@ describe('CreateShortcutModal', () => {
       const { wrapper, storeOptions } = getWrapper()
       await wrapper.vm.onConfirm('https://owncloud.com', 'owncloud.url')
       expect(storeOptions.modules.Files.mutations.UPSERT_RESOURCE).toHaveBeenCalled()
-      expect(storeOptions.actions.showMessage).toHaveBeenCalled()
+      const { showMessage } = useMessages()
+      expect(showMessage).toHaveBeenCalled()
     })
     it('should show error message on fail', async () => {
       console.error = jest.fn()
       const { wrapper, storeOptions } = getWrapper({ rejectPutFileContents: true })
       await wrapper.vm.onConfirm('https://owncloud.com', 'owncloud.url')
       expect(storeOptions.modules.Files.mutations.UPSERT_RESOURCE).not.toHaveBeenCalled()
-      expect(storeOptions.actions.showErrorMessage).toHaveBeenCalled()
+      const { showErrorMessage } = useMessages()
+      expect(showErrorMessage).toHaveBeenCalled()
     })
   })
   describe('method "searchTask"', () => {
diff --git a/packages/web-pkg/tests/unit/components/Spaces/QuotaModal.spec.ts b/packages/web-pkg/tests/unit/components/Spaces/QuotaModal.spec.ts
index 25e9ad3c83f..a2fa10b0b61 100644
--- a/packages/web-pkg/tests/unit/components/Spaces/QuotaModal.spec.ts
+++ b/packages/web-pkg/tests/unit/components/Spaces/QuotaModal.spec.ts
@@ -8,6 +8,7 @@ import {
   mount,
   mockAxiosResolve
 } from 'web-test-helpers'
+import { useMessages } from '../../../../src/composables/piniaStores'
 
 describe('QuotaModal', () => {
   describe('method "editQuota"', () => {
@@ -30,7 +31,8 @@ describe('QuotaModal', () => {
       expect(
         storeOptions.modules.runtime.modules.spaces.mutations.UPDATE_SPACE_FIELD
       ).toHaveBeenCalledTimes(1)
-      expect(storeOptions.actions.showMessage).toHaveBeenCalledTimes(1)
+      const { showMessage } = useMessages()
+      expect(showMessage).toHaveBeenCalledTimes(1)
     })
 
     it('should show message on server error', async () => {
@@ -42,7 +44,8 @@ describe('QuotaModal', () => {
       expect(
         storeOptions.modules.runtime.modules.spaces.mutations.UPDATE_SPACE_FIELD
       ).toHaveBeenCalledTimes(0)
-      expect(storeOptions.actions.showErrorMessage).toHaveBeenCalledTimes(1)
+      const { showErrorMessage } = useMessages()
+      expect(showErrorMessage).toHaveBeenCalledTimes(1)
     })
   })
 })
diff --git a/packages/web-pkg/tests/unit/components/Spaces/ReadmeContentModal.spec.ts b/packages/web-pkg/tests/unit/components/Spaces/ReadmeContentModal.spec.ts
index 9c1c27dcde9..70ff4795cb7 100644
--- a/packages/web-pkg/tests/unit/components/Spaces/ReadmeContentModal.spec.ts
+++ b/packages/web-pkg/tests/unit/components/Spaces/ReadmeContentModal.spec.ts
@@ -11,20 +11,23 @@ import {
 import { GetFileContentsResponse } from '@ownclouders/web-client/src/webdav/getFileContents'
 import { Resource } from '@ownclouders/web-client/src'
 import { mock } from 'jest-mock-extended'
+import { useMessages } from '../../../../src/composables/piniaStores'
 
 describe('ReadmeContentModal', () => {
   describe('method "onConfirm"', () => {
     it('should show message on success', async () => {
-      const { wrapper, storeOptions } = getWrapper()
+      const { wrapper } = getWrapper()
       await wrapper.vm.onConfirm()
-      expect(storeOptions.actions.showMessage).toHaveBeenCalledTimes(1)
+      const { showMessage } = useMessages()
+      expect(showMessage).toHaveBeenCalledTimes(1)
     })
 
     it('should show message on error', async () => {
       jest.spyOn(console, 'error').mockImplementation(() => undefined)
-      const { wrapper, storeOptions } = getWrapper(false)
+      const { wrapper } = getWrapper(false)
       await wrapper.vm.onConfirm()
-      expect(storeOptions.actions.showErrorMessage).toHaveBeenCalledTimes(1)
+      const { showErrorMessage } = useMessages()
+      expect(showErrorMessage).toHaveBeenCalledTimes(1)
     })
   })
 })
diff --git a/packages/web-pkg/tests/unit/composables/actions/files/useFileActionsCopyQuicklink.spec.ts b/packages/web-pkg/tests/unit/composables/actions/files/useFileActionsCopyQuicklink.spec.ts
index d6a5fe0c734..6c48238d5df 100644
--- a/packages/web-pkg/tests/unit/composables/actions/files/useFileActionsCopyQuicklink.spec.ts
+++ b/packages/web-pkg/tests/unit/composables/actions/files/useFileActionsCopyQuicklink.spec.ts
@@ -3,18 +3,14 @@ import {
   useFileActionsCopyQuickLink,
   useFileActionsCreateLink
 } from '../../../../../src/composables/actions/files'
-import {
-  createStore,
-  defaultComponentMocks,
-  defaultStoreMockOptions,
-  getComposableWrapper
-} from 'web-test-helpers'
+import { defaultComponentMocks, getComposableWrapper } from 'web-test-helpers'
 import { mock } from 'jest-mock-extended'
 import { FileAction } from '../../../../../src/composables/actions'
 import { useCanShare } from '../../../../../src/composables/shares'
 import { Resource } from '@ownclouders/web-client'
 import { Share, buildShare } from '@ownclouders/web-client/src/helpers/share'
 import { useClipboard } from '../../../../../src/composables/clipboard'
+import { useMessages } from '../../../../../src/composables/piniaStores'
 
 jest.mock('../../../../../src/composables/shares', () => ({
   useCanShare: jest.fn()
@@ -70,10 +66,11 @@ describe('useFileActionsCopyQuickLink', () => {
     it('should not create a new link if quick link does already exist', () => {
       getWrapper({
         quickLinkExists: true,
-        setup: async ({ actions }, { mocks, storeOptions }) => {
+        setup: async ({ actions }, { mocks }) => {
           await unref(actions)[0].handler({ resources: [mock<Resource>()] })
           expect(mocks.createLinkMock).not.toHaveBeenCalled()
-          expect(storeOptions.actions.showMessage).toHaveBeenCalledTimes(1)
+          const { showMessage } = useMessages()
+          expect(showMessage).toHaveBeenCalledTimes(1)
         }
       })
     })
@@ -94,20 +91,14 @@ function getWrapper({ setup, canShare = true, quickLinkExists = false }) {
   const mocks = { ...defaultComponentMocks(), createLinkMock }
   mocks.$clientService.owncloudSdk.shares.getShares.mockResolvedValue([{}])
 
-  const storeOptions = defaultStoreMockOptions
-  const store = createStore(storeOptions)
-
   return {
     wrapper: getComposableWrapper(
       () => {
-        const instance = useFileActionsCopyQuickLink({
-          store
-        })
-        setup(instance, { storeOptions, mocks })
+        const instance = useFileActionsCopyQuickLink()
+        setup(instance, { mocks })
       },
       {
         mocks,
-        store,
         provide: mocks
       }
     )
diff --git a/packages/web-pkg/tests/unit/composables/actions/files/useFileActionsCreateLink.spec.ts b/packages/web-pkg/tests/unit/composables/actions/files/useFileActionsCreateLink.spec.ts
index 42949de60b9..1fe3576b8f2 100644
--- a/packages/web-pkg/tests/unit/composables/actions/files/useFileActionsCreateLink.spec.ts
+++ b/packages/web-pkg/tests/unit/composables/actions/files/useFileActionsCreateLink.spec.ts
@@ -1,12 +1,7 @@
 import { computed, unref } from 'vue'
 import { useFileActionsCreateLink } from '../../../../../src/composables/actions/files/useFileActionsCreateLink'
-import { useModals } from '../../../../../src/composables/piniaStores'
-import {
-  createStore,
-  defaultComponentMocks,
-  defaultStoreMockOptions,
-  getComposableWrapper
-} from 'web-test-helpers'
+import { useMessages, useModals } from '../../../../../src/composables/piniaStores'
+import { defaultComponentMocks, getComposableWrapper } from 'web-test-helpers'
 import { mock } from 'jest-mock-extended'
 import { Resource } from '@ownclouders/web-client'
 import { useCreateLink, useDefaultLinkPermissions } from '../../../../../src/composables/links'
@@ -66,13 +61,14 @@ describe('useFileActionsCreateLink', () => {
   describe('handler', () => {
     it('calls the createLink method and shows messages', () => {
       getWrapper({
-        setup: async ({ actions }, { mocks, storeOptions }) => {
+        setup: async ({ actions }, { mocks }) => {
           // link action
           await unref(actions)[0].handler({ resources: [mock<Resource>({ canShare: () => true })] })
           expect(mocks.createLinkMock).toHaveBeenCalledWith(
             expect.objectContaining({ quicklink: false })
           )
-          expect(storeOptions.actions.showMessage).toHaveBeenCalledTimes(1)
+          const { showMessage } = useMessages()
+          expect(showMessage).toHaveBeenCalledTimes(1)
 
           // quick link action
           await unref(actions)[1].handler({ resources: [mock<Resource>({ canShare: () => true })] })
@@ -119,9 +115,10 @@ describe('useFileActionsCreateLink', () => {
     it('does not show messages if disabled', () => {
       getWrapper({
         showMessages: false,
-        setup: async ({ actions }, { storeOptions }) => {
+        setup: async ({ actions }) => {
           await unref(actions)[0].handler({ resources: [mock<Resource>({ canShare: () => true })] })
-          expect(storeOptions.actions.showMessage).not.toHaveBeenCalled()
+          const { showMessage } = useMessages()
+          expect(showMessage).not.toHaveBeenCalled()
         }
       })
     })
@@ -149,23 +146,18 @@ function getWrapper({
 
   const mocks = { ...defaultComponentMocks(), createLinkMock }
 
-  const storeOptions = defaultStoreMockOptions
-  const store = createStore(storeOptions)
-
   return {
     wrapper: getComposableWrapper(
       () => {
         const instance = useFileActionsCreateLink({
-          store,
           enforceModal,
           showMessages,
           onLinkCreatedCallback
         })
-        setup(instance, { storeOptions, mocks })
+        setup(instance, { mocks })
       },
       {
         mocks,
-        store,
         provide: mocks
       }
     )
diff --git a/packages/web-pkg/tests/unit/composables/actions/files/useFileActionsCreateNewFile.spec.ts b/packages/web-pkg/tests/unit/composables/actions/files/useFileActionsCreateNewFile.spec.ts
index 3f00149c476..71cc5c40a9f 100644
--- a/packages/web-pkg/tests/unit/composables/actions/files/useFileActionsCreateNewFile.spec.ts
+++ b/packages/web-pkg/tests/unit/composables/actions/files/useFileActionsCreateNewFile.spec.ts
@@ -1,7 +1,7 @@
 import { mock } from 'jest-mock-extended'
 import { nextTick, ref, unref } from 'vue'
 import { useFileActionsCreateNewFile } from '../../../../../src/composables/actions'
-import { useModals } from '../../../../../src/composables/piniaStores'
+import { useMessages, useModals } from '../../../../../src/composables/piniaStores'
 import { SpaceResource } from '@ownclouders/web-client/src'
 import { Resource } from '@ownclouders/web-client/src/helpers'
 import { FileActionOptions } from '../../../../../src/composables/actions'
@@ -47,12 +47,10 @@ describe('useFileActionsCreateNewFile', () => {
           await addNewFile('myfile.txt', null)
           await nextTick()
           expect(storeOptions.modules.Files.mutations.UPSERT_RESOURCE).toHaveBeenCalled()
-          expect(storeOptions.actions.showMessage).toHaveBeenCalledWith(
-            expect.anything(),
-            expect.objectContaining({
-              title: '"myfile.txt" was created successfully'
-            })
-          )
+          const { showMessage } = useMessages()
+          expect(showMessage).toHaveBeenCalledWith({
+            title: '"myfile.txt" was created successfully'
+          })
         }
       })
     })
@@ -62,15 +60,15 @@ describe('useFileActionsCreateNewFile', () => {
       getWrapper({
         resolveCreateFile: false,
         space,
-        setup: async ({ addNewFile }, { storeOptions }) => {
+        setup: async ({ addNewFile }) => {
           await addNewFile('myfolder', null)
           await nextTick()
-          expect(storeOptions.actions.showErrorMessage).toHaveBeenCalledWith(
-            expect.anything(),
-            expect.objectContaining({
-              title: 'Failed to create file'
-            })
+
+          const { showErrorMessage } = useMessages()
+          expect(showErrorMessage).toHaveBeenCalledWith(
+            expect.objectContaining({ title: 'Failed to create file' })
           )
+
           consoleErrorMock.mockRestore()
         }
       })
diff --git a/packages/web-pkg/tests/unit/composables/actions/files/useFileActionsCreateNewFolder.spec.ts b/packages/web-pkg/tests/unit/composables/actions/files/useFileActionsCreateNewFolder.spec.ts
index 1074a3d1e77..a1d0bbc5a89 100644
--- a/packages/web-pkg/tests/unit/composables/actions/files/useFileActionsCreateNewFolder.spec.ts
+++ b/packages/web-pkg/tests/unit/composables/actions/files/useFileActionsCreateNewFolder.spec.ts
@@ -1,7 +1,7 @@
 import { mock } from 'jest-mock-extended'
 import { nextTick, unref } from 'vue'
 import { useFileActionsCreateNewFolder } from '../../../../../src/composables/actions'
-import { useModals } from '../../../../../src/composables/piniaStores'
+import { useMessages, useModals } from '../../../../../src/composables/piniaStores'
 import { SpaceResource } from '@ownclouders/web-client/src'
 import { FolderResource } from '@ownclouders/web-client/src/helpers'
 import {
@@ -37,7 +37,7 @@ describe('useFileActionsCreateNewFolder', () => {
     })
   })
   describe('addNewFolder', () => {
-    it('create new folder', async () => {
+    it('create new folder', () => {
       const space = mock<SpaceResource>({ id: '1' })
       getWrapper({
         space,
@@ -45,28 +45,24 @@ describe('useFileActionsCreateNewFolder', () => {
           await addNewFolder('myfolder')
           await nextTick()
           expect(storeOptions.modules.Files.mutations.UPSERT_RESOURCE).toHaveBeenCalled()
-          expect(storeOptions.actions.showMessage).toHaveBeenCalledWith(
-            expect.anything(),
-            expect.objectContaining({
-              title: '"myfolder" was created successfully'
-            })
-          )
+          const { showMessage } = useMessages()
+          expect(showMessage).toHaveBeenCalledWith({ title: '"myfolder" was created successfully' })
 
           // expect scrolltoresource to have been called
         }
       })
     })
-    it('show error message if createFolder fails', async () => {
+    it('show error message if createFolder fails', () => {
       const consoleErrorMock = jest.spyOn(console, 'error').mockImplementation()
       const space = mock<SpaceResource>({ id: '1' })
       getWrapper({
         resolveCreateFolder: false,
         space,
-        setup: async ({ addNewFolder }, { storeOptions }) => {
+        setup: async ({ addNewFolder }) => {
           await addNewFolder('myfolder')
           await nextTick()
-          expect(storeOptions.actions.showErrorMessage).toHaveBeenCalledWith(
-            expect.anything(),
+          const { showErrorMessage } = useMessages()
+          expect(showErrorMessage).toHaveBeenCalledWith(
             expect.objectContaining({
               title: 'Failed to create folder'
             })
diff --git a/packages/web-pkg/tests/unit/composables/actions/files/useFileActionsEmptyTrashBin.spec.ts b/packages/web-pkg/tests/unit/composables/actions/files/useFileActionsEmptyTrashBin.spec.ts
index 9299da763fb..488e3d40ece 100644
--- a/packages/web-pkg/tests/unit/composables/actions/files/useFileActionsEmptyTrashBin.spec.ts
+++ b/packages/web-pkg/tests/unit/composables/actions/files/useFileActionsEmptyTrashBin.spec.ts
@@ -1,5 +1,5 @@
 import { useFileActionsEmptyTrashBin } from '../../../../../src/composables/actions'
-import { useModals } from '../../../../../src/composables/piniaStores'
+import { useMessages, useModals } from '../../../../../src/composables/piniaStores'
 import { createLocationTrash, createLocationSpaces } from '../../../../../src/router'
 import { mock } from 'jest-mock-extended'
 import {
@@ -15,8 +15,6 @@ import { ProjectSpaceResource, Resource } from '@ownclouders/web-client/src/help
 import { FileActionOptions } from '../../../../../src/composables/actions'
 
 describe('emptyTrashBin', () => {
-  afterEach(() => jest.clearAllMocks())
-
   describe('isEnabled property', () => {
     it('should be false when location is invalid', () => {
       getWrapper({
@@ -57,10 +55,11 @@ describe('emptyTrashBin', () => {
   describe('method "emptyTrashBin"', () => {
     it('should show message on success', () => {
       getWrapper({
-        setup: async ({ emptyTrashBin }, { space, storeOptions }) => {
+        setup: async ({ emptyTrashBin }, { space }) => {
           await emptyTrashBin({ space })
 
-          expect(storeOptions.actions.showMessage).toHaveBeenCalledTimes(1)
+          const { showMessage } = useMessages()
+          expect(showMessage).toHaveBeenCalledTimes(1)
         }
       })
     })
@@ -70,10 +69,11 @@ describe('emptyTrashBin', () => {
 
       getWrapper({
         resolveClearTrashBin: false,
-        setup: async ({ emptyTrashBin }, { space, storeOptions }) => {
+        setup: async ({ emptyTrashBin }, { space }) => {
           await emptyTrashBin({ space })
 
-          expect(storeOptions.actions.showErrorMessage).toHaveBeenCalledTimes(1)
+          const { showErrorMessage } = useMessages()
+          expect(showErrorMessage).toHaveBeenCalledTimes(1)
         }
       })
     })
@@ -117,13 +117,7 @@ function getWrapper({
     mocks.$clientService.webdav.clearTrashBin.mockRejectedValue(new Error(''))
   }
 
-  const storeOptions = {
-    ...defaultStoreMockOptions,
-    modules: {
-      ...defaultStoreMockOptions.modules,
-      user: { state: { uuid: 1 } }
-    }
-  }
+  const storeOptions = { ...defaultStoreMockOptions }
   const store = createStore(storeOptions)
   return {
     wrapper: getComposableWrapper(
diff --git a/packages/web-pkg/tests/unit/composables/actions/files/useFileActionsOpenShortcut.spec.ts b/packages/web-pkg/tests/unit/composables/actions/files/useFileActionsOpenShortcut.spec.ts
index 24cd11ee8ab..972c362440f 100644
--- a/packages/web-pkg/tests/unit/composables/actions/files/useFileActionsOpenShortcut.spec.ts
+++ b/packages/web-pkg/tests/unit/composables/actions/files/useFileActionsOpenShortcut.spec.ts
@@ -160,7 +160,7 @@ function getWrapper({
   return {
     wrapper: getComposableWrapper(
       () => {
-        const instance = useFileActionsOpenShortcut({ store })
+        const instance = useFileActionsOpenShortcut()
         setup(instance, { storeOptions })
       },
       {
diff --git a/packages/web-pkg/tests/unit/composables/actions/files/useFileActionsRename.spec.ts b/packages/web-pkg/tests/unit/composables/actions/files/useFileActionsRename.spec.ts
index 715e701cf16..3c4a11ae380 100644
--- a/packages/web-pkg/tests/unit/composables/actions/files/useFileActionsRename.spec.ts
+++ b/packages/web-pkg/tests/unit/composables/actions/files/useFileActionsRename.spec.ts
@@ -1,5 +1,5 @@
 import { ConfigurationManager, useFileActionsRename, useStore } from '../../../../../src'
-import { useModals } from '../../../../../src/composables/piniaStores'
+import { useMessages, useModals } from '../../../../../src/composables/piniaStores'
 import { mock, mockDeep } from 'jest-mock-extended'
 import { Resource, SpaceResource } from '@ownclouders/web-client/src/helpers'
 import {
@@ -156,13 +156,14 @@ describe('rename', () => {
       jest.spyOn(console, 'error').mockImplementation(() => undefined)
 
       getWrapper({
-        setup: async ({ renameResource }, { space, storeOptions, clientService }) => {
+        setup: async ({ renameResource }, { space, clientService }) => {
           clientService.webdav.moveFiles.mockRejectedValueOnce(new Error())
 
           renameResource(space, currentFolder, 'new name')
           await nextTick()
           await nextTick()
-          expect(storeOptions.actions.showErrorMessage).toHaveBeenCalledTimes(1)
+          const { showErrorMessage } = useMessages()
+          expect(showErrorMessage).toHaveBeenCalledTimes(1)
         }
       })
     })
diff --git a/packages/web-pkg/tests/unit/composables/actions/files/useFileActionsRestore.spec.ts b/packages/web-pkg/tests/unit/composables/actions/files/useFileActionsRestore.spec.ts
index 6bf1c9993c0..bab089fa369 100644
--- a/packages/web-pkg/tests/unit/composables/actions/files/useFileActionsRestore.spec.ts
+++ b/packages/web-pkg/tests/unit/composables/actions/files/useFileActionsRestore.spec.ts
@@ -8,7 +8,7 @@ import {
   getComposableWrapper,
   RouteLocation
 } from 'web-test-helpers'
-import { useStore } from '../../../../../src/composables'
+import { useMessages, useStore } from '../../../../../src/composables'
 import { unref } from 'vue'
 import { Resource } from '@ownclouders/web-client'
 import { ProjectSpaceResource, SpaceResource } from '@ownclouders/web-client/src/helpers'
@@ -88,7 +88,8 @@ describe('restore', () => {
             mock<LoadingTaskCallbackArguments>()
           )
 
-          expect(storeOptions.actions.showMessage).toHaveBeenCalledTimes(1)
+          const { showMessage } = useMessages()
+          expect(showMessage).toHaveBeenCalledTimes(1)
           expect(storeOptions.modules.Files.actions.removeFilesFromTrashbin).toHaveBeenCalledTimes(
             1
           )
diff --git a/packages/web-pkg/tests/unit/composables/actions/files/useFileActionsSetImage.spec.ts b/packages/web-pkg/tests/unit/composables/actions/files/useFileActionsSetImage.spec.ts
index 378060d709d..8ccbc6cf500 100644
--- a/packages/web-pkg/tests/unit/composables/actions/files/useFileActionsSetImage.spec.ts
+++ b/packages/web-pkg/tests/unit/composables/actions/files/useFileActionsSetImage.spec.ts
@@ -1,4 +1,5 @@
 import { useFileActionsSetImage } from '../../../../../src'
+import { useMessages } from '../../../../../src/composables/piniaStores'
 import { buildSpace, Resource, SpaceResource } from '@ownclouders/web-client/src/helpers'
 import { mock, mockDeep } from 'jest-mock-extended'
 import {
@@ -106,7 +107,7 @@ describe('setImage', () => {
 
       const space = mock<SpaceResource>({ id: '1' })
       getWrapper({
-        setup: async ({ actions }, { storeOptions, clientService }) => {
+        setup: async ({ actions }, { clientService }) => {
           clientService.graphAuthenticated.drives.updateDrive.mockResolvedValue(
             mockAxiosResolve(driveMock)
           )
@@ -119,7 +120,8 @@ describe('setImage', () => {
               }
             ] as Resource[]
           })
-          expect(storeOptions.actions.showMessage).toHaveBeenCalledTimes(1)
+          const { showMessage } = useMessages()
+          expect(showMessage).toHaveBeenCalledTimes(1)
         }
       })
     })
@@ -128,7 +130,7 @@ describe('setImage', () => {
       jest.spyOn(console, 'error').mockImplementation(() => undefined)
       const space = mock<SpaceResource>({ id: '1' })
       getWrapper({
-        setup: async ({ actions }, { storeOptions }) => {
+        setup: async ({ actions }) => {
           await unref(actions)[0].handler({
             space,
             resources: [
@@ -138,7 +140,8 @@ describe('setImage', () => {
               }
             ] as Resource[]
           })
-          expect(storeOptions.actions.showErrorMessage).toHaveBeenCalledTimes(1)
+          const { showErrorMessage } = useMessages()
+          expect(showErrorMessage).toHaveBeenCalledTimes(1)
         }
       })
     })
diff --git a/packages/web-pkg/tests/unit/composables/actions/files/useFileActionsSetReadme.spec.ts b/packages/web-pkg/tests/unit/composables/actions/files/useFileActionsSetReadme.spec.ts
index 4e0b9d1f79c..0b9c6c1e6a0 100644
--- a/packages/web-pkg/tests/unit/composables/actions/files/useFileActionsSetReadme.spec.ts
+++ b/packages/web-pkg/tests/unit/composables/actions/files/useFileActionsSetReadme.spec.ts
@@ -1,4 +1,5 @@
 import { useFileActionsSetReadme } from '../../../../../src'
+import { useMessages } from '../../../../../src/composables/piniaStores'
 import { buildSpace, FileResource, SpaceResource } from '@ownclouders/web-client/src/helpers'
 import { mock } from 'jest-mock-extended'
 
@@ -99,7 +100,7 @@ describe('setReadme', () => {
       const { wrapper } = getWrapper({
         resolveGetFileContents: true,
         space,
-        setup: async ({ actions }, { storeOptions }) => {
+        setup: async ({ actions }) => {
           unref(actions)[0].handler({
             space,
             resources: [
@@ -115,8 +116,8 @@ describe('setReadme', () => {
           await nextTick()
           await nextTick()
           await nextTick()
-          expect(storeOptions.actions.showMessage).toHaveBeenCalledWith(
-            expect.anything(),
+          const { showMessage } = useMessages()
+          expect(showMessage).toHaveBeenCalledWith(
             expect.not.objectContaining({ status: 'danger' })
           )
         }
@@ -130,7 +131,7 @@ describe('setReadme', () => {
       const { wrapper } = getWrapper({
         resolveGetFileContents: false,
         space,
-        setup: async ({ actions }, { storeOptions }) => {
+        setup: async ({ actions }) => {
           unref(actions)[0].handler({
             space,
             resources: [
@@ -142,7 +143,8 @@ describe('setReadme', () => {
           })
 
           await nextTick()
-          expect(storeOptions.actions.showErrorMessage).toHaveBeenCalled()
+          const { showErrorMessage } = useMessages()
+          expect(showErrorMessage).toHaveBeenCalled()
         }
       })
     })
diff --git a/packages/web-pkg/tests/unit/composables/actions/spaces/useSpaceActionsDelete.spec.ts b/packages/web-pkg/tests/unit/composables/actions/spaces/useSpaceActionsDelete.spec.ts
index ff015d0c96f..985ac2ac7cd 100644
--- a/packages/web-pkg/tests/unit/composables/actions/spaces/useSpaceActionsDelete.spec.ts
+++ b/packages/web-pkg/tests/unit/composables/actions/spaces/useSpaceActionsDelete.spec.ts
@@ -1,5 +1,5 @@
 import { useSpaceActionsDelete } from '../../../../../src/composables/actions'
-import { useModals } from '../../../../../src/composables/piniaStores'
+import { useMessages, useModals } from '../../../../../src/composables/piniaStores'
 import { buildSpace, SpaceResource } from '@ownclouders/web-client/src/helpers'
 import {
   createStore,
@@ -74,7 +74,7 @@ describe('delete', () => {
   describe('handler', () => {
     it('should trigger the delete modal window', () => {
       getWrapper({
-        setup: async ({ actions }, { storeOptions }) => {
+        setup: async ({ actions }) => {
           const { dispatchModal } = useModals()
           await unref(actions)[0].handler({
             resources: [
@@ -88,7 +88,7 @@ describe('delete', () => {
     })
     it('should not trigger the delete modal window without any resource to delete', () => {
       getWrapper({
-        setup: async ({ actions }, { storeOptions }) => {
+        setup: async ({ actions }) => {
           const { dispatchModal } = useModals()
           await unref(actions)[0].handler({
             resources: [
@@ -105,14 +105,15 @@ describe('delete', () => {
   describe('method "deleteSpace"', () => {
     it('should show message on success', () => {
       getWrapper({
-        setup: async ({ deleteSpaces }, { storeOptions, clientService }) => {
+        setup: async ({ deleteSpaces }, { clientService }) => {
           clientService.graphAuthenticated.drives.deleteDrive.mockResolvedValue(mockAxiosResolve())
 
           await deleteSpaces([
             mock<SpaceResource>({ id: '1', canBeDeleted: () => true, driveType: 'project' })
           ])
 
-          expect(storeOptions.actions.showMessage).toHaveBeenCalledTimes(1)
+          const { showMessage } = useMessages()
+          expect(showMessage).toHaveBeenCalledTimes(1)
         }
       })
     })
@@ -120,13 +121,14 @@ describe('delete', () => {
     it('should show message on error', () => {
       jest.spyOn(console, 'error').mockImplementation(() => undefined)
       getWrapper({
-        setup: async ({ deleteSpaces }, { clientService, storeOptions }) => {
+        setup: async ({ deleteSpaces }, { clientService }) => {
           clientService.graphAuthenticated.drives.deleteDrive.mockRejectedValue(new Error())
           await deleteSpaces([
             mock<SpaceResource>({ id: '1', canBeDeleted: () => true, driveType: 'project' })
           ])
 
-          expect(storeOptions.actions.showErrorMessage).toHaveBeenCalledTimes(1)
+          const { showErrorMessage } = useMessages()
+          expect(showErrorMessage).toHaveBeenCalledTimes(1)
         }
       })
     })
diff --git a/packages/web-pkg/tests/unit/composables/actions/spaces/useSpaceActionsDisable.spec.ts b/packages/web-pkg/tests/unit/composables/actions/spaces/useSpaceActionsDisable.spec.ts
index d43c956eb87..4ad41ee8370 100644
--- a/packages/web-pkg/tests/unit/composables/actions/spaces/useSpaceActionsDisable.spec.ts
+++ b/packages/web-pkg/tests/unit/composables/actions/spaces/useSpaceActionsDisable.spec.ts
@@ -1,5 +1,5 @@
 import { useSpaceActionsDisable } from '../../../../../src/composables/actions/spaces'
-import { useModals } from '../../../../../src/composables/piniaStores'
+import { useMessages, useModals } from '../../../../../src/composables/piniaStores'
 import { buildSpace, SpaceResource } from '@ownclouders/web-client/src/helpers'
 import {
   createStore,
@@ -72,7 +72,7 @@ describe('disable', () => {
   describe('handler', () => {
     it('should trigger the disable modal window', () => {
       getWrapper({
-        setup: async ({ actions }, { storeOptions }) => {
+        setup: async ({ actions }) => {
           const { dispatchModal } = useModals()
           await unref(actions)[0].handler({
             resources: [
@@ -86,7 +86,7 @@ describe('disable', () => {
     })
     it('should not trigger the disable modal window without any resource', () => {
       getWrapper({
-        setup: async ({ actions }, { storeOptions }) => {
+        setup: async ({ actions }) => {
           const { dispatchModal } = useModals()
           await unref(actions)[0].handler({
             resources: [
@@ -103,13 +103,14 @@ describe('disable', () => {
   describe('method "disableSpace"', () => {
     it('should show message on success', () => {
       getWrapper({
-        setup: async ({ disableSpaces }, { storeOptions, clientService }) => {
+        setup: async ({ disableSpaces }, { clientService }) => {
           clientService.graphAuthenticated.drives.disableDrive.mockResolvedValue(mockAxiosResolve())
           await disableSpaces([
             mock<SpaceResource>({ id: '1', canDisable: () => true, driveType: 'project' })
           ])
 
-          expect(storeOptions.actions.showMessage).toHaveBeenCalledTimes(1)
+          const { showMessage } = useMessages()
+          expect(showMessage).toHaveBeenCalledTimes(1)
         }
       })
     })
@@ -117,13 +118,14 @@ describe('disable', () => {
     it('should show message on error', () => {
       jest.spyOn(console, 'error').mockImplementation(() => undefined)
       getWrapper({
-        setup: async ({ disableSpaces }, { storeOptions, clientService }) => {
+        setup: async ({ disableSpaces }, { clientService }) => {
           clientService.graphAuthenticated.drives.disableDrive.mockRejectedValue(new Error())
           await disableSpaces([
             mock<SpaceResource>({ id: '1', canDisable: () => true, driveType: 'project' })
           ])
 
-          expect(storeOptions.actions.showErrorMessage).toHaveBeenCalledTimes(1)
+          const { showErrorMessage } = useMessages()
+          expect(showErrorMessage).toHaveBeenCalledTimes(1)
         }
       })
     })
diff --git a/packages/web-pkg/tests/unit/composables/actions/spaces/useSpaceActionsDuplicate.spec.ts b/packages/web-pkg/tests/unit/composables/actions/spaces/useSpaceActionsDuplicate.spec.ts
index b87ca0a248c..54cc496cce5 100644
--- a/packages/web-pkg/tests/unit/composables/actions/spaces/useSpaceActionsDuplicate.spec.ts
+++ b/packages/web-pkg/tests/unit/composables/actions/spaces/useSpaceActionsDuplicate.spec.ts
@@ -11,6 +11,7 @@ import {
 } from 'web-test-helpers'
 import { unref } from 'vue'
 import { ListFilesResult } from '@ownclouders/web-client/src/webdav/listFiles'
+import { useMessages } from '../../../../../src/composables/piniaStores'
 
 const spaces = [
   mock<SpaceResource>({
@@ -94,10 +95,11 @@ describe('restore', () => {
     it('should show error message on error', () => {
       jest.spyOn(console, 'error').mockImplementation(() => undefined)
       getWrapper({
-        setup: async ({ duplicateSpace }, { storeOptions, clientService }) => {
+        setup: async ({ duplicateSpace }, { clientService }) => {
           clientService.graphAuthenticated.drives.createDrive.mockRejectedValue(new Error())
           await duplicateSpace(spaces[0])
-          expect(storeOptions.actions.showErrorMessage).toHaveBeenCalledTimes(1)
+          const { showErrorMessage } = useMessages()
+          expect(showErrorMessage).toHaveBeenCalledTimes(1)
         }
       })
     })
@@ -126,7 +128,8 @@ describe('restore', () => {
           expect(
             storeOptions.modules.runtime.modules.spaces.mutations.UPSERT_SPACE
           ).toHaveBeenCalled()
-          expect(storeOptions.actions.showMessage).toHaveBeenCalled()
+          const { showMessage } = useMessages()
+          expect(showMessage).toHaveBeenCalled()
         }
       })
     })
diff --git a/packages/web-pkg/tests/unit/composables/actions/spaces/useSpaceActionsEditDescription.spec.ts b/packages/web-pkg/tests/unit/composables/actions/spaces/useSpaceActionsEditDescription.spec.ts
index 480d7bbed27..f5e477c634e 100644
--- a/packages/web-pkg/tests/unit/composables/actions/spaces/useSpaceActionsEditDescription.spec.ts
+++ b/packages/web-pkg/tests/unit/composables/actions/spaces/useSpaceActionsEditDescription.spec.ts
@@ -1,5 +1,5 @@
 import { useSpaceActionsEditDescription } from '../../../../../src/composables/actions'
-import { useModals } from '../../../../../src/composables/piniaStores'
+import { useMessages, useModals } from '../../../../../src/composables/piniaStores'
 import {
   createStore,
   defaultComponentMocks,
@@ -39,11 +39,12 @@ describe('editDescription', () => {
   describe('method "editDescriptionSpace"', () => {
     it('should show message on success', () => {
       getWrapper({
-        setup: async ({ actions, editDescriptionSpace }, { storeOptions, clientService }) => {
+        setup: async ({ editDescriptionSpace }, { clientService }) => {
           clientService.graphAuthenticated.drives.updateDrive.mockResolvedValue(mockAxiosResolve())
           await editDescriptionSpace(mock<SpaceResource>(), 'doesntmatter')
 
-          expect(storeOptions.actions.showMessage).toHaveBeenCalledTimes(1)
+          const { showMessage } = useMessages()
+          expect(showMessage).toHaveBeenCalledTimes(1)
         }
       })
     })
@@ -51,11 +52,12 @@ describe('editDescription', () => {
     it('should show message on error', () => {
       jest.spyOn(console, 'error').mockImplementation(() => undefined)
       getWrapper({
-        setup: async ({ actions, editDescriptionSpace }, { storeOptions, clientService }) => {
+        setup: async ({ editDescriptionSpace }, { clientService }) => {
           clientService.graphAuthenticated.drives.updateDrive.mockRejectedValue(new Error())
           await editDescriptionSpace(mock<SpaceResource>(), 'doesntmatter')
 
-          expect(storeOptions.actions.showErrorMessage).toHaveBeenCalledTimes(1)
+          const { showErrorMessage } = useMessages()
+          expect(showErrorMessage).toHaveBeenCalledTimes(1)
         }
       })
     })
diff --git a/packages/web-pkg/tests/unit/composables/actions/spaces/useSpaceActionsRename.spec.ts b/packages/web-pkg/tests/unit/composables/actions/spaces/useSpaceActionsRename.spec.ts
index 7c67ecb9232..8a82ac25c9b 100644
--- a/packages/web-pkg/tests/unit/composables/actions/spaces/useSpaceActionsRename.spec.ts
+++ b/packages/web-pkg/tests/unit/composables/actions/spaces/useSpaceActionsRename.spec.ts
@@ -1,5 +1,5 @@
 import { useSpaceActionsRename } from '../../../../../src/composables/actions/spaces'
-import { useModals } from '../../../../../src/composables/piniaStores'
+import { useMessages, useModals } from '../../../../../src/composables/piniaStores'
 import { mock } from 'jest-mock-extended'
 import {
   createStore,
@@ -40,11 +40,12 @@ describe('rename', () => {
   describe('method "renameSpace"', () => {
     it('should show message on success', () => {
       getWrapper({
-        setup: async ({ renameSpace }, { storeOptions, clientService }) => {
+        setup: async ({ renameSpace }, { clientService }) => {
           clientService.graphAuthenticated.drives.updateDrive.mockResolvedValue(mockAxiosResolve())
           await renameSpace(mock<SpaceResource>({ id: '1' }), 'renamed space')
 
-          expect(storeOptions.actions.showMessage).toHaveBeenCalledTimes(1)
+          const { showMessage } = useMessages()
+          expect(showMessage).toHaveBeenCalledTimes(1)
         }
       })
     })
@@ -52,11 +53,12 @@ describe('rename', () => {
     it('should show message on error', () => {
       jest.spyOn(console, 'error').mockImplementation(() => undefined)
       getWrapper({
-        setup: async ({ renameSpace }, { storeOptions, clientService }) => {
+        setup: async ({ renameSpace }, { clientService }) => {
           clientService.graphAuthenticated.drives.updateDrive.mockRejectedValue(new Error())
           await renameSpace(mock<SpaceResource>({ id: '1' }), 'renamed space')
 
-          expect(storeOptions.actions.showErrorMessage).toHaveBeenCalledTimes(1)
+          const { showErrorMessage } = useMessages()
+          expect(showErrorMessage).toHaveBeenCalledTimes(1)
         }
       })
     })
diff --git a/packages/web-pkg/tests/unit/composables/actions/spaces/useSpaceActionsRestore.spec.ts b/packages/web-pkg/tests/unit/composables/actions/spaces/useSpaceActionsRestore.spec.ts
index bfc381b2d41..a1a5c5fb384 100644
--- a/packages/web-pkg/tests/unit/composables/actions/spaces/useSpaceActionsRestore.spec.ts
+++ b/packages/web-pkg/tests/unit/composables/actions/spaces/useSpaceActionsRestore.spec.ts
@@ -11,7 +11,7 @@ import {
 } from 'web-test-helpers'
 import { unref } from 'vue'
 import { Drive } from '@ownclouders/web-client/src/generated'
-import { useModals } from '../../../../../src/composables/piniaStores'
+import { useMessages, useModals } from '../../../../../src/composables/piniaStores'
 
 describe('restore', () => {
   describe('isEnabled property', () => {
@@ -103,11 +103,12 @@ describe('restore', () => {
   describe('method "restoreSpace"', () => {
     it('should show message on success', () => {
       getWrapper({
-        setup: async ({ restoreSpaces }, { storeOptions, clientService }) => {
+        setup: async ({ restoreSpaces }, { clientService }) => {
           clientService.graphAuthenticated.drives.updateDrive.mockResolvedValue(mockAxiosResolve())
           await restoreSpaces([mock<SpaceResource>({ id: '1', canRestore: () => true })])
 
-          expect(storeOptions.actions.showMessage).toHaveBeenCalledTimes(1)
+          const { showMessage } = useMessages()
+          expect(showMessage).toHaveBeenCalledTimes(1)
         }
       })
     })
@@ -115,11 +116,12 @@ describe('restore', () => {
     it('should show message on error', () => {
       jest.spyOn(console, 'error').mockImplementation(() => undefined)
       getWrapper({
-        setup: async ({ restoreSpaces }, { storeOptions, clientService }) => {
+        setup: async ({ restoreSpaces }, { clientService }) => {
           clientService.graphAuthenticated.drives.updateDrive.mockRejectedValue(new Error())
           await restoreSpaces([mock<SpaceResource>({ id: '1', canRestore: () => true })])
 
-          expect(storeOptions.actions.showErrorMessage).toHaveBeenCalledTimes(1)
+          const { showErrorMessage } = useMessages()
+          expect(showErrorMessage).toHaveBeenCalledTimes(1)
         }
       })
     })
diff --git a/packages/web-pkg/tests/unit/helpers/resource/conflictHandling/conflictDialog.spec.ts b/packages/web-pkg/tests/unit/helpers/resource/conflictHandling/conflictDialog.spec.ts
index 31e39cee48a..1aea8d958cb 100644
--- a/packages/web-pkg/tests/unit/helpers/resource/conflictHandling/conflictDialog.spec.ts
+++ b/packages/web-pkg/tests/unit/helpers/resource/conflictHandling/conflictDialog.spec.ts
@@ -6,7 +6,7 @@ import { setActivePinia } from 'pinia'
 import { createMockStore } from 'web-test-helpers'
 
 const getConflictDialogInstance = () => {
-  return new ConflictDialog(jest.fn(), jest.fn(), jest.fn(), jest.fn())
+  return new ConflictDialog(jest.fn(), jest.fn())
 }
 
 describe('conflict dialog', () => {
diff --git a/packages/web-runtime/src/components/Account/GdprExport.vue b/packages/web-runtime/src/components/Account/GdprExport.vue
index d8c9103c0e6..e6906c4a59f 100644
--- a/packages/web-runtime/src/components/Account/GdprExport.vue
+++ b/packages/web-runtime/src/components/Account/GdprExport.vue
@@ -35,7 +35,7 @@ import { computed, defineComponent, onMounted, onUnmounted, ref, unref } from 'v
 import { useTask } from 'vue-concurrency'
 import { useGettext } from 'vue3-gettext'
 import { Resource } from '@ownclouders/web-client'
-import { useClientService, useStore, useUserStore } from '@ownclouders/web-pkg'
+import { useClientService, useMessages, useStore, useUserStore } from '@ownclouders/web-pkg'
 import { useDownloadFile } from '@ownclouders/web-pkg'
 import { formatDateFromJSDate } from '@ownclouders/web-pkg'
 import { isPersonalSpaceResource } from '@ownclouders/web-client/src/helpers'
@@ -47,6 +47,7 @@ export default defineComponent({
   name: 'GdprExport',
   setup() {
     const store = useStore()
+    const { showMessage, showErrorMessage } = useMessages()
     const userStore = useUserStore()
     const { $gettext, current: currentLanguage } = useGettext()
     const clientService = useClientService()
@@ -99,13 +100,11 @@ export default defineComponent({
           storageLocation: `/${GDPR_EXPORT_FILE_NAME}`
         })
         await loadExportTask.perform()
-        return store.dispatch('showMessage', {
-          title: $gettext('GDPR export has been requested')
-        })
+        showMessage({ title: $gettext('GDPR export has been requested') })
       } catch (e) {
-        return store.dispatch('showErrorMessage', {
+        showErrorMessage({
           title: $gettext('GDPR export could not be requested. Please contact an administrator.'),
-          error: e
+          errors: [e]
         })
       }
     }
diff --git a/packages/web-runtime/src/components/EditPasswordModal.vue b/packages/web-runtime/src/components/EditPasswordModal.vue
index 79ce312f23d..d3150c32d81 100644
--- a/packages/web-runtime/src/components/EditPasswordModal.vue
+++ b/packages/web-runtime/src/components/EditPasswordModal.vue
@@ -25,14 +25,14 @@
 <script lang="ts">
 import { computed, defineComponent, ref, PropType, unref, watch } from 'vue'
 import { useGettext } from 'vue3-gettext'
-import { Modal, useClientService, useStore } from '@ownclouders/web-pkg'
+import { Modal, useClientService, useMessages } from '@ownclouders/web-pkg'
 
 export default defineComponent({
   name: 'EditPasswordModal',
   props: { modal: { type: Object as PropType<Modal>, required: true } },
   emits: ['update:confirmDisabled'],
   setup(props, { emit, expose }) {
-    const store = useStore()
+    const { showMessage, showErrorMessage } = useMessages()
     const clientService = useClientService()
     const { $gettext } = useGettext()
 
@@ -61,15 +61,13 @@ export default defineComponent({
       return clientService.graphAuthenticated.users
         .changeOwnPassword(unref(currentPassword).trim(), unref(newPassword).trim())
         .then(() => {
-          store.dispatch('showMessage', {
-            title: $gettext('Password was changed successfully')
-          })
+          showMessage({ title: $gettext('Password was changed successfully') })
         })
         .catch((error) => {
           console.error(error)
-          store.dispatch('showErrorMessage', {
+          showErrorMessage({
             title: $gettext('Failed to change password'),
-            error
+            errors: [error]
           })
         })
     }
diff --git a/packages/web-runtime/src/components/MessageBar.vue b/packages/web-runtime/src/components/MessageBar.vue
index 6a8f60729a2..f5a9b020a22 100644
--- a/packages/web-runtime/src/components/MessageBar.vue
+++ b/packages/web-runtime/src/components/MessageBar.vue
@@ -1,7 +1,7 @@
 <template>
   <oc-notifications :position="notificationPosition">
     <oc-notification-message
-      v-for="item in $_ocMessages_limited"
+      v-for="item in limitedMessages"
       :key="item.id"
       :title="item.title"
       :message="item.desc"
@@ -14,34 +14,31 @@
 </template>
 
 <script lang="ts">
-import { defineComponent } from 'vue'
-import { mapGetters } from 'vuex'
+import { Message, useConfigurationManager, useMessages } from '@ownclouders/web-pkg'
+import { computed, defineComponent } from 'vue'
 
 export default defineComponent({
-  props: {
-    activeMessages: {
-      type: Array,
-      required: false,
-      default: () => []
-    }
-  },
-  emits: ['deleteMessage'],
-  computed: {
-    ...mapGetters(['configuration']),
-    notificationPosition() {
-      if (this.configuration.options.topCenterNotifications) {
+  name: 'MessageBar',
+  setup() {
+    const messageStore = useMessages()
+    const configurationManager = useConfigurationManager()
+
+    const notificationPosition = computed(() => {
+      if (configurationManager.options.topCenterNotifications) {
         return 'top-center'
       }
       return 'default'
-    },
-    $_ocMessages_limited(): any[] {
-      return this.activeMessages ? this.activeMessages.slice(0, 5) : []
-    }
-  },
-  methods: {
-    deleteMessage(item) {
-      this.$emit('deleteMessage', item)
+    })
+
+    const limitedMessages = computed(() => {
+      return messageStore.messages ? messageStore.messages.slice(0, 5) : []
+    })
+
+    const deleteMessage = (message: Message) => {
+      messageStore.removeMessage(message)
     }
+
+    return { notificationPosition, limitedMessages, deleteMessage }
   }
 })
 </script>
diff --git a/packages/web-runtime/src/container/bootstrap.ts b/packages/web-runtime/src/container/bootstrap.ts
index 1c91db9f114..4be677a602e 100644
--- a/packages/web-runtime/src/container/bootstrap.ts
+++ b/packages/web-runtime/src/container/bootstrap.ts
@@ -8,7 +8,13 @@ import { loadTheme } from '../helpers/theme'
 import OwnCloud from 'owncloud-sdk'
 import { createGettext, GetTextOptions, Language } from 'vue3-gettext'
 import { getBackendVersion, getWebVersion } from './versions'
-import { useModals, useThemeStore, useUserStore, UserStore } from '@ownclouders/web-pkg'
+import {
+  useModals,
+  useThemeStore,
+  useUserStore,
+  UserStore,
+  useMessages
+} from '@ownclouders/web-pkg'
 import { authService } from '../services/auth'
 import {
   ClientService,
@@ -331,9 +337,10 @@ export const announceTheme = async ({
 }
 
 export const announcePiniaStores = () => {
+  const messagesStore = useMessages()
   const modalStore = useModals()
   const userStore = useUserStore()
-  return { modalStore, userStore }
+  return { messagesStore, modalStore, userStore }
 }
 
 /**
diff --git a/packages/web-runtime/src/layouts/Application.vue b/packages/web-runtime/src/layouts/Application.vue
index 99bf9bdcd8d..9232d443abc 100644
--- a/packages/web-runtime/src/layouts/Application.vue
+++ b/packages/web-runtime/src/layouts/Application.vue
@@ -27,14 +27,14 @@
       <portal-target name="app.runtime.footer" />
     </div>
     <div class="snackbars">
-      <message-bar :active-messages="activeMessages" @delete-message="deleteMessage" />
+      <message-bar />
       <upload-info />
     </div>
   </div>
 </template>
 
 <script lang="ts">
-import { mapActions, mapGetters } from 'vuex'
+import { mapGetters } from 'vuex'
 import orderBy from 'lodash-es/orderBy'
 import { AppLoadingSpinner, SidebarNavExtension, useExtensionRegistry } from '@ownclouders/web-pkg'
 import TopBar from '../components/Topbar/TopBar.vue'
@@ -179,7 +179,7 @@ export default defineComponent({
     }
   },
   computed: {
-    ...mapGetters(['apps', 'activeMessages', 'configuration']),
+    ...mapGetters(['apps', 'configuration']),
     isIE11() {
       return !!(window as any).MSInputMethodContext && !!(document as any).documentMode
     },
@@ -222,9 +222,6 @@ export default defineComponent({
   },
   beforeUnmount() {
     window.removeEventListener('resize', this.onResize)
-  },
-  methods: {
-    ...mapActions(['deleteMessage'])
   }
 })
 </script>
diff --git a/packages/web-runtime/src/pages/account.vue b/packages/web-runtime/src/pages/account.vue
index 21f6add3d79..1039fce23a5 100644
--- a/packages/web-runtime/src/pages/account.vue
+++ b/packages/web-runtime/src/pages/account.vue
@@ -149,6 +149,7 @@ import {
   useCapabilityGraphPersonalDataExport,
   useClientService,
   useGetMatchingSpace,
+  useMessages,
   useModals,
   useStore,
   useUserStore
@@ -171,6 +172,7 @@ export default defineComponent({
   },
   setup() {
     const store = useStore()
+    const { showMessage, showErrorMessage } = useMessages()
     const userStore = useUserStore()
     const language = useGettext()
     const { $gettext } = language
@@ -215,9 +217,9 @@ export default defineComponent({
         valuesList.value = values || []
       } catch (e) {
         console.error(e)
-        store.dispatch('showErrorMessage', {
+        showErrorMessage({
           title: $gettext('Unable to load account data…'),
-          error: e
+          errors: [e]
         })
         valuesList.value = []
       }
@@ -235,9 +237,9 @@ export default defineComponent({
         accountBundle.value = bundles?.find((b) => b.extension === 'ocis-accounts')
       } catch (e) {
         console.error(e)
-        store.dispatch('showErrorMessage', {
+        showErrorMessage({
           title: $gettext('Unable to load account data…'),
-          error: e
+          errors: [e]
         })
         accountBundle.value = undefined
       }
@@ -249,9 +251,9 @@ export default defineComponent({
         graphUser.value = data
       } catch (e) {
         console.error(e)
-        store.dispatch('showErrorMessage', {
+        showErrorMessage({
           title: $gettext('Unable to load account data…'),
-          error: e
+          errors: [e]
         })
         graphUser.value = undefined
       }
@@ -345,14 +347,12 @@ export default defineComponent({
           })
         }
 
-        store.dispatch('showMessage', {
-          title: $gettext('Preference saved.')
-        })
+        showMessage({ title: $gettext('Preference saved.') })
       } catch (e) {
         console.error(e)
-        store.dispatch('showErrorMessage', {
+        showErrorMessage({
           title: $gettext('Unable to save preference…'),
-          error: e
+          errors: [e]
         })
       }
     }
@@ -364,14 +364,12 @@ export default defineComponent({
           valueOptions: { boolValue: !option }
         })
         disableEmailNotificationsValue.value = option
-        store.dispatch('showMessage', {
-          title: $gettext('Preference saved.')
-        })
+        showMessage({ title: $gettext('Preference saved.') })
       } catch (e) {
         console.error(e)
-        store.dispatch('showErrorMessage', {
+        showErrorMessage({
           title: $gettext('Unable to save preference…'),
-          error: e
+          errors: [e]
         })
       }
     }
@@ -380,14 +378,12 @@ export default defineComponent({
       try {
         store.commit('Files/SET_FILE_WEB_DAV_DETAILS_VISIBILITY', option)
         viewOptionWebDavDetailsValue.value = option
-        store.dispatch('showMessage', {
-          title: $gettext('Preference saved.')
-        })
+        showMessage({ title: $gettext('Preference saved.') })
       } catch (e) {
         console.error(e)
-        store.dispatch('showErrorMessage', {
+        showErrorMessage({
           title: $gettext('Unable to save preference…'),
-          error: e
+          errors: [e]
         })
       }
     }
diff --git a/packages/web-runtime/src/store/app.ts b/packages/web-runtime/src/store/app.ts
deleted file mode 100644
index 146ea578a15..00000000000
--- a/packages/web-runtime/src/store/app.ts
+++ /dev/null
@@ -1,74 +0,0 @@
-const state = {
-  messages: []
-}
-
-const actions = {
-  showErrorMessage({ commit }, message) {
-    const getXRequestID = (error: any): string | null => {
-      /**
-       * x-request-id response headers might be very nested in ownCloud SDK,
-       * only remove records if you are sure they aren't valid anymore
-       */
-      if (error.response?.res?.res?.headers?.['x-request-id']) {
-        return error.response.res.res.headers['x-request-id']
-      }
-      if (error.response?.headers?.map?.['x-request-id']) {
-        return error.response.headers.map['x-request-id']
-      }
-      if (error.response?.res?.headers?.['x-request-id']) {
-        return error.response.res.headers['x-request-id']
-      }
-      if (error.response?.headers?.['x-request-id']) {
-        return error.response.headers['x-request-id']
-      }
-      return null
-    }
-
-    message.status = message.status || 'danger'
-    message.timeout = message.timeout || 0
-    message.errors = message.error ? [message.error] : message.errors || []
-
-    const xRequestIds = message.errors
-      .map((error) => getXRequestID(error))
-      .filter((xRequestId) => xRequestId !== null)
-      .map((item) => `X-Request-Id: ${item}`)
-      .join('\r\n')
-
-    message.errorLogContent = xRequestIds
-
-    commit('ENQUEUE_MESSAGE', message)
-  },
-  showMessage({ commit }, message) {
-    commit('ENQUEUE_MESSAGE', message)
-  },
-  deleteMessage(context, mId) {
-    context.commit('REMOVE_MESSAGE', mId)
-  }
-}
-
-const mutations = {
-  ENQUEUE_MESSAGE(state, message) {
-    // set random id to improve iteration in v-for & lodash
-    if (!message.id) {
-      message.id = Math.random().toString(36).slice(2, -1)
-    }
-
-    state.messages.push(message)
-  },
-  REMOVE_MESSAGE(state, item) {
-    state.messages.splice(state.messages.indexOf(item), 1)
-  }
-}
-
-const getters = {
-  activeMessages: (state) => {
-    return state.messages
-  }
-}
-
-export default {
-  state,
-  actions,
-  mutations,
-  getters
-}
diff --git a/packages/web-runtime/src/store/index.ts b/packages/web-runtime/src/store/index.ts
index 2c63a6f851d..b851c9eefb3 100644
--- a/packages/web-runtime/src/store/index.ts
+++ b/packages/web-runtime/src/store/index.ts
@@ -1,5 +1,4 @@
 import ancestorMetaData from './ancestorMetaData'
-import app from './app'
 import apps from './apps'
 import auth from './auth'
 import config from './config'
@@ -20,7 +19,6 @@ const runtime = {
 
 export default {
   modules: {
-    app,
     apps,
     user,
     config,
diff --git a/packages/web-runtime/tests/unit/components/MessageBar.spec.ts b/packages/web-runtime/tests/unit/components/MessageBar.spec.ts
index a05f07cfb94..a6d1d847af3 100644
--- a/packages/web-runtime/tests/unit/components/MessageBar.spec.ts
+++ b/packages/web-runtime/tests/unit/components/MessageBar.spec.ts
@@ -1,10 +1,6 @@
+import { useMessages } from '@ownclouders/web-pkg'
 import MessageBar from 'web-runtime/src/components/MessageBar.vue'
-import {
-  createStore,
-  defaultPlugins,
-  shallowMount,
-  defaultStoreMockOptions
-} from 'web-test-helpers'
+import { defaultPlugins, shallowMount } from 'web-test-helpers'
 
 const messages = [
   {
@@ -50,30 +46,22 @@ const selectors = {
 }
 
 describe('MessageBar component', () => {
-  const spyDeleteMessage = jest.spyOn((MessageBar as any).methods, 'deleteMessage')
-  const spyOcMessagesLimited = jest.spyOn((MessageBar as any).computed, '$_ocMessages_limited')
-
-  afterEach(() => {
-    jest.clearAllMocks()
-  })
-
   describe('when there is an active message', () => {
-    const { wrapper } = getShallowWrapper([messages[0]])
-    const notificationMessage = wrapper.findComponent<any>(selectors.notificationMessage)
-
     it('should set props in oc-notification-message component', () => {
+      const { wrapper } = getShallowWrapper([messages[0]])
+      const notificationMessage = wrapper.findComponent<any>(selectors.notificationMessage)
+
       expect(notificationMessage.attributes().title).toEqual(messages[0].title)
       expect(notificationMessage.attributes().status).toEqual(messages[0].status)
       expect(notificationMessage.attributes().message).toEqual(messages[0].desc)
     })
-    it('should call "deleteMessage" method on close event', () => {
-      expect(spyDeleteMessage).toHaveBeenCalledTimes(0)
+    it('should call "removeMessage" method on close event', () => {
+      const { wrapper } = getShallowWrapper([messages[0]])
+      const messageStore = useMessages()
+      const notificationMessage = wrapper.findComponent<any>(selectors.notificationMessage)
       ;(notificationMessage.vm as any).$emit('close')
 
-      expect(spyDeleteMessage).toHaveBeenCalledTimes(1)
-      expect(spyDeleteMessage).toHaveBeenCalledWith(messages[0])
-      expect(wrapper.emitted().deleteMessage).toBeTruthy()
-      expect(wrapper.emitted().deleteMessage).toEqual([[messages[0]]])
+      expect(messageStore.removeMessage).toHaveBeenCalledTimes(1)
     })
   })
 
@@ -81,28 +69,17 @@ describe('MessageBar component', () => {
     it('should return only the first five messages', () => {
       const { wrapper } = getShallowWrapper(messages)
 
-      expect(spyOcMessagesLimited).toHaveBeenCalledTimes(1)
-      expect(wrapper.vm.$_ocMessages_limited).toHaveLength(5)
+      expect(wrapper.findAll(selectors.notificationMessage).length).toBe(5)
     })
   })
 })
 
-function getShallowWrapper(activeMessages = []) {
-  const storeOptions = defaultStoreMockOptions
-  storeOptions.getters.configuration.mockImplementation(() => ({
-    options: {
-      topCenterNotifications: false
-    }
-  }))
-  const store = createStore(storeOptions)
+function getShallowWrapper(messages = []) {
   return {
     wrapper: shallowMount(MessageBar, {
-      props: {
-        activeMessages
-      },
       global: {
         renderStubDefaultSlot: true,
-        plugins: [...defaultPlugins(), store]
+        plugins: [...defaultPlugins({ piniaOptions: { messagesState: { messages } } })]
       }
     })
   }
diff --git a/packages/web-runtime/tests/unit/pages/account.spec.ts b/packages/web-runtime/tests/unit/pages/account.spec.ts
index 50c522bbf5f..8ba9a565dcd 100644
--- a/packages/web-runtime/tests/unit/pages/account.spec.ts
+++ b/packages/web-runtime/tests/unit/pages/account.spec.ts
@@ -11,7 +11,7 @@ import {
 import { mock } from 'jest-mock-extended'
 import { SpaceResource } from '@ownclouders/web-client/src/helpers'
 import { AxiosResponse } from 'axios'
-import { ConfigurationManager } from '@ownclouders/web-pkg'
+import { ConfigurationManager, useMessages } from '@ownclouders/web-pkg'
 import { SettingsBundle, SettingsValue } from 'web-runtime/src/helpers/settings'
 import { User } from '@ownclouders/web-client/src/generated'
 
@@ -233,7 +233,7 @@ describe('account page', () => {
 
   describe('Method "updateDisableEmailNotifications', () => {
     it('should show a message on success', async () => {
-      const { wrapper, mocks, storeOptions } = getWrapper()
+      const { wrapper, mocks } = getWrapper()
 
       await wrapper.vm.loadAccountBundleTask.last
       await wrapper.vm.loadValuesListTask.last
@@ -241,12 +241,13 @@ describe('account page', () => {
 
       mocks.$clientService.httpAuthenticated.post.mockResolvedValueOnce(mockAxiosResolve({}))
       await wrapper.vm.updateDisableEmailNotifications(true)
-      expect(storeOptions.actions.showMessage).toHaveBeenCalled()
+      const { showMessage } = useMessages()
+      expect(showMessage).toHaveBeenCalled()
     })
     it('should show a message on error', async () => {
       jest.spyOn(console, 'error').mockImplementation(() => undefined)
 
-      const { wrapper, mocks, storeOptions } = getWrapper()
+      const { wrapper, mocks } = getWrapper()
 
       await wrapper.vm.loadAccountBundleTask.last
       await wrapper.vm.loadValuesListTask.last
@@ -254,13 +255,14 @@ describe('account page', () => {
 
       mocks.$clientService.httpAuthenticated.post.mockImplementation(() => mockAxiosReject('err'))
       await wrapper.vm.updateDisableEmailNotifications(true)
-      expect(storeOptions.actions.showErrorMessage).toHaveBeenCalled()
+      const { showErrorMessage } = useMessages()
+      expect(showErrorMessage).toHaveBeenCalled()
     })
   })
 
   describe('Method "updateSelectedLanguage', () => {
     it('should show a message on success', async () => {
-      const { wrapper, mocks, storeOptions } = getWrapper({})
+      const { wrapper, mocks } = getWrapper({})
 
       await wrapper.vm.loadAccountBundleTask.last
       await wrapper.vm.loadValuesListTask.last
@@ -270,12 +272,13 @@ describe('account page', () => {
         mockAxiosResolve({})
       )
       await wrapper.vm.updateSelectedLanguage('en')
-      expect(storeOptions.actions.showMessage).toHaveBeenCalled()
+      const { showMessage } = useMessages()
+      expect(showMessage).toHaveBeenCalled()
     })
     it('should show a message on error', async () => {
       jest.spyOn(console, 'error').mockImplementation(() => undefined)
 
-      const { wrapper, mocks, storeOptions } = getWrapper({})
+      const { wrapper, mocks } = getWrapper({})
 
       await wrapper.vm.loadAccountBundleTask.last
       await wrapper.vm.loadValuesListTask.last
@@ -285,7 +288,8 @@ describe('account page', () => {
         mockAxiosReject('err')
       )
       await wrapper.vm.updateSelectedLanguage('en')
-      expect(storeOptions.actions.showErrorMessage).toHaveBeenCalled()
+      const { showErrorMessage } = useMessages()
+      expect(showErrorMessage).toHaveBeenCalled()
     })
   })
 
@@ -298,7 +302,8 @@ describe('account page', () => {
       await wrapper.vm.loadGraphUserTask.last
 
       await wrapper.vm.updateViewOptionsWebDavDetails(true)
-      expect(storeOptions.actions.showMessage).toHaveBeenCalled()
+      const { showMessage } = useMessages()
+      expect(showMessage).toHaveBeenCalled()
       expect(
         storeOptions.modules.Files.mutations.SET_FILE_WEB_DAV_DETAILS_VISIBILITY
       ).toHaveBeenCalled()
diff --git a/packages/web-test-helpers/src/mocks/pinia.ts b/packages/web-test-helpers/src/mocks/pinia.ts
index a4a3eddb40e..2a8974af7cb 100644
--- a/packages/web-test-helpers/src/mocks/pinia.ts
+++ b/packages/web-test-helpers/src/mocks/pinia.ts
@@ -1,7 +1,7 @@
 import { createTestingPinia } from '@pinia/testing'
 import defaultTheme from '../../../web-runtime/themes/owncloud/theme.json'
 import { User } from '../../../web-client/src/generated'
-import { Modal, WebThemeType } from '../../../web-pkg/src/composables/piniaStores'
+import { Message, Modal, WebThemeType } from '../../../web-pkg/src/composables/piniaStores'
 import { mock } from 'jest-mock-extended'
 
 export { createTestingPinia }
@@ -9,6 +9,7 @@ export { createTestingPinia }
 export type PiniaMockOptions = {
   stubActions?: boolean
   themeState?: { availableThemes?: WebThemeType[]; currentTheme?: WebThemeType }
+  messagesState?: { messages?: Message[] }
   modalsState?: { modals?: Modal[] }
   userState?: { user?: User }
 }
@@ -16,6 +17,7 @@ export type PiniaMockOptions = {
 export function createMockStore({
   stubActions = true,
   themeState = {},
+  messagesState = {},
   modalsState = {},
   userState = {}
 }: PiniaMockOptions = {}) {
@@ -33,6 +35,7 @@ export function createMockStore({
   return createTestingPinia({
     stubActions,
     initialState: {
+      messages: { messages: [], ...messagesState },
       modals: {
         modals: [],
         ...modalsState
diff --git a/packages/web-test-helpers/src/mocks/store/defaultStoreMockOptions.ts b/packages/web-test-helpers/src/mocks/store/defaultStoreMockOptions.ts
index 28d4275021d..121e0723d7e 100644
--- a/packages/web-test-helpers/src/mocks/store/defaultStoreMockOptions.ts
+++ b/packages/web-test-helpers/src/mocks/store/defaultStoreMockOptions.ts
@@ -33,9 +33,6 @@ export const defaultStoreMockOptions = {
     }
   },
   actions: {
-    showMessage: jest.fn(),
-    showErrorMessage: jest.fn(),
-    deleteNotification: jest.fn(),
     openNavigation: jest.fn(),
     closeNavigation: jest.fn()
   },