From 0f948f0930fbcd5ebd3f1e0f984c5a4c60b6a56a Mon Sep 17 00:00:00 2001
From: Copilot <198982749+Copilot@users.noreply.github.com>
Date: Sun, 8 Feb 2026 10:00:23 +0200
Subject: [PATCH 1/8] Optimistically remove threads from list view when
 deletion/move tasks are queued (#2)

* feat: optimistically remove threads from list view when deletion/move tasks are queued

Co-authored-by: csfercoci <3026315+csfercoci@users.noreply.github.com>

* Merge branch 'master' into copilot/fix-message-deletion-ui
---
 .../models/query-subscription-pool-spec.ts    | 64 +++++++++++++++++++
 app/spec/models/query-subscription-spec.ts    | 45 ++++++++++++-
 .../flux/models/query-subscription-pool.ts    | 53 +++++++++++++++
 app/src/flux/models/query-subscription.ts     | 27 ++++++--
 4 files changed, 181 insertions(+), 8 deletions(-)

diff --git a/app/spec/models/query-subscription-pool-spec.ts b/app/spec/models/query-subscription-pool-spec.ts
index f4561ed2df..c1a61342e9 100644
--- a/app/spec/models/query-subscription-pool-spec.ts
+++ b/app/spec/models/query-subscription-pool-spec.ts
@@ -1,6 +1,10 @@
 import QuerySubscriptionPool from '../../src/flux/models/query-subscription-pool';
 import DatabaseStore from '../../src/flux/stores/database-store';
 import { Label } from '../../src/flux/models/label';
+import { Thread } from '../../src/flux/models/thread';
+import { Folder } from '../../src/flux/models/folder';
+import { ChangeFolderTask } from '../../src/flux/tasks/change-folder-task';
+import { ChangeLabelsTask } from '../../src/flux/tasks/change-labels-task';
 
 describe('QuerySubscriptionPool', function QuerySubscriptionPoolSpecs() {
   beforeEach(() => {
@@ -57,4 +61,64 @@ describe('QuerySubscriptionPool', function QuerySubscriptionPoolSpecs() {
       });
     });
   });
+
+  describe('_threadIdsForRemovalTask', () => {
+    it('should return threadIds for a ChangeFolderTask', () => {
+      const threads = [
+        new Thread({ id: 't1', accountId: 'a1', folders: [new Folder({ id: 'f1' })] }),
+      ];
+      const task = new ChangeFolderTask({
+        threads,
+        folder: new Folder({ id: 'trash-folder', role: 'trash', accountId: 'a1' }),
+      });
+      const result = QuerySubscriptionPool._threadIdsForRemovalTask(task);
+      expect(result).toEqual(['t1']);
+    });
+
+    it('should return threadIds for a ChangeLabelsTask with only removals', () => {
+      const task = new ChangeLabelsTask({
+        threads: [new Thread({ id: 't2', accountId: 'a1' })],
+        labelsToRemove: [new Label({ id: 'inbox', role: 'inbox', accountId: 'a1' })],
+        labelsToAdd: [],
+      });
+      const result = QuerySubscriptionPool._threadIdsForRemovalTask(task);
+      expect(result).toEqual(['t2']);
+    });
+
+    it('should return null for a ChangeLabelsTask with additions', () => {
+      const task = new ChangeLabelsTask({
+        threads: [new Thread({ id: 't3', accountId: 'a1' })],
+        labelsToRemove: [new Label({ id: 'inbox', role: 'inbox', accountId: 'a1' })],
+        labelsToAdd: [new Label({ id: 'archive', role: 'all', accountId: 'a1' })],
+      });
+      const result = QuerySubscriptionPool._threadIdsForRemovalTask(task);
+      expect(result).toBeNull();
+    });
+  });
+
+  describe('_optimisticallyRemoveThreads', () => {
+    it('should call optimisticallyRemoveItemsById on Thread subscriptions', () => {
+      const threadQuery = DatabaseStore.findAll<Thread>(Thread);
+      const threadKey = threadQuery.sql();
+      const callback = jasmine.createSpy('callback');
+      QuerySubscriptionPool.add(threadQuery, callback);
+      const subscription = QuerySubscriptionPool._subscriptions[threadKey];
+      spyOn(subscription, 'optimisticallyRemoveItemsById');
+
+      QuerySubscriptionPool._optimisticallyRemoveThreads(['t1', 't2']);
+      expect(subscription.optimisticallyRemoveItemsById).toHaveBeenCalledWith(['t1', 't2']);
+    });
+
+    it('should not call optimisticallyRemoveItemsById on non-Thread subscriptions', () => {
+      const labelQuery = DatabaseStore.findAll<Label>(Label);
+      const labelKey = labelQuery.sql();
+      const callback = jasmine.createSpy('callback');
+      QuerySubscriptionPool.add(labelQuery, callback);
+      const subscription = QuerySubscriptionPool._subscriptions[labelKey];
+      spyOn(subscription, 'optimisticallyRemoveItemsById');
+
+      QuerySubscriptionPool._optimisticallyRemoveThreads(['t1']);
+      expect(subscription.optimisticallyRemoveItemsById).not.toHaveBeenCalled();
+    });
+  });
 });
