diff --git a/framework/Mail/lib/Horde/Mail/Transport.php b/framework/Mail/lib/Horde/Mail/Transport.php
index f38cc447dde..8f762dafd01 100644
--- a/framework/Mail/lib/Horde/Mail/Transport.php
+++ b/framework/Mail/lib/Horde/Mail/Transport.php
@@ -134,7 +134,7 @@ public function prepareHeaders(array $headers)
             if (strcasecmp($key, 'From') === 0) {
                 $parser = new Horde_Mail_Rfc822();
                 $addresses = $parser->parseAddressList($value, array(
-                    'validate' => true
+                    'validate' => $this->eai ? 'eai' : true
                 ));
                 $from = $addresses[0]->bare_address;
 
@@ -190,7 +190,7 @@ public function parseRecipients($recipients)
         // should already be in the headers.
         $rfc822 = new Horde_Mail_Rfc822();
         return $rfc822->parseAddressList($recipients, array(
-            'validate' => true
+            'validate' => $this->eai ? 'eai' : true
         ))->bare_addresses_idn;
     }
 
diff --git a/framework/Mail/package.xml b/framework/Mail/package.xml
index 69ce096df30..179d100e9ad 100644
--- a/framework/Mail/package.xml
+++ b/framework/Mail/package.xml
@@ -21,7 +21,7 @@
  </stability>
  <license uri="http://www.horde.org/licenses/bsd">BSD-2-Clause</license>
  <notes>
-* 
+* [mms] Fix validating sent messages if the driver supports EAI addresses.
  </notes>
  <contents>
   <dir baseinstalldir="/" name="/">
@@ -723,7 +723,7 @@
    <date>2015-06-24</date>
    <license uri="http://www.horde.org/licenses/bsd">BSD-2-Clause</license>
    <notes>
-* 
+* [mms] Fix validating sent messages if the driver supports EAI addresses.
    </notes>
   </release>
  </changelog>