diff --git a/ChangeLog b/ChangeLog
index e7bff64c7..5507679ce 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-02-20  Francis Lachapelle  <flachapelle@inverse.ca>
+
+	* UI/WebServerResources/UIxMailEditor.js (onWindowResize): we now
+	make use of the ckeditor javascript api to reszie the container.
+
 2012-02-16  Francis Lachapelle  <flachapelle@inverse.ca>
 
 	* UI/WebServerResources/UIxAttendeesEditor.js (checkAttendee):
diff --git a/UI/WebServerResources/UIxMailEditor.css b/UI/WebServerResources/UIxMailEditor.css
index f6345dc2a..7d047bea8 100644
--- a/UI/WebServerResources/UIxMailEditor.css
+++ b/UI/WebServerResources/UIxMailEditor.css
@@ -127,7 +127,6 @@ hr.fieldSeparator
   border: 0;
   clear: both;
   color: #848284;
-  float: left;
   height: 1px;
   margin: 0px;
   padding: 0px;
@@ -179,14 +178,6 @@ UL#attachments LI
 UL#attachments LI IMG
 { vertical-align: bottom; }
 
-#pageContent TEXTAREA,
-#cke_text
-{ position: absolute;
-  left: 0;
-  right: 0;
-  bottom: 0;
-  /*top: 999em;*/ }
-
 #pageContent TEXTAREA
 { width: 99%; }
 
diff --git a/UI/WebServerResources/UIxMailEditor.js b/UI/WebServerResources/UIxMailEditor.js
index bab879bd0..e092a4577 100644
--- a/UI/WebServerResources/UIxMailEditor.js
+++ b/UI/WebServerResources/UIxMailEditor.js
@@ -622,6 +622,7 @@ function onWindowResize(event) {
     textarea.setStyle({ 'top': hr.offsetTop + 'px' });
 
     // Resize the textarea (message content)
+    var offsetTop = $('rightPanel').offsetTop + headerarea.getHeight();
     var composeMode = UserDefaults["SOGoMailComposeMessageType"];
     if (composeMode == "html") {
         var editor = $('cke_text');
@@ -629,23 +630,11 @@ function onWindowResize(event) {
             onWindowResize.defer();
             return;
         }
-        var ck_top = $("cke_top_text");
-        var ck_bottom = $("cke_bottom_text");
-        var content = $("cke_contents_text");
-        var top = hr.offsetTop;
-        var height = Math.floor(window.height() - top - ck_top.getHeight() - ck_bottom.getHeight());
-        height = height - 15;
-        
-        if (Prototype.Browser.IE) {
-            editor.style.width = '';
-            editor.style.height = '';
-        }
-
-        editor.setStyle({ top: (top + 2) + 'px' });
-        content.setStyle({ height: height + 'px' });
+        var height = window.height() - offsetTop;
+        CKEDITOR.instances["text"].resize('100%', height);
     }
     else
-        textarea.rows = Math.floor((window.height() - textarea.offsetTop) / rowheight);
+        textarea.rows = Math.floor((window.height() - offsetTop) / rowheight);
 
     // Resize search contacts addressbook selector
     if ($("contacts").visible())