@bobfrankston/rmfmail 1.1.90 → 1.1.92

package/.commitmsg

@@ -1,7 +1,13 @@
-Search history records live (no-Enter) searches too
+Fix: viewer showed wrong body (header/body mismatch on search results)
 
-Search history only recorded on Enter, so a search typed and run
-live ("Hoddie") never appeared in the history dropdown. Every executed
-search is now recorded; recordSearchHistory() prunes any entry that is a
-prefix of the new query, collapsing the keystroke progression ("Hod",
-"Hodd") into the final term so it lands in history exactly once.
+The viewer's same-message guard keyed on (uid, folderId). uid is only
+unique within a folder, so a cross-folder search could surface two
+different messages with the same uid; when the result's folderId was
+omitted the guard mis-fired — it refreshed the header to the clicked
+message but kept the previously-shown message's body in the iframe. The
+viewer looked "scrambled": header said one message, body showed another.
+
+The guard now keys on the stable `uuid` whenever both sides have one,
+falling back to (uid, folderId) only for uuid-less envelopes (thread
+popup). The local store/.eml files were never corrupt — this was purely
+a viewer identity-check bug.

package/client/app.bundle.js

@@ -1095,7 +1095,8 @@ async function showMessage(accountId, uid, folderId, specialUse, isRetry = false
   const headerEl = document.getElementById("mv-header");
   const bodyEl = document.getElementById("mv-body");
   const attEl = document.getElementById("mv-attachments");
-  if (!isRetry && currentMessage && currentAccountId === accountId && currentMessage.uid === uid && (folderId === void 0 || currentMessage.folderId === folderId) && bodyEl.querySelector("iframe")) {
+  const sameMessage = !!currentMessage && currentAccountId === accountId && (envelope?.uuid && currentMessage.uuid ? envelope.uuid === currentMessage.uuid : currentMessage.uid === uid && (folderId === void 0 || currentMessage.folderId === folderId));
+  if (!isRetry && sameMessage && bodyEl.querySelector("iframe")) {
     if (envelope) {
       lastEnvelope = envelope;
       try {