diff --git a/tests/MessageTest.php b/tests/MessageTest.php
index 4dde0f12..727d05d8 100644
--- a/tests/MessageTest.php
+++ b/tests/MessageTest.php
@@ -892,6 +892,15 @@ public function testMixedInlineDisposition()
         $this->assertSame('Price4VladDaKar.xlsx', $attachment->getFilename());
     }
 
+    public function testHandlerBadAddress()
+    {
+        $this->mailbox->addMessage($this->getFixture('bad_address'));
+
+        $message = $this->mailbox->getMessage(1);
+
+        $this->assertSame('"Gap" <%%FromAddress%@>', $message->getFrom()->getFullAddress());
+    }
+
     private function resetAttachmentCharset(MessageInterface $message)
     {
         // Mimic GMAIL behaviour that correctly doesn't report charset
diff --git a/tests/fixtures/bad_address.eml b/tests/fixtures/bad_address.eml
new file mode 100644
index 00000000..2d2462a5
--- /dev/null
+++ b/tests/fixtures/bad_address.eml
@@ -0,0 +1,9 @@
+From: "Gap" <%%FromAddress%@>
+To: to@here.com
+Subject: Nuu
+Date: Wed, 13 Sep 2017 13:05:45 +0200
+Content-Type: text/plain;
+	charset="us-ascii"
+Content-Transfer-Encoding: quoted-printable
+
+Hi