diff --git a/lib/plugins/acts_as_watchable/lib/acts_as_watchable.rb b/lib/plugins/acts_as_watchable/lib/acts_as_watchable.rb
index 6b16e18a5..bb71a2884 100644
--- a/lib/plugins/acts_as_watchable/lib/acts_as_watchable.rb
+++ b/lib/plugins/acts_as_watchable/lib/acts_as_watchable.rb
@@ -73,7 +73,7 @@ module Redmine
 
         def notified_watchers
           notified = watcher_users.active.to_a
-          notified = notified.map {|n| n.is_a?(Group) ? n.users : n}.flatten
+          notified = notified.map {|n| n.is_a?(Group) ? n.users.active : n}.flatten
           notified.uniq!
           notified.reject! {|user| user.mail.blank? || user.mail_notification == 'none'}
           if respond_to?(:visible?)
diff --git a/test/unit/mailer_test.rb b/test/unit/mailer_test.rb
index b676a4503..f0bdb6406 100644
--- a/test/unit/mailer_test.rb
+++ b/test/unit/mailer_test.rb
@@ -30,7 +30,8 @@ class MailerTest < ActiveSupport::TestCase
            :issue_statuses, :enumerations, :messages, :boards, :repositories,
            :wikis, :wiki_pages, :wiki_contents, :wiki_content_versions,
            :versions,
-           :comments
+           :comments,
+           :groups_users, :watchers
 
   def setup
     ActionMailer::Base.deliveries.clear
@@ -392,6 +393,24 @@ class MailerTest < ActiveSupport::TestCase
     Time.zone = zone_was
   end
 
+  def test_locked_user_of_group_members_in_watchers_should_not_send_notification
+    user = users(:users_005)  # Locked user
+    group = Group.generate!
+    group.users << user
+    issue = Issue.generate!
+    Watcher.create!(:watchable => issue, :user => group)
+
+    ActionMailer::Base.deliveries.clear
+    assert Mailer.deliver_issue_add(issue)
+    assert_not_include user.mail, recipients
+
+    journal = issue.init_journal(User.current)
+    issue.update(:status_id => 4)
+    ActionMailer::Base.deliveries.clear
+    Mailer.deliver_issue_edit(journal)
+    assert_not_include user.mail, recipients
+  end
+
   test "#issue_add should notify project members" do
     issue = Issue.find(1)
     assert Mailer.deliver_issue_add(issue)