merge stable

diff --cc curs_main.c
index f7105063d2e000c3f90400d6dcf7ff168c4971a6,a474d2484366b18f2199a795107975d0cfed8853..f5aeb1b55d735b7527b710c846002defde90f00d
--- 1/curs_main.c
--- 2/curs_main.c
+++ b/curs_main.c
@@@ -1269,8 -1261,9 +1269,9 @@@ int mutt_index_menu (void
            if (check == MUTT_NEW_MAIL || check == MUTT_REOPENED)
              update_index (menu, Context, check, oldcount, index_hint);
  
+             FREE (&new_last_folder);
            set_option (OPTSEARCHINVALID);
 -          menu->redraw = REDRAW_INDEX | REDRAW_STATUS;
 +          menu->redraw |= REDRAW_INDEX | REDRAW_STATUS;
            break;
          }
          FREE (&Context);