diff --git a/src/AddressList.php b/src/AddressList.php
index 393d27fc..9a00d68f 100644
--- a/src/AddressList.php
+++ b/src/AddressList.php
@@ -90,7 +90,7 @@ public function addMany(array $addresses)
      */
     public function addFromString($address)
     {
-        if (! preg_match('/^((?P<name>.*?)<(?P<namedEmail>[^>]+)>|(?P<email>.+))$/', $address, $matches)) {
+        if (! preg_match('/^((?P<name>.*)<(?P<namedEmail>[^>]+)>|(?P<email>.+))$/', $address, $matches)) {
             throw new Exception\InvalidArgumentException('Invalid address format');
         }
 
diff --git a/test/AddressListTest.php b/test/AddressListTest.php
index 8ba08879..0386d31a 100644
--- a/test/AddressListTest.php
+++ b/test/AddressListTest.php
@@ -15,10 +15,13 @@
 
 /**
  * @group      Zend_Mail
- * @covers Zend\Mail\AddressList<extended>
+ * @covers \Zend\Mail\AddressList<extended>
  */
 class AddressListTest extends TestCase
 {
+    /** @var AddressList $list */
+    private $list;
+
     public function setUp()
     {
         $this->list = new AddressList();
diff --git a/test/HeadersTest.php b/test/HeadersTest.php
index 367ec6c2..be5a55ce 100644
--- a/test/HeadersTest.php
+++ b/test/HeadersTest.php
@@ -15,7 +15,7 @@
 
 /**
  * @group      Zend_Mail
- * @covers Zend\Mail\Headers<extended>
+ * @covers \Zend\Mail\Headers<extended>
  */
 class HeadersTest extends TestCase
 {
@@ -483,4 +483,36 @@ public function testAddressListGetEncodedFieldValueWithUtf8Domain()
         $encodedValue = $to->getFieldValue(Header\HeaderInterface::FORMAT_ENCODED);
         $this->assertEquals('local-part@xn---umlaut-4wa.de', $encodedValue);
     }
+
+    /**
+     * Test ">" being part of email "comment".
+     *
+     * Example Email-header:
+     *  "Foo <bar" foo.bar@test.com
+     *
+     * Description:
+     *   The example email-header should be valid
+     *   according to https://tools.ietf.org/html/rfc2822#section-3.4
+     *   but the function AdressList.php/addFromString matches it incorrect.
+     *   The result has the following form:
+     *    "bar <foo.bar@test.com"
+     *   This is clearly not a valid adress and therefore causes
+     *   exceptions in the following code
+     *
+     * @see https://github.com/zendframework/zend-mail/issues/127
+     */
+    public function testEmailNameParser() {
+        $to = Header\To::fromString('To: "=?UTF-8?Q?=C3=B5lu?= <bar" <foo.bar@test.com>');
+
+        $address = $to->getAddressList()->get('foo.bar@test.com');
+        $this->assertEquals('õlu <bar', $address->getName());
+        $this->assertEquals('foo.bar@test.com', $address->getEmail());
+
+        $encodedValue = $to->getFieldValue(Header\HeaderInterface::FORMAT_ENCODED);
+        $this->assertEquals('=?UTF-8?Q?=C3=B5lu=20<bar?= <foo.bar@test.com>', $encodedValue);
+
+        $encodedValue = $to->getFieldValue(Header\HeaderInterface::FORMAT_RAW);
+        // FIXME: shouldn't the "name" part be in quotes?
+        $this->assertEquals('õlu <bar <foo.bar@test.com>', $encodedValue);
+    }
 }