diff --git a/offlineimap/head/debian/changelog b/offlineimap/head/debian/changelog
index 5ff76ce..686af07 100644
--- a/offlineimap/head/debian/changelog
+++ b/offlineimap/head/debian/changelog
@@ -1,6 +1,8 @@
 offlineimap (3.0.4) unstable; urgency=low
 
-  * Placeholder
+  * When uploading messages from a Maildir, now convert \r\n to \n in case
+    the message is stored weirdly.  That way, everything is uniform.
+    Fixes [complete.org #11].
 
  -- John Goerzen <jgoerzen@complete.org>  Sun, 21 Jul 2002 16:09:42 -0500
 
diff --git a/offlineimap/head/offlineimap/folder/Maildir.py b/offlineimap/head/offlineimap/folder/Maildir.py
index a8d169f..22e463f 100644
--- a/offlineimap/head/offlineimap/folder/Maildir.py
+++ b/offlineimap/head/offlineimap/folder/Maildir.py
@@ -130,7 +130,7 @@ class MaildirFolder(BaseFolder):
         file = open(filename, 'rt')
         retval = file.read()
         file.close()
-        return retval
+        return retval.replace("\r\n", "\n")
 
     def savemessage(self, uid, content, flags):
         if uid < 0: