diff -N -c -r mutt-1.5.6.orig/buffy.c mutt-1.5.6/buffy.c
*** mutt-1.5.6.orig/buffy.c	2004-02-01 13:20:59.000000000 -0500
--- mutt-1.5.6/buffy.c	2004-06-02 14:10:25.000000000 -0400
***************
*** 263,269 ****
    char path[_POSIX_PATH_MAX];
    struct stat contex_sb;
    time_t t;
! 
  #ifdef USE_IMAP
    /* update postponed count as well, on force */
    if (force)
--- 263,269 ----
    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,301 ****
--- 296,303 ----
    
    for (tmp = Incoming; tmp; tmp = tmp->next)
    {
+ 	if ( tmp->new == 1 )
+ 		tmp->has_new = 1;
      tmp->new = 0;
  
  #ifdef USE_IMAP
***************
*** 349,358 ****
        case M_MBOX:
        case M_MMDF:
  
! 	if (STAT_CHECK)
  	{
  	  BuffyCount++;
! 	  tmp->new = 1;
  	}
  #ifdef BUFFY_SIZE
  	else
--- 351,377 ----
        case M_MBOX:
        case M_MMDF:
  
!     {
! 	if (STAT_CHECK || tmp->msgcount == 0)
  	{
+ 	  BUFFY b = *tmp;
+ 	  int msgcount = 0;
+ 	  int msg_unread = 0;
  	  BuffyCount++;
! 	  /* parse the mailbox, to see how much mail there is */
! 	  ctx = mx_open_mailbox( tmp->path, M_READONLY | M_QUIET | M_NOSORT,
! 	    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;
  	}
  #ifdef BUFFY_SIZE
  	else
***************
*** 364,370 ****
  	if (tmp->newly_created &&
  	    (sb.st_ctime != sb.st_mtime || sb.st_ctime != sb.st_atime))
  	  tmp->newly_created = 0;
! 
  	break;
  
        case M_MAILDIR:
--- 383,389 ----
  	if (tmp->newly_created &&
  	    (sb.st_ctime != sb.st_mtime || sb.st_ctime != sb.st_atime))
  	  tmp->newly_created = 0;
! 	}
  	break;
  
        case M_MAILDIR:
***************
*** 375,380 ****
--- 394,421 ----
  	  tmp->magic = 0;
  	  break;
  	}
+ 	tmp->msgcount = 0;
+ 	tmp->msg_unread = 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->has_new = tmp->new = 1;
+         tmp->msgcount++;
+ 		tmp->msg_unread++;
+ 	  }
+ 	}
+ 	closedir (dirp);
+ 	snprintf (path, sizeof (path), "%s/cur", tmp->path);
+ 	if ((dirp = opendir (path)) == NULL)
+ 	{
+ 	  tmp->magic = 0;
+ 	  break;
+ 	}
  	while ((de = readdir (dirp)) != NULL)
  	{
  	  char *p;
***************
*** 383,404 ****
  	  {
  	    /* 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;
  	
  #ifdef USE_IMAP
        case M_IMAP:
! 	if ((tmp->new = imap_mailbox_check (tmp->path, 1)) > 0)
  	  BuffyCount++;
  	else
  	  tmp->new = 0;
  
--- 424,464 ----
  	  {
  	    /* one new and undeleted message is enough */
  	    BuffyCount++;
! 	    tmp->has_new = tmp->new = 1;
!         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)))
!       {
!         if (mh_valid_message (de->d_name))
!         {
! 		  tmp->msgcount++;
! 		  tmp->has_new = tmp->new = 1;
!         }
!       }
!       closedir (dp);
!     }
  	break;
  	
  #ifdef USE_IMAP
        case M_IMAP:
! 	  tmp->msgcount = imap_mailbox_check(tmp->path, 0);
! 	if ((tmp->new = imap_mailbox_check (tmp->path, 1)) > 0) {
  	  BuffyCount++;
+ 	}
  	else
  	  tmp->new = 0;
  
diff -N -c -r mutt-1.5.6.orig/buffy.h mutt-1.5.6/buffy.h
*** mutt-1.5.6.orig/buffy.h	2002-12-11 06:19:39.000000000 -0500
--- mutt-1.5.6/buffy.h	2004-06-02 14:10:25.000000000 -0400
***************
*** 27,33 ****
--- 27,37 ----
    long size;
  #endif				/* BUFFY_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 */
    short notified;		/* user has been notified */
    short magic;			/* mailbox type */
    short newly_created;		/* mbox or mmdf just popped into existence */
diff -N -c -r mutt-1.5.6.orig/color.c mutt-1.5.6/color.c
*** mutt-1.5.6.orig/color.c	2003-11-05 04:41:31.000000000 -0500
--- mutt-1.5.6/color.c	2004-06-02 14:10:25.000000000 -0400
***************
*** 89,94 ****
--- 89,95 ----
    { "bold",		MT_COLOR_BOLD },
    { "underline",	MT_COLOR_UNDERLINE },
    { "index",		MT_COLOR_INDEX },
+   { "sidebarnew",	MT_COLOR_NEW },
    { NULL,		0 }
  };
  
diff -N -c -r mutt-1.5.6.orig/compose.c mutt-1.5.6/compose.c
*** mutt-1.5.6.orig/compose.c	2003-11-05 04:41:31.000000000 -0500
--- mutt-1.5.6/compose.c	2004-06-04 02:50:25.000000000 -0400
***************
*** 67,73 ****
  
  #define HDR_XOFFSET 10
  #define TITLE_FMT "%10s" /* Used for Prompts, which are ASCII */
! #define W (COLS - HDR_XOFFSET)
  
  static char *Prompts[] =
  {
--- 67,73 ----
  
  #define HDR_XOFFSET 10
  #define TITLE_FMT "%10s" /* Used for Prompts, which are ASCII */
! #define W (COLS - HDR_XOFFSET - SidebarWidth)
  
  static char *Prompts[] =
  {
***************
*** 110,125 ****
    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;
  
--- 110,125 ----
    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;
  
***************
*** 133,139 ****
      addstr (_("Clear"));
    clrtoeol ();
  
!   move (HDR_CRYPTINFO, 0);
    clrtoeol ();
    if ((WithCrypto & APPLICATION_PGP)
        && msg->security & APPLICATION_PGP  && msg->security & SIGN)
--- 133,139 ----
      addstr (_("Clear"));
    clrtoeol ();
  
!   move (HDR_CRYPTINFO, SidebarWidth);
    clrtoeol ();
    if ((WithCrypto & APPLICATION_PGP)
        && msg->security & APPLICATION_PGP  && msg->security & SIGN)
***************
*** 146,152 ****
  
    if ((WithCrypto & APPLICATION_SMIME)
         && msg->security & APPLICATION_SMIME  && (msg->security & ENCRYPT)) {
!       mvprintw (HDR_CRYPTINFO, 40, "%s%s", _("Encrypt with: "),
  		NONULL(SmimeCryptAlg));
        off = 20;
    }
--- 146,152 ----
  
    if ((WithCrypto & APPLICATION_SMIME)
         && msg->security & APPLICATION_SMIME  && (msg->security & ENCRYPT)) {
!       mvprintw (HDR_CRYPTINFO, SidebarWidth + 40, "%s%s", _("Encrypt with: "),
  		NONULL(SmimeCryptAlg));
        off = 20;
    }
***************
*** 308,314 ****
    int c;
    char *t;
  
!   mvaddstr (HDR_MIX, 0,     "     Mix: ");
  
    if (!chain)
    {
--- 308,314 ----
    int c;
    char *t;
  
!   mvaddstr (HDR_MIX, SidebarWidth,     "     Mix: ");
  
    if (!chain)
    {
***************
*** 323,329 ****
      if (t && t[0] == '0' && t[1] == '\0')
        t = "<random>";
      
!     if (c + mutt_strlen (t) + 2 >= COLS)
        break;
  
      addstr (NONULL(t));
--- 323,329 ----
      if (t && t[0] == '0' && t[1] == '\0')
        t = "<random>";
      
!     if (c + mutt_strlen (t) + 2 >= COLS - SidebarWidth)
        break;
  
      addstr (NONULL(t));
***************
*** 375,381 ****
  
    buf[0] = 0;
    rfc822_write_address (buf, sizeof (buf), addr, 1);
!   mvprintw (line, 0, TITLE_FMT, Prompts[line - 1]);
    mutt_paddstr (W, buf);
  }
  
--- 375,381 ----
  
    buf[0] = 0;
    rfc822_write_address (buf, sizeof (buf), addr, 1);
!   mvprintw (line, SidebarWidth, TITLE_FMT, Prompts[line - 1]);
    mutt_paddstr (W, buf);
  }
  
***************
*** 385,394 ****
    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)
--- 385,394 ----
    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)
