postal-mime 2.7.3 → 2.7.4

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## [2.7.4](https://github.com/postalsys/postal-mime/compare/v2.7.3...v2.7.4) (2026-03-17)
+
+
+### Bug Fixes
+
+* add missing originalKey to Header type and Uint8Array to Attachment content ([92cc91c](https://github.com/postalsys/postal-mime/commit/92cc91c1c8477e0462cb0e93ddf8ea6aec6534d0))
+* include originalKey in parsed headers output ([83521c8](https://github.com/postalsys/postal-mime/commit/83521c87f62e5e095ae09913c70798f20e2ab347))
+* preserve __esModule and .default in CJS build for bundler interop ([1466910](https://github.com/postalsys/postal-mime/commit/1466910e31608b9e5307724ecc6a0a3a70556048))
+* prevent RFC 2047 encoded-word address fabrication ([844f920](https://github.com/postalsys/postal-mime/commit/844f92023d49d819ef13b9ad5c50b7c346eb02d3))
+
 ## [2.7.3](https://github.com/postalsys/postal-mime/compare/v2.7.2...v2.7.3) (2026-01-09)
 
 

package/README.md

@@ -14,6 +14,9 @@
 -   **Handles complex MIME structures** - Multipart messages, nested parts, attachments
 -   **Security limits** - Built-in protection against deeply nested messages and oversized headers
 
+> [!NOTE]
+> Full documentation is available at [postal-mime.postalsys.com](https://postal-mime.postalsys.com/).
+
 ## Table of Contents
 
 -   [Source](#source)

package/dist/address-parser.cjs

@@ -141,27 +141,27 @@ function _handleAddress(tokens, depth) {
     data.text = data.text.join(" ");
     data.address = data.address.join(" ");
     if (!data.address && /^=\?[^=]+?=$/.test(data.text.trim())) {
-      const parsedSubAddresses = addressParser((0, import_decode_strings.decodeWords)(data.text));
-      if (parsedSubAddresses && parsedSubAddresses.length) {
-        return parsedSubAddresses;
+      const decodedText = (0, import_decode_strings.decodeWords)(data.text);
+      if (/<[^<>]+@[^<>]+>/.test(decodedText)) {
+        const parsedSubAddresses = addressParser(decodedText);
+        if (parsedSubAddresses && parsedSubAddresses.length) {
+          return parsedSubAddresses;
+        }
       }
+      return [{ address: "", name: decodedText }];
     }
-    if (!data.address && isGroup) {
-      return [];
-    } else {
-      address = {
-        address: data.address || data.text || "",
-        name: (0, import_decode_strings.decodeWords)(data.text || data.address || "")
-      };
-      if (address.address === address.name) {
-        if ((address.address || "").match(/@/)) {
-          address.name = "";
-        } else {
-          address.address = "";
-        }
+    address = {
+      address: data.address || data.text || "",
+      name: (0, import_decode_strings.decodeWords)(data.text || data.address || "")
+    };
+    if (address.address === address.name) {
+      if ((address.address || "").match(/@/)) {
+        address.name = "";
+      } else {
+        address.address = "";
       }
-      addresses.push(address);
     }
+    addresses.push(address);
   }
   return addresses;
 }
@@ -238,7 +238,7 @@ class Tokenizer {
       this.operatorExpecting = this.operators[chr];
       this.escaped = false;
       return;
-    } else if (['"', "'"].includes(this.operatorExpecting) && chr === "\\") {
+    } else if (this.operatorExpecting === '"' && chr === "\\") {
       this.escaped = true;
       return;
     }
@@ -312,11 +312,14 @@ if (module.exports.default) {
     var defaultExport = module.exports.default;
     var namedExports = {};
     for (var key in module.exports) {
-        if (key !== 'default') {
+        if (key !== 'default' && key !== '__esModule') {
             namedExports[key] = module.exports[key];
         }
     }
     module.exports = defaultExport;
     Object.assign(module.exports, namedExports);
+    // Preserve __esModule and .default for bundler/transpiler interop
+    Object.defineProperty(module.exports, '__esModule', { value: true });
+    module.exports.default = defaultExport;
 }
 

package/dist/base64-decoder.cjs

@@ -32,9 +32,7 @@ class Base64Decoder {
   }
   update(buffer) {
     let str = this.decoder.decode(buffer);
-    if (/[^a-zA-Z0-9+\/]/.test(str)) {
-      str = str.replace(/[^a-zA-Z0-9+\/]+/g, "");
-    }
+    str = str.replace(/[^a-zA-Z0-9+\/]+/g, "");
     this.remainder += str;
     if (this.remainder.length >= this.maxChunkSize) {
       let allowedBytes = Math.floor(this.remainder.length / 4) * 4;
@@ -64,11 +62,14 @@ if (module.exports.default) {
     var defaultExport = module.exports.default;
     var namedExports = {};
     for (var key in module.exports) {
-        if (key !== 'default') {
+        if (key !== 'default' && key !== '__esModule') {
             namedExports[key] = module.exports[key];
         }
     }
     module.exports = defaultExport;
     Object.assign(module.exports, namedExports);
+    // Preserve __esModule and .default for bundler/transpiler interop
+    Object.defineProperty(module.exports, '__esModule', { value: true });
+    module.exports.default = defaultExport;
 }
 

package/dist/base64-encoder.cjs

@@ -62,11 +62,14 @@ if (module.exports.default) {
     var defaultExport = module.exports.default;
     var namedExports = {};
     for (var key in module.exports) {
-        if (key !== 'default') {
+        if (key !== 'default' && key !== '__esModule') {
             namedExports[key] = module.exports[key];
         }
     }
     module.exports = defaultExport;
     Object.assign(module.exports, namedExports);
+    // Preserve __esModule and .default for bundler/transpiler interop
+    Object.defineProperty(module.exports, '__esModule', { value: true });
+    module.exports.default = defaultExport;
 }
 

package/dist/decode-strings.cjs

@@ -32,7 +32,7 @@ module.exports = __toCommonJS(decode_strings_exports);
 const textEncoder = new TextEncoder();
 const base64Chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
 const base64Lookup = new Uint8Array(256);
-for (var i = 0; i < base64Chars.length; i++) {
+for (let i = 0; i < base64Chars.length; i++) {
   base64Lookup[base64Chars.charCodeAt(i)] = i;
 }
 function decodeBase64(base64) {
@@ -244,11 +244,14 @@ if (module.exports.default) {
     var defaultExport = module.exports.default;
     var namedExports = {};
     for (var key in module.exports) {
-        if (key !== 'default') {
+        if (key !== 'default' && key !== '__esModule') {
             namedExports[key] = module.exports[key];
         }
     }
     module.exports = defaultExport;
     Object.assign(module.exports, namedExports);
+    // Preserve __esModule and .default for bundler/transpiler interop
+    Object.defineProperty(module.exports, '__esModule', { value: true });
+    module.exports.default = defaultExport;
 }
 

package/dist/html-entities.cjs

@@ -2266,11 +2266,14 @@ if (module.exports.default) {
     var defaultExport = module.exports.default;
     var namedExports = {};
     for (var key in module.exports) {
-        if (key !== 'default') {
+        if (key !== 'default' && key !== '__esModule') {
             namedExports[key] = module.exports[key];
         }
     }
     module.exports = defaultExport;
     Object.assign(module.exports, namedExports);
+    // Preserve __esModule and .default for bundler/transpiler interop
+    Object.defineProperty(module.exports, '__esModule', { value: true });
+    module.exports.default = defaultExport;
 }
 

package/dist/mime-node.cjs

@@ -35,6 +35,7 @@ var import_decode_strings = require("./decode-strings.cjs");
 var import_pass_through_decoder = __toESM(require("./pass-through-decoder.cjs"), 1);
 var import_base64_decoder = __toESM(require("./base64-decoder.cjs"), 1);
 var import_qp_decoder = __toESM(require("./qp-decoder.cjs"), 1);
+const defaultDecoder = (0, import_decode_strings.getDecoder)();
 class MimeNode {
   constructor(options) {
     this.options = options || {};
@@ -212,7 +213,7 @@ class MimeNode {
   }
   decodeFlowedText(str, delSp) {
     return str.split(/\r?\n/).reduce((previousValue, currentValue) => {
-      if (/ $/.test(previousValue) && !/(^|\n)-- $/.test(previousValue)) {
+      if (previousValue.endsWith(" ") && previousValue !== "-- " && !previousValue.endsWith("\n-- ")) {
         if (delSp) {
           return previousValue.slice(0, -1) + currentValue;
         } else {
@@ -299,7 +300,7 @@ class MimeNode {
           let error = new Error(`Maximum header size of ${this.options.maxHeadersSize} bytes exceeded`);
           throw error;
         }
-        this.headerLines.push((0, import_decode_strings.getDecoder)().decode(line));
+        this.headerLines.push(defaultDecoder.decode(line));
         break;
       case "body": {
         this.contentDecoder.update(line);
@@ -313,11 +314,14 @@ if (module.exports.default) {
     var defaultExport = module.exports.default;
     var namedExports = {};
     for (var key in module.exports) {
-        if (key !== 'default') {
+        if (key !== 'default' && key !== '__esModule') {
             namedExports[key] = module.exports[key];
         }
     }
     module.exports = defaultExport;
     Object.assign(module.exports, namedExports);
+    // Preserve __esModule and .default for bundler/transpiler interop
+    Object.defineProperty(module.exports, '__esModule', { value: true });
+    module.exports.default = defaultExport;
 }
 

package/dist/pass-through-decoder.cjs

@@ -40,11 +40,14 @@ if (module.exports.default) {
     var defaultExport = module.exports.default;
     var namedExports = {};
     for (var key in module.exports) {
-        if (key !== 'default') {
+        if (key !== 'default' && key !== '__esModule') {
             namedExports[key] = module.exports[key];
         }
     }
     module.exports = defaultExport;
     Object.assign(module.exports, namedExports);
+    // Preserve __esModule and .default for bundler/transpiler interop
+    Object.defineProperty(module.exports, '__esModule', { value: true });
+    module.exports.default = defaultExport;
 }
 

package/dist/postal-mime.cjs

@@ -40,6 +40,9 @@ var import_decode_strings = require("./decode-strings.cjs");
 var import_base64_encoder = require("./base64-encoder.cjs");
 const MAX_NESTING_DEPTH = 256;
 const MAX_HEADERS_SIZE = 2 * 1024 * 1024;
+function toCamelCase(key) {
+  return key.replace(/-(.)/g, (o, c) => c.toUpperCase());
+}
 class PostalMime {
   static parse(buf, options) {
     const parser = new PostalMime(options);
@@ -124,22 +127,22 @@ class PostalMime {
   readLine() {
     let startPos = this.readPos;
     let endPos = this.readPos;
-    let res = () => {
-      return {
-        bytes: new Uint8Array(this.buf, startPos, endPos - startPos),
-        done: this.readPos >= this.av.length
-      };
-    };
     while (this.readPos < this.av.length) {
       const c = this.av[this.readPos++];
       if (c !== 13 && c !== 10) {
         endPos = this.readPos;
       }
       if (c === 10) {
-        return res();
+        return {
+          bytes: new Uint8Array(this.buf, startPos, endPos - startPos),
+          done: this.readPos >= this.av.length
+        };
       }
     }
-    return res();
+    return {
+      bytes: new Uint8Array(this.buf, startPos, endPos - startPos),
+      done: this.readPos >= this.av.length
+    };
   }
   async processNodeTree() {
     let textContent = {};
@@ -228,7 +231,7 @@ class PostalMime {
         await walk(childNode, alternative, related);
       }
     };
-    await walk(this.root, false, []);
+    await walk(this.root, false, false);
     textMap.forEach((mapEntry) => {
       textTypes.forEach((textType) => {
         if (!textContent[textType]) {
@@ -388,7 +391,7 @@ class PostalMime {
     }
     await this.processNodeTree();
     const message = {
-      headers: this.root.headers.map((entry) => ({ key: entry.key, value: entry.value })).reverse()
+      headers: this.root.headers.map((entry) => ({ key: entry.key, originalKey: entry.originalKey, value: entry.value })).reverse()
     };
     for (const key of ["from", "sender"]) {
       const addressHeader = this.root.headers.find((line) => line.key === key);
@@ -404,7 +407,7 @@ class PostalMime {
       if (addressHeader && addressHeader.value) {
         const addresses = (0, import_address_parser.default)(addressHeader.value);
         if (addresses && addresses.length && addresses[0].address) {
-          const camelKey = key.replace(/\-(.)/g, (o, c) => c.toUpperCase());
+          const camelKey = toCamelCase(key);
           message[camelKey] = addresses[0].address;
         }
       }
@@ -414,21 +417,21 @@ class PostalMime {
       let addresses = [];
       addressHeaders.filter((entry) => entry && entry.value).map((entry) => (0, import_address_parser.default)(entry.value)).forEach((parsed) => addresses = addresses.concat(parsed || []));
       if (addresses && addresses.length) {
-        const camelKey = key.replace(/\-(.)/g, (o, c) => c.toUpperCase());
+        const camelKey = toCamelCase(key);
         message[camelKey] = addresses;
       }
     }
     for (const key of ["subject", "message-id", "in-reply-to", "references"]) {
       const header = this.root.headers.find((line) => line.key === key);
       if (header && header.value) {
-        const camelKey = key.replace(/\-(.)/g, (o, c) => c.toUpperCase());
+        const camelKey = toCamelCase(key);
         message[camelKey] = (0, import_decode_strings.decodeWords)(header.value);
       }
     }
     let dateHeader = this.root.headers.find((line) => line.key === "date");
     if (dateHeader) {
       let date = new Date(dateHeader.value);
-      if (!date || date.toString() === "Invalid Date") {
+      if (date.toString() === "Invalid Date") {
         date = dateHeader.value;
       } else {
         date = date.toISOString();
@@ -464,7 +467,7 @@ class PostalMime {
         }
         break;
       default:
-        throw new Error("Unknwon attachment encoding");
+        throw new Error("Unknown attachment encoding");
     }
     return message;
   }
@@ -480,11 +483,14 @@ if (module.exports.default) {
     var defaultExport = module.exports.default;
     var namedExports = {};
     for (var key in module.exports) {
-        if (key !== 'default') {
+        if (key !== 'default' && key !== '__esModule') {
             namedExports[key] = module.exports[key];
         }
     }
     module.exports = defaultExport;
     Object.assign(module.exports, namedExports);
+    // Preserve __esModule and .default for bundler/transpiler interop
+    Object.defineProperty(module.exports, '__esModule', { value: true });
+    module.exports.default = defaultExport;
 }
 

package/dist/qp-decoder.cjs

@@ -86,7 +86,6 @@ class QPDecoder {
     }
     if (encodedBytes.length) {
       this.chunks.push(this.decodeQPBytes(encodedBytes));
-      encodedBytes = [];
     }
   }
   update(buffer) {
@@ -122,11 +121,14 @@ if (module.exports.default) {
     var defaultExport = module.exports.default;
     var namedExports = {};
     for (var key in module.exports) {
-        if (key !== 'default') {
+        if (key !== 'default' && key !== '__esModule') {
             namedExports[key] = module.exports[key];
         }
     }
     module.exports = defaultExport;
     Object.assign(module.exports, namedExports);
+    // Preserve __esModule and .default for bundler/transpiler interop
+    Object.defineProperty(module.exports, '__esModule', { value: true });
+    module.exports.default = defaultExport;
 }
 

package/dist/text-format.cjs

@@ -51,7 +51,7 @@ function decodeHTMLEntities(str) {
     } else {
       codePoint = parseInt(entity.substr(1), 10);
     }
-    var output = "";
+    let output = "";
     if (codePoint >= 55296 && codePoint <= 57343 || codePoint > 1114111) {
       return "\uFFFD";
     }
@@ -271,11 +271,14 @@ if (module.exports.default) {
     var defaultExport = module.exports.default;
     var namedExports = {};
     for (var key in module.exports) {
-        if (key !== 'default') {
+        if (key !== 'default' && key !== '__esModule') {
             namedExports[key] = module.exports[key];
         }
     }
     module.exports = defaultExport;
     Object.assign(module.exports, namedExports);
+    // Preserve __esModule and .default for bundler/transpiler interop
+    Object.defineProperty(module.exports, '__esModule', { value: true });
+    module.exports.default = defaultExport;
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "postal-mime",
-    "version": "2.7.3",
+    "version": "2.7.4",
     "description": "Email parser for Node.js and browser environments",
     "main": "./dist/postal-mime.cjs",
     "module": "./src/postal-mime.js",
@@ -38,14 +38,14 @@
     "author": "Andris Reinman",
     "license": "MIT-0",
     "devDependencies": {
-        "@types/node": "24.10.1",
+        "@types/node": "25.5.0",
         "cross-blob": "3.0.2",
         "cross-env": "10.1.0",
-        "esbuild": "0.27.0",
+        "esbuild": "0.27.4",
         "eslint": "8.57.0",
         "eslint-cli": "1.1.1",
         "iframe-resizer": "4.3.6",
-        "prettier": "3.6.2",
+        "prettier": "3.8.1",
         "typescript": "5.9.3"
     }
 }

package/postal-mime.d.ts

@@ -3,6 +3,8 @@ export type RawEmail = string | ArrayBuffer | Uint8Array | Blob | Buffer | Reada
 export type Header = {
     /** Lowercase header name */
     key: string;
+    /** Original header name preserving case */
+    originalKey: string;
     /** Header value */
     value: string;
 };
@@ -36,7 +38,7 @@ export type Attachment = {
     description?: string;
     contentId?: string;
     method?: string;
-    content: ArrayBuffer | string;
+    content: ArrayBuffer | Uint8Array | string;
     encoding?: "base64" | "utf8";
 };
 

package/src/address-parser.js

@@ -142,13 +142,13 @@ function _handleAddress(tokens, depth) {
             }
         }
 
-        // If there's still is no text but a comment exixts, replace the two
+        // If there's still no text but a comment exists, replace the two
         if (!data.text.length && data.comment.length) {
             data.text = data.comment;
             data.comment = [];
         }
 
-        // Keep only the first address occurence, push others to regular text
+        // Keep only the first address occurrence, push others to regular text
         if (data.address.length > 1) {
             data.text = data.text.concat(data.address.splice(1));
         }
@@ -159,30 +159,34 @@ function _handleAddress(tokens, depth) {
 
         if (!data.address && /^=\?[^=]+?=$/.test(data.text.trim())) {
             // try to extract words from text content
-            const parsedSubAddresses = addressParser(decodeWords(data.text));
-            if (parsedSubAddresses && parsedSubAddresses.length) {
-                return parsedSubAddresses;
+            const decodedText = decodeWords(data.text);
+            // Security: only re-parse if decoded text contains angle-bracket addresses.
+            // Without this, a bare encoded email (e.g. =?utf-8?B?dGVzdEBldmlsLmNv?=)
+            // would be fabricated into an address from attacker-controlled input.
+            if (/<[^<>]+@[^<>]+>/.test(decodedText)) {
+                const parsedSubAddresses = addressParser(decodedText);
+                if (parsedSubAddresses && parsedSubAddresses.length) {
+                    return parsedSubAddresses;
+                }
             }
+            // No usable address found - treat decoded text as display name only
+            return [{ address: '', name: decodedText }];
         }
 
-        if (!data.address && isGroup) {
-            return [];
-        } else {
-            address = {
-                address: data.address || data.text || '',
-                name: decodeWords(data.text || data.address || '')
-            };
+        address = {
+            address: data.address || data.text || '',
+            name: decodeWords(data.text || data.address || '')
+        };
 
-            if (address.address === address.name) {
-                if ((address.address || '').match(/@/)) {
-                    address.name = '';
-                } else {
-                    address.address = '';
-                }
+        if (address.address === address.name) {
+            if ((address.address || '').match(/@/)) {
+                address.name = '';
+            } else {
+                address.address = '';
             }
-
-            addresses.push(address);
         }
+
+        addresses.push(address);
     }
 
     return addresses;
@@ -280,7 +284,7 @@ class Tokenizer {
             this.operatorExpecting = this.operators[chr];
             this.escaped = false;
             return;
-        } else if (['"', "'"].includes(this.operatorExpecting) && chr === '\\') {
+        } else if (this.operatorExpecting === '"' && chr === '\\') {
             this.escaped = true;
             return;
         }

package/src/base64-decoder.js

@@ -16,9 +16,7 @@ export default class Base64Decoder {
     update(buffer) {
         let str = this.decoder.decode(buffer);
 
-        if (/[^a-zA-Z0-9+\/]/.test(str)) {
-            str = str.replace(/[^a-zA-Z0-9+\/]+/g, '');
-        }
+        str = str.replace(/[^a-zA-Z0-9+\/]+/g, '');
 
         this.remainder += str;
 

package/src/decode-strings.js

@@ -4,7 +4,7 @@ const base64Chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456
 
 // Use a lookup table to find the index.
 const base64Lookup = new Uint8Array(256);
-for (var i = 0; i < base64Chars.length; i++) {
+for (let i = 0; i < base64Chars.length; i++) {
     base64Lookup[base64Chars.charCodeAt(i)] = i;
 }
 

package/src/mime-node.js

@@ -3,6 +3,8 @@ import PassThroughDecoder from './pass-through-decoder.js';
 import Base64Decoder from './base64-decoder.js';
 import QPDecoder from './qp-decoder.js';
 
+const defaultDecoder = getDecoder();
+
 export default class MimeNode {
     constructor(options) {
         this.options = options || {};
@@ -233,7 +235,7 @@ export default class MimeNode {
                 // remove soft linebreaks
                 // soft linebreaks are added after space symbols
                 .reduce((previousValue, currentValue) => {
-                    if (/ $/.test(previousValue) && !/(^|\n)-- $/.test(previousValue)) {
+                    if (previousValue.endsWith(' ') && previousValue !== '-- ' && !previousValue.endsWith('\n-- ')) {
                         if (delSp) {
                             // delsp adds space to text to be able to fold it
                             // these spaces can be removed once the text is unfolded
@@ -360,7 +362,7 @@ export default class MimeNode {
                     throw error;
                 }
 
-                this.headerLines.push(getDecoder().decode(line));
+                this.headerLines.push(defaultDecoder.decode(line));
                 break;
             case 'body': {
                 // add line to body

package/src/postal-mime.js

@@ -9,6 +9,10 @@ export { addressParser, decodeWords };
 const MAX_NESTING_DEPTH = 256;
 const MAX_HEADERS_SIZE = 2 * 1024 * 1024;
 
+function toCamelCase(key) {
+    return key.replace(/-(.)/g, (o, c) => c.toUpperCase());
+}
+
 export default class PostalMime {
     static parse(buf, options) {
         const parser = new PostalMime(options);
@@ -76,9 +80,11 @@ export default class PostalMime {
                 let boundaryEnd = boundary.value.length + 2;
                 let isTerminator = false;
 
-                if (line.length >= boundary.value.length + 4 &&
+                if (
+                    line.length >= boundary.value.length + 4 &&
                     line[boundary.value.length + 2] === 0x2d &&
-                    line[boundary.value.length + 3] === 0x2d) {
+                    line[boundary.value.length + 3] === 0x2d
+                ) {
                     isTerminator = true;
                     boundaryEnd = boundary.value.length + 4;
                 }
@@ -130,13 +136,6 @@ export default class PostalMime {
         let startPos = this.readPos;
         let endPos = this.readPos;
 
-        let res = () => {
-            return {
-                bytes: new Uint8Array(this.buf, startPos, endPos - startPos),
-                done: this.readPos >= this.av.length
-            };
-        };
-
         while (this.readPos < this.av.length) {
             const c = this.av[this.readPos++];
 
@@ -145,11 +144,17 @@ export default class PostalMime {
             }
 
             if (c === 0x0a) {
-                return res();
+                return {
+                    bytes: new Uint8Array(this.buf, startPos, endPos - startPos),
+                    done: this.readPos >= this.av.length
+                };
             }
         }
 
-        return res();
+        return {
+            bytes: new Uint8Array(this.buf, startPos, endPos - startPos),
+            done: this.readPos >= this.av.length
+        };
     }
 
     async processNodeTree() {
@@ -220,7 +225,9 @@ export default class PostalMime {
                 // is it an attachment
                 else if (node.content) {
                     const filename =
-                        node.contentDisposition?.parsed?.params?.filename || node.contentType.parsed.params.name || null;
+                        node.contentDisposition?.parsed?.params?.filename ||
+                        node.contentType.parsed.params.name ||
+                        null;
                     const attachment = {
                         filename: filename ? decodeWords(filename) : null,
                         mimeType: node.contentType.parsed.value,
@@ -274,7 +281,7 @@ export default class PostalMime {
             }
         };
 
-        await walk(this.root, false, []);
+        await walk(this.root, false, false);
 
         textMap.forEach(mapEntry => {
             textTypes.forEach(textType => {
@@ -471,7 +478,9 @@ export default class PostalMime {
         await this.processNodeTree();
 
         const message = {
-            headers: this.root.headers.map(entry => ({ key: entry.key, value: entry.value })).reverse()
+            headers: this.root.headers
+                .map(entry => ({ key: entry.key, originalKey: entry.originalKey, value: entry.value }))
+                .reverse()
         };
 
         for (const key of ['from', 'sender']) {
@@ -489,7 +498,7 @@ export default class PostalMime {
             if (addressHeader && addressHeader.value) {
                 const addresses = addressParser(addressHeader.value);
                 if (addresses && addresses.length && addresses[0].address) {
-                    const camelKey = key.replace(/\-(.)/g, (o, c) => c.toUpperCase());
+                    const camelKey = toCamelCase(key);
                     message[camelKey] = addresses[0].address;
                 }
             }
@@ -505,7 +514,7 @@ export default class PostalMime {
                 .forEach(parsed => (addresses = addresses.concat(parsed || [])));
 
             if (addresses && addresses.length) {
-                const camelKey = key.replace(/\-(.)/g, (o, c) => c.toUpperCase());
+                const camelKey = toCamelCase(key);
                 message[camelKey] = addresses;
             }
         }
@@ -513,7 +522,7 @@ export default class PostalMime {
         for (const key of ['subject', 'message-id', 'in-reply-to', 'references']) {
             const header = this.root.headers.find(line => line.key === key);
             if (header && header.value) {
-                const camelKey = key.replace(/\-(.)/g, (o, c) => c.toUpperCase());
+                const camelKey = toCamelCase(key);
                 message[camelKey] = decodeWords(header.value);
             }
         }
@@ -521,7 +530,7 @@ export default class PostalMime {
         let dateHeader = this.root.headers.find(line => line.key === 'date');
         if (dateHeader) {
             let date = new Date(dateHeader.value);
-            if (!date || date.toString() === 'Invalid Date') {
+            if (date.toString() === 'Invalid Date') {
                 date = dateHeader.value;
             } else {
                 // enforce ISO format if seems to be a valid date
@@ -567,7 +576,7 @@ export default class PostalMime {
                 break;
 
             default:
-                throw new Error('Unknwon attachment encoding');
+                throw new Error('Unknown attachment encoding');
         }
 
         return message;

package/src/qp-decoder.js

@@ -81,7 +81,6 @@ export default class QPDecoder {
         }
         if (encodedBytes.length) {
             this.chunks.push(this.decodeQPBytes(encodedBytes));
-            encodedBytes = [];
         }
     }
 

package/src/text-format.js

@@ -20,7 +20,7 @@ export function decodeHTMLEntities(str) {
             codePoint = parseInt(entity.substr(1), 10);
         }
 
-        var output = '';
+        let output = '';
 
         if ((codePoint >= 0xd800 && codePoint <= 0xdfff) || codePoint > 0x10ffff) {
             // Invalid range, return a replacement character instead