diff --git a/app/views/dmsf/index.html.erb b/app/views/dmsf/index.html.erb
index d08d083b..972cab5e 100644
--- a/app/views/dmsf/index.html.erb
+++ b/app/views/dmsf/index.html.erb
@@ -258,7 +258,7 @@ form_tag({:action => "entries_operation", :id => @project, :folder_id => @folder
 			uploader.plupload({
 				runtimes : 'gears,html5,flash,html4',
 				url : '<%= url_for({:controller => "dmsf_detail", :action => "upload_file", :id => @project, :folder_id => @folder}) %>',
-				max_file_size : '100mb',
+				max_file_size : "100mb",
 				max_file_count: <%= Setting.plugin_redmine_dmsf["dmsf_max_file_upload"].to_i %>,
 				multipart: true,
 				multipart_params : {authenticity_token : jQuery("input[name=authenticity_token]").val()},
diff --git a/assets/javascripts/plupload/jquery.ui.plupload/jquery.ui.plupload.js b/assets/javascripts/plupload/jquery.ui.plupload/jquery.ui.plupload.js
index 4efc4b75..60802d81 100644
--- a/assets/javascripts/plupload/jquery.ui.plupload/jquery.ui.plupload.js
+++ b/assets/javascripts/plupload/jquery.ui.plupload/jquery.ui.plupload.js
@@ -33,6 +33,11 @@ function renderUI(obj) {
 		'<div class="plupload_wrapper">' +
 			'<div class="ui-widget-content plupload_container">' +
 				'<div class="plupload">' +
+					'<div class="ui-state-default ui-widget-header plupload_header">' +
+						'<div class="plupload_header_content">' +
+						'</div>' +
+					'</div>' +
+					
 					'<div class="plupload_content">' +
 						'<table class="plupload_filelist">' +
 						'<tr class="ui-widget-header plupload_filelist_header">' +
@@ -214,9 +219,10 @@ $.widget("ui.plupload", {
 		if (self.options.max_file_count) {
 			uploader.bind('FilesAdded', function(up, files) {
 				var length = files.length, removed = [];
+				length += up.files.length;
 				
 				if (length > self.options.max_file_count) {
-					removed = files.splice(self.options.max_file_count);
+					removed = files.splice(self.options.max_file_count - up.files.length);
 					
 					up.trigger('Error', {
 						code : self.FILE_COUNT_ERROR,
diff --git a/assets/stylesheets/plupload/jquery.ui.plupload.css b/assets/stylesheets/plupload/jquery.ui.plupload.css
index b5475c76..b3faf5d0 100644
--- a/assets/stylesheets/plupload/jquery.ui.plupload.css
+++ b/assets/stylesheets/plupload/jquery.ui.plupload.css
@@ -13,20 +13,23 @@
 .plupload .plupload_filelist_footer {border-width: 1px 0 0 0}
 .plupload .plupload_filelist_header {border-width: 0 0 1px 0}
 div.plupload .plupload_file {border-width: 0 0 1px 0}
-div.plupload div.plupload_header {border-width: 0 0 1px 0; position: relative;}
+/* div.plupload div.plupload_header {border-width: 0 0 1px 0; position: relative;} */
 
 .plupload_file .ui-icon {
 	cursor:pointer;	
 }
 
+/*
 .plupload_header_content {
 	background-image: url('../img/plupload.png');
 	background-repeat: no-repeat;
 	background-position: 8px center;
-	min-height: 56px;
+	min-height: 56px; 
 	padding-left: 60px;
-	position:relative;
+	position:relative; 
 }
+*/
+
 .plupload_header_content_bw {background-image: url('../img/plupload-bw.png');}
 .plupload_header_title {
 	font: normal 18px sans-serif;
@@ -96,6 +99,7 @@ div.plupload div.plupload_header {border-width: 0 0 1px 0; position: relative;}
 
 .plupload_buttons, .plupload_upload_status {float: left}
 
+/*
 .plupload_message {
 	position: absolute;
 	top: 0px;
@@ -103,6 +107,7 @@ div.plupload div.plupload_header {border-width: 0 0 1px 0; position: relative;}
 	height: 100%;
 	width: 100%;
 }
+*/
 
 .plupload_message p {
 	padding:0.7em;
@@ -127,10 +132,11 @@ plupload_message i {
 	border:none;	
 }
 
+/* updated by evilcroco */
 .plupload_message_close {
-	position:absolute;
-	top:5px;
-	right:5px;
+	float:right;
+	margin-top:5px;
+	margin-right:5px;
 	cursor:pointer;	
 }