***************
*** 399,405 ****
  #endif
  
    SETCOLOR (MT_COLOR_STATUS);
!   mvaddstr (HDR_ATTACH - 1, 0, _("-- Attachments"));
    BKGDSET (MT_COLOR_STATUS);
    clrtoeol ();
  
--- 399,405 ----
  #endif
  
    SETCOLOR (MT_COLOR_STATUS);
!   mvaddstr (HDR_ATTACH - 1, SidebarWidth, _("-- Attachments"));
    BKGDSET (MT_COLOR_STATUS);
    clrtoeol ();
  
***************
*** 437,443 ****
    /* 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;
--- 437,443 ----
    /* 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;
***************
*** 679,685 ****
  	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);
--- 679,685 ----
  	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);
***************
*** 694,700 ****
  	{
  	  strfcpy (fcc, buf, _POSIX_PATH_MAX);
  	  mutt_pretty_mailbox (fcc);
! 	  move (HDR_FCC, HDR_XOFFSET);
  	  mutt_paddstr (W, fcc);
  	  fccSet = 1;
  	}
--- 694,700 ----
  	{
  	  strfcpy (fcc, buf, _POSIX_PATH_MAX);
  	  mutt_pretty_mailbox (fcc);
! 	  move (HDR_FCC, HDR_XOFFSET + SidebarWidth);
  	  mutt_paddstr (W, fcc);
  	  fccSet = 1;
  	}
diff -N -c -r mutt-1.5.6.orig/curs_main.c mutt-1.5.6/curs_main.c
*** mutt-1.5.6.orig/curs_main.c	2003-11-05 04:41:31.000000000 -0500
--- mutt-1.5.6/curs_main.c	2004-06-04 03:12:46.000000000 -0400
***************
*** 24,29 ****
--- 24,30 ----
  #include "sort.h"
  #include "buffy.h"
  #include "mx.h"
+ #include "sidebar.h"
  
  #ifdef USE_POP
  #include "pop.h"
***************
*** 534,539 ****
--- 535,541 ----
      if (menu->redraw & REDRAW_FULL)
      {
        menu_redraw_full (menu);
+       draw_sidebar(menu->menu);
        mutt_show_error ();
      }
  
***************
*** 556,562 ****
--- 558,566 ----
  
        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);
  	mutt_paddstr (COLS, buf);
***************
*** 1033,1038 ****
--- 1037,1043 ----
  	  menu->redraw = REDRAW_FULL;
  	break;
  
+       case OP_OPEN_MBOX:
        case OP_MAIN_CHANGE_FOLDER:
        
  	if (attach_msg)
***************
*** 1050,1056 ****
  	buf[0] = '\0';
  	mutt_buffy (buf, sizeof (buf));
  
! 	if (mutt_enter_fname (cp, buf, sizeof (buf), &menu->redraw, 1) == -1)
  	  break;
  	if (!buf[0])
  	{
--- 1055,1063 ----
  	buf[0] = '\0';
  	mutt_buffy (buf, sizeof (buf));
  
! 	if ( op == OP_OPEN_MBOX )
! 	  strncpy( buf, CurBuffy->path, sizeof(buf) );
! 	else if (mutt_enter_fname (cp, buf, sizeof (buf), &menu->redraw, 1) == -1)
  	  break;
  	if (!buf[0])
  	{
***************
*** 1059,1064 ****
--- 1066,1072 ----
  	}
  
  	mutt_expand_path (buf, sizeof (buf));
+         set_curbuffy(buf);
  	if (mx_get_magic (buf) <= 0)
  	{
  	  mutt_error (_("%s is not a mailbox."), buf);
***************
*** 2071,2076 ****
--- 2079,2090 ----
  	mutt_what_key();
  	break;
  
+ 	  case OP_SCROLL_MBOX_UP:
+ 	  case OP_SCROLL_MBOX_DOWN:
+ 	  case OP_NEXT_MBOX:
+ 	  case OP_PREV_MBOX:
+ 	    scroll_sidebar(op, menu->menu);
+ 		break;
        default:
  	if (menu->menu == MENU_MAIN)
  	  km_error_key (MENU_MAIN);
diff -N -c -r mutt-1.5.6.orig/doc/instdoc mutt-1.5.6/doc/instdoc
*** mutt-1.5.6.orig/doc/instdoc	1969-12-31 19:00:00.000000000 -0500
--- mutt-1.5.6/doc/instdoc	2004-06-04 02:55:13.000000000 -0400
***************
*** 0 ****
--- 1,24 ----
+ #!/bin/sh --
+ 
+ prefix=/home/thomer/install
+ exec_prefix=${prefix}
+ bindir=${exec_prefix}/bin
+ libdir=${exec_prefix}/lib
+ mandir=${prefix}/man
+ srcdir=.
+ docdir=/home/thomer/install/doc/mutt
+ includedir=${prefix}/include
+ top_srcdir=..
+ top_builddir=..
+ 
+ SOURCE="$1"
+ TARGET="$2"
+ 
+ 
+ rm -f "$TARGET"
+ 
+ sed -e "s;/usr/local/bin/;$bindir/;g" 	 	\
+     -e "s;/usr/local/doc/mutt/;$docdir/;g" 	\
+     "$SOURCE" > $TARGET
+ 
+ chmod 644 "$TARGET"
diff -N -c -r mutt-1.5.6.orig/doc/manual.sgml mutt-1.5.6/doc/manual.sgml
*** mutt-1.5.6.orig/doc/manual.sgml	2004-02-01 13:22:19.000000000 -0500
--- mutt-1.5.6/doc/manual.sgml	2004-06-04 03:01:41.000000000 -0400
***************
*** 3551,3557 ****
  <sect2>dotlock&lowbar;program<label id="dotlock_program">
  <p>
  Type: path<newline>
! Default: &dquot;/usr/local/bin/mutt&lowbar;dotlock&dquot;
  
  <p>
  Contains the path of the mutt&lowbar;dotlock (8) binary to be used by
--- 3551,3557 ----
  <sect2>dotlock&lowbar;program<label id="dotlock_program">
  <p>
  Type: path<newline>
! Default: &dquot;/home/thomer/install/bin/mutt&lowbar;dotlock&dquot;
  
  <p>
  Contains the path of the mutt&lowbar;dotlock (8) binary to be used by
***************
*** 4241,4247 ****
  <sect2>ispell<label id="ispell">
  <p>
  Type: path<newline>
! Default: &dquot;/usr/bin/ispell&dquot;
  
  <p>
  How to invoke ispell (GNU's spell-checking software).
--- 4241,4247 ----
  <sect2>ispell<label id="ispell">
  <p>
  Type: path<newline>
! Default: &dquot;ispell&dquot;
  
  <p>
  How to invoke ispell (GNU's spell-checking software).
***************
*** 4359,4364 ****
--- 4359,4382 ----
  folder will be appended.
  
  
+ <sect2>mbox&lowbar;pane&lowbar;show<label id="mbox_pane_show">
+ <p>
+ Type: boolean<newline>
+ Default: no
+ 
+ <p>
+ This specifies whether or not to show the mailbox list pane.
+ 
+ 
+ <sect2>mbox&lowbar;pane&lowbar;width<label id="mbox_pane_width">
+ <p>
+ Type: number<newline>
+ Default: 0
+ 
+ <p>
+ The width of the mailbox list pane (left sidebar like in GUIs).
+ 
+ 
  <sect2>mbox&lowbar;type<label id="mbox_type">
  <p>
  Type: folder magic<newline>
***************
*** 6546,6562 ****
  command.
  
  
- <sect2>use&lowbar;ipv6<label id="use_ipv6">
- <p>
- Type: boolean<newline>
- Default: yes
- 
- <p>
- When <em>set</em>, Mutt will look for IPv6 addresses of hosts it tries to
- contact.  If this option is unset, Mutt will restrict itself to IPv4 addresses.
- Normally, the default should work.
- 
- 
  <sect2>user&lowbar;agent<label id="user_agent">
  <p>
  Type: boolean<newline>
--- 6564,6569 ----
diff -N -c -r mutt-1.5.6.orig/doc/muttrc.man mutt-1.5.6/doc/muttrc.man
*** mutt-1.5.6.orig/doc/muttrc.man	2004-02-01 13:22:19.000000000 -0500
--- mutt-1.5.6/doc/muttrc.man	2004-06-04 03:01:40.000000000 -0400
***************
*** 1056,1062 ****
  .B dotlock_program
  .nf
  Type: path
! Default: \(lq/usr/local/bin/mutt_dotlock\(rq
  .fi
  .IP
  Contains the path of the mutt_dotlock (8) binary to be used by
--- 1056,1062 ----
  .B dotlock_program
  .nf
  Type: path
! Default: \(lq/home/thomer/install/bin/mutt_dotlock\(rq
  .fi
  .IP
  Contains the path of the mutt_dotlock (8) binary to be used by
***************
*** 1887,1893 ****
  .B ispell
  .nf
  Type: path
! Default: \(lq/usr/bin/ispell\(rq
  .fi
  .IP
  How to invoke ispell (GNU's spell-checking software).
--- 1887,1893 ----
  .B ispell
  .nf
  Type: path
! Default: \(lqispell\(rq
  .fi
  .IP
  How to invoke ispell (GNU's spell-checking software).
***************
*** 2016,2021 ****
--- 2016,2041 ----
  
  
  .TP
+ .B mbox_pane_show
+ .nf
+ Type: boolean
+ Default: no
+ .fi
+ .IP
+ This specifies whether or not to show the mailbox list pane.
+ 
+ 
+ .TP
+ .B mbox_pane_width
+ .nf
+ Type: number
+ Default: 0
+ .fi
+ .IP
+ The width of the mailbox list pane (left sidebar like in GUIs).
+ 
+ 
+ .TP
  .B mbox_type
  .nf
  Type: folder magic
***************
*** 4502,4519 ****
  
  
  .TP
- .B use_ipv6
- .nf
- Type: boolean
- Default: yes
- .fi
- .IP
- When \fIset\fP, Mutt will look for IPv6 addresses of hosts it tries to
- contact.  If this option is unset, Mutt will restrict itself to IPv4 addresses.
- Normally, the default should work.
- 
- 
- .TP
  .B user_agent
  .nf
  Type: boolean
--- 4522,4527 ----
diff -N -c -r mutt-1.5.6.orig/flags.c mutt-1.5.6/flags.c
*** mutt-1.5.6.orig/flags.c	2003-01-30 18:48:07.000000000 -0500
--- mutt-1.5.6/flags.c	2004-06-03 01:19:35.000000000 -0400
***************
*** 18,25 ****
--- 18,27 ----
  
  #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"
***************
*** 270,275 ****
--- 272,278 ----
     */
    if (h->searched && (changed != h->changed || deleted != ctx->deleted || tagged != ctx->tagged))
      h->searched = 0;
