Index: mutt-1.5.21/buffy.c
===================================================================
--- mutt-1.5.21.orig/buffy.c	2010-09-13 19:19:55.000000000 +0200
+++ mutt-1.5.21/buffy.c	2012-06-21 11:48:06.752181922 +0200
@@ -161,6 +161,49 @@ void mutt_buffy_cleanup (const char *buf
   }
 }
 
+static int buffy_compare_name(const void *a, const void *b) {
+  const BUFFY *b1 = * (BUFFY * const *) a;
+  const BUFFY *b2 = * (BUFFY * const *) b;
+
+  return mutt_strcoll(b1->path, b2->path);
+}
+
+static BUFFY *buffy_sort(BUFFY *b)
+{
+  BUFFY *tmp = b;
+  int buffycount = 0;
+  BUFFY **ary;
+  int i;
+
+  if (!option(OPTSIDEBARSORT))
+    return b;
+
+  for (; tmp != NULL; tmp = tmp->next)
+    buffycount++;
+
+  ary = (BUFFY **) safe_calloc(buffycount, sizeof (*ary));
+
+  tmp = b;
+  for (i = 0; tmp != NULL; tmp = tmp->next, i++) {
+    ary[i] = tmp;
+  }
+
+  qsort(ary, buffycount, sizeof(*ary), buffy_compare_name);
+
+  for (i = 0; i < buffycount - 1; i++) {
+    ary[i]->next = ary[i+1];
+  }
+  ary[buffycount - 1]->next = NULL;
+  for (i = 1; i < buffycount; i++) {
+    ary[i]->prev = ary[i-1];
+  }
+  ary[0]->prev = NULL;
+
+  tmp = ary[0];
+  free(ary);
+  return tmp;
+}
+
 BUFFY *mutt_find_mailbox (const char *path)
 {
   BUFFY *tmp = NULL;
@@ -282,6 +325,7 @@ int mutt_parse_mailboxes (BUFFER *path,
     else
       (*tmp)->size = 0;
   }
+  Incoming = buffy_sort(Incoming);
   return 0;
 }
 
@@ -340,6 +384,68 @@ static int buffy_maildir_hasnew (BUFFY*
   return rc;
 }
 
