X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=curs_main.c;h=1e50716a25e329ae450787f7b40895977a578a51;hp=9969bbc8f54b87e1e95d7d438bc35ef9be86b051;hb=16392434eb28ef16069eae972640e1f534477f83;hpb=a999edabd13e2227d9da939aaf1b2c5e12eb7051

diff --git a/curs_main.c b/curs_main.c
index 9969bbc..1e50716 100644
--- a/curs_main.c
+++ b/curs_main.c
@@ -195,7 +195,7 @@ int index_color (int index_no)
 {
   HEADER *h = Context->hdrs[Context->v2r[index_no]];
 
-  if (h->pair)
+  if (h && h->pair)
     return h->pair;
 
   mutt_set_header_color (Context, h);
@@ -479,8 +479,12 @@ int mutt_index_menu (void)
 #endif
         IndexHelp);
   
-  if (!attach_msg) 
+  if (!attach_msg) {
     mutt_buffy_check(1); /* force the buffy check after we enter the folder */
+    /* record folder we open to place sidebar indicator properly */
+    if (Context && Context->path)
+      set_curbuffy(Context->path);
+  }
 
   FOREVER
   {
@@ -1310,6 +1314,7 @@ CHECK_IMAP_ACL(IMAP_ACL_DELETE);
           mutt_error (_("%s is not a mailbox."), buf);
           break;
         }
+        mutt_str_replace (&CurrentFolder, buf);
 
         if (Context)
         {