diff --git a/VERSION.txt b/VERSION.txt
index 04e8e877b2a..3c686cb8a9a 100644
--- a/VERSION.txt
+++ b/VERSION.txt
@@ -1,6 +1,7 @@
 jetty-7.0.0.RC4-SNAPSHOT 
  + 286185 Implement ability for JSON implementation to automatically register convertors
  + Added discoverable start options
+ + 286535 ContentExchange status code
 
 jetty-7.0.0.RC3 7 August 2009
  + 277403 remove system properties
diff --git a/jetty-client/src/main/java/org/eclipse/jetty/client/ContentExchange.java b/jetty-client/src/main/java/org/eclipse/jetty/client/ContentExchange.java
index 5e11073c7fb..05c6b772d81 100644
--- a/jetty-client/src/main/java/org/eclipse/jetty/client/ContentExchange.java
+++ b/jetty-client/src/main/java/org/eclipse/jetty/client/ContentExchange.java
@@ -62,25 +62,17 @@ public class ContentExchange extends CachedExchange
     protected void onResponseHeader(Buffer name, Buffer value) throws IOException
     {
         super.onResponseHeader(name,value);
-        int header = HttpHeaders.CACHE.getOrdinal(value);
+        int header = HttpHeaders.CACHE.getOrdinal(name);
         switch (header)
         {
             case HttpHeaders.CONTENT_LENGTH_ORDINAL:
                 _contentLength = BufferUtil.toInt(value);
                 break;
             case HttpHeaders.CONTENT_TYPE_ORDINAL:
-
                 String mime = StringUtil.asciiToLowerCase(value.toString());
                 int i = mime.indexOf("charset=");
                 if (i > 0)
-                {
-                    mime = mime.substring(i + 8);
-                    i = mime.indexOf(';');
-                    if (i > 0)
-                        mime = mime.substring(0,i);
-                }
-                if (mime != null && mime.length() > 0)
-                    _encoding = mime;
+                    _encoding = mime.substring(i + 8);
                 break;
         }
     }