diff --git a/include/class.mailparse.php b/include/class.mailparse.php
index 27ea94701fbcb665b26a2a2a96724a13cd517855..37f9b3bf2779869d565d6bccd946eb8fb9e685cc 100644
--- a/include/class.mailparse.php
+++ b/include/class.mailparse.php
@@ -370,7 +370,8 @@ class Mail_Parse {
                     'type'  => strtolower($part->ctype_primary.'/'.$part->ctype_secondary),
                     );
 
-            if ($part->ctype_parameters['charset'])
+            if ($part->ctype_parameters['charset']
+                    && 0 === strcasecmp($part->ctype_primary, 'text'))
                 $file['data'] = $this->mime_encode($part->body,
                     $part->ctype_parameters['charset']);
             else