Index: /MediaWiki/trunk/extensions/FCKeditor/plugins/mediawiki/fckplugin.js
===================================================================
--- /MediaWiki/trunk/extensions/FCKeditor/plugins/mediawiki/fckplugin.js	(revision 511)
+++ /MediaWiki/trunk/extensions/FCKeditor/plugins/mediawiki/fckplugin.js	(revision 512)
@@ -212,15 +212,20 @@
 								href = htmlNode.getAttribute( 'href' , 2 ) || '' ;
 
-							if ( href.StartsWith( 'wiki:' ) )
+							var isWikiUrl = href.StartsWith( 'wiki:' ) ;
+							if ( isWikiUrl )
 								href = href.replace( /^wiki:/, '' ) ;
 
-							stringBuilder.push( '[[' ) ;
+							stringBuilder.push( '[' ) ;
 							stringBuilder.push( href ) ;
 							if ( href != htmlNode.innerHTML )
 							{
-								stringBuilder.push( '|' )
+								if ( isWikiUrl )
+									stringBuilder.push( '|' ) ;
+								else
+									stringBuilder.push( ' ' ) ;
+									
 								this._AppendChildNodes( htmlNode, stringBuilder ) ;
 							}
-							stringBuilder.push( ']]' ) ;
+							stringBuilder.push( ']' ) ;
 
 							break ;
@@ -406,4 +411,11 @@
 			// Hide the textarea to avoid seeing the code change.
 			FCK.EditingArea.Textarea.style.visibility = 'hidden' ;
+			
+			var loading = document.createElement( 'span' ) ;
+			loading.innerHTML = '&nbsp;Loading Wikitext. Please wait...&nbsp;' ;
+			loading.style.position = 'absolute' ;
+			loading.style.left = '5px' ;
+//			loading.style.backgroundColor = '#ff0000' ;
+			FCK.EditingArea.Textarea.parentNode.appendChild( loading, FCK.EditingArea.Textarea ) ;
 
 			// Use Ajax to transform the Wikitext to HTML.
