diff --git a/ChangeLog b/ChangeLog
index d1b8b30dc..380e433cf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,7 @@
 	* UI/WebServerResources/UIxMailEditor.js: Use CKeditor
 	* SoObjects/Mailer/SOGoMailForward.m: Added htmlComposition property,
 	changed almost all methods to escape what needsto be escaped.
+	* UI/WebServerResources/UIxPreferences.js: Fixed CKeditor toggle issue
 
 2009-06-23  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
diff --git a/UI/WebServerResources/UIxPreferences.js b/UI/WebServerResources/UIxPreferences.js
index 5408eea1a..50b76d0a3 100644
--- a/UI/WebServerResources/UIxPreferences.js
+++ b/UI/WebServerResources/UIxPreferences.js
@@ -50,8 +50,10 @@ function initPreferences() {
 
   $("composeMessagesType").observe ("change", onComposeMessagesTypeChange);
 
+  alert (UserDefaults["ComposeMessagesType"]);
   if (UserDefaults["ComposeMessagesType"] != "html") {
-    $("signature").style.display = 'inline';
+    $("signature").style.display = 'block';
+    $("signature").style.visibility = '';
     $('cke_signature').style.display = 'none';
   }
 }
@@ -68,20 +70,18 @@ function onReplyPlacementListChange() {
 }
 
 function onComposeMessagesTypeChange () {
-/*  var textArea = $('signature');
-  var oEditor = CKeditorAPI.GetInstance('signature');
+  var textArea = $('signature');
   var editor = $('cke_signature');
  
   if ($("composeMessagesType").value == 0) {
-    textArea.style.display = 'inline';
+    textArea.style.display = 'block';
+    textArea.style.visibility = '';
     editor.style.display = 'none';
-    textArea.value = oEditor.GetData();
   }
   else {
     textArea.style.display = 'none';
-    editor.style.display = '';
-    oEditor.SetHTML(textArea.value);
-  }*/
+    editor.style.display = 'block';
+  }
 }
 
 document.observe("dom:loaded", initPreferences);