Fix save_message() - set the append flag to the correct mailbox

Fixes #1645

diff --git a/commands.c b/commands.c
index eee314f442e1cf6a9090213691906be7b8f28ede..b8d4ce7330e09493dca8c4ead987b1baa6111149 100644 (file)
--- a/commands.c
+++ b/commands.c
@@ -1074,8 +1074,8 @@ int mutt_save_message(struct Mailbox *m, struct EmailList *el, bool delete,
     mailbox_free(&m_save);
     return -1;
   }
-  bool old_append = m->append;
-  m->append = true;
+  bool old_append = m_save->append;
+  m_save->append = true;
 
 #ifdef USE_COMPRESSED
   /* If we're saving to a compressed mailbox, the stats won't be updated
@@ -1093,7 +1093,7 @@ int mutt_save_message(struct Mailbox *m, struct EmailList *el, bool delete,
   {
     if (mutt_save_message_ctx(en->email, delete, decode, decrypt, ctx_save->mailbox) != 0)
     {
-      m->append = old_append;
+      m_save->append = old_append;
       mx_mbox_close(&ctx_save);
       return -1;
     }
@@ -1148,7 +1148,7 @@ int mutt_save_message(struct Mailbox *m, struct EmailList *el, bool delete,
 #endif
     if (rc != 0)
     {
-      m->append = old_append;
+      m_save->append = old_append;
       mx_mbox_close(&ctx_save);
       return -1;
     }
@@ -1157,7 +1157,7 @@ int mutt_save_message(struct Mailbox *m, struct EmailList *el, bool delete,
   const bool need_mailbox_cleanup = ((ctx_save->mailbox->magic == MUTT_MBOX) ||
                                      (ctx_save->mailbox->magic == MUTT_MMDF));
 
-  m->append = old_append;
+  m_save->append = old_append;
   mx_mbox_close(&ctx_save);
 
   if (need_mailbox_cleanup)