diff --git a/ChangeLog b/ChangeLog
index b1eb7a827..431944536 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-09-09  Pirmin Braun <pb@intars.de>
+
+        * Source/Additions/GSMime.m: When creating a child parser, pass on
+        the flag to say we are parsing HTTP rather than MIME.
+        
 2013-09-09  Richard Frith-Macdonald <rfm@gnu.org>
 
         * Source/Additions/GSMime.m: Add comments and a further fallback
diff --git a/Source/Additions/GSMime.m b/Source/Additions/GSMime.m
index 5afec9a6c..4dc5b975c 100644
--- a/Source/Additions/GSMime.m
+++ b/Source/Additions/GSMime.m
@@ -2370,10 +2370,14 @@ NSDebugMLLog(@"GSMime", @"Header parsed - %@", info);
 {
   DESTROY(child);
   child = [GSMimeParser new];
-  if (flags.buggyQuotes == 1)
+  if (1 == flags.buggyQuotes)
     {
       [child setBuggyQuotes: YES];
     }
+  if (1 == flags.isHttp)
+    {
+      [child setIsHttp];
+    }
   /*
    * Tell child parser the default encoding to use.
    */