diff --git a/app/views/settings/_dmsf_settings.erb b/app/views/settings/_dmsf_settings.erb
index 822508b1..3feac0ee 100644
--- a/app/views/settings/_dmsf_settings.erb
+++ b/app/views/settings/_dmsf_settings.erb
@@ -66,21 +66,6 @@
   (<%=l(:label_default)%>: <%=l(:select_option_deactivated)%>)
 </p>
 
-<p>
-  <%=content_tag(:label, l(:label_zip_names_encoding) + ":") %>
-  <%=text_field_tag "settings[dmsf_zip_encoding]", @settings["dmsf_zip_encoding"], :size=>50 %><br/>
-  (<%=l(:label_default)%>: utf-8)
-  <br/>
-  <%= l(:note_zip_names_encoding_iconv) %>
-</p>
-<% unless @settings["dmsf_zip_encoding"].blank? || @settings["dmsf_zip_encoding"].downcase == "utf-8"
-	begin
-  		Iconv.conv(@settings["dmsf_zip_encoding"], "utf-8", "test")
-   	rescue %>
-		<p class="warning"><%= l(:error_wrong_zip_encoding) %></p> 
-<%	end 
-   end %>
-
 <p>
   <%=content_tag(:label, l(:label_webdav) + ":") %>
   <%=select_tag("settings[dmsf_webdav]",
diff --git a/init.rb b/init.rb
index 075a40f3..e3d98909 100644
--- a/init.rb
+++ b/init.rb
@@ -36,8 +36,7 @@ Redmine::Plugin.register :redmine_dmsf do
               "dmsf_max_file_upload" => "0",
               "dmsf_max_file_download" => "0",
               "dmsf_max_email_filesize" => "0",
-              "dmsf_storage_directory" => Rails.root.join('files/dmsf').to_s,
-              "dmsf_zip_encoding" => "utf-8",
+              "dmsf_storage_directory" => Rails.root.join('files/dmsf').to_s,              
               "dmsf_index_database" => Rails.root.join("files/dmsf_index").to_s,
               "dmsf_stemming_lang" => "english",
               "dmsf_stemming_strategy" => "STEM_NONE",