From 86e9c7442bed8703e059cdcbd18bbea71c513ae8 Mon Sep 17 00:00:00 2001 From: Vladimir Marek Date: Tue, 26 Jul 2011 10:59:53 +0200 Subject: [PATCH] Include message header at better place It's not enough to place header after first newline, since this might break multiline rfc0822 folded long header lines. Those are difined as CRLF followed by white space. Instead we'll search for two successive CRLF sequences which mark end of mail headers and place our header just before that. Signed-off-by: Vladimir Marek Signed-off-by: Nicolas Sebrecht --- offlineimap/folder/IMAP.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/offlineimap/folder/IMAP.py b/offlineimap/folder/IMAP.py index 9297a7b..19a0340 100644 --- a/offlineimap/folder/IMAP.py +++ b/offlineimap/folder/IMAP.py @@ -276,7 +276,7 @@ class IMAPFolder(BaseFolder): self.ui.debug('imap', 'savemessage_addheader: called to add %s: %s' % (headername, headervalue)) - insertionpoint = content.find("\r\n") + insertionpoint = content.find("\r\n\r\n") self.ui.debug('imap', 'savemessage_addheader: insertionpoint = %d' % insertionpoint) leader = content[0:insertionpoint] self.ui.debug('imap', 'savemessage_addheader: leader = %s' % repr(leader))