From c6b1ffe7e7684cbe24a37e0595e18f87a75ca3b0 Mon Sep 17 00:00:00 2001
From: Brian White <mscdex@mscdex.net>
Date: Thu, 3 Jan 2013 23:33:36 -0500
Subject: [PATCH] even more fetch() fixes

---
 lib/imap.js         | 2 +-
 lib/imap.parsers.js | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/lib/imap.js b/lib/imap.js
index 8fdde45..fa846c1 100644
--- a/lib/imap.js
+++ b/lib/imap.js
@@ -330,8 +330,8 @@ ImapConnection.prototype.connect = function(loginCb) {
             for (body = 0, lenb = bodies.length; body < lenb; body += 2) {
               fetches = requests[0].fetchers[bodies[body]];
               val = bodies[body + 1];
-
               for (var i=0, len=fetches.length; i<len; ++i) {
+                parsed = undefined;
                 if (!fetches[i]._msg)
                   fetches[i]._msg = new ImapMessage();
 
diff --git a/lib/imap.parsers.js b/lib/imap.parsers.js
index b973dbf..27e6824 100644
--- a/lib/imap.parsers.js
+++ b/lib/imap.parsers.js
@@ -80,6 +80,12 @@ exports.parseFetchBodies = function(str, literals) {
       bodies;
   for (var i=0,len=result.length; i<len; i+=2) {
     if (Array.isArray(result[i])) {
+      if (result[i].length > 1) {
+        // HEADER.FIELDS (foo)
+        result[i][0] += ' (';
+        result[i][0] += result[i].slice(1).join(' ');
+        result[i][0] += ')';
+      }
       if (bodies === undefined)
         bodies = ['BODY[' + result[i][0] + ']', result[i+1]];
       else {