1 files changed, 3 insertions, 2 deletions
diff --git a/lib/Fripost/Schema/Mail.pm b/lib/Fripost/Schema/Mail.pm
index c07c6d1..3f9ec73 100644
--- a/lib/Fripost/Schema/Mail.pm
+++ b/lib/Fripost/Schema/Mail.pm
@@ -19,6 +19,7 @@ use utf8;
 use MIME::Entity;
 use Mail::GnuPG;
 use Encode 'encode';
+use Net::IDN::Encode 'email_to_ascii';
 
 my $DEBUG = 0;
 
@@ -31,8 +32,8 @@ sub new {
     $msg{Encoding} //= 'quoted-printable';
     $msg{Charset}  //= 'utf-8';
 
-    $msg{From}    = Encode::encode( 'MIME-Q', $msg{From})    if $msg{From};
-    $msg{To}      = Encode::encode( 'MIME-Q', $msg{To})      if $msg{To};
+    $msg{From}    = Encode::encode( 'MIME-Q', email_to_ascii($msg{From}))    if $msg{From};
+    $msg{To}      = Encode::encode( 'MIME-Q', email_to_ascii($msg{To}))      if $msg{To};
     $msg{Subject} = Encode::encode( 'MIME-Q', $msg{Subject}) if $msg{Subject};
 
     my $msg = MIME::Entity::->build( %msg );