diff --git a/wp-mail.php b/wp-mail.php
index 94dac0485a..7e046370f4 100644
--- a/wp-mail.php
+++ b/wp-mail.php
@@ -62,8 +62,8 @@ for ($i=1; $i <= $count; $i++) :
 
 			// Set the author using the email address (To or Reply-To, the last used)
 			// otherwise use the site admin
-			if (preg_match('/From: /', $line) | preg_match('/Reply-To: /', $line))  {
-				$author = sanitize_email($line);
+			if ( preg_match('/(From|Reply-To): /', $line) )  {
+				$author = sanitize_email(preg_replace('/(From|Reply-To): /', '', $line));
 				if ( is_email($author) ) {
 					echo "Author = {$author} <p>";
 					$author = $wpdb->escape($author);