Move address_from_name_and_email to mail handler.

3 files changed, 6 insertions, 5 deletions

diff --git a/app/models/info_request.rb b/app/models/info_request.rb
index e1885dee6..85524e798 100644
--- a/app/models/info_request.rb
+++ b/app/models/info_request.rb
@@ -275,7 +275,7 @@ public
         return self.magic_email("request-")
     end
     def incoming_name_and_email
-        return TMail::Address.address_from_name_and_email(self.user_name, self.incoming_email).to_s
+        return MailHandler.address_from_name_and_email(self.user_name, self.incoming_email)
     end
 
     # Subject lines for emails about the request
@@ -707,11 +707,11 @@ public
         return self.public_body.is_followupable?
     end
     def recipient_name_and_email
-        return TMail::Address.address_from_name_and_email(
+        return MailHandler.address_from_name_and_email(
             _("{{law_used}} requests at {{public_body}}",
                 :law_used => self.law_used_short,
                 :public_body => self.public_body.short_or_long_name),
-            self.recipient_email).to_s
+            self.recipient_email)
     end
 
     # History of some things that have happened
diff --git a/app/models/outgoing_mailer.rb b/app/models/outgoing_mailer.rb
index 277794c69..503166b8a 100644
--- a/app/models/outgoing_mailer.rb
+++ b/app/models/outgoing_mailer.rb
@@ -47,7 +47,8 @@ class OutgoingMailer < ApplicationMailer
             return info_request.recipient_name_and_email
         else
             # calling safe_mail_from from so censor rules are run
-            return TMail::Address.address_from_name_and_email(incoming_message_followup.safe_mail_from, incoming_message_followup.from_email).to_s
+            return MailHandler.address_from_name_and_email(incoming_message_followup.safe_mail_from,
+                                                           incoming_message_followup.from_email)
         end
     end
     # Used in the preview of followup
diff --git a/app/models/user.rb b/app/models/user.rb
index 70386f7e4..6e1e21481 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -203,7 +203,7 @@ class User < ActiveRecord::Base
 
 # For use in to/from in email messages
     def name_and_email
-        return TMail::Address.address_from_name_and_email(self.name, self.email).to_s
+        return MailHandler.address_from_name_and_email(self.name, self.email)
     end
 
     # The "internal admin" is a special user for internal use.