diff --git a/app/services/notification_service.rb b/app/services/notification_service.rb
index 112a0ff0016..3c3ee39cd7b 100644
--- a/app/services/notification_service.rb
+++ b/app/services/notification_service.rb
@@ -106,12 +106,14 @@ class NotificationService
 
     if note.commit_id
       opts.merge!(commit_id: note.commit_id)
+      recipients = [note.commit_author]
     else
       opts.merge!(noteable_id: note.noteable_id)
+      recipients = [note.noteable.try(:author), note.noteable.try(:assignee)]
     end
 
     # Get users who left comment in thread
-    recipients = User.where(id: Note.where(opts).pluck(:author_id))
+    recipients = recipients.concat(User.where(id: Note.where(opts).pluck(:author_id)))
 
     # Merge project watchers
     recipients = recipients.concat(project_watchers(note.project)).compact.uniq
diff --git a/spec/services/notification_service_spec.rb b/spec/services/notification_service_spec.rb
index c82b89d65d9..fa47a6354c8 100644
--- a/spec/services/notification_service_spec.rb
+++ b/spec/services/notification_service_spec.rb
@@ -21,40 +21,71 @@ describe NotificationService do
   end
 
   describe 'Notes' do
-    let(:note) { create :note_on_commit }
+    context 'issue note' do
+      let(:issue) { create(:issue, assignee: create(:user)) }
+      let(:note) { create(:note_on_issue, noteable: issue, project_id: issue.project_id) }
 
-    before do
-      build_team(note.project)
+      before do
+        build_team(note.project)
+      end
+
+      describe :new_note do
+        it do
+          should_email(@u_watcher.id)
+          should_email(note.noteable.author_id)
+          should_email(note.noteable.assignee_id)
+          should_not_email(note.author_id)
+          should_not_email(@u_participating.id)
+          should_not_email(@u_disabled.id)
+          notification.new_note(note)
+        end
+
+        def should_email(user_id)
+          Notify.should_receive(:note_issue_email).with(user_id, note.id)
+        end
+
+        def should_not_email(user_id)
+          Notify.should_not_receive(:note_issue_email).with(user_id, note.id)
+        end
+      end
     end
 
-    describe :new_note do
-      it do
-        should_email(@u_watcher.id)
-        should_not_email(note.author_id)
-        should_not_email(@u_participating.id)
-        should_not_email(@u_disabled.id)
-        notification.new_note(note)
+    context 'commit note' do
+      let(:note) { create :note_on_commit }
+
+      before do
+        build_team(note.project)
       end
 
-      it do
-        create(:note_on_commit,
-               author: @u_participating,
-               project_id: note.project_id,
-               commit_id: note.commit_id)
+      describe :new_note do
+        it do
+          should_email(@u_watcher.id)
+          should_not_email(note.author_id)
+          should_not_email(@u_participating.id)
+          should_not_email(@u_disabled.id)
+          notification.new_note(note)
+        end
 
-        should_email(@u_watcher.id)
-        should_email(@u_participating.id)
-        should_not_email(note.author_id)
-        should_not_email(@u_disabled.id)
-        notification.new_note(note)
-      end
+        it do
+          create(:note_on_commit,
+                 author: @u_participating,
+                 project_id: note.project_id,
+                 commit_id: note.commit_id)
 
-      def should_email(user_id)
-        Notify.should_receive(:note_commit_email).with(user_id, note.id)
-      end
+          should_email(@u_watcher.id)
+          should_email(@u_participating.id)
+          should_not_email(note.author_id)
+          should_not_email(@u_disabled.id)
+          notification.new_note(note)
+        end
 
-      def should_not_email(user_id)
-        Notify.should_not_receive(:note_commit_email).with(user_id, note.id)
+        def should_email(user_id)
+          Notify.should_receive(:note_commit_email).with(user_id, note.id)
+        end
+
+        def should_not_email(user_id)
+          Notify.should_not_receive(:note_commit_email).with(user_id, note.id)
+        end
       end
     end
   end