diff --git a/modules/issue_tracker/php/edit.class.inc b/modules/issue_tracker/php/edit.class.inc
index 4e448ad315b..574db464529 100644
--- a/modules/issue_tracker/php/edit.class.inc
+++ b/modules/issue_tracker/php/edit.class.inc
@@ -513,6 +513,13 @@ class Edit extends \NDB_Page implements ETagCalculator
                             'issueID' => $issueID,
                         ]
                     );
+                    // Send email to watchers if they are not the assignee
+                    if (isset($issueValues['assignee'])
+                        && $issueValues['assignee'] == $usersWatching
+                    ) {
+                        continue;
+                    }
+                    $this->emailUser($issueID, $usersWatching, $user);
                 }
             }
         }