From: Kevin McCarthy <kevin@8t8.us>
Date: Sat, 29 Dec 2018 21:50:00 +0000 (-0800)
Subject: Respect ignore for the protected subject display.
X-Git-Tag: mutt-1-12-rel~150
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0917da9610f9cc9efd9d1f5abc0e1e227a2b5022;p=mutt

Respect ignore for the protected subject display.
---

diff --git a/crypt.c b/crypt.c
index 7c39f856..0c3da324 100644
--- a/crypt.c
+++ b/crypt.c
@@ -943,6 +943,11 @@ int mutt_protected_headers_handler (BODY *a, STATE *s)
   {
     if (a->mime_headers->subject)
     {
+      if ((s->flags & MUTT_DISPLAY) && option (OPTWEED) &&
+          mutt_matches_ignore ("subject", Ignore) &&
+          !mutt_matches_ignore ("subject", UnIgnore))
+        return 0;
+
       state_mark_protected_header (s);
       mutt_write_one_header (s->fpout, "Subject", a->mime_headers->subject,
                              s->prefix,