diff --git a/VERSION b/VERSION
index 9bced999..86c22746 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.3.0 (2012-12-06 16:55:43) rc1
+Version 2.3.0 (2012-12-06 23:01:24) rc1
diff --git a/gluon/main.py b/gluon/main.py
index 58df9dfa..baa82ff5 100644
--- a/gluon/main.py
+++ b/gluon/main.py
@@ -577,9 +577,12 @@ def wsgibase(environ, responder):
 
                 if request.cid:
                     if response.flash:
-                        http_response.headers['web2py-component-flash'] = urllib2.quote(xmlescape(response.flash).replace('\n', ''))
+                        http_response.headers['web2py-component-flash'] = \
+                            urllib2.quote(xmlescape(response.flash)\
+                                              .replace('\n',''))
                     if response.js:
-                        http_response.headers['web2py-component-command'] = response.js.replace('\n', '')
+                        http_response.headers['web2py-component-command'] = \
+                            urllib2.quote(response.js.replace('\n',''))
 
                 # ##################################################
                 # store cookies in headers