diff --git a/Changelog.md b/Changelog.md
index 5cbb40ed57f737121d35bb8fe4849c250ac7e56b..8100032306daeb47ff0df3a5eb38b826bef7cd01 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -49,6 +49,7 @@ The default for including jQuery from a CDN has changed. If you want to continue
 * Handle long URLs and titles in OpenGraph descriptions [#5208](https://github.com/diaspora/diaspora/pull/5208)
 * Fix deformed getting started popover [#5227](https://github.com/diaspora/diaspora/pull/5227)
 * Use correct locale for invitation subject [#5232](https://github.com/diaspora/diaspora/pull/5232)
+* Initial support for IDN emails
 
 ## Features
 * Don't pull jQuery from a CDN by default [#5105](https://github.com/diaspora/diaspora/pull/5105)
diff --git a/app/mailers/notification_mailers/base.rb b/app/mailers/notification_mailers/base.rb
index ec2950bfbdc0f0fbd6100bf027bf1e3b96d48a6a..086228b06039b606badeeaebe99fd7135e856ee3 100644
--- a/app/mailers/notification_mailers/base.rb
+++ b/app/mailers/notification_mailers/base.rb
@@ -23,7 +23,7 @@ module NotificationMailers
     end
 
     def name_and_address(name, email)
-      address = Mail::Address.new email
+      address = Mail::Address.new Addressable::IDNA.to_ascii(email)
       address.display_name = name
       address.format
     end
diff --git a/spec/mailers/notifier_spec.rb b/spec/mailers/notifier_spec.rb
index 32788078090bd4420b502b94f44fac166abe19fa..c5296b5c61be1a3ac1219577cb77ac05e40d74eb 100644
--- a/spec/mailers/notifier_spec.rb
+++ b/spec/mailers/notifier_spec.rb
@@ -326,4 +326,14 @@ describe Notifier, :type => :mailer do
       expect(mail.body.encoded).to match "<p><a href=\"http://localhost:9887/tags/welcome\">#Welcome</a> to bureaucracy!</p>"
     end
   end
+
+  describe "base" do
+    it "handles idn addresses" do
+      # user = FactoryGirl.create(:user, email: "ŧoo@ŧexample.com")
+      bob.update_attribute(:email, "ŧoo@ŧexample.com")
+      expect {
+        Notifier.started_sharing(bob.id, person.id)
+      }.to_not raise_error
+    end
+  end
 end