@bobfrankston/mailx-store 0.1.83 → 0.1.85

package/db.js

@@ -4019,8 +4019,11 @@ export class MailxDB {
             }
             else if (folderMatch) {
                 const v = folderMatch[1].replace(/"/g, "");
-                extraWhere.push("LOWER(f.name) LIKE ?");
-                extraParams.push(`%${v.toLowerCase()}%`);
+                // Match the leaf name OR the full path, so both
+                // `folder:rmf` and `folder:lists/rmf` land on the same
+                // folder. LOWER() on both sides keeps it case-insensitive.
+                extraWhere.push("(LOWER(f.name) LIKE ? OR LOWER(f.path) LIKE ?)");
+                extraParams.push(`%${v.toLowerCase()}%`, `%${v.toLowerCase()}%`);
             }
             else if (/^(AND|OR)$/.test(part)) {
                 // FTS5 boolean operators — pass through verbatim (must be uppercase).

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bobfrankston/mailx-store",
-  "version": "0.1.83",
+  "version": "0.1.85",
   "type": "module",
   "main": "index.js",
   "types": "index.d.ts",
@@ -9,8 +9,8 @@
   },
   "license": "ISC",
   "dependencies": {
-    "@bobfrankston/mailx-types": "^0.1.40",
-    "@bobfrankston/mailx-settings": "^0.1.49",
+    "@bobfrankston/mailx-types": "^0.1.45",
+    "@bobfrankston/mailx-settings": "^0.1.52",
     "@bobfrankston/mailx-bus": "^0.1.2",
     "mailparser": "^3.7.2"
   },
@@ -29,8 +29,8 @@
   },
   ".transformedSnapshot": {
     "dependencies": {
-      "@bobfrankston/mailx-types": "^0.1.40",
-      "@bobfrankston/mailx-settings": "^0.1.49",
+      "@bobfrankston/mailx-types": "^0.1.45",
+      "@bobfrankston/mailx-settings": "^0.1.52",
       "@bobfrankston/mailx-bus": "^0.1.2",
       "mailparser": "^3.7.2"
     }

package/store.js

@@ -455,11 +455,30 @@ export class Store {
         // This runs BEFORE sanitization because Delivered-To feeds the
         // recipient-allowlist re-check just below.
         let deliveredTo = "";
-        const rawDelivered = parsed.headers.get("delivered-to");
-        if (rawDelivered) {
+        // Delivered-To is the qmail/Gmail spelling. Postfix writes
+        // X-Original-To and Exim writes Envelope-To for the same fact: the
+        // address THIS server accepted the message for. All three are stamped
+        // by the RECEIVING MTA, not by the sender or a mailing list, which is
+        // what makes them the right key for "which of my identities was this
+        // sent to" — a list message where the user appears nowhere in To/Cc
+        // still carries the subscriber alias here.
+        //
+        // Without the alternates, mail arriving through a Postfix/Exim path
+        // fell through to scanning To/Cc, and list mail (where the user is
+        // not addressed at all) landed on the account default instead of the
+        // per-list alias (Bob 2026-08-10: "even if I'm on a list should I see
+        // a proper deliver-to?").
+        for (const key of ["delivered-to", "x-original-to", "envelope-to"]) {
+            const rawDelivered = parsed.headers.get(key);
+            if (!rawDelivered)
+                continue;
+            // Each delivery agent PREPENDS its own, so [0] is the FINAL
+            // delivery to this mailbox; later entries are forwarding hops.
             const deliveredList = Array.isArray(rawDelivered) ? rawDelivered : [rawDelivered];
             const d = deliveredList[0];
             deliveredTo = typeof d === "string" ? d : d?.text || d?.address || String(d);
+            if (deliveredTo)
+                break;
         }
         const hdr = (key) => {
             let v = parsed.headers.get(key);