diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc
index 914ab1538..ab2109fc5 100644
--- a/program/steps/mail/func.inc
+++ b/program/steps/mail/func.inc
@@ -358,11 +358,17 @@ function rcmail_message_list_head($attrib, $a_show_cols)
   // define sortable columns
   $a_sort_cols = array('subject', 'date', 'from', 'to', 'size', 'cc');
 
-  if (!empty($attrib['optionsmenuicon']))
-    $list_menu = html::a(
-      array('href' => '#', 'onclick' => 'return '.JS_OBJECT_NAME.".command('menu-open', 'messagelistmenu')"),
-      html::img(array('src' => $skin_path . $attrib['optionsmenuicon'], 'id' => 'listmenulink', 'title' => rcube_label('listoptions')))
-    );
+  if (!empty($attrib['optionsmenuicon'])) {
+    $onclick = 'return ' . JS_OBJECT_NAME . ".command('menu-open', 'messagelistmenu')";
+    if ($attrib['optionsmenuicon'] === true || $attrib['optionsmenuicon'] == 'true')
+      $list_menu = html::div(array('onclick' => $onclick, 'class' => 'listmenu',
+        'id' => 'listmenulink', 'title' => rcube_label('listoptions')));
+    else
+      $list_menu = html::a(array('href' => '#', 'onclick' => $onclick),
+        html::img(array('src' => $skin_path . $attrib['optionsmenuicon'],
+          'id' => 'listmenulink', 'title' => rcube_label('listoptions')))
+      );
+  }
   else
     $list_menu = '';
 
diff --git a/skins/default/images/messageicons.gif b/skins/default/images/messageicons.gif
index 07e90cca0..c792dae3c 100644
Binary files a/skins/default/images/messageicons.gif and b/skins/default/images/messageicons.gif differ
diff --git a/skins/default/images/messageicons.png b/skins/default/images/messageicons.png
index 7d21ab969..61bc51e4e 100644
Binary files a/skins/default/images/messageicons.png and b/skins/default/images/messageicons.png differ
diff --git a/skins/default/mail.css b/skins/default/mail.css
index 3342f8957..2a524e8a5 100644
--- a/skins/default/mail.css
+++ b/skins/default/mail.css
@@ -696,8 +696,6 @@ body.messagelist
   display: inline-block;
 }
 
-#messagelist tr td div.collapsed,
-#messagelist tr td div.expanded,
 #messagelist tbody tr td.flag
 {
   cursor: pointer;
@@ -711,6 +709,7 @@ body.messagelist
 
 #messagelist tr td div.collapsed,
 #messagelist tr td div.expanded,
+#messagelist tr td.threads div.listmenu,
 #messagelist tr td.attachment span.attachment,
 #messagelist tr td.flag span.flagged,
 #messagelist tr td.flag span.unflagged:hover,
@@ -778,11 +777,19 @@ body.messagelist
 #messagelist tr td div.collapsed
 {
   background-position: -195px 0;
+  cursor: pointer;
 }
 
 #messagelist tr td div.expanded
 {
   background-position: -180px 0;
+  cursor: pointer;
+}
+
+#messagelist tr td.threads div.listmenu
+{
+  background-position: -210px 1px;
+  cursor: pointer;
 }
 
 #messagelist tbody tr td.subject
diff --git a/skins/default/templates/mail.html b/skins/default/templates/mail.html
index 840907e5f..1e444f839 100644
--- a/skins/default/templates/mail.html
+++ b/skins/default/templates/mail.html
@@ -58,7 +58,7 @@
   cellspacing="0"
   columns=""
   summary="Message list"
-  optionsmenuIcon="/images/icons/columnpicker.gif" />
+  optionsmenuIcon="true" />
 </div>
 <div class="boxfooter">
     <div id="listcontrols" class="pagenav">