sidebar patch for 1.5.19 from http://www.lunar-linux.org/index.php?option=com_content...

diff --git a/debian/patches/mutt-patched/sidebar b/debian/patches/mutt-patched/sidebar
index 94de9cf98314a0fa44b2e3f507399a724fe18821..27483501c66e32407b50a3d02dcaff5ac3fc0001 100644 (file)
--- a/debian/patches/mutt-patched/sidebar
+++ b/debian/patches/mutt-patched/sidebar
@@ -1,1375 +1,1792 @@
-# vim:ft=diff:
-This is the sidebar patch.
-
-When enabled, mutt will show a list of mailboxes with (new) message counts in a
-separate column on the left side of the screen.
-
-As this feature is still considered to be unstable, this patch is only applied
-in the "mutt-patched" package.
-
-* Configuration variables:
-
-  sidebar_delim (string, default "|")
-
-    This specifies the delimiter between the sidebar (if visible) and 
-    other screens.
-
-  sidebar_visible (boolean, default no)
-
-    This specifies whether or not to show sidebar (left-side list of folders).
-
-  sidebar_width (integer, default 0)
-
-    The width of the sidebar.
-
-* Patch source:
-  - http://www.lunar-linux.org/index.php?page=mutt-sidebar
-  - http://lunar-linux.org/~tchan/mutt/patch-1.5.18.sidebar.20080611.txt
-
-* Changes made:
-  - 2008-08-02 myon: Refreshed patch using quilt push -f to remove hunks we do
-    not need (Makefile.in).
-
-== END PATCH
---- a/buffy.c
-+++ b/buffy.c
-@@ -261,7 +261,7 @@ int mutt_buffy_check (int force)
-   char path[_POSIX_PATH_MAX];
-   struct stat contex_sb;
-   time_t t;
--
-+  CONTEXT *ctx;
- #ifdef USE_IMAP
-   /* update postponed count as well, on force */
-   if (force)
-@@ -296,6 +296,8 @@ int mutt_buffy_check (int force)
-   
-   for (tmp = Incoming; tmp; tmp = tmp->next)
-   {
-+    if ( tmp->new == 1 )
-+      tmp->has_new = 1;
- #ifdef USE_IMAP
-     if (tmp->magic != M_IMAP)
- #endif
-@@ -353,48 +355,112 @@ int mutt_buffy_check (int force)
-       case M_MBOX:
-       case M_MMDF:
- 
--      if (STAT_CHECK)
-+        {
-+        if (STAT_CHECK || tmp->msgcount == 0)
-       {
--        BuffyCount++;
--        tmp->new = 1;
-+        BUFFY b = *tmp;
-+        int msgcount = 0;
-+        int msg_unread = 0;
-+        /* parse the mailbox, to see how much mail there is */
-+        ctx = mx_open_mailbox( tmp->path, M_READONLY | M_QUIET | M_NOSORT | M_PEEK, NULL);
-+        if(ctx)
-+        {
-+            msgcount = ctx->msgcount;
-+          msg_unread = ctx->unread;
-+          mx_close_mailbox(ctx, 0);
-+        }
-+        *tmp = b;
-+        tmp->msgcount = msgcount;
-+        tmp->msg_unread = msg_unread;
-+        if(STAT_CHECK) {
-+          tmp->has_new = tmp->new = 1;
-+          BuffyCount++;
-+          }  
-       }
-       else if (option(OPTCHECKMBOXSIZE))
-       {
-         /* some other program has deleted mail from the folder */
-         tmp->size = (long) sb.st_size;
-       }
--      if (tmp->newly_created &&
--          (sb.st_ctime != sb.st_mtime || sb.st_ctime != sb.st_atime))
--        tmp->newly_created = 0;
--
--      break;
-+        if (tmp->newly_created &&
-+            (sb.st_ctime != sb.st_mtime || sb.st_ctime != sb.st_atime))
-+          tmp->newly_created = 0;
-+        }
-+        break;
- 
-       case M_MAILDIR:
- 
-+        /* count new message */
-       snprintf (path, sizeof (path), "%s/new", tmp->path);
-       if ((dirp = opendir (path)) == NULL)
-       {
-         tmp->magic = 0;
-         break;
-       }
-+      tmp->msgcount = 0;
-+      tmp->msg_unread = 0;
-+      tmp->msg_flagged = 0;
-       while ((de = readdir (dirp)) != NULL)
-       {
-         char *p;
-         if (*de->d_name != '.' && 
-             (!(p = strstr (de->d_name, ":2,")) || !strchr (p + 3, 'T')))
-         {
--          /* one new and undeleted message is enough */
--          BuffyCount++;
--          tmp->new = 1;
--          break;
-+          tmp->has_new = tmp->new = 1;
-+            tmp->msgcount++;
-+            tmp->msg_unread++;
-+        }
-+      }
-+        if(tmp->msg_unread)
-+          BuffyCount++;
-+ 
-+      closedir (dirp);
-+ 
-+        /*
-+         * count read messages (for folderlist (sidebar) we also need to count
-+         * messages in cur so that we the total number of messages
-+         */
-+      snprintf (path, sizeof (path), "%s/cur", tmp->path);
-+      if ((dirp = opendir (path)) == NULL)
-+      {
-+        tmp->magic = 0;
-+        break;
-+      }
-+      while ((de = readdir (dirp)) != NULL)
-+      {
-+        char *p;
-+        if (*de->d_name != '.' && 
-+            (!(p = strstr (de->d_name, ":2,")) || !strchr (p + 3, 'T')))
-+        {
-+             tmp->msgcount++;
-+             if (p && strchr(p + 3, 'F')) {
-+               tmp->msg_flagged++;
-+             }
-         }
-       }
-       closedir (dirp);
-       break;
- 
-       case M_MH:
--      if ((tmp->new = mh_buffy (tmp->path)) > 0)
--        BuffyCount++;
-+      {
-+      DIR *dp;
-+      struct dirent *de;
-+      if ((tmp->new = mh_buffy (tmp->path)) > 0)
-+        BuffyCount++;
-+    
-+      if ((dp = opendir (path)) == NULL)
-+        break;
-+      tmp->msgcount = 0;
-+      while ((de = readdir (dp)))
-+      {
-+        if (mh_valid_message (de->d_name))
-+        {
-+        tmp->msgcount++;
-+        tmp->has_new = tmp->new = 1;
-+        }
-+      }
-+      closedir (dp);
-+      }
-       break;
-       }
-     }
---- a/buffy.h
-+++ b/buffy.h
-@@ -25,7 +25,12 @@ typedef struct buffy_t
-   char *path;
-   long 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 */
---- a/color.c
-+++ b/color.c
-@@ -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 }
- };
- 
---- a/compose.c
-+++ b/compose.c
-@@ -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[] =
- {
-@@ -115,16 +115,16 @@ static void redraw_crypt_lines (HEADER *
-   if ((WithCrypto & APPLICATION_PGP) && (WithCrypto & APPLICATION_SMIME))
-   {     
-     if (!msg->security)
--      mvaddstr (HDR_CRYPT, 0,     "Security: ");
-+      mvaddstr (HDR_CRYPT, SidebarWidth,     "Security: ");
-     else if (msg->security & APPLICATION_SMIME)
--      mvaddstr (HDR_CRYPT, 0,     "  S/MIME: ");
-+      mvaddstr (HDR_CRYPT, SidebarWidth,     "  S/MIME: ");
-     else if (msg->security & APPLICATION_PGP)
--      mvaddstr (HDR_CRYPT, 0,     "     PGP: ");
-+      mvaddstr (HDR_CRYPT, SidebarWidth,     "     PGP: ");
-   }
-   else if ((WithCrypto & APPLICATION_SMIME))
--    mvaddstr (HDR_CRYPT, 0,     "  S/MIME: ");
-+    mvaddstr (HDR_CRYPT, SidebarWidth,     "  S/MIME: ");
-   else if ((WithCrypto & APPLICATION_PGP))
--    mvaddstr (HDR_CRYPT, 0,     "     PGP: ");
-+    mvaddstr (HDR_CRYPT, SidebarWidth,     "     PGP: ");
-   else
-     return;
- 
-@@ -148,7 +148,7 @@ static void redraw_crypt_lines (HEADER *
-     }
-   clrtoeol ();
- 
--  move (HDR_CRYPTINFO, 0);
-+  move (HDR_CRYPTINFO, SidebarWidth);
-   clrtoeol ();
-   if ((WithCrypto & APPLICATION_PGP)
-       && msg->security & APPLICATION_PGP  && msg->security & SIGN)
-@@ -164,7 +164,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;
-   }
-@@ -178,7 +178,7 @@ static void redraw_mix_line (LIST *chain
-   int c;
-   char *t;
- 
--  mvaddstr (HDR_MIX, 0,     "     Mix: ");
-+  mvaddstr (HDR_MIX, SidebarWidth,     "     Mix: ");
- 
-   if (!chain)
-   {
-@@ -193,7 +193,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));
-@@ -245,7 +245,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);
- }
- 
-@@ -255,10 +255,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)
-@@ -269,7 +269,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 ();
- 
-@@ -307,7 +307,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;
-@@ -553,7 +553,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);
-@@ -570,7 +570,7 @@ int mutt_compose_menu (HEADER *msg,   /*
-       {
-         strfcpy (fcc, buf, _POSIX_PATH_MAX);
-         mutt_pretty_mailbox (fcc);
--        move (HDR_FCC, HDR_XOFFSET);
-+        move (HDR_FCC, HDR_XOFFSET + SidebarWidth);
-         mutt_paddstr (W, fcc);
-         fccSet = 1;
-       }
---- a/curs_main.c
-+++ b/curs_main.c
-@@ -29,6 +29,7 @@
- #include "sort.h"
- #include "buffy.h"
- #include "mx.h"
-+#include "sidebar.h"
- 
- #ifdef USE_POP
- #include "pop.h"
-@@ -544,8 +545,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 ())
+*** mutt-1.5.19-orig/buffy.c   2008-08-29 18:39:48.000000000 -0500
+--- mutt-1.5.19-patched/buffy.c        2009-05-22 08:45:01.000000000 -0500
+***************
+*** 259,265 ****
+    char path[_POSIX_PATH_MAX];
+    struct stat contex_sb;
+    time_t t;
+! 
+  #ifdef USE_IMAP
+    /* update postponed count as well, on force */
+    if (force)
+--- 259,265 ----
+    char path[_POSIX_PATH_MAX];
+    struct stat contex_sb;
+    time_t t;
+!   CONTEXT *ctx;
+  #ifdef USE_IMAP
+    /* update postponed count as well, on force */
+    if (force)
+***************
+*** 294,299 ****
+--- 294,301 ----
+    
+    for (tmp = Incoming; tmp; tmp = tmp->next)
+    {
++     if ( tmp->new == 1 )
++       tmp->has_new = 1;
+  #ifdef USE_IMAP
+      if (tmp->magic != M_IMAP)
+  #endif
+***************
+*** 350,359 ****
+        case M_MBOX:
+        case M_MMDF:
+  
+!      if (STAT_CHECK)
+       {
+!        BuffyCount++;
+!        tmp->new = 1;
+       }
+       else if (option(OPTCHECKMBOXSIZE))
+       {
+--- 352,378 ----
+        case M_MBOX:
+        case M_MMDF:
+  
+!         {
+!      if (STAT_CHECK || tmp->msgcount == 0)
+       {
+!        BUFFY b = *tmp;
+!        int msgcount = 0;
+!        int msg_unread = 0;
+!        /* parse the mailbox, to see how much mail there is */
+!        ctx = mx_open_mailbox( tmp->path, M_READONLY | M_QUIET | M_NOSORT | M_PEEK, NULL);
+!        if(ctx)
+!        {
+!             msgcount = ctx->msgcount;
+!          msg_unread = ctx->unread;
+!          mx_close_mailbox(ctx, 0);
+!        }
+!        *tmp = b;
+!        tmp->msgcount = msgcount;
+!        tmp->msg_unread = msg_unread;
+!        if(STAT_CHECK) {
+!          tmp->has_new = tmp->new = 1;
+!          BuffyCount++;
+!           }  
+       }
+       else if (option(OPTCHECKMBOXSIZE))
+       {
+***************
+*** 363,397 ****
+       if (tmp->newly_created &&
+           (sb.st_ctime != sb.st_mtime || sb.st_ctime != sb.st_atime))
+         tmp->newly_created = 0;
+! 
+       break;
+  
+        case M_MAILDIR:
+  
+       snprintf (path, sizeof (path), "%s/new", tmp->path);
+       if ((dirp = opendir (path)) == NULL)
+       {
+         tmp->magic = 0;
+         break;
+       }
+       while ((de = readdir (dirp)) != NULL)
+       {
+         char *p;
+         if (*de->d_name != '.' && 
+             (!(p = strstr (de->d_name, ":2,")) || !strchr (p + 3, 'T')))
+         {
+!          /* one new and undeleted message is enough */
+!          BuffyCount++;
+!          tmp->new = 1;
+!          break;
+         }
+       }
+       closedir (dirp);
+       break;
+  
+        case M_MH:
+       if ((tmp->new = mh_buffy (tmp->path)) > 0)
+         BuffyCount++;
+       break;
+        }
+      }
+--- 382,467 ----
+       if (tmp->newly_created &&
+           (sb.st_ctime != sb.st_mtime || sb.st_ctime != sb.st_atime))
+         tmp->newly_created = 0;
+!         }
+       break;
+  
+        case M_MAILDIR:
+  
++         /* count new message */
+       snprintf (path, sizeof (path), "%s/new", tmp->path);
+       if ((dirp = opendir (path)) == NULL)
+       {
+         tmp->magic = 0;
+         break;
+       }
++      tmp->msgcount = 0;
++      tmp->msg_unread = 0;
++      tmp->msg_flagged = 0;
+       while ((de = readdir (dirp)) != NULL)
+       {
+         char *p;
+         if (*de->d_name != '.' && 
+             (!(p = strstr (de->d_name, ":2,")) || !strchr (p + 3, 'T')))
+         {
+!          tmp->has_new = tmp->new = 1;
+!             tmp->msgcount++;
+!             tmp->msg_unread++;
+!        }
+!      }
+!         if(tmp->msg_unread)
+!           BuffyCount++;
+!  
+!      closedir (dirp);
+!  
+!         /*
+!          * count read messages (for folderlist (sidebar) we also need to count
+!          * messages in cur so that we the total number of messages
+!          */
+!      snprintf (path, sizeof (path), "%s/cur", tmp->path);
+!      if ((dirp = opendir (path)) == NULL)
+!      {
+!        tmp->magic = 0;
+!        break;
+!      }
+!      while ((de = readdir (dirp)) != NULL)
+!      {
+!        char *p;
+!           if (*de->d_name != '.') {
+!                   if ((p = strstr (de->d_name, ":2,"))) {
+!                           if (!strchr (p + 3, 'T')) {
+!                                   tmp->msgcount++;
+!                                   if ( !strchr (p + 3, 'S'))
+!                                           tmp->msg_unread++;
+!                                   if (strchr(p + 3, 'F'))
+!                                           tmp->msg_flagged++;
+!                           }
+!                   } else
+!                           tmp->msgcount++;
+         }
+       }
+       closedir (dirp);
+       break;
+  
+        case M_MH:
++       {
++       DIR *dp;
++       struct dirent *de;
+       if ((tmp->new = mh_buffy (tmp->path)) > 0)
+         BuffyCount++;
++     
++       if ((dp = opendir (path)) == NULL)
++         break;
++       tmp->msgcount = 0;
++       while ((de = readdir (dp)))

 +       {
 +       {

-+         menu->redraw |= REDRAW_FULL;
-+         if (option (OPTBEEPNEW))
-+           beep ();
++         if (mh_valid_message (de->d_name))
++         {
++        tmp->msgcount++;
++        tmp->has_new = tmp->new = 1;
++         }
++       }
++       closedir (dp);

 +       }
 +       }

+       break;
+        }

       }
       }

