Index: typo3/class.browse_links.php
===================================================================
--- typo3/class.browse_links.php	(revision 6354)
+++ typo3/class.browse_links.php	(working copy)
@@ -1268,6 +1268,97 @@
 			// Adding the menu and header to the top of page:
 		$content.=$this->printCurrentUrl($this->curUrlInfo['info']).'<br />';
 
+			// Prepare the form with link options
+		$linkOptions = '
+
+			<!--
+				Selecting class for link:
+			-->
+				<form action="" name="lclassform" id="lclassform">
+					<table border="0" cellpadding="2" cellspacing="1" id="typo3-linkClass">
+						<tr>
+							<td style="width: 96px;">' . $GLOBALS['LANG']->getLL('class', 1) . '</td>
+							<td><input type="text" name="lclass" onchange="browse_links_setClass(this.value);" value="' . htmlspecialchars($this->setClass) . '"' . $this->doc->formWidth(10) . ' /></td>
+						</tr>
+					</table>
+				</form>
+
+			<!--
+				Selecting title for link:
+			-->
+				<form action="" name="ltitleform" id="ltitleform">
+					<table border="0" cellpadding="2" cellspacing="1" id="typo3-linkTitle">
+						<tr>
+							<td style="width: 96px;">' . $GLOBALS['LANG']->getLL('title', 1) . '</td>
+							<td><input type="text" name="ltitle" onchange="browse_links_setTitle(this.value);" value="' . htmlspecialchars($this->setTitle) . '"' . $this->doc->formWidth(10) . ' /></td>
+						</tr>
+					</table>
+				</form>
+';
+
+			// Target:
+		$linkTarget = '
+
+			<!--
+				Selecting target for link:
+			-->
+				<form action="" name="ltargetform" id="ltargetform">
+					<table border="0" cellpadding="2" cellspacing="1" id="typo3-linkTarget">
+						<tr>
+							<td>' . $GLOBALS['LANG']->getLL('target',1) . ':</td>
+							<td><input type="text" name="ltarget" onchange="browse_links_setTarget(this.value);" value="' . htmlspecialchars($this->setTarget) . '"' . $this->doc->formWidth(10) . ' /></td>
+							<td>
+								<select name="ltarget_type" onchange="browse_links_setTarget(this.options[this.selectedIndex].value);document.ltargetform.ltarget.value=this.options[this.selectedIndex].value;this.selectedIndex=0;">
+									<option></option>
+									<option value="_top">' . $GLOBALS['LANG']->getLL('top', 1) . '</option>
+									<option value="_blank">' . $GLOBALS['LANG']->getLL('newWindow', 1) . '</option>
+								</select>
+							</td>
+							<td>';
+			if (($this->curUrlInfo['act'] == 'page' || $this->curUrlInfo['act'] == 'file' || $this->curUrlInfo['act'] == 'folder') && $this->curUrlArray['href'] && $this->curUrlInfo['act'] == $this->act) {
+				$linkTarget .= '
+							<input type="submit" value="' . $GLOBALS['LANG']->getLL('update', 1) . '" onclick="return link_current();" />';
+			}
+
+			$selectJS = '
+				if (document.ltargetform.popup_width.options[document.ltargetform.popup_width.selectedIndex].value>0 && document.ltargetform.popup_height.options[document.ltargetform.popup_height.selectedIndex].value>0)	{
+					document.ltargetform.ltarget.value = document.ltargetform.popup_width.options[document.ltargetform.popup_width.selectedIndex].value+"x"+document.ltargetform.popup_height.options[document.ltargetform.popup_height.selectedIndex].value;
+					browse_links_setTarget(document.ltargetform.ltarget.value);
+					browse_links_setClass(document.lclassform.lclass.value);
+					browse_links_setTitle(document.ltitleform.ltitle.value);
+					document.ltargetform.popup_width.selectedIndex=0;
+					document.ltargetform.popup_height.selectedIndex=0;
+				}
+			';
+
+			$linkTarget .= '		</td>
+						</tr>
+						<tr>
+							<td>' . $GLOBALS['LANG']->getLL('target_popUpWindow', 1) . ':</td>
+							<td colspan="3">
+								<select name="popup_width" onchange="' . htmlspecialchars($selectJS) . '">
+									<option value="0">' . $GLOBALS['LANG']->getLL('target_popUpWindow_width', 1) . '</option>
+									<option value="300">300</option>
+									<option value="400">400</option>
+									<option value="500">500</option>
+									<option value="600">600</option>
+									<option value="700">700</option>
+									<option value="800">800</option>
+								</select>
+								x
+								<select name="popup_height" onchange="' . htmlspecialchars($selectJS) . '">
+									<option value="0">' . $GLOBALS['LANG']->getLL('target_popUpWindow_height', 1) . '</option>
+									<option value="200">200</option>
+									<option value="300">300</option>
+									<option value="400">400</option>
+									<option value="500">500</option>
+									<option value="600">600</option>
+								</select>
+							</td>
+						</tr>
+					</table>
+				</form>';
+
 			// Depending on the current action we will create the actual module content for selecting a link:
 		switch($this->act)	{
 			case 'mail':
@@ -1286,6 +1377,7 @@
 						</table>
 					</form>';
 				$content.=$extUrl;
+				$content .= $linkOptions;
 			break;
 			case 'url':
 				$extUrl='
@@ -1303,6 +1395,7 @@
 						</table>
 					</form>';
 				$content.=$extUrl;
+				$content .= $linkOptions . $linkTarget;
 			break;
 			case 'file':
 			case 'folder':
@@ -1338,6 +1431,7 @@
 						<tr>
 							<td class="c-wCell" valign="top">'.$this->barheader($GLOBALS['LANG']->getLL('folderTree').':').$tree.'</td>
 							<td class="c-wCell" valign="top">'.$files.'</td>
+							<td class="c-wCell" valign="top">' . $this->barheader($GLOBALS['LANG']->getLL('linkOptions') . ':') . $linkOptions . $linkTarget . '</td>
 						</tr>
 					</table>
 					';
@@ -1399,6 +1493,8 @@
 						</table>
 						';
 				}
