{
char buffer[SHORT_STRING];
- flags |= (h->irt_changed ? CH_UPDATE_IRT : 0)
- | (h->refs_changed ? CH_UPDATE_REFS : 0);
+ if (h->env)
+ flags |= (h->env->irt_changed ? CH_UPDATE_IRT : 0) |
+ (h->env->refs_changed ? CH_UPDATE_REFS : 0);
if (mutt_copy_hdr (in, out, h->offset, h->content->offset, flags, prefix) ==
-1)
if (flags & CH_UPDATE) {
if ((flags & CH_NOSTATUS) == 0) {
- if (h->irt_changed && h->new_env->in_reply_to) {
- LIST *listp = h->new_env->in_reply_to;
+ if (h->env->irt_changed && h->env->in_reply_to) {
+ LIST *listp = h->env->in_reply_to;
if (fputs ("In-Reply-To: ", out) == EOF)
return (-1);
return (-1);
}
- if (h->refs_changed && h->new_env->references) {
- LIST *listp = h->new_env->references, *refs = NULL, *t;
+ if (h->env->refs_changed && h->env->references) {
+ LIST *listp = h->env->references, *refs = NULL, *t;
if (fputs ("References: ", out) == EOF)
return (-1);
int
_mutt_append_message (CONTEXT * dest, FILE * fpin, CONTEXT * src,
- HEADER * hdr, BODY * body, int flags, int chflags)
-{
+ HEADER * hdr, BODY * body, int flags, int chflags) {
+ char buf[STRING];
MESSAGE *msg;
int r;
- if ((msg =
- mx_open_new_message (dest, hdr,
- (src->magic == M_MBOX
- || src->magic == M_MMDF) ? 0 : M_ADD_FROM)) ==
- NULL)
- return -1;
+ fseek(fpin, hdr->offset, 0);
+ if (fgets (buf, sizeof (buf), fpin) == NULL)
+ return (-1);
+ if ((msg = mx_open_new_message (dest, hdr, is_from (buf, NULL, 0, NULL) ? 0 : M_ADD_FROM)) == NULL)
+ return (-1);
if (dest->magic == M_MBOX || dest->magic == M_MMDF)
chflags |= CH_FROM | CH_FORCE_FROM;
chflags |= (dest->magic == M_MAILDIR ? CH_NOSTATUS : CH_UPDATE);