diff --git a/app/models/mail_handler.rb.orig b/app/models/mail_handler.rb
index 8421fb6..b43a1fd 100644
--- a/app/models/mail_handler.rb.orig
+++ b/app/models/mail_handler.rb
@@ -378,7 +378,9 @@ class MailHandler < ActionMailer::Base
   end

   def cleaned_up_subject
-    subject = email.subject.to_s
+    part = email.text_part || email.html_part || email
+    subject = email.subject
+    subject = Redmine::CodesetUtil.to_utf8(subject, part.charset)
     subject.strip[0,255]
   end