+
+				$content .= $linkOptions . $linkTarget;
 			break;
 			case 'page':
 				$pagetree = t3lib_div::makeInstance('rtePageTree');
@@ -1414,118 +1510,20 @@
 						<tr>
 							<td class="c-wCell" valign="top">'.$this->barheader($GLOBALS['LANG']->getLL('pageTree').':').$tree.'</td>
 							<td class="c-wCell" valign="top">'.$cElements.'</td>
+							<td class="c-wCell" valign="top">' . $this->barheader($GLOBALS['LANG']->getLL('linkOptions') . ':') . $linkOptions . $linkTarget . '</td>
 						</tr>
 					</table>
-					';
+					'; 
 			break;
 			default:
 					//call hook
 				foreach($this->hookObjects as $hookObject) {
 					$content .= $hookObject->getTab($this->act);
 				}
+				$content .= $linkOptions . $linkTarget;
 			break;
 		}
 
-		$content .= '
-
-			<!--
-				Selecting class for link:
-			-->
-				<form action="" name="lclassform" id="lclassform">
-					<table border="0" cellpadding="2" cellspacing="1" id="typo3-linkClass">
-						<tr>
-							<td style="width: 96px;">' . $GLOBALS['LANG']->getLL('class', 1) . '</td>
-							<td><input type="text" name="lclass" onchange="browse_links_setClass(this.value);" value="' . htmlspecialchars($this->setClass) . '"' . $this->doc->formWidth(10) . ' /></td>
-						</tr>
-					</table>
-				</form>
-
-			<!--
-				Selecting title for link:
-			-->
-				<form action="" name="ltitleform" id="ltitleform">
-					<table border="0" cellpadding="2" cellspacing="1" id="typo3-linkTitle">
-						<tr>
-							<td style="width: 96px;">' . $GLOBALS['LANG']->getLL('title', 1) . '</td>
-							<td><input type="text" name="ltitle" onchange="browse_links_setTitle(this.value);" value="' . htmlspecialchars($this->setTitle) . '"' . $this->doc->formWidth(10) . ' /></td>
-						</tr>
-					</table>
-				</form>
-';
-
-			// Target:
-		if ($this->act!='mail')	{
-			$ltarget='
-
-
-
-			<!--
-				Selecting target for link:
-			-->
-				<form action="" name="ltargetform" id="ltargetform">
-					<table border="0" cellpadding="2" cellspacing="1" id="typo3-linkTarget">
-						<tr>
-							<td>'.$GLOBALS['LANG']->getLL('target',1).':</td>
-							<td><input type="text" name="ltarget" onchange="browse_links_setTarget(this.value);" value="' . htmlspecialchars($this->setTarget) . '"' . $this->doc->formWidth(10) . ' /></td>
-							<td>
-								<select name="ltarget_type" onchange="browse_links_setTarget(this.options[this.selectedIndex].value);document.ltargetform.ltarget.value=this.options[this.selectedIndex].value;this.selectedIndex=0;">
-									<option></option>
-									<option value="_top">'.$GLOBALS['LANG']->getLL('top',1).'</option>
-									<option value="_blank">'.$GLOBALS['LANG']->getLL('newWindow',1).'</option>
-								</select>
-							</td>
-							<td>';
-			if (($this->curUrlInfo['act'] == 'page' || $this->curUrlInfo['act'] == 'file' || $this->curUrlInfo['act'] == 'folder') && $this->curUrlArray['href'] && $this->curUrlInfo['act'] == $this->act) {
-				$ltarget.='
-							<input type="submit" value="'.$GLOBALS['LANG']->getLL('update',1).'" onclick="return link_current();" />';
-			}
-
-			$selectJS = '
-				if (document.ltargetform.popup_width.options[document.ltargetform.popup_width.selectedIndex].value>0 && document.ltargetform.popup_height.options[document.ltargetform.popup_height.selectedIndex].value>0)	{
-					document.ltargetform.ltarget.value = document.ltargetform.popup_width.options[document.ltargetform.popup_width.selectedIndex].value+"x"+document.ltargetform.popup_height.options[document.ltargetform.popup_height.selectedIndex].value;
-					browse_links_setTarget(document.ltargetform.ltarget.value);
-					browse_links_setClass(document.lclassform.lclass.value);
-					browse_links_setTitle(document.ltitleform.ltitle.value);
-					document.ltargetform.popup_width.selectedIndex=0;
-					document.ltargetform.popup_height.selectedIndex=0;
-				}
-			';
-
-			$ltarget.='		</td>
-						</tr>
-						<tr>
-							<td>'.$GLOBALS['LANG']->getLL('target_popUpWindow',1).':</td>
-							<td colspan="3">
-								<select name="popup_width" onchange="'.htmlspecialchars($selectJS).'">
-									<option value="0">'.$GLOBALS['LANG']->getLL('target_popUpWindow_width',1).'</option>
-									<option value="300">300</option>
-									<option value="400">400</option>
-									<option value="500">500</option>
-									<option value="600">600</option>
-									<option value="700">700</option>
-									<option value="800">800</option>
-								</select>
-								x
-								<select name="popup_height" onchange="'.htmlspecialchars($selectJS).'">
-									<option value="0">'.$GLOBALS['LANG']->getLL('target_popUpWindow_height',1).'</option>
-									<option value="200">200</option>
-									<option value="300">300</option>
-									<option value="400">400</option>
-									<option value="500">500</option>
-									<option value="600">600</option>
-								</select>
-							</td>
-						</tr>
-					</table>
-				</form>';
-
-				// Add "target selector" box to content:
-			$content.=$ltarget;
-
-				// Add some space
-			$content.='<br /><br />';
-		}
-
 			// End page, return content:
 		$content.= $this->doc->endPage();
 		$content = $this->doc->insertStylesAndJS($content);
