Merge remote-tracking branch 'upstream/pull/2462'

diff --git a/app/mailers/notifier.rb b/app/mailers/notifier.rb
index b125999810b0571127e752a544ff2c7db15d1098..1d33db9d8b9fc73e5239f0ee1506f61b27ce9dae 100644 (file)
--- a/app/mailers/notifier.rb
+++ b/app/mailers/notifier.rb
@@ -94,11 +94,12 @@ class Notifier < ApplicationMailer
       @readurl = diary_entry_url(comment.diary_entry.user, comment.diary_entry, :anchor => "comment#{comment.id}")
       @commenturl = diary_entry_url(comment.diary_entry.user, comment.diary_entry, :anchor => "newcomment")
       @replyurl = new_message_url(comment.user, :message => { :title => "Re: #{comment.diary_entry.title}" })
-
       @author = @from_user
 
       attach_user_avatar(comment.user)
 
+      set_references("diary", comment.diary_entry)
+
       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)
@@ -136,6 +137,8 @@ class Notifier < ApplicationMailer
       @author = @commenter
       attach_user_avatar(comment.author)
 
+      set_references("note", comment.note)
+
       subject = if @owner
                   I18n.t("notifier.note_comment_notification.#{@event}.subject_own", :commenter => @commenter)
                 else
@@ -166,6 +169,8 @@ class Notifier < ApplicationMailer
 
       attach_user_avatar(comment.author)
 
+      set_references("changeset", comment.changeset)
+
       mail :to => recipient.email, :subject => subject
     end
   end
@@ -210,4 +215,10 @@ class Notifier < ApplicationMailer
       Settings.email_from
     end
   end
+
+  def set_references(scope, reference_object)
+    ref = "osm-#{scope}-#{reference_object.id}@#{Settings.server_url}"
+    headers["In-Reply-To"] = ref
+    headers["References"]  = ref
+  end
 end