diff --git a/app/models/mail_handler.rb b/app/models/mail_handler.rb
index 518f043..14d8152 100644
--- a/app/models/mail_handler.rb
+++ b/app/models/mail_handler.rb
@@ -190,6 +190,7 @@ class MailHandler < ActionMailer::Base
     issue.assigned_to = assigned_to if assigned_to
     
     issue.save!
+    add_watchers(issue) if Setting.mail_handler_add_watchers_on_receive_issue_reply
     logger.info "MailHandler: issue ##{issue.id} updated by #{user}" if logger && logger.info
     journal
   end
diff --git a/app/views/settings/_mail_handler.rhtml b/app/views/settings/_mail_handler.rhtml
index f3508ac..80b21d4 100644
--- a/app/views/settings/_mail_handler.rhtml
+++ b/app/views/settings/_mail_handler.rhtml
@@ -18,6 +18,9 @@
 </p>
 </div>
 
+<div class="box tabular settings">
+	<p><%= setting_check_box :mail_handler_add_watchers_on_receive_issue_reply %></p>
+</div>
 <%= submit_tag l(:button_save) %>
 
 <% end %>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 13b6fe0..9b8be34 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -334,6 +334,7 @@ en:
   setting_mail_handler_body_delimiters: "Truncate emails after one of these lines"
   setting_mail_handler_api_enabled: Enable WS for incoming emails
   setting_mail_handler_api_key: API key
+  setting_mail_handler_add_watchers_on_receive_issue_reply: "Add watchers from to: and cc: in replies"
   setting_sequential_project_identifiers: Generate sequential project identifiers
   setting_gravatar_enabled: Use Gravatar user icons
   setting_gravatar_default: Default Gravatar image
diff --git a/config/settings.yml b/config/settings.yml
index d07261f..5785e67 100644
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -124,6 +124,8 @@ mail_handler_api_enabled:
   default: 0
 mail_handler_api_key:
   default: 
+mail_handler_add_watchers_on_receive_issue_reply:
+  default: false
 issue_list_default_columns:
   serialized: true
   default: