diff --git a/codec-http/src/main/java/io/netty/handler/codec/http/HttpMessageDecoder.java b/codec-http/src/main/java/io/netty/handler/codec/http/HttpMessageDecoder.java
index e0a5a40f0b..f9de2fca24 100644
--- a/codec-http/src/main/java/io/netty/handler/codec/http/HttpMessageDecoder.java
+++ b/codec-http/src/main/java/io/netty/handler/codec/http/HttpMessageDecoder.java
@@ -368,14 +368,13 @@ public abstract class HttpMessageDecoder extends ReplayingDecoder<HttpMessageDec
         if (msg instanceof HttpResponse) {
             HttpResponse res = (HttpResponse) msg;
             int code = res.getStatus().getCode();
-            if (code < 200) {
-                // Old Web Socket upgrade response had 16-byte fixed length content.
-                // See https://github.com/netty/netty/issues/222
-                if (code == 101 &&
-                    res.containsHeader(HttpHeaders.Names.SEC_WEBSOCKET_ORIGIN) &&
-                    res.containsHeader(HttpHeaders.Names.SEC_WEBSOCKET_LOCATION)) {
-                    return false;
-                }
+            
+            // Correctly handle return codes of 1xx.
+            // 
+            // See: 
+            //     - http://www.w3.org/Protocols/rfc2616/rfc2616-sec4.html Section 4.4
+            //     - https://github.com/netty/netty/issues/222
+            if (!isDecodingRequest() && code >= 100 && code < 200) {
                 return true;
             }