@bobfrankston/rmfmail 1.2.252 → 1.2.254

package/client/app.js

@@ -6510,6 +6510,32 @@ document.addEventListener("mailx-popout-message", (async (e) => {
             draftFolderId: msg.folderId,
             draftId: msg.mailxDraftId || "",
         };
+        // Reopening a draft must bring its attachments back into compose,
+        // exactly as forward / edit-as-new do. Drafts had none to bring until
+        // saveDraft started including them (2026-08-11); without this, editing
+        // a draft and re-saving would strip the files a second time.
+        if (Array.isArray(msg.attachments) && msg.attachments.length) {
+            const loaded = [];
+            for (const att of msg.attachments) {
+                try {
+                    const data = await getAttachment(accountId, msg.uid, att.id, msg.folderId);
+                    if (data?.content) {
+                        loaded.push({
+                            filename: data.filename || att.filename || "attachment",
+                            mimeType: data.contentType || att.contentType || "application/octet-stream",
+                            dataBase64: data.content,
+                        });
+                    }
+                }
+                catch (e) {
+                    // Loud: a dropped attachment here means the next autosave
+                    // writes a draft without it.
+                    console.error(`[compose] edit draft: failed to load attachment ${att.id} ("${att.filename}"): ${e?.message || e}`);
+                }
+            }
+            if (loaded.length)
+                init.attachments = loaded;
+        }
         sessionStorage.setItem("composeInit", JSON.stringify(init));
         showComposeOverlay(msg.subject ? `Edit: ${msg.subject}` : "Edit draft");
         return;