Adding basic UTF-8 support.

1 files changed, 8 insertions, 4 deletions

diff --git a/rfc2047.c b/rfc2047.c
index 3bfaafb7..87745bd8 100644
--- a/rfc2047.c
+++ b/rfc2047.c
@@ -324,16 +324,20 @@ static int rfc2047_decode_word (char *d, const char *s, size_t len)
     }
     pp = 0;
   }
+  
   if (filter)
   {
-    if (mutt_display_string(d, mutt_get_translation(charset, Charset)) == -1)
+    if(mutt_is_utf8(charset))
+    {
+      CHARSET *chs = mutt_get_charset(Charset);
+      mutt_decode_utf8_string(d, chs);
+    }
+    else if (mutt_display_string(d, mutt_get_translation(charset, Charset)) == -1)
     {
-      pd = d;
-      while (*pd)
+      for(pd = d; *pd; pd++)
       {
         if (!IsPrint (*pd))
 	  *pd = '?';
-        pd++;
       }
     }
   }