-      else
-        do_buffy_notify = 1;
-@@ -557,6 +562,7 @@ int mutt_index_menu (void)
-     if (menu->redraw & REDRAW_FULL)
-     {
-       menu_redraw_full (menu);
-+      draw_sidebar(menu->menu);
-       mutt_show_error ();
-     }
- 
-@@ -579,10 +585,13 @@ int mutt_index_menu (void)
- 
-       if (menu->redraw & REDRAW_STATUS) 
+*** mutt-1.5.19-orig/buffy.h   2008-05-22 13:25:19.000000000 -0500
+--- mutt-1.5.19-patched/buffy.h        2009-05-21 23:08:38.000000000 -0500
+***************
+*** 25,31 ****
+--- 25,36 ----
+    char *path;
+    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 */
+*** mutt-1.5.19-orig/color.c   2008-03-19 15:07:57.000000000 -0500
+--- mutt-1.5.19-patched/color.c        2009-05-21 23:08:38.000000000 -0500
+***************
+*** 93,98 ****
+--- 93,100 ----
+    { "bold",          MT_COLOR_BOLD },
+    { "underline",     MT_COLOR_UNDERLINE },
+    { "index",         MT_COLOR_INDEX },
++   { "sidebar_new",   MT_COLOR_NEW },
++   { "sidebar_flagged",       MT_COLOR_FLAGGED },
+    { NULL,            0 }
+  };
+  
+*** mutt-1.5.19-orig/compose.c 2009-01-05 13:20:53.000000000 -0600
+--- mutt-1.5.19-patched/compose.c      2009-05-21 23:08:38.000000000 -0500
+***************
+*** 72,78 ****
+  
+  #define HDR_XOFFSET 10
+  #define TITLE_FMT "%10s" /* Used for Prompts, which are ASCII */
+! #define W (COLS - HDR_XOFFSET)
+  
+  static char *Prompts[] =
+  {
+--- 72,78 ----
+  
+  #define HDR_XOFFSET 10
+  #define TITLE_FMT "%10s" /* Used for Prompts, which are ASCII */
+! #define W (COLS - HDR_XOFFSET - SidebarWidth)
+  
+  static char *Prompts[] =
+  {
+***************
+*** 115,130 ****
+    if ((WithCrypto & APPLICATION_PGP) && (WithCrypto & APPLICATION_SMIME))
+    {     
+      if (!msg->security)
+!       mvaddstr (HDR_CRYPT, 0,     "Security: ");
+      else if (msg->security & APPLICATION_SMIME)
+!       mvaddstr (HDR_CRYPT, 0,     "  S/MIME: ");
+      else if (msg->security & APPLICATION_PGP)
+!       mvaddstr (HDR_CRYPT, 0,     "     PGP: ");
+    }
+    else if ((WithCrypto & APPLICATION_SMIME))
+!     mvaddstr (HDR_CRYPT, 0,     "  S/MIME: ");
+    else if ((WithCrypto & APPLICATION_PGP))
+!     mvaddstr (HDR_CRYPT, 0,     "     PGP: ");
+    else
+      return;
+  
+--- 115,130 ----
+    if ((WithCrypto & APPLICATION_PGP) && (WithCrypto & APPLICATION_SMIME))
+    {     
+      if (!msg->security)
+!       mvaddstr (HDR_CRYPT, SidebarWidth,     "Security: ");
+      else if (msg->security & APPLICATION_SMIME)
+!       mvaddstr (HDR_CRYPT, SidebarWidth,     "  S/MIME: ");
+      else if (msg->security & APPLICATION_PGP)
+!       mvaddstr (HDR_CRYPT, SidebarWidth,     "     PGP: ");
+    }
+    else if ((WithCrypto & APPLICATION_SMIME))
+!     mvaddstr (HDR_CRYPT, SidebarWidth,     "  S/MIME: ");
+    else if ((WithCrypto & APPLICATION_PGP))
+!     mvaddstr (HDR_CRYPT, SidebarWidth,     "     PGP: ");
+    else
+      return;
+  
+***************
+*** 148,154 ****
+      }
+    clrtoeol ();
+  
+!   move (HDR_CRYPTINFO, 0);
+    clrtoeol ();
+    if ((WithCrypto & APPLICATION_PGP)
+        && msg->security & APPLICATION_PGP  && msg->security & SIGN)
+--- 148,154 ----
+      }
+    clrtoeol ();
+  
+!   move (HDR_CRYPTINFO, SidebarWidth);
+    clrtoeol ();
+    if ((WithCrypto & APPLICATION_PGP)
+        && msg->security & APPLICATION_PGP  && msg->security & SIGN)
+***************
+*** 164,170 ****
+        && (msg->security & ENCRYPT)
+        && SmimeCryptAlg
+        && *SmimeCryptAlg) {
+!       mvprintw (HDR_CRYPTINFO, 40, "%s%s", _("Encrypt with: "),
+               NONULL(SmimeCryptAlg));
+        off = 20;
+    }
+--- 164,170 ----
+        && (msg->security & ENCRYPT)
+        && SmimeCryptAlg
+        && *SmimeCryptAlg) {
+!       mvprintw (HDR_CRYPTINFO, SidebarWidth + 40, "%s%s", _("Encrypt with: "),
+               NONULL(SmimeCryptAlg));
+        off = 20;
+    }
+***************
+*** 178,184 ****
+    int c;
+    char *t;
+  
+!   mvaddstr (HDR_MIX, 0,     "     Mix: ");
+  
+    if (!chain)
+    {
+--- 178,184 ----
+    int c;
+    char *t;
+  
+!   mvaddstr (HDR_MIX, SidebarWidth,     "     Mix: ");
+  
+    if (!chain)
+    {
+***************
+*** 193,199 ****
+      if (t && t[0] == '0' && t[1] == '\0')
+        t = "<random>";
+      
+!     if (c + mutt_strlen (t) + 2 >= COLS)
+        break;
+  
+      addstr (NONULL(t));
+--- 193,199 ----
+      if (t && t[0] == '0' && t[1] == '\0')
+        t = "<random>";
+      
+!     if (c + mutt_strlen (t) + 2 >= COLS - SidebarWidth)
+        break;
+  
+      addstr (NONULL(t));
+***************
+*** 245,251 ****
+  
+    buf[0] = 0;
+    rfc822_write_address (buf, sizeof (buf), addr, 1);
+!   mvprintw (line, 0, TITLE_FMT, Prompts[line - 1]);
+    mutt_paddstr (W, buf);
+  }
+  
+--- 245,251 ----
+  
+    buf[0] = 0;
+    rfc822_write_address (buf, sizeof (buf), addr, 1);
+!   mvprintw (line, SidebarWidth, TITLE_FMT, Prompts[line - 1]);
+    mutt_paddstr (W, buf);
+  }
+  
+***************
+*** 255,264 ****
+    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]);
+    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]);
+    mutt_paddstr (W, fcc);
+  
+    if (WithCrypto)
+--- 255,264 ----
+    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, 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, SidebarWidth, TITLE_FMT, Prompts[HDR_FCC - 1]);
+    mutt_paddstr (W, fcc);
+  
+    if (WithCrypto)
+***************
+*** 269,275 ****
+  #endif
+  
+    SETCOLOR (MT_COLOR_STATUS);
+!   mvaddstr (HDR_ATTACH - 1, 0, _("-- Attachments"));
+    BKGDSET (MT_COLOR_STATUS);
+    clrtoeol ();
+  
+--- 269,275 ----
+  #endif
+  
+    SETCOLOR (MT_COLOR_STATUS);
+!   mvaddstr (HDR_ATTACH - 1, SidebarWidth, _("-- Attachments"));
+    BKGDSET (MT_COLOR_STATUS);
+    clrtoeol ();
+  
+***************
+*** 307,313 ****
+    /* 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);
+    mutt_paddstr (W, buf);
+    
+    return 0;
+--- 307,313 ----
+    /* 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+SidebarWidth);
+    mutt_paddstr (W, buf);
+    
+    return 0;
+***************
+*** 552,558 ****
+       if (mutt_get_field ("Subject: ", buf, sizeof (buf), 0) == 0)
+       {
+         mutt_str_replace (&msg->env->subject, buf);
+!        move (HDR_SUBJECT, HDR_XOFFSET);
+         clrtoeol ();
+         if (msg->env->subject)
+           mutt_paddstr (W, msg->env->subject);
+--- 552,558 ----
+       if (mutt_get_field ("Subject: ", buf, sizeof (buf), 0) == 0)
+       {
+         mutt_str_replace (&msg->env->subject, buf);
+!        move (HDR_SUBJECT, HDR_XOFFSET + SidebarWidth);
+         clrtoeol ();
+         if (msg->env->subject)
+           mutt_paddstr (W, msg->env->subject);
+***************
+*** 569,575 ****
+       {
+         strfcpy (fcc, buf, fcclen);
+         mutt_pretty_mailbox (fcc, fcclen);
+!        move (HDR_FCC, HDR_XOFFSET);
+         mutt_paddstr (W, fcc);
+         fccSet = 1;
+       }
+--- 569,575 ----
+       {
+         strfcpy (fcc, buf, fcclen);
+         mutt_pretty_mailbox (fcc, fcclen);
+!        move (HDR_FCC, HDR_XOFFSET + SidebarWidth);
+         mutt_paddstr (W, fcc);
+         fccSet = 1;
+       }
+*** mutt-1.5.19-orig/curs_main.c       2009-01-05 13:20:53.000000000 -0600
+--- mutt-1.5.19-patched/curs_main.c    2009-05-21 23:08:38.000000000 -0500
+***************
+*** 26,32 ****
+--- 26,34 ----
+  #include "mailbox.h"
+  #include "mapping.h"
+  #include "sort.h"
++ #include "buffy.h"
+  #include "mx.h"
++ #include "sidebar.h"
+  
+  #ifdef USE_POP
+  #include "pop.h"
+***************
+*** 523,530 ****
+         menu->redraw |= REDRAW_STATUS;
+       if (do_buffy_notify)

        {
        {

-+        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);
-@@ -603,7 +612,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);
+!        if (mutt_buffy_notify () && option (OPTBEEPNEW))
+!      beep ();
+       }

        else
        else

-@@ -1072,6 +1081,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:
-       
-@@ -1103,7 +1113,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)
-           {
-@@ -1121,6 +1135,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);
-@@ -2213,6 +2228,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);
---- a/flags.c
-+++ b/flags.c
-@@ -22,8 +22,10 @@
- 
- #include "mutt.h"
- #include "mutt_curses.h"
-+#include "mutt_menu.h"
- #include "sort.h"
- #include "mx.h"
-+#include "sidebar.h"
- 
- #ifdef USE_IMAP
- #include "imap_private.h"
-@@ -294,6 +296,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)
---- a/functions.h
-+++ b/functions.h
-@@ -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 }
- };
- 
-@@ -267,6 +272,11 @@ struct binding_t OpPager[] = { /* map: p
-   { "decrypt-save",           OP_DECRYPT_SAVE,                NULL },
- 
- 
+         do_buffy_notify = 1;
+--- 525,536 ----
+         menu->redraw |= REDRAW_STATUS;
+       if (do_buffy_notify)
+       {
+!        if (mutt_buffy_notify ())
+!        {
+!          menu->redraw |= REDRAW_FULL;
+!          if (option (OPTBEEPNEW))
+!            beep ();
+!        }
+       }
+       else
+         do_buffy_notify = 1;
+***************
+*** 536,541 ****
+--- 542,548 ----
+      if (menu->redraw & REDRAW_FULL)
+      {
+        menu_redraw_full (menu);
++       draw_sidebar(menu->menu);
+        mutt_show_error ();
+      }
+  
+***************
+*** 558,567 ****
+--- 565,577 ----
+  
+        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);
+***************
+*** 575,581 ****
+       menu->oldcurrent = -1;
+  
+        if (option (OPTARROWCURSOR))
+!      move (menu->current - menu->top + menu->offset, 2);
+        else if (option (OPTBRAILLEFRIENDLY))
+       move (menu->current - menu->top + menu->offset, 0);
+        else
+--- 585,591 ----
+       menu->oldcurrent = -1;
+  
+        if (option (OPTARROWCURSOR))
+!      move (menu->current - menu->top + menu->offset, SidebarWidth + 2);
+        else if (option (OPTBRAILLEFRIENDLY))
+       move (menu->current - menu->top + menu->offset, 0);
+        else
+***************
+*** 1048,1053 ****
+--- 1058,1064 ----
+         menu->redraw = REDRAW_FULL;
+       break;
+  
++       case OP_SIDEBAR_OPEN:
+        case OP_MAIN_CHANGE_FOLDER:
+        case OP_MAIN_NEXT_UNREAD_MAILBOX:
+        
+***************
+*** 1079,1085 ****
+       {
+         mutt_buffy (buf, sizeof (buf));
+  
+!        if (mutt_enter_fname (cp, buf, sizeof (buf), &menu->redraw, 1) == -1)
+         {
+           if (menu->menu == MENU_PAGER)
+           {
+--- 1090,1100 ----
+       {
+         mutt_buffy (buf, sizeof (buf));
+  
+!           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)
+           {
+***************
+*** 1097,1102 ****
+--- 1112,1118 ----
+       }
+  
+       mutt_expand_path (buf, sizeof (buf));
++         set_curbuffy(buf);
+       if (mx_get_magic (buf) <= 0)
+       {
+         mutt_error (_("%s is not a mailbox."), buf);
+***************
+*** 2176,2181 ****
+--- 2192,2203 ----
+       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);
+*** mutt-1.5.19-orig/flags.c   2009-01-03 17:27:10.000000000 -0600
+--- mutt-1.5.19-patched/flags.c        2009-05-21 23:08:38.000000000 -0500
+***************
+*** 22,29 ****
+--- 22,31 ----
+  
+  #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,268 ****
+--- 265,271 ----
+     */
+    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)
+*** mutt-1.5.19-orig/functions.h       2009-01-05 13:20:53.000000000 -0600
+--- mutt-1.5.19-patched/functions.h    2009-05-21 23:08:38.000000000 -0500
+***************
+*** 168,173 ****
+--- 168,178 ----
+    { "decrypt-save",          OP_DECRYPT_SAVE,                NULL },
+  
+  

 +  { "sidebar-scroll-up",      OP_SIDEBAR_SCROLL_UP, NULL },
 +  { "sidebar-scroll-down",    OP_SIDEBAR_SCROLL_DOWN, 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 }
