gistfile1.txt

diff --git a/copy.c b/copy.c
index 187c873cc..514d62c3b 100644
--- a/copy.c
+++ b/copy.c
@@ -490,7 +490,7 @@ int mutt_copy_header(FILE *fp_in, struct Email *e, FILE *fp_out,
       fprintf(fp_out, "Lines: %d\n", e->lines);
   }
 
-  const bool c_weed = cs_subset_bool(NeoMutt->sub, "weed");
+  const bool c_weed = chflags & CH_WEED;
 #ifdef USE_NOTMUCH
   if (chflags & CH_VIRTUAL)
   {
diff --git a/pattern/exec.c b/pattern/exec.c
index cdd10e2bf..e35943a85 100644
--- a/pattern/exec.c
+++ b/pattern/exec.c
@@ -151,7 +151,13 @@ static bool msg_search(struct Pattern *pat, struct Email *e, struct Message *msg
 
     if (needs_head)
     {
-      mutt_copy_header(msg->fp, e, s.fp_out, CH_FROM | CH_DECODE, NULL, 0);
+      CopyHeaderFlags f;
+#ifdef USE_NOTMUCH
+      f = CH_FROM | CH_DECODE | CH_VIRTUAL;
+#else
+      f = CH_FROM | CH_DECODE;
+#endif /* USE_NOTMUCH */
+      mutt_copy_header(msg->fp, e, s.fp_out, f, NULL, 0);
     }
 
     if (needs_body)