diff --git a/panels/MailPanel.php b/panels/MailPanel.php
index d6daf027f..8a9116ef7 100644
--- a/panels/MailPanel.php
+++ b/panels/MailPanel.php
@@ -73,6 +73,11 @@ public function init()
                                 $body = $part->getBody();
                                 break;
                             }
+                            if ($part->getContentType() == 'text/html') {
+                                $messageData['charset'] = $part->getCharset();
+                                $body = $part->getBody();
+                                break;
+                            }
                         }
                     }
                 }