diff --git a/src/components/FolderSelectionDialog.vue b/src/components/FolderSelectionDialog.vue
index c09cd66..cc98474 100644
--- a/src/components/FolderSelectionDialog.vue
+++ b/src/components/FolderSelectionDialog.vue
@@ -23,7 +23,7 @@ const props = withDefaults(defineProps<Props>(), {
 
 const emit = defineEmits<{
   'update:modelValue': [value: boolean]
-  select: [folder: CollectionObject]
+  select: [target: CollectionObject]
   cancel: []
 }>()
 
@@ -50,16 +50,13 @@ interface ServiceGroup {
 }
 
 const serviceGroups = computed<ServiceGroup[]>(() => {
-  const moveCandidate = mailStore.moveMessageCandidates[0]
+  const context = mailStore.moveDialogService
 
-  if (!moveCandidate) {
+  if (!context) {
     return []
   }
 
-  const service = servicesStore.services.find(entry =>
-    entry.provider === moveCandidate.provider &&
-    String(entry.identifier) === String(moveCandidate.service),
-  )
+  const service = servicesStore.serviceByIdentifier(mailStore.moveDialogService)
 
   if (!service) {
     return []
@@ -111,7 +108,7 @@ const canConfirm = computed(() => {
 })
 
 watch(
-  () => [props.modelValue, mailStore.moveMessageCandidates],
+  () => [props.modelValue, mailStore.moveDialogService],
   ([isOpen]) => {
     if (!isOpen) {
       return
diff --git a/src/components/MessageList.vue b/src/components/MessageList.vue
index 58cea56..00fb2b9 100644
--- a/src/components/MessageList.vue
+++ b/src/components/MessageList.vue
@@ -1,40 +1,34 @@
 <script setup lang="ts">
 import { computed, onBeforeUnmount, ref } from 'vue'
 import type { EntityIdentifier } from '@MailManager/types/common'
-import type { EntityInterface } from '@MailManager/types/entity'
-import type { MessageInterface } from '@MailManager/types/message'
+import type { EntityObject } from '@MailManager/models'
 import type { CollectionObject } from '@MailManager/models/collection'
 
 // Props
 interface Props {
-  messages: EntityInterface<MessageInterface>[]
-  selectedMessage?: EntityInterface<MessageInterface> | null
-  selectedMessageIds?: EntityIdentifier[]
-  selectionModeActive?: boolean
-  selectionCount?: number
-  hasSelection?: boolean
-  allCurrentMessagesSelected?: boolean
+  messages: EntityObject[]
+  selectedMessage?: EntityObject | null
+  selectionList?: EntityIdentifier[]
+  selectionMode?: boolean
   selectedCollection?: CollectionObject | null
   loading?: boolean
 }
 
 const props = withDefaults(defineProps<Props>(), {
   loading: false,
-  selectedMessageIds: () => [],
-  selectionModeActive: false,
-  selectionCount: 0,
-  hasSelection: false,
-  allCurrentMessagesSelected: false,
+  selectionList: () => [],
+  selectionMode: false,
 })
 
 // Emits
 const emit = defineEmits<{
-  open: [message: EntityInterface<MessageInterface>]
-  toggleSelection: [message: EntityInterface<MessageInterface>]
-  activateSelectionMode: [message: EntityInterface<MessageInterface>]
+  open: [message: EntityObject]
+  toggleSelection: [message: EntityObject]
+  activateSelectionMode: [message: EntityObject]
   toggleSelectAll: [value: boolean]
   clearSelection: []
   moveSelection: []
+  deleteSelection: []
 }>()
 
 const longPressTimer = ref<number | null>(null)
@@ -42,19 +36,19 @@ const longPressActivated = ref(false)
 const suppressNextClick = ref(false)
 const LONG_PRESS_MS = 450
 
-const selectedIdSet = computed(() => new Set(props.selectedMessageIds))
+const selectedIdSet = computed(() => new Set(props.selectionList))
 
-const isOpened = (message: EntityInterface<MessageInterface>): boolean => {
+const isOpened = (message: EntityObject): boolean => {
   if (!props.selectedMessage) return false
   return (
-    message.provider === selectedMessage.value.provider &&
-    message.service === selectedMessage.value.service &&
-    message.collection === selectedMessage.value.collection &&
-    message.identifier === selectedMessage.value.identifier
+    message.provider === props.selectedMessage.provider &&
+    message.service === props.selectedMessage.service &&
+    message.collection === props.selectedMessage.collection &&
+    message.identifier === props.selectedMessage.identifier
   )
 }
 
-const isSelected = (message: EntityInterface<MessageInterface>): boolean => {
+const isSelected = (message: EntityObject): boolean => {
   return selectedIdSet.value.has(
     `${message.provider}:${String(message.service)}:${String(message.collection)}:${String(message.identifier)}` as EntityIdentifier,
   )
@@ -70,6 +64,16 @@ const isFlagged = (message: EntityObject): boolean => {
   return message.properties.flags?.flagged || false
 }
 
+const currentMessages = computed(() => props.messages ?? [])
+
+const selectionCount = computed(() => props.selectionList.length)
+
+const hasSelection = computed(() => selectionCount.value > 0)
+
+const allCurrentMessagesSelected = computed(() => {
+  return currentMessages.value.length > 0 && currentMessages.value.every(message => isSelected(message))
+})
+
 // Format date for display
 const formatDate = (date: Date | string | null | undefined): string => {
   if (!date) return ''
@@ -101,6 +105,7 @@ const formatDate = (date: Date | string | null | undefined): string => {
       day: 'numeric' 
     })
   }
+
   
   // Other years - show full date
   return messageDate.toLocaleDateString('en-US', { 
@@ -116,8 +121,18 @@ const truncate = (text: string | null | undefined, length: number = 100): string
   return text.length > length ? text.substring(0, length) + '...' : text
 }
 
-// Handle message click
-const handleMessageClick = (message: EntityInterface<MessageInterface>) => {
+const handleSelectionToggle = (message: EntityObject) => {
+  emit('toggleSelection', message)
+}
+
+const handleMessageMouseClick = (event: MouseEvent | KeyboardEvent, message: EntityObject) => {
+  if (event.shiftKey && !props.selectionMode) {
+    event.preventDefault()
+    event.stopPropagation()
+    emit('activateSelectionMode', message)
+    return
+  }
+
   if (longPressActivated.value) {
     longPressActivated.value = false
     return
@@ -128,7 +143,7 @@ const handleMessageClick = (message: EntityInterface<MessageInterface>) => {
     return
   }
 
-  if (props.selectionModeActive) {
+  if (props.selectionMode) {
     emit('toggleSelection', message)
     return
   }
@@ -136,23 +151,8 @@ const handleMessageClick = (message: EntityInterface<MessageInterface>) => {
   emit('open', message)
 }
 
-const handleSelectionToggle = (message: EntityInterface<MessageInterface>) => {
-  emit('toggleSelection', message)
-}
-
-const handleMessageMouseClick = (event: MouseEvent | KeyboardEvent, message: EntityInterface<MessageInterface>) => {
-  if (event.shiftKey && !props.selectionModeActive) {
-    event.preventDefault()
-    event.stopPropagation()
-    emit('activateSelectionMode', message)
-    return
-  }
-
-  handleMessageClick(message)
-}
-
-const handleMessageMouseDown = (event: MouseEvent, message: EntityInterface<MessageInterface>) => {
-  if (!event.shiftKey || props.selectionModeActive) {
+const handleMessageMouseDown = (event: MouseEvent, message: EntityObject) => {
+  if (!event.shiftKey || props.selectionMode) {
     return
   }
 
@@ -169,12 +169,12 @@ const clearLongPressTimer = () => {
   }
 }
 
-const handleTouchStart = (message: EntityInterface<MessageInterface>) => {
+const handleTouchStart = (message: EntityObject) => {
   clearLongPressTimer()
   longPressActivated.value = false
 
   longPressTimer.value = window.setTimeout(() => {
-    if (!props.selectionModeActive) {
+    if (!props.selectionMode) {
       emit('activateSelectionMode', message)
     } else {
       emit('toggleSelection', message)
@@ -216,12 +216,12 @@ const unreadCount = computed(() => {
 })
 
 const totalCount = computed(() => {
-  return selectedFolder.value?.properties.total ?? 0
+  return props.selectedCollection?.properties.total ?? 0
 })
 
 // True only when the collection explicitly provides total/unread counts
 const hasCountData = computed(() => {
-  return selectedFolder.value?.properties.total != null
+  return props.selectedCollection?.properties.total != null
 })
 </script>
 
@@ -243,7 +243,7 @@ const hasCountData = computed(() => {
         </div>
       </div>
 
-      <div v-if="selectionModeActive && messages.length > 0" class="selection-summary">
+      <div v-if="selectionMode && messages.length > 0" class="selection-summary">
         <div class="selection-controls">
           <v-checkbox-btn
             :model-value="allCurrentMessagesSelected"
@@ -267,6 +267,15 @@ const hasCountData = computed(() => {
           >
             Move
           </v-btn>
+          <v-btn
+            size="small"
+            variant="text"
+            prepend-icon="mdi-delete-outline"
+            :disabled="!hasSelection"
+            @click="emit('deleteSelection')"
+          >
+            Delete
+          </v-btn>
           <v-btn
             size="small"
             variant="text"
@@ -307,12 +316,12 @@ const hasCountData = computed(() => {
     >
       <template v-slot:default="{ item: message }">
         <v-list-item
-          :key="`${message.provider}-${message.service}-${message.collection}-${message.identifier}`"
+          :key="`${message.provider}:${message.service}:${message.collection}:${message.identifier}`"
           class="message-item"
           :class="{
             'opened': isOpened(message),
             'selected': isSelected(message),
-            'selection-mode': selectionModeActive,
+            'selection-mode': selectionMode,
             'unread': isUnread(message)
           }"
           @mousedown="handleMessageMouseDown($event, message)"
@@ -326,7 +335,7 @@ const hasCountData = computed(() => {
           <template v-slot:prepend>
             <div class="message-item-prepend">
               <v-checkbox-btn
-                v-if="selectionModeActive || isSelected(message)"
+                v-if="selectionMode || isSelected(message)"
                 :model-value="isSelected(message)"
                 density="compact"
                 hide-details
diff --git a/src/components/settings/AccountsSettings.vue b/src/components/settings/AccountsSettings.vue
index 795f6a3..f703472 100644
--- a/src/components/settings/AccountsSettings.vue
+++ b/src/components/settings/AccountsSettings.vue
@@ -2,14 +2,14 @@
 import { ref, onMounted } from 'vue'
 import { useServicesStore } from '@MailManager/stores/servicesStore'
 import { AddAccountDialog, EditAccountDialog } from '@MailManager/main'
+import type { ServiceObject } from '@MailManager/models'
 
 const servicesStore = useServicesStore()
 
 // Dialog state
 const showAddDialog = ref(false)
 const showEditDialog = ref(false)
-const editServiceProvider = ref<string>('')
-const editServiceIdentifier = ref<string | number>('')
+const editService = ref<ServiceObject>()
 
 // Load services on mount
 onMounted(async () => {
@@ -22,11 +22,8 @@ const handleAddAccount = () => {
   showAddDialog.value = true
 }
 
-const handleConfigureAccount = (serviceKey: string) => {
-  // Service key is in format "provider:identifier"
-  const [provider, identifier] = serviceKey.split(':')
-  editServiceProvider.value = provider
-  editServiceIdentifier.value = identifier
+const handleConfigureAccount = (service: ServiceObject) => {
+  editService.value = service
   showEditDialog.value = true
 }
 
@@ -58,7 +55,7 @@ const handleAccountSaved = async () => {
             icon="mdi-cog"
             variant="text"
             size="small"
-            @click="handleConfigureAccount(`${service.provider}:${service.identifier}`)"
+            @click="handleConfigureAccount(service)"
           />
         </template>
       </v-list-item>
@@ -87,10 +84,10 @@ const handleAccountSaved = async () => {
 
     <!-- Edit Account Dialog -->
     <EditAccountDialog
-      v-if="editServiceProvider && editServiceIdentifier"
+      v-if="editService"
       v-model="showEditDialog"
-      :service-provider="editServiceProvider"
-      :service-identifier="editServiceIdentifier"
+      :service-provider="editService.provider"
+      :service-identifier="editService.identifier"
       @saved="handleAccountSaved"
     />
   </div>
diff --git a/src/pages/MailPage.vue b/src/pages/MailPage.vue
index 700597d..9902c33 100644
--- a/src/pages/MailPage.vue
+++ b/src/pages/MailPage.vue
@@ -5,6 +5,7 @@ import { useDisplay } from 'vuetify'
 import { useModuleStore } from '@KTXC'
 import { useMailStore } from '@/stores/mailStore'
 import type { CollectionObject, EntityObject } from '@MailManager/models'
+import type { EntityIdentifier } from '@MailManager/types/common'
 import FolderTree from '@/components/FolderTree.vue'
 import MessageList from '@/components/MessageList.vue'
 import MessageReader from '@/components/MessageReader.vue'
@@ -32,19 +33,23 @@ const {
   loading,
   selectedFolder,
   selectedMessage,
-  selectedMessageIds,
-  selectionModeActive,
+  selectionList,
+  selectionMode,
   composeMode,
   composeReplyTo,
+  currentMessages,
   moveDialogVisible,
-  selectionCount,
-  hasSelection,
-  allCurrentMessagesSelected,
+  moveDialogCandidates,
 } = storeToRefs(mailStore)
 
 // Complex store/composable objects accessed directly (not simple refs)
 const { mailSync, entitiesStore } = mailStore
 
+const lastSyncLabel = computed(() => {
+  if (!mailSync.lastSync.value) return ''
+  return `(Last: ${new Date(mailSync.lastSync.value).toLocaleTimeString()})`
+})
+
 // Initialize
 onMounted(async () => {
   if (!isMailManagerAvailable.value) return
@@ -71,23 +76,24 @@ const handleSelectAllToggle = (value: boolean) => {
 
 const handleSelectionClear = () => mailStore.deactivateSelectionMode()
 
-const handleSelectionMove = () => mailStore.openMoveDialogForSelection()
+const handleSelectionMove = () => mailStore.openMoveDialog()
 
-const handleCompose = (replyTo?: EntityObject) => mailStore.openCompose(replyTo)
+const handleSelectionDelete = () => mailStore.deleteMessages([...selectionList.value])
+
+const handleCompose = (message?: EntityObject) => mailStore.openCompose(message)
 
 const handleComposeClose = () => mailStore.closeCompose()
 
 const handleComposeSent = () => mailStore.afterSent()
 
-const handleReply = (message: EntityObject) => mailStore.openCompose(message)
-
-const handleDelete = (message: EntityObject) => mailStore.deleteMessage(message)
+const handleDelete = (message: EntityObject) => {
+  const id = `${message.provider}:${String(message.service)}:${String(message.collection)}:${String(message.identifier)}` as EntityIdentifier
+  mailStore.deleteMessages([id])
+}
 
 const handleMove = (message: EntityObject) => mailStore.openMoveDialog(message)
 
-const handleMoveConfirm = async (folder: CollectionObject) => {
-  await mailStore.moveMessages(folder)
-}
+const handleMoveConfirm = async (target: CollectionObject) => { await mailStore.moveMessages(target, moveDialogCandidates.value ?? []) }
 
 const handleMoveCancel = () => mailStore.closeMoveDialog()
 
@@ -150,7 +156,7 @@ const handleFolderCreated = (folder: CollectionObject) => mailStore.notify(`Fold
       >
         <v-icon>mdi-refresh</v-icon>
         <v-tooltip activator="parent" location="bottom">
-          Refresh {{ mailSync.lastSync ? `(Last: ${new Date(mailSync.lastSync).toLocaleTimeString()})` : '' }}
+          Refresh {{ lastSyncLabel }}
         </v-tooltip>
       </v-btn>
       
@@ -201,13 +207,10 @@ const handleFolderCreated = (folder: CollectionObject) => mailStore.notify(`Fold
           <div class="mail-list-panel">
             <MessageList
               :messages="currentMessages"
-              :selected-message="selectedMessage"
-              :selected-message-ids="selectedMessageIds"
-              :selection-mode-active="selectionModeActive"
-              :selection-count="selectionCount"
-              :has-selection="hasSelection"
-              :all-current-messages-selected="allCurrentMessagesSelected"
               :selected-collection="selectedFolder"
+              :selected-message="selectedMessage"
+              :selection-list="selectionList"
+              :selection-mode="selectionMode"
               :loading="loading"
               @open="handleMessageOpen"
               @toggle-selection="handleMessageSelectionToggle"
@@ -215,6 +218,7 @@ const handleFolderCreated = (folder: CollectionObject) => mailStore.notify(`Fold
               @toggle-select-all="handleSelectAllToggle"
               @clear-selection="handleSelectionClear"
               @move-selection="handleSelectionMove"
+              @delete-selection="handleSelectionDelete"
             />
           </div>
 
@@ -235,7 +239,6 @@ const handleFolderCreated = (folder: CollectionObject) => mailStore.notify(`Fold
               @reply="handleCompose"
               @move="handleMove"
               @delete="handleDelete"
-              @compose="handleCompose()"
             />
           </div>
         </div>
diff --git a/src/stores/mailStore.ts b/src/stores/mailStore.ts
index f1807f2..697110a 100644
--- a/src/stores/mailStore.ts
+++ b/src/stores/mailStore.ts
@@ -5,7 +5,7 @@ import { useEntitiesStore } from '@MailManager/stores/entitiesStore'
 import { useServicesStore } from '@MailManager/stores/servicesStore'
 import { useMailSync } from '@MailManager/composables/useMailSync'
 import { useSnackbar } from '@KTXC'
-import type { CollectionIdentifier, EntityIdentifier } from '@MailManager/types/common'
+import type { ServiceIdentifier, CollectionIdentifier, EntityIdentifier } from '@MailManager/types/common'
 import type { ServiceObject, CollectionObject, EntityObject } from '@MailManager/models'
 
 export const useMailStore = defineStore('mailStore', () => {
@@ -41,8 +41,8 @@ export const useMailStore = defineStore('mailStore', () => {
   // ── Selection State ───────────────────────────────────────────────────────
   const selectedFolder = shallowRef<CollectionObject | null>(null)
   const selectedMessage = shallowRef<EntityObject | null>(null)
-  const selectedMessageIds = ref<EntityIdentifier[]>([])
-  const selectionModeActive = ref(false)
+  const selectionMode = ref(false)
+  const selectionList = ref<EntityIdentifier[]>([])
 
   // ── Compose State ─────────────────────────────────────────────────────────
   const composeMode = ref(false)
@@ -50,7 +50,8 @@ export const useMailStore = defineStore('mailStore', () => {
 
   // ── Move State ────────────────────────────────────────────────────────────
   const moveDialogVisible = ref(false)
-  const moveMessageCandidates = shallowRef<EntityObject[]>([])
+  const moveDialogService = ref<ServiceIdentifier | null>(null)
+  const moveDialogCandidates = ref<EntityIdentifier[] | null>(null)
 
   // ── Computed ──────────────────────────────────────────────────────────────
   const currentMessages = computed(() => {
@@ -65,31 +66,6 @@ export const useMailStore = defineStore('mailStore', () => {
     )
   })
 
-  const selectedMessageIdSet = computed(() => new Set(selectedMessageIds.value))
-
-  const selectedMessageMap = computed(() => {
-    const messageMap = new Map<EntityIdentifier, EntityObject>()
-
-    currentMessages.value.forEach(message => {
-      const identifier = _entityIdentifier(message)
-      if (selectedMessageIdSet.value.has(identifier)) {
-        messageMap.set(identifier, message)
-      }
-    })
-
-    return messageMap
-  })
-
-  const selectedMessages = computed(() => Array.from(selectedMessageMap.value.values()))
-
-  const selectionCount = computed(() => selectedMessageIds.value.length)
-
-  const hasSelection = computed(() => selectionCount.value > 0)
-
-  const allCurrentMessagesSelected = computed(() => {
-    return currentMessages.value.length > 0 && currentMessages.value.every(message => isMessageSelected(message))
-  })
-
   // ── Initialization ────────────────────────────────────────────────────────
 
   async function initialize() {
@@ -162,36 +138,36 @@ export const useMailStore = defineStore('mailStore', () => {
 
   // ── Helpers ──────────────────────────────────────────────────────────
 
-  function _serviceKey(provider: string, service: string | number) {
-    return `${provider}:${String(service)}`
+  function _serviceIdentifier(item: ServiceObject | CollectionObject | EntityObject | { provider: string, service: string | number }): ServiceIdentifier {
+    return `${item.provider}:${String(item.service)}` as ServiceIdentifier
   }
 
-  function _collectionIdentifier(collection: CollectionObject): CollectionIdentifier {
-    return `${collection.provider}:${String(collection.service)}:${String(collection.identifier)}` as CollectionIdentifier
+  function _collectionIdentifier(item: CollectionObject | EntityObject): CollectionIdentifier {
+    return `${item.provider}:${String(item.service)}:${String(item.identifier)}` as CollectionIdentifier
   }
 
-  function _entityIdentifier(entity: EntityObject): EntityIdentifier {
-    return `${entity.provider}:${String(entity.service)}:${String(entity.collection)}:${String(entity.identifier)}` as EntityIdentifier
+  function _entityIdentifier(item: EntityObject): EntityIdentifier {
+    return `${item.provider}:${String(item.service)}:${String(item.collection)}:${String(item.identifier)}` as EntityIdentifier
   }
 
   function _setServiceFolderLoading(provider: string, service: string | number, loadingState: boolean) {
     serviceFolderLoadingState.value = {
       ...serviceFolderLoadingState.value,
-      [_serviceKey(provider, service)]: loadingState,
+      [_serviceIdentifier({ provider, service })]: loadingState,
     }
   }
 
   function _setServiceFolderLoaded(provider: string, service: string | number, loaded: boolean) {
     serviceFolderLoadedState.value = {
       ...serviceFolderLoadedState.value,
-      [_serviceKey(provider, service)]: loaded,
+      [_serviceIdentifier({ provider, service })]: loaded,
     }
   }
 
   function _setServiceFolderError(provider: string, service: string | number, error: string | null) {
     serviceFolderErrorState.value = {
       ...serviceFolderErrorState.value,
-      [_serviceKey(provider, service)]: error,
+      [_serviceIdentifier({ provider, service })]: error,
     }
   }
 
@@ -231,22 +207,15 @@ export const useMailStore = defineStore('mailStore', () => {
   }
 
   function isServiceFolderLoading(provider: string, service: string | number) {
-    return serviceFolderLoadingState.value[_serviceKey(provider, service)] === true
+    return serviceFolderLoadingState.value[_serviceIdentifier({ provider, service })] === true
   }
 
   function hasServiceFoldersLoaded(provider: string, service: string | number) {
-    return serviceFolderLoadedState.value[_serviceKey(provider, service)] === true
+    return serviceFolderLoadedState.value[_serviceIdentifier({ provider, service })] === true
   }
 
   function getServiceFolderError(provider: string, service: string | number) {
-    return serviceFolderErrorState.value[_serviceKey(provider, service)] ?? null
-  }
-
-  function _serviceFor(provider: string, serviceIdentifier: string | number) {
-    return servicesStore.services.find(service =>
-      service.provider === provider &&
-      String(service.identifier) === String(serviceIdentifier),
-    ) ?? null
+    return serviceFolderErrorState.value[_serviceIdentifier({ provider, service })] ?? null
   }
 
   function _reloadFolderMessages(folder: CollectionObject) {
@@ -259,17 +228,12 @@ export const useMailStore = defineStore('mailStore', () => {
     })
   }
 
-  function _setSelectedMessageIds(nextIds: EntityIdentifier[]) {
-    selectedMessageIds.value = Array.from(new Set(nextIds))
-  }
+  function _setSelectionList(nextIds: EntityIdentifier[]) {
+    selectionList.value = Array.from(new Set(nextIds))
 
-  function _removeSelection(sourceIdentifiers: EntityIdentifier[]) {
-    if (sourceIdentifiers.length === 0 || selectedMessageIds.value.length === 0) {
-      return
+    if (selectionList.value.length === 0) {
+      selectionMode.value = false
     }
-
-    const removedIds = new Set(sourceIdentifiers)
-    selectedMessageIds.value = selectedMessageIds.value.filter(identifier => !removedIds.has(identifier))
   }
 
   function _reconcileSelection() {
@@ -280,10 +244,10 @@ export const useMailStore = defineStore('mailStore', () => {
     }
 
     const currentMessageIdentifiers = new Set(currentMessages.value.map(message => _entityIdentifier(message)))
-    const nextSelectedIds = selectedMessageIds.value.filter(identifier => currentMessageIdentifiers.has(identifier))
+    const nextSelectedIds = selectionList.value.filter(identifier => currentMessageIdentifiers.has(identifier))
 
-    if (nextSelectedIds.length !== selectedMessageIds.value.length) {
-      selectedMessageIds.value = nextSelectedIds
+    if (nextSelectedIds.length !== selectionList.value.length) {
+      _setSelectionList(nextSelectedIds)
     }
 
     if (selectedMessage.value && !currentMessageIdentifiers.has(_entityIdentifier(selectedMessage.value))) {
@@ -321,7 +285,7 @@ export const useMailStore = defineStore('mailStore', () => {
     selectedFolder.value = folder
     selectedMessage.value = null
     clearSelection()
-    selectionModeActive.value = false
+    selectionMode.value = false
     composeMode.value = false
 
     try {
@@ -347,82 +311,7 @@ export const useMailStore = defineStore('mailStore', () => {
     composeReplyTo.value = replyTo ?? null
     selectedMessage.value = null
   }
-
-  function isMessageSelected(message: EntityObject) {
-    return selectedMessageIdSet.value.has(_entityIdentifier(message))
-  }
-
-  function toggleMessageSelection(message: EntityObject) {
-    const identifier = _entityIdentifier(message)
-
-    selectionModeActive.value = true
-
-    if (selectedMessageIdSet.value.has(identifier)) {
-      selectedMessageIds.value = selectedMessageIds.value.filter(selectedId => selectedId !== identifier)
-
-      if (selectedMessageIds.value.length === 0) {
-        selectionModeActive.value = false
-      }
-
-      return
-    }
-
-    _setSelectedMessageIds([...selectedMessageIds.value, identifier])
-  }
-
-  function selectAllCurrentMessages() {
-    selectionModeActive.value = true
-    _setSelectedMessageIds(currentMessages.value.map(message => _entityIdentifier(message)))
-  }
-
-  function activateSelectionMode(message?: EntityObject) {
-    selectionModeActive.value = true
-
-    if (message) {
-      const identifier = _entityIdentifier(message)
-
-      if (!selectedMessageIdSet.value.has(identifier)) {
-        _setSelectedMessageIds([...selectedMessageIds.value, identifier])
-      }
-    }
-  }
-
-  function deactivateSelectionMode() {
-    selectionModeActive.value = false
-    clearSelection()
-  }
-
-  function clearSelection() {
-    selectedMessageIds.value = []
-  }
-
-  function openMoveDialog(messages: EntityObject | EntityObject[]) {
-    const nextCandidates = Array.isArray(messages) ? messages : [messages]
-
-    moveMessageCandidates.value = Array.from(
-      new Map(nextCandidates.map(candidate => [_entityIdentifier(candidate), candidate])).values(),
-    )
-
-    if (moveMessageCandidates.value.length === 0) {
-      return
-    }
-
-    moveDialogVisible.value = true
-  }
-
-  function openMoveDialogForSelection() {
-    if (selectedMessages.value.length === 0) {
-      return
-    }
-
-    openMoveDialog(selectedMessages.value)
-  }
-
-  function closeMoveDialog() {
-    moveDialogVisible.value = false
-    moveMessageCandidates.value = []
-  }
-
+  
   function closeCompose() {
     composeMode.value = false
     composeReplyTo.value = null
@@ -438,20 +327,91 @@ export const useMailStore = defineStore('mailStore', () => {
     }
   }
 
-  async function moveMessages(targetFolder: CollectionObject) {
-    const candidates = moveMessageCandidates.value
+  function isMessageSelected(message: EntityObject) {
+    return selectionList.value.includes(_entityIdentifier(message))
+  }
+
+  function toggleMessageSelection(message: EntityObject) {
+    const identifier = _entityIdentifier(message)
+
+    selectionMode.value = true
+
+    if (selectionList.value.includes(identifier)) {
+      _setSelectionList(selectionList.value.filter(selectedId => selectedId !== identifier))
 
-    if (candidates.length === 0) {
       return
     }
 
-    const movableCandidates = candidates.filter(message => !(
-      targetFolder.provider === message.provider &&
-      String(targetFolder.service) === String(message.service) &&
-      String(targetFolder.identifier) === String(message.collection)
-    ))
+    _setSelectionList([...selectionList.value, identifier])
+  }
 
-    if (movableCandidates.length === 0) {
+  function selectAllCurrentMessages() {
+    selectionMode.value = true
+    _setSelectionList(currentMessages.value.map(message => _entityIdentifier(message)))
+  }
+
+  function activateSelectionMode(message?: EntityObject) {
+    selectionMode.value = true
+
+    if (message) {
+      const identifier = _entityIdentifier(message)
+
+      if (!selectionList.value.includes(identifier)) {
+        _setSelectionList([...selectionList.value, identifier])
+      }
+    }
+  }
+
+  function deactivateSelectionMode() {
+    selectionMode.value = false
+    clearSelection()
+  }
+
+  function clearSelection() {
+    _setSelectionList([])
+  }
+
+  function openMoveDialog(entities?: EntityObject | EntityObject[]) {
+    
+    moveDialogCandidates.value = []
+    
+    if (entities) {
+      if (Array.isArray(entities)) {
+        moveDialogCandidates.value = entities.map(entity => _entityIdentifier(entity))
+        moveDialogService.value = _serviceIdentifier(entities[0])
+      } else {
+        moveDialogCandidates.value = [_entityIdentifier(entities)]
+        moveDialogService.value = _serviceIdentifier(entities)
+      }
+    } else {
+      moveDialogCandidates.value = selectionList.value
+      moveDialogService.value = _serviceIdentifier(selectedFolder.value)
+    }
+
+    moveDialogVisible.value = true
+  }
+
+  function closeMoveDialog() {
+    moveDialogVisible.value = false
+    moveDialogService.value = null
+    moveDialogCandidates.value = null
+  }
+
+  async function moveMessages(target: CollectionObject, entityIdentifiers: EntityIdentifier[]) {
+    const movableIdentifiers = entityIdentifiers.filter(identifier => {
+      const entity = entitiesStore.entityByIdentifier(identifier)
+
+      if (!entity) {
+        return false
+      }
+
+      // Only allow moving messages within the same service and disallow moving into the same folder
+      return entity.provider === target.provider &&
+        String(entity.service) === String(target.service) &&
+        String(entity.collection) !== String(target.identifier)
+    })
+
+    if (movableIdentifiers.length === 0) {
       closeMoveDialog()
       return
     }
@@ -459,55 +419,31 @@ export const useMailStore = defineStore('mailStore', () => {
     loading.value = true
 
     try {
-      const sourceIdentifiers = movableCandidates.map(message => _entityIdentifier(message))
-      const response = await entitiesStore.move(_collectionIdentifier(targetFolder), sourceIdentifiers)
-      const successfulMoves: EntityIdentifier[] = []
-      const failedMoves: string[] = []
+      const response = await entitiesStore.move(_collectionIdentifier(target), movableIdentifiers)
+      const operationSucceeded: EntityIdentifier[] = []
+      const operationFailures: EntityIdentifier[] = []
 
       Object.entries(response).forEach(([sourceIdentifier, result]) => {
         if (result.success) {
-          successfulMoves.push(sourceIdentifier as EntityIdentifier)
+          operationSucceeded.push(sourceIdentifier as EntityIdentifier)
           return
         }
 
-        failedMoves.push(result.error)
+        operationFailures.push(sourceIdentifier as EntityIdentifier)
       })
 
-      if (successfulMoves.length === 0) {
-        throw new Error(failedMoves[0] ?? 'Failed to move messages')
+      if (operationSucceeded.length === 0) {
+        throw new Error(operationFailures[0] ?? 'Failed to move messages')
       }
 
-      _removeSelection(successfulMoves)
-
-      if (selectedMessage.value && successfulMoves.includes(_entityIdentifier(selectedMessage.value))) {
+      if (selectedMessage.value && operationSucceeded.includes(_entityIdentifier(selectedMessage.value))) {
         selectedMessage.value = null
       }
 
-      if (selectedMessageIds.value.length === 0) {
-        selectionModeActive.value = false
-      }
-
+      clearSelection()
       closeMoveDialog()
 
-      const servicesToRefresh = new Map<string, ServiceObject>()
-      movableCandidates.forEach(message => {
-        const service = _serviceFor(message.provider, message.service)
-        if (service && service.identifier !== null) {
-          servicesToRefresh.set(`${service.provider}:${String(service.identifier)}`, service)
-        }
-      })
-
-      const targetService = _serviceFor(targetFolder.provider, targetFolder.service)
-      if (targetService && targetService.identifier !== null) {
-        servicesToRefresh.set(`${targetService.provider}:${String(targetService.identifier)}`, targetService)
-      }
-
-      await Promise.allSettled([
-        ...Array.from(servicesToRefresh.values()).map(service => loadFoldersForService(service)),
-        ...(selectedFolder.value ? [_reloadFolderMessages(selectedFolder.value)] : []),
-      ])
-
-      const notification = _formatMoveNotification(successfulMoves.length, failedMoves.length, targetFolder)
+      const notification = _formatMoveNotification(operationSucceeded.length, operationFailures.length, target)
       notify(notification.message, notification.color)
     } catch (error) {
       const messageText = error instanceof Error ? error.message : 'Failed to move messages'
@@ -519,9 +455,61 @@ export const useMailStore = defineStore('mailStore', () => {
     }
   }
 
-  async function deleteMessage(message: EntityObject) {
-    // TODO: implement delete via entity / collection store
-    console.log('[Mail] Delete message:', message.identifier)
+  async function deleteMessages(entityIdentifiers: EntityIdentifier[]) {
+    if (entityIdentifiers.length === 0) {
+      return
+    }
+
+    loading.value = true
+
+    try {
+      const response = await entitiesStore.delete(entityIdentifiers)
+      const operationSucceeded: EntityIdentifier[] = []
+      const operationFailures: EntityIdentifier[] = []
+
+      Object.entries(response).forEach(([sourceIdentifier, result]) => {
+        if (result.success) {
+          operationSucceeded.push(sourceIdentifier as EntityIdentifier)
+          return
+        }
+
+        operationFailures.push(sourceIdentifier as EntityIdentifier)
+      })
+
+      if (operationSucceeded.length === 0) {
+        throw new Error(operationFailures[0] ?? 'Failed to delete messages')
+      }
+
+      if (selectedMessage.value && operationSucceeded.includes(_entityIdentifier(selectedMessage.value))) {
+        selectedMessage.value = null
+      }
+
+      clearSelection()
+
+      const successCount = operationSucceeded.length
+      const failureCount = operationFailures.length
+
+      if (failureCount === 0) {
+        notify(
+          successCount === 1 ? 'Message deleted' : `${successCount} messages deleted`,
+          'success',
+        )
+      } else {
+        notify(
+          successCount === 0
+            ? `Delete failed for ${failureCount === 1 ? '1 message' : `${failureCount} messages`}`
+            : `Deleted ${successCount} ${successCount === 1 ? 'message' : 'messages'}. ${failureCount} failed.`,
+          successCount === 0 ? 'error' : 'warning',
+        )
+      }
+    } catch (error) {
+      const messageText = error instanceof Error ? error.message : 'Failed to delete messages'
+      console.error('[Mail] Failed to delete messages:', error)
+      notify(messageText, 'error')
+      throw error
+    } finally {
+      loading.value = false
+    }
   }
 
   function toggleSidebar() {
@@ -551,23 +539,19 @@ export const useMailStore = defineStore('mailStore', () => {
     loading,
     selectedFolder,
     selectedMessage,
-    selectedMessageIds,
-    selectionModeActive,
+    selectionList,
+    selectionMode,
     composeMode,
     composeReplyTo,
     moveDialogVisible,
-    moveMessageCandidates,
+    moveDialogService,
+    moveDialogCandidates,
     serviceFolderLoadingState,
     serviceFolderLoadedState,
     serviceFolderErrorState,
 
     // Computed
     currentMessages,
-    selectedMessageMap,
-    selectedMessages,
-    selectionCount,
-    hasSelection,
-    allCurrentMessagesSelected,
 
     // Actions
     selectFolder,
@@ -580,11 +564,10 @@ export const useMailStore = defineStore('mailStore', () => {
     clearSelection,
     openCompose,
     openMoveDialog,
-    openMoveDialogForSelection,
     closeMoveDialog,
     closeCompose,
     afterSent,
-    deleteMessage,
+    deleteMessages,
     moveMessages,
     toggleSidebar,
     openSettings,