Index: typo3/sysext/lang/locallang_browse_links.xml
===================================================================
--- typo3/sysext/lang/locallang_browse_links.xml	(revision 6354)
+++ typo3/sysext/lang/locallang_browse_links.xml	(working copy)
@@ -28,6 +28,7 @@
 			<label index="top">Top</label>
 			<label index="none">None - new link!</label>
 			<label index="pageTree">Page tree</label>
+			<label index="linkOptions">Link options</label>
 			<label index="contentElements">Content elements</label>
 			<label index="selectRecords">Select Records</label>
 			<label index="addToList">Add to list...</label>
Index: typo3/sysext/cms/tbl_tt_content.php
===================================================================
--- typo3/sysext/cms/tbl_tt_content.php	(revision 6354)
+++ typo3/sysext/cms/tbl_tt_content.php	(working copy)
@@ -234,7 +234,7 @@
 						'title' => 'Link',
 						'icon' => 'link_popup.gif',
 						'script' => 'browse_links.php?mode=wizard',
-						'JSopenParams' => 'height=300,width=500,status=0,menubar=0,scrollbars=1'
+						'JSopenParams' => 'height=600,width=950,status=0,menubar=0,scrollbars=1'
 					)
 				),
 				'softref' => 'typolink'
@@ -494,7 +494,7 @@
 						'title' => 'Link',
 						'icon' => 'link_popup.gif',
 						'script' => 'browse_links.php?mode=wizard',
-						'JSopenParams' => 'height=300,width=500,status=0,menubar=0,scrollbars=1'
+						'JSopenParams' => 'height=600,width=950,status=0,menubar=0,scrollbars=1'
 					)
 				),
 				'softref' => 'typolink[linkList]'