diff --git a/mozilla/editor/ui/composer/content/editor.js b/mozilla/editor/ui/composer/content/editor.js
index c2d37faa32f..80c291221a0 100644
--- a/mozilla/editor/ui/composer/content/editor.js
+++ b/mozilla/editor/ui/composer/content/editor.js
@@ -415,8 +415,14 @@ function EditorViewSource()
 
 function EditorSetDocumentCharacterSet(aCharset)
 {
-  dump(aCharset);
-  editorShell.SetDocumentCharacterSet(aCharset);
+  if(window.editorShell &&
+     (! window.editorShell.documentModified) &&
+       editorShell.editorDocument.locatoin != "about:blank")
+  {
+    dump(aCharset);
+    editorShell.SetDocumentCharacterSet(aCharset);
+    editorShell.LoadUrl(editorShell.editorDocument.location);
+  }
 }