Index: t3lib/class.t3lib_htmlmail.php
===================================================================
--- t3lib/class.t3lib_htmlmail.php	(revision 6849)
+++ t3lib/class.t3lib_htmlmail.php	(working copy)
@@ -478,7 +478,12 @@
 			// From
 		if ($this->from_email) {
 			if ($this->from_name && !t3lib_div::isBrokenEmailEnvironment()) {
-				$this->add_header('From: '.$this->from_name.' <'.$this->from_email.'>');
+				if (strpos($this->from_name, ',') !== FALSE) {
+					$from = '"' . str_replace('"', '\\"', $this->from_name) . '"';
+				} else {
+					$from = $this->from_name;
+				}
+				$this->add_header('From: ' . $from . ' <' . $this->from_email . '>');
 			} else {
 				$this->add_header('From: '.$this->from_email);
 			}