diff --git a/VERSION b/VERSION
index 7dd31d74..94718922 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.00.0 (2012-07-31 22:02:48) dev
+Version 2.00.0 (2012-07-31 22:03:43) dev
diff --git a/applications/admin/static/js/ajax_editor.js b/applications/admin/static/js/ajax_editor.js
index 8790d847..8706cbd8 100644
--- a/applications/admin/static/js/ajax_editor.js
+++ b/applications/admin/static/js/ajax_editor.js
@@ -72,7 +72,7 @@ function doClickSave() {
 
 	        // show flash message (if any)
 	        var flash=xhr.getResponseHeader('web2py-component-flash');
-            if (flash) jQuery('.flash').html(flash).slideDown();
+            if (flash) jQuery('.flash').html(decodeURIComponent(flash)).slideDown();
             else jQuery('.flash').hide();
 
             // reenable disabled submit button
@@ -149,8 +149,8 @@ function doToggleBreakpoint(filename, url) {
 	  success: function(json,text,xhr){
 
 	        // show flash message (if any)
-	        var flash=decodeURIComponent(xhr.getResponseHeader('web2py-component-flash'));
-            if (flash) jQuery('.flash').html(flash).slideDown();
+	        var flash=xhr.getResponseHeader('web2py-component-flash');
+            if (flash) jQuery('.flash').html(decodeURIComponent(flash)).slideDown();
             else jQuery('.flash').hide();
 		    try {
 			if (json.error) {
diff --git a/gluon/main.py b/gluon/main.py
index a3779359..ee891c53 100644
--- a/gluon/main.py
+++ b/gluon/main.py
@@ -28,6 +28,7 @@ import socket
 import tempfile
 import random
 import string
+import urllib2
 
 from fileutils import abspath, write_file, parse_version
 from settings import global_settings
@@ -548,7 +549,7 @@ def wsgibase(environ, responder):
                 if request.cid:
                     if response.flash and not 'web2py-component-flash' in http_response.headers:
                         http_response.headers['web2py-component-flash'] = \
-                            str(response.flash).replace('\n','')
+                            urllib2.quote(str(response.flash).replace('\n',''))
                     if response.js and not 'web2py-component-command' in http_response.headers:
                         http_response.headers['web2py-component-command'] = \
                             response.js.replace('\n','')