1 files changed, 7 insertions, 0 deletions
diff --git a/extensions/RequestNagger/bin/send-request-nags.pl b/extensions/RequestNagger/bin/send-request-nags.pl
index 8aea0c0ab..22a4baa54 100755
--- a/extensions/RequestNagger/bin/send-request-nags.pl
+++ b/extensions/RequestNagger/bin/send-request-nags.pl
@@ -23,6 +23,7 @@ use Bugzilla::Hook;
 use Bugzilla::Error;
 use Bugzilla::Extension::RequestNagger::Constants;
 use Bugzilla::Extension::RequestNagger::Bug;
+use Bugzilla::Extension::RequestNagger::Settings;
 use Bugzilla::Mailer;
 use Bugzilla::User;
 use Bugzilla::Util qw(format_time);
@@ -173,11 +174,17 @@ sub _send_email {
     my @reports         = qw( requestee setter );
     my $recipient_id    = $params->{recipient_id};
     my $requests        = $params->{requests};
+    my $watching        = $params{template} eq 'watching';
     my $recipient       = Bugzilla::User->new({ id => $recipient_id, cache => 1 });
     my $securemail      = Bugzilla::User->can('public_key');
     my $has_key         = $securemail && $recipient->public_key;
     my $has_private_bug = 0;
 
+    my $settings = Bugzilla::Extension::RequestNagger::Setting->new($recipient_id);
+    if ($watching && $setting->no_encryption) {
+        $has_key = 0;
+    }
+
     foreach my $target_login (keys %$requests) {
         my $rh = $requests->{$target_login};
         $rh->{target} = Bugzilla::User->new({ name => $target_login, cache => 1 });