{
HEADER *h = Context->hdrs[Context->v2r[index_no]];
- if (h->pair)
+ if (h && h->pair)
return h->pair;
mutt_set_header_color (Context, h);
#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
{