Restore the xlabel_changed reset

The cherry pick accidentally obliterated the reset.  That flag is now
located in hdr->env->changed in the branch and is reset properly
elsewhere.  Keep it in place in the stable branch.

Co-authored-by: Richard Russon <rich@flatcap.org>

diff --git a/copy.c b/copy.c
index 5109009f4b5b81a376d8882ad00eeb305f1512df..c9b0d248dfc987ff897df031ba975b86711bb267 100644 (file)
--- a/copy.c
+++ b/copy.c
@@ -504,6 +504,7 @@ int mutt_copy_header(FILE *in, struct Email *e, FILE *out, int flags, const char
 
   if ((flags & CH_UPDATE_LABEL) && e->env->x_label)
   {
+    e->xlabel_changed = 0;
     if (!(flags & CH_DECODE))
       rfc2047_encode(&e->env->x_label, NULL, sizeof("X-Label:"), SendCharset);
     if (mutt_write_one_header(out, "X-Label", e->env->x_label, flags & CH_PREFIX ? prefix : 0,