diff --git a/aw.listreply.diff b/aw.listreply.diff
index 1c6c475..644e714 100644
--- a/aw.listreply.diff
+++ b/aw.listreply.diff
@@ -11,7 +11,7 @@ ask when sending list message replies to author only - Armin Wolfermann (aw)
 +++ mutt-1.5.23/PATCHES	2015-01-26 15:34:40.133518493 +0000
 @@ -1,2 +1,3 @@
 +patch-1.5.9.aw.listreply.1
- patch-1.5.24.sidebar.20151111.txt
+ patch-1.6.0.sidebar.20160404.txt
  rr.compressed
 --- mutt-1.5.23/init.h
 +++ mutt-1.5.23/init.h	2012-06-21 09:48:22.000000000 +0000
@@ -19,11 +19,11 @@ ask when sending list message replies to author only - Armin Wolfermann (aw)
    ** The locale used by \fCstrftime(3)\fP to format dates. Legal values are
    ** the strings your system accepts for the locale environment variable \fC$$$LC_TIME\fP.
    */
-+  { "list_reply",      DT_QUAD, R_NONE, OPT_LISTREPLY, M_NO },
++  { "list_reply",	DT_QUAD, R_NONE, OPT_LISTREPLY, M_NO },
 +  /*
 +  ** .pp
 +  ** When set, address replies to the mailing list the original message came
-+  ** from (instead to the author only). Setting this option to ``ask-yes'' or
++  ** from (instead to the author only).  Setting this option to ``ask-yes'' or
 +  ** ``ask-no'' will ask if you really intended to reply to the author only.
 +  */
    { "mail_check",	DT_NUM,  R_NONE, UL &BuffyTimeout, 5 },
diff --git a/mutt-1.5.24-patches.tar.bz2 b/mutt-1.5.24-patches.tar.bz2
deleted file mode 100644
index 4516007..0000000
--- a/mutt-1.5.24-patches.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:835e4f8c81ab862ff8aed0b1b0eaaa3660534c3992e7752dcdfe7f02a0859ca0
-size 244
diff --git a/mutt-1.5.24.tar.gz b/mutt-1.5.24.tar.gz
deleted file mode 100644
index e8c42bb..0000000
--- a/mutt-1.5.24.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a292ca765ed7b19db4ac495938a3ef808a16193b7d623d65562bb8feb2b42200
-size 3897115
diff --git a/mutt-1.5.24-opennfs.dif b/mutt-1.6.0-opennfs.dif
similarity index 92%
rename from mutt-1.5.24-opennfs.dif
rename to mutt-1.6.0-opennfs.dif
index 1e2d824..5d0ee3e 100644
--- a/mutt-1.5.24-opennfs.dif
+++ b/mutt-1.6.0-opennfs.dif
@@ -10,7 +10,7 @@
  8 files changed, 144 insertions(+), 9 deletions(-)
 
 --- Makefile.am
-+++ Makefile.am	2015-09-11 14:41:16.061518931 +0000
++++ Makefile.am	2016-04-11 11:24:25.813117416 +0000
 @@ -29,7 +29,7 @@ mutt_SOURCES = \
  	edit.c enter.c flags.c init.c filter.c from.c \
  	getdomain.c group.c \
@@ -19,7 +19,7 @@
 +	main.c mbox.c menu.c mh.c mx.c opennfs.c pager.c parse.c pattern.c \
  	postpone.c query.c recvattach.c recvcmd.c \
  	rfc822.c rfc1524.c rfc2047.c rfc2231.c rfc3676.c \
- 	score.c send.c sendlib.c signal.c sort.c \
+ 	sidebar.c \
 @@ -84,7 +84,7 @@ mutt_dotlock_SOURCES = mutt_dotlock.c
  mutt_dotlock_LDADD = $(LIBOBJS)
  mutt_dotlock_DEPENDENCIES = $(LIBOBJS)
@@ -30,8 +30,8 @@
  pgpring_DEPENDENCIES = $(LIBOBJS) $(INTLDEPS)
  
 --- Makefile.in
-+++ Makefile.in	2015-09-11 14:41:53.390018589 +0000
-@@ -125,7 +125,7 @@ am_mutt_OBJECTS = addrbook.$(OBJEXT) ali
++++ Makefile.in	2016-04-11 11:23:21.414301183 +0000
+@@ -128,7 +128,7 @@ am_mutt_OBJECTS = addrbook.$(OBJEXT) ali
  	hash.$(OBJEXT) hdrline.$(OBJEXT) headers.$(OBJEXT) \
  	help.$(OBJEXT) hook.$(OBJEXT) keymap.$(OBJEXT) main.$(OBJEXT) \
  	mbox.$(OBJEXT) menu.$(OBJEXT) mh.$(OBJEXT) mx.$(OBJEXT) \
@@ -40,7 +40,7 @@
  	postpone.$(OBJEXT) query.$(OBJEXT) recvattach.$(OBJEXT) \
  	recvcmd.$(OBJEXT) rfc822.$(OBJEXT) rfc1524.$(OBJEXT) \
  	rfc2047.$(OBJEXT) rfc2231.$(OBJEXT) rfc3676.$(OBJEXT) \
-@@ -155,7 +155,7 @@ pgpewrap_LDADD = $(LDADD)
+@@ -159,7 +159,7 @@ pgpewrap_LDADD = $(LDADD)
  pgpewrap_DEPENDENCIES = $(LIBOBJS) $(am__DEPENDENCIES_1)
  am_pgpring_OBJECTS = pgppubring.$(OBJEXT) pgplib.$(OBJEXT) \
  	lib.$(OBJEXT) extlib.$(OBJEXT) sha1.$(OBJEXT) md5.$(OBJEXT) \
@@ -49,7 +49,7 @@
  pgpring_OBJECTS = $(am_pgpring_OBJECTS)
  am_txt2c_OBJECTS = txt2c.$(OBJEXT)
  txt2c_OBJECTS = $(am_txt2c_OBJECTS)
-@@ -474,7 +474,7 @@ mutt_SOURCES = \
+@@ -486,7 +486,7 @@ mutt_SOURCES = \
  	edit.c enter.c flags.c init.c filter.c from.c \
  	getdomain.c group.c \
  	handler.c hash.c hdrline.c headers.c help.c hook.c keymap.c \
@@ -59,7 +59,7 @@
  	rfc822.c rfc1524.c rfc2047.c rfc2231.c rfc3676.c \
  	score.c send.c sendlib.c signal.c sort.c \
 --- lib.c
-+++ lib.c	2009-03-02 23:00:00.000000000 +0000
++++ lib.c	2016-04-11 11:23:21.414301183 +0000
 @@ -50,6 +50,7 @@
  #define EX_OK 0
  #endif
@@ -89,7 +89,7 @@
    if (lstat (path, &osb) < 0 || fstat (fd, &nsb) < 0 ||
        compare_stat(&osb, &nsb) == -1)
 --- mbox.c