- };
- 
---- a/globals.h
-+++ b/globals.h
-@@ -116,6 +116,7 @@ WHERE char *Realname;
- WHERE char *SendCharset;
- WHERE char *Sendmail;
- WHERE char *Shell;
-+WHERE char *SidebarDelim;
- WHERE char *Signature;
- WHERE char *SimpleSearch;
- #if USE_SMTP
-@@ -212,6 +213,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;
- #endif
---- a/init.h
-+++ b/init.h
-@@ -1532,6 +1532,22 @@ struct option_t MuttVars[] = {
-   ** you may unset this setting.
-   ** (Crypto only)
++  { "sidebar-next",           OP_SIDEBAR_NEXT, NULL },
++  { "sidebar-prev",           OP_SIDEBAR_PREV, NULL },
++  { "sidebar-open",           OP_SIDEBAR_OPEN, NULL },
+    { NULL,                    0,                              NULL }
+  };
+  
+***************
+*** 266,271 ****
+--- 271,281 ----
+  
+    { "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 }
+  };
+  
+*** mutt-1.5.19-orig/globals.h 2009-01-03 17:27:10.000000000 -0600
+--- mutt-1.5.19-patched/globals.h      2009-05-21 23:08:38.000000000 -0500
+***************
+*** 116,121 ****
+--- 116,122 ----
+  WHERE char *SendCharset;
+  WHERE char *Sendmail;
+  WHERE char *Shell;
++ WHERE char *SidebarDelim;
+  WHERE char *Signature;
+  WHERE char *SimpleSearch;
+  #if USE_SMTP
+***************
+*** 205,210 ****
+--- 206,214 ----
+  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;
+*** mutt-1.5.19-orig/init.h    2009-01-05 13:20:53.000000000 -0600
+--- mutt-1.5.19-patched/init.h 2009-05-21 23:08:38.000000000 -0500
+***************
+*** 1572,1577 ****
+--- 1572,1593 ----
+    ** you may \fIunset\fP this setting.
+    ** (Crypto 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_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
+*** mutt-1.5.19-orig/mailbox.h 2008-03-19 15:07:06.000000000 -0500
+--- mutt-1.5.19-patched/mailbox.h      2009-05-21 23:08:38.000000000 -0500
+***************
+*** 27,32 ****
+--- 27,33 ----
+  #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 */
+*** mutt-1.5.19-orig/Makefile.am       2009-01-05 13:20:53.000000000 -0600
+--- mutt-1.5.19-patched/Makefile.am    2009-05-21 23:08:38.000000000 -0500
+***************
+*** 29,35 ****
+       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
+  
+  nodist_mutt_SOURCES = $(BUILT_SOURCES)
+  
+--- 29,36 ----
+       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 \
+!         sidebar.c
+  
+  nodist_mutt_SOURCES = $(BUILT_SOURCES)
+  
+*** mutt-1.5.19-orig/Makefile.in       2009-01-05 13:24:13.000000000 -0600
+--- mutt-1.5.19-patched/Makefile.in    2009-05-21 23:08:38.000000000 -0500
+***************
+*** 83,89 ****
+       system.$(OBJEXT) thread.$(OBJEXT) charset.$(OBJEXT) \
+       history.$(OBJEXT) lib.$(OBJEXT) muttlib.$(OBJEXT) \
+       editmsg.$(OBJEXT) mbyte.$(OBJEXT) url.$(OBJEXT) \
+!      ascii.$(OBJEXT) crypt-mod.$(OBJEXT)
+  am__objects_1 = patchlist.$(OBJEXT)
+  nodist_mutt_OBJECTS = $(am__objects_1)
+  mutt_OBJECTS = $(am_mutt_OBJECTS) $(nodist_mutt_OBJECTS)
+--- 83,90 ----
+       system.$(OBJEXT) thread.$(OBJEXT) charset.$(OBJEXT) \
+       history.$(OBJEXT) lib.$(OBJEXT) muttlib.$(OBJEXT) \
+       editmsg.$(OBJEXT) mbyte.$(OBJEXT) url.$(OBJEXT) \
+!      ascii.$(OBJEXT) crypt-mod.$(OBJEXT) \
+!      sidebar.$(OBJEXT)
+  am__objects_1 = patchlist.$(OBJEXT)
+  nodist_mutt_OBJECTS = $(am__objects_1)
+  mutt_OBJECTS = $(am_mutt_OBJECTS) $(nodist_mutt_OBJECTS)
+***************
+*** 307,313 ****
+       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
+  
+  nodist_mutt_SOURCES = $(BUILT_SOURCES)
+  mutt_LDADD = @MUTT_LIB_OBJECTS@ @LIBOBJS@ $(LIBIMAP) $(MUTTLIBS) \
+--- 308,315 ----
+       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 \
+!      sidebar.c
+  
+  nodist_mutt_SOURCES = $(BUILT_SOURCES)
+  mutt_LDADD = @MUTT_LIB_OBJECTS@ @LIBOBJS@ $(LIBIMAP) $(MUTTLIBS) \
+***************
+*** 339,345 ****
+       README.SSL smime.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
+  
+  EXTRA_SCRIPTS = smime_keys
+  mutt_dotlock_SOURCES = mutt_dotlock.c
+--- 341,347 ----
+       README.SSL smime.h \
+       muttbug pgppacket.h depcomp ascii.h BEWARE PATCHES patchlist.sh \
+       ChangeLog mkchangelog.sh mutt_idna.h \
+!      snprintf.c regex.c crypt-gpgme.h sidebar.h hcachever.sh.in
+  
+  EXTRA_SCRIPTS = smime_keys
+  mutt_dotlock_SOURCES = mutt_dotlock.c
+*** mutt-1.5.19-orig/mbox.c    2008-08-15 13:30:12.000000000 -0500
+--- mutt-1.5.19-patched/mbox.c 2009-05-21 23:08:38.000000000 -0500
+***************
+*** 100,105 ****
+--- 100,106 ----
+      mutt_perror (ctx->path);
+      return (-1);
+    }
++   ctx->atime = sb.st_atime;
+    ctx->mtime = sb.st_mtime;
+    ctx->size = sb.st_size;
+  
+***************
+*** 255,260 ****
+--- 256,262 ----
+  
+    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)
+*** mutt-1.5.19-orig/menu.c    2009-01-05 13:20:53.000000000 -0600
+--- mutt-1.5.19-patched/menu.c 2009-05-21 23:08:38.000000000 -0500
+***************
+*** 24,29 ****
+--- 24,30 ----
+  #include "mutt_curses.h"
+  #include "mutt_menu.h"
+  #include "mbyte.h"
++ #include "sidebar.h"
+  
+  #include <string.h>
+  #include <stdlib.h>
+***************
+*** 156,162 ****
+  {
+    char *scratch = safe_strdup (s);
+    int shift = option (OPTARROWCURSOR) ? 3 : 0;
+!   int cols = COLS - shift;
+  
+    mutt_format_string (s, n, cols, cols, FMT_LEFT, ' ', scratch, mutt_strlen (scratch), 1);
+    s[n - 1] = 0;
+--- 157,163 ----
+  {
+    char *scratch = safe_strdup (s);
+    int shift = option (OPTARROWCURSOR) ? 3 : 0;
+!   int cols = COLS - shift - SidebarWidth;
+  
+    mutt_format_string (s, n, cols, cols, FMT_LEFT, ' ', scratch, mutt_strlen (scratch), 1);
+    s[n - 1] = 0;
+***************
+*** 207,212 ****
+--- 208,214 ----
+    char buf[LONG_STRING];
+    int i;
+  
++   draw_sidebar(1);
+    for (i = menu->top; i < menu->top + menu->pagelen; i++)
+    {
+      if (i < menu->max)
+***************
+*** 217,223 ****
+        if (option (OPTARROWCURSOR))
+        {
+          attrset (menu->color (i));
+!      CLEARLINE (i - menu->top + menu->offset);
+  
+       if (i == menu->current)
+       {
+--- 219,225 ----
+        if (option (OPTARROWCURSOR))
+        {
+          attrset (menu->color (i));
+!      CLEARLINE_WIN (i - menu->top + menu->offset);
+  
+       if (i == menu->current)
+       {
+***************
+*** 246,259 ****
+         BKGDSET (MT_COLOR_INDICATOR);
+       }
+  
+!      CLEARLINE (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);
+    }
+    menu->redraw = 0;
+  }
+--- 248,261 ----
+         BKGDSET (MT_COLOR_INDICATOR);
+       }
+  
+!      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_WIN (i - menu->top + menu->offset);
+    }
+    menu->redraw = 0;
+  }
+***************
+*** 268,274 ****
+      return;
+    }
+    
+!   move (menu->oldcurrent + menu->offset - menu->top, 0);
+    SETCOLOR (MT_COLOR_NORMAL);
+    BKGDSET (MT_COLOR_NORMAL);
+  
+--- 270,276 ----
+      return;
+    }
+    
+!   move (menu->oldcurrent + menu->offset - menu->top, SidebarWidth);
+    SETCOLOR (MT_COLOR_NORMAL);
+    BKGDSET (MT_COLOR_NORMAL);
+  
+***************
+*** 283,295 ****
+        clrtoeol ();
+        menu_make_entry (buf, sizeof (buf), menu, menu->oldcurrent);
+        menu_pad_string (buf, sizeof (buf));
+!       move (menu->oldcurrent + menu->offset - menu->top, 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);
+      attrset (menu->color (menu->current));
+      ADDCOLOR (MT_COLOR_INDICATOR);
+      addstr ("->");
+--- 285,297 ----
+        clrtoeol ();
+        menu_make_entry (buf, sizeof (buf), menu, menu->oldcurrent);
+        menu_pad_string (buf, sizeof (buf));
+!       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, SidebarWidth);
+      attrset (menu->color (menu->current));
+      ADDCOLOR (MT_COLOR_INDICATOR);
+      addstr ("->");
+***************
+*** 310,316 ****
+      attrset (menu->color (menu->current));
+      ADDCOLOR (MT_COLOR_INDICATOR);
+      BKGDSET (MT_COLOR_INDICATOR);
+!     CLEARLINE (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);
+--- 312,318 ----
+      attrset (menu->color (menu->current));
+      ADDCOLOR (MT_COLOR_INDICATOR);
+      BKGDSET (MT_COLOR_INDICATOR);
+!     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,328 ****
+  {
+    char buf[LONG_STRING];
+    
+!   move (menu->current + menu->offset - menu->top, 0);
+    menu_make_entry (buf, sizeof (buf), menu, menu->current);
+    menu_pad_string (buf, sizeof (buf));
+  
+--- 324,330 ----
+  {
+    char buf[LONG_STRING];
+    
+!   move (menu->current + menu->offset - menu->top, SidebarWidth);
+    menu_make_entry (buf, sizeof (buf), menu, menu->current);
+    menu_pad_string (buf, sizeof (buf));
+  
+***************
+*** 882,888 ****
+      
+      
+      if (option (OPTARROWCURSOR))
+!       move (menu->current - menu->top + menu->offset, 2);
+      else if (option (OPTBRAILLEFRIENDLY))
+        move (menu->current - menu->top + menu->offset, 0);
+      else
+--- 884,890 ----
+      
+      
+      if (option (OPTARROWCURSOR))
+!       move (menu->current - menu->top + menu->offset, SidebarWidth + 2);
+      else if (option (OPTBRAILLEFRIENDLY))
+        move (menu->current - menu->top + menu->offset, 0);
+      else
+*** mutt-1.5.19-orig/mutt_curses.h     2008-03-19 15:07:57.000000000 -0500
+--- mutt-1.5.19-patched/mutt_curses.h  2009-05-21 23:08:38.000000000 -0500
+***************
+*** 64,69 ****
+--- 64,70 ----
+  #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,131 ****
+--- 127,134 ----
+    MT_COLOR_BOLD,
+    MT_COLOR_UNDERLINE,
+    MT_COLOR_INDEX,
++   MT_COLOR_NEW,
++   MT_COLOR_FLAGGED,
+    MT_COLOR_MAX
+  };
+  
+*** mutt-1.5.19-orig/mutt.h    2008-09-25 17:00:03.000000000 -0500
+--- mutt-1.5.19-patched/mutt.h 2009-05-21 23:08:38.000000000 -0500
+***************
+*** 409,414 ****
+--- 409,415 ----
+    OPTSAVEEMPTY,
+    OPTSAVENAME,
+    OPTSCORE,
++   OPTSIDEBAR,
+    OPTSIGDASHES,
+    OPTSIGONTOP,
+    OPTSORTRE,
+***************
+*** 843,848 ****
+--- 844,850 ----
+  {
+    char *path;
+    FILE *fp;
++   time_t atime;
+    time_t mtime;
+    off_t size;
+    off_t vsize;
+***************
+*** 877,882 ****
+--- 879,885 ----
+    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 */
+*** mutt-1.5.19-orig/muttlib.c 2009-01-05 13:20:53.000000000 -0600
+--- mutt-1.5.19-patched/muttlib.c      2009-05-21 23:08:38.000000000 -0500
+***************
+*** 1217,1222 ****
+--- 1217,1224 ----
+         pl = pw = 1;
+  
+       /* see if there's room to add content, else ignore */
++         if ( DrawFullLine )
++         {
+       if ((col < COLS && wlen < destlen) || soft)
+       {
+         int pad;
+***************
+*** 1259,1264 ****
+--- 1261,1312 ----
+         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 == '|')
+*** mutt-1.5.19-orig/mx.c      2009-01-05 13:20:53.000000000 -0600
+--- mutt-1.5.19-patched/mx.c   2009-05-21 23:08:38.000000000 -0500
+***************
+*** 611,616 ****
+--- 611,617 ----
+   *           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

    */
    */

-+  {"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_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
---- a/mailbox.h
-+++ b/mailbox.h
-@@ -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 */
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -29,7 +29,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 mutt_idna.c crypt-mod.c crypt-mod.h
-+      url.c ascii.c mutt_idna.c crypt-mod.c crypt-mod.h \
-+        sidebar.c
- 
- nodist_mutt_SOURCES = $(BUILT_SOURCES)
- 
---- a/mbox.c
-+++ b/mbox.c
-@@ -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;
- 
-@@ -259,6 +260,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)
---- a/menu.c
-+++ b/menu.c
-@@ -24,6 +24,7 @@
- #include "mutt_curses.h"
- #include "mutt_menu.h"
- #include "mbyte.h"
-+#include "sidebar.h"
- 
- #ifdef USE_IMAP
- #include "imap.h"
-@@ -158,7 +159,7 @@ void menu_pad_string (char *s, size_t n)
- {
-   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;
-@@ -209,6 +210,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)
-@@ -219,7 +221,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)
-       {
-@@ -248,14 +250,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;
- }
-@@ -270,7 +272,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);
- 
-@@ -285,13 +287,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 ("->");
-@@ -312,7 +314,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);
-@@ -324,7 +326,7 @@ void menu_redraw_current (MUTTMENU *menu
- {
-   char buf[LONG_STRING];
+  CONTEXT *mx_open_mailbox (const char *path, int flags, CONTEXT *pctx)
+***************
+*** 633,638 ****
+--- 634,641 ----
+      ctx->quiet = 1;
+    if (flags & M_READONLY)
+      ctx->readonly = 1;
++   if (flags & M_PEEK)
++     ctx->peekonly = 1;
+  
+    if (flags & (M_APPEND|M_NEWFOLDER))
+    {
+***************
+*** 732,740 ****
+--- 735,755 ----
+  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
+  
+    if (ctx->mx_close)
+      ctx->mx_close (ctx);
+*** mutt-1.5.19-orig/OPS       2008-03-19 15:07:57.000000000 -0500
+--- mutt-1.5.19-patched/OPS    2009-05-21 23:08:38.000000000 -0500
+***************
+*** 178,180 ****
+--- 178,185 ----
+  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"
+*** mutt-1.5.19-orig/pager.c   2009-01-05 13:20:53.000000000 -0600
+--- mutt-1.5.19-patched/pager.c        2009-05-21 23:08:38.000000000 -0500
+***************
+*** 29,34 ****
+--- 29,35 ----
+  #include "pager.h"
+  #include "attach.h"
+  #include "mbyte.h"
++ #include "sidebar.h"
+  
+  #include "mutt_crypt.h"
+  
+***************
+*** 1060,1065 ****
+--- 1061,1068 ----
+    mbstate_t mbstate;
+  
+    int wrap_cols = mutt_term_width ((flags & M_PAGER_NOWRAP) ? 0 : Wrap);
++ 
++   wrap_cols -= SidebarWidth;
+    
+    /* FIXME: this should come from lineInfo */
+    memset(&mbstate, 0, sizeof(mbstate));
+***************
+*** 1694,1700 ****
+      if ((redraw & REDRAW_BODY) || topline != oldtopline)
+      {
+        do {
+!      move (bodyoffset, 0);
+       curline = oldtopline = topline;
+       lines = 0;
+       force_redraw = 0;
+--- 1697,1703 ----
+      if ((redraw & REDRAW_BODY) || topline != oldtopline)
+      {
+        do {
+!      move (bodyoffset, SidebarWidth);
+       curline = oldtopline = topline;
+       lines = 0;
+       force_redraw = 0;
+***************
+*** 1707,1712 ****
+--- 1710,1716 ----
+                           &QuoteList, &q_level, &force_redraw, &SearchRE) > 0)
+           lines++;
+         curline++;
++        move(lines + bodyoffset, SidebarWidth);
+       }
+       last_offset = lineInfo[curline].offset;
+        } while (force_redraw);
+***************
+*** 1720,1725 ****
+--- 1724,1730 ----
+         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. */
+***************
+*** 1743,1764 ****
+        /* print out the pager status bar */
+        SETCOLOR (MT_COLOR_STATUS);
+        BKGDSET (MT_COLOR_STATUS);
+!       CLEARLINE (statusoffset);
+        if (IsHeader (extra))
+        {
+!      size_t l1 = COLS * MB_LEN_MAX;
+       size_t l2 = sizeof (buffer);
+       hfi.hdr = extra->hdr;
+       mutt_make_string_info (buffer, l1 < l2 ? l1 : l2, NONULL (PagerFmt), &hfi, M_FORMAT_MAKEPRINT);
+        }
+        else if (IsMsgAttach (extra))
+        {
+!      size_t l1 = COLS * MB_LEN_MAX;
+       size_t l2 = sizeof (buffer);
+       hfi.hdr = extra->bdy->hdr;
+       mutt_make_string_info (buffer, l1 < l2 ? l1 : l2, NONULL (PagerFmt), &hfi, M_FORMAT_MAKEPRINT);
+        }
+!       mutt_paddstr (COLS, IsHeader (extra) || IsMsgAttach (extra) ?  buffer : banner);
+        BKGDSET (MT_COLOR_NORMAL);
+        SETCOLOR (MT_COLOR_NORMAL);
+      }
+--- 1748,1769 ----
+        /* print out the pager status bar */
+        SETCOLOR (MT_COLOR_STATUS);
+        BKGDSET (MT_COLOR_STATUS);
+!       CLEARLINE_WIN (statusoffset);
+        if (IsHeader (extra))
+        {
+!      size_t l1 = (COLS-SidebarWidth) * MB_LEN_MAX;
+       size_t l2 = sizeof (buffer);
+       hfi.hdr = extra->hdr;
+       mutt_make_string_info (buffer, l1 < l2 ? l1 : l2, NONULL (PagerFmt), &hfi, M_FORMAT_MAKEPRINT);
+        }
+        else if (IsMsgAttach (extra))
+        {
+!      size_t l1 = (COLS-SidebarWidth) * MB_LEN_MAX;
+       size_t l2 = sizeof (buffer);
+       hfi.hdr = extra->bdy->hdr;
+       mutt_make_string_info (buffer, l1 < l2 ? l1 : l2, NONULL (PagerFmt), &hfi, M_FORMAT_MAKEPRINT);
+        }
+!       mutt_paddstr (COLS-SidebarWidth, IsHeader (extra) || IsMsgAttach (extra) ?  buffer : banner);
+        BKGDSET (MT_COLOR_NORMAL);
+        SETCOLOR (MT_COLOR_NORMAL);
+      }
+***************
+*** 1768,1785 ****
+        /* redraw the pager_index indicator, because the
+         * flags for this message might have changed. */
+        menu_redraw_current (index);
+  
+        /* print out the index status bar */
+        menu_status_line (buffer, sizeof (buffer), index, NONULL(Status));

    
    

--  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));
- 
-@@ -871,7 +873,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
---- a/mutt_curses.h
-+++ b/mutt_curses.h
-@@ -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
- };
- 
---- a/mutt.h
-+++ b/mutt.h
-@@ -437,6 +437,7 @@ enum
-   OPTSAVEEMPTY,
-   OPTSAVENAME,
-   OPTSCORE,
-+  OPTSIDEBAR,
-   OPTSIGDASHES,
-   OPTSIGONTOP,
-   OPTSORTRE,
-@@ -874,6 +875,7 @@ typedef struct _context
- {
-   char *path;
-   FILE *fp;
-+  time_t atime;
-   time_t mtime;
-   off_t size;
-   off_t vsize;
-@@ -914,6 +916,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 */
---- a/muttlib.c
-+++ b/muttlib.c
-@@ -1205,6 +1205,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;
-@@ -1247,6 +1249,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 == '|')
---- a/mx.c
-+++ b/mx.c
-@@ -626,6 +626,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)
-@@ -648,6 +649,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))
-   {
-@@ -752,9 +755,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
- 
-   if (ctx->mx_close)
-     ctx->mx_close (ctx);
---- a/OPS
-+++ b/OPS
-@@ -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"
---- a/pager.c
-+++ b/pager.c
-@@ -30,6 +30,7 @@
- #include "pager.h"
- #include "attach.h"
- #include "mbyte.h"
-+#include "sidebar.h"
- 
- #include "mx.h"
- 
-@@ -1067,6 +1068,8 @@ static int format_line (struct line_t **
-   mbstate_t mbstate;
- 
-   int wrap_cols = mutt_term_width ((flags & M_PAGER_NOWRAP) ? 0 : Wrap);
-+
-+  wrap_cols -= SidebarWidth;
+!       move (indexoffset + (option (OPTSTATUSONTOP) ? 0 : (indexlen - 1)), 0);
+        SETCOLOR (MT_COLOR_STATUS);
+        BKGDSET (MT_COLOR_STATUS);
+!       mutt_paddstr (COLS, buffer);
+        SETCOLOR (MT_COLOR_NORMAL);
+        BKGDSET (MT_COLOR_NORMAL);
+      }
+  
+      redraw = 0;
+  
+      if (option(OPTBRAILLEFRIENDLY)) {
+--- 1773,1795 ----
+        /* 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));

    
    

-   /* FIXME: this should come from lineInfo */
-   memset(&mbstate, 0, sizeof(mbstate));
-@@ -1700,7 +1703,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;
-@@ -1713,6 +1716,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);
-@@ -1726,6 +1730,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. */
-@@ -1749,22 +1754,22 @@ 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))
-       {
--      size_t l1 = COLS * MB_LEN_MAX;
-+      size_t l1 = (COLS-SidebarWidth) * MB_LEN_MAX;
-       size_t l2 = sizeof (buffer);
-       hfi.hdr = extra->hdr;
-       mutt_make_string_info (buffer, l1 < l2 ? l1 : l2, NONULL (PagerFmt), &hfi, M_FORMAT_MAKEPRINT);
-       }
-       else if (IsMsgAttach (extra))
-       {
--      size_t l1 = COLS * MB_LEN_MAX;
-+      size_t l1 = (COLS-SidebarWidth) * MB_LEN_MAX;
-       size_t l2 = sizeof (buffer);
-       hfi.hdr = extra->bdy->hdr;
-       mutt_make_string_info (buffer, l1 < l2 ? l1 : l2, NONULL (PagerFmt), &hfi, M_FORMAT_MAKEPRINT);
-       }
--      mutt_paddstr (COLS, IsHeader (extra) || IsMsgAttach (extra) ?  buffer : banner);
-+      mutt_paddstr (COLS-SidebarWidth, IsHeader (extra) || IsMsgAttach (extra) ?  buffer : banner);
-       BKGDSET (MT_COLOR_NORMAL);
-       SETCOLOR (MT_COLOR_NORMAL);
-       if (option(OPTXTERMSETTITLES))
-@@ -1781,18 +1786,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)) {
-@@ -2671,6 +2681,13 @@ search_next:
-         redraw = REDRAW_FULL;
-         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;
---- /dev/null
-+++ b/sidebar.c
-@@ -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);
+!       move (indexoffset + (option (OPTSTATUSONTOP) ? 0 : (indexlen - 1)), SidebarWidth);
+        SETCOLOR (MT_COLOR_STATUS);
+        BKGDSET (MT_COLOR_STATUS);
+!       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)) {
+***************
+*** 2671,2676 ****
+--- 2681,2693 ----
+       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;
+*** mutt-1.5.19-orig/PATCHES   2008-03-19 15:07:06.000000000 -0500
+--- mutt-1.5.19-patched/PATCHES        2009-05-22 08:45:39.000000000 -0500
+***************
+*** 0 ****
+--- 1 ----
++ patch-1.5.19.sidebar.20090522.txt
+*** mutt-1.5.19-orig/sidebar.c 1969-12-31 18:00:00.000000000 -0600
+--- mutt-1.5.19-patched/sidebar.c      2009-05-21 23:08:38.000000000 -0500
+***************
+*** 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 ) return 0;
++        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 {
 +          } else {

-+              sprintf(
-+                      entry + SidebarWidth - delim_len - 3 - quick_log10(size) - quick_log10(new),
-+                      "% d(%d)", size, new);
++            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 */

 +          }
 +          }

