diff --git a/Source/Additions/GSMime.m b/Source/Additions/GSMime.m
index c0a0404e0..37495f88a 100644
--- a/Source/Additions/GSMime.m
+++ b/Source/Additions/GSMime.m
@@ -841,7 +841,7 @@ wordData(NSString *word)
 	    case ChunkData:
 	      /*
 	       * If the pos is non-zero, we have a data chunk to read.
-	       * otherwise, what we actually want it to read footers.
+	       * otherwise, what we actually want is to read footers.
 	       */
 	      if (ctxt->pos > 0)
 		{
diff --git a/Source/GSHTTPURLHandle.m b/Source/GSHTTPURLHandle.m
index 94a8b1828..63c40e6c4 100644
--- a/Source/GSHTTPURLHandle.m
+++ b/Source/GSHTTPURLHandle.m
@@ -301,7 +301,7 @@ static void debugWrite(NSData *data)
   d = [dict objectForKey: NSFileHandleNotificationDataItem];
   if (debug == YES) debugRead(d);
 
-  if ([parser parse: d] == NO)
+  if ([parser parse: d] == NO || [parser isComplete] == YES)
     {
       if ([parser isComplete] == YES)
 	{