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.

diff --git a/copy.c b/copy.c
index f072869b04a3e155d876ab63cbbb24098e5f23f5..1a971558193c296fcf88993616ba15c6e7429169 100644 (file)
--- a/copy.c
+++ b/copy.c
@@ -423,6 +423,7 @@ mutt_copy_header (FILE *in, HEADER *h, FILE *out, int flags, const char *prefix)
 
   if ((flags & CH_UPDATE_LABEL) && h->env->x_label)
   {
+    h->xlabel_changed = 0;
     if (!(flags & CH_DECODE))
       rfc2047_encode_string (&h->env->x_label);
     if (mutt_write_one_header (out, "X-Label", h->env->x_label,