diff --git a/app/services/notification_service.rb b/app/services/notification_service.rb
index 9d7bb9639ac1353eb1ec94db2edf965401ebf660..ee867a1da0c7ffc6c7c28ee96e656a73e8144f28 100644
--- a/app/services/notification_service.rb
+++ b/app/services/notification_service.rb
@@ -111,6 +111,7 @@ class NotificationService
 
     # ignore gitlab service messages
     return true if note.note =~ /\A_Status changed to closed_/
+    return true if note.note =~ /\A_mentioned in / && note.system == true
 
     opts = { noteable_type: note.noteable_type, project_id: note.project_id }
 
diff --git a/spec/services/notification_service_spec.rb b/spec/services/notification_service_spec.rb
index e378be0425507d8f114616564b9eeb8de3f36c51..0869ebc9e0fa8c8f0d4bf1445fb2f0474c8094fe 100644
--- a/spec/services/notification_service_spec.rb
+++ b/spec/services/notification_service_spec.rb
@@ -32,6 +32,7 @@ describe NotificationService do
   describe 'Notes' do
     context 'issue note' do
       let(:issue) { create(:issue, assignee: create(:user)) }
+      let(:mentioned_issue) { create(:issue, assignee: issue.assignee) }
       let(:note) { create(:note_on_issue, noteable: issue, project_id: issue.project_id, note: '@mention referenced') }
 
       before do
@@ -50,6 +51,13 @@ describe NotificationService do
           notification.new_note(note)
         end
 
+        it 'filters out "mentioned in" notes' do
+          mentioned_note = Note.create_cross_reference_note(mentioned_issue, issue, issue.author, issue.project)
+
+          Notify.should_not_receive(:note_issue_email)
+          notification.new_note(mentioned_note)
+        end
+
         def should_email(user_id)
           Notify.should_receive(:note_issue_email).with(user_id, note.id)
         end