Index: typo3/sysext/rtehtmlarea/htmlarea/htmlarea-gecko.js
===================================================================
--- typo3/sysext/rtehtmlarea/htmlarea/htmlarea-gecko.js	(révision 6975)
+++ typo3/sysext/rtehtmlarea/htmlarea/htmlarea-gecko.js	(copie de travail)
@@ -645,9 +645,8 @@
 			var a = textNode.parentNode.insertBefore(tag, rightText);
 			HTMLArea.removeFromParent(textNode);
 			a.appendChild(textNode);
-			rightText.data += " ";
-			s.collapse(rightText, rightText.data.length);
-			event.stopEvent();
+			s.collapse(rightText, 0);
+			rightText.parentNode.normalize();
 	
 			editor._unLink = function() {
 				var t = a.firstChild;
@@ -665,9 +664,7 @@
 	
 		switch(ev.which) {
 				// Space or Enter or >, see if the text just typed looks like a URL, or email address and link it accordingly
-			case 13:	// Enter
-				if(ev.shiftKey || editor.config.disableEnterParagraphs) break;
-					//Space
+			case 13:
 			case 32:
 				if(s && s.isCollapsed && s.anchorNode.nodeType == 3 && s.anchorNode.data.length > 3 && s.anchorNode.data.indexOf('.') >= 0) {
 					var midStart = s.anchorNode.data.substring(0,s.anchorOffset).search(/[a-zA-Z0-9]+\S{3,}$/);
Index: typo3/sysext/rtehtmlarea/htmlarea/htmlarea.js
===================================================================
--- typo3/sysext/rtehtmlarea/htmlarea/htmlarea.js	(révision 6977)
+++ typo3/sysext/rtehtmlarea/htmlarea/htmlarea.js	(copie de travail)
@@ -1286,7 +1286,7 @@
 		}
 		if (!event.altKey && !event.ctrlKey) {
 				// Detect URL in non-IE browsers
-			if (!Ext.isIE) {
+			if (!Ext.isIE && (event.getKey() != Ext.EventObject.ENTER || event.shiftKey)) {
 				this.getEditor()._detectURL(event);
 			}
 				// Handle option+SPACE for Mac users
@@ -1344,6 +1344,7 @@
 	 * Handler for ENTER key in non-IE browsers
 	 */
 	onEnter: function (key, event) {
+		this.getEditor()._detectURL(event);
 		if (!event.shiftKey) {
 			if (this.getEditor()._checkInsertP()) {
 				event.stopEvent();