3 files changed, 35 insertions, 4 deletions
diff --git a/skins/default/functions.js b/skins/default/functions.js
index 603c703b2..32c0a7368 100644
--- a/skins/default/functions.js
+++ b/skins/default/functions.js
@@ -82,14 +82,14 @@ function rcube_mail_ui()
   this.popups = {
     markmenu:       {id:'markmessagemenu'},
     replyallmenu:   {id:'replyallmenu'},
-    forwardmenu:    {id:'forwardmenu'},
+    forwardmenu:    {id:'forwardmenu', editable:1},
     searchmenu:     {id:'searchmenu', editable:1},
     messagemenu:    {id:'messagemenu'},
     listmenu:       {id:'listmenu', editable:1},
     dragmessagemenu:{id:'dragmessagemenu', sticky:1},
     groupmenu:      {id:'groupoptionsmenu', above:1},
     mailboxmenu:    {id:'mailboxoptionsmenu', above:1},
-    composemenu:    {id:'composeoptionsmenu', editable:1},
+    composemenu:    {id:'composeoptionsmenu', editable:1, overlap:1},
     // toggle: #1486823, #1486930
     uploadmenu:     {id:'attachment-form', editable:1, above:1, toggle:!bw.ie&&!bw.linux },
     uploadform:     {id:'upload-form', editable:1, toggle:!bw.ie&&!bw.linux }
@@ -141,6 +141,11 @@ show_popupmenu: function(popup, show)
   }
 
   obj[show?'show':'hide']();
+  
+  if (bw.ie6 && this.popups[popup].overlap) {
+    $('select').css('visibility', show?'hidden':'inherit');
+    $('select', obj).css('visibility', 'inherit');
+  }
 },
 
 dragmessagemenu: function(show)
@@ -335,7 +340,7 @@ body_mouseup: function(evt, p)
       && (!this.popups[i].editable || !this.target_overlaps(target, this.popups[i].id))
       && (!this.popups[i].sticky || !rcube_mouse_is_over(evt, rcube_find_object(this.popups[i].id)))
     ) {
-      window.setTimeout('$("#'+this.popups[i].id+'").hide()', 50);
+      window.setTimeout('rcmail_ui.show_popup("'+i+'",false);', 50);
     }
   }
 },
diff --git a/skins/default/ie6hacks.css b/skins/default/ie6hacks.css
index cecf08db8..bfdb6f087 100644
--- a/skins/default/ie6hacks.css
+++ b/skins/default/ie6hacks.css
@@ -55,7 +55,7 @@ img
 
 .pagenav
 {
-  width: 200px;
+  width: 250px;
 }
 
 .pagenav a.button,
diff --git a/skins/default/iehacks.css b/skins/default/iehacks.css
index 892cdeaa2..8931e2aee 100644
--- a/skins/default/iehacks.css
+++ b/skins/default/iehacks.css
@@ -7,6 +7,11 @@ input, textarea
   background-color: expression(this.type=='checkbox' || this.type=='radio' ? 'transparent' : '#ffffff');
 }
 
+body.iframe
+{
+  margin-top: 6px;
+}
+
 #login-form form
 {
   margin-top: 0;
@@ -56,6 +61,11 @@ input, textarea
   top: 8px;
 }
 
+div.messageheaderbox
+{
+  margin-top: 0px;
+}
+
 #abooktoolbar a.buttonPas
 {
   filter: alpha(opacity=35);
@@ -214,6 +224,13 @@ ul.toolbarmenu li a
   min-height: auto;
 }
 
+.popupmenu li.block a
+{
+  clear: none;
+  display: inline-block;
+  padding-left: 2px;
+}
+
 #console
 {
   filter: alpha(opacity=80);
@@ -235,6 +252,15 @@ table.records-table thead tr td
   margin-top: 2px;
 }
 
+#contact-details
+{
+  margin-top: 12px;
+}
+
+#contact-details form {
+  margin-top: -1px;
+}
+
 .contactfieldgroup legend
 {
 	padding: 0 0 0.5em 0;