From 140596178c5dea3ef6d42b2edf76c9c785bcb702 Mon Sep 17 00:00:00 2001
From: Nikolaus Schulz <microschulz@web.de>
Date: Thu, 28 Sep 2006 23:31:47 +0000
Subject: Convert on-the-wire CRLF to native EOL when saving messages from an
 IMAP folder.

---
 archivemail.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'archivemail.py')

diff --git a/archivemail.py b/archivemail.py
index 81ab69a..9a36004 100755
--- a/archivemail.py
+++ b/archivemail.py
@@ -1270,7 +1270,10 @@ def _archive_imap(mailbox_name, final_archive_name):
     for msg_id in message_list:
         result, response = imap_srv.fetch(msg_id, '(RFC822 FLAGS)')
         if result != 'OK': unexpected_error("Failed to fetch message")
-        msg_str = response[0][1]
+        if "\r\n" == os.linesep:
+            msg_str = response[0][1]
+        else:
+            msg_str = response[0][1].replace("\r\n", os.linesep)
         msg_flags = imaplib.ParseFlags(response[1])
         msg = rfc822.Message(cStringIO.StringIO(msg_str))
         add_status_headers_imap(msg, msg_flags)
-- 
cgit v1.2.3