-<%= t'notifier.friend_notification.had_added_you', :user => @user %>
+<%=
+ t 'notifier.friend_notification.had_added_you',
+ :user => @friend.befriender.display_name
+%>
-<%= t'notifier.friend_notification.see_their_profile', :userurl => @userurl %>
+<%=
+ t 'notifier.friend_notification.see_their_profile',
+ :userurl => url_for(:host => SERVER_URL,
+ :controller => "user", :action => "view",
+ :display_name => @friend.befriender.display_name)
+%>
+<%=
+ unless @friend.befriendee.is_friends_with?(@friend.befriender)
+ t 'notifier.friend_notification.befriend_them',
+ :befriendurl => url_for(:host => SERVER_URL,
+ :controller => "user", :action => "make_friend",
+ :display_name => @friend.befriender.display_name)
+ end
+%>