-+        } 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);
++          saveSidebarWidth = 0;
++          return (0);

 +        }
 +        }

-+
-+
-+//    if ( SidebarWidth == 0 ) return 0;
-+       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;

 +       }
 +       }

-+
-+    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 ) {
-+              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
-+              short maildir_is_prefix = 0;
-+              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
-+              int sidebar_folder_depth = 0;
-+              char *sidebar_folder_name;
-+              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);
-+}
-+
---- /dev/null
-+++ b/sidebar.h
-@@ -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 */
---- a/doc/Muttrc
-+++ b/doc/Muttrc
-@@ -2090,6 +2090,26 @@ attachments   -I message/external-body
- # function.
- # 
- # 
-+# 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
---- a/imap/imap.c
-+++ b/imap/imap.c
-@@ -1484,7 +1484,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_cmd_queue (idata, command) < 0)
-     {
---- a/imap/command.c
-+++ b/imap/command.c
-@@ -911,6 +911,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;
-       }
---- a/PATCHES
-+++ b/PATCHES
-@@ -0,0 +1 @@
-+patch-1.5.18.sidebar.20080611.txt
++       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 ) {
++              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
++              short maildir_is_prefix = 0;
++              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
++              int sidebar_folder_depth = 0;
++              char *sidebar_folder_name;
++              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);
++ }
++ 
+*** mutt-1.5.19-orig/sidebar.h 1969-12-31 18:00:00.000000000 -0600
+--- mutt-1.5.19-patched/sidebar.h      2009-05-21 23:08:38.000000000 -0500
+***************
+*** 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 */
+*** mutt-1.5.19-orig/doc/Muttrc        2009-01-05 18:36:17.000000000 -0600
+--- mutt-1.5.19-patched/doc/Muttrc     2009-05-21 23:08:38.000000000 -0500
+***************
+*** 2167,2172 ****
+--- 2167,2192 ----
+  # function.
+  # 
+  # 
++ # 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
+*** mutt-1.5.19-orig/imap/imap.c       2009-01-05 17:50:39.000000000 -0600
+--- mutt-1.5.19-patched/imap/imap.c    2009-05-21 23:08:38.000000000 -0500
+***************
+*** 1513,1519 ****
+  
+      imap_munge_mbox_name (munged, sizeof (munged), name);
+      snprintf (command, sizeof (command),
+!            "STATUS %s (UIDNEXT UIDVALIDITY UNSEEN RECENT)", munged);
+  
+      if (imap_exec (idata, command, IMAP_CMD_QUEUE) < 0)
+      {
+--- 1513,1519 ----
+  
+      imap_munge_mbox_name (munged, sizeof (munged), name);
+      snprintf (command, sizeof (command),
+!            "STATUS %s (UIDNEXT UIDVALIDITY UNSEEN RECENT MESSAGES)", munged);
+  
+      if (imap_exec (idata, command, IMAP_CMD_QUEUE) < 0)
+      {
+*** mutt-1.5.19-orig/imap/command.c    2009-01-05 17:57:30.000000000 -0600
+--- mutt-1.5.19-patched/imap/command.c 2009-05-21 23:08:38.000000000 -0500
+***************
+*** 1009,1014 ****
+--- 1009,1021 ----
+            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;
+        }