Index: /FCKeditor/trunk/_whatsnew.html
===================================================================
--- /FCKeditor/trunk/_whatsnew.html	(revision 1565)
+++ /FCKeditor/trunk/_whatsnew.html	(revision 1566)
@@ -107,4 +107,6 @@
 		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1670">#1670</a>] Improved the background color
 			behind smiley icons and special characters in their corresponding dialogs.</li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1693">#1693</a>] Custom error messages are now 
+			properly displayed in the file browser.</li>
 	</ul>
 	<p>
Index: /FCKeditor/trunk/editor/filemanager/browser/default/browser.html
===================================================================
--- /FCKeditor/trunk/editor/filemanager/browser/default/browser.html	(revision 1565)
+++ /FCKeditor/trunk/editor/filemanager/browser/default/browser.html	(revision 1566)
@@ -141,5 +141,8 @@
 function OnUploadCompleted( errorNumber, fileUrl, fileName, customMsg )
 {
-	window.frames['frmUpload'].OnUploadCompleted( errorNumber, fileName ) ;
+	if (errorNumber == "1")
+		window.frames['frmUpload'].OnUploadCompleted( errorNumber, customMsg ) ;
+	else
+		window.frames['frmUpload'].OnUploadCompleted( errorNumber, fileName ) ;
 }