@bobfrankston/rmfmail 1.2.33 → 1.2.35

package/client/android-bootstrap.bundle.js

@@ -5767,6 +5767,7 @@ var WebMailxService = class {
     let bodyText = "";
     let hasRemoteContent = false;
     let attachments = [];
+    let deliveredTo = "", returnPath = "", listUnsubscribe = "";
     let raw = null;
     try {
       raw = await this.syncManager.fetchMessageBody(accountId, envelope.folderId, envelope.uid);
@@ -5813,6 +5814,27 @@ var WebMailxService = class {
         size: a.size || 0,
         contentId: a.contentId || ""
       }));
+      const hEnd = source.search(/\r?\n\r?\n/);
+      const hb = hEnd >= 0 ? source.slice(0, hEnd) : source;
+      const unfolded = [];
+      for (const ln of hb.split(/\r?\n/)) {
+        if (/^[ \t]/.test(ln) && unfolded.length)
+          unfolded[unfolded.length - 1] += " " + ln.trim();
+        else
+          unfolded.push(ln);
+      }
+      const firstHeader = (name) => {
+        const re = new RegExp("^" + name + ":\\s*(.*)$", "i");
+        for (const ln of unfolded) {
+          const m = ln.match(re);
+          if (m)
+            return m[1].trim();
+        }
+        return "";
+      };
+      deliveredTo = firstHeader("Delivered-To");
+      returnPath = firstHeader("Return-Path").replace(/[<>]/g, "");
+      listUnsubscribe = firstHeader("List-Unsubscribe");
     }
     const allowList = await loadAllowlist();
     const senderAddr = (envelope.from?.address || "").toLowerCase();
@@ -5836,9 +5858,9 @@ var WebMailxService = class {
       hasRemoteContent,
       remoteAllowed: allowRemote,
       attachments,
-      deliveredTo: "",
-      returnPath: "",
-      listUnsubscribe: "",
+      deliveredTo,
+      returnPath,
+      listUnsubscribe,
       isFlagged
     };
   }