Index: /FCKeditor.Java/branches/2.5-test/java-core/src/main/java/net/fckeditor/connector/impl/SimpleFileSystemConnector.java
===================================================================
--- /FCKeditor.Java/branches/2.5-test/java-core/src/main/java/net/fckeditor/connector/impl/SimpleFileSystemConnector.java	(revision 2422)
+++ /FCKeditor.Java/branches/2.5-test/java-core/src/main/java/net/fckeditor/connector/impl/SimpleFileSystemConnector.java	(revision 2423)
@@ -103,5 +103,5 @@
 			return UploadResponse.getErrorSecurity();
 		}
-		String responseUrl = UtilsResponse.constructResponseUrl(type, paths.get(typeDir), currentFolder)
+		String responseUrl = UtilsResponse.constructResponseUrl(type, paths.get(typeDir), ConnectorHandler.getUserFilesPath(), currentFolder)
 				.concat(fileToSave.getName());
 		UploadResponse uploadResponse;
@@ -143,5 +143,5 @@
 		
 		GetResponse getResponse = new GetResponse(CommandHandler.GET_FOLDERS_AND_FILES, type, 
-				currentFolder, UtilsResponse.constructResponseUrl(type, paths.get(type), currentFolder));
+				currentFolder, UtilsResponse.constructResponseUrl(type, paths.get(type), ConnectorHandler.getUserFilesPath(), currentFolder));
 		getResponse.setFolders(getFolders(currentDir));
 		return getResponse;
@@ -159,5 +159,5 @@
 		
 		GetResponse getResponse = new GetResponse(CommandHandler.GET_FOLDERS_AND_FILES, type, 
-				currentFolder, UtilsResponse.constructResponseUrl(type, paths.get(type), currentFolder));
+				currentFolder, UtilsResponse.constructResponseUrl(type, paths.get(type), ConnectorHandler.getUserFilesPath(), currentFolder));
 		getResponse.setFolders(getFolders(currentDir));
 		// collect files
Index: /FCKeditor.Java/branches/2.5-test/java-core/src/main/java/net/fckeditor/tool/UtilsResponse.java
===================================================================
--- /FCKeditor.Java/branches/2.5-test/java-core/src/main/java/net/fckeditor/tool/UtilsResponse.java	(revision 2422)
+++ /FCKeditor.Java/branches/2.5-test/java-core/src/main/java/net/fckeditor/tool/UtilsResponse.java	(revision 2423)
@@ -37,7 +37,6 @@
 	 * Constructs a URL from different parameters. This method is about to
 	 * change in version 2.5. 
-	 * TODO {@link ConnectorHandler#getUserFilesPath()} call has to be eliminated, because it could contains absolute paths in future ! ???
 	 */
-	public static String constructResponseUrl(ResourceType resourceType, String resourceTypePath, String urlPath) {
+	public static String constructResponseUrl(ResourceType resourceType, String resourceTypePath, String filePath, String urlPath) {
 		HttpServletRequest request = ThreadLocalData.getServletRequest();
 		StringBuffer sb = new StringBuffer();
@@ -48,5 +47,5 @@
 		}
 		    	
-		sb.append(ConnectorHandler.getUserFilesPath());
+		sb.append(filePath);
 		sb.append(resourceTypePath);