X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=imap-send.c;h=16804ab286a42c0dc2733dccf816ab2173e465af;hb=151602df00b8e5c5b4a8193f59a94b85f9b5aebc;hp=362e4743740435dc0e5b08933c0e05c53b7b62af;hpb=69de8cc8527dc45a7aef76e8f1ace45b509b3712;p=git.git

diff --git a/imap-send.c b/imap-send.c
index 362e47437..16804ab28 100644
--- a/imap-send.c
+++ b/imap-send.c
@@ -1226,6 +1226,14 @@ split_msg( msg_data_t *all_msgs, msg_data_t *msg, int *ofs )
 	if (msg->len < 5 || strncmp( data, "From ", 5 ))
 		return 0;
 
+	p = strchr( data, '\n' );
+	if (p) {
+		p = &p[1];
+		msg->len -= p-data;
+		*ofs += p-data;
+		data = p;
+	}
+
 	p = strstr( data, "\nFrom " );
 	if (p)
 		msg->len = &p[1] - data;