5 files changed, 74 insertions, 75 deletions
diff --git a/skins/default/editor_content.css b/skins/default/editor_content.css
index 8569b2fc6..14c2936d5 100644
--- a/skins/default/editor_content.css
+++ b/skins/default/editor_content.css
@@ -5,7 +5,7 @@ body, td, pre {
 	font-family: "Lucida Grande", Verdana,  Arial, Helvetica, sans-serif;
 	font-size: 12px;
 }
-  
+
 body {
 	background-color: #FFFFFF;
 	margin-left: 4px;
@@ -22,6 +22,7 @@ pre
 	white-space: pre;
 	word-wrap: break-word; /* IE (and Safari) */
 }
+
 blockquote
 {
 	padding-left:5px;
@@ -29,3 +30,4 @@ blockquote
 	margin-left:5px;
 	width:100%;
 }
+
diff --git a/skins/default/ie6hacks.css b/skins/default/ie6hacks.css
index 912eac48f..e3a824fed 100644
--- a/skins/default/ie6hacks.css
+++ b/skins/default/ie6hacks.css
@@ -115,7 +115,7 @@ ul.toolbarmenu li.separator_below
 
 #compose-div .boxlistcontent
 {
-  height: expression((parseInt(this.parentNode.offsetHeight)-28-parseInt(this.style.top?this.style.top:21))+'px');
+  height: expression((parseInt(this.parentNode.offsetHeight)-23-parseInt(this.style.top?this.style.top:21))+'px');
 }
 
 #directorylistbox
diff --git a/skins/default/iehacks.css b/skins/default/iehacks.css
index 7f6529921..2b2180fb9 100644
--- a/skins/default/iehacks.css
+++ b/skins/default/iehacks.css
@@ -161,12 +161,6 @@ body.iframe
   width: expression((parseInt(document.documentElement.clientWidth))+'px');
 }
 
-#compose-headers td textarea,
-#compose-headers td input
-{
-  width: 99%;
-}
-
 div.message-part pre,
 div.message-htmlpart pre,
 div.message-part div.pre
diff --git a/skins/default/mail.css b/skins/default/mail.css
index 1b83e03b4..03a80835a 100644
--- a/skins/default/mail.css
+++ b/skins/default/mail.css
@@ -830,6 +830,30 @@ body.messagelist
   color: #CCCCCC;
 }
 
+#listmenu
+{
+  padding: 6px;
+}
+
+#listmenu legend
+{
+  color: #999999;
+}
+
+#listmenu fieldset
+{
+  border: 1px solid #999999;
+  margin: 0 5px;
+  float: left;
+}
+
+#listmenu div
+{
+  padding: 8px 0 3px 0;
+  text-align: center;
+  clear: both;
+}
+
 /***** tree indicators *****/
 
 td span.branch div
@@ -861,7 +885,6 @@ td span.branch div.l3
 }
 
 
-
 /** message view styles */
 
 #messageframe
@@ -1089,6 +1112,38 @@ div.message-htmlpart div.rcmBody
   border: 0;
 }
 
+td.show-headers
+{
+  background: url(images/icons/down_small.gif) no-repeat center;
+}
+
+td.hide-headers
+{
+  background: url(images/icons/up_small.gif) no-repeat center;
+}
+
+#all-headers
+{
+  height: 150px;
+  display: none;
+}
+
+#headers-source
+{
+  margin: 0 5px;
+  padding: 0.5em;
+  height: 145px;
+  background: white;
+  overflow: auto;
+  font-size: 11px;
+  white-space: nowrap;
+  border: 1px solid #999999;
+  display: none;
+  text-align: left;
+  color: #333;
+}
+
+
 /** message compose styles */
 
 #compose-container
@@ -1112,14 +1167,14 @@ div.message-htmlpart div.rcmBody
 
 #compose-div .boxfooter
 {
-  height: 26px;
+  height: 22px;
   background: none;
   border-top: 0;
 }
 
 #compose-div .boxlistcontent
 {
-  bottom: 26px;
+  bottom: 23px;
 }
 
 #compose-body
@@ -1143,7 +1198,7 @@ div.message-htmlpart div.rcmBody
 
 #compose-headers td.editfield
 {
-  padding-right: 5px;
+  padding-right: 8px;
   width: 95%;
 }
 
@@ -1160,6 +1215,7 @@ div.message-htmlpart div.rcmBody
   font-weight: bold;
   padding-right: 10px;
   white-space: nowrap;
+  color: #666;
 }
 
 #compose-headers td textarea,
@@ -1182,12 +1238,6 @@ div.message-htmlpart div.rcmBody
   display: none;
 }
 
-#formlinks
-{
-  white-space: nowrap;
-  padding-left: 5px;
-}
-
 #formlinks a,
 #formlinks a:visited
 {
@@ -1205,11 +1255,18 @@ div.message-htmlpart div.rcmBody
 #compose-editorfooter
 {
   position: absolute;
-  right: 5px;
-  bottom: 2px;
+  right: 0;
+  bottom: 0;
   text-align: right;
 }
 
+#compose-editorfooter label
+{
+  font-size: 11px;
+  font-weight: bold;
+  color: #666;
+}
+
 #compose-buttons
 {
   position: absolute;
@@ -1273,60 +1330,6 @@ div.message-htmlpart div.rcmBody
   margin-top: 4px;
 }
 
-td.show-headers
-{
-  background: url(images/icons/down_small.gif) no-repeat center;
-}
-
-td.hide-headers
-{
-  background: url(images/icons/up_small.gif) no-repeat center;
-}
-
-#all-headers
-{
-  height: 150px;
-  display: none;
-}
-
-#headers-source
-{
-  margin: 0 5px;
-  padding: 0.5em;
-  height: 145px;
-  background: white;
-  overflow: auto;
-  font-size: 11px;
-  white-space: nowrap;
-  border: 1px solid #999999;
-  display: none;
-  text-align: left;
-  color: #333;
-}
-
-#listmenu
-{
-  padding: 6px;
-}
-
-#listmenu legend
-{
-  color: #999999;
-}
-
-#listmenu fieldset
-{
-  border: 1px solid #999999;
-  margin: 0 5px;
-  float: left;
-}
-
-#listmenu div
-{
-  padding: 8px 0 3px 0;
-  text-align: center;
-  clear: both;
-}
 
 /** quota indicator */
 
diff --git a/skins/default/templates/compose.html b/skins/default/templates/compose.html
index 4e167ce12..8d2c2509a 100644
--- a/skins/default/templates/compose.html
+++ b/skins/default/templates/compose.html
@@ -102,7 +102,7 @@
             <div id="compose-editorfooter">
                 <span id="spellcheck-control" style="margin-right:10px"></span>
                 <span>
-                    <roundcube:label name="editortype" />
+                    <label><roundcube:label name="editortype" /></label>
                     <roundcube:object name="editorSelector" editorid="compose-body" tabindex="10" />
                 </span>
             </div>