Index: branches/5.2.x/core/admin_templates/js/uploader/uploader.js
===================================================================
diff -u -N -r15729 -r15733
--- branches/5.2.x/core/admin_templates/js/uploader/uploader.js	(.../uploader.js)	(revision 15729)
+++ branches/5.2.x/core/admin_templates/js/uploader/uploader.js	(.../uploader.js)	(revision 15733)
@@ -265,14 +265,16 @@
 }
 
 Uploader.prototype.isImage = function($filename) {
-	$filename.match(/\.([^.]*)$/);
+	this.removeTempExtension($filename).match(/\.([^.]*)$/);
+
 	var $ext = RegExp.$1.toLowerCase();
 
 	return $ext.match(/^(bmp|gif|jpg|jpeg|png)$/);
 }
 
 Uploader.prototype.getFileIcon = function($filename) {
-	$filename.match(/\.([^.]*)$/);
+	this.removeTempExtension($filename).match(/\.([^.]*)$/);
+
 	var $ext = RegExp.$1.toLowerCase(),
 		$ext_overrides = {
 			'doc': '^(docx|dotx|docm|dotm)$',
@@ -297,10 +299,14 @@
 	return this.IconPath + '/' + $icon + '.gif';
 }
 
+Uploader.prototype.removeTempExtension = function ($file) {
+	return $file.replace(/(_[\d]+)?\.tmp$/, '');
+}
+
 Uploader.prototype.getQueueElement = function($file) {
 	var $ret = '';
 	var $icon_image = this.getFileIcon($file.name);
-	var $file_label = $file.name + ' (' + this._formatSize($file.size) + ')';
+	var $file_label = this.removeTempExtension($file.name) + ' (' + this._formatSize($file.size) + ')';
 	var $need_preview = false;
 
 	if (isset($file.uploaded)) {
@@ -533,7 +539,7 @@
 		this.files[$file_index].uploaded = 1;
 		this.files[$file_index].progress = 100;
 		this.files[$file_index].temp = 1;
-		this.files[$file_index].url = this.params.tmp_url.replace('#ID#', file.id).replace('#FILE#', encodeURIComponent(file.name)).replace('#FIELD#', this.params.field);
+		this.files[$file_index].url = this.params.tmp_url.replace('#ID#', file.id).replace('#FILE#', encodeURIComponent(this.files[$file_index].name)).replace('#FIELD#', this.params.field);
 		this.updateInfo($file_index);
 	}