From 4701831a64d57d5a266578d4b9697efd180415dc Mon Sep 17 00:00:00 2001
From: Nicolas Pouillard <nicolas.pouillard@gmail.com>
Date: Tue, 8 Jan 2008 02:42:56 +0100
Subject: [PATCH] encoding, fix: Normalize UTF8 and UTF_8 to utf8, to please
 iconv.

Signed-off-by: William Morgan <wmorgan-sup@masanjin.net>
---
 lib/sup/message.rb | 1 +
 lib/sup/rfc2047.rb | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/lib/sup/message.rb b/lib/sup/message.rb
index 01008ed..53ab2a6 100644
--- a/lib/sup/message.rb
+++ b/lib/sup/message.rb
@@ -391,6 +391,7 @@ private
   end
 
   def self.convert_from body, charset
+    charset = "utf-8" if charset =~ /UTF_?8/i
     begin
       raise MessageFormatError, "RubyMail decode returned a null body" unless body
       return body unless charset
diff --git a/lib/sup/rfc2047.rb b/lib/sup/rfc2047.rb
index 10ad7e0..947de02 100644
--- a/lib/sup/rfc2047.rb
+++ b/lib/sup/rfc2047.rb
@@ -52,6 +52,8 @@ module Rfc2047
         # WORD.
       end
 
+      charset = "utf-8" if charset =~ /UTF_?8/i
+
       # Convert:
       #
       # Remember - Iconv.open(to, from)!
-- 
2.45.2