diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index 1e4aa4c46..9afc2e629 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -1,4 +1,5 @@
 7.0.7
+ - rfe: Image Management (funded by Formation Design Systems)
  - fix: can't change default size of text fields (midellaq)
  - fix: sqlform trunctate search results doesn't work (Martin Kamerbeek /
    Procolix)
diff --git a/etc/WebGUI.conf.original b/etc/WebGUI.conf.original
index 974de5cbd..257cf6f3b 100644
--- a/etc/WebGUI.conf.original
+++ b/etc/WebGUI.conf.original
@@ -62,6 +62,14 @@
 
 "uploadsPath" : "/data/WebGUI/www/uploads",
 
+# Set this value to 1 if you want rich editors to use the
+# WebGUI asset URLs for images rather than their real URLs
+# in the uploads folder. The advantage of this is that users 
+# see short clean WebGUI controlled URLs. However, this is 
+# slower than the default.
+
+"richEditorsUseAssetUrls" : 0,
+
 # An array of URLs that WebGUI should leave alone for normal
 # processing by Apache. Anything that begins with these URLs
 # will be entirely ignored by WebGUI
diff --git a/lib/WebGUI/Operation/FormHelpers.pm b/lib/WebGUI/Operation/FormHelpers.pm
index 032dde9f6..4d6230f02 100644
--- a/lib/WebGUI/Operation/FormHelpers.pm
+++ b/lib/WebGUI/Operation/FormHelpers.pm
@@ -306,7 +306,11 @@ sub www_richEditViewThumbnail {
 		$output .= '</div>';
 		$output .= '<script type="text/javascript">';
 		$output .= "//<![CDATA[\n";
-		$output .= "\nvar src = '".$image->getFileUrl."';\n";
+		if ( $session->config->get("richEditorsUseAssetUrls")) {
+			$output .= "\nvar src = '".$image->getUrl."';\n";
+		} else {
+			$output .= "\nvar src = '".$image->getFileUrl."';\n";
+		}
 		$output .= "if(src.length > 0) {
 				var manager=window.parent;
    				if(manager)