Index: typo3/sysext/rtehtmlarea/htmlarea/plugins/TYPO3Link/typo3link.js
===================================================================
--- typo3/sysext/rtehtmlarea/htmlarea/plugins/TYPO3Link/typo3link.js	(revision 6354)
+++ typo3/sysext/rtehtmlarea/htmlarea/plugins/TYPO3Link/typo3link.js	(working copy)
@@ -141,7 +141,7 @@
 				}
 			}
 		}
-		this.dialog = this.openDialog("CreateLink", this.makeUrlFromModulePath(this.modulePath, additionalParameter), null, null, {width:550, height:350}, "yes");
+		this.dialog = this.openDialog("CreateLink", this.makeUrlFromModulePath(this.modulePath, additionalParameter), null, null, {width:950, height:600}, "yes");
 		return false;
 	},
 	
Index: typo3/sysext/rtehtmlarea/mod3/locallang.xml
===================================================================
--- typo3/sysext/rtehtmlarea/mod3/locallang.xml	(revision 6354)
+++ typo3/sysext/rtehtmlarea/mod3/locallang.xml	(working copy)
@@ -27,6 +27,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/rtehtmlarea/mod3/class.tx_rtehtmlarea_browse_links.php
===================================================================
--- typo3/sysext/rtehtmlarea/mod3/class.tx_rtehtmlarea_browse_links.php	(revision 6354)
+++ typo3/sysext/rtehtmlarea/mod3/class.tx_rtehtmlarea_browse_links.php	(working copy)
@@ -815,8 +815,6 @@
 				}
 			break;
 			case 'page':
-				$content.=$this->addAttributesForm();
-
 				$pagetree = t3lib_div::makeInstance('tx_rtehtmlarea_pageTree');
 				$pagetree->ext_showNavTitle = $GLOBALS['BE_USER']->getTSConfigVal('options.pageTree.showNavTitle');
 				$pagetree->addField('nav_title');
@@ -830,6 +828,7 @@
 						<tr>
 							<td class="c-wCell" valign="top">'.$this->barheader($LANG->getLL('pageTree').':').$tree.'</td>
 							<td class="c-wCell" valign="top">'.$cElements.'</td>
+							<td class="c-wCell" valign="top">' . $this->barheader($LANG->getLL('linkOptions') . ':') . $this->addAttributesForm() . '</td>
 						</tr>
 					</table>
 					';
@@ -877,7 +876,7 @@
 						<tr>
 							<td>
 							</td>
-							<td colspan="3">
+							<td>
 								<input type="submit" value="'.$LANG->getLL('update',1).'" onclick="return link_current();" />
 							</td>
 						</tr>';
@@ -894,7 +893,7 @@
 		return ($this->act == 'page' && $this->buttonConfig && is_array($this->buttonConfig['pageIdSelector.']) && $this->buttonConfig['pageIdSelector.']['enabled'])?'
 						<tr>
 							<td>'.$LANG->getLL('page_id',1).':</td>
-							<td colspan="3">
+							<td>
 								<input type="text" size="6" name="luid" />&nbsp;<input type="submit" value="'.$LANG->getLL('setLink',1).'" onclick="return link_typo3Page(document.ltargetform.luid.value);" />
 							</td>
 						</tr>':'';
@@ -906,7 +905,7 @@
 		return ($this->act == 'page' && $this->buttonConfig && is_array($this->buttonConfig['queryParametersSelector.']) && $this->buttonConfig['queryParametersSelector.']['enabled'])?'
 						<tr>
 							<td>'.$LANG->getLL('query_parameters',1).':</td>
-							<td colspan="3">
+							<td>
 								<input type="text" name="query_parameters" value="' . ($this->curUrlInfo['query']?$this->curUrlInfo['query']:'') . '" ' . $this->doc->formWidth(30) . ' />
 							</td>
 						</tr>':'';
@@ -926,12 +925,15 @@
 
 		$ltarget = '';
 		if ($this->act != 'mail')	{
+			$targetFrame = ($this->setClass || !$this->classesAnchorDefault[$this->act]) ? '' : $this->classesAnchorDefaultTarget[$this->act];
+			
 			$ltarget .= '
 					<tr id="ltargetrow"'. (($targetSelectorConfig['disabled'] && $popupSelectorConfig['disabled']) ? ' style="display: none;"' : '') . '>
 						<td>'.$LANG->getLL('target',1).':</td>
-						<td><input type="text" name="ltarget" onchange="browse_links_setTarget(this.value);" value="'.htmlspecialchars($this->setTarget?$this->setTarget:(($this->setClass || !$this->classesAnchorDefault[$this->act])?'':$this->classesAnchorDefaultTarget[$this->act])).'"'.$this->doc->formWidth(10).' /></td>';
-			$ltarget .= '
-						<td colspan="2">';
+						<td>
+							<input type="text" name="ltarget" onchange="browse_links_setTarget(this.value);" value="'
+								. htmlspecialchars($this->setTarget ? $this->setTarget : $targetFrame)
+								. '"' . $this->doc->formWidth(10) . ' />';
 			if (!$targetSelectorConfig['disabled']) {
 				$ltarget .= '
 							<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;">
@@ -992,7 +994,7 @@
 			$selectClass ='
 						<tr>
 							<td>'.$GLOBALS['LANG']->getLL('anchor_class',1).':</td>
-							<td colspan="3">
+							<td>
 								<select name="anchor_class" onchange="'.$this->getClassOnChangeJS().'">
 									' . $this->classesAnchorJSOptions[$this->act] . '
 								</select>
@@ -1048,9 +1050,9 @@
 		return '
 						<tr>
 							<td><label for="rtehtmlarea-browse-links-anchor_title" id="rtehtmlarea-browse-links-title-label">' . $GLOBALS['LANG']->getLL('anchor_title',1) . ':</label></td>
-							<td colspan="3">
+							<td>
 								<span id="rtehtmlarea-browse-links-title-input" style="display: ' . ($readOnly ? 'none' : 'inline') . ';">
-									<input type="text" id="rtehtmlarea-browse-links-anchor_title" name="anchor_title" value="' . $title . '" ' . $this->doc->formWidth(30) . ' />
+									<input type="text" id="rtehtmlarea-browse-links-anchor_title" name="anchor_title" value="' . $title . '" ' . $this->doc->formWidth(20) . ' />
 								</span>
 								<span id="rtehtmlarea-browse-links-title-readonly" style="display: ' . ($readOnly ? 'inline' : 'none') . ';">' . $title . '</span>
 							</td>