diff --git a/program/js/editor.js b/program/js/editor.js
index 13298cd29..7b22c9e8e 100644
--- a/program/js/editor.js
+++ b/program/js/editor.js
@@ -35,26 +35,6 @@ function rcmail_editor_init(skin_path, editor_lang)
                });
   }
 
-// Set the state of the HTML/Plain toggles based on the _is_html field value
-function rcmail_set_editor_toggle_states()
-  {
-  // set the editor toggle based on the state of the editor
-
-  var htmlFlag = document.getElementsByName('_is_html')[0];
-  var toggles = document.getElementsByName('_editorSelect');
-  for(var t=0; t<toggles.length; t++)
-    {
-	if (toggles[t].value == 'html')
-	  {
-	  toggles[t].checked = (htmlFlag.value == "1");
-	  }
-	else
-	  {
-	  toggles[t].checked = (htmlFlag.value == "0");
-	  }
-	}
-  }
-
 // Toggle between the HTML and Plain Text editors
 
 function rcmail_toggle_editor(toggler)
@@ -62,7 +42,6 @@ function rcmail_toggle_editor(toggler)
   var selectedEditor = toggler.value;
 
   // determine the currently displayed editor
-
   var htmlFlag = document.getElementsByName('_is_html')[0];
   var isHtml = htmlFlag.value;
 
diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc
index 9989a82b6..1189c991e 100644
--- a/program/steps/mail/compose.inc
+++ b/program/steps/mail/compose.inc
@@ -825,7 +825,7 @@ function rcmail_editor_selector($attrib)
   $selector = '';
   
   $attrib['name'] = '_editorSelect';
-  $attrib['onchange'] = 'return rcmail_toggle_editor(this)';
+  $attrib['onclick'] = 'return rcmail_toggle_editor(this)';
   foreach ($choices as $value => $text)
   {
     $attrib['id'] = '_' . $value;