diff --git a/lib/imap.js b/lib/imap.js
index 59b87b9..385a1e9 100644
--- a/lib/imap.js
+++ b/lib/imap.js
@@ -228,10 +228,10 @@ ImapConnection.prototype.connect = function(loginCb) {
   function emitMsgEnd(key) {
     var fetches = requests[0].fetchers[key];
     for (var i=0, len=fetches.length; i<len; ++i) {
-      if (fetches[i]._msg._ended)
-        continue;
-      fetches[i]._msg.emit('end');
-      fetches[i]._msg._ended = true;
+      if (fetches[i]._msg) {
+        fetches[i]._msg.emit('end');
+        fetches[i]._msg = undefined;
+      }
     }
   }