diff --git a/ChangeLog b/ChangeLog
index 380e433cf..e11c9b2ad 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-06-26  Cyril Robert <crobert@inverse.ca>
+
+	* UI/WebServerResources/UIxPreferences.js: Fixed a bug when
+	ComposeMessagesType isn't set, removed an "alert"
+
 2009-06-25  Cyril Robert <crobert@inverse.ca>
 
 	* SoObjects/Mailer/SOGoMailReply.m: Added proper blockquote
diff --git a/UI/WebServerResources/UIxPreferences.js b/UI/WebServerResources/UIxPreferences.js
index 50b76d0a3..745fa2cc7 100644
--- a/UI/WebServerResources/UIxPreferences.js
+++ b/UI/WebServerResources/UIxPreferences.js
@@ -50,12 +50,10 @@ function initPreferences() {
 
   $("composeMessagesType").observe ("change", onComposeMessagesTypeChange);
 
-  alert (UserDefaults["ComposeMessagesType"]);
-  if (UserDefaults["ComposeMessagesType"] != "html") {
-    $("signature").style.display = 'block';
-    $("signature").style.visibility = '';
-    $('cke_signature').style.display = 'none';
-  }
+  if (!UserDefaults["ComposeMessagesType"])
+    UserDefaults["ComposeMessagesType"] = "text";
+
+  onComposeMessagesTypeChange ();
 }
 
 function onReplyPlacementListChange() {
@@ -72,6 +70,11 @@ function onReplyPlacementListChange() {
 function onComposeMessagesTypeChange () {
   var textArea = $('signature');
   var editor = $('cke_signature');
+
+  if (!editor) {
+    setTimeout ("onComposeMessagesTypeChange ()", 10);
+    return;
+  }
  
   if ($("composeMessagesType").value == 0) {
     textArea.style.display = 'block';