-<%= t'notifier.friend_notification.had_added_you', :user => @user %>
+<p><%= t 'notifier.friend_notification.had_added_you', :user => @friend.befriender.display_name %></p>
-<%= t'notifier.friend_notification.see_their_profile', :userurl => @userurl %>
+<%= message_body do %>
+ <p><%= raw t 'notifier.friend_notification.see_their_profile', :userurl => link_to(@viewurl, @viewurl) %></p>
+ <% unless @friend.befriendee.is_friends_with?(@friend.befriender) -%>
+ <p><%= raw t 'notifier.friend_notification.befriend_them', :befriendurl => link_to(@friendurl, @friendurl) %></p>
+ <% end -%>
+<% end %>