+ 	draw_sidebar(0);
  }
  
  void mutt_tag_set_flag (int flag, int bf)
diff -N -c -r mutt-1.5.6.orig/flea mutt-1.5.6/flea
*** mutt-1.5.6.orig/flea	1969-12-31 19:00:00.000000000 -0500
--- mutt-1.5.6/flea	2004-06-04 03:03:25.000000000 -0400
***************
*** 0 ****
--- 1,336 ----
+ #!/bin/sh
+ 
+ #
+ #     File a bug against the Mutt mail user agent.
+ #
+ 
+ # 
+ #     $Id: muttbug.sh.in,v 3.6 2003/09/20 06:24:10 roessler Exp $
+ #
+ 
+ #
+ #     Copyright (c) 2000 Thomas Roessler <roessler@guug.de>
+ #
+ #
+ #     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.
+ #
+ 
+ SUBMIT="submit@bugs.guug.de"
+ DEBIAN_SUBMIT="submit@bugs.debian.org"
+ 
+ prefix=/home/thomer/install
+ 
+ DEBUGGER=/usr/bin/gdb
+ SENDMAIL=/usr/sbin/sendmail
+ sysconfdir=${prefix}/etc
+ pkgdatadir=@pkgdatadir@
+ 
+ include_file ()
+ {
+ 	echo
+ 	echo "--- Begin $1"
+ 	sed -e 's/^-/- -/' $1 | egrep -v '^[ 	]*(#|$)'
+ 	echo "--- End $1"
+ 	echo
+ }
+ 
+ debug_gdb ()
+ {
+ 	cat << EOF > $SCRATCH/gdb.rc
+ bt
+ list
+ quit
+ EOF
+ 	$DEBUGGER -n -x $SCRATCH/gdb.rc -c $CORE mutt
+ }
+ 
+ debug_dbx ()
+ {
+ 	cat << EOF > $SCRATCH/dbx.rc
+ where
+ list
+ quit
+ EOF
+ 	$DEBUGGER -s $SCRATCH/dbx.rc mutt $CORE
+ }
+ 
+ debug_sdb ()
+ {
+ 	cat << EOF > $SCRATCH/sdb.rc
+ t
+ w
+ q
+ EOF
+ 	$DEBUGGER mutt $CORE < $SCRATCH/sdb.rc
+ }
+ 
+ case `echo -n` in
+ "") n=-n; c=   ;;
+  *) n=; c='\c' ;;
+ esac
+  
+ 
+ exec > /dev/tty
+ exec < /dev/tty
+ 
+ SCRATCH=${TMPDIR-/tmp}/`basename $0`.`hostname`.$$
+ 
+ mkdir ${SCRATCH} || \
+ { 
+ 	echo "`basename $0`: Can't create temporary directory." >& 2 ; 
+ 	exit 1 ; 
+ }
+ 
+ trap "rm -r -f ${SCRATCH} ; trap '' 0 ; exit" 0 1 2
+ 
+ TEMPLATE=${SCRATCH}/template.txt
+ 
+ if test -z "$EMAIL" ; then
+ 	EMAIL="`mutt -Q from 2> /dev/null | sed -e 's/^from=.\(.*\).$/\1/'`"
+ fi
+ 
+ echo "Please enter your e-mail address [$EMAIL]:"
+ echo $n "> $c"
+ read EMAILTMP
+ 
+ if test -n "$EMAILTMP" ; then
+ 	EMAIL="$EMAILTMP"
+ fi
+ 
+ echo "Please enter a one-line description of the problem you experience:"
+ echo $n "> $c"
+ read SUBJECT
+ 
+ cat <<EOF  
+ What should the severity for this bug report be?
+ 
+        0) Feature request, or maybe a bug which is very difficult to
+        fix due to major design considerations.
+ 
+        1) The package fails to perform correctly in some conditions,
+        or on some systems, or fails to comply with current policy
+        documents. Most bugs are in this category.
+ 
+        2) This bug makes this version of the package unsuitable for
+        a stable release.
+ 
+        3) Dangerous bug. Makes the package in question unusable by
+        anyone or mostly so, or causes data loss, or introduces a
+        security hole allowing access to the accounts of users who
+        use the package.
+ 
+        4) Critical bug. Makes unrelated software on the system (or
+        the whole system) break, or causes serious data loss, or
+        introduces a security hole on systems where you install the
+        package.
+ 
+ EOF
+ echo $n "Severity? [01234] $c"
+ read severity
+ case "$severity" in
+ 0|[Ww]) severity=wishlist  ;;
+ 2|[Ii]) severity=important ;;
+ 3|[Gg]) severity=grave     ;;
+ 4|[Cc]) severity=critical  ;;
+      *) severity=normal    ;;
+ esac
+ 
+ if test -x $DEBUGGER ; then
+ 	test -f core && CORE=core
+ 	echo "If mutt has crashed, it may have saved some program state in"
+ 	echo "a file named core.  We can include this information with the bug"
+ 	echo "report if you wish so."
+ 	echo "Do you want to include information gathered from a core file?"
+ 	echo "If yes, please enter the path - otherwise just say no: [$CORE]"
+ 	echo $n "> $c"
+ 	read _CORE
+ 	test "$_CORE" && CORE="$_CORE"
+ fi
+ 
+ echo $n "Do you want to include your personal mutt configuration files? [Y|n] $c"
+ read personal
+ case "$personal" in
+ [nN]*)  personal=no  ;;
+     *)  personal=yes ;;
+ esac
+ 
+ echo $n "Do you want to include your system's global mutt configuration file? [Y|n] $c"
+ read global
+ case "$global" in
+ [nN]*)  global=no  ;;
+     *)	global=yes ;;
+ esac
+ 
+ if test -f /etc/debian_version ; then
+ 	DEBIAN=yes
+ 	echo $n "Checking whether mutt has been installed as a package... $c"
+ 	DEBIANVERSION="`dpkg -l mutt | grep '^[ih]' | awk '{print $3}'`" 2> /dev/null
+ 	if test "$DEBIANVERSION" ; then
+ 		DPKG=yes
+ 	else
+ 		DPKG=no
+ 		unset DEBIANVERSION
+ 	fi
+ 	echo "$DPKG"
+ 	echo $n "File this bug with Debian? [Y|n] $c"
+ 	read DPKG
+ 	case "$DPKG" in
+ 	[nN])	DPKG=no ;;
+ 	*)	DPKG=yes ;;
+ 	esac
+ else
+ 	DEBIAN=no
+ 	DPKG=no
+ fi
+ 
+ if rpm -q mutt > /dev/null 2> /dev/null ; then
+ 	echo "Mutt seems to come from an RPM package."
+ 	RPMVERSION="`rpm -q mutt`"
+ 	RPMPACKAGER="`rpm -q -i mutt | sed -n -e 's/^Packager *: *//p'`"
+ fi
+ 
+ MUTTVERSION="`mutt -v | awk '{print $2; exit; }'`"
+ test "$DPKG" = "yes" && SUBMIT="$SUBMIT, $DEBIAN_SUBMIT"
+ 
+ exec > ${TEMPLATE}
+ 
+ test "$EMAIL"        && echo "From: $EMAIL"
+ test "$REPLYTO"      && echo "Reply-To: $REPLYTO"
+ test "$ORGANIZATION" && echo "Organization: $ORGANIZATION"
+ 
+ echo "Subject: mutt-$MUTTVERSION: $SUBJECT"
+ echo "To: $SUBMIT"
+ test "$EMAIL" 	     && echo "Bcc: ${EMAIL}"
+ echo
+ echo "Package: mutt"
+ echo "Version: ${DEBIANVERSION-${RPMVERSION-$MUTTVERSION}}"
+ echo "Severity: $severity"
+ echo 
+ echo "-- Please type your report below this line"
+ echo
+ echo
+ echo
+ 
+ if test "$DEBIAN" = "yes" ; then
+ 	echo "Obtaining Debian-specific information..." > /dev/tty
+ 	bug -p -s dummy mutt < /dev/null 2> /dev/null |        \
+ 		sed -n -e "/^-- System Information/,/^---/p" | \
+ 		grep -v '^---'
+ else
+ 	echo "-- System Information"
+ 	echo "System Version: `uname -a`"
+ 	test -z "$RPMPACKAGER" || echo "RPM Packager: $RPMPACKAGER";
+ 	test -f /etc/redhat-release && echo "RedHat Release: `cat /etc/redhat-release`"
+ 	test -f /etc/SuSE-release && echo "SuSE Release: `sed 1q /etc/SuSE-release`"
+ 	# Please provide more of these if you have any.
+ fi
+ 
+ echo 
+ echo "-- Build environment information"
+ echo
+ echo "(Note: This is the build environment installed on the system"
+ echo "muttbug is run on.  Information may or may not match the environment"
+ echo "used to build mutt.)"
+ echo
+ echo "- gcc version information"
+ echo "gcc"
+ gcc -v 2>&1
+ echo
+ echo "- CFLAGS"
+ echo -Wall -pedantic -g -O2
+ 
+ 
+ echo
+ echo "-- Mutt Version Information"
+ echo
+ mutt -v
+ 
+ if test "$CORE" && test -f "$CORE" ; then
+ 	echo 
+ 	echo "-- Core Dump Analysis Output"
+ 	echo
+ 
+ 	case "$DEBUGGER" in
+ 		*sdb) debug_sdb $CORE ;;
+ 		*dbx) debug_dbx $CORE ;;
+ 		*gdb) debug_gdb $CORE ;;
+ 	esac
+ 	
+ 	echo
+ fi
+ 
+ if test "$personal" = "yes" ; then
+ 	CANDIDATES=".muttrc-${MUTTVERSION} .muttrc .mutt/muttrc-${MUTTVERSION} .mutt/muttrc"
+ 	MATCHED="none"
+ 	for f in $CANDIDATES; do
+ 		if test -f "${HOME}/$f" ; then
+ 			MATCHED="${HOME}/$f"
+ 			break
+ 	        fi
+ 	done
+ 	
+ 	if test "$MATCHED" = "none" ; then
+ 		echo "Warning: Can't find your personal .muttrc." >&2
+ 	else
+ 		include_file $MATCHED
+ 	fi
+ fi
+ 
+ 
+ if test "$global" = "yes" ; then
+ 	CANDIDATES="Muttrc-${MUTTVERSION} Muttrc"
+ 	DIRECTORIES="$sysconfdir $pkgdatadir"
+ 	MATCHED="none"
+ 	for d in $DIRECTORIES ; do
+ 		for f in $CANDIDATES; do
+ 			if test -f $d/$f ; then
+ 				MATCHED="$d/$f"
+ 				break
+ 			fi
+ 		done
+ 		test "$MATCHED" = "none" || break
+ 	done
+ 	
+ 	if test "$MATCHED" = "none" ; then
+ 		echo "Warning: Can't find global Muttrc." >&2
+ 	else
+ 		include_file $MATCHED
+ 	fi
+ fi
+ 
+ exec > /dev/tty
+ 
+ cp $TEMPLATE $SCRATCH/mutt-bug.txt
+ 
+ input="e"
+ while : ; do
+ 	if test "$input" = "e" ; then
+ 		${VISUAL-${EDITOR-vi}} $SCRATCH/mutt-bug.txt
+ 		if cmp $SCRATCH/mutt-bug.txt ${TEMPLATE} > /dev/null ; then
+ 			echo "Warning: Bug report was not modified!"
+ 		fi
+ 	fi
+ 	
+ 	echo $n "Submit, Edit, View, Quit? [S|e|v|q] $c"
+ 	read _input
+ 	input="`echo $_input | tr EVSQ evsq`"
+ 	case $input in
+ 	e*)	;;
+ 	v*)	${PAGER-more} $SCRATCH/mutt-bug.txt ;;
+ 	s*|"")	$SENDMAIL -t < $SCRATCH/mutt-bug.txt ; exit ;;
+ 	q*)	exit
+ 	esac
+ done
+ 
diff -N -c -r mutt-1.5.6.orig/functions.h mutt-1.5.6/functions.h
*** mutt-1.5.6.orig/functions.h	2003-11-05 04:41:31.000000000 -0500
--- mutt-1.5.6/functions.h	2004-06-02 14:10:25.000000000 -0400
***************
*** 149,154 ****
--- 149,159 ----
    { "decrypt-save",		OP_DECRYPT_SAVE,		NULL },
  
  
