diff --git a/src/include/mailbox.cpp b/src/include/mailbox.cpp
index fac3f7b54..fa9d65916 100755
--- a/src/include/mailbox.cpp
+++ b/src/include/mailbox.cpp
@@ -47,7 +47,7 @@ void TMailbox::reread()
 
   // skip read messages
   mbox.seekg(_lastpos);
-  while (mbox.getline(buf, MAX_TXT_LEN -1) != NULL)
+  while (mbox.getline(buf, MAX_TXT_LEN -1).good())	 // (mbox.getline(buf, MAX_TXT_LEN -1) != NULL)	
   {
     // process new message
     TMessage* tmnew = new TMessage (NULL, NULL, NULL, buf);