diff --git a/include/network/protocol/http/client/connection/async_normal.ipp b/include/network/protocol/http/client/connection/async_normal.ipp
index a99680632..5366532df 100644
--- a/include/network/protocol/http/client/connection/async_normal.ipp
+++ b/include/network/protocol/http/client/connection/async_normal.ipp
@@ -430,20 +430,44 @@ struct http_async_connection_pimpl : boost::enable_shared_from_this<http_async_c
                           placeholders::bytes_transferred)));
             } else {
               NETWORK_MESSAGE("no callback provided, appending to body...");
+              bool get_more = true;
+              if (content_length_) {
+                buffer_type::const_iterator begin = this->part.begin();
+                buffer_type::const_iterator end = begin;
+                std::advance(end, bytes_transferred);
+                get_more = (end - begin) < *content_length_;
+                NETWORK_MESSAGE("content_length = " << * content_length_ 
+                  << ", bytes read = " << (end - begin) << ", read more = " << get_more);
+              }
               // Here we don't have a body callback. Let's
               // make sure that we deal with the remainder
               // from the headers part in case we do have data
               // that's still in the buffer.
-              this->parse_body(request_strand_.wrap(
-                                   boost::bind(
-                                       &this_type::handle_received_data,
-                                       this_type::shared_from_this(),
-                                       body,
-                                       get_body,
-                                       callback,
-                                       placeholders::error,
-                                       placeholders::bytes_transferred)),
-                               bytes_transferred);
+              if (get_more) {
+                this->parse_body(request_strand_.wrap(
+                                     boost::bind(
+                                         &this_type::handle_received_data,
+                                         this_type::shared_from_this(),
+                                         body,
+                                         get_body,
+                                         callback,
+                                         placeholders::error,
+                                         placeholders::bytes_transferred)),
+                                 bytes_transferred);
+              } else {
+                std::string body_string;
+                std::swap(body_string, this->partial_parsed);
+                body_string.append(
+                  this->part.begin()
+                  , bytes_transferred
+                  );
+                this->body_promise.set_value(body_string);                
+                // TODO set the destination value somewhere!
+                this->destination_promise.set_value("");
+                this->source_promise.set_value("");
+                this->part.assign('\0');
+                this->response_parser_.reset();
+              }
             }
           }
           return;
@@ -709,6 +733,21 @@ struct http_async_connection_pimpl : boost::enable_shared_from_this<http_async_c
       boost::trim(header_pair.second);
       headers.insert(header_pair);
     }
+    // Set content length
+    content_length_ = boost::none;
+    auto it = headers.find("Content-Length");
+    if (it != headers.end()) {
+      try {
+        content_length_ = std::stoul(it->second);
+        NETWORK_MESSAGE("Content-Length: " << *content_length_);
+      } catch(const std::invalid_argument&) {
+        NETWORK_MESSAGE("invalid argument exception while interpreting " 
+          << it->second << " as content length");
+      } catch(const std::out_of_range&) {
+        NETWORK_MESSAGE("out of range exception while interpreting " 
+          << it->second << " as content length");
+      }
+    }
     headers_promise.set_value(headers);
   }
 
@@ -790,6 +829,7 @@ struct http_async_connection_pimpl : boost::enable_shared_from_this<http_async_c
   boost::promise<boost::uint16_t> status_promise;
   boost::promise<std::string> status_message_promise;
   boost::promise<std::multimap<std::string, std::string> > headers_promise;
+  boost::optional<size_t> content_length_;
   boost::promise<std::string> source_promise;
   boost::promise<std::string> destination_promise;
   boost::promise<std::string> body_promise;