X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/fe0f4543c1b3a28f872b8a303dcd0f7aa823b872..de6c33814b92e93dcd4dc40b33da1effe8ad982b:/app/models/notifier.rb

diff --git a/app/models/notifier.rb b/app/models/notifier.rb
index a498e4edf..0539bdeb7 100644
--- a/app/models/notifier.rb
+++ b/app/models/notifier.rb
@@ -107,7 +107,7 @@ class Notifier < ActionMailer::Base
                           :display_name => comment.user.display_name,
                           :title => "Re: #{comment.diary_entry.title}")
 
-      mail :from => from_address(comment.user.display_name, "c", comment.id, comment.digest),
+      mail :from => from_address(comment.user.display_name, "c", comment.id, comment.digest, recipient.id),
            :to => recipient.email,
            :subject => I18n.t("notifier.diary_comment_notification.subject", :user => comment.user.display_name)
     end
@@ -180,9 +180,13 @@ class Notifier < ActionMailer::Base
     end
   end
 
-  def from_address(name, type, id, digest)
+  def from_address(name, type, id, digest, user_id = nil)
     if Object.const_defined?(:MESSAGES_DOMAIN) && domain = MESSAGES_DOMAIN
-      "#{name} <#{type}-#{id}-#{digest[0, 6]}@#{domain}>"
+      if user_id
+        "#{name} <#{type}-#{id}-#{user_id}-#{digest[0, 6]}@#{domain}>"
+      else
+        "#{name} <#{type}-#{id}-#{digest[0, 6]}@#{domain}>"
+      end
     else
       EMAIL_FROM
     end