diff --git a/app/spec/models/query-subscription-spec.ts b/app/spec/models/query-subscription-spec.ts
index 0d492f6723..440bec4892 100644
--- a/app/spec/models/query-subscription-spec.ts
+++ b/app/spec/models/query-subscription-spec.ts
@@ -35,7 +35,7 @@ describe('QuerySubscription', function QuerySubscriptionSpecs() {
       describe('when initialModels are provided', () =>
         it('should apply the models and trigger', () => {
           const query = DatabaseStore.findAll<Thread>(Thread);
-          const threads = [1, 2, 3, 4, 5].map(i => new Thread({ id: i }));
+          const threads = [1, 2, 3, 4, 5].map((i) => new Thread({ id: i }));
           const subscription = new QuerySubscription(query, { initialModels: threads });
           expect(subscription._set).not.toBe(null);
         }));
@@ -222,8 +222,8 @@ describe('QuerySubscription', function QuerySubscriptionSpecs() {
     jasmine.unspy(Utils, 'generateTempId');
 
     describe('scenarios', () =>
-      scenarios.forEach(scenario => {
-        scenario.tests.forEach(test => {
+      scenarios.forEach((scenario) => {
+        scenario.tests.forEach((test) => {
           it(`with ${scenario.name}, should correctly apply ${test.name}`, () => {
             const subscription = new QuerySubscription(scenario.query);
             subscription._set = new MutableQueryResultSet();
@@ -348,4 +348,43 @@ describe('QuerySubscription', function QuerySubscriptionSpecs() {
       });
     });
   });
+
+  describe('optimisticallyRemoveItemsById', () => {
+    it('should remove items from the set and trigger callbacks', () => {
+      const query = DatabaseStore.findAll<Thread>(Thread);
+      const threads = [1, 2, 3, 4, 5].map((i) => new Thread({ id: `${i}` }));
+      const subscription = new QuerySubscription(query, { initialModels: threads });
+
+      spyOn(subscription, '_createResultAndTrigger');
+      subscription.optimisticallyRemoveItemsById(['2', '4']);
+
+      expect(subscription._set.offsetOfId('2')).toBe(-1);
+      expect(subscription._set.offsetOfId('4')).toBe(-1);
+      expect(subscription._set.ids().length).toBe(3);
+      expect(subscription._createResultAndTrigger).toHaveBeenCalled();
+    });
+
+    it('should not trigger if no items were in the set', () => {
+      const query = DatabaseStore.findAll<Thread>(Thread);
+      const threads = [1, 2, 3].map((i) => new Thread({ id: `${i}` }));
+      const subscription = new QuerySubscription(query, { initialModels: threads });
+
+      spyOn(subscription, '_createResultAndTrigger');
+      subscription.optimisticallyRemoveItemsById(['99', '100']);
+
+      expect(subscription._set.ids().length).toBe(3);
+      expect(subscription._createResultAndTrigger).not.toHaveBeenCalled();
+    });
+
+    it('should do nothing if _set is null', () => {
+      spyOn(QuerySubscription.prototype, 'update').andReturn();
+      const query = DatabaseStore.findAll<Thread>(Thread);
+      const subscription = new QuerySubscription(query);
+      subscription._set = null;
+
+      expect(() => {
+        subscription.optimisticallyRemoveItemsById(['1', '2']);
+      }).not.toThrow();
+    });
+  });
 });
diff --git a/app/src/flux/models/query-subscription-pool.ts b/app/src/flux/models/query-subscription-pool.ts
index 9b8861de40..55a0e70a93 100644
--- a/app/src/flux/models/query-subscription-pool.ts
+++ b/app/src/flux/models/query-subscription-pool.ts
@@ -3,6 +3,7 @@ import { QuerySubscription } from './query-subscription';
 import { DatabaseChangeRecord } from '../stores/database-change-record';
 import ModelQuery from './query';
 import { Model } from './model';
+import * as Actions from '../actions';
 let DatabaseStore = null;
 
 /*
@@ -105,6 +106,8 @@ class QuerySubscriptionPool {
   _setup() {
     DatabaseStore = DatabaseStore || require('../stores/database-store').default;
     DatabaseStore.listen(this._onChange);
+    Actions.queueTask.listen(this._onQueueTask);
+    Actions.queueTasks.listen(this._onQueueTasks);
   }
 
   _onChange = (record: DatabaseChangeRecord<Model>) => {
@@ -113,6 +116,56 @@ class QuerySubscriptionPool {
       subscription.applyChangeRecord(record);
     }
   };
+
+  _onQueueTask = (task) => {
+    const threadIds = this._threadIdsForRemovalTask(task);
+    if (threadIds && threadIds.length > 0) {
+      this._optimisticallyRemoveThreads(threadIds);
+    }
+  };
+
+  _onQueueTasks = (tasks) => {
+    if (!tasks || !tasks.length) return;
+    const allIds: string[] = [];
+    for (const task of tasks) {
+      const ids = this._threadIdsForRemovalTask(task);
+      if (ids) {
+        allIds.push(...ids);
+      }
+    }
+    if (allIds.length > 0) {
+      this._optimisticallyRemoveThreads(allIds);
+    }
+  };
+
+  _threadIdsForRemovalTask(task): string[] | null {
+    const ChangeFolderTask = require('../tasks/change-folder-task').ChangeFolderTask;
+    const ChangeLabelsTask = require('../tasks/change-labels-task').ChangeLabelsTask;
+
+    if (task instanceof ChangeFolderTask && task.threadIds && task.threadIds.length > 0) {
+      return task.threadIds;
+    }
+    if (
+      task instanceof ChangeLabelsTask &&
+      task.threadIds &&
+      task.threadIds.length > 0 &&
+      task.labelsToRemove &&
+      task.labelsToRemove.length > 0 &&
+      (!task.labelsToAdd || task.labelsToAdd.length === 0)
+    ) {
+      return task.threadIds;
+    }
+    return null;
+  }
+
+  _optimisticallyRemoveThreads(threadIds: string[]) {
+    for (const key of Object.keys(this._subscriptions)) {
+      const subscription = this._subscriptions[key];
+      if (subscription._query && subscription._query.objectClass() === 'Thread') {
+        subscription.optimisticallyRemoveItemsById(threadIds);
+      }
+    }
+  }
 }
 
 const pool = new QuerySubscriptionPool();
diff --git a/app/src/flux/models/query-subscription.ts b/app/src/flux/models/query-subscription.ts
index e55447a259..5059be612e 100644
--- a/app/src/flux/models/query-subscription.ts
+++ b/app/src/flux/models/query-subscription.ts
@@ -77,7 +77,7 @@ export class QuerySubscription<T extends Model> {
         `QuerySubscription:removeCallback - expects a function, received ${callback}`
       );
     }
-    this._callbacks = this._callbacks.filter(c => c !== callback);
+    this._callbacks = this._callbacks.filter((c) => c !== callback);
     if (this.callbackCount() === 0) {
       this.onLastCallbackRemoved();
     }
@@ -121,7 +121,7 @@ export class QuerySubscription<T extends Model> {
     let knownImpacts = 0;
     let unknownImpacts = 0;
 
-    this._queuedChangeRecords.forEach(record => {
+    this._queuedChangeRecords.forEach((record) => {
       if (record.type === 'unpersist') {
         for (const item of record.objects) {
           const offset = this._set.offsetOfId(item.id);
@@ -248,7 +248,7 @@ export class QuerySubscription<T extends Model> {
       rangeQuery.background();
     }
 
-    DatabaseStore.run<T[] | string[]>(rangeQuery, { format: false }).then(async results => {
+    DatabaseStore.run<T[] | string[]>(rangeQuery, { format: false }).then(async (results) => {
       if (this._queryVersion !== version) {
         return;
       }
@@ -279,13 +279,30 @@ export class QuerySubscription<T extends Model> {
   }
 
   async _fetchMissingModels() {
-    const missingIds = this._set.ids().filter(id => !this._set.modelWithId(id));
+    const missingIds = this._set.ids().filter((id) => !this._set.modelWithId(id));
     if (missingIds.length === 0) {
       return [];
     }
     return DatabaseStore.findAll<T>(this._query._klass, { id: missingIds });
   }
 
+  optimisticallyRemoveItemsById = (ids: string[]) => {
+    if (!this._set) {
+      return;
+    }
+    let removed = 0;
+    for (const id of ids) {
+      const offset = this._set.offsetOfId(id);
+      if (offset !== -1) {
+        this._set.removeModelAtOffset({ id } as T, offset);
+        removed += 1;
+      }
+    }
+    if (removed > 0) {
+      this._createResultAndTrigger();
+    }
+  };
+
   _createResultAndTrigger() {
     const allCompleteModels = this._set.isComplete();
 
@@ -319,7 +336,7 @@ export class QuerySubscription<T extends Model> {
       this._lastResult = this._query.formatResult(models) as QuerySubscriptionResult<T>;
     }
 
-    this._callbacks.forEach(callback => callback(this._lastResult));
+    this._callbacks.forEach((callback) => callback(this._lastResult));
 
     // process any additional change records that have arrived
     if (this._updateInFlight) {

From d69c253e8a11c16bc6f4f241fd519af46afd586e Mon Sep 17 00:00:00 2001
From: csfercoci <cristian_sfercoci@yahoo.com>
Date: Sat, 14 Feb 2026 11:49:53 +0100
Subject: [PATCH 2/8] Update mailsync submodule to TLS Gmail SNI fixes

---
 mailsync | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mailsync b/mailsync
index 9969b9770b..936002e513 160000
--- a/mailsync
+++ b/mailsync
@@ -1 +1 @@
-Subproject commit 9969b9770b01c4509294ec5639a07f4254cb3949
+Subproject commit 936002e513b5cef95c2c852f46b5e3614b3a5194

From 6fff5149eaa91e42821a60cf194458bd60d7f339 Mon Sep 17 00:00:00 2001
From: csfercoci <cristian_sfercoci@yahoo.com>
Date: Sat, 14 Feb 2026 11:52:12 +0100
Subject: [PATCH 3/8] Point mailsync submodule to origin/master

---
 mailsync | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mailsync b/mailsync
index 936002e513..b7d0a7e028 160000
--- a/mailsync
+++ b/mailsync
@@ -1 +1 @@
-Subproject commit 936002e513b5cef95c2c852f46b5e3614b3a5194
+Subproject commit b7d0a7e0284355c215811812f7e83596eed3fca8

From 690486bbb8758a1ea282d731889352a794d3554d Mon Sep 17 00:00:00 2001
From: csfercoci <cristian_sfercoci@yahoo.com>
Date: Sat, 14 Feb 2026 12:29:02 +0100
Subject: [PATCH 4/8] Update mailsync submodule to merged TLS Gmail integration

---
 mailsync | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mailsync b/mailsync
index b7d0a7e028..c8d34e9e3f 160000
--- a/mailsync
+++ b/mailsync
@@ -1 +1 @@
-Subproject commit b7d0a7e0284355c215811812f7e83596eed3fca8
+Subproject commit c8d34e9e3ffb4cd204853b2169ee49b7a21a4cc9

From c3dd90307a8be16688efcf025ebb2847af16dd9b Mon Sep 17 00:00:00 2001
From: csfercoci <cristian_sfercoci@yahoo.com>
Date: Sat, 14 Feb 2026 12:31:16 +0100
Subject: [PATCH 5/8] Update mailsync submodule to merged TLS and test fixes

---
 mailsync | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mailsync b/mailsync
index c8d34e9e3f..fb6bbe4536 160000
--- a/mailsync
+++ b/mailsync
@@ -1 +1 @@
-Subproject commit c8d34e9e3ffb4cd204853b2169ee49b7a21a4cc9
+Subproject commit fb6bbe45363a5c7d0eda5051995cb8aa7cab36cf

From 483da652bc9d0b6861c5d361aa3dc486c2127db0 Mon Sep 17 00:00:00 2001
From: csfercoci <cristian_sfercoci@yahoo.com>
Date: Sat, 14 Feb 2026 13:29:30 +0100
Subject: [PATCH 6/8] Fix delete handling in search and scope optimistic thread
 removal

---
 .../thread-list/lib/thread-list.tsx           | 35 +++++--
 .../lib/thread-toolbar-buttons.tsx            | 29 +++++-
 .../lib/search-mailbox-perspective.tsx        | 33 +------
 app/keymaps/base.json                         |  2 +-
 .../models/query-subscription-pool-spec.ts    | 96 +++++++++++++++----
 .../flux/models/query-subscription-pool.ts    | 91 ++++++++++++++----
 app/src/flux/models/query-subscription.ts     | 14 ++-
 7 files changed, 228 insertions(+), 72 deletions(-)

diff --git a/app/internal_packages/thread-list/lib/thread-list.tsx b/app/internal_packages/thread-list/lib/thread-list.tsx
index c459856cf6..9f53b1d1f2 100644
--- a/app/internal_packages/thread-list/lib/thread-list.tsx
+++ b/app/internal_packages/thread-list/lib/thread-list.tsx
@@ -64,6 +64,7 @@ class ThreadList extends React.Component<
       })
     );
     window.addEventListener('resize', this._onResize, true);
+    window.addEventListener('keydown', this._onGlobalDeleteKeyDown, true);
     ReactDOM.findDOMNode(this).addEventListener('contextmenu', this._onShowContextMenu);
     this._onResize();
   }
@@ -75,6 +76,7 @@ class ThreadList extends React.Component<
   componentWillUnmount() {
     this.unsub();
     window.removeEventListener('resize', this._onResize, true);
+    window.removeEventListener('keydown', this._onGlobalDeleteKeyDown, true);
     ReactDOM.findDOMNode(this).removeEventListener('contextmenu', this._onShowContextMenu);
   }
 
@@ -161,15 +163,15 @@ class ThreadList extends React.Component<
         task instanceof ChangeStarredTask
           ? 'unstar'
           : task instanceof ChangeFolderTask
-          ? task.folder.name
-          : task instanceof ChangeLabelsTask
-          ? 'archive'
-          : 'remove';
+            ? task.folder.name
+            : task instanceof ChangeLabelsTask
+              ? 'archive'
+              : 'remove';
 
       return `swipe-${name}`;
     };
 
-    props.onSwipeRight = function(callback) {
+    props.onSwipeRight = function (callback) {
       const perspective = FocusedPerspectiveStore.current();
       const tasks = perspective.tasksForRemovingItems([item], 'Swipe');
       if (tasks.length === 0) {
@@ -237,7 +239,27 @@ class ThreadList extends React.Component<
     event.dataTransfer.setData(`mailspring-accounts=${data.accountIds.join(',')}`, '1');
   };
 
-  _onDragEnd = event => {};
+  _onDragEnd = event => { };
+
+  _onGlobalDeleteKeyDown = (event: KeyboardEvent) => {
+    const key = (event.key || '').toLowerCase();
+    const isDelete = key === 'delete' || key === 'del';
+    if (!isDelete) {
+      return;
+    }
+    if (event.altKey || event.ctrlKey || event.metaKey || event.shiftKey) {
+      return;
+    }
+
+    const items = this._threadsForKeyboardAction();
+    if (!items || items.length === 0) {
+      return;
+    }
+
+    event.preventDefault();
+    event.stopPropagation();
+    AppEnv.commands.dispatch('core:remove-from-view');
+  };
 
   _onResize = (event?: any) => {
     const narrowStyleWidth = DOMUtils.getWorkspaceCssNumberProperty(
@@ -309,6 +331,7 @@ class ThreadList extends React.Component<
     );
     Actions.popSheet();
   };
+
 }
 
 export default ThreadList;
diff --git a/app/internal_packages/thread-list/lib/thread-toolbar-buttons.tsx b/app/internal_packages/thread-list/lib/thread-toolbar-buttons.tsx
index 086e7eac21..3bc2df9b1e 100644
--- a/app/internal_packages/thread-list/lib/thread-toolbar-buttons.tsx
+++ b/app/internal_packages/thread-list/lib/thread-toolbar-buttons.tsx
@@ -102,6 +102,28 @@ export class TrashButton extends React.Component<{ items: Thread[] }> {
 class HiddenGenericRemoveButton extends React.Component<{ items: Thread[] }> {
   static displayName = 'HiddenGenericRemoveButton';
 
+  _itemsForRemove = () => {
+    if (this.props.items && this.props.items.length > 0) {
+      return this.props.items;
+    }
+
+    const dataSource = ThreadListStore.dataSource();
+    if (!dataSource) {
+      return [];
+    }
+
+    const focused = FocusedContentStore.focused('thread') as Thread;
+    if (focused) {
+      return [focused];
+    }
+
+    if (dataSource.selection && dataSource.selection.count() > 0) {
+      return dataSource.selection.items() as Thread[];
+    }
+
+    return [];
+  };
+
   _onRemoveAndShift = ({ offset }) => {
     const dataSource = ThreadListStore.dataSource();
     const focusedId = FocusedContentStore.focusedId('thread');
@@ -117,8 +139,13 @@ class HiddenGenericRemoveButton extends React.Component<{ items: Thread[] }> {
   };
 
   _onRemoveFromView = () => {
+    const items = this._itemsForRemove();
+    if (items.length === 0) {
+      return;
+    }
+
     const current = FocusedPerspectiveStore.current();
-    const tasks = current.tasksForRemovingItems(this.props.items, 'Keyboard Shortcut');
+    const tasks = current.tasksForRemovingItems(items, 'Keyboard Shortcut');
     Actions.queueTasks(tasks);
     Actions.popSheet();
   };
diff --git a/app/internal_packages/thread-search/lib/search-mailbox-perspective.tsx b/app/internal_packages/thread-search/lib/search-mailbox-perspective.tsx
index a9a0351983..ad236e553e 100644
--- a/app/internal_packages/thread-search/lib/search-mailbox-perspective.tsx
+++ b/app/internal_packages/thread-search/lib/search-mailbox-perspective.tsx
@@ -1,11 +1,6 @@
 import React from 'react';
 import {
   localized,
-  Folder,
-  ChangeLabelsTask,
-  ChangeFolderTask,
-  AccountStore,
-  CategoryStore,
   TaskFactory,
   MailboxPerspective,
   Actions,
@@ -82,31 +77,9 @@ class SearchMailboxPerspective extends MailboxPerspective {
   }
 
   tasksForRemovingItems(threads, source?: string) {
-    return TaskFactory.tasksForThreadsByAccountId(threads, (accountThreads, accountId) => {
-      const account = AccountStore.accountForId(accountId);
-      if (!account) {
-        return [];
-      }
-      const dest = account.preferredRemovalDestination();
-      if (!dest) {
-        return [];
-      }
-      if (dest instanceof Folder) {
-        return new ChangeFolderTask({
-          threads: accountThreads,
-          source: 'Dragged out of list',
-          folder: dest,
-        });
-      }
-      if (dest.role === 'all') {
-        // if you're searching and archive something, it really just removes the inbox label
-        return new ChangeLabelsTask({
-          threads: accountThreads,
-          source: 'Dragged out of list',
-          labelsToRemove: [CategoryStore.getInboxCategory(accountId)],
-        });
-      }
-      throw new Error('Unexpected destination returned from preferredRemovalDestination()');
+    return TaskFactory.tasksForMovingToTrash({
+      threads,
+      source: source || 'Keyboard Shortcut',
     });
   }
 }
diff --git a/app/keymaps/base.json b/app/keymaps/base.json
index ee2c123290..1d5b525578 100644
--- a/app/keymaps/base.json
+++ b/app/keymaps/base.json
@@ -24,7 +24,7 @@
   "core:print-thread": "mod+p",
   "core:copy-mailbox-link": "ctrl+l",
   "core:focus-item": "enter",
-  "core:remove-from-view": ["backspace", "del"],
+  "core:remove-from-view": ["backspace", "del", "delete"],
   "core:pop-sheet": "escape",
   "core:show-keybindings": "?",
 
diff --git a/app/spec/models/query-subscription-pool-spec.ts b/app/spec/models/query-subscription-pool-spec.ts
index c1a61342e9..61f08a79c8 100644
--- a/app/spec/models/query-subscription-pool-spec.ts
+++ b/app/spec/models/query-subscription-pool-spec.ts
@@ -37,11 +37,11 @@ describe('QuerySubscriptionPool', function QuerySubscriptionPoolSpecs() {
 
     describe('unsubscribe', () => {
       it('should return an unsubscribe method', () => {
-        expect(QuerySubscriptionPool.add(this.query, () => {}) instanceof Function).toBe(true);
+        expect(QuerySubscriptionPool.add(this.query, () => { }) instanceof Function).toBe(true);
       });
 
       it('should remove the callback from the subscription', () => {
-        const cb = () => {};
+        const cb = () => { };
 
         const unsub = QuerySubscriptionPool.add(this.query, cb);
         const subscription = QuerySubscriptionPool._subscriptions[this.queryKey];
@@ -52,7 +52,7 @@ describe('QuerySubscriptionPool', function QuerySubscriptionPoolSpecs() {
       });
 
       it("should wait before removing th subscription to make sure it's not reused", () => {
-        const unsub = QuerySubscriptionPool.add(this.query, () => {});
+        const unsub = QuerySubscriptionPool.add(this.query, () => { });
         expect(QuerySubscriptionPool._subscriptions[this.queryKey]).toBeDefined();
         unsub();
         expect(QuerySubscriptionPool._subscriptions[this.queryKey]).toBeDefined();
@@ -63,50 +63,106 @@ describe('QuerySubscriptionPool', function QuerySubscriptionPoolSpecs() {
   });
 
   describe('_threadIdsForRemovalTask', () => {
-    it('should return threadIds for a ChangeFolderTask', () => {
+    const threadSubscriptionForCategory = (categoryId: string) => {
+      const threadQuery = DatabaseStore.findAll<Thread>(Thread).where([
+        Thread.attributes.categories.contains(categoryId),
+      ]);
+      QuerySubscriptionPool.add(threadQuery, () => { });
+      return QuerySubscriptionPool._subscriptions[threadQuery.sql()];
+    };
+
+    it('should return threadIds for a ChangeFolderTask when moving out of the subscription category', () => {
       const threads = [
         new Thread({ id: 't1', accountId: 'a1', folders: [new Folder({ id: 'f1' })] }),
       ];
+      const subscription = threadSubscriptionForCategory('f1');
       const task = new ChangeFolderTask({
         threads,
         folder: new Folder({ id: 'trash-folder', role: 'trash', accountId: 'a1' }),
+        previousFolder: new Folder({ id: 'f1', role: 'inbox', accountId: 'a1' }),
       });
-      const result = QuerySubscriptionPool._threadIdsForRemovalTask(task);
+      const result = QuerySubscriptionPool._threadIdsForRemovalTask(task, subscription);
       expect(result).toEqual(['t1']);
     });
 
+    it('should return null for a ChangeFolderTask when moving into the subscription category', () => {
+      const threads = [
+        new Thread({ id: 't1', accountId: 'a1', folders: [new Folder({ id: 'spam-folder' })] }),
+      ];
+      const subscription = threadSubscriptionForCategory('inbox-folder');
+      const task = new ChangeFolderTask({
+        threads,
+        folder: new Folder({ id: 'inbox-folder', role: 'inbox', accountId: 'a1' }),
+        previousFolder: new Folder({ id: 'spam-folder', role: 'spam', accountId: 'a1' }),
+      });
+      const result = QuerySubscriptionPool._threadIdsForRemovalTask(task, subscription);
+      expect(result).toBeNull();
+    });
+
+    it('should return null for an undo ChangeFolderTask', () => {
+      const threads = [
+        new Thread({ id: 't1', accountId: 'a1', folders: [new Folder({ id: 'f1' })] }),
+      ];
+      const subscription = threadSubscriptionForCategory('inbox-folder');
+      const task = new ChangeFolderTask({
+        threads,
+        folder: new Folder({ id: 'inbox-folder', role: 'inbox', accountId: 'a1' }),
+        previousFolder: new Folder({ id: 'trash-folder', role: 'trash', accountId: 'a1' }),
+      });
+      task.isUndo = true;
+
+      const result = QuerySubscriptionPool._threadIdsForRemovalTask(task, subscription);
+      expect(result).toBeNull();
+    });
+
     it('should return threadIds for a ChangeLabelsTask with only removals', () => {
+      const subscription = threadSubscriptionForCategory('inbox');
       const task = new ChangeLabelsTask({
         threads: [new Thread({ id: 't2', accountId: 'a1' })],
         labelsToRemove: [new Label({ id: 'inbox', role: 'inbox', accountId: 'a1' })],
         labelsToAdd: [],
       });
-      const result = QuerySubscriptionPool._threadIdsForRemovalTask(task);
+      const result = QuerySubscriptionPool._threadIdsForRemovalTask(task, subscription);
       expect(result).toEqual(['t2']);
     });
 
     it('should return null for a ChangeLabelsTask with additions', () => {
+      const subscription = threadSubscriptionForCategory('inbox');
       const task = new ChangeLabelsTask({
         threads: [new Thread({ id: 't3', accountId: 'a1' })],
         labelsToRemove: [new Label({ id: 'inbox', role: 'inbox', accountId: 'a1' })],
         labelsToAdd: [new Label({ id: 'archive', role: 'all', accountId: 'a1' })],
       });
-      const result = QuerySubscriptionPool._threadIdsForRemovalTask(task);
+      const result = QuerySubscriptionPool._threadIdsForRemovalTask(task, subscription);
       expect(result).toBeNull();
     });
   });
 
   describe('_optimisticallyRemoveThreads', () => {
-    it('should call optimisticallyRemoveItemsById on Thread subscriptions', () => {
-      const threadQuery = DatabaseStore.findAll<Thread>(Thread);
-      const threadKey = threadQuery.sql();
-      const callback = jasmine.createSpy('callback');
-      QuerySubscriptionPool.add(threadQuery, callback);
-      const subscription = QuerySubscriptionPool._subscriptions[threadKey];
-      spyOn(subscription, 'optimisticallyRemoveItemsById');
+    it('should call optimisticallyRemoveItemsById only on matching Thread subscriptions', () => {
+      const inboxQuery = DatabaseStore.findAll<Thread>(Thread).where([
+        Thread.attributes.categories.contains('inbox-folder'),
+      ]);
+      const searchQuery = DatabaseStore.findAll<Thread>(Thread);
 
-      QuerySubscriptionPool._optimisticallyRemoveThreads(['t1', 't2']);
-      expect(subscription.optimisticallyRemoveItemsById).toHaveBeenCalledWith(['t1', 't2']);
+      QuerySubscriptionPool.add(inboxQuery, jasmine.createSpy('inboxCb'));
+      QuerySubscriptionPool.add(searchQuery, jasmine.createSpy('searchCb'));
+
+      const inboxSubscription = QuerySubscriptionPool._subscriptions[inboxQuery.sql()];
+      const searchSubscription = QuerySubscriptionPool._subscriptions[searchQuery.sql()];
+
+      spyOn(inboxSubscription, 'optimisticallyRemoveItemsById');
+      spyOn(searchSubscription, 'optimisticallyRemoveItemsById');
+
+      const task = new ChangeFolderTask({
+        threads: [new Thread({ id: 't1', accountId: 'a1' })],
+        folder: new Folder({ id: 'trash-folder', role: 'trash', accountId: 'a1' }),
+        previousFolder: new Folder({ id: 'inbox-folder', role: 'inbox', accountId: 'a1' }),
+      });
+
+      QuerySubscriptionPool._optimisticallyRemoveThreads(task);
+      expect(inboxSubscription.optimisticallyRemoveItemsById).toHaveBeenCalledWith(['t1']);
+      expect(searchSubscription.optimisticallyRemoveItemsById).not.toHaveBeenCalled();
     });
 
     it('should not call optimisticallyRemoveItemsById on non-Thread subscriptions', () => {
@@ -117,7 +173,13 @@ describe('QuerySubscriptionPool', function QuerySubscriptionPoolSpecs() {
       const subscription = QuerySubscriptionPool._subscriptions[labelKey];
       spyOn(subscription, 'optimisticallyRemoveItemsById');
 
-      QuerySubscriptionPool._optimisticallyRemoveThreads(['t1']);
+      const task = new ChangeFolderTask({
+        threads: [new Thread({ id: 't1', accountId: 'a1' })],
+        folder: new Folder({ id: 'trash-folder', role: 'trash', accountId: 'a1' }),
+        previousFolder: new Folder({ id: 'inbox-folder', role: 'inbox', accountId: 'a1' }),
+      });
+
+      QuerySubscriptionPool._optimisticallyRemoveThreads(task);
       expect(subscription.optimisticallyRemoveItemsById).not.toHaveBeenCalled();
     });
   });
diff --git a/app/src/flux/models/query-subscription-pool.ts b/app/src/flux/models/query-subscription-pool.ts
index 55a0e70a93..557b958739 100644
--- a/app/src/flux/models/query-subscription-pool.ts
+++ b/app/src/flux/models/query-subscription-pool.ts
@@ -118,33 +118,50 @@ class QuerySubscriptionPool {
   };
 
   _onQueueTask = (task) => {
-    const threadIds = this._threadIdsForRemovalTask(task);
-    if (threadIds && threadIds.length > 0) {
-      this._optimisticallyRemoveThreads(threadIds);
+    try {
+      this._optimisticallyRemoveThreads(task);
+    } catch (error) {
+      console.warn('QuerySubscriptionPool: optimistic removal failed for queueTask', error);
     }
   };
 
   _onQueueTasks = (tasks) => {
     if (!tasks || !tasks.length) return;
-    const allIds: string[] = [];
-    for (const task of tasks) {
-      const ids = this._threadIdsForRemovalTask(task);
-      if (ids) {
-        allIds.push(...ids);
+    try {
+      for (const task of tasks) {
+        this._optimisticallyRemoveThreads(task);
       }
-    }
-    if (allIds.length > 0) {
-      this._optimisticallyRemoveThreads(allIds);
+    } catch (error) {
+      console.warn('QuerySubscriptionPool: optimistic removal failed for queueTasks', error);
     }
   };
 
-  _threadIdsForRemovalTask(task): string[] | null {
+  _threadIdsForRemovalTask(task, subscription?: QuerySubscription<any>): string[] | null {
     const ChangeFolderTask = require('../tasks/change-folder-task').ChangeFolderTask;
     const ChangeLabelsTask = require('../tasks/change-labels-task').ChangeLabelsTask;
 
-    if (task instanceof ChangeFolderTask && task.threadIds && task.threadIds.length > 0) {
+    if (task && task.isUndo) {
+      return null;
+    }
+
+    if (
+      !subscription ||
+      !subscription._query ||
+      subscription._query.objectClass() !== 'Thread'
+    ) {
+      return null;
+    }
+
+    if (
+      task instanceof ChangeFolderTask &&
+      task.threadIds &&
+      task.threadIds.length > 0 &&
+      this._subscriptionMatchesCategory(subscription, task.previousFolder && task.previousFolder.id) &&
+      !this._subscriptionMatchesCategory(subscription, task.folder && task.folder.id)
+    ) {
       return task.threadIds;
     }
+
     if (
       task instanceof ChangeLabelsTask &&
       task.threadIds &&
@@ -153,16 +170,58 @@ class QuerySubscriptionPool {
       task.labelsToRemove.length > 0 &&
       (!task.labelsToAdd || task.labelsToAdd.length === 0)
     ) {
-      return task.threadIds;
+      const labelsToRemove = task.labelsToRemove.map(label => label && label.id).filter(id => !!id);
+      if (labelsToRemove.some(labelId => this._subscriptionMatchesCategory(subscription, labelId))) {
+        return task.threadIds;
+      }
     }
     return null;
   }
 
-  _optimisticallyRemoveThreads(threadIds: string[]) {
+  _subscriptionMatchesCategory(subscription: QuerySubscription<any>, categoryId: string) {
+    if (!categoryId || !subscription || !subscription._query) {
+      return false;
+    }
+
+    const query = subscription._query;
+    const matchers = query.matchersFlattened ? query.matchersFlattened() : query.matchers();
+    if (!matchers || !(matchers instanceof Array)) {
+      return false;
+    }
+
+    const asId = value => (value && value.id ? value.id : value);
+    return matchers.some(matcher => {
+      if (!matcher || !matcher.attr) {
+        return false;
+      }
+
+      const modelKey = matcher.attr.modelKey;
+      if (!['categories', 'folders', 'labels'].includes(modelKey)) {
+        return false;
+      }
+
+      const matcherValue = matcher.value instanceof Function ? matcher.value() : matcher.val;
+
+      if (matcher.comparator === 'contains') {
+        return asId(matcherValue) === categoryId;
+      }
+
+      if (matcher.comparator === 'containsAny' && matcherValue instanceof Array) {
+        return matcherValue.map(asId).includes(categoryId);
+      }
+
+      return false;
+    });
+  }
+
+  _optimisticallyRemoveThreads(task) {
     for (const key of Object.keys(this._subscriptions)) {
       const subscription = this._subscriptions[key];
       if (subscription._query && subscription._query.objectClass() === 'Thread') {
-        subscription.optimisticallyRemoveItemsById(threadIds);
+        const threadIds = this._threadIdsForRemovalTask(task, subscription);
+        if (threadIds && threadIds.length > 0) {
+          subscription.optimisticallyRemoveItemsById(threadIds);
+        }
       }
     }
   }
diff --git a/app/src/flux/models/query-subscription.ts b/app/src/flux/models/query-subscription.ts
index 5059be612e..8483b528bd 100644
--- a/app/src/flux/models/query-subscription.ts
+++ b/app/src/flux/models/query-subscription.ts
@@ -83,7 +83,7 @@ export class QuerySubscription<T extends Model> {
     }
   }
 
-  onLastCallbackRemoved() {}
+  onLastCallbackRemoved() { }
 
   callbackCount = () => {
     return this._callbacks.length;
@@ -120,6 +120,9 @@ export class QuerySubscription<T extends Model> {
 
     let knownImpacts = 0;
     let unknownImpacts = 0;
+    const hasNonEvaluableMatchers = this._query
+      .matchersFlattened()
+      .some(matcher => !matcher || !matcher.attr);
 
     this._queuedChangeRecords.forEach((record) => {
       if (record.type === 'unpersist') {
@@ -134,6 +137,15 @@ export class QuerySubscription<T extends Model> {
         for (const item of record.objects) {
           const offset = this._set.offsetOfId(item.id);
           const itemIsInSet = offset !== -1;
+
+          if (hasNonEvaluableMatchers) {
+            if (itemIsInSet) {
+              this._set.updateModel(item);
+            }
+            unknownImpacts += 1;
+            continue;
+          }
+
           const itemShouldBeInSet = item.matches(this._query.matchers());
 
           if (itemIsInSet && !itemShouldBeInSet) {

From ecf0aaae962b5c3cdc5f872e674985f50092b988 Mon Sep 17 00:00:00 2001
From: csfercoci <cristian_sfercoci@yahoo.com>
Date: Sat, 14 Feb 2026 13:47:02 +0100
Subject: [PATCH 7/8] Remove global Delete capture; rely on keymap input-safe
 handling

---
 .../thread-list/lib/thread-list.tsx           | 22 -------------------
 1 file changed, 22 deletions(-)

diff --git a/app/internal_packages/thread-list/lib/thread-list.tsx b/app/internal_packages/thread-list/lib/thread-list.tsx
index 9f53b1d1f2..f96f6f93b8 100644
--- a/app/internal_packages/thread-list/lib/thread-list.tsx
+++ b/app/internal_packages/thread-list/lib/thread-list.tsx
@@ -64,7 +64,6 @@ class ThreadList extends React.Component<
       })
     );
     window.addEventListener('resize', this._onResize, true);
-    window.addEventListener('keydown', this._onGlobalDeleteKeyDown, true);
     ReactDOM.findDOMNode(this).addEventListener('contextmenu', this._onShowContextMenu);
     this._onResize();
   }
@@ -76,7 +75,6 @@ class ThreadList extends React.Component<
   componentWillUnmount() {
     this.unsub();
     window.removeEventListener('resize', this._onResize, true);
-    window.removeEventListener('keydown', this._onGlobalDeleteKeyDown, true);
     ReactDOM.findDOMNode(this).removeEventListener('contextmenu', this._onShowContextMenu);
   }
 
@@ -241,26 +239,6 @@ class ThreadList extends React.Component<
 
   _onDragEnd = event => { };
 
-  _onGlobalDeleteKeyDown = (event: KeyboardEvent) => {
-    const key = (event.key || '').toLowerCase();
-    const isDelete = key === 'delete' || key === 'del';
-    if (!isDelete) {
-      return;
-    }
-    if (event.altKey || event.ctrlKey || event.metaKey || event.shiftKey) {
-      return;
-    }
-
-    const items = this._threadsForKeyboardAction();
-    if (!items || items.length === 0) {
-      return;
-    }
-
-    event.preventDefault();
-    event.stopPropagation();
-    AppEnv.commands.dispatch('core:remove-from-view');
-  };
-
   _onResize = (event?: any) => {
     const narrowStyleWidth = DOMUtils.getWorkspaceCssNumberProperty(
       'thread-list-narrow-style-width',

From 846c678ed486d5181bfdde957c7d4f6d03d9cfe3 Mon Sep 17 00:00:00 2001
From: csfercoci <cristian_sfercoci@yahoo.com>
Date: Sat, 14 Feb 2026 14:09:13 +0100
Subject: [PATCH 8/8] Adjust delete/remove key bindings

---
 app/keymaps/base.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/keymaps/base.json b/app/keymaps/base.json
index 1d5b525578..9d8a8b115c 100644
--- a/app/keymaps/base.json
+++ b/app/keymaps/base.json
@@ -24,7 +24,8 @@
   "core:print-thread": "mod+p",
   "core:copy-mailbox-link": "ctrl+l",
   "core:focus-item": "enter",
-  "core:remove-from-view": ["backspace", "del", "delete"],
+  "core:remove-from-view": ["backspace"],
+  "core:delete-item": ["del", "delete"],
   "core:pop-sheet": "escape",
   "core:show-keybindings": "?",