diff --git a/common/js/plugins/jquery.fileupload/js/main.js b/common/js/plugins/jquery.fileupload/js/main.js
index a3a0cfc2a..f8a792c3a 100644
--- a/common/js/plugins/jquery.fileupload/js/main.js
+++ b/common/js/plugins/jquery.fileupload/js/main.js
@@ -360,6 +360,11 @@
 				$container.find('.allowed_attach_size').text(res.allowed_attach_size);
 				$container.find('.attached_size').text(res.attached_size);
 				$container.find('.file_count').text(res.files.length);
+				if(res.allowed_filetypes === '*.*') {
+					$container.find('.allowed_filetypes_container').hide();
+				} else {
+					$container.find('.allowed_filetypes_container').show();
+				}
 
 				var tmpl_fileitem = data.settings.tmplXeUploaderFileitem;
 				var tmpl_fileitem_image = data.settings.tmplXeUploaderFileitemImage;
diff --git a/modules/editor/skins/ckeditor/file_upload.html b/modules/editor/skins/ckeditor/file_upload.html
index 7f6081e4a..4e80dc0e8 100644
--- a/modules/editor/skins/ckeditor/file_upload.html
+++ b/modules/editor/skins/ckeditor/file_upload.html
@@ -10,9 +10,12 @@
 			<input id="xe-fileupload" type="file" class="fileupload-processing " value="{$lang->edit->upload_file}" name="Filedata" data-auto-upload="true" data-editor-sequence="{$editor_sequence}" multiple />
 		</span>
 
-		<p class="xefu-dropzone-message">{$lang->ckeditor_about_file_drop_area}</p>
+		<p class="xefu-dropzone-message" cond="!$m">{$lang->ckeditor_about_file_drop_area}</p>
 
-		<p class="upload_info">{$lang->allowed_filesize} : <span class="allowed_filesize">0MB</span> <span>({$lang->allowed_filetypes} : <span class="allowed_filetypes">*.*</span>)</span></p>
+		<p class="upload_info">
+			<span class="allowed_filesize_container">{$lang->allowed_filesize} : <span class="allowed_filesize">0MB</span></span>
+			<span class="allowed_filetypes_container">({$lang->allowed_filetypes} : <span class="allowed_filetypes">*.*</span>)</span>
+		</p>
 
 		<p class="xefu-progress-status" style="display: none;">{$lang->ckeditor_file_uploading} (<span class="xefu-progress-percent">0%</span>)</p>
 		<div class="xefu-progressbar" style="display: none;"><div></div></div>