4 files changed, 12 insertions, 23 deletions
diff --git a/skins/classic/functions.js b/skins/classic/functions.js
index 049e4d5d4..07df6391c 100644
--- a/skins/classic/functions.js
+++ b/skins/classic/functions.js
@@ -940,10 +940,7 @@ function percent_indicator(obj, data)
 };
 
 // Optional parameters used by TinyMCE
-var rcmail_editor_settings = {
-  skin: "default", // "default", "o2k7"
-  skin_variant: "" // "", "silver", "black"
-};
+var rcmail_editor_settings = {};
 
 var rcmail_ui;
 
diff --git a/skins/classic/mail.css b/skins/classic/mail.css
index 7f96289dd..a640c0817 100644
--- a/skins/classic/mail.css
+++ b/skins/classic/mail.css
@@ -1520,15 +1520,11 @@ div.hide-headers
   outline: none;
 }
 
-#compose-body_tbl,
-#compose-body_tbl td
+.mce-container.mce-panel
 {
   border: none;
-}
-
-#compose-body_tbl tr.mceFirst td.mceToolbar
-{
   border-bottom: 1px solid #ccc;
+  background-image: none;
 }
 
 #compose-headers
diff --git a/skins/larry/mail.css b/skins/larry/mail.css
index 8e6e78e77..3f8a3905e 100644
--- a/skins/larry/mail.css
+++ b/skins/larry/mail.css
@@ -1548,16 +1548,12 @@ div.message-partheaders .headers-table td.header {
 	padding-bottom: 8px;
 }
 
-.defaultSkin table.mceLayout,
-.defaultSkin table.mceLayout tr.mceLast td {
+#composebodycontainer .mce-tinymce {
 	border: 0 !important;
 }
 
-.defaultSkin td.mceToolbar {
-	border: 0 !important;
-}
-
-.defaultSkin table.mceLayout tr.mceFirst td {
+#composebodycontainer .mce-panel {
+	border-color: #ccc !important;
 	background: #f0f0f0;
 }
 
diff --git a/skins/larry/ui.js b/skins/larry/ui.js
index 44fc727f6..a173ffd1d 100644
--- a/skins/larry/ui.js
+++ b/skins/larry/ui.js
@@ -517,19 +517,19 @@ function rcube_mail_ui()
       w, h, bh, ovflw, btns = 0,
       minheight = 300,
 
-    bh = (form.height() - bottom.position().top);
+    bh = form.height() - bottom.position().top;
     ovflw = minheight - bh;
     btns = ovflw > -100 ? 0 : 40;
-    bottom.css('height', Math.max(minheight, bh) + 'px');
+    bottom.height(Math.max(minheight, bh));
     form.css('overflow', ovflw > 0 ? 'auto' : 'hidden');
 
     w = body.parent().width() - 5;
-    h = body.parent().height() - 16;
+    h = body.parent().height() - 8;
     body.width(w).height(h);
 
-    $('#composebody_tbl').width((w+8)+'px').height('').css('margin-top', '1px');
-    $('#composebody_ifr').width((w+8)+'px').height((h-40)+'px');
-    $('#googie_edit_layer').height(h+'px');
+    $('#composebodycontainer > div').width(w+8).css('margin-top', '1px');
+    $('#composebody_ifr').height(h + 4 - $('.mce-toolbar-grp').height());
+    $('#googie_edit_layer').height(h - 8);
 //    $('#composebodycontainer')[(btns ? 'addClass' : 'removeClass')]('buttons');
 //    $('#composeformbuttons')[(btns ? 'show' : 'hide')]();