 						<input id='file-description' style='display: inherit;' value='' placeholder='#{t("Upload_file_description")}'>
 					</div>
 				"""
-			else
+			else if file.type is 'image'
 				text = """
 					<div class='upload-preview'>
-						<div class='upload-preview-file' style='background-image: url(#{fileContent})'></div>
+						<div class='upload-preview-file' style='background-image: url(#{preview})'></div>
+					</div>
+					<div class='upload-preview-title'>
+						<input id='file-name' style='display: inherit;' value='#{Handlebars._escape(file.name)}' placeholder='#{t("Upload_file_name")}'>
+						<input id='file-description' style='display: inherit;' value='' placeholder='#{t("Upload_file_description")}'>
+					</div>
+				"""
+			else
+				fileSize = formatBytes(file.file.size)
+
+				text = """
+					<div class='upload-preview'>
+						<div>#{Handlebars._escape(file.name)} - #{fileSize}</div>
 					</div>
 					<div class='upload-preview-title'>
 						<input id='file-name' style='display: inherit;' value='#{Handlebars._escape(file.name)}' placeholder='#{t("Upload_file_name")}'>

				text = """
					<div class='upload-preview'>
						<video  style="width: 100%;" controls="controls">
							<source src="#{fileContent}" type="video/webm">
							Your browser does not support the video element.
						</video>
					</div>

			swal.close()
			return

		if not RocketChat.fileUploadIsValidContentType file.file.type
			swal
				title: t('FileUpload_MediaType_NotAccepted')
				text: file.file.type || "*.#{s.strRightBack(file.file.name, '.')}"
				type: 'error'
				timer: 3000
			return

		if file.file.size is 0
			swal
				title: t('FileUpload_File_Empty')
				type: 'error'
				timer: 1000
			return

		getUploadPreview file, (file, preview) ->
			text = ''

			if file.type is 'audio'
				text = """
					<div class='upload-preview'>
						<audio  style="width: 100%;" controls="controls">
							<source src="#{preview}" type="audio/wav">
							Your browser does not support the audio element.
						</audio>
					</div>
