MANIFEST                   |  1 +
 lib/PublicInbox/Address.pm | 13 ++++++++++++-
 t/address.t                | 21 +++++++++++++++++++++

diff --git a/MANIFEST b/MANIFEST
index 834cb5ddd33e7761e099a5bb452315cbcd8cf3d4..2156caf7021f0f04e593f174f2ed9a90ec9c4244 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -99,6 +99,7 @@ scripts/import_slrnspool
 scripts/report-spam
 scripts/slrnspool2maildir
 scripts/ssoma-replay
+t/address.t
 t/cgi.t
 t/check-www-inbox.perl
 t/common.perl
diff --git a/lib/PublicInbox/Address.pm b/lib/PublicInbox/Address.pm
index 772adedb29b3ed1546a647181a31609e5f3d7766..abba43d1f03ef25d032ee31abf07a78767d40e97 100644
--- a/lib/PublicInbox/Address.pm
+++ b/lib/PublicInbox/Address.pm
@@ -7,7 +7,18 @@
 # very loose regexes, here.  We don't need RFC-compliance,
 # just enough to make thing sanely displayable and pass to git
 
-sub emails { ($_[0] =~ /([^<\s,]+\@[^>\s,]+)/g) }
+sub emails { ($_[0] =~ /([\w\.\+=\-]+\@[\w\.\-]+)>?\s*(?:,\s*|\z)/g) }
+
+sub names {
+	map {
+		tr/\r\n\t/ /;
+		s/\s*<([^<]+)\z//;
+		my $e = $1;
+		s/\A['"\s]*//;
+		s/['"\s]*\z//;
+		$_ =~ /\S/ ? $_ : $e;
+	} split(/\@+[\w\.\-]+>?\s*(?:,\s*|\z)/, $_[0]);
+}
 
 sub from_name {
 	my ($val) = @_;
diff --git a/t/address.t b/t/address.t
new file mode 100644
index 0000000000000000000000000000000000000000..c488a8ed6f726ef032fe11884fd557da1df304d6
--- /dev/null
+++ b/t/address.t
@@ -0,0 +1,21 @@
+# Copyright (C) 2016 all contributors <meta@public-inbox.org>
+# License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
+use strict;
+use warnings;
+use Test::More;
+use_ok 'PublicInbox::Address';
+
+is_deeply([qw(e@example.com e@example.org)],
+	[PublicInbox::Address::emails('User <e@example.com>, e@example.org')],
+	'address extraction works as expected');
+
+is_deeply([PublicInbox::Address::emails('"ex@example.com" <ex@example.com>')],
+	[qw(ex@example.com)]);
+
+my @names = PublicInbox::Address::names(
+	'User <e@e>, e@e, "John A. Doe" <j@d>, <x@x>');
+is_deeply(['User', 'e', 'John A. Doe', 'x'], \@names,
+	'name extraction works as expected');
+
+
+done_testing;