diff --git a/felamimail/inc/class.uicompose.inc.php b/felamimail/inc/class.uicompose.inc.php
index fd24bf7a20..78cc02cb31 100644
--- a/felamimail/inc/class.uicompose.inc.php
+++ b/felamimail/inc/class.uicompose.inc.php
@@ -555,7 +555,7 @@
 			}
 			else
 			{	
-				$this->t->set_var("toggle_editormode", lang("Editor type").":&nbsp;<span><input name=\"_is_html\" value=\"".$ishtml."\" type=\"hidden\" /><input name=\"_editorselect\" onchange=\"fm_toggle_editor(this)\" ".($ishtml ? "checked=\"checked\"" : "")." id=\"_html\" value=\"html\" type=\"radio\"><label for=\"_html\">HTML</label><input name=\"_editorselect\" onchange=\"fm_toggle_editor(this)\" ".($ishtml ? "" : "checked=\"checked\"")." id=\"_plain\" value=\"plain\" type=\"radio\"><label for=\"_plain\">Plain text</label></span>");
+				$this->t->set_var("toggle_editormode", lang("Editor type").":&nbsp;<span><input name=\"_is_html\" value=\"".$ishtml."\" type=\"hidden\" /><input name=\"_editorselect\" onchange=\"fm_toggle_editor(this)\" onclick=\"fm_toggle_editor(this)\" ".($ishtml ? "checked=\"checked\"" : "")." id=\"_html\" value=\"html\" type=\"radio\"><label for=\"_html\">HTML</label><input name=\"_editorselect\" onchange=\"fm_toggle_editor(this)\" onclick=\"fm_toggle_editor(this)\" ".($ishtml ? "" : "checked=\"checked\"")." id=\"_plain\" value=\"plain\" type=\"radio\"><label for=\"_plain\">Plain text</label></span>");
 			}
 			$this->t->pparse("out","body_input");
 
diff --git a/felamimail/js/jscode/composeMessage.js b/felamimail/js/jscode/composeMessage.js
index 04140c8d36..70c305e002 100644
--- a/felamimail/js/jscode/composeMessage.js
+++ b/felamimail/js/jscode/composeMessage.js
@@ -677,6 +677,7 @@ function fm_set_editor_toggle_states()
 	}
 }
 
+var scaytStartup;
 // Toggle between the HTML and Plain Text editors
 function fm_toggle_editor(toggler)
 {
@@ -716,10 +717,17 @@ function fm_toggle_editor(toggler)
 		plaineditor.style.display = "none";
 		if (ckeditor)
 		{
-			// nothing to do
+			scaytStartup = ckeditor.config.scayt_autoStartup;
+			if (ckeditor.env.ie) ckeditor.config.scayt_autoStartup = false;
+			ckeditor.config.height = '338px'; // seems to fit the area
+			//ckeditor.config.resize_enabled = true;
 		}
 		else
 		{
+			scaytStartup = ckeditorConfig.scayt_autoStartup;
+			if (CKEDITOR.env.ie) ckeditorConfig.scayt_autoStartup = false;
+			ckeditorConfig.height = "338px"; // seems to fit the area
+			//ckeditorConfig.resize_enabled = true;
 			ckeditor = CKEDITOR.replace('body',ckeditorConfig);
 		}
 		//Copy the current ASCII data and recode it via a XAJAX request
@@ -735,7 +743,8 @@ function fm_toggle_editor(toggler)
 		//Copy the current HTML data and recode it via a XAJAX request
 		var existingHtml = ckeditor.getData();
 		var ckeditor_span = document.getElementById('cke_body');
-		ckeditor.setData('');
+		//ckeditor.config.scayt_autoStartup = false;
+		ckeditor.setData('&nbsp;',function(){this.checkDirty();},true);
 		//Hide the old editor		
 		ckeditor_span.style.display = "none";
 		// we need to destroy the ckeditor, as the/a submit is using the content of the ckeditor instance for content of body
@@ -797,7 +806,7 @@ function showPlainEditor(_content)
 	plaineditor.style.display = "block";
 
 	plaineditor.value = _content;
-
+	plaineditor.focus();
 	hideAjaxLoader(document.getElementById('editorArea'));
 }
 
@@ -808,6 +817,9 @@ function showHTMLEditor(_content)
 
 	//Set the new content
 	ckeditor.setData(_content);
+	//alert((typeof scaytStartup)+'->'+ scaytStartup);
+	ckeditor.focus();
+	if ( typeof scaytStartup == boolean ) ckeditor.config.scayt_autoStartup = scaytStartup;
 
 	//Toggle the plain editor visiblity
 	ckeditor_span.style.display = 'block';