diff --git a/ChangeLog b/ChangeLog
index 1f8e12fb8..82bbe17c2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,7 +3,7 @@
 	* Source/Additions/GSMime.h: improve consistency of naming of
 	methods with add/set methods for new headers.
 	* Source/GSHTTPURLHandle.m: ([bgdRead:]) if the headers are complete
-	and the status is 204, don't expect to read body content.
+	and there is no content-length, don't expect to read body content.
 
 2004-01-31  Manuel Guesdon <mguesdon@orange-concept.com>
 	* Source/NSNumber.m: Modified numberWithXX: methods
diff --git a/Source/GSHTTPURLHandle.m b/Source/GSHTTPURLHandle.m
index 482049348..3693c4f26 100644
--- a/Source/GSHTTPURLHandle.m
+++ b/Source/GSHTTPURLHandle.m
@@ -312,7 +312,7 @@ static void debugWrite(NSData *data)
     }
   else if ([parser isComplete] == YES
     || ([parser isInHeaders] == NO &&
-      [[[document headerNamed: @"http"] objectForKey: NSHTTPPropertyStatusCodeKey] intValue] == 204))
+      [[[document headerNamed: @"content-length"] value] intValue] > 0))
     {
       GSMimeHeader	*info;
       NSString		*val;