/offlineimap/head: changeset 444

[offlineimap] / offlineimap / head / offlineimap / folder / IMAP.py

diff --git a/offlineimap/head/offlineimap/folder/IMAP.py b/offlineimap/head/offlineimap/folder/IMAP.py
index 6e043804470e0090a0736831658a62ac3a938cc0..34b4508c3538834dc786b7c82e5b6b4ea5488218 100644 (file)
--- a/offlineimap/head/offlineimap/folder/IMAP.py
+++ b/offlineimap/head/offlineimap/folder/IMAP.py
@@ -174,8 +174,7 @@ class IMAPFolder(BaseFolder):
                 # but some IMAP servers nonetheless choke on 1902.
                 date = imaplib.Time2Internaldate(time.localtime())
 
-            if content.find("\r\n") == -1:  # Convert line endings if not already
-                content = content.replace("\n", "\r\n")
+            content = re.sub("[^\r]\n", "\r\n", content)
 
             (headername, headervalue) = self.savemessage_getnewheader(content)
             content = self.savemessage_addheader(content, headername,