X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/23b8672bc9a8449f6a89d94b25ea036f4815e4bc..592ab2bec84542d329d88692adf4674a8d7adaa7:/app/models/notifier.rb

diff --git a/app/models/notifier.rb b/app/models/notifier.rb
index 6ba90ce58..1f3d39808 100644
--- a/app/models/notifier.rb
+++ b/app/models/notifier.rb
@@ -84,7 +84,7 @@ class Notifier < ActionMailer::Base
          :replyurl => url_for(:host => SERVER_URL,
                               :controller => "message",
                               :action => "new",
-                              :user_id => comment.user.id,
+                              :display_name => comment.user.display_name,
                               :title => "Re: #{comment.diary_entry.title}")
   end
 
@@ -112,7 +112,7 @@ private
 
   def from_header(name, type, id, digest)
     if domain = APP_CONFIG['messages_domain']
-      from "#{name} <#{type}-#{id}-#{digest[0,6]}@#{domain}>"
+      from quote_address_if_necessary("#{name} <#{type}-#{id}-#{digest[0,6]}@#{domain}>", "utf-8")
     end
   end
 end