1 files changed, 2 insertions, 5 deletions
diff --git a/init.c b/init.c
index 26f8afcf..9c0a3946 100644
--- a/init.c
+++ b/init.c
@@ -1703,9 +1703,7 @@ static int parse_my_hdr (BUFFER *buf, BUFFER *s, union pointer_long_t udata, BUF
       if (ascii_strncasecmp (buf->data, tmp->data, keylen) == 0)
       {
 	/* replace the old value */
-	FREE (&tmp->data);
-	tmp->data = buf->data;
-	mutt_buffer_init (buf);
+	mutt_str_replace (&tmp->data, mutt_b2s (buf));
 	return 0;
       }
       if (!tmp->next)
@@ -1719,8 +1717,7 @@ static int parse_my_hdr (BUFFER *buf, BUFFER *s, union pointer_long_t udata, BUF
     tmp = mutt_new_list ();
     UserHeader = tmp;
   }
-  tmp->data = buf->data;
-  mutt_buffer_init (buf);
+  tmp->data = safe_strdup (mutt_b2s (buf));
   return 0;
 }