diff --git a/Gemfile b/Gemfile
index 27ea84610..1759e72b8 100644
--- a/Gemfile
+++ b/Gemfile
@@ -9,7 +9,7 @@ gem 'mini_mime', '~> 1.1.0'
 gem "actionpack-xml_parser"
 gem 'roadie-rails', '~> 3.0.0'
 gem 'marcel'
-gem "mail", "~> 2.7.1"
+gem 'mail', '~> 2.8.1'
 gem 'nokogiri', '~> 1.14.0'
 gem 'i18n', '~> 1.12.0'
 gem "rbpdf", "~> 1.20.0"
diff --git a/app/models/mail_handler.rb b/app/models/mail_handler.rb
index 1025bf033..6da848124 100644
--- a/app/models/mail_handler.rb
+++ b/app/models/mail_handler.rb
@@ -523,12 +523,7 @@ class MailHandler < ActionMailer::Base
       part.attachment?
     end
     parts.map do |p|
-      body_charset =
-        if Mail::RubyVer.respond_to?(:pick_encoding)
-          Mail::RubyVer.pick_encoding(p.charset).to_s
-        else
-          p.charset
-        end
+      body_charset = Mail::Utilities.pick_encoding(p.charset).to_s
       body = Redmine::CodesetUtil.to_utf8(p.body.decoded, body_charset)
       # convert html parts to text
       p.mime_type == 'text/html' ? self.class.html_body_to_text(body) : self.class.plain_text_body_to_text(body)