diff --git a/exec/imapservice.js b/exec/imapservice.js
index 4b5ea5a3046ccf6fe4f805901ce8025acc28111c..9d3c8853df3d5266b1bf737244fd2efede6c3f39 100644
--- a/exec/imapservice.js
+++ b/exec/imapservice.js
@@ -56,6 +56,7 @@ MsgBase.HeaderPrototype.get_envelope=function (force)
 			return("NIL");
 
 		header=header.pop().replace(new RegExp("^"+abnf.field_name+abnf.WSP+"*:","i"),"");
+		header=header.replace(/\r\n$/,'');
 		header=strip_CFWS(header);
 
 		/* : Use mime.js ABNF to parse this correctly */
@@ -758,8 +759,8 @@ any_state_command_handlers = {
 			client.socket.send("+ Ooo, Idling... my favorite.\r\n");
 			while(1) {
 				line=client.socket.recvline(10240, 5);
-				if(line != null) {
-					debug_log("DONE IDLE: "+line, true);
+				if(line != undefined && line != '') {
+					debug_log("DONE IDLE: '"+line+"'", true);
 					tagged(tag, "OK", "That was fun.");
 					return;
 				}