1 files changed, 16 insertions, 0 deletions
diff --git a/extensions/BugmailFilter/Extension.pm b/extensions/BugmailFilter/Extension.pm
index ebfc1f851..4d4a1938f 100644
--- a/extensions/BugmailFilter/Extension.pm
+++ b/extensions/BugmailFilter/Extension.pm
@@ -235,6 +235,10 @@ sub user_wants_mail {
             filter_field => $_->{field_name}, # filter's field_name
             field_name   => $_->{field_name}, # raw bugzilla field_name
         } }
+        grep {
+            # flags are added later
+            $_->{field_name} ne 'flagtypes.name'
+        }
         @$diffs
     ];
 
@@ -248,6 +252,18 @@ sub user_wants_mail {
         }
     }
 
+    # insert fake fields for flags
+    foreach my $diff (@$diffs) {
+        next unless $diff->{field_name} eq 'flagtypes.name';
+        foreach my $change (split(/, /, join(', ', ($diff->{old}, $diff->{new})))) {
+            next unless $change =~ /^(.+)[\?\-+]/;
+            push @$fields, {
+                filter_field => $1,
+                field_name   => 'flagtypes.name',
+            };
+        }
+    }
+
     # set filter_field on tracking flags to tracking.$type
     require Bugzilla::Extension::TrackingFlags::Flag;
     my @tracking_flags = Bugzilla->tracking_flags;