diff --git a/app/controllers/notifications_controller.rb b/app/controllers/notifications_controller.rb
index 62d2c4d67..b665a6c37 100644
--- a/app/controllers/notifications_controller.rb
+++ b/app/controllers/notifications_controller.rb
@@ -33,7 +33,7 @@ class NotificationsController < VannaController
     end
     notifications.each do |n|
       n[:actors] = n.actors
-      n[:translation] = object_link(n, n.actors.map { |a| person_link(a) })
+      n[:translation] = notification_message_for(n)
       n[:translation_key] = n.popup_translation_key
       n[:target] = n.translation_key == "notifications.mentioned" ? n.target.post : n.target
     end
diff --git a/app/helpers/notifications_helper.rb b/app/helpers/notifications_helper.rb
index bd288fee8..3f69849e2 100644
--- a/app/helpers/notifications_helper.rb
+++ b/app/helpers/notifications_helper.rb
@@ -60,7 +60,7 @@ module NotificationsHelper
     number_of_actors = actors.count
     sentence_translations = {:two_words_connector => " #{t('notifications.index.and')} ", :last_word_connector => ", #{t('notifications.index.and')} " }
     actor_links = actors.collect{ |person|
-      person_link(person, :class => 'hovercardable', :what => 'thefuck' )
+      person_link(person, :class => 'hovercardable')
     }
 
     if number_of_actors < 4