@bobfrankston/rmfmail 1.0.697 → 1.0.699

package/client/app.bundle.js

@@ -1198,15 +1198,28 @@ async function showMessage(accountId, uid, folderId, specialUse, isRetry = false
             const m = mailUrl.match(/^mailto:([^?]*)(?:\?(.*))?$/i);
             const to = m?.[1] ? decodeURIComponent(m[1]) : "";
             const qs = new URLSearchParams(m?.[2] || "");
-            const subject = qs.get("subject") || "Unsubscribe";
-            const body = qs.get("body") || "";
+            const origFrom = msg.from ? msg.from.name ? `${msg.from.name} <${msg.from.address}>` : msg.from.address : "";
+            const origSubject = msg.subject || "";
+            const origDate = msg.date ? new Date(msg.date).toLocaleString(void 0, { year: "numeric", month: "short", day: "numeric", hour: "2-digit", minute: "2-digit", hour12: false }) : "";
+            const subject = qs.get("subject") || (origSubject ? `Unsubscribe: ${origSubject}` : "Unsubscribe");
+            const inlineBody = qs.get("body") || "";
+            const escape = (s) => s.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
+            const contextLines = [];
+            if (origFrom)
+              contextLines.push(`From: ${escape(origFrom)}`);
+            if (origSubject)
+              contextLines.push(`Subject: ${escape(origSubject)}`);
+            if (origDate)
+              contextLines.push(`Date: ${escape(origDate)}`);
+            const contextBlock = contextLines.length ? `<p>\u2014<br>${contextLines.join("<br>")}</p>` : "";
+            const bodyHtml = inlineBody ? `<p>${escape(inlineBody)}</p>${contextBlock}` : `<p>Please unsubscribe me from this list.</p>${contextBlock}`;
             const init = {
               mode: "new",
               accountId: currentAccountId,
               to: to ? [{ name: "", address: to }] : [],
               cc: [],
               subject,
-              bodyHtml: body ? `<p>${body}</p>` : "",
+              bodyHtml,
               inReplyTo: "",
               references: [],
               accounts: []