From 5287669116f1821bfd99874bf54e4125e5985e40 Mon Sep 17 00:00:00 2001
From: Arpit Jalan <arpit@techapj.com>
Date: Mon, 19 Jan 2015 15:21:39 +0530
Subject: [PATCH] :lipstick: simplify utf-8 conversion

---
 lib/email/receiver.rb | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/lib/email/receiver.rb b/lib/email/receiver.rb
index 44857065e3b..900108c5313 100644
--- a/lib/email/receiver.rb
+++ b/lib/email/receiver.rb
@@ -146,9 +146,7 @@ module Email
       return nil if object.nil?
 
       if object.charset
-        # convert UTF8 charset to UTF-8
-        object.charset = object.charset.gsub(/utf8/i, "UTF-8") if object.charset.downcase == "utf8"
-        object.body.decoded.force_encoding(object.charset).encode("UTF-8").to_s
+        object.body.decoded.force_encoding(object.charset.gsub(/utf8/i, "UTF-8")).encode("UTF-8").to_s
       else
         object.body.to_s
       end