diff -urN ../markasjunk2.orig/markasjunk2.php ./markasjunk2.php
--- ../markasjunk2.orig/markasjunk2.php	2015-02-10 21:49:07.000000000 +0200
+++ ./markasjunk2.php	2015-02-22 23:39:50.000000000 +0200
@@ -75,13 +75,13 @@
 				$this->add_button(array('command' => 'plugin.markasjunk2.junk', 'type' => 'link', 'class' => 'button buttonPas markasjunk2 disabled', 'classact' => 'button markasjunk2', 'classsel' => 'button markasjunk2Sel', 'title' => 'markasjunk2.buttonjunk', 'label' => 'junk', 'style' => $display_junk), 'toolbar');
 				$this->add_button(array('command' => 'plugin.markasjunk2.not_junk', 'type' => 'link', 'class' => 'button buttonPas markasnotjunk2 disabled', 'classact' => 'button markasnotjunk2', 'classsel' => 'button markasnotjunk2Sel', 'title' => 'markasjunk2.buttonnotjunk', 'label' => 'markasjunk2.notjunk', 'style' => $display_not_junk), 'toolbar');
 			}
-			else {
+//			else {
 				// add the buttons to the mark message menu
 				$markjunk = $this->api->output->button(array('command' => 'plugin.markasjunk2.junk', 'label' => 'markasjunk2.markasjunk', 'id' => 'markasjunk2', 'class' => 'icon markasjunk2', 'classact' => 'icon markasjunk2 active', 'innerclass' => 'icon markasjunk2'));
 				$marknotjunk = $this->api->output->button(array('command' => 'plugin.markasjunk2.not_junk', 'label' => 'markasjunk2.markasnotjunk', 'id' => 'markasnotjunk2', 'class' => 'icon markasnotjunk2', 'classact' => 'icon markasnotjunk2 active', 'innerclass' => 'icon markasnotjunk2'));
 				$this->api->add_content(html::tag('li', array('style' => $display_junk, 'role' => 'menuitem'), $markjunk), 'markmenu');
 				$this->api->add_content(html::tag('li', array('style' => $display_not_junk, 'role' => 'menuitem'), $marknotjunk), 'markmenu');
-			}
+//			}
 
 			// add markasjunk2 folder settings to the env for JS
 			$this->api->output->set_env('markasjunk2_override', $mb_override);
diff -urN ../markasjunk2.orig/skins/larry/markasjunk2.css ./skins/larry/markasjunk2.css
--- ../markasjunk2.orig/skins/larry/markasjunk2.css	2015-02-10 21:49:07.000000000 +0200
+++ ./skins/larry/markasjunk2.css	2015-02-23 01:00:02.000000000 +0200
@@ -22,6 +22,8 @@
   background-position: center -61px;
 }
 
+div.contextmenu.rcmmainmenu ul.toolbarmenu li a.markasjunk2 span.icon,
+div.contextmenu.rcmmainmenu ul.toolbarmenu li a.markasnotjunk2 span.icon,
 ul.toolbarmenu li a span.markasjunk2,
 ul.toolbarmenu li a span.markasnotjunk2,
 ul.toolbarmenu li a.markasjunk2 span.cmicon,
@@ -30,12 +32,14 @@
   background-image: url(images/messageactions.png);
 }
 
+div.contextmenu.rcmmainmenu ul.toolbarmenu li a.markasjunk2 span.icon,
 ul.toolbarmenu li a span.markasjunk2,
 ul.toolbarmenu li a.markasjunk2 span.cmicon
 {
   background-position: 1px -17px;
 }
 
+div.contextmenu.rcmmainmenu ul.toolbarmenu li a.markasnotjunk2 span.icon,
 ul.toolbarmenu li a span.markasnotjunk2,
 ul.toolbarmenu li a.markasnotjunk2 span.cmicon
 {