X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/3aa69ffbdda5f111aed60d77e1a1eec8cdcad3ba..22f7c1f721e5a77786f9f61fa219f262784757ac:/app/models/notifier.rb

diff --git a/app/models/notifier.rb b/app/models/notifier.rb
index 8f3486626..d7fa66c4a 100644
--- a/app/models/notifier.rb
+++ b/app/models/notifier.rb
@@ -129,7 +129,9 @@ class Notifier < ActionMailer::Base
       @friendurl = url_for(:host => SERVER_URL,
                            :controller => "user", :action => "make_friend",
                            :display_name => @friend.befriender.display_name)
+      @user_message_author = @friend.befriender.display_name
 
+      attach_user_avatar(@friend.befriender)
       mail :to => friend.befriendee.email,
            :subject => I18n.t("notifier.friend_notification.subject", :user => friend.befriender.display_name)
     end
@@ -161,6 +163,7 @@ class Notifier < ActionMailer::Base
 
   def changeset_comment_notification(comment, recipient)
     with_recipient_locale recipient do
+      @to_user = recipient.display_name
       @changeset_url = changeset_url(comment.changeset, :host => SERVER_URL)
       @comment = comment.body
       @owner = recipient == comment.changeset.user