@bobfrankston/rmfmail 1.2.82 → 1.2.84

package/client/app.js

@@ -6,7 +6,7 @@ import { initFolderTree, refreshFolderTree, updateFolderCounts, setFolderSynced,
 import { initMessageList, loadMessages, loadUnifiedInbox, loadSearchResults, reloadCurrentFolder, clearSearchMode, getSelectedMessages, markBodiesCached, getCurrentFocused, releaseFocus, removeMessagesAndReconcile, setRowFlagged, scrollFocusedIntoView, refreshPriorityIndex, revealMessage, selectAllVisible, exitMultiSelect } from "./components/message-list.js";
 import { seenOf, flaggedOf, draftOf, setSeen, setFlagged } from "@bobfrankston/mailx-types";
 import { initTabs, setActiveView as setActiveTabView, openTab } from "./components/tabs.js";
-import { getCurrentMessage, initViewer, popOutCurrentMessage, printCurrentMessage, toggleFullscreenPreview, showPreviewBodyMenu, wrapHtmlBody } from "./components/message-viewer.js";
+import { getCurrentMessage, initViewer, popOutCurrentMessage, popOutToWindow, printCurrentMessage, toggleFullscreenPreview, showPreviewBodyMenu, wrapHtmlBody } from "./components/message-viewer.js";
 import { connectWebSocket, onWsEvent, triggerSync, syncAccount, reauthenticate, getAccounts, getFolders, deleteMessage, deleteMessages, undeleteMessage, restartServer, getSyncPending, getVersion, getSettings, saveSettings, getAutocompleteSettings, saveAutocompleteSettings, repairAccounts, updateFlags, markAsSpamMessages, logClientEvent, sendMessage as apiSendMessage, subscribeStore, cancelServerSearch, installConsoleCapture, getAttachment } from "./lib/api-client.js";
 import * as messageState from "./lib/message-state.js";
 // FIRST THING. Captures every console.log/warn/error + window errors +
@@ -714,6 +714,7 @@ document.getElementById("btn-back")?.addEventListener("touchend", backToList);
 // once), mobile toggles `body.viewer-fullscreen` for full-screen reading.
 // Threshold and behavior live in popOutCurrentMessage.
 document.getElementById("mv-popout")?.addEventListener("click", () => popOutCurrentMessage());
+document.getElementById("mv-popout-window")?.addEventListener("click", () => popOutToWindow());
 document.getElementById("btn-print")?.addEventListener("click", () => printCurrentMessage());
 // Close folder panel when a folder is selected (narrow mode)
 // Also reset narrow navigation: show message list, hide viewer
@@ -1120,6 +1121,14 @@ async function openCompose(mode, overrideMsg, overrideAccountId) {
         init.cc = Array.isArray(msg.cc) ? msg.cc : [];
         init.subject = msg.subject || "";
         init.bodyHtml = editAsNewBody(msg);
+        // From: preserve the original sender when it's one of YOUR accounts
+        // (resending your own message keeps the same identity); otherwise fall
+        // back to received-identity detection. Without this, edit-as-new always
+        // defaulted to the primary account — "a different from address" (Bob
+        // 2026-06-29).
+        const origFrom = msg.from?.address ? bareAddress(msg.from.address) : "";
+        const ownFrom = origFrom && accounts.some((acc) => bareAddress(acc.email || "") === origFrom) ? origFrom : undefined;
+        init.fromAddress = ownFrom || detectReplyFrom();
     }
     // Carry the original message's attachments into forward / edit-as-new so
     // reopening a sent message to edit (or forwarding one) keeps its files —