diff -Naur src/mail.c.org src/mail.c
--- src/mail.c.org	2003-12-19 05:57:01.000000000 +0100
+++ src/mail.c	2004-01-20 16:47:09.000000000 +0100
@@ -1376,7 +1378,15 @@
 		mbox->old_mail_count = 0;
 		while(fgets(buf, sizeof(buf), f))
 			{
-			if (is_multipart && !in_header)
+		
+			if (is_From_line(mbox, buf))
+				{
+				mbox->mail_count += 1;
+				in_header = TRUE;
+				marked_read = FALSE;
+				is_multipart = FALSE;
+				}
+			else if (is_multipart && !in_header)
 				{
 				/* Skip to last line of multipart mail */
 				if (strncmp(buf,mpart_sep,strlen(mpart_sep))==0)
@@ -1387,12 +1397,6 @@
 				in_header = FALSE;
 				mbox->is_internal = FALSE;
 				}
-			else if (is_From_line(mbox, buf))
-				{
-				mbox->mail_count += 1;
-				in_header = TRUE;
-				marked_read = FALSE;
-				}
 			else if (in_header && status_is_old(buf) && !marked_read)
 				{
 				mbox->old_mail_count += 1;