diff --git a/app/controllers/dmsf_detail_controller.rb b/app/controllers/dmsf_detail_controller.rb
index aa9a1b83..551abdb3 100644
--- a/app/controllers/dmsf_detail_controller.rb
+++ b/app/controllers/dmsf_detail_controller.rb
@@ -173,7 +173,7 @@ class DmsfDetailController < ApplicationController
       Rails.logger.info "#{Time.now} from #{request.remote_ip}/#{request.env["HTTP_X_FORWARDED_FOR"]}: #{User.current.login} uploaded for project #{@project.identifier}:"
       files.each {|file| Rails.logger.info "\t#{file.dmsf_path_str}:"}
       begin 
-        DmsfMailer.deliver_files_updated(User.current, files)
+        DmsfMailer.deliver_files_updated(User.current, files) unless files.empty?
       rescue ActionView::MissingTemplate => e
         Rails.logger.error "Could not send email notifications: " + e
       end
diff --git a/app/views/dmsf_detail/_upload_file_locked.html.erb b/app/views/dmsf_detail/_upload_file_locked.html.erb
index ff2ccad0..fd1e818d 100644
--- a/app/views/dmsf_detail/_upload_file_locked.html.erb
+++ b/app/views/dmsf_detail/_upload_file_locked.html.erb
@@ -1,5 +1,6 @@
 <div class="box dmsf_upload">
 	<%= hidden_field_tag("commited_files[#{i}][disk_filename]", upload.disk_filename) %>
+	<%= hidden_field_tag("commited_files[#{i}][name]", upload.name) %>
 	<fieldset class="tabular">
 		<legend><%= h(upload.name) %></legend>
 		<p class="warning">File locked!</p>
diff --git a/init.rb b/init.rb
index 566cc713..e37f4088 100644
--- a/init.rb
+++ b/init.rb
@@ -22,7 +22,7 @@ Redmine::Plugin.register :redmine_dmsf do
   name "DMSF"
   author "Vít Jonáš"
   description "Document Management System Features for Redmine"
-  version "0.6.0"
+  version "0.5.2"
   url "https://code.google.com/p/redmine-dmsf/"
   author_url "mailto:vit.jonas@kontron-czech.com"