diff --git a/src/basicheaderframe.h b/src/basicheaderframe.h
index ac0f644..f6cc056 100644
--- a/src/basicheaderframe.h
+++ b/src/basicheaderframe.h
@@ -119,11 +119,14 @@ public:
         if (!message) return false;
         
         // store size
-        message->setBodySize(bodySize());
+        message->setBodySize(_bodySize);
         
         // and copy the meta data
         message->set(_metadata);
         
+        // for empty bodies we're ready now
+        if (_bodySize == 0) channel->reportMessage();
+        
         // done
         return true;
     }