diff --git a/git-send-email.perl b/git-send-email.perl
index 2fd5e87934..21b3686b2c 100755
--- a/git-send-email.perl
+++ b/git-send-email.perl
@@ -409,6 +409,11 @@ sub send_message
 	    $gitversion = Git::version();
 	}
 
+	my ($author_name) = ($from =~ /^(.*?)\s+</);
+	if ($author_name =~ /\./ && $author_name !~ /^".*"$/) {
+		my ($name, $addr) = ($from =~ /^(.*?)(\s+<.*)/);
+		$from = "\"$name\"$addr";
+	}
 	my $header = "From: $from
 To: $to
 Cc: $cc