@bobfrankston/rmfmail 1.0.565 → 1.0.570

package/client/app.js

@@ -4,7 +4,7 @@
  */
 import { initFolderTree, refreshFolderTree, updateFolderCounts, setFolderSynced, getFolderSynced, setOutboxTotal } from "./components/folder-tree.js";
 import { initMessageList, loadMessages, loadUnifiedInbox, loadSearchResults, reloadCurrentFolder, clearSearchMode, getSelectedMessages, markBodiesCached, getCurrentFocused, releaseFocus, removeMessagesAndReconcile, setRowFlagged, scrollFocusedIntoView, refreshPriorityIndex } from "./components/message-list.js";
-import { showMessage, getCurrentMessage, initViewer, popOutCurrentMessage, toggleFullscreenPreview, showPreviewBodyMenu } from "./components/message-viewer.js";
+import { getCurrentMessage, initViewer, popOutCurrentMessage, toggleFullscreenPreview, showPreviewBodyMenu } from "./components/message-viewer.js";
 import { connectWebSocket, onWsEvent, triggerSync, syncAccount, reauthenticate, getAccounts, getFolders, deleteMessages, undeleteMessage, restartServer, getSyncPending, getVersion, getSettings, saveSettings, getAutocompleteSettings, saveAutocompleteSettings, repairAccounts, updateFlags, markAsSpamMessages, logClientEvent, sendMessage as apiSendMessage } from "./lib/api-client.js";
 import * as messageState from "./lib/message-state.js";
 // ── New message badge (favicon + title) ──
@@ -324,9 +324,14 @@ initFolderTree(folderTree, (accountId, folderId, folderName, specialUse) => {
     setTitle(`${APP_NAME} - All Inboxes`);
     setNarrowFolderTitle("All Inboxes");
 });
-initMessageList((accountId, uid, folderId) => {
-    showMessage(accountId, uid, folderId, currentFolderSpecialUse);
-    // Narrow screen: show message viewer, hide list
+initMessageList((_accountId, _uid, _folderId) => {
+    // The list row's setFocus() already drove the viewer with its own
+    // envelope (header + preview paint synchronously, body fetches in
+    // background). Calling showMessage here a SECOND time without the
+    // envelope wiped the good render and forced a bare "Loading…"
+    // placeholder until the body IPC returned — making every click feel
+    // like a network round-trip. This callback now only handles the
+    // narrow-screen layout switch.
     if (window.innerWidth <= 768) {
         document.getElementById("message-viewer")?.classList.add("narrow-active");
         document.getElementById("message-list")?.classList.add("narrow-hidden");
@@ -1450,8 +1455,10 @@ function doSearch(immediate = false) {
     // "server" which spans all folders on all accounts. Local scope dropdown
     // is unchanged (all/current) for the local-only case.
     const serverCheck = document.getElementById("search-server-too");
+    const trashCheck = document.getElementById("search-include-trash");
     const localScope = searchScope?.value || "all";
     const effectiveScope = serverCheck?.checked ? "server" : localScope;
+    const includeTrash = !!trashCheck?.checked;
     // "This folder" scope: instant client-side filter on debounce, server search on Enter
     if (effectiveScope === "current" && !immediate) {
         // Client-side filter of visible rows
@@ -1465,7 +1472,7 @@ function doSearch(immediate = false) {
         }
         return;
     }
-    loadSearchResults(query, effectiveScope, currentAccountId, currentFolderId);
+    loadSearchResults(query, effectiveScope, currentAccountId, currentFolderId, includeTrash);
     setTitle(`${APP_NAME} - Search: ${query}`);
 }
 // Track current folder for scoped search
@@ -1523,6 +1530,7 @@ function rerunActiveSearch() {
 }
 searchScope?.addEventListener("change", rerunActiveSearch);
 document.getElementById("search-server-too")?.addEventListener("change", rerunActiveSearch);
+document.getElementById("search-include-trash")?.addEventListener("change", rerunActiveSearch);
 // Message state handles move/delete — no manual event listener needed
 // ── Folder filter ──
 const ftFilterInput = document.getElementById("ft-filter-input");