@bobfrankston/rmfmail 1.2.165 → 1.2.166

package/client/android-bootstrap.bundle.js

@@ -10593,10 +10593,12 @@ var AndroidSyncManager = class {
       auth = { method: "XOAUTH2", user: smtpUser, token };
     }
     const parseAddrs = (s) => s.match(/[\w.+-]+@[\w.-]+/g) || [];
-    const toMatch = raw.match(/^To:\s*(.+)$/mi);
-    const ccMatch = raw.match(/^Cc:\s*(.+)$/mi);
-    const bccMatch = raw.match(/^Bcc:\s*(.+)$/mi);
-    const fromMatch = raw.match(/^From:\s*(.+)$/mi);
+    const headerEnd = raw.search(/\r?\n\r?\n/);
+    const headerSec = (headerEnd === -1 ? raw : raw.slice(0, headerEnd)).replace(/\r?\n[ \t]+/g, " ");
+    const toMatch = headerSec.match(/^To:\s*(.+)$/mi);
+    const ccMatch = headerSec.match(/^Cc:\s*(.+)$/mi);
+    const bccMatch = headerSec.match(/^Bcc:\s*(.+)$/mi);
+    const fromMatch = headerSec.match(/^From:\s*(.+)$/mi);
     const recipients = [
       ...toMatch ? parseAddrs(toMatch[1]) : [],
       ...ccMatch ? parseAddrs(ccMatch[1]) : [],
@@ -10604,7 +10606,8 @@ var AndroidSyncManager = class {
     ];
     const sender = fromMatch ? parseAddrs(fromMatch[1])[0] || account.email : account.email;
     if (recipients.length === 0) throw new Error("No recipients");
-    const rawToSend = raw.replace(/^Bcc:.*\r?\n/mi, "");
+    const stripBcc = (h) => h.replace(/^Bcc:[^\n]*(\r?\n[ \t][^\n]*)*(\r?\n|$)/mi, "").replace(/\r?\n$/, "");
+    const rawToSend = headerEnd === -1 ? stripBcc(raw) : stripBcc(raw.slice(0, headerEnd)) + raw.slice(headerEnd);
     const client = new SmtpClient({
       host: smtpHost,
       port: smtpPort,