+   { "scroll-mbox-up",	OP_SCROLL_MBOX_UP, NULL },
+   { "scroll-mbox-down",	OP_SCROLL_MBOX_DOWN, NULL },
+   { "next-mbox",	OP_NEXT_MBOX, NULL },
+   { "previous-mbox",	OP_PREV_MBOX, NULL },
+   { "open-mbox", OP_OPEN_MBOX, NULL },
    { NULL,			0,				NULL }
  };
  
***************
*** 243,248 ****
--- 248,258 ----
    { "decrypt-save",    	OP_DECRYPT_SAVE,		NULL },
  
  
+   { "scroll-mbox-up",	OP_SCROLL_MBOX_UP, NULL },
+   { "scroll-mbox-down",	OP_SCROLL_MBOX_DOWN, NULL },
+   { "next-mbox",	OP_NEXT_MBOX, NULL },
+   { "previous-mbox",	OP_PREV_MBOX, NULL },
+   { "open-mbox", OP_OPEN_MBOX, NULL },
    { NULL,		0,				NULL }
  };
  
diff -N -c -r mutt-1.5.6.orig/globals.h mutt-1.5.6/globals.h
*** mutt-1.5.6.orig/globals.h	2004-02-01 12:15:17.000000000 -0500
--- mutt-1.5.6/globals.h	2004-06-03 23:33:32.000000000 -0400
***************
*** 157,162 ****
--- 157,165 ----
  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
