--- typo3/sysext/cms/tslib/class.tslib_menu.php	Do  1. Jan 10:13:08 1970
+++ typo3/sysext/cms/tslib/class.tslib_menu.php	Mi  8. Jun 13:21:42 2011
@@ -2009,7 +2009,11 @@
 		$part = isset($this->I['val']['wrapItemAndSub.'])
 			? $this->WMcObj->stdWrap($this->I['val']['wrapItemAndSub'], $this->I['val']['wrapItemAndSub.'])
 			: $this->I['val']['wrapItemAndSub'];
-		$this->WMresult.= $part ? $this->tmpl->wrap($this->I['theItem'],$part) : $this->I['theItem'];
+		$this->I['theItem'] = $part ? $this->tmpl->wrap($this->I['theItem'], $part) : $this->I['theItem'];
+		if ($this->I['val']['subst_elementUid']) {
+			$this->I['theItem'] = str_replace('{elementUid}', $this->I['uid'], $this->I['theItem']);
+		}
+		$this->WMresult .= $this->I['theItem'];
 	}
 
 	/**
@@ -2555,7 +2559,11 @@
 		$part = isset($this->I['val']['wrapItemAndSub.'])
 			? $this->WMcObj->stdWrap($this->I['val']['wrapItemAndSub'], $this->I['val']['wrapItemAndSub.'])
 			: $this->I['val']['wrapItemAndSub'];
-		$this->WMresult.= $part ? $this->tmpl->wrap($this->I['theItem'],$part) : $this->I['theItem'];
+		$this->I['theItem'] = $part ? $this->tmpl->wrap($this->I['theItem'],$part) : $this->I['theItem'];
+		if ($this->I['val']['subst_elementUid']) {
+			$this->I['theItem'] = str_replace('{elementUid}',$this->I['uid'],$this->I['theItem']);
+		}
+		$this->WMresult .= $this->I['theItem'];
 	}