From 9f035fb7afc37def7fd4808a36c4ed7509976115 Mon Sep 17 00:00:00 2001 From: Martin Edenhofer Date: Thu, 19 Mar 2015 08:43:03 +0100 Subject: [PATCH] Improved error handling of spam emails (also for html parts). --- app/models/channel/email_parser.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/channel/email_parser.rb b/app/models/channel/email_parser.rb index 0bec2c523..2e9420ca0 100644 --- a/app/models/channel/email_parser.rb +++ b/app/models/channel/email_parser.rb @@ -142,7 +142,7 @@ class Channel::EmailParser data[:body] = Encode.conv( mail.html_part.charset.to_s, data[:body] ) data[:body] = data[:body].html2text.to_s.force_encoding('utf-8') - if !data[:body].valid_encoding? + if !data[:body].force_encoding("UTF-8").valid_encoding? data[:body] = data[:body].encode('utf-8', 'binary', :invalid => :replace, :undef => :replace, :replace => '?') end