diff --git a/Source/Additions/GSMime.m b/Source/Additions/GSMime.m
index bb77708d5..63b4f88ed 100644
--- a/Source/Additions/GSMime.m
+++ b/Source/Additions/GSMime.m
@@ -2385,9 +2385,9 @@ NSDebugMLLog(@"GSMime", @"Header parsed - %@", info);
 	  lineEnd = input++;
 	  if (input < dataEnd && c == '\r' && bytes[input] == '\n')
 	    {
-	      input++;
+	      c = bytes[input++];
 	    }
-	  if (input < dataEnd)
+	  if (input < dataEnd || (c == '\n' && lineEnd == lineStart))
 	    {
 	      unsigned	length = lineEnd - lineStart;