I don't think that's the right fix here because the way this method is used (i.e. to create a stream of chunked messages from a single HttpMessage) it will duplicate the entity. We should use the mechanism we introduce above for signalling Content-Type for chunked start messages and use that one here in combination with an empty entity to transport the content-type.