Merge commit 'origin/0.8.x' into 0.9.x

1 files changed, 3 insertions, 0 deletions

diff --git a/scripts/maildaemon.php b/scripts/maildaemon.php
index a4003b6b2..3ef4d0638 100755
--- a/scripts/maildaemon.php
+++ b/scripts/maildaemon.php
@@ -317,6 +317,9 @@ class MailerDaemon
         } else if ($parsed->ctype_primary == 'text'
             && $parsed->ctype_secondary=='plain') {
             $msg = $parsed->body;
+            if(strtolower($parsed->ctype_parameters['charset']) != "utf-8"){
+                $msg = utf8_encode($msg);
+            }
         }else if(!empty($parsed->body)){
             if(common_config('attachments', 'uploads')){
                 //only save attachments if uploads are enabled