Permalink
Browse files

Merge branch 'master' of git://github.com/ochko/mail into ochko-master

  • Loading branch information...
2 parents 686e695 + 3f69873 commit aa24026f4cf92aa71b986aaf1b68420cc48cc028 @mikel committed Nov 17, 2012
Showing with 1 addition and 1 deletion.
  1. +1 −1 lib/mail/message.rb
View
@@ -2046,7 +2046,7 @@ def decode_body_as_text
else
if encoding = Encoding.find(charset) rescue nil
body_text.force_encoding(encoding)
- return body_text.encode(Encoding::UTF_8)
+ return body_text.encode(Encoding::UTF_8, :undef => :replace, :invalid => :replace, :replace => '')
end
end
end

0 comments on commit aa24026

Please sign in to comment.