-+++ mbox.c	2010-11-04 14:01:05.000000000 +0000
++++ mbox.c	2016-04-11 11:23:21.414301183 +0000
 @@ -781,7 +781,7 @@ int mbox_sync_mailbox (CONTEXT *ctx, int
  
    /* Create a temporary file to write the new version of the mailbox in. */
@@ -100,7 +100,7 @@
    {
      if (-1 != i)
 --- mh.c
-+++ mh.c	2009-03-02 23:00:00.000000000 +0000
++++ mh.c	2016-04-11 11:23:21.414301183 +0000
 @@ -332,7 +332,11 @@ static int mh_mkstemp (CONTEXT * dest, F
    {
      snprintf (path, _POSIX_PATH_MAX, "%s/.mutt-%s-%d-%d",
@@ -127,15 +127,15 @@
        if (errno != EEXIST)
        {
 --- mutt.h
-+++ mutt.h	2009-03-02 23:00:00.000000000 +0000
-@@ -981,4 +981,5 @@ typedef struct
++++ mutt.h	2016-04-11 11:23:21.414301183 +0000
+@@ -987,4 +987,5 @@ typedef struct
  #include "lib.h"
  #include "globals.h"
  
 +extern int opennfs(const char *, int, int);
  #endif /*MUTT_H*/
 --- opennfs.c
-+++ opennfs.c	2009-03-02 23:00:00.000000000 +0000
++++ opennfs.c	2016-04-11 11:23:21.414301183 +0000
 @@ -0,0 +1,122 @@
 +#include <errno.h>
 +#include <fcntl.h>
@@ -260,7 +260,7 @@
 +    return open(path, flags, mode);
 +}
 --- sendlib.c
-+++ sendlib.c	2009-03-02 23:00:00.000000000 +0000
++++ sendlib.c	2016-04-11 11:23:21.414301183 +0000
 @@ -2223,7 +2223,7 @@ send_msg (const char *path, char **args,
        if (SendmailWait >= 0 && tempfile && *tempfile)
        {
diff --git a/mutt-1.6.0-patches.tar.bz2 b/mutt-1.6.0-patches.tar.bz2
new file mode 100644
index 0000000..ffe792f
--- /dev/null
+++ b/mutt-1.6.0-patches.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:859441143833d0f64f59eccec64091a5eb9913282b20ac7fc9490917f6fbd3a5
+size 235
diff --git a/mutt-1.5.24.dif b/mutt-1.6.0.dif
similarity index 87%
rename from mutt-1.5.24.dif
rename to mutt-1.6.0.dif
index 0c80a02..945c77e 100644
--- a/mutt-1.5.24.dif
+++ b/mutt-1.6.0.dif
@@ -9,7 +9,7 @@
  7 files changed, 112 insertions(+), 30 deletions(-)
 
 --- configure.ac
-+++ configure.ac	2007-06-01 10:57:38.000000000 +0000
++++ configure.ac	2016-04-11 11:09:41.997377315 +0000
 @@ -240,7 +240,7 @@ main ()
                          mutt_cv_slang=$withval
                          if test -d $withval/include/slang; then
@@ -46,8 +46,8 @@
  
            saved_LIBS="$LIBS"
 --- doc/Makefile.in
-+++ doc/Makefile.in	2010-11-04 13:01:18.000000000 +0000
-@@ -685,7 +685,7 @@ uninstall-local:
++++ doc/Makefile.in	2016-04-11 11:09:41.997377315 +0000
+@@ -697,7 +697,7 @@ uninstall-local:
  
  check:
  manual.txt: manual.html
@@ -56,8 +56,19 @@
  	LC_ALL=C w3m -dump manual.html > $@ || \
  	LC_ALL=C elinks -dump -no-numbering -no-references manual.html | sed -e 's,\\001, ,g' > $@
  
+--- doc/Muttrc.head
++++ doc/Muttrc.head	2016-04-11 11:09:41.997377315 +0000
+@@ -23,7 +23,7 @@ macro index,pager,attach,compose \cb "\
+ "call urlview to extract URLs out of a message"
+ 
+ # Show documentation when pressing F1
+-macro generic,pager <F1> "<shell-escape> less @docdir@/manual.txt<Enter>" "show Mutt documentation"
++macro generic,index,pager <F1> "<shell-escape> less -iM @docdir@/manual.txt<Enter>" "show Mutt documentation"
+ 
+ # show the incoming mailboxes list (just like "mutt -y") and back when pressing "y"
+ macro index,pager y "<change-folder>?<toggle-mailboxes>" "show incoming mailboxes list"
 --- doc/Muttrc
-+++ doc/Muttrc	2009-03-03 14:56:33.000000000 +0000
++++ doc/Muttrc	2016-04-11 11:07:05.472260646 +0000
 @@ -23,7 +23,7 @@ macro index,pager,attach,compose \cb "\
  "call urlview to extract URLs out of a message"
  
@@ -93,7 +104,7 @@
  # Name: check_mbox_size
  # Type: boolean
  # Default: no
-@@ -909,11 +909,11 @@ attachments   -I message/external-body
+@@ -912,11 +912,11 @@ attachments   -I message/external-body
  # filtered message is read from the standard output.
  # 
  # 
@@ -107,7 +118,7 @@
  # 
  # 
  # Contains the path of the mutt_dotlock(8) binary to be used by
-@@ -2351,9 +2351,9 @@ attachments   -I message/external-body
+@@ -2380,9 +2380,9 @@ attachments   -I message/external-body
  # directly from the pager, and screen resizes cause lines longer than
  # the screen width to be badly formatted in the help menu.
  # 
@@ -120,7 +131,7 @@
  # Name: pager_context
  # Type: number
  # Default: 0
-@@ -2381,9 +2381,9 @@ attachments   -I message/external-body
+@@ -2410,9 +2410,9 @@ attachments   -I message/external-body
  # pager.  The valid sequences are listed in the $index_format
  # section.
  # 
@@ -133,7 +144,7 @@
  # Name: pager_index_lines
  # Type: number
  # Default: 0
-@@ -2401,9 +2401,9 @@ attachments   -I message/external-body
+@@ -2430,9 +2430,9 @@ attachments   -I message/external-body
  # is less than $pager_index_lines, then the index will only use as
  # many lines as it needs.
  # 
@@ -146,9 +157,9 @@
  # Name: pager_stop
  # Type: boolean
  # Default: no
-@@ -3440,9 +3440,9 @@ attachments   -I message/external-body
- # (possibly undeleted) message whenever a command that modifies the
- # current message is executed.
+@@ -3538,9 +3538,9 @@ attachments   -I message/external-body
+ # user-defined headers, and other processing effects from being
+ # made multiple times to the draft file.
  # 
 -# 
 -# set reverse_alias=no
@@ -159,7 +170,7 @@
  # Name: reverse_alias
  # Type: boolean
  # Default: no
-@@ -3574,6 +3574,18 @@ attachments   -I message/external-body
+@@ -3672,6 +3672,18 @@ attachments   -I message/external-body
  # Also see the $force_name variable.
  # 
  # 
@@ -178,7 +189,7 @@
  # set score=yes
  #
  # Name: score
-@@ -4144,9 +4156,9 @@ attachments   -I message/external-body
+@@ -4255,9 +4267,9 @@ attachments   -I message/external-body
  # Setting this variable overrides the value of the $sendmail
  # variable.
  # 
@@ -191,7 +202,7 @@
  # Name: sort
  # Type: sort order
  # Default: date
-@@ -4630,9 +4642,9 @@ attachments   -I message/external-body
+@@ -4741,9 +4753,9 @@ attachments   -I message/external-body
  # When set, mutt uses the date received rather than the date sent
  # to thread messages by subject.
  # 
@@ -204,7 +215,7 @@
  # Name: tilde
  # Type: boolean
  # Default: no
-@@ -4980,6 +4992,42 @@ attachments   -I message/external-body
+@@ -5079,6 +5091,42 @@ attachments   -I message/external-body
  # in this case.
  # 
  # 
@@ -247,19 +258,8 @@
  # set write_inc=10
  #
  # Name: write_inc
---- doc/Muttrc.head
-+++ doc/Muttrc.head	2007-06-01 10:51:04.000000000 +0000
-@@ -23,7 +23,7 @@ macro index,pager,attach,compose \cb "\
- "call urlview to extract URLs out of a message"
- 
- # Show documentation when pressing F1
--macro generic,pager <F1> "<shell-escape> less @docdir@/manual.txt<Enter>" "show Mutt documentation"
-+macro generic,index,pager <F1> "<shell-escape> less -iM @docdir@/manual.txt<Enter>" "show Mutt documentation"
- 
- # show the incoming mailboxes list (just like "mutt -y") and back when pressing "y"
- macro index,pager y "<change-folder>?<toggle-mailboxes>" "show incoming mailboxes list"
 --- imap/auth.c
-+++ imap/auth.c	2006-11-09 15:19:56.000000000 +0000
++++ imap/auth.c	2016-04-11 11:09:41.997377315 +0000
 @@ -72,6 +72,23 @@ int imap_authenticate (IMAP_DATA* idata)
        dprint (2, (debugfile, "imap_authenticate: Trying method %s\n", method));
        authenticator = imap_authenticators;
@@ -295,8 +295,8 @@
  
      FREE (&methods);
 --- init.h
-+++ init.h	2009-06-25 15:52:10.000000000 +0000
-@@ -3044,6 +3044,9 @@ struct option_t MuttVars[] = {
++++ init.h	2016-04-11 11:09:41.997377315 +0000
+@@ -3122,6 +3122,9 @@ struct option_t MuttVars[] = {
    ** the default from the GNUTLS library.
    */
  # endif /* USE_SSL_GNUTLS */
@@ -307,8 +307,8 @@
    /*
    ** .pp
 --- mx.c
-+++ mx.c	2011-07-07 11:24:49.000000000 +0000
-@@ -1537,6 +1537,9 @@ void mx_update_context (CONTEXT *ctx, in
++++ mx.c	2016-04-11 11:09:42.001377242 +0000
+@@ -1544,6 +1544,9 @@ void mx_update_context (CONTEXT *ctx, in
    {
      h = ctx->hdrs[msgno];
  
diff --git a/mutt-1.6.0.tar.gz b/mutt-1.6.0.tar.gz
new file mode 100644
index 0000000..34eaaf9
--- /dev/null
+++ b/mutt-1.6.0.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:29afb6238ab7a540c0e3a78ce25c970f975ab6c0f0bc9f919993aab772136c19
+size 3954591
diff --git a/mutt.changes b/mutt.changes
index 3572c48..4c8dc81 100644
--- a/mutt.changes
+++ b/mutt.changes
@@ -1,3 +1,45 @@
+-------------------------------------------------------------------
+Mon Apr 11 12:04:29 UTC 2016 - werner@suse.de
+
+- Update to mutt version 1.6.0 (2016-04-04):
+  + Enabled utf-8 mailbox support for IMAP.
+  + New expandos %r and %R for comma separated list of To: and Cc:
+    recipients respectively.
+  + Improved support for internationalized email and SMTPUTF8 (RFC653[0-3]).
+  ! $use_idn has been renamed to $idn_decode.
+  + $idn_encode controls whether outgoing email address domains will
+    be IDNA encoded.  If your MTA supports it, unset to use utf-8
+    email address domains.
+  + The S/MIME message digest algorithm is now specified using the
+    option $smime_sign_digest_alg.  Note that $smime_sign_command
+    should be modified to include "-md %d".  Please see
+    contrib/smime.rc.
+  + $reflow_space_quotes allows format=flowed email quotes to be
+    displayed with spacing between them.
+  ! multipart draft files are now supported.
+  + The "-E" command line argument causes mutt to edit draft or include files.
+    All changes made in mutt will be saved back out to those files.
+  + $resume_draft_files and $resume_edited_draft_files control how
+    mutt processes draft files.
+  + For classic gpg mode, $pgp_decryption_okay should be set to verify
+    multipart/encrypted are actually encrypted.  Please see
+    contrib/gpg.rc for the suggested value.
+  ! mailto URL header parameters by default are now restricted to
+    'body' and 'subject'.
+  + mailto_allow and unmailto_allow can be used to add or remove
+    allowed mailto header parameters.
+  ! The method of setting $hostname has been changed.  Rather than
+    scanning /etc/resolv.conf, the domain will now be determined using
+    DNS calls.
+- Modfied patches
+   aw.listreply.diff
+   patch-1.5.24.vk.pgp_verbose_mime
+- Ported patches
+   mutt-1.5.24.dif becomes mutt-1.6.0.dif
+   mutt-1.5.24-opennfs.dif becomes mutt-1.6.0-opennfs.dif
+   patch-1.5.24.rr.compressed.bz2 becomes patch-1.6.0.rr.compressed.bz2
+   patch-1.5.24.sidebar.20151111.patch becomes patch-1.6.0.sidebar.20160411.patch
+
 -------------------------------------------------------------------
 Mon Feb 29 15:22:58 UTC 2016 - werner@suse.de
 
diff --git a/mutt.spec b/mutt.spec
index d678c17..365880d 100644
--- a/mutt.spec
+++ b/mutt.spec
@@ -68,7 +68,7 @@ Requires:       perl(Expect)
 # NOTE: We don't want this dependency and desktop-data-SuSE is in all
 # desktop selections.
 #Requires:    desktop-data-SuSE
-Version:        1.5.24
+Version:        1.6.0
 Release:        0
 Summary:        Mail Program
 License:        GPL-2.0+
@@ -90,9 +90,9 @@ Patch1:         patch-%version.rr.compressed.bz2
 Patch2:         %name-1.5.9i-pgpewrap.diff
 Patch3:         %name-1.5.20-sendgroupreplyto.diff
 Patch4:         %name-1.5.15-wrapcolumn.diff
-# http://lunar-linux.org/mutt-sidebar
-Patch6:         patch-1.5.24.sidebar.20151111.patch
-Patch7:         mutt-1.5.24-opennfs.dif
+# http://www.lunar-linux.org/mutt-sidebar/
+Patch6:         patch-1.6.0.sidebar.20160411.patch
+Patch7:         mutt-1.6.0-opennfs.dif
 Patch9:         bug-676388-largefile.patch
 Patch10:        mutt-1.5.21-tinfo.dif
 # http://www.wolfermann.org/mutt.html
diff --git a/patch-1.5.24.rr.compressed.bz2 b/patch-1.5.24.rr.compressed.bz2
deleted file mode 100644
index deadb93..0000000
--- a/patch-1.5.24.rr.compressed.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9b1e63f051e53cb84faa541635df295c0a1e04a1f5a8cf3747f3b1eadb4561a9
-size 9696
diff --git a/patch-1.5.24.vk.pgp_verbose_mime b/patch-1.5.24.vk.pgp_verbose_mime
index 1cdc5fa..b55e4b9 100644
--- a/patch-1.5.24.vk.pgp_verbose_mime
+++ b/patch-1.5.24.vk.pgp_verbose_mime
@@ -10,7 +10,7 @@
 @@ -1,3 +1,4 @@
 +patch-1.5.3.vk.pgp_verbose_mime
  patch-1.5.9.aw.listreply.1
- patch-1.5.24.sidebar.20151111.txt
+ patch-1.6.0.sidebar.20160404.txt
  rr.compressed
 --- globals.h
 +++ globals.h	2012-04-11 04:52:45.000000000 +0000
diff --git a/patch-1.6.0.rr.compressed.bz2 b/patch-1.6.0.rr.compressed.bz2
new file mode 100644
index 0000000..09df962
--- /dev/null
+++ b/patch-1.6.0.rr.compressed.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:08e03883b29f3cdb1cd70b948e7de39dd381b45f5a262a85b1df96d08927bc78
+size 9671
diff --git a/patch-1.5.24.sidebar.20151111.patch b/patch-1.6.0.sidebar.20160411.patch
similarity index 82%
rename from patch-1.5.24.sidebar.20151111.patch
rename to patch-1.6.0.sidebar.20160411.patch
index 670a931..93fe001 100644
--- a/patch-1.5.24.sidebar.20151111.patch
+++ b/patch-1.6.0.sidebar.20160411.patch
@@ -1,96 +1,71 @@
 ---
- Makefile.am    |   1 +
- Makefile.in    |  17 ++-
- OPS            |   5 +
- PATCHES        |   1 +
- buffy.c        | 152 ++++++++++++++++++++-
- buffy.h        |   6 +
- color.c        |   2 +
- compose.c      |  26 ++--
- configure.ac   |   2 +
- curs_main.c    |  37 +++++-
- doc/Muttrc     |  20 +++
- flags.c        |   3 +
- functions.h    |  10 ++
- globals.h      |   6 +
- handler.c      |  30 ++++-
- imap/command.c |   7 +
- imap/imap.c    |   2 +-
- init.h         |  48 +++++++
- mailbox.h      |   1 +
- main.c         |  11 +-
- mbox.c         |   2 +
- menu.c         |  20 +--
- mh.c           |  26 ++++
- mutt.h         |   6 +
- mutt_curses.h  |   3 +
- mutt_menu.h    |   1 +
- muttlib.c      |  48 +++++++
- mx.c           |  24 +++-
- mx.h           |   1 +
- pager.c        |  42 +++++-
- pattern.c      |  38 ++++++
- protos.h       |   7 +
- sidebar.c      | 410 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- sidebar.h      |  36 +++++
- 34 files changed, 1003 insertions(+), 48 deletions(-)
- create mode 100644 sidebar.c
- create mode 100644 sidebar.h
+ Makefile.am    |    1 
+ Makefile.in    |    3 
+ OPS            |    5 
+ PATCHES        |    1 
+ buffy.c        |  150 ++++++++++++++++++++
+ buffy.h        |    6 
+ color.c        |    2 
+ compose.c      |   26 +--
+ configure.ac   |    2 
+ curs_main.c    |   35 ++++
+ doc/Muttrc     |   20 ++
+ flags.c        |    3 
+ functions.h    |   10 +
+ globals.h      |    6 
+ handler.c      |   30 ++++
+ imap/command.c |    7 
+ imap/imap.c    |    2 
+ init.h         |   48 ++++++
+ mailbox.h      |    1 
+ main.c         |   11 +
+ mbox.c         |    2 
+ menu.c         |   20 +-
+ mh.c           |   26 +++
+ mutt.h         |    6 
+ mutt_curses.h  |    3 
+ mutt_menu.h    |    1 
+ muttlib.c      |   48 ++++++
+ mx.c           |   22 +++
+ mx.h           |    1 
+ pager.c        |   42 ++++-
+ pattern.c      |   38 +++++
+ protos.h       |    7 
+ sidebar.c      |  410 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ sidebar.h      |   36 +++++
+ 34 files changed, 993 insertions(+), 38 deletions(-)
 
-diff --git a/Makefile.am b/Makefile.am
-index da1c3d4..0fc7ab2 100644
+diff --git a/Makefile.am b/mutt-1.6.0/Makefile.am
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -34,6 +34,7 @@ mutt_SOURCES = \
+@@ -32,6 +32,7 @@ mutt_SOURCES = \
+ 	main.c mbox.c menu.c mh.c mx.c pager.c parse.c pattern.c \
+ 	postpone.c query.c recvattach.c recvcmd.c \
  	rfc822.c rfc1524.c rfc2047.c rfc2231.c rfc3676.c \
++	sidebar.c \
  	score.c send.c sendlib.c signal.c sort.c \
  	status.c system.c thread.c charset.c history.c lib.c \
-+	sidebar.c \
- 	muttlib.c editmsg.c mbyte.c \
- 	url.c ascii.c crypt-mod.c crypt-mod.h safe_asprintf.c
- 
-diff --git a/Makefile.in b/Makefile.in
-index c830b75..3bd847d 100644
+ 	muttlib.c editmsg.c mbyte.c mutt_idna.c \
+diff --git a/Makefile.in b/mutt-1.6.0/Makefile.in
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -87,10 +87,10 @@ DIST_COMMON = $(top_srcdir)/flymake.am $(srcdir)/Makefile.in \
- 	$(srcdir)/Makefile.am $(top_srcdir)/configure \
- 	$(am__configure_deps) $(srcdir)/config.h.in \
- 	$(top_srcdir)/intl/Makefile.in $(srcdir)/hcachever.sh.in \
--	$(srcdir)/muttbug.sh.in strtok_r.c strcasecmp.c regex.c \
--	snprintf.c wcscasecmp.c strcasestr.c setenv.c mkdtemp.c \
--	strsep.c strdup.c depcomp ABOUT-NLS ChangeLog INSTALL NEWS \
--	README TODO compile config.guess config.sub install-sh missing
-+	$(srcdir)/muttbug.sh.in snprintf.c strtok_r.c regex.c strdup.c \
-+	strcasecmp.c setenv.c strcasestr.c wcscasecmp.c mkdtemp.c \
-+	strsep.c depcomp ABOUT-NLS ChangeLog INSTALL NEWS README TODO \
-+	compile config.guess config.sub install-sh missing
- EXTRA_PROGRAMS = mutt_dotlock$(EXEEXT) pgpring$(EXEEXT) \
- 	pgpewrap$(EXEEXT) mutt_md5$(EXEEXT)
- bin_PROGRAMS = mutt$(EXEEXT) $(DOTLOCK_TARGET) $(PGPAUX_TARGET)
-@@ -132,9 +132,10 @@ am_mutt_OBJECTS = addrbook.$(OBJEXT) alias.$(OBJEXT) attach.$(OBJEXT) \
+@@ -133,6 +133,7 @@ am_mutt_OBJECTS = addrbook.$(OBJEXT) ali
+ 	recvcmd.$(OBJEXT) rfc822.$(OBJEXT) rfc1524.$(OBJEXT) \
+ 	rfc2047.$(OBJEXT) rfc2231.$(OBJEXT) rfc3676.$(OBJEXT) \
  	score.$(OBJEXT) send.$(OBJEXT) sendlib.$(OBJEXT) \
++	sidebar.$(OBJECT) \
  	signal.$(OBJEXT) sort.$(OBJEXT) status.$(OBJEXT) \
  	system.$(OBJEXT) thread.$(OBJEXT) charset.$(OBJEXT) \
--	history.$(OBJEXT) lib.$(OBJEXT) muttlib.$(OBJEXT) \
--	editmsg.$(OBJEXT) mbyte.$(OBJEXT) url.$(OBJEXT) \
--	ascii.$(OBJEXT) crypt-mod.$(OBJEXT) safe_asprintf.$(OBJEXT)
-+	history.$(OBJEXT) lib.$(OBJEXT) sidebar.$(OBJEXT) \
-+	muttlib.$(OBJEXT) editmsg.$(OBJEXT) mbyte.$(OBJEXT) \
-+	url.$(OBJEXT) ascii.$(OBJEXT) crypt-mod.$(OBJEXT) \
-+	safe_asprintf.$(OBJEXT)
- am__objects_1 =
- am__objects_2 = patchlist.$(OBJEXT) conststrings.$(OBJEXT) \
- 	$(am__objects_1)
-@@ -478,6 +479,7 @@ mutt_SOURCES = \
+ 	history.$(OBJEXT) lib.$(OBJEXT) muttlib.$(OBJEXT) \
+@@ -489,6 +490,7 @@ mutt_SOURCES = \
+ 	postpone.c query.c recvattach.c recvcmd.c \
  	rfc822.c rfc1524.c rfc2047.c rfc2231.c rfc3676.c \
  	score.c send.c sendlib.c signal.c sort.c \
- 	status.c system.c thread.c charset.c history.c lib.c \
 +	sidebar.c \
- 	muttlib.c editmsg.c mbyte.c \
+ 	status.c system.c thread.c charset.c history.c lib.c \
+ 	muttlib.c editmsg.c mbyte.c mutt_idna.c \
  	url.c ascii.c crypt-mod.c crypt-mod.h safe_asprintf.c
- 
-@@ -808,6 +810,7 @@ distclean-compile:
+@@ -819,6 +821,7 @@ distclean-compile:
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/send.Po@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sendlib.Po@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sha1.Po@am__quote@
@@ -98,11 +73,10 @@ index c830b75..3bd847d 100644
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/signal.Po@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/smime.Po@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/smtp.Po@am__quote@
-diff --git a/OPS b/OPS
-index 8414a8b..ef14453 100644
+diff --git a/OPS b/mutt-1.6.0/OPS
 --- a/OPS
 +++ b/OPS
-@@ -179,3 +179,8 @@ OP_WHAT_KEY "display the keycode for a key press"
+@@ -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"
@@ -111,18 +85,16 @@ index 8414a8b..ef14453 100644
 +OP_SIDEBAR_NEXT "go down to next mailbox"
 +OP_SIDEBAR_PREV "go to previous mailbox"
 +OP_SIDEBAR_OPEN "open hilighted mailbox"
-diff --git a/PATCHES b/PATCHES
-index 91a8cf6..c9f9313 100644
+diff --git a/PATCHES b/mutt-1.6.0/PATCHES
 --- a/PATCHES
 +++ b/PATCHES
 @@ -1 +1,2 @@
-+patch-1.5.24.sidebar.20151111.txt
++patch-1.6.0.sidebar.20160404.txt
  rr.compressed
-diff --git a/buffy.c b/buffy.c
-index 12a16d1..d108a09 100644
+diff --git a/buffy.c b/mutt-1.6.0/buffy.c
 --- a/buffy.c
 +++ b/buffy.c
-@@ -161,6 +161,49 @@ void mutt_buffy_cleanup (const char *buf, struct stat *st)
+@@ -161,6 +161,49 @@ void mutt_buffy_cleanup (const char *buf
    }
  }
  
@@ -186,7 +158,7 @@ index 12a16d1..d108a09 100644
    buffy->next = NULL;
    buffy->magic = 0;
  
-@@ -243,8 +290,8 @@ int mutt_parse_mailboxes (BUFFER *path, BUFFER *s, unsigned long data, BUFFER *e
+@@ -243,8 +290,8 @@ int mutt_parse_mailboxes (BUFFER *path,
      p = realpath (buf, f1);
      for (tmp = &Incoming; *tmp; tmp = &((*tmp)->next))
      {
@@ -197,7 +169,7 @@ index 12a16d1..d108a09 100644
        {
  	dprint(3,(debugfile,"mailbox '%s' already registered as '%s'\n", buf, (*tmp)->path));
  	break;
-@@ -282,6 +329,7 @@ int mutt_parse_mailboxes (BUFFER *path, BUFFER *s, unsigned long data, BUFFER *e
+@@ -282,6 +329,7 @@ int mutt_parse_mailboxes (BUFFER *path,
      else
        (*tmp)->size = 0;
    }
@@ -205,7 +177,7 @@ index 12a16d1..d108a09 100644
    return 0;
  }
  
-@@ -306,6 +354,11 @@ static int buffy_maildir_dir_hasnew(BUFFY* mailbox, const char *dir_name)
+@@ -306,6 +354,11 @@ static int buffy_maildir_dir_hasnew(BUFF
        return 0;
    }
  
@@ -217,7 +189,7 @@ index 12a16d1..d108a09 100644
    if ((dirp = opendir (path)) == NULL)
    {
      mailbox->magic = 0;
-@@ -357,6 +410,73 @@ static int buffy_maildir_hasnew (BUFFY* mailbox)
+@@ -357,6 +410,73 @@ static int buffy_maildir_hasnew (BUFFY*
  
    return 0;
  }
@@ -291,7 +263,7 @@ index 12a16d1..d108a09 100644
  /* returns 1 if mailbox has new mail */ 
  static int buffy_mbox_hasnew (BUFFY* mailbox, struct stat *sb)
  {
-@@ -368,7 +488,7 @@ static int buffy_mbox_hasnew (BUFFY* mailbox, struct stat *sb)
+@@ -368,7 +488,7 @@ static int buffy_mbox_hasnew (BUFFY* mai
    else
      statcheck = sb->st_mtime > sb->st_atime
        || (mailbox->newly_created && sb->st_ctime == sb->st_mtime && sb->st_ctime == sb->st_atime);
@@ -300,7 +272,7 @@ index 12a16d1..d108a09 100644
    {
      if (!option(OPTMAILCHECKRECENT) || sb->st_mtime > mailbox->last_visited)
      {
-@@ -388,6 +508,27 @@ static int buffy_mbox_hasnew (BUFFY* mailbox, struct stat *sb)
+@@ -388,6 +508,27 @@ static int buffy_mbox_hasnew (BUFFY* mai
    return rc;
  }
  
@@ -328,7 +300,7 @@ index 12a16d1..d108a09 100644
  int mutt_buffy_check (int force)
  {
    BUFFY *tmp;
-@@ -461,17 +602,20 @@ int mutt_buffy_check (int force)
+@@ -461,16 +602,19 @@ int mutt_buffy_check (int force)
        {
        case M_MBOX:
        case M_MMDF:
@@ -344,14 +316,11 @@ index 12a16d1..d108a09 100644
  	break;
  
        case M_MH:
--	mh_buffy(tmp);
 +	mh_buffy_update (tmp->path, &tmp->msgcount, &tmp->msg_unread, &tmp->msg_flagged, &tmp->sb_last_checked);
-+        mh_buffy(tmp);
+ 	mh_buffy(tmp);
  	if (tmp->new)
  	  BuffyCount++;
- 	break;
-diff --git a/buffy.h b/buffy.h
-index f9fc55a..1436451 100644
+diff --git a/buffy.h b/mutt-1.6.0/buffy.h
 --- a/buffy.h
 +++ b/buffy.h
 @@ -23,13 +23,19 @@
@@ -374,8 +343,7 @@ index f9fc55a..1436451 100644
  }
  BUFFY;
  
-diff --git a/color.c b/color.c
-index 64a46dc..d6f9198 100644
+diff --git a/color.c b/mutt-1.6.0/color.c
 --- a/color.c
 +++ b/color.c
 @@ -94,6 +94,8 @@ static const struct mapping_t Fields[] =
@@ -387,8 +355,7 @@ index 64a46dc..d6f9198 100644
    { NULL,		0 }
  };
  
-diff --git a/compose.c b/compose.c
-index 9d87060..b63695f 100644
+diff --git a/compose.c b/mutt-1.6.0/compose.c
 --- a/compose.c
 +++ b/compose.c
 @@ -72,7 +72,7 @@ enum
@@ -400,7 +367,7 @@ index 9d87060..b63695f 100644
  
  static const char * const Prompts[] =
  {
-@@ -110,7 +110,7 @@ static void snd_entry (char *b, size_t blen, MUTTMENU *menu, int num)
+@@ -110,7 +110,7 @@ static void snd_entry (char *b, size_t b
  
  static void redraw_crypt_lines (HEADER *msg)
  {
@@ -409,7 +376,7 @@ index 9d87060..b63695f 100644
  
    if ((WithCrypto & (APPLICATION_PGP | APPLICATION_SMIME)) == 0)
    {
-@@ -145,7 +145,7 @@ static void redraw_crypt_lines (HEADER *msg)
+@@ -145,7 +145,7 @@ static void redraw_crypt_lines (HEADER *
        addstr (_(" (OppEnc mode)"));
  
    clrtoeol ();
@@ -418,7 +385,7 @@ index 9d87060..b63695f 100644
    clrtoeol ();
  
    if ((WithCrypto & APPLICATION_PGP)
-@@ -162,7 +162,7 @@ static void redraw_crypt_lines (HEADER *msg)
+@@ -162,7 +162,7 @@ static void redraw_crypt_lines (HEADER *
        && (msg->security & ENCRYPT)
        && SmimeCryptAlg
        && *SmimeCryptAlg) {
@@ -427,7 +394,7 @@ index 9d87060..b63695f 100644
  		NONULL(SmimeCryptAlg));
    }
  }
-@@ -175,7 +175,7 @@ static void redraw_mix_line (LIST *chain)
+@@ -175,7 +175,7 @@ static void redraw_mix_line (LIST *chain
    int c;
    char *t;
  
@@ -436,7 +403,7 @@ index 9d87060..b63695f 100644
  
    if (!chain)
    {
-@@ -190,7 +190,7 @@ static void redraw_mix_line (LIST *chain)
+@@ -190,7 +190,7 @@ static void redraw_mix_line (LIST *chain
      if (t && t[0] == '0' && t[1] == '\0')
        t = "<random>";
      
@@ -445,7 +412,7 @@ index 9d87060..b63695f 100644
        break;
  
      addstr (NONULL(t));
-@@ -242,7 +242,7 @@ static void draw_envelope_addr (int line, ADDRESS *addr)
+@@ -242,7 +242,7 @@ static void draw_envelope_addr (int line
  
    buf[0] = 0;
    rfc822_write_address (buf, sizeof (buf), addr, 1);
@@ -454,7 +421,7 @@ index 9d87060..b63695f 100644
    mutt_paddstr (W, buf);
  }
  
-@@ -252,10 +252,10 @@ static void draw_envelope (HEADER *msg, char *fcc)
+@@ -252,10 +252,10 @@ static void draw_envelope (HEADER *msg,
    draw_envelope_addr (HDR_TO, msg->env->to);
    draw_envelope_addr (HDR_CC, msg->env->cc);
    draw_envelope_addr (HDR_BCC, msg->env->bcc);
@@ -467,7 +434,7 @@ index 9d87060..b63695f 100644
    mutt_paddstr (W, fcc);
  
    if (WithCrypto)
-@@ -266,7 +266,7 @@ static void draw_envelope (HEADER *msg, char *fcc)
+@@ -266,7 +266,7 @@ static void draw_envelope (HEADER *msg,
  #endif
  
    SETCOLOR (MT_COLOR_STATUS);
@@ -476,7 +443,7 @@ index 9d87060..b63695f 100644
    clrtoeol ();
  
    NORMAL_COLOR;
-@@ -302,7 +302,7 @@ static int edit_address_list (int line, ADDRESS **addr)
+@@ -302,7 +302,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);
@@ -485,7 +452,7 @@ index 9d87060..b63695f 100644
    mutt_paddstr (W, buf);
    
    return 0;
-@@ -562,7 +562,7 @@ int mutt_compose_menu (HEADER *msg,   /* structure for new message */
+@@ -564,7 +564,7 @@ int mutt_compose_menu (HEADER *msg,   /*
  	if (mutt_get_field ("Subject: ", buf, sizeof (buf), 0) == 0)
  	{
  	  mutt_str_replace (&msg->env->subject, buf);
@@ -494,7 +461,7 @@ index 9d87060..b63695f 100644
  	  if (msg->env->subject)
  	    mutt_paddstr (W, msg->env->subject);
  	  else
-@@ -580,7 +580,7 @@ int mutt_compose_menu (HEADER *msg,   /* structure for new message */
+@@ -582,7 +582,7 @@ int mutt_compose_menu (HEADER *msg,   /*
  	{
  	  strfcpy (fcc, buf, fcclen);
  	  mutt_pretty_mailbox (fcc, fcclen);
@@ -503,11 +470,10 @@ index 9d87060..b63695f 100644
  	  mutt_paddstr (W, fcc);
  	  fccSet = 1;
  	}
-diff --git a/configure.ac b/configure.ac
-index 8ff4b3c..0c81c05 100644
+diff --git a/configure.ac b/mutt-1.6.0/configure.ac
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1315,6 +1315,8 @@ if test $mutt_cv_langinfo_yesexpr = yes; then
+@@ -1314,6 +1314,8 @@ if test $mutt_cv_langinfo_yesexpr = yes;
    AC_DEFINE(HAVE_LANGINFO_YESEXPR,1,[ Define if you have <langinfo.h> and nl_langinfo(YESEXPR). ])
  fi
  
@@ -516,8 +482,7 @@ index 8ff4b3c..0c81c05 100644
  dnl Documentation tools
  have_openjade="no"
  AC_PATH_PROG([OSPCAT], [ospcat], [none])
-diff --git a/curs_main.c b/curs_main.c
-index 3e7021b..0496232 100644
+diff --git a/curs_main.c b/mutt-1.6.0/curs_main.c
 --- a/curs_main.c
 +++ b/curs_main.c
 @@ -26,7 +26,9 @@
@@ -530,19 +495,18 @@ index 3e7021b..0496232 100644
  
  #ifdef USE_POP
  #include "pop.h"
-@@ -596,20 +598,31 @@ int mutt_index_menu (void)
+@@ -595,20 +597,31 @@ int mutt_index_menu (void)
         menu->redraw |= REDRAW_STATUS;
       if (do_buffy_notify)
       {
 -       if (mutt_buffy_notify () && option (OPTBEEPNEW))
-- 	beep ();
 +       if (mutt_buffy_notify ())
 +       {
 +         menu->redraw |= REDRAW_STATUS;
 +         if (option (OPTBEEPNEW))
-+           beep ();
-+       }
+  	beep ();
       }
++     }
       else
         do_buffy_notify = 1;
      }
@@ -564,7 +528,7 @@ index 3e7021b..0496232 100644
      }
  
      if (menu->menu == MENU_MAIN)
-@@ -631,9 +644,12 @@ int mutt_index_menu (void)
+@@ -630,9 +643,12 @@ int mutt_index_menu (void)
  
        if (menu->redraw & REDRAW_STATUS)
        {
@@ -577,7 +541,7 @@ index 3e7021b..0496232 100644
  	mutt_paddstr (COLS, buf);
  	NORMAL_COLOR;
  	menu->redraw &= ~REDRAW_STATUS;
-@@ -653,7 +669,7 @@ int mutt_index_menu (void)
+@@ -652,7 +668,7 @@ int mutt_index_menu (void)
  	menu->oldcurrent = -1;
  
        if (option (OPTARROWCURSOR))
@@ -586,7 +550,7 @@ index 3e7021b..0496232 100644
        else if (option (OPTBRAILLEFRIENDLY))
  	move (menu->current - menu->top + menu->offset, 0);
        else
-@@ -1095,6 +1111,7 @@ int mutt_index_menu (void)
+@@ -1091,6 +1107,7 @@ int mutt_index_menu (void)
  	  break;
  
  	CHECK_MSGCOUNT;
@@ -594,7 +558,7 @@ index 3e7021b..0496232 100644
  	CHECK_READONLY;
  	{
  	  int oldvcount = Context->vcount;
-@@ -1154,6 +1171,7 @@ int mutt_index_menu (void)
+@@ -1150,6 +1167,7 @@ int mutt_index_menu (void)
  	  menu->redraw = REDRAW_FULL;
  	break;
  
@@ -602,7 +566,7 @@ index 3e7021b..0496232 100644
        case OP_MAIN_CHANGE_FOLDER:
        case OP_MAIN_NEXT_UNREAD_MAILBOX:
  
-@@ -1185,7 +1203,11 @@ int mutt_index_menu (void)
+@@ -1181,7 +1199,11 @@ int mutt_index_menu (void)
  	{
  	  mutt_buffy (buf, sizeof (buf));
  
@@ -615,7 +579,7 @@ index 3e7021b..0496232 100644
  	  {
  	    if (menu->menu == MENU_PAGER)
  	    {
-@@ -1203,6 +1225,7 @@ int mutt_index_menu (void)
+@@ -1199,6 +1221,7 @@ int mutt_index_menu (void)
  	}
  
  	mutt_expand_path (buf, sizeof (buf));
@@ -623,7 +587,7 @@ index 3e7021b..0496232 100644
  	if (mx_get_magic (buf) <= 0)
  	{
  	  mutt_error (_("%s is not a mailbox."), buf);
-@@ -2298,6 +2321,12 @@ int mutt_index_menu (void)
+@@ -2315,6 +2338,12 @@ int mutt_index_menu (void)
  	mutt_what_key();
  	break;
  
@@ -636,8 +600,7 @@ index 3e7021b..0496232 100644
        default:
  	if (menu->menu == MENU_MAIN)
  	  km_error_key (MENU_MAIN);
-diff --git a/doc/Muttrc b/doc/Muttrc
-index fa7c105..e5ae11e 100644
+diff --git a/doc/Muttrc b/mutt-1.6.0/doc/Muttrc
 --- a/doc/Muttrc
 +++ b/doc/Muttrc
 @@ -657,6 +657,26 @@ set check_mbox_size=yes
@@ -667,8 +630,7 @@ index fa7c105..e5ae11e 100644
  # set crypt_autosign=no
  #
  # Name: crypt_autosign
-diff --git a/flags.c b/flags.c
-index f0f3d81..d675000 100644
+diff --git a/flags.c b/mutt-1.6.0/flags.c
 --- a/flags.c
 +++ b/flags.c
 @@ -22,8 +22,10 @@
@@ -682,7 +644,7 @@ index f0f3d81..d675000 100644
  
  void _mutt_set_flag (CONTEXT *ctx, HEADER *h, int flag, int bf, int upd_ctx)
  {
-@@ -263,6 +265,7 @@ void _mutt_set_flag (CONTEXT *ctx, HEADER *h, int flag, int bf, int upd_ctx)
+@@ -263,6 +265,7 @@ void _mutt_set_flag (CONTEXT *ctx, HEADE
     */
    if (h->searched && (changed != h->changed || deleted != ctx->deleted || tagged != ctx->tagged || flagged != ctx->flagged))
      h->searched = 0;
@@ -690,11 +652,10 @@ index f0f3d81..d675000 100644
  }
  
  void mutt_tag_set_flag (int flag, int bf)
-diff --git a/functions.h b/functions.h
-index 7a1c5a9..39dc50b 100644
+diff --git a/functions.h b/mutt-1.6.0/functions.h
 --- a/functions.h
 +++ b/functions.h
-@@ -169,6 +169,11 @@ const struct binding_t OpMain[] = { /* map: index */
+@@ -169,6 +169,11 @@ const struct binding_t OpMain[] = { /* m
    { "decrypt-save",		OP_DECRYPT_SAVE,		NULL },
  
  
@@ -706,7 +667,7 @@ index 7a1c5a9..39dc50b 100644
    { NULL,			0,				NULL }
  };
  
-@@ -272,6 +277,11 @@ const struct binding_t OpPager[] = { /* map: pager */
+@@ -272,6 +277,11 @@ const struct binding_t OpPager[] = { /*
  
    { "what-key",		OP_WHAT_KEY,		NULL },
  
@@ -718,8 +679,7 @@ index 7a1c5a9..39dc50b 100644
    { NULL,		0,				NULL }
  };
  
-diff --git a/globals.h b/globals.h
-index e77030c..aa37fe9 100644
+diff --git a/globals.h b/mutt-1.6.0/globals.h
 --- a/globals.h
 +++ b/globals.h
 @@ -118,6 +118,9 @@ WHERE short SearchContext;
@@ -732,7 +692,7 @@ index e77030c..aa37fe9 100644
  WHERE char *Signature;
  WHERE char *SimpleSearch;
  #if USE_SMTP
-@@ -213,6 +216,9 @@ WHERE short ScoreThresholdDelete;
+@@ -214,6 +217,9 @@ WHERE short ScoreThresholdDelete;
  WHERE short ScoreThresholdRead;
  WHERE short ScoreThresholdFlag;
  
@@ -742,11 +702,10 @@ index e77030c..aa37fe9 100644
  #ifdef USE_IMAP
  WHERE short ImapKeepalive;
  WHERE short ImapPipelineDepth;
-diff --git a/handler.c b/handler.c
-index 1a062be..8c3b699 100644
+diff --git a/handler.c b/mutt-1.6.0/handler.c
 --- a/handler.c
 +++ b/handler.c
-@@ -1603,6 +1603,11 @@ static int run_decode_and_handler (BODY *b, STATE *s, handler_t handler, int pla
+@@ -1603,6 +1603,11 @@ static int run_decode_and_handler (BODY
  
    fseeko (s->fpin, b->offset, 0);
  
@@ -758,7 +717,7 @@ index 1a062be..8c3b699 100644
    /* see if we need to decode this part before processing it */
    if (b->encoding == ENCBASE64 || b->encoding == ENCQUOTEDPRINTABLE ||
        b->encoding == ENCUUENCODED || plaintext ||
-@@ -1618,6 +1623,14 @@ static int run_decode_and_handler (BODY *b, STATE *s, handler_t handler, int pla
+@@ -1618,6 +1623,14 @@ static int run_decode_and_handler (BODY
      {
        /* decode to a tempfile, saving the original destination */
        fp = s->fpout;
@@ -773,7 +732,7 @@ index 1a062be..8c3b699 100644
        mutt_mktemp (tempfile, sizeof (tempfile));
        if ((s->fpout = safe_fopen (tempfile, "w")) == NULL)
        {
-@@ -1625,6 +1638,7 @@ static int run_decode_and_handler (BODY *b, STATE *s, handler_t handler, int pla
+@@ -1625,6 +1638,7 @@ static int run_decode_and_handler (BODY
          dprint (1, (debugfile, "Can't open %s.\n", tempfile));
          return -1;
        }
@@ -781,7 +740,7 @@ index 1a062be..8c3b699 100644
        /* decoding the attachment changes the size and offset, so save a copy
          * of the "real" values now, and restore them after processing
          */
-@@ -1653,9 +1667,19 @@ static int run_decode_and_handler (BODY *b, STATE *s, handler_t handler, int pla
+@@ -1653,9 +1667,19 @@ static int run_decode_and_handler (BODY
        /* restore final destination and substitute the tempfile for input */
        s->fpout = fp;
        fp = s->fpin;
@@ -802,7 +761,7 @@ index 1a062be..8c3b699 100644
        /* restore the prefix */
        s->prefix = savePrefix;
      }
-@@ -1680,6 +1704,10 @@ static int run_decode_and_handler (BODY *b, STATE *s, handler_t handler, int pla
+@@ -1680,6 +1704,10 @@ static int run_decode_and_handler (BODY
  
        /* restore the original source stream */
        safe_fclose (&s->fpin);
@@ -813,11 +772,10 @@ index 1a062be..8c3b699 100644
        s->fpin = fp;
      }
    }
-diff --git a/imap/command.c b/imap/command.c
-index 32f8417..d68e3ab 100644
+diff --git a/imap/command.c b/mutt-1.6.0/imap/command.c
 --- a/imap/command.c
 +++ b/imap/command.c
-@@ -1012,6 +1012,13 @@ static void cmd_parse_status (IMAP_DATA* idata, char* s)
+@@ -1016,6 +1016,13 @@ static void cmd_parse_status (IMAP_DATA*
  	     opened */
  	  status->uidnext = oldun;
  
@@ -831,24 +789,22 @@ index 32f8417..d68e3ab 100644
          FREE (&value);
          return;
        }
-diff --git a/imap/imap.c b/imap/imap.c
-index ad15f5e..6f4af88 100644
+diff --git a/imap/imap.c b/mutt-1.6.0/imap/imap.c
 --- a/imap/imap.c
 +++ b/imap/imap.c
-@@ -1523,7 +1523,7 @@ int imap_buffy_check (int force)
+@@ -1535,7 +1535,7 @@ int imap_buffy_check (int force)
  
-     imap_munge_mbox_name (munged, sizeof (munged), name);
+     imap_munge_mbox_name (idata, munged, sizeof (munged), name);
      snprintf (command, sizeof (command),
 -	      "STATUS %s (UIDNEXT UIDVALIDITY UNSEEN RECENT)", munged);
 +	      "STATUS %s (UIDNEXT UIDVALIDITY UNSEEN RECENT MESSAGES)", munged);
  
      if (imap_exec (idata, command, IMAP_CMD_QUEUE) < 0)
      {
-diff --git a/init.h b/init.h
-index 0055a1b..e7a1280 100644
+diff --git a/init.h b/mutt-1.6.0/init.h
 --- a/init.h
 +++ b/init.h
-@@ -2016,6 +2016,54 @@ struct option_t MuttVars[] = {
+@@ -2049,6 +2049,54 @@ struct option_t MuttVars[] = {
    ** not used.
    ** (PGP only)
    */
@@ -903,8 +859,7 @@ index 0055a1b..e7a1280 100644
    { "pgp_use_gpg_agent", DT_BOOL, R_NONE, OPTUSEGPGAGENT, 0},
    /*
    ** .pp
-diff --git a/mailbox.h b/mailbox.h
-index 2b2c9a1..000503d 100644
+diff --git a/mailbox.h b/mutt-1.6.0/mailbox.h
 --- a/mailbox.h
 +++ b/mailbox.h
 @@ -27,6 +27,7 @@
@@ -915,8 +870,7 @@ index 2b2c9a1..000503d 100644
  
  /* mx_open_new_message() */
  #define M_ADD_FROM	(1<<0)	/* add a From_ line */
-diff --git a/main.c b/main.c
-index 9c562be..49fdc78 100644
+diff --git a/main.c b/mutt-1.6.0/main.c
 --- a/main.c
 +++ b/main.c
 @@ -50,6 +50,7 @@
@@ -927,7 +881,7 @@ index 9c562be..49fdc78 100644
  #include <sys/utsname.h>
  
  #ifdef HAVE_GETOPT_H
-@@ -561,7 +562,7 @@ init_extended_keys();
+@@ -563,7 +564,7 @@ init_extended_keys();
  
  int main (int argc, char **argv)
  {
@@ -936,7 +890,7 @@ index 9c562be..49fdc78 100644
    char *subject = NULL;
    char *includeFile = NULL;
    char *draftFile = NULL;
-@@ -1042,6 +1043,13 @@ int main (int argc, char **argv)
+@@ -1190,6 +1191,13 @@ int main (int argc, char **argv)
        strfcpy (folder, NONULL(Spoolfile), sizeof (folder));
      mutt_expand_path (folder, sizeof (folder));
  
@@ -950,7 +904,7 @@ index 9c562be..49fdc78 100644
      mutt_str_replace (&CurrentFolder, folder);
      mutt_str_replace (&LastFolder, folder);
  
-@@ -1064,6 +1072,7 @@ int main (int argc, char **argv)
+@@ -1212,6 +1220,7 @@ int main (int argc, char **argv)
      if((Context = mx_open_mailbox (folder, ((flags & M_RO) || option (OPTREADONLY)) ? M_READONLY : 0, NULL))
         || !explicit_folder)
      {
@@ -958,8 +912,7 @@ index 9c562be..49fdc78 100644
        mutt_index_menu ();
        if (Context)
  	FREE (&Context);
-diff --git a/mbox.c b/mbox.c
-index 6d3b6bd..fa82eb3 100644
+diff --git a/mbox.c b/mutt-1.6.0/mbox.c
 --- a/mbox.c
 +++ b/mbox.c
 @@ -104,6 +104,7 @@ int mmdf_parse_mailbox (CONTEXT *ctx)
@@ -978,8 +931,7 @@ index 6d3b6bd..fa82eb3 100644
  
  #ifdef NFS_ATTRIBUTE_HACK
    if (sb.st_mtime > sb.st_atime)
-diff --git a/menu.c b/menu.c
-index e03dd33..02c14f1 100644
+diff --git a/menu.c b/mutt-1.6.0/menu.c
 --- a/menu.c
 +++ b/menu.c
 @@ -24,6 +24,7 @@
@@ -988,9 +940,9 @@ index e03dd33..02c14f1 100644
  #include "mbyte.h"
 +#include "sidebar.h"
  
- extern size_t UngetCount;
+ char* SearchBuffers[MENU_MAX];
  
-@@ -186,7 +187,7 @@ static void menu_pad_string (char *s, size_t n)
+@@ -184,7 +185,7 @@ static void menu_pad_string (char *s, si
  {
    char *scratch = safe_strdup (s);
    int shift = option (OPTARROWCURSOR) ? 3 : 0;
@@ -999,7 +951,7 @@ index e03dd33..02c14f1 100644
  
    mutt_format_string (s, n, cols, cols, FMT_LEFT, ' ', scratch, mutt_strlen (scratch), 1);
    s[n - 1] = 0;
-@@ -239,6 +240,7 @@ void menu_redraw_index (MUTTMENU *menu)
+@@ -237,6 +238,7 @@ void menu_redraw_index (MUTTMENU *menu)
    int do_color;
    int attr;
  
@@ -1007,7 +959,7 @@ index e03dd33..02c14f1 100644
    for (i = menu->top; i < menu->top + menu->pagelen; i++)
    {
      if (i < menu->max)
-@@ -249,7 +251,7 @@ void menu_redraw_index (MUTTMENU *menu)
+@@ -247,7 +249,7 @@ void menu_redraw_index (MUTTMENU *menu)
        menu_pad_string (buf, sizeof (buf));
  
        ATTRSET(attr);
@@ -1016,7 +968,7 @@ index e03dd33..02c14f1 100644
        do_color = 1;
  
        if (i == menu->current)
-@@ -272,7 +274,7 @@ void menu_redraw_index (MUTTMENU *menu)
+@@ -270,7 +272,7 @@ void menu_redraw_index (MUTTMENU *menu)
      else
      {
        NORMAL_COLOR;
@@ -1025,7 +977,7 @@ index e03dd33..02c14f1 100644
      }
    }
    NORMAL_COLOR;
-@@ -289,7 +291,7 @@ void menu_redraw_motion (MUTTMENU *menu)
+@@ -287,7 +289,7 @@ void menu_redraw_motion (MUTTMENU *menu)
      return;
    }
    
@@ -1034,7 +986,7 @@ index e03dd33..02c14f1 100644
    ATTRSET(menu->color (menu->oldcurrent));
  
    if (option (OPTARROWCURSOR))
-@@ -301,13 +303,13 @@ void menu_redraw_motion (MUTTMENU *menu)
+@@ -299,13 +301,13 @@ void menu_redraw_motion (MUTTMENU *menu)
      {
        menu_make_entry (buf, sizeof (buf), menu, menu->oldcurrent);
        menu_pad_string (buf, sizeof (buf));
@@ -1050,7 +1002,7 @@ index e03dd33..02c14f1 100644
    }
    else
    {
-@@ -320,7 +322,7 @@ void menu_redraw_motion (MUTTMENU *menu)
+@@ -318,7 +320,7 @@ void menu_redraw_motion (MUTTMENU *menu)
      menu_make_entry (buf, sizeof (buf), menu, menu->current);
      menu_pad_string (buf, sizeof (buf));
      SETCOLOR(MT_COLOR_INDICATOR);
@@ -1059,7 +1011,7 @@ index e03dd33..02c14f1 100644
      print_enriched_string (menu->color(menu->current), (unsigned char *) buf, 0);
    }
    menu->redraw &= REDRAW_STATUS;
-@@ -332,7 +334,7 @@ void menu_redraw_current (MUTTMENU *menu)
+@@ -330,7 +332,7 @@ void menu_redraw_current (MUTTMENU *menu
    char buf[LONG_STRING];
    int attr = menu->color (menu->current);
    
@@ -1068,7 +1020,7 @@ index e03dd33..02c14f1 100644
    menu_make_entry (buf, sizeof (buf), menu, menu->current);
    menu_pad_string (buf, sizeof (buf));
  
-@@ -872,7 +874,7 @@ int mutt_menuLoop (MUTTMENU *menu)
+@@ -873,7 +875,7 @@ int mutt_menuLoop (MUTTMENU *menu)
      
      
      if (option (OPTARROWCURSOR))
@@ -1077,8 +1029,7 @@ index e03dd33..02c14f1 100644
      else if (option (OPTBRAILLEFRIENDLY))
        move (menu->current - menu->top + menu->offset, 0);
      else
-diff --git a/mh.c b/mh.c
-index 63e12d2..753a53c 100644
+diff --git a/mh.c b/mutt-1.6.0/mh.c
 --- a/mh.c
 +++ b/mh.c
 @@ -295,6 +295,32 @@ void mh_buffy(BUFFY *b)
@@ -1114,11 +1065,10 @@ index 63e12d2..753a53c 100644
  static int mh_mkstemp (CONTEXT * dest, FILE ** fp, char **tgt)
  {
    int fd;
-diff --git a/mutt.h b/mutt.h
-index 8e92ea0..1cc3a31 100644
+diff --git a/mutt.h b/mutt-1.6.0/mutt.h
 --- a/mutt.h
 +++ b/mutt.h
-@@ -429,6 +429,10 @@ enum
+@@ -434,6 +434,10 @@ enum
    OPTSAVENAME,
    OPTSENDGROUPREPLYTO,
    OPTSCORE,
@@ -1129,7 +1079,7 @@ index 8e92ea0..1cc3a31 100644
    OPTSIGDASHES,
    OPTSIGONTOP,
    OPTSORTRE,
-@@ -872,6 +876,7 @@ typedef struct _context
+@@ -878,6 +882,7 @@ typedef struct _context
  {
    char *path;
    FILE *fp;
@@ -1137,7 +1087,7 @@ index 8e92ea0..1cc3a31 100644
    time_t mtime;
    off_t size;
    off_t vsize;
-@@ -911,6 +916,7 @@ typedef struct _context
+@@ -917,6 +922,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 */
@@ -1145,8 +1095,7 @@ index 8e92ea0..1cc3a31 100644
  
    /* driver hooks */
    void *data;			/* driver specific data */
-diff --git a/mutt_curses.h b/mutt_curses.h
-index f8bc47c..ef9884e 100644
+diff --git a/mutt_curses.h b/mutt-1.6.0/mutt_curses.h
 --- a/mutt_curses.h
 +++ b/mutt_curses.h
 @@ -64,6 +64,7 @@
@@ -1157,7 +1106,7 @@ index f8bc47c..ef9884e 100644
  #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)
-@@ -121,6 +122,8 @@ enum
+@@ -124,6 +125,8 @@ enum
    MT_COLOR_UNDERLINE,
    MT_COLOR_INDEX,
    MT_COLOR_PROMPT,
@@ -1166,8 +1115,7 @@ index f8bc47c..ef9884e 100644
    MT_COLOR_MAX
  };
  
-diff --git a/mutt_menu.h b/mutt_menu.h
-index 8192019..aea89f1 100644
+diff --git a/mutt_menu.h b/mutt-1.6.0/mutt_menu.h
 --- a/mutt_menu.h
 +++ b/mutt_menu.h
 @@ -34,6 +34,7 @@
@@ -1178,11 +1126,10 @@ index 8192019..aea89f1 100644
  
  #define M_MODEFMT "-- Mutt: %s"
  
-diff --git a/muttlib.c b/muttlib.c
-index 02067cc..8d0c13d 100644
+diff --git a/muttlib.c b/mutt-1.6.0/muttlib.c
 --- a/muttlib.c
 +++ b/muttlib.c
-@@ -1276,6 +1276,8 @@ void mutt_FormatString (char *dest,		/* output buffer */
+@@ -1282,6 +1282,8 @@ void mutt_FormatString (char *dest,		/*
  	  pl = pw = 1;
  
  	/* see if there's room to add content, else ignore */
@@ -1191,7 +1138,7 @@ index 02067cc..8d0c13d 100644
  	if ((col < COLS && wlen < destlen) || soft)
  	{
  	  int pad;
-@@ -1319,6 +1321,52 @@ void mutt_FormatString (char *dest,		/* output buffer */
+@@ -1325,6 +1327,52 @@ void mutt_FormatString (char *dest,		/*
  	  col += wid;
  	  src += pl;
  	}
@@ -1244,11 +1191,10 @@ index 02067cc..8d0c13d 100644
  	break; /* skip rest of input */
        }
        else if (ch == '|')
-diff --git a/mx.c b/mx.c
-index 495b295..1cb966c 100644
+diff --git a/mx.c b/mutt-1.6.0/mx.c
 --- a/mx.c
 +++ b/mx.c
-@@ -596,6 +596,7 @@ static int mx_open_mailbox_append (CONTEXT *ctx, int flags)
+@@ -596,6 +596,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
@@ -1256,7 +1202,7 @@ index 495b295..1cb966c 100644
   *	ctx	if non-null, context struct to use
   */
  CONTEXT *mx_open_mailbox (const char *path, int flags, CONTEXT *pctx)
-@@ -618,6 +619,8 @@ CONTEXT *mx_open_mailbox (const char *path, int flags, CONTEXT *pctx)
+@@ -618,6 +619,8 @@ CONTEXT *mx_open_mailbox (const char *pa
      ctx->quiet = 1;
    if (flags & M_READONLY)
      ctx->readonly = 1;
@@ -1265,7 +1211,7 @@ index 495b295..1cb966c 100644
  
    if (flags & (M_APPEND|M_NEWFOLDER))
    {
-@@ -722,13 +725,26 @@ CONTEXT *mx_open_mailbox (const char *path, int flags, CONTEXT *pctx)
+@@ -722,12 +725,25 @@ CONTEXT *mx_open_mailbox (const char *pa
  void mx_fastclose_mailbox (CONTEXT *ctx)
  {
    int i;
@@ -1287,12 +1233,10 @@ index 495b295..1cb966c 100644
  
    /* never announce that a mailbox we've just left has new mail. #3290
     * XXX: really belongs in mx_close_mailbox, but this is a nice hook point */
--  mutt_buffy_setnotified(ctx->path);
 +  if(!ctx->peekonly)
-+    mutt_buffy_setnotified(ctx->path);
+   mutt_buffy_setnotified(ctx->path);
  
    if (ctx->mx_close)
-     ctx->mx_close (ctx);
 @@ -740,6 +756,8 @@ void mx_fastclose_mailbox (CONTEXT *ctx)
    mutt_clear_threads (ctx);
    for (i = 0; i < ctx->msgcount; i++)
@@ -1302,7 +1246,7 @@ index 495b295..1cb966c 100644
    FREE (&ctx->hdrs);
    FREE (&ctx->v2r);
  #ifdef USE_COMPRESSED
-@@ -843,6 +861,10 @@ int mx_close_mailbox (CONTEXT *ctx, int *index_hint)
+@@ -843,6 +861,10 @@ int mx_close_mailbox (CONTEXT *ctx, int
      if (!ctx->hdrs[i]->deleted && ctx->hdrs[i]->read 
          && !(ctx->hdrs[i]->flagged && option (OPTKEEPFLAGGED)))
        read_msgs++;
@@ -1313,11 +1257,10 @@ index 495b295..1cb966c 100644
    }
  
    if (read_msgs && quadoption (OPT_MOVE) != M_NO)
-diff --git a/mx.h b/mx.h
-index 2ef4ec7..a6d1f0a 100644
+diff --git a/mx.h b/mutt-1.6.0/mx.h
 --- a/mx.h
 +++ b/mx.h
-@@ -60,6 +60,7 @@ void mbox_reset_atime (CONTEXT *, struct stat *);
+@@ -60,6 +60,7 @@ void mbox_reset_atime (CONTEXT *, struct
  int mh_read_dir (CONTEXT *, const char *);
  int mh_sync_mailbox (CONTEXT *, int *);
  int mh_check_mailbox (CONTEXT *, int *);
@@ -1325,8 +1268,7 @@ index 2ef4ec7..a6d1f0a 100644
  int mh_check_empty (const char *);
  
  int maildir_read_dir (CONTEXT *);
-diff --git a/pager.c b/pager.c
-index 4f7e7be..ba8ab7a 100644
+diff --git a/pager.c b/mutt-1.6.0/pager.c
 --- a/pager.c
 +++ b/pager.c
 @@ -29,6 +29,7 @@
@@ -1337,7 +1279,7 @@ index 4f7e7be..ba8ab7a 100644
  
  #include "mutt_crypt.h"
  
-@@ -1095,6 +1096,7 @@ static int format_line (struct line_t **lineInfo, int n, unsigned char *buf,
+@@ -1096,6 +1097,7 @@ static int format_line (struct line_t **
    wchar_t wc;
    mbstate_t mbstate;
    int wrap_cols = mutt_term_width ((flags & M_PAGER_NOWRAP) ? 0 : Wrap);
@@ -1345,7 +1287,7 @@ index 4f7e7be..ba8ab7a 100644
  
    if (check_attachment_marker ((char *)buf) == 0)
      wrap_cols = COLS;
-@@ -1572,6 +1574,7 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t *extra)
+@@ -1573,6 +1575,7 @@ mutt_pager (const char *banner, const ch
  
    int bodyoffset = 1;			/* offset of first line of real text */
    int statusoffset = 0; 		/* offset for the status bar */
@@ -1353,7 +1295,7 @@ index 4f7e7be..ba8ab7a 100644
    int helpoffset = LINES - 2;		/* offset for the help bar. */
    int bodylen = LINES - 2 - bodyoffset; /* length of displayable area */
  
-@@ -1746,7 +1749,7 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t *extra)
+@@ -1747,7 +1750,7 @@ mutt_pager (const char *banner, const ch
      if ((redraw & REDRAW_BODY) || topline != oldtopline)
      {
        do {
@@ -1362,7 +1304,7 @@ index 4f7e7be..ba8ab7a 100644
  	curline = oldtopline = topline;
  	lines = 0;
  	force_redraw = 0;
-@@ -1759,6 +1762,7 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t *extra)
+@@ -1760,6 +1763,7 @@ mutt_pager (const char *banner, const ch
  			    &QuoteList, &q_level, &force_redraw, &SearchRE) > 0)
  	    lines++;
  	  curline++;
@@ -1370,7 +1312,7 @@ index 4f7e7be..ba8ab7a 100644
  	}
  	last_offset = lineInfo[curline].offset;
        } while (force_redraw);
-@@ -1771,6 +1775,7 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t *extra)
+@@ -1772,6 +1776,7 @@ mutt_pager (const char *banner, const ch
  	  addch ('~');
  	addch ('\n');
  	lines++;
@@ -1378,7 +1320,7 @@ index 4f7e7be..ba8ab7a 100644
        }
        NORMAL_COLOR;
  
-@@ -1788,29 +1793,39 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t *extra)
+@@ -1789,29 +1794,39 @@ mutt_pager (const char *banner, const ch
        hfi.ctx = Context;
        hfi.pager_progress = pager_progress_str;
  
@@ -1422,7 +1364,7 @@ index 4f7e7be..ba8ab7a 100644
        NORMAL_COLOR;
        if (option(OPTTSENABLED) && TSSupported)
        {
-@@ -1826,16 +1841,22 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t *extra)
+@@ -1827,16 +1842,22 @@ 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);
@@ -1447,7 +1389,7 @@ index 4f7e7be..ba8ab7a 100644
      redraw = 0;
  
      if (option(OPTBRAILLEFRIENDLY)) {
-@@ -2770,6 +2791,13 @@ search_next:
+@@ -2777,6 +2798,13 @@ search_next:
  	mutt_what_key ();
  	break;
  
@@ -1461,11 +1403,10 @@ index 4f7e7be..ba8ab7a 100644
        default:
  	ch = -1;
  	break;
-diff --git a/pattern.c b/pattern.c
-index 7af1c38..379f064 100644
+diff --git a/pattern.c b/mutt-1.6.0/pattern.c
 --- a/pattern.c
 +++ b/pattern.c
-@@ -154,6 +154,10 @@ msg_search (CONTEXT *ctx, pattern_t* pat, int msgno)
+@@ -154,6 +154,10 @@ msg_search (CONTEXT *ctx, pattern_t* pat
    HEADER *h = ctx->hdrs[msgno];
    char *buf;
    size_t blen;
@@ -1476,7 +1417,7 @@ index 7af1c38..379f064 100644
  
    if ((msg = mx_open_message (ctx, msgno)) != NULL)
    {
-@@ -163,12 +167,20 @@ msg_search (CONTEXT *ctx, pattern_t* pat, int msgno)
+@@ -163,12 +167,20 @@ msg_search (CONTEXT *ctx, pattern_t* pat
        memset (&s, 0, sizeof (s));
        s.fpin = msg->fp;
        s.flags = M_CHARCONV;
@@ -1497,7 +1438,7 @@ index 7af1c38..379f064 100644
  
        if (pat->op != M_BODY)
  	mutt_copy_header (msg->fp, h, s.fpout, CH_FROM | CH_DECODE, NULL);
-@@ -184,7 +196,11 @@ msg_search (CONTEXT *ctx, pattern_t* pat, int msgno)
+@@ -184,7 +196,11 @@ msg_search (CONTEXT *ctx, pattern_t* pat
  	  if (s.fpout)
  	  {
  	    safe_fclose (&s.fpout);
@@ -1509,7 +1450,7 @@ index 7af1c38..379f064 100644
  	  }
  	  return (0);
  	}
-@@ -193,11 +209,28 @@ msg_search (CONTEXT *ctx, pattern_t* pat, int msgno)
+@@ -193,11 +209,28 @@ msg_search (CONTEXT *ctx, pattern_t* pat
  	mutt_body_handler (h->content, &s);
        }
  
@@ -1538,7 +1479,7 @@ index 7af1c38..379f064 100644
      }
      else
      {
-@@ -244,7 +277,12 @@ msg_search (CONTEXT *ctx, pattern_t* pat, int msgno)
+@@ -244,7 +277,12 @@ msg_search (CONTEXT *ctx, pattern_t* pat
      if (option (OPTTHOROUGHSRC))
      {
        safe_fclose (&fp);
@@ -1551,8 +1492,7 @@ index 7af1c38..379f064 100644
      }
    }
  
-diff --git a/protos.h b/protos.h
-index 2ba4d1d..5126f10 100644
+diff --git a/protos.h b/mutt-1.6.0/protos.h
 --- a/protos.h
 +++ b/protos.h
 @@ -36,6 +36,13 @@ struct hdr_format_info
@@ -1569,10 +1509,8 @@ index 2ba4d1d..5126f10 100644
  void mutt_make_string_info (char *, size_t, const char *, struct hdr_format_info *, format_flag);
  
  int mutt_extract_token (BUFFER *, BUFFER *, int);
-diff --git a/sidebar.c b/sidebar.c
-new file mode 100644
-index 0000000..e9d9eba
---- /dev/null
+diff --git a/sidebar.c b/mutt-1.6.0/sidebar.c
+--- a/sidebar.c
 +++ b/sidebar.c
 @@ -0,0 +1,410 @@
 +/*
@@ -1892,7 +1830,7 @@ index 0000000..e9d9eba
 +		/* 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 = option(OPTSIDEBARSHORTPATH) ? mutt_basename(tmp->path) : tmp->path + maildir_is_prefix*(strlen(Maildir));
++		sidebar_folder_name = option(OPTSIDEBARSHORTPATH) ? mutt_basename(tmp->path) : tmp->path + maildir_is_prefix*(strlen(Maildir) + 1);
 +		if ( maildir_is_prefix && option(OPTSIDEBARFOLDERINDENT) ) {
 +			char *tmp_folder_name;
 +			int i;
@@ -1985,10 +1923,8 @@ index 0000000..e9d9eba
 +	draw_sidebar(menu);
 +}
 +
-diff --git a/sidebar.h b/sidebar.h
-new file mode 100644
-index 0000000..d195f11
---- /dev/null
+diff --git a/sidebar.h b/mutt-1.6.0/sidebar.h
+--- a/sidebar.h
 +++ b/sidebar.h
 @@ -0,0 +1,36 @@
 +/*
@@ -2027,6 +1963,3 @@ index 0000000..d195f11
 +void set_buffystats(CONTEXT*);
 +
 +#endif /* SIDEBAR_H */
--- 
-2.6.2
-