diff --git a/app/views/settings/_mail_handler.html.erb b/app/views/settings/_mail_handler.html.erb
index 910270033..de6364d97 100644
--- a/app/views/settings/_mail_handler.html.erb
+++ b/app/views/settings/_mail_handler.html.erb
@@ -10,7 +10,7 @@
     <em class="info"><%= l(:text_line_separated) %></em>
   </p>
   <p>
-    <%= setting_text_field :mail_handler_excluded_filenames, :size => 60 %>
+    <%= setting_text_area :mail_handler_excluded_filenames, :maxlength => 60 %>
     <label class="block">
       <%= setting_check_box :mail_handler_enable_regex_excluded_filenames, :label => false %>
       <%= l(:setting_mail_handler_enable_regex) %>
diff --git a/test/unit/mail_handler_test.rb b/test/unit/mail_handler_test.rb
index 469722a37..3d776cdf9 100644
--- a/test/unit/mail_handler_test.rb
+++ b/test/unit/mail_handler_test.rb
@@ -1114,7 +1114,7 @@ class MailHandlerTest < ActiveSupport::TestCase
   end
 
   def test_attachments_that_match_mail_handler_excluded_filenames_should_be_ignored
-    with_settings :mail_handler_excluded_filenames => '*.vcf, *.jpg' do
+    with_settings :mail_handler_excluded_filenames => "*.vcf,\n *.jpg" do
       issue = submit_email('ticket_with_attachment.eml', :issue => {:project => 'onlinestore'})
       assert issue.is_a?(Issue)
       assert !issue.new_record?