Adding the edit-message feature.

1 files changed, 4 insertions, 6 deletions

diff --git a/parse.c b/parse.c
index d1ab50a8..7b3497c0 100644
--- a/parse.c
+++ b/parse.c
@@ -969,6 +969,8 @@ ENVELOPE *mutt_read_rfc822_header (FILE *f, HEADER *hdr)
       case 'd':
 	if (!strcasecmp ("ate", line + 1))
 	{
+	  safe_free((void **)&e->date);
+	  e->date = safe_strdup(p);
 	  if (hdr)
 	    hdr->date_sent = parse_date (p, hdr);
 	  matched = 1;
@@ -1067,7 +1069,6 @@ ENVELOPE *mutt_read_rfc822_header (FILE *f, HEADER *hdr)
 	    if (d)
 	      hdr->received = parse_date (d + 1, NULL);
 	  }
-	  matched = 1;
 	}
 	break;
 
@@ -1151,11 +1152,8 @@ ENVELOPE *mutt_read_rfc822_header (FILE *f, HEADER *hdr)
 	break;
     }
 
-    /* if hdr==NULL, then we are using this to parse either a postponed
-     * message, or a outgoing message (edit_hdrs), so we want to keep
-     * track of the user-defined headers
-     */
-    if (!matched && !hdr)
+     /* Keep track of the user-defined headers */
+    if (!matched)
     {
       if (last)
       {