diff --git a/docs/changelog/6.x.x.txt b/docs/changelog/6.x.x.txt
index 31e0b5161..48d6e6a0d 100644
--- a/docs/changelog/6.x.x.txt
+++ b/docs/changelog/6.x.x.txt
@@ -11,6 +11,9 @@
  - fix [ 1404485 ] userDefined1 to 5 onlineHelp
  - fix [ 1403155 ] Poll shows no result
  - fix [ 1373583 ] ITransact Module does not URL encode data within XML
+ - fix [ 1345363 ] Using RTE breaks links (Thanks to Gerald Young for
+		   assisting with this one.)
+ - fix [ 1376148 ] wrong pages are shown after visit of photo gallery (Gerald Young)
 
 6.8.4
  - fix [ 1395371 ] XSS Vulnerability in DataForm Entries
diff --git a/www/extras/tinymce2/jscripts/webgui.js b/www/extras/tinymce2/jscripts/webgui.js
index d139c7bac..e7c4628b6 100644
--- a/www/extras/tinymce2/jscripts/webgui.js
+++ b/www/extras/tinymce2/jscripts/webgui.js
@@ -11,6 +11,7 @@ function tinyMCE_WebGUI_URLConvertor(url, node, on_save) {
 	url = url.replace(/^\/\^/,"^");
 	url = url.replace(/http:\/\/\//,"/");
 	url = url.replace(/^.*(\^\/\;.*)$/,"$1");
+	url = url.replace(/^.*(\^FileUrl\(.*\)\;.*)$/,"$1");
         return url;
 }