fix(imp): refresh search list after trash delete

js/base.js

@@ -3802,7 +3802,14 @@ var ImpBase = {
         opts.vs = this._getSelection(opts);
 
         if (this._doMsgAction('deleteMessages', opts, {})) {
-            this.updateFlag(opts.vs, ImpCore.conf.FLAG_DELETED, true);
+            /* When using a Trash mailbox (nodeleteshow), messages are moved
+             * or hidden — they must not be painted as IMAP \Deleted. That
+             * optimistic mark is only correct for classic mark-for-deletion
+             * mode, and in search views it often sticks even after a successful
+             * move-to-trash. Rely on the server disappear/viewport refresh. */
+            if (!this.viewport.getMetaData('nodeleteshow')) {
+                this.updateFlag(opts.vs, ImpCore.conf.FLAG_DELETED, true);
+            }
         }
     },
 

lib/Ajax/Application.php

@@ -419,6 +419,14 @@ public function deleteMsgs(IMP_Indices $indices, $changed, $force = false)
             $changed = ($this->indices->mailbox->getSort()->sortby == Horde_Imap_Client::SORT_THREAD);
         }
 
+        /* Search BUIDs are session-synthetic and the result set is rebuilt
+         * after mailbox mutations. Always refresh the viewport so moved/
+         * deleted messages leave the search list instead of lingering with
+         * an optimistic \Deleted appearance. */
+        if (!$changed && $this->indices->mailbox->search) {
+            $changed = true;
+        }
+
         if ($changed) {
             $this->addTask('viewport', $this->viewPortData(true));
         } elseif (($indices instanceof IMP_Indices_Mailbox)

lib/Indices.php

@@ -444,46 +444,49 @@ public function delete(array $opts = [])
             $imp_imap = $ob->mbox->imp_imap;
             $ids_ob = $imp_imap->getIdsOb($ob->uids);
             $processed = false;
+            $moved_to_trash = false;
 
             /* Trash is only valid for IMAP mailboxes. */
             if ($use_trash_mbox
                 && ($ob->mbox != $trash)
                 /* TODO(?): Don't use Trash mailbox for remote accounts. */
-                && !$ob->mbox->remote_mbox) {
-                if ($ob->mbox->access_expunge) {
-                    try {
-                        if ($mark_seen) {
-                            $imp_imap->store($ob->mbox, [
-                                'add' => [Horde_Imap_Client::FLAG_SEEN],
-                                'ids' => $ids_ob,
-                            ]);
-                        }
-
-                        $imp_imap->copy($ob->mbox, $trash, [
+                && !$ob->mbox->remote_mbox
+                && $ob->mbox->access_expunge) {
+                try {
+                    if ($mark_seen) {
+                        $imp_imap->store($ob->mbox, [
+                            'add' => [Horde_Imap_Client::FLAG_SEEN],
                             'ids' => $ids_ob,
-                            'move' => true,
                         ]);
-                        $affected_mailboxes[strval($ob->mbox)] = $ob->mbox;
-                        $affected_mailboxes[strval($trash)] = $trash;
-                        $processed = true;
-                    } catch (IMP_Imap_Exception $e) {
-                        if ($e->getCode() == $e::OVERQUOTA) {
-                            $notification->push(
-                                _('You are over your quota, so your messages will be permanently deleted instead of moved to the Trash mailbox.'),
-                                'horde.warning'
-                            );
+                    }
 
-                            $idx = new IMP_Indices($ob->mbox, $ob->uids);
-                            return $idx->delete([
-                                'keeplog' => !empty($opts['keeplog']),
-                                'nuke' => true,
-                            ]);
-                        }
+                    $imp_imap->copy($ob->mbox, $trash, [
+                        'ids' => $ids_ob,
+                        'move' => true,
+                    ]);
+                    $affected_mailboxes[strval($ob->mbox)] = $ob->mbox;
+                    $affected_mailboxes[strval($trash)] = $trash;
+                    $processed = true;
+                    $moved_to_trash = true;
+                } catch (IMP_Imap_Exception $e) {
+                    if ($e->getCode() == $e::OVERQUOTA) {
+                        $notification->push(
+                            _('You are over your quota, so your messages will be permanently deleted instead of moved to the Trash mailbox.'),
+                            'horde.warning'
+                        );
 
-                        return false;
+                        $idx = new IMP_Indices($ob->mbox, $ob->uids);
+                        return $idx->delete([
+                            'keeplog' => !empty($opts['keeplog']),
+                            'nuke' => true,
+                        ]);
                     }
+
+                    return false;
                 }
-            } else {
+            }
+
+            if (!$moved_to_trash) {
                 /* Delete message logs now. This may result in loss of message
                  * log data for messages that might not be deleted - i.e. if
                  * an error occurs. But 1) the user has already indicated they