Index: /FCKeditor.Java/branches/2.4/src/main/java/net/fckeditor/connector/ConnectorServlet.java
===================================================================
--- /FCKeditor.Java/branches/2.4/src/main/java/net/fckeditor/connector/ConnectorServlet.java	(revision 1548)
+++ /FCKeditor.Java/branches/2.4/src/main/java/net/fckeditor/connector/ConnectorServlet.java	(revision 1549)
@@ -179,5 +179,5 @@
 
 		Node root = createCommonXml(document, commandStr, typeStr,
-				currentFolderStr, request.getContextPath().concat(currentPath));
+				currentFolderStr, currentPath, request);
 
 		if (!ConfigurationHandler.isEnabledForFileBrowsing(request)) {
@@ -328,9 +328,9 @@
 						if (isEmpty(newFilename)) {
 							ur = new UploadResponse(UploadResponse.EN_OK,
-									request.getContextPath() + currentPath
+									constructServerAddress(request, currentPath)
 											+ filename);
 						} else {
 							ur = new UploadResponse(UploadResponse.EN_RENAMED,
-									request.getContextPath() + currentPath
+									constructServerAddress(request, currentPath)
 											+ newFilename, newFilename);
 						}
@@ -393,5 +393,6 @@
 
 	private Node createCommonXml(Document doc, String commandStr,
-			String typeStr, String currentPath, String currentUrl) {
+			String typeStr, String currentPath, String currentUrl,
+			HttpServletRequest request) {
 		Element root = doc.createElement("Connector");
 		doc.appendChild(root);
@@ -401,5 +402,6 @@
 		Element myEl = doc.createElement("CurrentFolder");
 		myEl.setAttribute("path", currentPath);
-		myEl.setAttribute("url", currentUrl);
+		
+		myEl.setAttribute("url", constructServerAddress(request, currentUrl));
 		root.appendChild(myEl);
 
@@ -409,9 +411,9 @@
 	private String constructTypeBasedFolderString(final ResourceType fileType,
 			final String currentFolderString, final HttpServletRequest request) {
-		StringWriter retval = new StringWriter();
-		retval.write(ConfigurationHandler.getUserFilesPath(request));
-		retval.write(fileType.getPath());
-		retval.write(currentFolderString);
-		return replaceAll(retval.toString(), "//", "/");
+		StringWriter sw = new StringWriter();
+		sw.write(ConfigurationHandler.getUserFilesPath(request));
+		sw.write(fileType.getPath());
+		sw.write(currentFolderString);
+		return replaceAll(sw.toString(), "//", "/");
 	}
 
@@ -442,3 +444,22 @@
 			ExtensionsHandler.setExtensionsDenied(type, deniedList);
 	}
+	
+	/**
+	 * TODO maybe change name?
+	 * TODO make it better
+	 * @param request
+	 * @param url TODO
+	 * @return
+	 */
+	private String constructServerAddress(final HttpServletRequest request,
+			String url) {
+		String address = request.getRequestURL().toString();
+
+		if (ConfigurationHandler.isFullUrl())
+			return address.substring(0, address.indexOf('/', 8))
+					+ request.getContextPath() + url;
+		else
+			return request.getContextPath() + url;
+
+	}
 }
Index: /FCKeditor.Java/branches/2.4/src/main/java/net/fckeditor/handlers/ConfigurationHandler.java
===================================================================
--- /FCKeditor.Java/branches/2.4/src/main/java/net/fckeditor/handlers/ConfigurationHandler.java	(revision 1548)
+++ /FCKeditor.Java/branches/2.4/src/main/java/net/fckeditor/handlers/ConfigurationHandler.java	(revision 1549)
@@ -65,4 +65,5 @@
 	private static String fckEditorToolbarSet;
 	private static boolean forceSingleExtension;
+	private static boolean fullUrl;
 	
 	public static final String PROPERTY_MESSAGE_COMPATIBLE_BROWSER = "message.enabled_tag.compatible_browser.yes";
@@ -89,4 +90,6 @@
 		forceSingleExtension = Boolean.valueOf(defaultProperties
 		        .getProperty("connector.forceSingleExtension"));
+		fullUrl = Boolean.valueOf(defaultProperties
+		        .getProperty("connector.fullUrl"));
 
 		logger.info("Default properties loaded and initialized successfully.");
@@ -233,4 +236,8 @@
 		return forceSingleExtension;
 	}
+	
+	public static boolean isFullUrl() {
+		return fullUrl;
+	}
 
 	/**
Index: /FCKeditor.Java/branches/2.4/src/main/resources/net/fckeditor/handlers/default.properties
===================================================================
--- /FCKeditor.Java/branches/2.4/src/main/resources/net/fckeditor/handlers/default.properties	(revision 1548)
+++ /FCKeditor.Java/branches/2.4/src/main/resources/net/fckeditor/handlers/default.properties	(revision 1549)
@@ -1,5 +1,24 @@
-#Generated by ResourceBundle Editor (http://eclipse-rbe.sourceforge.net)
-## Default properties.
-##
+#
+# FCKeditor - The text editor for Internet - http://www.fckeditor.net
+# Copyright (C) 2003-2007 Frederico Caldeira Knabben
+#
+# == BEGIN LICENSE ==
+#
+# Licensed under the terms of any of the following licenses at your
+# choice:
+#
+#  - GNU General Public License Version 2 or later (the "GPL")
+#    http://www.gnu.org/licenses/gpl.html
+#
+#  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+#    http://www.gnu.org/licenses/lgpl.html
+#
+#  - Mozilla Public License Version 1.1 or later (the "MPL")
+#    http://www.mozilla.org/MPL/MPL-1.1.html
+#
+# == END LICENSE ==
+#
+# Configuration file for the File Manager Connector for PHP.
+
 ## @version $Id: default.properties 1184 2008-01-03 10:39:36Z th-schwarz $ 
 
@@ -23,4 +42,8 @@
 connector.userFilesPath = /userfiles
 
+# Instructs the Connector to return the full URL of a file/folder in the XML
+# response rather than the absolute URL
+connector.fullUrl = false
+
 # directory of the editor relative to the context root
 fckeditor.basePath = /fckeditor