diff options
Diffstat (limited to 'app/models/mail_handler.rb')
| -rw-r--r-- | app/models/mail_handler.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/mail_handler.rb b/app/models/mail_handler.rb index 4aaa21c98..be737931c 100644 --- a/app/models/mail_handler.rb +++ b/app/models/mail_handler.rb @@ -42,7 +42,7 @@ class MailHandler < ActionMailer::Base @@handler_options[:no_notification] = (@@handler_options[:no_notification].to_s == '1') @@handler_options[:no_permission_check] = (@@handler_options[:no_permission_check].to_s == '1') - email.force_encoding('ASCII-8BIT') if email.respond_to?(:force_encoding) + email.force_encoding('ASCII-8BIT') super(email) end @@ -417,7 +417,7 @@ class MailHandler < ActionMailer::Base end parts.reject! do |part| - part.header[:content_disposition].try(:disposition_type) == 'attachment' + part.attachment? end @plain_text_body = parts.map do |p| |