Merge branch 'jc/send-email'

diff --git a/imap-send.c b/imap-send.c
index 362e4743740435dc0e5b08933c0e05c53b7b62af..16804ab286a42c0dc2733dccf816ab2173e465af 100644 (file)
--- 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;