2 files changed, 3 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index 54d7de2..9e2b321 100644
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,8 @@ News
 
   * Development:
 
+    * Handle CR-LF newline endings when parsing the headers.
+
     * Wrapper script for off-line mail delivery (Phil Sutter).
 
     * Document how to get CA certificates.
diff --git a/message.c b/message.c
index a52df85..b258c46 100644
--- a/message.c
+++ b/message.c
@@ -333,7 +333,7 @@ unsigned message_parse_headers(message_t *message)
 
 			start = stop;
 
-			if(line[0] == '\n')
+			if(line[0] == '\n' || line[0] == '\r')
 				return count;
 		}
 	}