diff --git a/lib/imap.js b/lib/imap.js
index 738d9d3..1520048 100644
--- a/lib/imap.js
+++ b/lib/imap.js
@@ -28,6 +28,7 @@ var CRLF = '\r\n',
     RE_TEXT_CODE = /([^ ]+)(?: (.*))?$/,
     RE_RES_IDLE = /^IDLE /i,
     RE_RES_NOOP = /^NOOP /i,
+    RE_CMD_FETCH = /^(?:UID )?FETCH/i,
     RE_PARTID = /^(?:[\d]+[\.]{0,1})*[\d]+$/,
     //RE_ISPARTIAL = /<(\d+)>$/,
     RE_DBLQ = /"/g,
@@ -323,7 +324,8 @@ ImapConnection.prototype.connect = function(loginCb) {
                 details, val;
 
             isUnsolicited = isUnsolicited
-                            || (requests[0] && requests[0].cmd !== 'FETCH');
+                            || (requests[0]
+                                && !RE_CMD_FETCH.test(requests[0].cmdstr));
 
             if (!isUnsolicited)
               bodies = parsers.parseFetchBodies(m.info, indata.literals);