diff --git a/includes/simplenews.mail.inc b/includes/simplenews.mail.inc
index e5b3f2b..c63562a 100644
--- a/includes/simplenews.mail.inc
+++ b/includes/simplenews.mail.inc
@@ -616,8 +616,8 @@ function _simplenews_set_from() {
   $address = variable_get('simplenews_from_address', $address_default);
   $name = variable_get('simplenews_from_name', $name_default);
 
-  // Windows based PHP systems don't accept formatted emails.
-  $formatted_address = drupal_substr(PHP_OS, 0, 3) == 'WIN' ? $address : '"' . $name . '" <' . $address . '>';
+  // Windows based PHP systems don't accept formatted email addresses.
+  $formatted_address = (drupal_substr(PHP_OS, 0, 3) == 'WIN') ? $address : '"'. addslashes(mime_header_encode($name)) .'" <'. $address .'>';
 
   return array(
     'address' => $address,