485a497,524
> 		//Mung addresses to prevent harvesting on the nntp side
> 		$from_orig = array("@", ".");
> 		$from_mung = array("_at_", "_dot_");
> 		//hehe.. probably too heavy handed.. borrowed from above
> 		if (preg_match('!(.*?)<(.*?)>!', $from, $matches)) {
> 			$this->sy_email = trim($matches[2]);
> 			if (!empty($matches[1])) {
> 				$matches[1] = trim($matches[1]);
> 				if ($matches[1][0] == '"' && substr($matches[1], -1) == '"') {
> 					$this->sy_name = substr($matches[1], 1, -1);
> 				} else {
> 					$this->sy_name = $matches[1];
> 				}
> 			} else {
> 				$this->sy_name = $this->sy_email;
> 			}
> 			if (preg_match('![^A-Za-z0-9\-_\s]!', $this->sy_name)) {
> 				$this->sy_name = substr($this->sy_email, 0, strpos($this->sy_email, '@'));
> 			}
> 		} else {
> 			$this->sy_email = trim($from);
> 			$this->sy_name = substr($this->sy_email, 0, strpos($this->sy_email, '@'));
> 		}
> 		//do str_replace only on email
> 		$this->sy_email = str_replace($from_orig, $from_mung, $this->sy_email)."_fixme_";
> 		//join back to make $from
> 		$from = $this->sy_name . " <" . $this->sy_email . ">";
>