diff --git a/app/mailers/application_mailer.rb b/app/mailers/application_mailer.rb
index acdc40b30..a158947da 100644
--- a/app/mailers/application_mailer.rb
+++ b/app/mailers/application_mailer.rb
@@ -1,6 +1,6 @@
 class ApplicationMailer < ActionMailer::Base
   before_action :add_smtputf8_header
-  before_action :convert_email_to_punycode
+  after_action :convert_email_to_punycode
 
   default from: Rails.application.config.customization['email_from_address']
   layout 'mailer'