X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=imap-send.c;h=9d0097ca02960460ff3a104f1739982fee453987;hb=53dfac44c93d5861f0ab60fc38e1a2d3b67e8c62;hp=7107923a39247b5c18ad443dc2309971e44abdb4;hpb=a59cb82a2f77c510d62d7d27f197451545f386ab;p=git.git

diff --git a/imap-send.c b/imap-send.c
index 7107923a3..9d0097ca0 100644
--- a/imap-send.c
+++ b/imap-send.c
@@ -1431,8 +1431,14 @@ static int count_messages(struct msg_data *msg)
 
 	while (1) {
 		if (!prefixcmp(p, "From ")) {
+			p = strstr(p+5, "\nFrom: ");
+			if (!p) break;
+			p = strstr(p+7, "\nDate: ");
+			if (!p) break;
+			p = strstr(p+7, "\nSubject: ");
+			if (!p) break;
+			p += 10;
 			count++;
-			p += 5;
 		}
 		p = strstr(p+5, "\nFrom ");
 		if (!p)