Index: /FCKeditor.Net/trunk/FileBrowser/FileWorkerBase.cs
===================================================================
--- /FCKeditor.Net/trunk/FileBrowser/FileWorkerBase.cs	(revision 1700)
+++ /FCKeditor.Net/trunk/FileBrowser/FileWorkerBase.cs	(revision 1701)
@@ -143,5 +143,5 @@
 		{
 			// Remove . \ / | : ? * " < >
-			return Regex.Replace( folderName, @"[.\\/|:?*""<>]", "_", RegexOptions.None );
+			return Regex.Replace( folderName, @"[.\\/|:?*""<>\p{C}]", "_", RegexOptions.None );
 		}
 
@@ -154,5 +154,5 @@
 
 			// Remove \ / | : ? * " < >
-			return Regex.Replace( fileName, @"[\\/|:?*""<>]", "_", RegexOptions.None );
+			return Regex.Replace( fileName, @"[\\/|:?*""<>\p{C}]", "_", RegexOptions.None );
 		}
 
Index: /FCKeditor.Net/trunk/_whatsnew.html
===================================================================
--- /FCKeditor.Net/trunk/_whatsnew.html	(revision 1700)
+++ /FCKeditor.Net/trunk/_whatsnew.html	(revision 1701)
@@ -33,4 +33,12 @@
 	<h1>
 		FCKeditor.Net ChangeLog - What's New?</h1>
+	<h3>
+		Version 2.6</h3>
+	<p>
+		Fixed Bugs:</p>
+	<ul>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1945">#1945</a>] New folders
+			and file names are now properly sanitized against control characters.</li>
+	</ul>
 	<h3>
 		Version 2.5</h3>