diff --git a/app/helpers/settings_helper.rb b/app/helpers/settings_helper.rb
index 6a14824..49a6184 100644
--- a/app/helpers/settings_helper.rb
+++ b/app/helpers/settings_helper.rb
@@ -25,6 +25,7 @@ module SettingsHelper
             {:name => 'api', :partial => 'settings/api', :label => :label_api},
             {:name => 'projects', :partial => 'settings/projects', :label => :label_project_plural},
             {:name => 'issues', :partial => 'settings/issues', :label => :label_issue_tracking},
+            {:name => 'attachments', :partial => 'settings/attachments', :label => :label_attachment_plural},
             {:name => 'notifications', :partial => 'settings/notifications', :label => :field_mail_notification},
             {:name => 'mail_handler', :partial => 'settings/mail_handler', :label => :label_incoming_emails},
             {:name => 'repositories', :partial => 'settings/repositories', :label => :label_repository_plural}
diff --git a/app/views/settings/_attachments.html.erb b/app/views/settings/_attachments.html.erb
new file mode 100644
index 0000000..f8a85c7
--- /dev/null
+++ b/app/views/settings/_attachments.html.erb
@@ -0,0 +1,15 @@
+<%= form_tag({:action => 'edit', :tab => 'attachments'}) do %>
+
+<div class="box tabular settings">
+<p><%= setting_text_field :attachment_max_size, :size => 6 %> <%= l(:"number.human.storage_units.units.kb") %></p>
+
+<p><%= setting_text_field :file_max_size_displayed, :size => 6 %> <%= l(:"number.human.storage_units.units.kb") %></p>
+
+<p><%= setting_text_field :diff_max_lines_displayed, :size => 6 %></p>
+
+<p><%= setting_text_field :repositories_encodings, :size => 60 %>
+<em class="info"><%= l(:text_comma_separated) %></em></p>
+</div>
+
+<%= submit_tag l(:button_save) %>
+<% end %>
diff --git a/app/views/settings/_general.html.erb b/app/views/settings/_general.html.erb
index 9bfd23b..23abdb3 100644
--- a/app/views/settings/_general.html.erb
+++ b/app/views/settings/_general.html.erb
@@ -6,7 +6,6 @@
 <p><%= setting_text_area :welcome_text, :cols => 60, :rows => 5, :class => 'wiki-edit' %></p>
 <%= wikitoolbar_for 'settings_welcome_text' %>
 
-<p><%= setting_text_field :attachment_max_size, :size => 6 %> <%= l(:"number.human.storage_units.units.kb") %></p>
 
 <p><%= setting_text_field :per_page_options, :size => 20 %>
 <em class="info"><%= l(:text_comma_separated) %></em></p>
@@ -28,13 +27,6 @@
 
 <p><%= setting_text_field :feeds_limit, :size => 6 %></p>
 
-<p><%= setting_text_field :file_max_size_displayed, :size => 6 %> <%= l(:"number.human.storage_units.units.kb") %></p>
-
-<p><%= setting_text_field :diff_max_lines_displayed, :size => 6 %></p>
-
-<p><%= setting_text_field :repositories_encodings, :size => 60 %>
-<em class="info"><%= l(:text_comma_separated) %></em></p>
-
 <%= call_hook(:view_settings_general_form) %>
 </div>