diff --git a/webui/model/search/message.php b/webui/model/search/message.php
index cc58f8a..cd49eb4 100644
--- a/webui/model/search/message.php
+++ b/webui/model/search/message.php
@@ -224,7 +224,7 @@
       }
 
       if(!preg_match("/utf-8/i", $charset)){
-         $chunk = utf8_encode($chunk);
+         $chunk = iconv($charset, 'utf-8', $chunk);
       }
 
       if($text_plain == 1){