Index: t3lib/class.t3lib_page.php
===================================================================
--- t3lib/class.t3lib_page.php	(Revision 3916)
+++ t3lib/class.t3lib_page.php	(Arbeitskopie)
@@ -450,6 +450,7 @@
 					$mp_row = $this->getPage($mount_info['mount_pid']);		// Using "getPage" is OK since we need the check for enableFields AND for type 2 of mount pids we DO require a doktype < 200!
 					if (count($mp_row))	{
 						$row = $mp_row;
+						$row['_ORIG_UID'] = $origUid;
 						$row['_MP_PARAM'] = $mount_info['MPvar'];
 					} else unset($row);	// If the mount point could not be fetched with respect to enableFields, unset the row so it does not become a part of the menu!
 				}
Index: typo3/sysext/cms/tslib/class.tslib_menu.php
===================================================================
--- typo3/sysext/cms/tslib/class.tslib_menu.php	(Revision 3916)
+++ typo3/sysext/cms/tslib/class.tslib_menu.php	(Arbeitskopie)
@@ -1201,6 +1201,8 @@
 			$overrideArray['uid'] = $this->mconf['overrideId']?$this->mconf['overrideId']:$this->menuArr[$key]['overrideId'];
 			$overrideArray['alias'] = '';
 			$MP_params = '';	// clear MP parameters since ID was changed.
+		} else if (isset($this->menuArr[$key]['_ORIG_UID'])) {
+			$overrideArray = array('uid' => $this->menuArr[$key]['_ORIG_UID']);
 		} else {
 			$overrideArray='';
 		}
Index: typo3/sysext/cms/tslib/class.tslib_content.php
===================================================================
--- typo3/sysext/cms/tslib/class.tslib_content.php	(Revision 3916)
+++ typo3/sysext/cms/tslib/class.tslib_content.php	(Arbeitskopie)
@@ -5350,7 +5350,7 @@
 							}
 						}
 							// If other domain, overwrite
-						if (strlen($tCR_domain) && !$GLOBALS['TSFE']->config['config']['typolinkEnableLinksAcrossDomains']) {
+						if (strlen($tCR_domain) && !$GLOBALS['TSFE']->config['config']['typolinkEnableLinksAcrossDomains'] && (!count($MPvarAcc) && strpos($addQueryParams, '&MP=') === false)) {
 							$target = isset($conf['extTarget']) ? $conf['extTarget'] : $GLOBALS['TSFE']->extTarget;
 							if ($conf['extTarget.']) {
 								$target = $this->stdWrap($target, $conf['extTarget.']);
@@ -5365,8 +5365,8 @@
 								$target = $forceTarget;
 							}
 							$LD = $GLOBALS['TSFE']->tmpl->linkData($page,$target,$conf['no_cache'],'','',$addQueryParams,$theTypeP);
-							if (strlen($tCR_domain)) {
-								// We will add domain only if URL does not have it already.
+							if (strlen($tCR_domain) && (!count($MPvarAcc) && strpos($addQueryParams, '&MP=') === false)) {
+								// We will add domain only if URL does not have it already and not a mount point -- they always link to the original page
 								$urlParts = parse_url($LD['totalURL']);
 								if ($urlParts['host'] == '') {
 									$LD['totalURL'] = 'http://' . $tCR_domain . ($LD['totalURL']{0} == '/' ? '' : '/') . $LD['totalURL'];