diff -N -c -r mutt-1.5.6.orig/init.h mutt-1.5.6/init.h
*** mutt-1.5.6.orig/init.h	2004-02-01 12:15:17.000000000 -0500
--- mutt-1.5.6/init.h	2004-06-03 23:52:29.000000000 -0400
***************
*** 1018,1023 ****
--- 1018,1033 ----
    ** This specifies the folder into which read mail in your ``$$spoolfile''
    ** folder will be appended.
    */
+   { "mbox_pane_show", DT_BOOL, R_BOTH, OPTMBOXPANE, 0 },
+   /*
+   ** .pp
+   ** This specifies whether or not to show the mailbox list pane.
+   */
+   { "mbox_pane_width", DT_NUM, R_BOTH, UL &SidebarWidth, 0 },
+   /*
+   ** .pp
+   ** The width of the mailbox list pane (left sidebar like in GUIs).
+   */
    { "mbox_type",	DT_MAGIC,R_NONE, UL &DefaultMagic, M_MBOX },
    /*
    ** .pp
diff -N -c -r mutt-1.5.6.orig/Makefile.am mutt-1.5.6/Makefile.am
*** mutt-1.5.6.orig/Makefile.am	2003-11-05 14:58:41.000000000 -0500
--- mutt-1.5.6/Makefile.am	2004-06-02 14:10:25.000000000 -0400
***************
*** 28,34 ****
  	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 utf8.c mbyte.c wcwidth.c \
! 	url.c ascii.c mutt_idna.c
  
  mutt_LDADD = @MUTT_LIB_OBJECTS@ @LIBOBJS@ $(LIBIMAP) $(MUTTLIBS) \
  	$(INTLLIBS) $(LIBICONV)
--- 28,34 ----
  	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 utf8.c mbyte.c wcwidth.c \
! 	url.c ascii.c mutt_idna.c sidebar.c
  
  mutt_LDADD = @MUTT_LIB_OBJECTS@ @LIBOBJS@ $(LIBIMAP) $(MUTTLIBS) \
  	$(INTLLIBS) $(LIBICONV)
***************
*** 62,68 ****
  	mutt_tunnel.c pop.c pop_auth.c pop_lib.c smime.c pgp.c pgpinvoke.c pgpkey.c \
  	pgplib.c sha1.c pgpmicalg.c gnupgparse.c resize.c dotlock.c remailer.c \
  	browser.h mbyte.h remailer.h url.h mutt_ssl_nss.c \
! 	pgppacket.c mutt_idna.h
  
  EXTRA_DIST = COPYRIGHT GPL OPS OPS.PGP OPS.CRYPT OPS.SMIME TODO \
  	configure acconfig.h account.h \
--- 62,68 ----
  	mutt_tunnel.c pop.c pop_auth.c pop_lib.c smime.c pgp.c pgpinvoke.c pgpkey.c \
  	pgplib.c sha1.c pgpmicalg.c gnupgparse.c resize.c dotlock.c remailer.c \
  	browser.h mbyte.h remailer.h url.h mutt_ssl_nss.c \
! 	pgppacket.c mutt_idna.h sidebar.h
  
  EXTRA_DIST = COPYRIGHT GPL OPS OPS.PGP OPS.CRYPT OPS.SMIME TODO \
  	configure acconfig.h account.h \
diff -N -c -r mutt-1.5.6.orig/Makefile.in mutt-1.5.6/Makefile.in
*** mutt-1.5.6.orig/Makefile.in	2004-06-04 02:56:01.000000000 -0400
--- mutt-1.5.6/Makefile.in	2004-06-04 03:14:46.000000000 -0400
***************
*** 94,100 ****
  	history.$(OBJEXT) lib.$(OBJEXT) muttlib.$(OBJEXT) \
  	editmsg.$(OBJEXT) utf8.$(OBJEXT) mbyte.$(OBJEXT) \
  	wcwidth.$(OBJEXT) url.$(OBJEXT) ascii.$(OBJEXT) \
! 	mutt_idna.$(OBJEXT)
  mutt_OBJECTS = $(am_mutt_OBJECTS)
  am__DEPENDENCIES_1 =
  am_mutt_dotlock_OBJECTS = mutt_dotlock.$(OBJEXT)
--- 94,100 ----
  	history.$(OBJEXT) lib.$(OBJEXT) muttlib.$(OBJEXT) \
  	editmsg.$(OBJEXT) utf8.$(OBJEXT) mbyte.$(OBJEXT) \
  	wcwidth.$(OBJEXT) url.$(OBJEXT) ascii.$(OBJEXT) \
! 	mutt_idna.$(OBJEXT) sidebar.$(OBJEXT)
  mutt_OBJECTS = $(am_mutt_OBJECTS)
  am__DEPENDENCIES_1 =
  am_mutt_dotlock_OBJECTS = mutt_dotlock.$(OBJEXT)
***************
*** 296,302 ****
  	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 utf8.c mbyte.c wcwidth.c \
! 	url.c ascii.c mutt_idna.c
  
  mutt_LDADD = @MUTT_LIB_OBJECTS@ @LIBOBJS@ $(LIBIMAP) $(MUTTLIBS) \
  	$(INTLLIBS) $(LIBICONV)
--- 296,302 ----
  	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 utf8.c mbyte.c wcwidth.c \
! 	url.c ascii.c mutt_idna.c sidebar.c
  
  mutt_LDADD = @MUTT_LIB_OBJECTS@ @LIBOBJS@ $(LIBIMAP) $(MUTTLIBS) \
  	$(INTLLIBS) $(LIBICONV)
***************
*** 312,318 ****
  	mutt_tunnel.c pop.c pop_auth.c pop_lib.c smime.c pgp.c pgpinvoke.c pgpkey.c \
  	pgplib.c sha1.c pgpmicalg.c gnupgparse.c resize.c dotlock.c remailer.c \
  	browser.h mbyte.h remailer.h url.h mutt_ssl_nss.c \
! 	pgppacket.c mutt_idna.h
  
  EXTRA_DIST = COPYRIGHT GPL OPS OPS.PGP OPS.CRYPT OPS.SMIME TODO \
  	configure acconfig.h account.h \
--- 312,318 ----
  	mutt_tunnel.c pop.c pop_auth.c pop_lib.c smime.c pgp.c pgpinvoke.c pgpkey.c \
  	pgplib.c sha1.c pgpmicalg.c gnupgparse.c resize.c dotlock.c remailer.c \
  	browser.h mbyte.h remailer.h url.h mutt_ssl_nss.c \
! 	pgppacket.c mutt_idna.h sidebar.h
  
  EXTRA_DIST = COPYRIGHT GPL OPS OPS.PGP OPS.CRYPT OPS.SMIME TODO \
  	configure acconfig.h account.h \
diff -N -c -r mutt-1.5.6.orig/menu.c mutt-1.5.6/menu.c
*** mutt-1.5.6.orig/menu.c	2004-02-01 12:10:57.000000000 -0500
--- mutt-1.5.6/menu.c	2004-06-04 02:51:59.000000000 -0400
***************
*** 20,25 ****
--- 20,26 ----
  #include "mutt_curses.h"
  #include "mutt_menu.h"
  #include "mbyte.h"
+ #include "sidebar.h"
  
  #ifdef USE_IMAP
  #include "imap.h"
***************
*** 159,165 ****
  void menu_pad_string (char *s, size_t n)
  {
    int shift = option (OPTARROWCURSOR) ? 3 : 0;
!   int cols = COLS - shift;
  
    mutt_format_string (s, n, cols, cols, 0, ' ', s, strlen (s), 1);
    s[n - 1] = 0;
--- 160,166 ----
  void menu_pad_string (char *s, size_t n)
  {
    int shift = option (OPTARROWCURSOR) ? 3 : 0;
!   int cols = COLS - shift - SidebarWidth;
  
    mutt_format_string (s, n, cols, cols, 0, ' ', s, strlen (s), 1);
    s[n - 1] = 0;
***************
*** 209,214 ****
--- 210,216 ----
    char buf[STRING];
    int i;
  
+   draw_sidebar(1);
    for (i = menu->top; i < menu->top + menu->pagelen; i++)
    {
      if (i < menu->max)
***************
*** 219,225 ****
        if (option (OPTARROWCURSOR))
        {
          attrset (menu->color (i));
! 	CLEARLINE (i - menu->top + menu->offset);
  
  	if (i == menu->current)
  	{
--- 221,227 ----
        if (option (OPTARROWCURSOR))
        {
          attrset (menu->color (i));
! 	CLEARLINE_WIN (i - menu->top + menu->offset);
  
  	if (i == menu->current)
  	{
***************
*** 230,236 ****
  	  addch (' ');
  	}
  	else
! 	  move (i - menu->top + menu->offset, 3);
  
          print_enriched_string (menu->color(i), (unsigned char *) buf, 1);
          SETCOLOR (MT_COLOR_NORMAL);          
--- 232,238 ----
  	  addch (' ');
  	}
  	else
! 	  move (i - menu->top + menu->offset, SidebarWidth + 3);
  
          print_enriched_string (menu->color(i), (unsigned char *) buf, 1);
          SETCOLOR (MT_COLOR_NORMAL);          
***************
*** 245,258 ****
  	  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;
  }
--- 247,260 ----
  	  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;
  }
***************
*** 267,273 ****
      return;
    }
    
!   move (menu->oldcurrent + menu->offset - menu->top, 0);
    SETCOLOR (MT_COLOR_NORMAL);
    BKGDSET (MT_COLOR_NORMAL);
  
--- 269,275 ----
      return;
    }
    
!   move (menu->oldcurrent + menu->offset - menu->top, SidebarWidth);
    SETCOLOR (MT_COLOR_NORMAL);
    BKGDSET (MT_COLOR_NORMAL);
  
***************
*** 282,294 ****
        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 ("->");
--- 284,296 ----
        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 ("->");
***************
*** 309,315 ****
      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);
--- 311,317 ----
      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);
***************
*** 321,327 ****
  {
    char buf[STRING];
    
!   move (menu->current + menu->offset - menu->top, 0);
    menu_make_entry (buf, sizeof (buf), menu, menu->current);
    menu_pad_string (buf, sizeof (buf));
  
--- 323,329 ----
  {
    char buf[STRING];
    
!   move (menu->current + menu->offset - menu->top, SidebarWidth);
    menu_make_entry (buf, sizeof (buf), menu, menu->current);
    menu_pad_string (buf, sizeof (buf));
  
diff -N -c -r mutt-1.5.6.orig/mutt_curses.h mutt-1.5.6/mutt_curses.h
*** mutt-1.5.6.orig/mutt_curses.h	2003-11-05 04:41:32.000000000 -0500
--- mutt-1.5.6/mutt_curses.h	2004-06-02 14:10:25.000000000 -0400
***************
*** 58,63 ****
--- 58,64 ----
  #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)
***************
*** 119,124 ****
--- 120,126 ----
    MT_COLOR_BOLD,
    MT_COLOR_UNDERLINE,
    MT_COLOR_INDEX,
+   MT_COLOR_NEW,
    MT_COLOR_MAX
  };
  
diff -N -c -r mutt-1.5.6.orig/mutt.h mutt-1.5.6/mutt.h
*** mutt-1.5.6.orig/mutt.h	2004-02-01 12:15:17.000000000 -0500
--- mutt-1.5.6/mutt.h	2004-06-03 23:30:38.000000000 -0400
***************
*** 375,380 ****
--- 375,381 ----
    OPTMAILDIRTRASH,
    OPTMARKERS,
    OPTMARKOLD,
+   OPTMBOXPANE,
    OPTMENUSCROLL,	/* scroll menu instead of implicit next-page */
    OPTMETAKEY,		/* interpret ALT-x as ESC-x */
    OPTMETOO,
