2 files changed, 13 insertions, 7 deletions
diff --git a/skins/default/functions.js b/skins/default/functions.js
index e9b03a125..e1edee1e8 100644
--- a/skins/default/functions.js
+++ b/skins/default/functions.js
@@ -148,7 +148,7 @@ show_popupmenu: function(obj, refname, show, above)
 {
   if (typeof show == 'undefined')
     show = obj.is(':visible') ? false : true;
-  
+
   var ref = rcube_find_object(refname);
   if (show && ref) {
     var pos = $(ref).offset();
@@ -214,7 +214,13 @@ show_listmenu: function(show)
 
   var ref = rcube_find_object('listmenulink');
   if (show && ref) {
-    var pos = $(ref).offset();
+    var pos = $(ref).offset(),
+      menuwidth = this.listmenu.width(),
+      pagewidth = $(document).width();
+
+    if (pagewidth - pos.left < menuwidth && pos.left > menuwidth)
+      pos.left = pos.left - menuwidth;
+
     this.listmenu.css({ left:pos.left, top:(pos.top + ref.offsetHeight + 2)});
     // set form values
     $('input[name="sort_col"][value="'+rcmail.env.sort_col+'"]').attr('checked', 1);
diff --git a/skins/default/mail.css b/skins/default/mail.css
index 8a78b4749..dfa091384 100644
--- a/skins/default/mail.css
+++ b/skins/default/mail.css
@@ -743,8 +743,8 @@ body.messagelist
 #messagelist tr td.attachment,
 #messagelist tr td.flag
 {
-  width: 20px;
-  padding: 0px 1px 1px 1px;
+  width: 18px;
+  padding: 0px 1px 1px 3px;
 }
 
 #messagelist tbody td span.branch,
@@ -756,7 +756,7 @@ body.messagelist
 
 #messagelist tbody td img.msgicon
 {
-  margin-right: 2px;
+  margin: 0 2px;
 }
 
 #messagelist tr td div.collapsed,
@@ -770,12 +770,12 @@ body.messagelist
 
 #messagelist tr td div.collapsed
 {
-  background: url(images/messageactions.png) 1px -91px no-repeat;
+  background: url(images/messageactions.png) -1px -91px no-repeat;
 }
 
 #messagelist tr td div.expanded
 {
-  background: url(images/messageactions.png) 1px -109px no-repeat;
+  background: url(images/messageactions.png) -1px -109px no-repeat;
 }
 
 #messagelist tbody tr td.flag img:hover,