diff --git a/src/Fetch/Attachment.php b/src/Fetch/Attachment.php
index 3b7c4a7..613afda 100644
--- a/src/Fetch/Attachment.php
+++ b/src/Fetch/Attachment.php
@@ -93,9 +93,9 @@ class Attachment
         $parameters = Message::getParametersFromStructure($structure);
 
         if (isset($parameters['filename'])) {
-            $this->filename = $parameters['filename'];
+            $this->filename = imap_utf8($parameters['filename']);
         } elseif (isset($parameters['name'])) {
-            $this->filename = $parameters['name'];
+            $this->filename = imap_utf8($parameters['name']);
         }
 
         $this->size = $structure->bytes;
diff --git a/src/Fetch/Message.php b/src/Fetch/Message.php
index d5aef7a..a71bc75 100755
--- a/src/Fetch/Message.php
+++ b/src/Fetch/Message.php
@@ -220,7 +220,7 @@ class Message
 
             return false;
 
-        $this->subject = isset($messageOverview->subject) ? $messageOverview->subject : null;
+        $this->subject = isset($messageOverview->subject) ? imap_utf8($messageOverview->subject) : null;
         $this->date    = strtotime($messageOverview->date);
         $this->size    = $messageOverview->size;