From a09111eacf944b272405afd8cb83997cfcce0c9a Mon Sep 17 00:00:00 2001
From: Martin Edenhofer <me@edenhofer.de>
Date: Wed, 5 Dec 2012 02:38:30 +0100
Subject: [PATCH] Added manual load of encode.rb.

---
 app/models/channel/email_parser.rb | 1 +
 lib/encode.rb                      | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/models/channel/email_parser.rb b/app/models/channel/email_parser.rb
index 812767dd9..016fa411d 100644
--- a/app/models/channel/email_parser.rb
+++ b/app/models/channel/email_parser.rb
@@ -1,6 +1,7 @@
 # encoding: utf-8
 
 require 'mail'
+require 'encode'
 
 class Channel::EmailParser
 
diff --git a/lib/encode.rb b/lib/encode.rb
index c6cb5f7c5..a6cdcca91 100644
--- a/lib/encode.rb
+++ b/lib/encode.rb
@@ -31,7 +31,7 @@ module Encode
 #    puts '-------' + charset
 #    puts string
     # convert string
-    string.encode!( 'UTF-8', charset.upcase )
+    string.encode!( 'UTF-8', charset )
 #    Iconv.conv( 'UTF8', charset, string )
   end
 end
\ No newline at end of file