diff -N -c -r mutt-1.5.6.orig/muttlib.c mutt-1.5.6/muttlib.c
*** mutt-1.5.6.orig/muttlib.c	2004-02-01 12:15:17.000000000 -0500
--- mutt-1.5.6/muttlib.c	2004-06-03 01:46:38.000000000 -0400
***************
*** 73,79 ****
    if (s[0] == '\0')
    {
      snprintf (s, l, "%s/muttXXXXXX", buf);
!     mktemp (s);
    }
    else
    {
--- 73,79 ----
    if (s[0] == '\0')
    {
      snprintf (s, l, "%s/muttXXXXXX", buf);
!     mkstemp (s);
    }
    else
    {
***************
*** 85,91 ****
      if ((period = strrchr (tmp, '.')) != NULL)
        *period = 0;
      snprintf (s, l, "%s/%s.XXXXXX", buf, tmp);
!     mktemp (s);
      if (period != NULL)
      {
        *period = '.';
--- 85,91 ----
      if ((period = strrchr (tmp, '.')) != NULL)
        *period = 0;
      snprintf (s, l, "%s/%s.XXXXXX", buf, tmp);
!     mkstemp (s);
      if (period != NULL)
      {
        *period = '.';
***************
*** 1007,1013 ****
  	ch = *src++; /* pad char */
  	/* calculate space left on line.  if we've already written more data
  	   than will fit on the line, ignore the rest of the line */
! 	count = (COLS < destlen ? COLS : destlen);
  	if (count > wlen)
  	{
  	  count -= wlen; /* how many chars left on this line */
--- 1007,1016 ----
  	ch = *src++; /* pad char */
  	/* calculate space left on line.  if we've already written more data
  	   than will fit on the line, ignore the rest of the line */
! 	if ( DrawFullLine )
! 	  count = (COLS < destlen ? COLS : destlen);
! 	else
! 	  count = ((COLS-SidebarWidth) < destlen ? COLS - SidebarWidth : destlen);
  	if (count > wlen)
  	{
  	  count -= wlen; /* how many chars left on this line */
diff -N -c -r mutt-1.5.6.orig/Muttrc mutt-1.5.6/Muttrc
*** mutt-1.5.6.orig/Muttrc	2004-02-01 13:22:18.000000000 -0500
--- mutt-1.5.6/Muttrc	2004-06-04 02:55:17.000000000 -0400
***************
*** 15,23 ****
  macro pager \cb |urlview\n 'call urlview to extract URLs out of a message'
  
  # Show documentation when pressing F1
! macro generic <f1> "!less /usr/local/doc/mutt/manual.txt\n" "Show Mutt documentation"
! macro index   <f1> "!less /usr/local/doc/mutt/manual.txt\n" "Show Mutt documentation"
! macro pager   <f1> "!less /usr/local/doc/mutt/manual.txt\n" "Show Mutt documentation"
  
  # If Mutt is unable to determine your site's domain name correctly, you can
  # set the default here.
--- 15,23 ----
  macro pager \cb |urlview\n 'call urlview to extract URLs out of a message'
  
  # Show documentation when pressing F1
! macro generic <f1> "!less /home/thomer/install/doc/mutt/manual.txt\n" "Show Mutt documentation"
! macro index   <f1> "!less /home/thomer/install/doc/mutt/manual.txt\n" "Show Mutt documentation"
! macro pager   <f1> "!less /home/thomer/install/doc/mutt/manual.txt\n" "Show Mutt documentation"
  
  # If Mutt is unable to determine your site's domain name correctly, you can
  # set the default here.
***************
*** 543,553 ****
  # filtered message is read from the standard output.
  # 
  # 
! # set dotlock_program="/usr/local/bin/mutt_dotlock"
  #
  # Name: dotlock_program
  # Type: path
! # Default: "/usr/local/bin/mutt_dotlock"
  # 
  # 
  # Contains the path of the mutt_dotlock (8) binary to be used by
--- 543,553 ----
  # filtered message is read from the standard output.
  # 
  # 
! # set dotlock_program="/home/thomer/install/bin/mutt_dotlock"
  #
  # Name: dotlock_program
  # Type: path
! # Default: "/home/thomer/install/bin/mutt_dotlock"
  # 
  # 
  # Contains the path of the mutt_dotlock (8) binary to be used by
***************
*** 1276,1286 ****
  # See also: ``$to_chars''.
  # 
  # 
! # set ispell="/usr/bin/ispell"
  #
  # Name: ispell
  # Type: path
! # Default: "/usr/bin/ispell"
  # 
  # 
  # How to invoke ispell (GNU's spell-checking software).
--- 1276,1286 ----
  # See also: ``$to_chars''.
  # 
  # 
! # set ispell="ispell"
  #
  # Name: ispell
  # Type: path
! # Default: "ispell"
  # 
  # 
  # How to invoke ispell (GNU's spell-checking software).
***************
*** 1408,1413 ****
--- 1408,1433 ----
  # folder will be appended.
  # 
  # 
+ # set mbox_pane_show=no
+ #
+ # Name: mbox_pane_show
+ # Type: boolean
+ # Default: no
+ # 
+ # 
+ # This specifies whether or not to show the mailbox list pane.
+ # 
+ # 
+ # set mbox_pane_width=0
+ #
+ # Name: mbox_pane_width
+ # Type: number
+ # Default: 0
+ # 
+ # 
+ # The width of the mailbox list pane (left sidebar like in GUIs).
+ # 
+ # 
  # set mbox_type=mbox
  #
  # Name: mbox_type
***************
*** 3719,3736 ****
  # command.
  # 
  # 
- # set use_ipv6=yes
- #
- # Name: use_ipv6
- # Type: boolean
- # Default: yes
- # 
- # 
- # When set, Mutt will look for IPv6 addresses of hosts it tries to
- # contact.  If this option is unset, Mutt will restrict itself to IPv4 addresses.
- # Normally, the default should work.
- # 
- # 
  # set user_agent=yes
  #
  # Name: user_agent
--- 3739,3744 ----
diff -N -c -r mutt-1.5.6.orig/OPS mutt-1.5.6/OPS
*** mutt-1.5.6.orig/OPS	2003-11-05 04:41:31.000000000 -0500
--- mutt-1.5.6/OPS	2004-06-02 14:10:25.000000000 -0400
***************
*** 174,176 ****
--- 174,181 ----
  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_SCROLL_MBOX_UP "scroll the mailbox pane up 1 page"
+ OP_SCROLL_MBOX_DOWN "scroll the mailbox pane down 1 page"
+ OP_NEXT_MBOX "go down to next mailbox"
+ OP_PREV_MBOX "go to previous mailbox"
+ OP_OPEN_MBOX "open hilighted mailbox"
diff -N -c -r mutt-1.5.6.orig/pager.c mutt-1.5.6/pager.c
*** mutt-1.5.6.orig/pager.c	2004-02-01 12:10:57.000000000 -0500
--- mutt-1.5.6/pager.c	2004-06-03 01:15:51.000000000 -0400
***************
*** 26,31 ****
--- 26,32 ----
  #include "pager.h"
  #include "attach.h"
  #include "mbyte.h"
+ #include "sidebar.h"
  
  #include "mx.h"
  
***************
*** 1032,1038 ****
    wchar_t wc;
    mbstate_t mbstate;
  
!   int wrap_cols = COLS - WrapMargin;
    
    if (wrap_cols <= 0)
      wrap_cols = COLS;
--- 1033,1039 ----
    wchar_t wc;
    mbstate_t mbstate;
  
!   int wrap_cols = COLS - WrapMargin - SidebarWidth;
    
    if (wrap_cols <= 0)
      wrap_cols = COLS;
***************
*** 1665,1671 ****
      if ((redraw & REDRAW_BODY) || topline != oldtopline)
      {
        do {
! 	move (bodyoffset, 0);
  	curline = oldtopline = topline;
  	lines = 0;
  	force_redraw = 0;
--- 1666,1672 ----
      if ((redraw & REDRAW_BODY) || topline != oldtopline)
      {
        do {
! 	move (bodyoffset, SidebarWidth);
  	curline = oldtopline = topline;
  	lines = 0;
  	force_redraw = 0;
***************
*** 1678,1683 ****
--- 1679,1685 ----
  			    &QuoteList, &q_level, &force_redraw, &SearchRE) > 0)
  	    lines++;
  	  curline++;
+ 		move(lines + bodyoffset, SidebarWidth);
  	}
  	last_offset = lineInfo[curline].offset;
        } while (force_redraw);
***************
*** 1691,1696 ****
--- 1693,1699 ----
  	  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. */
***************
*** 1703,1722 ****
        /* print out the pager status bar */
        SETCOLOR (MT_COLOR_STATUS);
        BKGDSET (MT_COLOR_STATUS);
!       CLEARLINE (statusoffset);
        if (IsHeader (extra))
        {
  	_mutt_make_string (buffer,
! 			   COLS-9 < sizeof (buffer) ? COLS-9 : sizeof (buffer),
  			   NONULL (PagerFmt), Context, extra->hdr, M_FORMAT_MAKEPRINT);
        }
        else if (IsMsgAttach (extra))
        {
  	_mutt_make_string (buffer,
! 			   COLS - 9 < sizeof (buffer) ? COLS - 9: sizeof (buffer),
  			   NONULL (PagerFmt), Context, extra->bdy->hdr, M_FORMAT_MAKEPRINT);
        }
!       mutt_paddstr (COLS-10, IsHeader (extra) || IsMsgAttach (extra) ?
  		    buffer : banner);
        addstr (" -- (");
        if (last_pos < sb.st_size - 1)
--- 1706,1727 ----
        /* print out the pager status bar */
        SETCOLOR (MT_COLOR_STATUS);
        BKGDSET (MT_COLOR_STATUS);
!       CLEARLINE_WIN(statusoffset);
        if (IsHeader (extra))
        {
  	_mutt_make_string (buffer,
! 			   COLS-9-SidebarWidth < sizeof (buffer) ?
! 			   COLS-9-SidebarWidth : sizeof (buffer),
  			   NONULL (PagerFmt), Context, extra->hdr, M_FORMAT_MAKEPRINT);
        }
        else if (IsMsgAttach (extra))
        {
  	_mutt_make_string (buffer,
! 			   COLS - 9 - SidebarWidth < sizeof (buffer) ?
! 			   COLS - 9 - SidebarWidth : sizeof (buffer),
  			   NONULL (PagerFmt), Context, extra->bdy->hdr, M_FORMAT_MAKEPRINT);
        }
!       mutt_paddstr (COLS-10-SidebarWidth, IsHeader (extra) || IsMsgAttach (extra) ?
  		    buffer : banner);
        addstr (" -- (");
        if (last_pos < sb.st_size - 1)
***************
*** 1732,1746 ****
        /* 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 (indexoffset + (option (OPTSTATUSONTOP) ? 0 : (indexlen - 1)), 0);
        SETCOLOR (MT_COLOR_STATUS);
!       mutt_paddstr (COLS, buffer);
        SETCOLOR (MT_COLOR_NORMAL);
      }
  
      redraw = 0;
  
--- 1737,1754 ----
        /* 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)),
! 		  SidebarWidth);
        SETCOLOR (MT_COLOR_STATUS);
!       mutt_paddstr (COLS-SidebarWidth, buffer);
        SETCOLOR (MT_COLOR_NORMAL);
      }
+ 	/* if we're not using the index, update every time */
+ 	if ( index == 0 )
+ 		draw_sidebar(MENU_PAGER);
  
      redraw = 0;
  
***************
*** 2607,2612 ****
--- 2615,2627 ----
          redraw = REDRAW_FULL;
          break;
  
+ 	  case OP_SCROLL_MBOX_UP:
+ 	  case OP_SCROLL_MBOX_DOWN:
+ 	  case OP_NEXT_MBOX:
+ 	  case OP_PREV_MBOX:
+ 	  case OP_OPEN_MBOX:
+ 	    scroll_sidebar(ch, MENU_PAGER);
+ 		break;
        default:
  	ch = -1;
  	break;
diff -N -c -r mutt-1.5.6.orig/PATCHES mutt-1.5.6/PATCHES
*** mutt-1.5.6.orig/PATCHES	2004-02-01 12:42:47.000000000 -0500
--- mutt-1.5.6/PATCHES	2004-06-02 14:10:25.000000000 -0400
***************
*** 0 ****
--- 1 ----
+ patch-1.5.6.jrh.sidebar.8
diff -N -c -r mutt-1.5.6.orig/sidebar.c mutt-1.5.6/sidebar.c
*** mutt-1.5.6.orig/sidebar.c	1969-12-31 19:00:00.000000000 -0500
--- mutt-1.5.6/sidebar.c	2004-06-04 03:04:04.000000000 -0400
***************
*** 0 ****
--- 1,242 ----
+ /*
+  * 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.
+  */ 
+ 
+ 
+ 
+ #include "mutt.h"
+ #include "mutt_menu.h"
+ #include "mutt_curses.h"
+ #include "sidebar.h"
+ #include "buffy.h"
+ #include <libgen.h>
+ #include "keymap.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);
+ 		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)
+ {
+ 	static char *entry = 0;
+ 	char *c;
+ 	int i = 0;
+ 
+ 	c = realloc(entry, SidebarWidth + 1);
+ 	if ( c ) entry = c;
+ 	entry[SidebarWidth] = 0;
+ 	for (; i < SidebarWidth; entry[i++] = ' ' );
+ 	i = strlen(box);
+ 	strncpy( entry, box, i < SidebarWidth ? i :SidebarWidth );
+ 
+ 	if ( new ) 
+ 		sprintf(
+ 			entry + SidebarWidth - 5 - quick_log10(size) - quick_log10(new),
+ 			"% d(%d)", size, new);
+ 	else
+ 		sprintf( entry + SidebarWidth - 3 - quick_log10(size), "% d", size);
+ 	return entry;
+ }
+ 
+ void set_curbuffy(char buf[LONG_STRING])
+ {
+   BUFFY* tmp = CurBuffy = Incoming;
+ 	if (!Incoming) return 0;
+   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;
+         attr_t attrs;
+         short color_pair;
+ 
+         static bool initialized = false;
+         static int prev_show_value;
+         static short saveSidebarWidth;
+ 
+         /* initialize first time */
+         if(!initialized) {
+                 prev_show_value = option(OPTMBOXPANE);
+                 saveSidebarWidth = SidebarWidth;
+                 if(!option(OPTMBOXPANE)) SidebarWidth = 0;
+                 initialized = true;
+         }
+ 
+         /* save or restore the value SidebarWidth */
+         if(prev_show_value != option(OPTMBOXPANE)) {
+                 if(prev_show_value && !option(OPTMBOXPANE)) {
+                         saveSidebarWidth = SidebarWidth;
+                         SidebarWidth = 0;
+                 } else if(!prev_show_value && option(OPTMBOXPANE)) {
+                         SidebarWidth = saveSidebarWidth;
+                 }
+                 prev_show_value = option(OPTMBOXPANE);
+         }
+ 
+ 
+ 	if ( SidebarWidth == 0 ) return 0;
+ 
+         /* get attributes for divider */
+ 	SETCOLOR(MT_COLOR_STATUS);
+         attr_get(&attrs, &color_pair, 0);
+         SETCOLOR(MT_COLOR_NORMAL);
+ 
+ 	/* draw the divider */
+ 
+ 	for ( ; lines < LINES-1-(menu != MENU_PAGER); lines++ ) {
+ 		move(lines, SidebarWidth - 1);
+ 		addch('|');
+                 mvchgat(lines, SidebarWidth - 1, 1, 0, color_pair, NULL);
+ 	}
+ 	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); tmp = tmp->next ) {
+ 		if ( tmp == CurBuffy )
+ 			SETCOLOR(MT_COLOR_INDICATOR);
+ 		else if ( tmp->msg_unread > 0 )
+ 			SETCOLOR(MT_COLOR_NEW);
+ 		else
+ 			SETCOLOR(MT_COLOR_NORMAL);
+ 
+ 		move( lines, 0 );
+ 		if ( Context && !strcmp( tmp->path, Context->path ) ) {
+ 			printw( "%.*s", SidebarWidth,
+ 				make_sidebar_entry(basename(tmp->path), Context->msgcount,
+ 				Context->unread));
+ 			tmp->msg_unread = Context->unread;
+ 			tmp->msgcount = Context->msgcount;
+ 		}
+ 		else
+ 			printw( "%.*s", SidebarWidth,
+ 				make_sidebar_entry(basename(tmp->path), tmp->msgcount,
+ 				tmp->msg_unread));
+ 		lines++;
+ 	}
+ 	SETCOLOR(MT_COLOR_NORMAL);
+ 	for ( ; lines < LINES - 1 - (menu != MENU_PAGER); lines++ ) {
+ 		int i = 0;
+ 		move( lines, 0 );
+ 		for ( ; i < SidebarWidth - 1; i++ )
+ 			addch(' ');
+ 	}
+ 	return 0;
+ }
+ 
+ void scroll_sidebar(int op, int menu)
+ {
+         if(!SidebarWidth) return;
+ 
+ 	switch (op) {
+ 		case OP_NEXT_MBOX:
+ 			if ( CurBuffy->next == NULL ) return;
+ 			CurBuffy = CurBuffy->next;
+ 			break;
+ 		case OP_PREV_MBOX:
+ 			if ( CurBuffy == Incoming ) return;
+ 			{
+ 				BUFFY *tmp = Incoming;
+ 				while ( tmp->next && strcmp(tmp->next->path, CurBuffy->path) ) tmp = tmp->next;
+ 				CurBuffy = tmp;
+ 			}
+ 			break;
+ 		case OP_SCROLL_MBOX_UP:
+ 			CurBuffy = TopBuffy;
+ 			if ( CurBuffy != Incoming ) {
+ 				calc_boundaries(menu);
+ 				CurBuffy = CurBuffy->prev;
+ 			}
+ 			break;
+ 		case OP_SCROLL_MBOX_DOWN:
+ 			CurBuffy = BottomBuffy;
+ 			if ( CurBuffy->next ) {
+ 				calc_boundaries(menu);
+ 				CurBuffy = CurBuffy->next;
+ 			}
+ 			break;
+ 		default:
+ 			return;
+ 	}
+ 	calc_boundaries(menu);
+ 	draw_sidebar(menu);
+ }
diff -N -c -r mutt-1.5.6.orig/sidebar.h mutt-1.5.6/sidebar.h
*** mutt-1.5.6.orig/sidebar.h	1969-12-31 19:00:00.000000000 -0500
--- mutt-1.5.6/sidebar.h	2004-06-03 02:16:56.000000000 -0400
***************
*** 0 ****
--- 1,35 ----
+ /*
+  * 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*);
+ 
+ #endif /* SIDEBAR_H */
diff -N -c -r mutt-1.5.6.orig/stamp-h mutt-1.5.6/stamp-h
*** mutt-1.5.6.orig/stamp-h	1969-12-31 19:00:00.000000000 -0500
--- mutt-1.5.6/stamp-h	2004-06-02 14:20:39.000000000 -0400
***************
*** 0 ****
--- 1 ----
+ timestamp