+/* update message counts for the sidebar */
+void buffy_maildir_update (BUFFY* mailbox)
+{
+  char path[_POSIX_PATH_MAX];
+  DIR *dirp;
+  struct dirent *de;
+  char *p;
+
+  mailbox->msgcount = 0;
+  mailbox->msg_unread = 0;
+  mailbox->msg_flagged = 0;
+
+  snprintf (path, sizeof (path), "%s/new", mailbox->path);
+
+  if ((dirp = opendir (path)) == NULL)
+  {
+    mailbox->magic = 0;
+    return;
+  }
+
+  while ((de = readdir (dirp)) != NULL)
+  {
+    if (*de->d_name == '.')
+      continue;
+
+    if (!(p = strstr (de->d_name, ":2,")) || !strchr (p + 3, 'T')) {
+      mailbox->new = 1;
+      mailbox->msgcount++;
+      mailbox->msg_unread++;
+    }
+  }
+
+  closedir (dirp);
+  snprintf (path, sizeof (path), "%s/cur", mailbox->path);
+
+  if ((dirp = opendir (path)) == NULL)
+  {
+    mailbox->magic = 0;
+    return;
+  }
+
+  while ((de = readdir (dirp)) != NULL)
+  {
+    if (*de->d_name == '.')
+      continue;
+
+    if (!(p = strstr (de->d_name, ":2,")) || !strchr (p + 3, 'T')) {
+      mailbox->msgcount++;
+      if ((p = strstr (de->d_name, ":2,"))) {
+        if (!strchr (p + 3, 'T')) {
+          if (!strchr (p + 3, 'S'))
+            mailbox->msg_unread++;
+          if (strchr(p + 3, 'F'))
+            mailbox->msg_flagged++;
+        }
+      }
+    }
+  }
+
+  closedir (dirp);
+}
+
 /* returns 1 if mailbox has new mail */ 
 static int buffy_mbox_hasnew (BUFFY* mailbox, struct stat *sb)
 {
@@ -371,12 +477,27 @@ static int buffy_mbox_hasnew (BUFFY* mai
   return rc;
 }
 
+/* update message counts for the sidebar */
+void buffy_mbox_update(BUFFY* mailbox)
+{
+  CONTEXT *ctx = NULL;
+
+  ctx = mx_open_mailbox(mailbox->path, M_READONLY | M_QUIET | M_NOSORT | M_PEEK, NULL);
+  if (ctx)
+  {
+    mailbox->msgcount = ctx->msgcount;
+    mailbox->msg_unread = ctx->unread;
+    mx_close_mailbox(ctx, 0);
+  }
+}
+
 int mutt_buffy_check (int force)
 {
   BUFFY *tmp;
   struct stat sb;
   struct stat contex_sb;
   time_t t;
+  CONTEXT *ctx;
 
   sb.st_size=0;
   contex_sb.st_dev=0;
@@ -413,6 +534,9 @@ int mutt_buffy_check (int force)
   
   for (tmp = Incoming; tmp; tmp = tmp->next)
   {
+    if (tmp->new == 1)
+          tmp->has_new = 1;
+
     if (tmp->magic != M_IMAP)
     {
       tmp->new = 0;
@@ -444,16 +568,24 @@ int mutt_buffy_check (int force)
       {
       case M_MBOX:
       case M_MMDF:
-	if (buffy_mbox_hasnew (tmp, &sb) > 0)
+        if (option(OPTSIDEBAR))
+          buffy_mbox_update(tmp);
+        if (buffy_mbox_hasnew (tmp, &sb) > 0) {
 	  BuffyCount++;
+        }
 	break;
 
       case M_MAILDIR:
+        if (option(OPTSIDEBAR))
+          buffy_maildir_update(tmp);
 	if (buffy_maildir_hasnew (tmp) > 0)
 	  BuffyCount++;
 	break;
 
       case M_MH:
+        if (option(OPTSIDEBAR))
+          mh_buffy_update (tmp->path, &tmp->msgcount,
+                           &tmp->msg_unread, &tmp->msg_flagged);
 	if ((tmp->new = mh_buffy (tmp->path)) > 0)
 	  BuffyCount++;
 	break;
Index: mutt-1.5.21/buffy.h
===================================================================
--- mutt-1.5.21.orig/buffy.h	2010-09-13 19:19:55.000000000 +0200
+++ mutt-1.5.21/buffy.h	2012-06-21 11:48:06.752181922 +0200
@@ -25,7 +25,12 @@ typedef struct buffy_t
   char path[_POSIX_PATH_MAX];
   off_t size;
   struct buffy_t *next;
+  struct buffy_t *prev;
   short new;			/* mailbox has new mail */
+  short has_new;		/* set it new if new and not read */
+  int msgcount;			/* total number of messages */
+  int msg_unread;		/* number of unread messages */
+  int msg_flagged;		/* number of flagged messages */
   short notified;		/* user has been notified */
   short magic;			/* mailbox type */
   short newly_created;		/* mbox or mmdf just popped into existence */
Index: mutt-1.5.21/color.c
===================================================================
--- mutt-1.5.21.orig/color.c	2009-05-15 19:18:23.000000000 +0200
+++ mutt-1.5.21/color.c	2012-06-21 11:48:06.752181922 +0200
@@ -93,6 +93,8 @@ static struct mapping_t Fields[] =
   { "bold",		MT_COLOR_BOLD },
   { "underline",	MT_COLOR_UNDERLINE },
   { "index",		MT_COLOR_INDEX },
+  { "sidebar_new",	MT_COLOR_NEW },
+  { "sidebar_flagged",	MT_COLOR_FLAGGED },
   { NULL,		0 }
 };
 
Index: mutt-1.5.21/compose.c
===================================================================
--- mutt-1.5.21.orig/compose.c	2010-04-14 20:50:19.000000000 +0200
+++ mutt-1.5.21/compose.c	2012-06-21 11:48:06.753181937 +0200
@@ -72,7 +72,7 @@ enum
 
 #define HDR_XOFFSET 10
 #define TITLE_FMT "%10s" /* Used for Prompts, which are ASCII */
-#define W (COLS - HDR_XOFFSET)
+#define W (COLS - HDR_XOFFSET - SidebarWidth)
 
 static char *Prompts[] =
 {
@@ -112,7 +112,7 @@ static void redraw_crypt_lines (HEADER *
 {
   int off = 0;
 
-  mvaddstr (HDR_CRYPT, 0, "Security: ");
+  mvaddstr (HDR_CRYPT, SidebarWidth, "Security: ");
 
   if ((WithCrypto & (APPLICATION_PGP | APPLICATION_SMIME)) == 0)
   {
@@ -144,7 +144,7 @@ static void redraw_crypt_lines (HEADER *
   }
 
   clrtoeol ();
-  move (HDR_CRYPTINFO, 0);
+  move (HDR_CRYPTINFO, SidebarWidth);
   clrtoeol ();
 
   if ((WithCrypto & APPLICATION_PGP)
@@ -161,7 +161,7 @@ static void redraw_crypt_lines (HEADER *
       && (msg->security & ENCRYPT)
       && SmimeCryptAlg
       && *SmimeCryptAlg) {
-      mvprintw (HDR_CRYPTINFO, 40, "%s%s", _("Encrypt with: "),
+      mvprintw (HDR_CRYPTINFO, SidebarWidth + 40, "%s%s", _("Encrypt with: "),
 		NONULL(SmimeCryptAlg));
       off = 20;
   }
@@ -175,7 +175,7 @@ static void redraw_mix_line (LIST *chain
   int c;
   char *t;
 
-  mvaddstr (HDR_MIX, 0,     "     Mix: ");
+  mvaddstr (HDR_MIX, SidebarWidth,     "     Mix: ");
 
   if (!chain)
   {
@@ -190,7 +190,7 @@ static void redraw_mix_line (LIST *chain
     if (t && t[0] == '0' && t[1] == '\0')
       t = "<random>";
     
-    if (c + mutt_strlen (t) + 2 >= COLS)
+    if (c + mutt_strlen (t) + 2 >= COLS - SidebarWidth)
       break;
 
     addstr (NONULL(t));
@@ -242,7 +242,7 @@ static void draw_envelope_addr (int line
 
   buf[0] = 0;
   rfc822_write_address (buf, sizeof (buf), addr, 1);
-  mvprintw (line, 0, TITLE_FMT, Prompts[line - 1]);
+  mvprintw (line, SidebarWidth, TITLE_FMT, Prompts[line - 1]);
   mutt_paddstr (W, buf);
 }
 
@@ -252,10 +252,10 @@ static void draw_envelope (HEADER *msg,
   draw_envelope_addr (HDR_TO, msg->env->to);
   draw_envelope_addr (HDR_CC, msg->env->cc);
   draw_envelope_addr (HDR_BCC, msg->env->bcc);
-  mvprintw (HDR_SUBJECT, 0, TITLE_FMT, Prompts[HDR_SUBJECT - 1]);
+  mvprintw (HDR_SUBJECT, SidebarWidth, TITLE_FMT, Prompts[HDR_SUBJECT - 1]);
   mutt_paddstr (W, NONULL (msg->env->subject));
   draw_envelope_addr (HDR_REPLYTO, msg->env->reply_to);
-  mvprintw (HDR_FCC, 0, TITLE_FMT, Prompts[HDR_FCC - 1]);
+  mvprintw (HDR_FCC, SidebarWidth, TITLE_FMT, Prompts[HDR_FCC - 1]);
   mutt_paddstr (W, fcc);
 
   if (WithCrypto)
@@ -266,7 +266,7 @@ static void draw_envelope (HEADER *msg,
 #endif
 
   SETCOLOR (MT_COLOR_STATUS);
-  mvaddstr (HDR_ATTACH - 1, 0, _("-- Attachments"));
+  mvaddstr (HDR_ATTACH - 1, SidebarWidth, _("-- Attachments"));
   BKGDSET (MT_COLOR_STATUS);
   clrtoeol ();
 
@@ -304,7 +304,7 @@ static int edit_address_list (int line,
   /* redraw the expanded list so the user can see the result */
   buf[0] = 0;
   rfc822_write_address (buf, sizeof (buf), *addr, 1);
-  move (line, HDR_XOFFSET);
+  move (line, HDR_XOFFSET+SidebarWidth);
   mutt_paddstr (W, buf);
   
   return 0;
@@ -549,7 +549,7 @@ int mutt_compose_menu (HEADER *msg,   /*
 	if (mutt_get_field ("Subject: ", buf, sizeof (buf), 0) == 0)
 	{
 	  mutt_str_replace (&msg->env->subject, buf);
-	  move (HDR_SUBJECT, HDR_XOFFSET);
+	  move (HDR_SUBJECT, HDR_XOFFSET + SidebarWidth);
 	  clrtoeol ();
 	  if (msg->env->subject)
 	    mutt_paddstr (W, msg->env->subject);
@@ -566,7 +566,7 @@ int mutt_compose_menu (HEADER *msg,   /*
 	{
 	  strfcpy (fcc, buf, fcclen);
 	  mutt_pretty_mailbox (fcc, fcclen);
-	  move (HDR_FCC, HDR_XOFFSET);
+	  move (HDR_FCC, HDR_XOFFSET + SidebarWidth);
 	  mutt_paddstr (W, fcc);
 	  fccSet = 1;
 	}
Index: mutt-1.5.21/curs_main.c
===================================================================
--- mutt-1.5.21.orig/curs_main.c	2012-06-21 11:48:06.742181772 +0200
+++ mutt-1.5.21/curs_main.c	2012-06-21 11:48:06.753181937 +0200
@@ -26,7 +26,9 @@
 #include "mailbox.h"
 #include "mapping.h"
 #include "sort.h"
+#include "buffy.h"
 #include "mx.h"
+#include "sidebar.h"
 
 #ifdef USE_POP
 #include "pop.h"
@@ -532,8 +534,12 @@ int mutt_index_menu (void)
        menu->redraw |= REDRAW_STATUS;
      if (do_buffy_notify)
      {
-       if (mutt_buffy_notify () && option (OPTBEEPNEW))
- 	beep ();
+       if (mutt_buffy_notify ())
+       {
+         menu->redraw |= REDRAW_FULL;
+         if (option (OPTBEEPNEW))
+           beep ();
+       }
      }
      else
        do_buffy_notify = 1;
@@ -545,6 +551,7 @@ int mutt_index_menu (void)
     if (menu->redraw & REDRAW_FULL)
     {
       menu_redraw_full (menu);
+      draw_sidebar(menu->menu);
       mutt_show_error ();
     }
 
@@ -567,10 +574,13 @@ int mutt_index_menu (void)
 
       if (menu->redraw & REDRAW_STATUS)
       {
+        DrawFullLine = 1;
 	menu_status_line (buf, sizeof (buf), menu, NONULL (Status));
+        DrawFullLine = 0;
 	CLEARLINE (option (OPTSTATUSONTOP) ? 0 : LINES-2);
 	SETCOLOR (MT_COLOR_STATUS);
         BKGDSET (MT_COLOR_STATUS);
+        set_buffystats(Context);
 	mutt_paddstr (COLS, buf);
 	SETCOLOR (MT_COLOR_NORMAL);
         BKGDSET (MT_COLOR_NORMAL);
@@ -591,7 +601,7 @@ int mutt_index_menu (void)
 	menu->oldcurrent = -1;
 
       if (option (OPTARROWCURSOR))
-	move (menu->current - menu->top + menu->offset, 2);
+	move (menu->current - menu->top + menu->offset, SidebarWidth + 2);
       else if (option (OPTBRAILLEFRIENDLY))
 	move (menu->current - menu->top + menu->offset, 0);
       else
@@ -1089,6 +1099,7 @@ int mutt_index_menu (void)
 	  menu->redraw = REDRAW_FULL;
 	break;
 
+      case OP_SIDEBAR_OPEN:
       case OP_MAIN_CHANGE_FOLDER:
       case OP_MAIN_NEXT_UNREAD_MAILBOX:
 
@@ -1120,7 +1131,11 @@ int mutt_index_menu (void)
 	{
 	  mutt_buffy (buf, sizeof (buf));
 
-	  if (mutt_enter_fname (cp, buf, sizeof (buf), &menu->redraw, 1) == -1)
+          if ( op == OP_SIDEBAR_OPEN ) {
+              if(!CurBuffy)
+                break;
+            strncpy( buf, CurBuffy->path, sizeof(buf) );  
+	    } else if (mutt_enter_fname (cp, buf, sizeof (buf), &menu->redraw, 1) == -1)
 	  {
 	    if (menu->menu == MENU_PAGER)
 	    {
@@ -1138,6 +1153,7 @@ int mutt_index_menu (void)
 	}
 
 	mutt_expand_path (buf, sizeof (buf));
+        set_curbuffy(buf);
 	if (mx_get_magic (buf) <= 0)
 	{
 	  mutt_error (_("%s is not a mailbox."), buf);
@@ -2233,6 +2249,12 @@ int mutt_index_menu (void)
 	mutt_what_key();
 	break;
 
+      case OP_SIDEBAR_SCROLL_UP:
+      case OP_SIDEBAR_SCROLL_DOWN:
+      case OP_SIDEBAR_NEXT:
+      case OP_SIDEBAR_PREV:
+        scroll_sidebar(op, menu->menu);
+        break;
       default:
 	if (menu->menu == MENU_MAIN)
 	  km_error_key (MENU_MAIN);
Index: mutt-1.5.21/flags.c
===================================================================
--- mutt-1.5.21.orig/flags.c	2012-06-21 11:48:06.587179442 +0200
+++ mutt-1.5.21/flags.c	2012-06-21 11:48:06.753181937 +0200
@@ -22,8 +22,10 @@
 
 #include "mutt.h"
 #include "mutt_curses.h"
+#include "mutt_menu.h"
 #include "sort.h"
 #include "mx.h"
+#include "sidebar.h"
 
 void _mutt_set_flag (CONTEXT *ctx, HEADER *h, int flag, int bf, int upd_ctx)
 {
@@ -263,6 +265,7 @@ void _mutt_set_flag (CONTEXT *ctx, HEADE
    */
   if (h->searched && (changed != h->changed || deleted != ctx->deleted || tagged != ctx->tagged || flagged != ctx->flagged))
     h->searched = 0;
+	draw_sidebar(0);
 }
 
 void mutt_tag_set_flag (int flag, int bf)
Index: mutt-1.5.21/functions.h
===================================================================
--- mutt-1.5.21.orig/functions.h	2010-08-24 18:34:21.000000000 +0200
+++ mutt-1.5.21/functions.h	2012-06-21 11:48:06.753181937 +0200
@@ -169,6 +169,11 @@ struct binding_t OpMain[] = { /* map: in
   { "decrypt-save",		OP_DECRYPT_SAVE,		NULL },
 
 
+ { "sidebar-scroll-up",	OP_SIDEBAR_SCROLL_UP, NULL },
+ { "sidebar-scroll-down",	OP_SIDEBAR_SCROLL_DOWN, NULL },
+ { "sidebar-next",		OP_SIDEBAR_NEXT, NULL },
+ { "sidebar-prev",		OP_SIDEBAR_PREV, NULL },
+ { "sidebar-open",		OP_SIDEBAR_OPEN, NULL },
   { NULL,			0,				NULL }
 };
 
@@ -272,6 +277,11 @@ struct binding_t OpPager[] = { /* map: p
 
   { "what-key",		OP_WHAT_KEY,		NULL },
 
+  { "sidebar-scroll-up",	OP_SIDEBAR_SCROLL_UP, NULL },
+  { "sidebar-scroll-down",	OP_SIDEBAR_SCROLL_DOWN, NULL },
+  { "sidebar-next",	OP_SIDEBAR_NEXT, NULL },
+  { "sidebar-prev",	OP_SIDEBAR_PREV, NULL },
+  { "sidebar-open", OP_SIDEBAR_OPEN, NULL },
   { NULL,		0,				NULL }
 };
 
Index: mutt-1.5.21/globals.h
===================================================================
--- mutt-1.5.21.orig/globals.h	2012-06-21 11:48:06.742181772 +0200
+++ mutt-1.5.21/globals.h	2012-06-21 11:48:06.754181952 +0200
@@ -117,6 +117,7 @@ WHERE short SearchContext;
 WHERE char *SendCharset;
 WHERE char *Sendmail;
 WHERE char *Shell;
+WHERE char *SidebarDelim;
 WHERE char *Signature;
 WHERE char *SimpleSearch;
 #if USE_SMTP
@@ -209,6 +210,9 @@ WHERE short ScoreThresholdDelete;
 WHERE short ScoreThresholdRead;
 WHERE short ScoreThresholdFlag;
 
+WHERE struct buffy_t *CurBuffy INITVAL(0);
+WHERE short DrawFullLine INITVAL(0);
+WHERE short SidebarWidth;
 #ifdef USE_IMAP
 WHERE short ImapKeepalive;
 WHERE short ImapPipelineDepth;
Index: mutt-1.5.21/init.h
===================================================================
--- mutt-1.5.21.orig/init.h	2012-06-21 11:48:06.743181787 +0200
+++ mutt-1.5.21/init.h	2012-06-21 11:50:43.372537019 +0200
@@ -1955,6 +1955,27 @@ struct option_t MuttVars[] = {
   ** not used.
   ** (PGP only)
   */
+  {"sidebar_delim", DT_STR, R_BOTH, UL &SidebarDelim, "|"},
+  /*
+  ** .pp
+  ** This specifies the delimiter between the sidebar (if visible) and 
+  ** other screens.
+  */
+  { "sidebar_visible", DT_BOOL, R_BOTH, OPTSIDEBAR, 0 },
+  /*
+  ** .pp
+  ** This specifies whether or not to show sidebar (left-side list of folders).
+  */
+  { "sidebar_sort", DT_BOOL, R_BOTH, OPTSIDEBARSORT, 0 },
+  /*
+  ** .pp
+  ** This specifies whether or not to sort the sidebar alphabetically.
+  */
+  { "sidebar_width", DT_NUM, R_BOTH, UL &SidebarWidth, 0 },
+  /*
+  ** .pp
+  ** The width of the sidebar.
+  */
   { "pgp_use_gpg_agent", DT_BOOL, R_NONE, OPTUSEGPGAGENT, 0},
   /*
   ** .pp
Index: mutt-1.5.21/mailbox.h
===================================================================
--- mutt-1.5.21.orig/mailbox.h	2009-04-30 19:33:48.000000000 +0200
+++ mutt-1.5.21/mailbox.h	2012-06-21 11:48:06.754181952 +0200
@@ -27,6 +27,7 @@
 #define M_NEWFOLDER	(1<<4) /* create a new folder - same as M_APPEND, but uses
 				* safe_fopen() for mbox-style folders.
 				*/
+#define M_PEEK		(1<<5) /* revert atime back after taking a look (if applicable) */
 
 /* mx_open_new_message() */
 #define M_ADD_FROM	1	/* add a From_ line */
Index: mutt-1.5.21/Makefile.am
===================================================================
--- mutt-1.5.21.orig/Makefile.am	2012-06-21 11:48:06.694181050 +0200
+++ mutt-1.5.21/Makefile.am	2012-06-21 11:50:50.018636976 +0200
@@ -33,7 +33,8 @@ mutt_SOURCES = \
 	score.c send.c sendlib.c signal.c sort.c \
 	status.c system.c thread.c charset.c history.c lib.c \
 	muttlib.c editmsg.c mbyte.c \
-	url.c ascii.c crypt-mod.c crypt-mod.h safe_asprintf.c
+	url.c ascii.c crypt-mod.c crypt-mod.h safe_asprintf.c \
+	sidebar.c
 
 nodist_mutt_SOURCES = $(BUILT_SOURCES)
 
Index: mutt-1.5.21/Makefile.in
===================================================================
--- mutt-1.5.21.orig/Makefile.in	2012-06-21 11:48:06.695181065 +0200
+++ mutt-1.5.21/Makefile.in	2012-06-21 11:50:50.018636976 +0200
@@ -86,7 +86,8 @@ am_mutt_OBJECTS = addrbook.$(OBJEXT) ali
 	system.$(OBJEXT) thread.$(OBJEXT) charset.$(OBJEXT) \
 	history.$(OBJEXT) lib.$(OBJEXT) muttlib.$(OBJEXT) \
 	editmsg.$(OBJEXT) mbyte.$(OBJEXT) url.$(OBJEXT) \
-	ascii.$(OBJEXT) crypt-mod.$(OBJEXT) safe_asprintf.$(OBJEXT)
+	ascii.$(OBJEXT) crypt-mod.$(OBJEXT) safe_asprintf.$(OBJEXT) \
+	sidebar.$(OBJEXT)
 am__objects_1 =
 am__objects_2 = patchlist.$(OBJEXT) $(am__objects_1)
 nodist_mutt_OBJECTS = $(am__objects_2)
@@ -360,7 +361,8 @@ mutt_SOURCES = \
 	score.c send.c sendlib.c signal.c sort.c \
 	status.c system.c thread.c charset.c history.c lib.c \
 	muttlib.c editmsg.c mbyte.c \
-	url.c ascii.c crypt-mod.c crypt-mod.h safe_asprintf.c
+	url.c ascii.c crypt-mod.c crypt-mod.h safe_asprintf.c \
+	sidebar.c
 
 nodist_mutt_SOURCES = $(BUILT_SOURCES)
 mutt_LDADD = @MUTT_LIB_OBJECTS@ @LIBOBJS@ $(LIBIMAP) $(MUTTLIBS) \
@@ -392,7 +394,7 @@ EXTRA_DIST = COPYRIGHT GPL OPS OPS.PGP O
 	README.SSL smime.h group.h \
 	muttbug pgppacket.h depcomp ascii.h BEWARE PATCHES patchlist.sh \
 	ChangeLog mkchangelog.sh mutt_idna.h \
-	snprintf.c regex.c crypt-gpgme.h hcachever.sh.in
+	snprintf.c regex.c crypt-gpgme.h sidebar.h hcachever.sh.in
 
 EXTRA_SCRIPTS = smime_keys
 mutt_dotlock_SOURCES = mutt_dotlock.c
Index: mutt-1.5.21/mbox.c
===================================================================
--- mutt-1.5.21.orig/mbox.c	2012-06-21 11:48:06.703181186 +0200
+++ mutt-1.5.21/mbox.c	2012-06-21 11:50:50.018636976 +0200
@@ -104,6 +104,7 @@ int mmdf_parse_mailbox (CONTEXT *ctx)
     mutt_perror (ctx->path);
     return (-1);
   }
+  ctx->atime = sb.st_atime;
   ctx->mtime = sb.st_mtime;
   ctx->size = sb.st_size;
 
@@ -255,6 +256,7 @@ int mbox_parse_mailbox (CONTEXT *ctx)
 
   ctx->size = sb.st_size;
   ctx->mtime = sb.st_mtime;
+  ctx->atime = sb.st_atime;
 
 #ifdef NFS_ATTRIBUTE_HACK
   if (sb.st_mtime > sb.st_atime)
Index: mutt-1.5.21/menu.c
===================================================================
--- mutt-1.5.21.orig/menu.c	2010-08-25 18:31:40.000000000 +0200
+++ mutt-1.5.21/menu.c	2012-06-21 11:48:06.755181967 +0200
@@ -24,6 +24,7 @@
 #include "mutt_curses.h"
 #include "mutt_menu.h"
 #include "mbyte.h"
+#include "sidebar.h"
 
 #include <string.h>
 #include <stdlib.h>
@@ -156,7 +157,7 @@ static void menu_pad_string (char *s, si
 {
   char *scratch = safe_strdup (s);
   int shift = option (OPTARROWCURSOR) ? 3 : 0;
-  int cols = COLS - shift;
+  int cols = COLS - shift - SidebarWidth;
 
   mutt_format_string (s, n, cols, cols, FMT_LEFT, ' ', scratch, mutt_strlen (scratch), 1);
   s[n - 1] = 0;
@@ -207,6 +208,7 @@ void menu_redraw_index (MUTTMENU *menu)
   char buf[LONG_STRING];
   int i;
 
+  draw_sidebar(1);
   for (i = menu->top; i < menu->top + menu->pagelen; i++)
   {
     if (i < menu->max)
@@ -217,7 +219,7 @@ void menu_redraw_index (MUTTMENU *menu)
       if (option (OPTARROWCURSOR))
       {
         attrset (menu->color (i));
-	CLEARLINE (i - menu->top + menu->offset);
+	CLEARLINE_WIN (i - menu->top + menu->offset);
 
 	if (i == menu->current)
 	{
@@ -246,14 +248,14 @@ void menu_redraw_index (MUTTMENU *menu)
 	  BKGDSET (MT_COLOR_INDICATOR);
 	}
 
-	CLEARLINE (i - menu->top + menu->offset);
+	CLEARLINE_WIN (i - menu->top + menu->offset);
 	print_enriched_string (menu->color(i), (unsigned char *) buf, i != menu->current);
         SETCOLOR (MT_COLOR_NORMAL);
         BKGDSET (MT_COLOR_NORMAL);
       }
     }
     else
-      CLEARLINE (i - menu->top + menu->offset);
+      CLEARLINE_WIN (i - menu->top + menu->offset);
   }
   menu->redraw = 0;
 }
@@ -268,7 +270,7 @@ void menu_redraw_motion (MUTTMENU *menu)
     return;
   }
   
-  move (menu->oldcurrent + menu->offset - menu->top, 0);
+  move (menu->oldcurrent + menu->offset - menu->top, SidebarWidth);
   SETCOLOR (MT_COLOR_NORMAL);
   BKGDSET (MT_COLOR_NORMAL);
 
@@ -283,13 +285,13 @@ void menu_redraw_motion (MUTTMENU *menu)
       clrtoeol ();
       menu_make_entry (buf, sizeof (buf), menu, menu->oldcurrent);
       menu_pad_string (buf, sizeof (buf));
-      move (menu->oldcurrent + menu->offset - menu->top, 3);
+      move (menu->oldcurrent + menu->offset - menu->top, SidebarWidth + 3);
       print_enriched_string (menu->color(menu->oldcurrent), (unsigned char *) buf, 1);
       SETCOLOR (MT_COLOR_NORMAL);
     }
 
     /* now draw it in the new location */
-    move (menu->current + menu->offset - menu->top, 0);
+    move (menu->current + menu->offset - menu->top, SidebarWidth);
     attrset (menu->color (menu->current));
     ADDCOLOR (MT_COLOR_INDICATOR);
     addstr ("->");
@@ -310,7 +312,7 @@ void menu_redraw_motion (MUTTMENU *menu)
     attrset (menu->color (menu->current));
     ADDCOLOR (MT_COLOR_INDICATOR);
     BKGDSET (MT_COLOR_INDICATOR);
-    CLEARLINE (menu->current - menu->top + menu->offset);
+    CLEARLINE_WIN (menu->current - menu->top + menu->offset);
     print_enriched_string (menu->color(menu->current), (unsigned char *) buf, 0);
     SETCOLOR (MT_COLOR_NORMAL);
     BKGDSET (MT_COLOR_NORMAL);
@@ -322,7 +324,7 @@ void menu_redraw_current (MUTTMENU *menu
 {
   char buf[LONG_STRING];
   
-  move (menu->current + menu->offset - menu->top, 0);
+  move (menu->current + menu->offset - menu->top, SidebarWidth);
   menu_make_entry (buf, sizeof (buf), menu, menu->current);
   menu_pad_string (buf, sizeof (buf));
 
@@ -875,7 +877,7 @@ int mutt_menuLoop (MUTTMENU *menu)
     
     
     if (option (OPTARROWCURSOR))
-      move (menu->current - menu->top + menu->offset, 2);
+      move (menu->current - menu->top + menu->offset, SidebarWidth + 2);
     else if (option (OPTBRAILLEFRIENDLY))
       move (menu->current - menu->top + menu->offset, 0);
     else
Index: mutt-1.5.21/mutt_curses.h
===================================================================
--- mutt-1.5.21.orig/mutt_curses.h	2008-03-19 21:07:57.000000000 +0100
+++ mutt-1.5.21/mutt_curses.h	2012-06-21 11:48:06.755181967 +0200
@@ -64,6 +64,7 @@
 #undef lines
 #endif /* lines */
 
+#define CLEARLINE_WIN(x) move(x,SidebarWidth), clrtoeol()
 #define CLEARLINE(x) move(x,0), clrtoeol()
 #define CENTERLINE(x,y) move(y, (COLS-strlen(x))/2), addstr(x)
 #define BEEP() do { if (option (OPTBEEP)) beep(); } while (0)
@@ -126,6 +127,8 @@ enum
   MT_COLOR_BOLD,
   MT_COLOR_UNDERLINE,
   MT_COLOR_INDEX,
+  MT_COLOR_NEW,
+  MT_COLOR_FLAGGED,
   MT_COLOR_MAX
 };
 
Index: mutt-1.5.21/mutt.h
===================================================================
--- mutt-1.5.21.orig/mutt.h	2012-06-21 11:48:06.743181787 +0200
+++ mutt-1.5.21/mutt.h	2012-06-21 11:50:50.018636976 +0200
@@ -425,6 +425,8 @@ enum
   OPTSAVENAME,
   OPTSENDGROUPREPLYTO,
   OPTSCORE,
+  OPTSIDEBAR,
+  OPTSIDEBARSORT,
   OPTSIGDASHES,
   OPTSIGONTOP,
   OPTSORTRE,
@@ -866,6 +868,7 @@ typedef struct _context
 {
   char *path;
   FILE *fp;
+  time_t atime;
   time_t mtime;
   off_t size;
   off_t vsize;
@@ -905,6 +908,7 @@ typedef struct _context
   unsigned int quiet : 1;	/* inhibit status messages? */
   unsigned int collapsed : 1;   /* are all threads collapsed? */
   unsigned int closing : 1;	/* mailbox is being closed */
+  unsigned int peekonly : 1;	/* just taking a glance, revert atime */
 
   /* driver hooks */
   void *data;			/* driver specific data */
Index: mutt-1.5.21/muttlib.c
===================================================================
--- mutt-1.5.21.orig/muttlib.c	2012-06-21 11:48:06.648180359 +0200
+++ mutt-1.5.21/muttlib.c	2012-06-21 11:48:06.756181982 +0200
@@ -1289,6 +1289,8 @@ void mutt_FormatString (char *dest,		/*
 	  pl = pw = 1;
 
 	/* see if there's room to add content, else ignore */
+        if ( DrawFullLine )
+        {
 	if ((col < COLS && wlen < destlen) || soft)
 	{
 	  int pad;
@@ -1332,6 +1334,52 @@ void mutt_FormatString (char *dest,		/*
 	  col += wid;
 	  src += pl;
 	}
+        }
+        else
+        {
+	if ((col < COLS-SidebarWidth && wlen < destlen) || soft)
+        {
+	  int pad;
+
+	  /* get contents after padding */
+	  mutt_FormatString (buf, sizeof (buf), 0, src + pl, callback, data, flags);
+	  len = mutt_strlen (buf);
+	  wid = mutt_strwidth (buf);
+
+	  /* try to consume as many columns as we can, if we don't have
+	   * memory for that, use as much memory as possible */
+	  pad = (COLS - SidebarWidth - col - wid) / pw;
+	  if (pad > 0 && wlen + (pad * pl) + len > destlen)
+	    pad = ((signed)(destlen - wlen - len)) / pl;
+	  if (pad > 0)
+	  {
+	    while (pad--)
+	    {
+	      memcpy (wptr, src, pl);
+	      wptr += pl;
+	      wlen += pl;
+	      col += pw;
+	    }
+	  }
+	  else if (soft && pad < 0)
+	  {
+	    /* \0-terminate dest for length computation in mutt_wstr_trunc() */
+	    *wptr = 0;
+	    /* make sure right part is at most as wide as display */
+	    len = mutt_wstr_trunc (buf, destlen, COLS, &wid);
+	    /* truncate left so that right part fits completely in */
+	    wlen = mutt_wstr_trunc (dest, destlen - len, col + pad, &col);
+	    wptr = dest + wlen;
+	  }
+	  if (len + wlen > destlen)
+	    len = mutt_wstr_trunc (buf, destlen - wlen, COLS - SidebarWidth - col, NULL);
+	  memcpy (wptr, buf, len);
+	  wptr += len;
+	  wlen += len;
+	  col += wid;
+	  src += pl;
+	}
+        }
 	break; /* skip rest of input */
       }
       else if (ch == '|')
Index: mutt-1.5.21/mx.c
===================================================================
--- mutt-1.5.21.orig/mx.c	2012-06-21 11:48:06.704181201 +0200
+++ mutt-1.5.21/mx.c	2012-06-21 11:48:06.756181982 +0200
@@ -595,6 +595,7 @@ static int mx_open_mailbox_append (CONTE
  *		M_APPEND	open mailbox for appending
  *		M_READONLY	open mailbox in read-only mode
  *		M_QUIET		only print error messages
+ *		M_PEEK		revert atime where applicable
  *	ctx	if non-null, context struct to use
  */
 CONTEXT *mx_open_mailbox (const char *path, int flags, CONTEXT *pctx)
@@ -617,6 +618,8 @@ CONTEXT *mx_open_mailbox (const char *pa
     ctx->quiet = 1;
   if (flags & M_READONLY)
     ctx->readonly = 1;
+  if (flags & M_PEEK)
+    ctx->peekonly = 1;
 
   if (flags & (M_APPEND|M_NEWFOLDER))
   {
@@ -721,9 +724,21 @@ CONTEXT *mx_open_mailbox (const char *pa
 void mx_fastclose_mailbox (CONTEXT *ctx)
 {
   int i;
+#ifndef BUFFY_SIZE
+  struct utimbuf ut;
+#endif
 
   if(!ctx) 
     return;
+#ifndef BUFFY_SIZE
+  /* fix up the times so buffy won't get confused */
+  if (ctx->peekonly && ctx->path && ctx->mtime > ctx->atime)
+  {
+    ut.actime = ctx->atime;
+    ut.modtime = ctx->mtime;
+    utime (ctx->path, &ut);
+  }
+#endif
 
   /* never announce that a mailbox we've just left has new mail. #3290
    * XXX: really belongs in mx_close_mailbox, but this is a nice hook point */
Index: mutt-1.5.21/OPS
===================================================================
--- mutt-1.5.21.orig/OPS	2010-03-01 18:56:19.000000000 +0100
+++ mutt-1.5.21/OPS	2012-06-21 11:48:06.756181982 +0200
@@ -179,3 +179,8 @@ OP_WHAT_KEY "display the keycode for a k
 OP_MAIN_SHOW_LIMIT "show currently active limit pattern"
 OP_MAIN_COLLAPSE_THREAD "collapse/uncollapse current thread"
 OP_MAIN_COLLAPSE_ALL "collapse/uncollapse all threads"
+OP_SIDEBAR_SCROLL_UP "scroll the mailbox pane up 1 page"
+OP_SIDEBAR_SCROLL_DOWN "scroll the mailbox pane down 1 page"
+OP_SIDEBAR_NEXT "go down to next mailbox"
+OP_SIDEBAR_PREV "go to previous mailbox"
+OP_SIDEBAR_OPEN "open hilighted mailbox"
Index: mutt-1.5.21/pager.c
===================================================================
--- mutt-1.5.21.orig/pager.c	2012-06-21 11:48:06.744181802 +0200
+++ mutt-1.5.21/pager.c	2012-06-21 11:48:06.757181997 +0200
@@ -29,6 +29,7 @@
 #include "pager.h"
 #include "attach.h"
 #include "mbyte.h"
+#include "sidebar.h"
 
 #include "mutt_crypt.h"
 
@@ -1095,6 +1096,7 @@ static int format_line (struct line_t **
   wchar_t wc;
   mbstate_t mbstate;
   int wrap_cols = mutt_term_width ((flags & M_PAGER_NOWRAP) ? 0 : Wrap);
+  wrap_cols -= SidebarWidth;
 
   if (check_attachment_marker ((char *)buf) == 0)
     wrap_cols = COLS;
@@ -1745,7 +1747,7 @@ mutt_pager (const char *banner, const ch
     if ((redraw & REDRAW_BODY) || topline != oldtopline)
     {
       do {
-	move (bodyoffset, 0);
+	move (bodyoffset, SidebarWidth);
 	curline = oldtopline = topline;
 	lines = 0;
 	force_redraw = 0;
@@ -1758,6 +1760,7 @@ mutt_pager (const char *banner, const ch
 			    &QuoteList, &q_level, &force_redraw, &SearchRE) > 0)
 	    lines++;
 	  curline++;
+  	  move(lines + bodyoffset, SidebarWidth);
 	}
 	last_offset = lineInfo[curline].offset;
       } while (force_redraw);
@@ -1771,6 +1774,7 @@ mutt_pager (const char *banner, const ch
 	  addch ('~');
 	addch ('\n');
 	lines++;
+  	move(lines + bodyoffset, SidebarWidth);
       }
       /* We are going to update the pager status bar, so it isn't
        * necessary to reset to normal color now. */
@@ -1794,21 +1798,21 @@ mutt_pager (const char *banner, const ch
       /* print out the pager status bar */
       SETCOLOR (MT_COLOR_STATUS);
       BKGDSET (MT_COLOR_STATUS);
-      CLEARLINE (statusoffset);
+      CLEARLINE_WIN (statusoffset);
 
       if (IsHeader (extra) || IsMsgAttach (extra))
       {
-	size_t l1 = COLS * MB_LEN_MAX;
+	size_t l1 = (COLS-SidebarWidth) * MB_LEN_MAX;
 	size_t l2 = sizeof (buffer);
 	hfi.hdr = (IsHeader (extra)) ? extra->hdr : extra->bdy->hdr;
 	mutt_make_string_info (buffer, l1 < l2 ? l1 : l2, NONULL (PagerFmt), &hfi, M_FORMAT_MAKEPRINT);
-	mutt_paddstr (COLS, buffer);
+	mutt_paddstr (COLS-SidebarWidth, buffer);
       }
       else
       {
 	char bn[STRING];
 	snprintf (bn, sizeof (bn), "%s (%s)", banner, pager_progress_str);
-	mutt_paddstr (COLS, bn);
+	mutt_paddstr (COLS-SidebarWidth, bn);
       }
       BKGDSET (MT_COLOR_NORMAL);
       SETCOLOR (MT_COLOR_NORMAL);
@@ -1826,18 +1830,23 @@ mutt_pager (const char *banner, const ch
       /* redraw the pager_index indicator, because the
        * flags for this message might have changed. */
       menu_redraw_current (index);
+      draw_sidebar(MENU_PAGER);
 
       /* print out the index status bar */
       menu_status_line (buffer, sizeof (buffer), index, NONULL(Status));
  
-      move (indexoffset + (option (OPTSTATUSONTOP) ? 0 : (indexlen - 1)), 0);
+      move (indexoffset + (option (OPTSTATUSONTOP) ? 0 : (indexlen - 1)), SidebarWidth);
       SETCOLOR (MT_COLOR_STATUS);
       BKGDSET (MT_COLOR_STATUS);
-      mutt_paddstr (COLS, buffer);
+      mutt_paddstr (COLS-SidebarWidth, buffer);
       SETCOLOR (MT_COLOR_NORMAL);
       BKGDSET (MT_COLOR_NORMAL);
     }
 
+    /* if we're not using the index, update every time */
+    if ( index == 0 )
+      draw_sidebar(MENU_PAGER);
+
     redraw = 0;
 
     if (option(OPTBRAILLEFRIENDLY)) {
@@ -2763,6 +2772,13 @@ search_next:
 	mutt_what_key ();
 	break;
 
+      case OP_SIDEBAR_SCROLL_UP:
+      case OP_SIDEBAR_SCROLL_DOWN:
+      case OP_SIDEBAR_NEXT:
+      case OP_SIDEBAR_PREV:
+	scroll_sidebar(ch, MENU_PAGER);
+ 	break;
+
       default:
 	ch = -1;
 	break;
Index: mutt-1.5.21/PATCHES
===================================================================
--- mutt-1.5.21.orig/PATCHES	2012-06-21 11:48:06.741181757 +0200
+++ mutt-1.5.21/PATCHES	2012-06-21 11:50:43.372537019 +0200
@@ -1,2 +1,3 @@
+patch-1.5.20.sidebar.20090619.txt
 patch-1.5.19.rr.compressed.1
 patch-1.5.5.1.nt.xtitles.3.ab.1
Index: mutt-1.5.21/sidebar.c
===================================================================
--- /dev/null	1970-01-01 00:00:00.000000000 +0000
+++ mutt-1.5.21/sidebar.c	2012-06-21 11:56:09.904450421 +0200
@@ -0,0 +1,333 @@
+/*
+ * Copyright (C) ????-2004 Justin Hibbits <jrh29@po.cwru.edu>
+ * Copyright (C) 2004 Thomer M. Gil <mutt@thomer.com>
+ *
+ *     This program is free software; you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation; either version 2 of the License, or
+ *     (at your option) any later version.
+ *
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program; if not, write to the Free Software
+ *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ */
+
+
+#if HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include "mutt.h"
+#include "mutt_menu.h"
+#include "mutt_curses.h"
+#include "sidebar.h"
+#include "buffy.h"
+#include <libgen.h>
+#include "keymap.h"
+#include <stdbool.h>
+
+/*BUFFY *CurBuffy = 0;*/
+static BUFFY *TopBuffy = 0;
+static BUFFY *BottomBuffy = 0;
+static int known_lines = 0;
+
+static int quick_log10(int n)
+{
+  char string[32];
+  sprintf(string, "%d", n);
+  return strlen(string);
+}
+
+void calc_boundaries (int menu)
+{
+  BUFFY *tmp = Incoming;
+
+  if ( known_lines != LINES ) {
+    TopBuffy = BottomBuffy = 0;
+    known_lines = LINES;
+  }
+  for ( ; tmp->next != 0; tmp = tmp->next )
+    tmp->next->prev = tmp;
+
+  if ( TopBuffy == 0 && BottomBuffy == 0 )
+    TopBuffy = Incoming;
+  if ( BottomBuffy == 0 ) {
+    int count = LINES - 2 - (menu != MENU_PAGER || option(OPTSTATUSONTOP));
+    BottomBuffy = TopBuffy;
+    while ( --count && BottomBuffy->next )
+      BottomBuffy = BottomBuffy->next;
+  }
+  else if ( TopBuffy == CurBuffy->next ) {
+    int count = LINES - 2 - (menu != MENU_PAGER);
+    BottomBuffy = CurBuffy;
+    tmp = BottomBuffy;
+    while ( --count && tmp->prev)
+      tmp = tmp->prev;
+    TopBuffy = tmp;
+  }
+  else if ( BottomBuffy == CurBuffy->prev ) {
+    int count = LINES - 2 - (menu != MENU_PAGER);
+    TopBuffy = CurBuffy;
+    tmp = TopBuffy;
+    while ( --count && tmp->next )
+      tmp = tmp->next;
+    BottomBuffy = tmp;
+  }
+}
+
+char *make_sidebar_entry(char *box, int size, int new, int flagged)
+{
+  static char *entry = 0;
+  char *c;
+  int i = 0;
+  int delim_len = strlen(SidebarDelim);
+
+  c = realloc(entry, SidebarWidth - delim_len + 2);
+  if ( c ) entry = c;
+  entry[SidebarWidth - delim_len + 1] = 0;
+  for (; i < SidebarWidth - delim_len + 1; entry[i++] = ' ' );
+  i = strlen(box);
+  strncpy( entry, box, i < (SidebarWidth - delim_len + 1) ? i : (SidebarWidth - delim_len + 1) );
+
+  if (size == -1)
+    sprintf(entry + SidebarWidth - delim_len - 3, "?");
+  else if ( new ) {
+    if (flagged > 0) {
+      sprintf(
+          entry + SidebarWidth - delim_len - 5 - quick_log10(size) - quick_log10(new) - quick_log10(flagged),
+          "% d(%d)[%d]", size, new, flagged);
+    } else {
+      sprintf(
+          entry + SidebarWidth - delim_len - 3 - quick_log10(size) - quick_log10(new),
+          "% d(%d)", size, new);
+    }
+  } else if (flagged > 0) {
+    sprintf( entry + SidebarWidth - delim_len - 3 - quick_log10(size) - quick_log10(flagged), "% d[%d]", size, flagged);
+  } else {
+    sprintf( entry + SidebarWidth - delim_len - 1 - quick_log10(size), "% d", size);
+  }
+  return entry;
+}
+
+void set_curbuffy(char buf[LONG_STRING])
+{
+  BUFFY* tmp = CurBuffy = Incoming;
+
+  if (!Incoming)
+    return;
+
+  while(1) {
+    if(!strcmp(tmp->path, buf)) {
+      CurBuffy = tmp;
+      break;
+    }
+
+    if(tmp->next)
+      tmp = tmp->next;
+    else
+      break;
+  }
+}
+
+int draw_sidebar(int menu) {
+
+  int lines = option(OPTHELP) ? 1 : 0;
+  BUFFY *tmp;
+#ifndef USE_SLANG_CURSES
+  attr_t attrs;
+#endif
+  short delim_len = strlen(SidebarDelim);
+  short color_pair;
+
+  static bool initialized = false;
+  static int prev_show_value;
+  static short saveSidebarWidth;
+
+  /* initialize first time */
+  if(!initialized) {
+    prev_show_value = option(OPTSIDEBAR);
+    saveSidebarWidth = SidebarWidth;
+    if(!option(OPTSIDEBAR)) SidebarWidth = 0;
+    initialized = true;
+  }
+
+  /* save or restore the value SidebarWidth */
+  if(prev_show_value != option(OPTSIDEBAR)) {
+    if(prev_show_value && !option(OPTSIDEBAR)) {
+      saveSidebarWidth = SidebarWidth;
+      SidebarWidth = 0;
+    } else if(!prev_show_value && option(OPTSIDEBAR)) {
+      SidebarWidth = saveSidebarWidth;
+    }
+    prev_show_value = option(OPTSIDEBAR);
+  }
+
+
+  if (SidebarWidth > 0 && option (OPTSIDEBAR)
+      && delim_len >= SidebarWidth) {
+    unset_option (OPTSIDEBAR);
+    /* saveSidebarWidth = SidebarWidth; */
+    if (saveSidebarWidth > delim_len) {
+      SidebarWidth = saveSidebarWidth;
+      mutt_error (_("Value for sidebar_delim is too long. Disabling sidebar."));
+      sleep (2);
+    } else {
+      SidebarWidth = 0;
+      mutt_error (_("Value for sidebar_delim is too long. Disabling sidebar. Please set your sidebar_width to a sane value."));
+      sleep (4); /* the advise to set a sane value should be seen long enough */
+    }
+    saveSidebarWidth = 0;
+    return (0);
+  }
+
+  if ( SidebarWidth == 0 || !option(OPTSIDEBAR)) {
+    if (SidebarWidth > 0) {
+      saveSidebarWidth = SidebarWidth;
+      SidebarWidth = 0;
+    }
+    unset_option(OPTSIDEBAR);
+    return 0;
+  }
+
+  /* get attributes for divider */
+  SETCOLOR(MT_COLOR_STATUS);
+#ifndef USE_SLANG_CURSES
+  attr_get(&attrs, &color_pair, 0);
+#else
+  color_pair = attr_get();
+#endif
+  SETCOLOR(MT_COLOR_NORMAL);
+
+  /* draw the divider */
+
+  for ( ; lines < LINES-1-(menu != MENU_PAGER || option(OPTSTATUSONTOP)); lines++ ) {
+    move(lines, SidebarWidth - delim_len);
+    addstr(NONULL(SidebarDelim));
+#ifndef USE_SLANG_CURSES
+    mvchgat(lines, SidebarWidth - delim_len, delim_len, 0, color_pair, NULL);
+#endif
+  }
+
+  if ( Incoming == 0 ) return 0;
+  lines = option(OPTHELP) ? 1 : 0; /* go back to the top */
+
+  if ( known_lines != LINES || TopBuffy == 0 || BottomBuffy == 0 )
+    calc_boundaries(menu);
+  if ( CurBuffy == 0 ) CurBuffy = Incoming;
+
+  tmp = TopBuffy;
+
+  SETCOLOR(MT_COLOR_NORMAL);
+
+  for ( ; tmp && lines < LINES-1 - (menu != MENU_PAGER || option(OPTSTATUSONTOP)); tmp = tmp->next ) {
+    short maildir_is_prefix = 0;
+    int sidebar_folder_depth = 0;
+    char *sidebar_folder_name;
+
+    if ( tmp == CurBuffy )
+      SETCOLOR(MT_COLOR_INDICATOR);
+    else if ( tmp->msg_unread > 0 )
+      SETCOLOR(MT_COLOR_NEW);
+    else if ( tmp->msg_flagged > 0 )
+      SETCOLOR(MT_COLOR_FLAGGED);
+    else
+      SETCOLOR(MT_COLOR_NORMAL);
+
+    move( lines, 0 );
+    if ( Context && !strcmp( tmp->path, Context->path ) ) {
+      tmp->msg_unread = Context->unread;
+      tmp->msgcount = Context->msgcount;
+      tmp->msg_flagged = Context->flagged;
+    }
+    /* check whether Maildir is a prefix of the current folder's path */
+    if ( (strlen(tmp->path) > strlen(Maildir)) &&
+        (strncmp(Maildir, tmp->path, strlen(Maildir)) == 0) )
+      maildir_is_prefix = 1;
+    /* calculate depth of current folder and generate its display name with indented spaces */
+    sidebar_folder_name = basename(tmp->path);
+    if ( maildir_is_prefix ) {
+      char *tmp_folder_name;
+      int i;
+      tmp_folder_name = tmp->path + strlen(Maildir);
+      for (i = 0; i < strlen(tmp->path) - strlen(Maildir); i++) {
+        if (tmp_folder_name[i] == '/') sidebar_folder_depth++;
+      }
+      if (sidebar_folder_depth > 0) {
+        sidebar_folder_name = malloc(strlen(basename(tmp->path)) + sidebar_folder_depth + 1);
+        for (i=0; i < sidebar_folder_depth; i++)
+          sidebar_folder_name[i]=' ';
+        sidebar_folder_name[i]=0;
+        strncat(sidebar_folder_name, basename(tmp->path), strlen(basename(tmp->path)) + sidebar_folder_depth);
+      }
+    }
+    printw( "%.*s", SidebarWidth - delim_len + 1,
+        make_sidebar_entry(sidebar_folder_name, tmp->msgcount,
+          tmp->msg_unread, tmp->msg_flagged));
+    if (sidebar_folder_depth > 0)
+      free(sidebar_folder_name);
+    lines++;
+  }
+  SETCOLOR(MT_COLOR_NORMAL);
+  for ( ; lines < LINES-1 - (menu != MENU_PAGER || option(OPTSTATUSONTOP)); lines++ ) {
+    int i = 0;
+    move( lines, 0 );
+    for ( ; i < SidebarWidth - delim_len; i++ )
+      addch(' ');
+  }
+  return 0;
+}
+
+
+void set_buffystats(CONTEXT* Context)
+{
+  BUFFY *tmp = Incoming;
+  while(tmp) {
+    if(Context && !strcmp(tmp->path, Context->path)) {
+      tmp->msg_unread = Context->unread;
+      tmp->msgcount = Context->msgcount;
+      break;
+    }
+    tmp = tmp->next;
+  }
+}
+
+void scroll_sidebar(int op, int menu)
+{
+  if(!SidebarWidth) return;
+  if(!CurBuffy) return;
+
+  switch (op) {
+    case OP_SIDEBAR_NEXT:
+      if ( CurBuffy->next == NULL ) return;
+      CurBuffy = CurBuffy->next;
+      break;
+    case OP_SIDEBAR_PREV:
+      if ( CurBuffy->prev == NULL ) return;
+      CurBuffy = CurBuffy->prev;
+      break;
+    case OP_SIDEBAR_SCROLL_UP:
+      CurBuffy = TopBuffy;
+      if ( CurBuffy != Incoming ) {
+        calc_boundaries(menu);
+        CurBuffy = CurBuffy->prev;
+      }
+      break;
+    case OP_SIDEBAR_SCROLL_DOWN:
+      CurBuffy = BottomBuffy;
+      if ( CurBuffy->next ) {
+        calc_boundaries(menu);
+        CurBuffy = CurBuffy->next;
+      }
+      break;
+    default:
+      return;
+  }
+  calc_boundaries(menu);
+  draw_sidebar(menu);
+}
+
Index: mutt-1.5.21/sidebar.h
===================================================================
--- /dev/null	1970-01-01 00:00:00.000000000 +0000
+++ mutt-1.5.21/sidebar.h	2012-06-21 11:48:06.757181997 +0200
@@ -0,0 +1,36 @@
+/*
+ * Copyright (C) ????-2004 Justin Hibbits <jrh29@po.cwru.edu>
+ * Copyright (C) 2004 Thomer M. Gil <mutt@thomer.com>
+ *
+ *     This program is free software; you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation; either version 2 of the License, or
+ *     (at your option) any later version.
+ *
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program; if not, write to the Free Software
+ *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ */
+
+#ifndef SIDEBAR_H
+#define SIDEBAR_H
+
+struct MBOX_LIST {
+	char *path;
+	int msgcount;
+	int new;
+} MBLIST;
+
+/* parameter is whether or not to go to the status line */
+/* used for omitting the last | that covers up the status bar in the index */
+int draw_sidebar(int);
+void scroll_sidebar(int, int);
+void set_curbuffy(char*);
+void set_buffystats(CONTEXT*);
+
+#endif /* SIDEBAR_H */
Index: mutt-1.5.21/doc/Muttrc
===================================================================
--- mutt-1.5.21.orig/doc/Muttrc	2012-06-21 11:48:06.700181140 +0200
+++ mutt-1.5.21/doc/Muttrc	2012-06-21 11:48:06.758182012 +0200
@@ -662,6 +662,26 @@ set check_mbox_size=yes
 # $crypt_autosign, $crypt_replysign and $smime_is_default.
 # 
 # 
+# set sidebar_visible=no
+#
+# Name: sidebar_visible
+# Type: boolean
+# Default: no
+# 
+# 
+# This specifies whether or not to show sidebar (left-side list of folders).
+# 
+# 
+# set sidebar_width=0
+#
+# Name: sidebar_width
+# Type: number
+# Default: 0
+# 
+# 
+# The width of the sidebar.
+# 
+# 
 # set crypt_autosign=no
 #
 # Name: crypt_autosign
Index: mutt-1.5.21/imap/imap.c
===================================================================
--- mutt-1.5.21.orig/imap/imap.c	2009-08-25 21:08:52.000000000 +0200
+++ mutt-1.5.21/imap/imap.c	2012-06-21 11:48:06.758182012 +0200
@@ -1521,7 +1521,7 @@ int imap_buffy_check (int force)
 
     imap_munge_mbox_name (munged, sizeof (munged), name);
     snprintf (command, sizeof (command),
-	      "STATUS %s (UIDNEXT UIDVALIDITY UNSEEN RECENT)", munged);
+	      "STATUS %s (UIDNEXT UIDVALIDITY UNSEEN RECENT MESSAGES)", munged);
 
     if (imap_exec (idata, command, IMAP_CMD_QUEUE) < 0)
     {
Index: mutt-1.5.21/imap/command.c
===================================================================
--- mutt-1.5.21.orig/imap/command.c	2010-09-15 17:39:31.000000000 +0200
+++ mutt-1.5.21/imap/command.c	2012-06-21 11:48:06.759182027 +0200
@@ -1011,6 +1011,13 @@ static void cmd_parse_status (IMAP_DATA*
 	     opened */
 	  status->uidnext = oldun;
 
+        /* Added to make the sidebar show the correct numbers */
+        if (status->messages)
+        {
+          inc->msgcount = status->messages;
+          inc->msg_unread = status->unseen;
+        }
+
         FREE (&value);
         return;
       }
Index: mutt-1.5.21/mh.c
===================================================================
--- mutt-1.5.21.orig/mh.c	2010-08-24 18:34:21.000000000 +0200
+++ mutt-1.5.21/mh.c	2012-06-21 11:50:50.018636976 +0200
@@ -242,6 +242,29 @@ int mh_buffy (const char *path)
   return r;
 }
 
+void mh_buffy_update (const char *path, int *msgcount,
+                      int *msg_unread, int *msg_flagged)
+{
+  int i;
+  struct mh_sequences mhs;
+  memset (&mhs, 0, sizeof (mhs));
+
+  if (mh_read_sequences (&mhs, path) < 0)
+    return;
+
+  msgcount = 0;
+  msg_unread = 0;
+  msg_flagged = 0;
+  for (i = 0; i <= mhs.max; i++)
+    msgcount++;
+    if (mhs_check (&mhs, i) & MH_SEQ_UNSEEN) {
+      msg_unread++;
+    }
+    if (mhs_check (&mhs, i) & MH_SEQ_FLAGGED)
+      msg_flagged++;
+  mhs_free_sequences (&mhs);
+}
+
 static int mh_mkstemp (CONTEXT * dest, FILE ** fp, char **tgt)
 {
   int fd;
Index: mutt-1.5.21/mx.h
===================================================================
--- mutt-1.5.21.orig/mx.h	2012-06-21 11:48:06.704181201 +0200
+++ mutt-1.5.21/mx.h	2012-06-21 11:48:06.759182027 +0200
@@ -61,6 +61,8 @@ int mh_read_dir (CONTEXT *, const char *
 int mh_sync_mailbox (CONTEXT *, int *);
 int mh_check_mailbox (CONTEXT *, int *);
 int mh_buffy (const char *);
+void mh_buffy_update (const char *path, int *msgcount,
+                      int *msg_unread, int *msg_flagged);
 int mh_check_empty (const char *);
 
 int maildir_read_dir (CONTEXT *);