--- send.php~	2006-01-17 15:16:12.000000000 -0500
+++ send.php	2006-01-17 15:28:04.000000000 -0500
@@ -111,7 +111,7 @@
 if($realname === NULL)
     addhdr("From", $myaddress);
 else
-    addhdr("From", $realname . " <" . $myaddress . ">");
+    addhdr("From", "\"" . $realname . "\" <" . $myaddress . ">");
 addhdr("To", $_POST["to"]);
 addhdr("Cc", $_POST["cc"]);
 addhdr("Bcc", $_POST["bcc"]);
--- include/utils.inc~	2006-01-18 04:52:47.000000000 -0500
+++ include/utils.inc	2006-01-18 04:52:47.000000000 -0500
@@ -281,6 +281,9 @@
 	if(($pwent = posix_getpwnam($_SESSION["username"])) === FALSE)
 	    return(NULL);
 	$name = $pwent["gecos"];
+	if((3 == substr_count($name, ",")) &&
+	   (($pos = strpos($name, ",")) !== FALSE))
+	    $name = substr($name, 0, $pos);
 	while(($pos = strpos($name, "&")) !== FALSE)
 	    $name = substr($name, 0, $pos) . ucfirst($_SESSION["username"]) . substr($name, $pos + 1);
 	return($name);