Index: typo3/sysext/extra_page_cm_options/class.tx_extrapagecmoptions.php
===================================================================
--- typo3/sysext/extra_page_cm_options/class.tx_extrapagecmoptions.php	(revision 4067)
+++ typo3/sysext/extra_page_cm_options/class.tx_extrapagecmoptions.php	(working copy)
@@ -83,8 +83,8 @@
 		$subname = t3lib_div::_GP('subname');
 
 			// Detecting menu level
-		if (!$backRef->cmLevel)	{	// LEVEL: Primary menu.
-
+		// LEVEL: Primary menu.
+		if (!in_array('moreoptions', $backRef->disabledItems) && !$backRef->cmLevel) {
 				// Creating menu items here:
 			if ($backRef->editOK)	{
 				$LL = $this->includeLL();
Index: typo3/sysext/version/class.tx_version_cm1.php
===================================================================
--- typo3/sysext/version/class.tx_version_cm1.php	(revision 4067)
+++ typo3/sysext/version/class.tx_version_cm1.php	(working copy)
@@ -69,7 +69,9 @@
 		if (!$backRef->cmLevel && $uid>0 && $BE_USER->check('modules','web_txversionM1'))	{
 
 				// Returns directly, because the clicked item was not from the pages table
-			if (!$TCA[$table] || !$TCA[$table]['ctrl']['versioningWS'])	return $menuItems;
+			if (in_array('versioning', $backRef->disabledItems) || !$TCA[$table] || !$TCA[$table]['ctrl']['versioningWS']) {
+				return $menuItems;
+			}
 
 				// Adds the regular item
 			$LL = $this->includeLL();