lib/PublicInbox/Import.pm | 8 ++++----
 t/address.t               | 4 ++++

diff --git a/lib/PublicInbox/Import.pm b/lib/PublicInbox/Import.pm
index 9555d27c44ef6d3588a2b1761954bddd800375b8..c2beb19c42e8fcfec42283df04f0d02ddbdef44c 100644
--- a/lib/PublicInbox/Import.pm
+++ b/lib/PublicInbox/Import.pm
@@ -10,6 +10,7 @@ use warnings;
 use Fcntl qw(:flock :DEFAULT);
 use PublicInbox::Spawn qw(spawn);
 use PublicInbox::MID qw(mid_mime mid2path);
+use PublicInbox::Address;
 
 sub new {
 	my ($class, $git, $name, $email, $inbox) = @_;
@@ -145,14 +146,13 @@ sub add {
 	my ($self, $mime, $check_cb) = @_; # mime = Email::MIME
 
 	my $from = $mime->header('From');
-	my ($email) = ($from =~ /([^<\s]+\@[^>\s]+)/g);
-	my $name = $from;
-	$name =~ s/\s*\S+\@\S+\s*\z//;
+	my ($email) = PublicInbox::Address::emails($from);
+	my ($name) = PublicInbox::Address::names($from);
 	# git gets confused with:
 	#  "'A U Thor <u@example.com>' via foo" <foo@example.com>
 	# ref:
 	# <CAD0k6qSUYANxbjjbE4jTW4EeVwOYgBD=bXkSu=akiYC_CB7Ffw@mail.gmail.com>
-	$name =~ tr/<>// and $name = $email;
+	$name =~ tr/<>//d;
 
 	my $date = $mime->header('Date');
 	my $subject = $mime->header('Subject');
diff --git a/t/address.t b/t/address.t
index 287fcfa05406672ed25df82e6c11f83f2766dc7c..be0fc5b7b41aa1eec50e8a130e7c8ace619cf4e4 100644
--- a/t/address.t
+++ b/t/address.t
@@ -29,4 +29,8 @@ 	my @emails = PublicInbox::Address::emails($backwards);
 	is_deeply(\@emails, ['u@example.com'], 'backwards emails OK');
 }
 
+
+@names = PublicInbox::Address::names('"Quote Unneeded" <user@example.com>');
+is_deeply(['Quote Unneeded'], \@names, 'extra quotes dropped');
+
 done_testing;