diff --git a/src/Fetch/Message.php b/src/Fetch/Message.php
index 3419862..a76d71c 100644
--- a/src/Fetch/Message.php
+++ b/src/Fetch/Message.php
@@ -451,9 +451,12 @@ class Message
                 if (!isset($set))
                     $set = true;
 
-                $outputString .= isset($address['name']) ?
-                    $address['name'] . ' <' . $address['address'] . '>'
-                    : $address['address'];
+                $val = '<' . $address['address'] . '>';
+                if (isset($address['name'])) {
+                    $val = '"' . preg_replace('/\W/u', '\\\\$0', $address['name']) . '" ' . $val;
+                }
+
+                $outputString .= $val;
             }
 
             return $outputString;