summarylogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.SRCINFO44
-rw-r--r--PKGBUILD86
-rw-r--r--collapse-flagged.patch170
-rw-r--r--mutt-attach.patch115
-rw-r--r--mutt-unmailbox.patch10
-rw-r--r--muttrc.example29
-rw-r--r--sidebar-dotted.patch65
-rw-r--r--sidebar-drawing-fix.patch165
-rw-r--r--sidebar-utf8.patch125
-rw-r--r--sidebar.patch1442
-rw-r--r--trash_folder-1.5.18.patch259
11 files changed, 2510 insertions, 0 deletions
diff --git a/.SRCINFO b/.SRCINFO
new file mode 100644
index 000000000000..7d83e4c434b7
--- /dev/null
+++ b/.SRCINFO
@@ -0,0 +1,44 @@
+pkgbase = muddy-mutt
+ pkgdesc = Small but very powerful text-based mail client, muddied with potentially useful patches.
+ pkgver = 1.5.23
+ pkgrel = 1
+ url = http://www.mutt.org/
+ arch = i686
+ arch = x86_64
+ license = GPL
+ depends = openssl
+ depends = gdbm
+ depends = mime-types
+ depends = libsasl
+ depends = gnupg
+ depends = gpgme
+ depends = libidn
+ depends = krb5
+ depends = slang
+ optdepends = smtp-forwarder: to send mail
+ provides = mutt
+ conflicts = mutt
+ backup = etc/Muttrc
+ source = ftp://ftp.mutt.org/mutt/mutt-1.5.23.tar.gz
+ source = sidebar.patch
+ source = sidebar-drawing-fix.patch
+ source = trash_folder-1.5.18.patch
+ source = muttrc.example
+ source = mutt-unmailbox.patch
+ source = mutt-attach.patch
+ source = sidebar-dotted.patch
+ source = sidebar-utf8.patch
+ source = collapse-flagged.patch
+ sha256sums = 3af0701e57b9e1880ed3a0dee34498a228939e854a16cdccd24e5e502626fd37
+ sha256sums = e943acf9697c290a6281994c246789b11a734549cc150ac3b2cb94a869499934
+ sha256sums = 70dcc2870607838afc968e9b69e3c4f97a5770a8f2742ecb0316b877b88e6f5b
+ sha256sums = e5012c018956c0848355453c308ff9e3efe7ea90a3519fadb59bd19db1f29673
+ sha256sums = 608423900a7ce6fc39a1da73d35825e9c456adfe535cb586926a53e314958942
+ sha256sums = 88f44f9bf90e28c3b08791bdcc63ec000439724726914e01b288b3a1bd19c22a
+ sha256sums = da2c9e54a5426019b84837faef18cc51e174108f07dc7ec15968ca732880cb14
+ sha256sums = 1a0fd6663173725f55c2251c595d99d6614d84440d1f871bd9165749450a0e77
+ sha256sums = 91161f28d181af2fd7bb521b0b066d1666befc2decc3d77acec304ce9aa82c6d
+ sha256sums = 458585fd7d2145e0f5a37132279e09f8bcb180e227fe02d8864f27fc03f4636b
+
+pkgname = muddy-mutt
+
diff --git a/PKGBUILD b/PKGBUILD
new file mode 100644
index 000000000000..1bed90cabcb5
--- /dev/null
+++ b/PKGBUILD
@@ -0,0 +1,86 @@
+# Maintainer: Peter Lewis <plewis@aur.archlinux.org>
+# Contributor: Dave Reisner <dreisner@archlinux.org>
+# Contributor: Patrick Brisbin <pbrisbin@gmail.com>
+# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
+
+pkgname=muddy-mutt
+pkgver=1.5.23
+pkgrel=1
+pkgdesc="Small but very powerful text-based mail client, muddied with potentially useful patches."
+url='http://www.mutt.org/'
+license=('GPL')
+backup=('etc/Muttrc')
+arch=('i686' 'x86_64')
+optdepends=('smtp-forwarder: to send mail')
+depends=('openssl' 'gdbm' 'mime-types' 'libsasl' 'gnupg' 'gpgme' 'libidn' 'krb5' 'slang')
+conflicts=('mutt')
+provides=('mutt')
+source=(ftp://ftp.mutt.org/mutt/mutt-${pkgver}.tar.gz
+ sidebar.patch
+ sidebar-drawing-fix.patch
+ trash_folder-1.5.18.patch
+ muttrc.example
+ mutt-unmailbox.patch
+ mutt-attach.patch
+ sidebar-dotted.patch
+ sidebar-utf8.patch
+ collapse-flagged.patch)
+
+sha256sums=('3af0701e57b9e1880ed3a0dee34498a228939e854a16cdccd24e5e502626fd37'
+ 'e943acf9697c290a6281994c246789b11a734549cc150ac3b2cb94a869499934'
+ '70dcc2870607838afc968e9b69e3c4f97a5770a8f2742ecb0316b877b88e6f5b'
+ 'e5012c018956c0848355453c308ff9e3efe7ea90a3519fadb59bd19db1f29673'
+ '608423900a7ce6fc39a1da73d35825e9c456adfe535cb586926a53e314958942'
+ '88f44f9bf90e28c3b08791bdcc63ec000439724726914e01b288b3a1bd19c22a'
+ 'da2c9e54a5426019b84837faef18cc51e174108f07dc7ec15968ca732880cb14'
+ '1a0fd6663173725f55c2251c595d99d6614d84440d1f871bd9165749450a0e77'
+ '91161f28d181af2fd7bb521b0b066d1666befc2decc3d77acec304ce9aa82c6d'
+ '458585fd7d2145e0f5a37132279e09f8bcb180e227fe02d8864f27fc03f4636b')
+
+build() {
+ cd "$srcdir/mutt-$pkgver"
+
+ # forgotten attatchment detector
+ patch -p1 < "$srcdir/mutt-attach.patch"
+
+ # patch to add sidebar support
+ patch -p1 < "$srcdir/sidebar.patch"
+ patch -p1 < "$srcdir/sidebar-drawing-fix.patch"
+ patch -p1 < "$srcdir/sidebar-dotted.patch"
+ patch -p1 < "$srcdir/sidebar-utf8.patch"
+
+ # patch to add trash folder
+ patch -p1 < "$srcdir/trash_folder-1.5.18.patch"
+
+ # patch to not collapse threads with flagged messages
+ patch -p1 < "$srcdir/collapse-flagged.patch"
+
+ ./configure \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --enable-gpgme \
+ --enable-pop \
+ --enable-imap \
+ --enable-smtp \
+ --enable-hcache \
+ --with-regex \
+ --with-gss=/usr \
+ --with-ssl=/usr \
+ --with-sasl \
+ --with-idn \
+ --with-slang \
+ #--with-curses=/usr \
+ make
+}
+
+package() {
+ cd "$srcdir/mutt-$pkgver"
+
+ make DESTDIR="$pkgdir" install
+
+ # remove unneeded or conflicting files
+ rm "${pkgdir}"/usr/bin/{flea,muttbug}
+ rm "${pkgdir}"/usr/share/man/man1/{flea,muttbug}.1
+ rm "${pkgdir}"/etc/mime.types{,.dist}
+ install -Dm644 contrib/gpg.rc "${pkgdir}"/etc/Muttrc.gpg.dist
+}
diff --git a/collapse-flagged.patch b/collapse-flagged.patch
new file mode 100644
index 000000000000..1527a085897a
--- /dev/null
+++ b/collapse-flagged.patch
@@ -0,0 +1,170 @@
+# HG changeset patch
+# User Fabian Groffen <grobian@gentoo.org>
+# Date 1279824714 -7200
+# Branch gentoo-1.5.21
+# Node ID e1d34b94943e57dd5af2c05d2883615d3120fa30
+# Parent 380bee062403d436676ce409cba0811428cab2ca
+collapse_flagged from http://debian.lpr.ch/Mutt/
+
+diff -r 380bee062403 -r e1d34b94943e PATCHES
+--- a/PATCHES Fri Dec 07 19:06:11 2012 +0100
++++ b/PATCHES Thu Jul 22 20:51:54 2010 +0200
+@@ -0,0 +1,1 @@
++patch-1.5.4.lpr.collapse_flagged Lukas P. Ruf <lukas.ruf@lpr.ch>
+diff -r 380bee062403 -r e1d34b94943e curs_main.c
+--- a/curs_main.c Fri Dec 07 19:06:11 2012 +0100
++++ b/curs_main.c Thu Jul 22 20:51:54 2010 +0200
+@@ -107,6 +107,11 @@ static const char *No_visible = N_("No v
+ #define CURHDR Context->hdrs[Context->v2r[menu->current]]
+ #define OLDHDR Context->hdrs[Context->v2r[menu->oldcurrent]]
+ #define UNREAD(h) mutt_thread_contains_unread (Context, h)
++#define FLAGGED(h) mutt_thread_contains_flagged (Context, h)
++
++#define CHECK_IF_TO_COLLAPSE(header) \
++ ((option (OPTCOLLAPSEUNREAD) || !UNREAD (header)) && \
++ (option (OPTCOLLAPSEFLAGGED) || FLAGGED(header) == 0))
+
+ extern size_t UngetCount;
+
+@@ -1727,14 +1732,14 @@ int mutt_index_menu (void)
+ if (option (OPTUNCOLLAPSEJUMP))
+ menu->current = mutt_thread_next_unread (Context, CURHDR);
+ }
+- else if (option (OPTCOLLAPSEUNREAD) || !UNREAD (CURHDR))
++ else if CHECK_IF_TO_COLLAPSE(CURHDR)
+ {
+ menu->current = mutt_collapse_thread (Context, CURHDR);
+ mutt_set_virtual (Context);
+ }
+ else
+ {
+- mutt_error _("Thread contains unread messages.");
++ mutt_error _("Thread contains unread or flagged messages.");
+ break;
+ }
+
+@@ -1759,8 +1764,10 @@ int mutt_index_menu (void)
+
+ if (CURHDR->collapsed)
+ final = mutt_uncollapse_thread (Context, CURHDR);
+- else if (option (OPTCOLLAPSEUNREAD) || !UNREAD (CURHDR))
++ else if CHECK_IF_TO_COLLAPSE(CURHDR)
++ {
+ final = mutt_collapse_thread (Context, CURHDR);
++ }
+ else
+ final = CURHDR->virtual;
+
+@@ -1778,9 +1785,11 @@ int mutt_index_menu (void)
+ {
+ if (h->collapsed)
+ mutt_uncollapse_thread (Context, h);
+- else if (option (OPTCOLLAPSEUNREAD) || !UNREAD (h))
++ else if CHECK_IF_TO_COLLAPSE(h)
++ {
+ mutt_collapse_thread (Context, h);
+ }
++ }
+ top = top->next;
+ }
+
+diff -r 380bee062403 -r e1d34b94943e init.h
+--- a/init.h Fri Dec 07 19:06:11 2012 +0100
++++ b/init.h Thu Jul 22 20:51:54 2010 +0200
+@@ -389,6 +389,12 @@ struct option_t MuttVars[] = {
+ ** When \fIunset\fP, Mutt will not collapse a thread if it contains any
+ ** unread messages.
+ */
++ { "collapse_flagged", DT_BOOL, R_NONE, OPTCOLLAPSEFLAGGED, 1 },
++ /*
++ ** .pp
++ ** When \fIunset\fP, Mutt will not collapse a thread if it contains any
++ ** flagged messages.
++ */
+ { "compose_format", DT_STR, R_BOTH, UL &ComposeFormat, UL "-- Mutt: Compose [Approx. msg size: %l Atts: %a]%>-" },
+ /*
+ ** .pp
+diff -r 380bee062403 -r e1d34b94943e mutt.h
+--- a/mutt.h Fri Dec 07 19:06:11 2012 +0100
++++ b/mutt.h Thu Jul 22 20:51:54 2010 +0200
+@@ -168,6 +168,7 @@ typedef enum
+ #define M_THREAD_GET_HIDDEN (1<<2)
+ #define M_THREAD_UNREAD (1<<3)
+ #define M_THREAD_NEXT_UNREAD (1<<4)
++#define M_THREAD_FLAGGED (1<<5)
+
+ enum
+ {
+@@ -329,6 +330,7 @@ enum
+ OPTCHECKMBOXSIZE,
+ OPTCHECKNEW,
+ OPTCOLLAPSEUNREAD,
++ OPTCOLLAPSEFLAGGED,
+ OPTCONFIRMAPPEND,
+ OPTCONFIRMCREATE,
+ OPTDELETEUNTAG,
+diff -r 380bee062403 -r e1d34b94943e protos.h
+--- a/protos.h Fri Dec 07 19:06:11 2012 +0100
++++ b/protos.h Thu Jul 22 20:51:54 2010 +0200
+@@ -62,6 +62,7 @@ int _mutt_aside_thread (HEADER *, short,
+ #define mutt_uncollapse_thread(x,y) _mutt_traverse_thread (x,y,M_THREAD_UNCOLLAPSE)
+ #define mutt_get_hidden(x,y)_mutt_traverse_thread (x,y,M_THREAD_GET_HIDDEN)
+ #define mutt_thread_contains_unread(x,y) _mutt_traverse_thread (x,y,M_THREAD_UNREAD)
++#define mutt_thread_contains_flagged(x,y) _mutt_traverse_thread (x,y,M_THREAD_FLAGGED)
+ #define mutt_thread_next_unread(x,y) _mutt_traverse_thread(x,y,M_THREAD_NEXT_UNREAD)
+ int _mutt_traverse_thread (CONTEXT *ctx, HEADER *hdr, int flag);
+
+diff -r 380bee062403 -r e1d34b94943e thread.c
+--- a/thread.c Fri Dec 07 19:06:11 2012 +0100
++++ b/thread.c Thu Jul 22 20:51:54 2010 +0200
+@@ -1129,7 +1129,7 @@ int _mutt_traverse_thread (CONTEXT *ctx,
+ THREAD *thread, *top;
+ HEADER *roothdr = NULL;
+ int final, reverse = (Sort & SORT_REVERSE), minmsgno;
+- int num_hidden = 0, new = 0, old = 0;
++ int num_hidden = 0, new = 0, old = 0, flagged = 0;
+ int min_unread_msgno = INT_MAX, min_unread = cur->virtual;
+ #define CHECK_LIMIT (!ctx->pattern || cur->limited)
+
+@@ -1162,6 +1162,11 @@ int _mutt_traverse_thread (CONTEXT *ctx,
+ }
+ }
+
++ if (cur->flagged && CHECK_LIMIT)
++ {
++ flagged = 1;
++ }
++
+ if (cur->virtual == -1 && CHECK_LIMIT)
+ num_hidden++;
+
+@@ -1188,6 +1193,8 @@ int _mutt_traverse_thread (CONTEXT *ctx,
+ return (num_hidden);
+ else if (flag & M_THREAD_NEXT_UNREAD)
+ return (min_unread);
++ else if (flag & M_THREAD_FLAGGED)
++ return (flagged);
+ }
+
+ FOREVER
+@@ -1239,6 +1246,11 @@ int _mutt_traverse_thread (CONTEXT *ctx,
+ }
+ }
+
++ if (cur->flagged && CHECK_LIMIT)
++ {
++ flagged = 1;
++ }
++
+ if (cur->virtual == -1 && CHECK_LIMIT)
+ num_hidden++;
+ }
+@@ -1274,6 +1286,8 @@ int _mutt_traverse_thread (CONTEXT *ctx,
+ return (num_hidden+1);
+ else if (flag & M_THREAD_NEXT_UNREAD)
+ return (min_unread);
++ else if (flag & M_THREAD_FLAGGED)
++ return (flagged);
+
+ return (0);
+ #undef CHECK_LIMIT
diff --git a/mutt-attach.patch b/mutt-attach.patch
new file mode 100644
index 000000000000..c926ca307dc9
--- /dev/null
+++ b/mutt-attach.patch
@@ -0,0 +1,115 @@
+diff -ur a/globals.h b/globals.h
+--- a/globals.h 2010-05-28 17:16:31.000000000 -0400
++++ b/globals.h 2010-05-28 21:28:58.000000000 -0400
+@@ -34,6 +34,7 @@
+ WHERE char *AliasFile;
+ WHERE char *AliasFmt;
+ WHERE char *AssumedCharset;
++WHERE char *AttachKeyword;
+ WHERE char *AttachSep;
+ WHERE char *Attribution;
+ WHERE char *AttachCharset;
+diff -ur a/init.h b/init.h
+--- a/init.h 2010-05-28 17:11:18.000000000 -0400
++++ b/init.h 2010-05-28 21:29:27.000000000 -0400
+@@ -83,6 +83,14 @@
+
+ struct option_t MuttVars[] = {
+ /*++*/
++ { "abort_noattach", DT_QUAD, R_NONE, OPT_ATTACH, M_ASKYES },
++ /*
++ ** .pp
++ ** If set to \fIyes\fP, when composing messages containing the word
++ ** specified by $attach_keyword (default is "attach") and no attachments
++ ** are given, composition will be aborted. If set to \fIno\fP, composing
++ ** messages as such will never be aborted.
++ */
+ { "abort_nosubject", DT_QUAD, R_NONE, OPT_SUBJECT, M_ASKYES },
+ /*
+ ** .pp
+@@ -241,6 +249,13 @@
+ ** .pp
+ ** For an explanation of ``soft-fill'', see the $$index_format documentation.
+ */
++ { "attach_keyword", DT_STR, R_NONE, UL &AttachKeyword, UL "attach" },
++ /*
++ ** .pp
++ ** If $abort_attach is not set to no, then the body of the message
++ ** will be scanned for this keyword, and if found, you will be prompted
++ ** if there are no attachments. This is case insensitive.
++ */
+ { "attach_sep", DT_STR, R_NONE, UL &AttachSep, UL "\n" },
+ /*
+ ** .pp
+diff -ur a/mutt.h b/mutt.h
+--- a/mutt.h 2010-05-28 17:13:48.000000000 -0400
++++ b/mutt.h 2010-05-28 21:29:44.000000000 -0400
+@@ -286,6 +286,8 @@
+ OPT_SUBJECT,
+ OPT_VERIFYSIG, /* verify PGP signatures */
+
++ OPT_ATTACH, /* forgotten attachment detector */
++
+ /* THIS MUST BE THE LAST VALUE. */
+ OPT_MAX
+ };
+diff -ur a/send.c b/send.c
+--- a/send.c 2010-05-28 21:42:58.000000000 -0400
++++ b/send.c 2010-05-28 21:44:39.000000000 -0400
+@@ -1113,6 +1113,34 @@
+ }
+
+ int
++mutt_search_attach_keyword(char* filename)
++{
++ /* searches for the magic keyword "attach" within a file */
++ int found = 0;
++ char* inputline = malloc(1024);
++ char* lowerKeyword = malloc(strlen(AttachKeyword)+1);
++ FILE *attf = fopen(filename, "r");
++ int i;
++ for (i=0; i <= strlen(AttachKeyword); i++) {
++ lowerKeyword[i] = tolower(AttachKeyword[i]);
++ }
++ while (!feof(attf)) {
++ fgets(inputline, 1024, attf);
++ for (i=0; i < strlen(inputline); i++) {
++ inputline[i] = tolower(inputline[i]);
++ }
++ if (strstr(inputline, lowerKeyword)) {
++ found = 1;
++ break;
++ }
++ }
++ free(inputline);
++ free(lowerKeyword);
++ fclose(attf);
++ return found;
++}
++
++int
+ ci_send_message (int flags, /* send mode */
+ HEADER *msg, /* template to use for new message */
+ char *tempfile, /* file specified by -i or -H */
+@@ -1605,6 +1633,21 @@
+ goto main_loop;
+ }
+
++ if (mutt_search_attach_keyword(msg->content->filename) &&
++ !msg->content->next &&
++ query_quadoption(OPT_ATTACH, _("No attachments, cancel sending?")) != M_NO)
++ {
++ /* if the abort is automatic, print an error message */
++ if (quadoption (OPT_ATTACH) == M_YES) {
++ char errorstr[512];
++ if (snprintf(errorstr, 512,
++ "Message contains magic keyword \"%s\", but no attachments. Not sending.", AttachKeyword)==-1)
++ errorstr[511] = 0; // terminate if need be. our string shouldnt be this long.
++ mutt_error _(errorstr);
++ }
++ goto main_loop;
++ }
++
+ if (msg->content->next)
+ msg->content = mutt_make_multipart (msg->content);
+
diff --git a/mutt-unmailbox.patch b/mutt-unmailbox.patch
new file mode 100644
index 000000000000..cbb321031011
--- /dev/null
+++ b/mutt-unmailbox.patch
@@ -0,0 +1,10 @@
+--- a/buffy.c 2009-08-10 08:23:12.731846990 -0400
++++ b/buffy.c 2009-08-10 08:23:50.541878087 -0400
+@@ -236,7 +236,6 @@
+ {
+ if(*tmp)
+ {
+- FREE (&((*tmp)->path));
+ tmp1=(*tmp)->next;
+ FREE (tmp); /* __FREE_CHECKED__ */
+ *tmp=tmp1;
diff --git a/muttrc.example b/muttrc.example
new file mode 100644
index 000000000000..f4f2bf221bd9
--- /dev/null
+++ b/muttrc.example
@@ -0,0 +1,29 @@
+# set up the sidebar, default not visible
+ set sidebar_width=12
+ set sidebar_visible=no
+#
+# # which mailboxes to list in the sidebar
+ mailboxes =inbox =ml
+#
+# # color of folders with new mail
+ color sidebar_new yellow default
+#
+# # ctrl-n, ctrl-p to select next, prev folder
+# # ctrl-o to open selected folder
+ bind index \CP sidebar-prev
+ bind index \CN sidebar-next
+ bind index \CO sidebar-open
+ bind pager \CP sidebar-prev
+ bind pager \CN sidebar-next
+ bind pager \CO sidebar-open
+#
+# # I don't need these. just for documentation purposes. See below.
+# # sidebar-scroll-up
+# #sidebar-scroll-down
+#
+# # b toggles sidebar visibility
+ macro index b '<enter-command>toggle sidebar_visible<enter>'
+ macro pager b '<enter-command>toggle sidebar_visible<enter>'
+#
+# # Remap bounce-message function to "B"
+ bind index B bounce-message
diff --git a/sidebar-dotted.patch b/sidebar-dotted.patch
new file mode 100644
index 000000000000..4257d13e3dc8
--- /dev/null
+++ b/sidebar-dotted.patch
@@ -0,0 +1,65 @@
+From: Evgeni Golov <sargentd@die-welt.net>
+License: 3-BSD
+
+When using IMAP, a '.' is often used as a separator instead of '/'.
+This patch enables mutt to find these dots and
+1. correctly intend the dir in the sidebar
+2. if "sidebar_shortpath" is set, shorten the dir to the part after
+ the last dot
+
+I hope, it's usefull for someone ;)
+
+--- a/sidebar.c
++++ b/sidebar.c
+@@ -255,14 +255,23 @@
+ int i;
+ tmp_folder_name = tmp->path + strlen(Maildir);
+ for (i = 0; i < strlen(tmp->path) - strlen(Maildir); i++) {
+- if (tmp_folder_name[i] == '/') sidebar_folder_depth++;
++ if (tmp_folder_name[i] == '/' || tmp_folder_name[i] == '.') sidebar_folder_depth++;
+ }
+ if (sidebar_folder_depth > 0) {
+- sidebar_folder_name = malloc(strlen(basename(tmp->path)) + sidebar_folder_depth + 1);
++ if (option(OPTSIDEBARSHORTPATH)) {
++ tmp_folder_name = strrchr(tmp->path, '.');
++ if (tmp_folder_name == NULL)
++ tmp_folder_name = tmp->path;
++ else
++ tmp_folder_name++;
++ }
++ else
++ tmp_folder_name = tmp->path;
++ sidebar_folder_name = malloc(strlen(basename(tmp_folder_name)) + sidebar_folder_depth + 1);
+ for (i=0; i < sidebar_folder_depth; i++)
+ sidebar_folder_name[i]=' ';
+ sidebar_folder_name[i]=0;
+- strncat(sidebar_folder_name, basename(tmp->path), strlen(basename(tmp->path)) + sidebar_folder_depth);
++ strncat(sidebar_folder_name, basename(tmp_folder_name), strlen(basename(tmp_folder_name)) + sidebar_folder_depth);
+ }
+ }
+ printw( "%.*s", SidebarWidth - delim_len + 1,
+--- a/init.h
++++ b/init.h
+@@ -1981,6 +1981,11 @@
+ ** .pp
+ ** The width of the sidebar.
+ */
++ { "sidebar_shortpath", DT_BOOL, R_BOTH, OPTSIDEBARSHORTPATH, 0 },
++ /*
++ ** .pp
++ ** Should the sidebar shorten the path showed.
++ */
+ { "pgp_use_gpg_agent", DT_BOOL, R_NONE, OPTUSEGPGAGENT, 0},
+ /*
+ ** .pp
+--- a/mutt.h
++++ b/mutt.h
+@@ -432,6 +432,7 @@
+ OPTSAVENAME,
+ OPTSCORE,
+ OPTSIDEBAR,
++ OPTSIDEBARSHORTPATH,
+ OPTSIDEBARSORT,
+ OPTSIGDASHES,
+ OPTSIGONTOP,
+ OPTSORTRE,
diff --git a/sidebar-drawing-fix.patch b/sidebar-drawing-fix.patch
new file mode 100644
index 000000000000..4a54a5c3a744
--- /dev/null
+++ b/sidebar-drawing-fix.patch
@@ -0,0 +1,165 @@
+Common subdirectories: mutt-1.5.22-orig/contrib and mutt-1.5.22/contrib
+Common subdirectories: mutt-1.5.22-orig/doc and mutt-1.5.22/doc
+Common subdirectories: mutt-1.5.22-orig/imap and mutt-1.5.22/imap
+Common subdirectories: mutt-1.5.22-orig/intl and mutt-1.5.22/intl
+Common subdirectories: mutt-1.5.22-orig/m4 and mutt-1.5.22/m4
+diff -u mutt-1.5.22-orig/pager.c mutt-1.5.22/pager.c
+--- mutt-1.5.22-orig/pager.c 2013-10-31 11:58:17.506721212 +0000
++++ mutt-1.5.22/pager.c 2013-10-31 11:58:54.513516256 +0000
+@@ -1574,6 +1574,7 @@
+
+ int bodyoffset = 1; /* offset of first line of real text */
+ int statusoffset = 0; /* offset for the status bar */
++ int statuswidth;
+ int helpoffset = LINES - 2; /* offset for the help bar. */
+ int bodylen = LINES - 2 - bodyoffset; /* length of displayable area */
+
+@@ -1792,29 +1793,39 @@
+ hfi.ctx = Context;
+ hfi.pager_progress = pager_progress_str;
+
++ statuswidth = COLS - (option(OPTSTATUSONTOP) && PagerIndexLines > 0 ? SidebarWidth : 0);
++
+ if (last_pos < sb.st_size - 1)
+ snprintf(pager_progress_str, sizeof(pager_progress_str), OFF_T_FMT "%%", (100 * last_offset / sb.st_size));
+ else
+ strfcpy(pager_progress_str, (topline == 0) ? "all" : "end", sizeof(pager_progress_str));
+
+ /* print out the pager status bar */
+- move (statusoffset, 0);
++ if(option(OPTSTATUSONTOP) && PagerIndexLines > 0) {
++ move (statusoffset, 0);
++ } else {
++ //not sure about this
++ move (statusoffset, 0);
++ DrawFullLine = 1; /* for mutt_make_string_info */
++ }
+ SETCOLOR (MT_COLOR_STATUS);
+
+ if (IsHeader (extra) || IsMsgAttach (extra))
+ {
+- size_t l1 = (COLS-SidebarWidth) * MB_LEN_MAX;
++ size_t l1 = statuswidth * MB_LEN_MAX;
+ size_t l2 = sizeof (buffer);
+ hfi.hdr = (IsHeader (extra)) ? extra->hdr : extra->bdy->hdr;
+ mutt_make_string_info (buffer, l1 < l2 ? l1 : l2, NONULL (PagerFmt), &hfi, M_FORMAT_MAKEPRINT);
+- mutt_paddstr (COLS-SidebarWidth, buffer);
++ mutt_paddstr (statuswidth, buffer);
+ }
+ else
+ {
+ char bn[STRING];
+ snprintf (bn, sizeof (bn), "%s (%s)", banner, pager_progress_str);
+- mutt_paddstr (COLS-SidebarWidth, bn);
++ mutt_paddstr (statuswidth, bn);
+ }
++ if(!option(OPTSTATUSONTOP) || PagerIndexLines == 0)
++ DrawFullLine = 0; /* reset */
+ NORMAL_COLOR;
+ }
+
+@@ -1828,9 +1839,10 @@
+ /* print out the index status bar */
+ menu_status_line (buffer, sizeof (buffer), index, NONULL(Status));
+
+- move (indexoffset + (option (OPTSTATUSONTOP) ? 0 : (indexlen - 1)), SidebarWidth);
++ move (indexoffset + (option (OPTSTATUSONTOP) ? 0 : (indexlen - 1)),
++ (option(OPTSTATUSONTOP) ? 0: SidebarWidth));
+ SETCOLOR (MT_COLOR_STATUS);
+- mutt_paddstr (COLS-SidebarWidth, buffer);
++ mutt_paddstr (COLS - (option(OPTSTATUSONTOP) ? 0 : SidebarWidth), buffer);
+ NORMAL_COLOR;
+ }
+
+Common subdirectories: mutt-1.5.22-orig/po and mutt-1.5.22/po
+diff -u mutt-1.5.22-orig/sidebar.c mutt-1.5.22/sidebar.c
+--- mutt-1.5.22-orig/sidebar.c 2013-10-31 11:58:17.510054557 +0000
++++ mutt-1.5.22/sidebar.c 2013-10-31 12:01:11.073953904 +0000
+@@ -47,6 +47,8 @@
+ {
+ BUFFY *tmp = Incoming;
+
++ int count = LINES - 2 - (option(OPTHELP) ? 1 : 0);
++
+ if ( known_lines != LINES ) {
+ TopBuffy = BottomBuffy = 0;
+ known_lines = LINES;
+@@ -57,13 +59,11 @@
+ if ( TopBuffy == 0 && BottomBuffy == 0 )
+ TopBuffy = Incoming;
+ if ( BottomBuffy == 0 ) {
+- int count = LINES - 2 - (menu != MENU_PAGER || option(OPTSTATUSONTOP));
+ BottomBuffy = TopBuffy;
+ while ( --count && BottomBuffy->next )
+ BottomBuffy = BottomBuffy->next;
+ }
+ else if ( TopBuffy == CurBuffy->next ) {
+- int count = LINES - 2 - (menu != MENU_PAGER);
+ BottomBuffy = CurBuffy;
+ tmp = BottomBuffy;
+ while ( --count && tmp->prev)
+@@ -71,7 +71,6 @@
+ TopBuffy = tmp;
+ }
+ else if ( BottomBuffy == CurBuffy->prev ) {
+- int count = LINES - 2 - (menu != MENU_PAGER);
+ TopBuffy = CurBuffy;
+ tmp = TopBuffy;
+ while ( --count && tmp->next )
+@@ -136,7 +135,12 @@
+
+ int draw_sidebar(int menu) {
+
+- int lines = option(OPTHELP) ? 1 : 0;
++ int lines = 0;
++ int SidebarHeight;
++
++ if(option(OPTSTATUSONTOP) || option(OPTHELP))
++ lines++; /* either one will occupy the first line */
++
+ BUFFY *tmp;
+ #ifndef USE_SLANG_CURSES
+ attr_t attrs;
+@@ -206,7 +210,11 @@
+
+ /* draw the divider */
+
+- for ( ; lines < LINES-1-(menu != MENU_PAGER || option(OPTSTATUSONTOP)); lines++ ) {
++ SidebarHeight = LINES - 1;
++ if(option(OPTHELP) || !option(OPTSTATUSONTOP))
++ SidebarHeight--;
++
++ for ( ; lines < SidebarHeight; lines++ ) {
+ move(lines, SidebarWidth - delim_len);
+ addstr(NONULL(SidebarDelim));
+ #ifndef USE_SLANG_CURSES
+@@ -215,7 +223,10 @@
+ }
+
+ if ( Incoming == 0 ) return 0;
+- lines = option(OPTHELP) ? 1 : 0; /* go back to the top */
++
++ lines = 0;
++ if(option(OPTSTATUSONTOP) || option(OPTHELP))
++ lines++; /* either one will occupy the first line */
+
+ if ( known_lines != LINES || TopBuffy == 0 || BottomBuffy == 0 )
+ calc_boundaries(menu);
+@@ -225,7 +236,7 @@
+
+ SETCOLOR(MT_COLOR_NORMAL);
+
+- for ( ; tmp && lines < LINES-1 - (menu != MENU_PAGER || option(OPTSTATUSONTOP)); tmp = tmp->next ) {
++ for ( ; tmp && lines < SidebarHeight; tmp = tmp->next ) {
+ if ( tmp == CurBuffy )
+ SETCOLOR(MT_COLOR_INDICATOR);
+ else if ( tmp->msg_unread > 0 )
+@@ -273,7 +284,7 @@
+ lines++;
+ }
+ SETCOLOR(MT_COLOR_NORMAL);
+- for ( ; lines < LINES-1 - (menu != MENU_PAGER || option(OPTSTATUSONTOP)); lines++ ) {
++ for ( ; lines < SidebarHeight; lines++ ) {
+ int i = 0;
+ move( lines, 0 );
+ for ( ; i < SidebarWidth - delim_len; i++ )
diff --git a/sidebar-utf8.patch b/sidebar-utf8.patch
new file mode 100644
index 000000000000..32241c59bc7b
--- /dev/null
+++ b/sidebar-utf8.patch
@@ -0,0 +1,125 @@
+This patch fixes a problem with utf-8 strings and the sidebar, it rewrites
+entirely make_sidebar_entry so it also fixes some segfaults due to
+misallocations and overflows.
+
+See:
+http://bugs.debian.org/584581
+http://bugs.debian.org/603287
+
+Author: Antonio Radici <antonio@dyne.org>
+
+Index: mutt/sidebar.c
+===================================================================
+--- mutt.orig/sidebar.c 2011-05-02 13:36:10.000000000 +0000
++++ mutt/sidebar.c 2011-05-02 13:36:30.000000000 +0000
+@@ -30,6 +30,7 @@
+ #include <libgen.h>
+ #include "keymap.h"
+ #include <stdbool.h>
++#include <wchar.h>
+
+ /*BUFFY *CurBuffy = 0;*/
+ static BUFFY *TopBuffy = 0;
+@@ -111,36 +112,72 @@
+
+ char *make_sidebar_entry(char *box, int size, int new, int flagged)
+ {
+- static char *entry = 0;
+- char *c;
+- int i = 0;
+- int delim_len = strlen(SidebarDelim);
+-
+- c = realloc(entry, SidebarWidth - delim_len + 2);
+- if ( c ) entry = c;
+- entry[SidebarWidth - delim_len + 1] = 0;
+- for (; i < SidebarWidth - delim_len + 1; entry[i++] = ' ' );
+- i = strlen(box);
+- strncpy( entry, box, i < (SidebarWidth - delim_len + 1) ? i : (SidebarWidth - delim_len + 1) );
+-
+- if (size == -1)
+- sprintf(entry + SidebarWidth - delim_len - 3, "?");
+- else if ( new ) {
+- if (flagged > 0) {
+- sprintf(
+- entry + SidebarWidth - delim_len - 5 - quick_log10(size) - quick_log10(new) - quick_log10(flagged),
+- "% d(%d)[%d]", size, new, flagged);
+- } else {
+- sprintf(
+- entry + SidebarWidth - delim_len - 3 - quick_log10(size) - quick_log10(new),
+- "% d(%d)", size, new);
+- }
+- } else if (flagged > 0) {
+- sprintf( entry + SidebarWidth - delim_len - 3 - quick_log10(size) - quick_log10(flagged), "% d[%d]", size, flagged);
+- } else {
+- sprintf( entry + SidebarWidth - delim_len - 1 - quick_log10(size), "% d", size);
+- }
+- return entry;
++ char int_store[20]; // up to 64 bits integers
++ int right_width, left_width;
++ int box_len, box_bytes;
++ int int_len;
++ int right_offset = 0;
++ int delim_len = strlen(SidebarDelim);
++ static char *entry;
++
++ right_width = left_width = 0;
++ box_len = box_bytes = 0;
++
++ // allocate an entry big enough to contain SidebarWidth wide chars
++ entry = malloc((SidebarWidth*4)+1); // TODO: error check
++
++ // determine the right space (i.e.: how big are the numbers that we want to print)
++ if ( size > 0 ) {
++ int_len = snprintf(int_store, sizeof(int_store), "%d", size);
++ right_width += int_len;
++ } else {
++ right_width = 1; // to represent 0
++ }
++ if ( new > 0 ) {
++ int_len = snprintf(int_store, sizeof(int_store), "%d", new);
++ right_width += int_len + 2; // 2 is for ()
++ }
++ if ( flagged > 0 ) {
++ int_len = snprintf(int_store, sizeof(int_store), "%d", flagged);
++ right_width += int_len + 2; // 2 is for []
++ }
++
++ // determine how much space we have for *box and its padding (if any)
++ left_width = SidebarWidth - right_width - 1 - delim_len; // 1 is for the space
++ //fprintf(stdout, "left_width: %d right_width: %d\n", left_width, right_width);
++ // right side overflow case
++ if ( left_width <= 0 ) {
++ snprintf(entry, SidebarWidth*4, "%-*.*s ...", SidebarWidth-4-delim_len, SidebarWidth-4-delim_len, box);
++ return entry;
++ }
++ right_width -= delim_len;
++
++ // to support utf-8 chars we need to add enough space padding in case there
++ // are less chars than bytes in *box
++ box_len = mbstowcs(NULL, box, 0);
++ box_bytes = strlen(box);
++ // debug
++ //fprintf(stdout, "box_len: %d box_bytes: %d (diff: %d)\n", box_len, box_bytes, (box_bytes-box_len));
++ // if there is less string than the space we allow, then we will add the
++ // spaces
++ if ( box_len != -1 && box_len < left_width ) {
++ left_width += (box_bytes - box_len);
++ }
++ // otherwise sprintf will truncate the string for us (therefore, no else case)
++
++ // print the sidebar entry (without new and flagged messages, at the moment)
++ //fprintf(stdout, "left_width: %d right_width: %d\n", left_width, right_width);
++ right_offset = snprintf(entry, SidebarWidth*4, "%-*.*s %d", left_width, left_width, box, size);
++
++ // then pad new and flagged messages if any
++ if ( new > 0 ) {
++ right_offset += snprintf(entry+right_offset, SidebarWidth*4-right_offset, "(%d)", new);
++ }
++ if ( flagged > 0 ) {
++ right_offset += snprintf(entry+right_offset, SidebarWidth*4-right_offset, "[%d]", flagged);
++ }
++
++ return entry;
+ }
+
+ void set_curbuffy(char buf[LONG_STRING])
diff --git a/sidebar.patch b/sidebar.patch
new file mode 100644
index 000000000000..47da58730a9a
--- /dev/null
+++ b/sidebar.patch
@@ -0,0 +1,1442 @@
+Based on Gentoo's updated version of the Mutt Sidebar patch,
+rebased to apply to pristine Mutt sources.
+
+http://prefix.gentooexperimental.org:8000/mutt-patches/file/8117acc3edc0/sidebar.patch
+
+diff -uNp -r mutt-1.5.22.orig/OPS mutt-1.5.22/OPS
+--- mutt-1.5.22.orig/OPS Tue Feb 23 06:57:28 2010
++++ mutt-1.5.22/OPS Fri Oct 18 10:18:45 2013
+@@ -179,3 +179,8 @@ OP_WHAT_KEY "display the keycode for a key press"
+ OP_MAIN_SHOW_LIMIT "show currently active limit pattern"
+ OP_MAIN_COLLAPSE_THREAD "collapse/uncollapse current thread"
+ OP_MAIN_COLLAPSE_ALL "collapse/uncollapse all threads"
++OP_SIDEBAR_SCROLL_UP "scroll the mailbox pane up 1 page"
++OP_SIDEBAR_SCROLL_DOWN "scroll the mailbox pane down 1 page"
++OP_SIDEBAR_NEXT "go down to next mailbox"
++OP_SIDEBAR_PREV "go to previous mailbox"
++OP_SIDEBAR_OPEN "open hilighted mailbox"
+diff -uNp -r mutt-1.5.22.orig/PATCHES mutt-1.5.22/PATCHES
+--- mutt-1.5.22.orig/PATCHES Sun Feb 21 05:51:26 2010
++++ mutt-1.5.22/PATCHES Fri Oct 18 10:19:14 2013
+@@ -0,0 +1 @@
++patch-1.5.22.sidebar.gentoo-openbsd
+diff -uNp -r mutt-1.5.22.orig/buffy.c mutt-1.5.22/buffy.c
+--- mutt-1.5.22.orig/buffy.c Mon Apr 22 07:14:53 2013
++++ mutt-1.5.22/buffy.c Fri Oct 18 10:18:45 2013
+@@ -161,6 +161,49 @@ void mutt_buffy_cleanup (const char *buf, struct stat
+ }
+ }
+
++static int buffy_compare_name(const void *a, const void *b) {
++ const BUFFY *b1 = * (BUFFY * const *) a;
++ const BUFFY *b2 = * (BUFFY * const *) b;
++
++ return mutt_strcoll(b1->path, b2->path);
++}
++
++static BUFFY *buffy_sort(BUFFY *b)
++{
++ BUFFY *tmp = b;
++ int buffycount = 0;
++ BUFFY **ary;
++ int i;
++
++ if (!option(OPTSIDEBARSORT))
++ return b;
++
++ for (; tmp != NULL; tmp = tmp->next)
++ buffycount++;
++
++ ary = (BUFFY **) safe_calloc(buffycount, sizeof (*ary));
++
++ tmp = b;
++ for (i = 0; tmp != NULL; tmp = tmp->next, i++) {
++ ary[i] = tmp;
++ }
++
++ qsort(ary, buffycount, sizeof(*ary), buffy_compare_name);
++
++ for (i = 0; i < buffycount - 1; i++) {
++ ary[i]->next = ary[i+1];
++ }
++ ary[buffycount - 1]->next = NULL;
++ for (i = 1; i < buffycount; i++) {
++ ary[i]->prev = ary[i-1];
++ }
++ ary[0]->prev = NULL;
++
++ tmp = ary[0];
++ free(ary);
++ return tmp;
++}
++
+ BUFFY *mutt_find_mailbox (const char *path)
+ {
+ BUFFY *tmp = NULL;
+@@ -282,6 +325,7 @@ int mutt_parse_mailboxes (BUFFER *path, BUFFER *s, uns
+ else
+ (*tmp)->size = 0;
+ }
++ Incoming = buffy_sort(Incoming);
+ return 0;
+ }
+
+@@ -340,6 +384,68 @@ static int buffy_maildir_hasnew (BUFFY* mailbox)
+ return rc;
+ }
+
++/* update message counts for the sidebar */
++void buffy_maildir_update (BUFFY* mailbox)
++{
++ char path[_POSIX_PATH_MAX];
++ DIR *dirp;
++ struct dirent *de;
++ char *p;
++
++ mailbox->msgcount = 0;
++ mailbox->msg_unread = 0;
++ mailbox->msg_flagged = 0;
++
++ snprintf (path, sizeof (path), "%s/new", mailbox->path);
++
++ if ((dirp = opendir (path)) == NULL)
++ {
++ mailbox->magic = 0;
++ return;
++ }
++
++ while ((de = readdir (dirp)) != NULL)
++ {
++ if (*de->d_name == '.')
++ continue;
++
++ if (!(p = strstr (de->d_name, ":2,")) || !strchr (p + 3, 'T')) {
++ mailbox->new = 1;
++ mailbox->msgcount++;
++ mailbox->msg_unread++;
++ }
++ }
++
++ closedir (dirp);
++ snprintf (path, sizeof (path), "%s/cur", mailbox->path);
++
++ if ((dirp = opendir (path)) == NULL)
++ {
++ mailbox->magic = 0;
++ return;
++ }
++
++ while ((de = readdir (dirp)) != NULL)
++ {
++ if (*de->d_name == '.')
++ continue;
++
++ if (!(p = strstr (de->d_name, ":2,")) || !strchr (p + 3, 'T')) {
++ mailbox->msgcount++;
++ if ((p = strstr (de->d_name, ":2,"))) {
++ if (!strchr (p + 3, 'T')) {
++ if (!strchr (p + 3, 'S'))
++ mailbox->msg_unread++;
++ if (strchr(p + 3, 'F'))
++ mailbox->msg_flagged++;
++ }
++ }
++ }
++ }
++
++ closedir (dirp);
++}
++
+ /* returns 1 if mailbox has new mail */
+ static int buffy_mbox_hasnew (BUFFY* mailbox, struct stat *sb)
+ {
+@@ -371,6 +477,20 @@ static int buffy_mbox_hasnew (BUFFY* mailbox, struct s
+ return rc;
+ }
+
++/* update message counts for the sidebar */
++void buffy_mbox_update (BUFFY* mailbox)
++{
++ CONTEXT *ctx = NULL;
++
++ ctx = mx_open_mailbox(mailbox->path, M_READONLY | M_QUIET | M_NOSORT | M_PEEK, NULL);
++ if(ctx)
++ {
++ mailbox->msgcount = ctx->msgcount;
++ mailbox->msg_unread = ctx->unread;
++ mx_close_mailbox(ctx, 0);
++ }
++}
++
+ int mutt_buffy_check (int force)
+ {
+ BUFFY *tmp;
+@@ -444,16 +564,19 @@ int mutt_buffy_check (int force)
+ {
+ case M_MBOX:
+ case M_MMDF:
++ buffy_mbox_update (tmp);
+ if (buffy_mbox_hasnew (tmp, &sb) > 0)
+ BuffyCount++;
+ break;
+
+ case M_MAILDIR:
++ buffy_maildir_update (tmp);
+ if (buffy_maildir_hasnew (tmp) > 0)
+ BuffyCount++;
+ break;
+
+ case M_MH:
++ mh_buffy_update (tmp->path, &tmp->msgcount, &tmp->msg_unread, &tmp->msg_flagged);
+ mh_buffy(tmp);
+ if (tmp->new)
+ BuffyCount++;
+diff -uNp -r mutt-1.5.22.orig/buffy.h mutt-1.5.22/buffy.h
+--- mutt-1.5.22.orig/buffy.h Mon Apr 22 07:14:53 2013
++++ mutt-1.5.22/buffy.h Fri Oct 18 10:18:45 2013
+@@ -25,7 +25,11 @@ typedef struct buffy_t
+ char path[_POSIX_PATH_MAX];
+ off_t size;
+ struct buffy_t *next;
++ struct buffy_t *prev;
+ short new; /* mailbox has new mail */
++ int msgcount; /* total number of messages */
++ int msg_unread; /* number of unread messages */
++ int msg_flagged; /* number of flagged messages */
+ short notified; /* user has been notified */
+ short magic; /* mailbox type */
+ short newly_created; /* mbox or mmdf just popped into existence */
+diff -uNp -r mutt-1.5.22.orig/color.c mutt-1.5.22/color.c
+--- mutt-1.5.22.orig/color.c Tue Jan 15 07:37:15 2013
++++ mutt-1.5.22/color.c Fri Oct 18 10:19:53 2013
+@@ -93,6 +93,8 @@ static const struct mapping_t Fields[] =
+ { "bold", MT_COLOR_BOLD },
+ { "underline", MT_COLOR_UNDERLINE },
+ { "index", MT_COLOR_INDEX },
++ { "sidebar_new", MT_COLOR_NEW },
++ { "sidebar_flagged", MT_COLOR_FLAGGED },
+ { NULL, 0 }
+ };
+
+diff -uNp -r mutt-1.5.22.orig/compose.c mutt-1.5.22/compose.c
+--- mutt-1.5.22.orig/compose.c Fri Oct 18 05:48:24 2013
++++ mutt-1.5.22/compose.c Fri Oct 18 10:22:12 2013
+@@ -72,7 +72,7 @@ enum
+
+ #define HDR_XOFFSET 10
+ #define TITLE_FMT "%10s" /* Used for Prompts, which are ASCII */
+-#define W (COLS - HDR_XOFFSET)
++#define W (COLS - HDR_XOFFSET - SidebarWidth)
+
+ static const char * const Prompts[] =
+ {
+@@ -110,7 +110,7 @@ static void snd_entry (char *b, size_t blen, MUTTMENU
+
+ static void redraw_crypt_lines (HEADER *msg)
+ {
+- mvaddstr (HDR_CRYPT, 0, "Security: ");
++ mvaddstr (HDR_CRYPT, SidebarWidth, "Security: ");
+
+ if ((WithCrypto & (APPLICATION_PGP | APPLICATION_SMIME)) == 0)
+ {
+@@ -142,7 +142,7 @@ static void redraw_crypt_lines (HEADER *msg)
+ }
+
+ clrtoeol ();
+- move (HDR_CRYPTINFO, 0);
++ move (HDR_CRYPTINFO, SidebarWidth);
+ clrtoeol ();
+
+ if ((WithCrypto & APPLICATION_PGP)
+@@ -159,7 +159,7 @@ static void redraw_crypt_lines (HEADER *msg)
+ && (msg->security & ENCRYPT)
+ && SmimeCryptAlg
+ && *SmimeCryptAlg) {
+- mvprintw (HDR_CRYPTINFO, 40, "%s%s", _("Encrypt with: "),
++ mvprintw (HDR_CRYPTINFO, SidebarWidth + 40, "%s%s", _("Encrypt with: "),
+ NONULL(SmimeCryptAlg));
+ }
+ }
+@@ -172,7 +172,7 @@ static void redraw_mix_line (LIST *chain)
+ int c;
+ char *t;
+
+- mvaddstr (HDR_MIX, 0, " Mix: ");
++ mvaddstr (HDR_MIX, SidebarWidth, " Mix: ");
+
+ if (!chain)
+ {
+@@ -187,7 +187,7 @@ static void redraw_mix_line (LIST *chain)
+ if (t && t[0] == '0' && t[1] == '\0')
+ t = "<random>";
+
+- if (c + mutt_strlen (t) + 2 >= COLS)
++ if (c + mutt_strlen (t) + 2 >= COLS - SidebarWidth)
+ break;
+
+ addstr (NONULL(t));
+@@ -239,7 +239,7 @@ static void draw_envelope_addr (int line, ADDRESS *add
+
+ buf[0] = 0;
+ rfc822_write_address (buf, sizeof (buf), addr, 1);
+- mvprintw (line, 0, TITLE_FMT, Prompts[line - 1]);
++ mvprintw (line, SidebarWidth, TITLE_FMT, Prompts[line - 1]);
+ mutt_paddstr (W, buf);
+ }
+
+@@ -249,10 +249,10 @@ static void draw_envelope (HEADER *msg, char *fcc)
+ draw_envelope_addr (HDR_TO, msg->env->to);
+ draw_envelope_addr (HDR_CC, msg->env->cc);
+ draw_envelope_addr (HDR_BCC, msg->env->bcc);
+- mvprintw (HDR_SUBJECT, 0, TITLE_FMT, Prompts[HDR_SUBJECT - 1]);
++ mvprintw (HDR_SUBJECT, SidebarWidth, TITLE_FMT, Prompts[HDR_SUBJECT - 1]);
+ mutt_paddstr (W, NONULL (msg->env->subject));
+ draw_envelope_addr (HDR_REPLYTO, msg->env->reply_to);
+- mvprintw (HDR_FCC, 0, TITLE_FMT, Prompts[HDR_FCC - 1]);
++ mvprintw (HDR_FCC, SidebarWidth, TITLE_FMT, Prompts[HDR_FCC - 1]);
+ mutt_paddstr (W, fcc);
+
+ if (WithCrypto)
+@@ -263,7 +263,7 @@ static void draw_envelope (HEADER *msg, char *fcc)
+ #endif
+
+ SETCOLOR (MT_COLOR_STATUS);
+- mvaddstr (HDR_ATTACH - 1, 0, _("-- Attachments"));
++ mvaddstr (HDR_ATTACH - 1, SidebarWidth, _("-- Attachments"));
+ clrtoeol ();
+
+ NORMAL_COLOR;
+@@ -299,7 +299,7 @@ static int edit_address_list (int line, ADDRESS **addr
+ /* redraw the expanded list so the user can see the result */
+ buf[0] = 0;
+ rfc822_write_address (buf, sizeof (buf), *addr, 1);
+- move (line, HDR_XOFFSET);
++ move (line, HDR_XOFFSET+SidebarWidth);
+ mutt_paddstr (W, buf);
+
+ return 0;
+@@ -544,7 +544,7 @@ int mutt_compose_menu (HEADER *msg, /* structure for
+ if (mutt_get_field ("Subject: ", buf, sizeof (buf), 0) == 0)
+ {
+ mutt_str_replace (&msg->env->subject, buf);
+- move (HDR_SUBJECT, HDR_XOFFSET);
++ move (HDR_SUBJECT, HDR_XOFFSET + SidebarWidth);
+ if (msg->env->subject)
+ mutt_paddstr (W, msg->env->subject);
+ else
+@@ -562,7 +562,7 @@ int mutt_compose_menu (HEADER *msg, /* structure for
+ {
+ strfcpy (fcc, buf, fcclen);
+ mutt_pretty_mailbox (fcc, fcclen);
+- move (HDR_FCC, HDR_XOFFSET);
++ move (HDR_FCC, HDR_XOFFSET + SidebarWidth);
+ mutt_paddstr (W, fcc);
+ fccSet = 1;
+ }
+diff -uNp -r mutt-1.5.22.orig/curs_main.c mutt-1.5.22/curs_main.c
+--- mutt-1.5.22.orig/curs_main.c Tue Jan 15 07:37:15 2013
++++ mutt-1.5.22/curs_main.c Fri Oct 18 10:18:45 2013
+@@ -26,7 +26,9 @@
+ #include "mailbox.h"
+ #include "mapping.h"
+ #include "sort.h"
++#include "buffy.h"
+ #include "mx.h"
++#include "sidebar.h"
+
+ #ifdef USE_POP
+ #include "pop.h"
+@@ -519,8 +521,12 @@ int mutt_index_menu (void)
+ menu->redraw |= REDRAW_STATUS;
+ if (do_buffy_notify)
+ {
+- if (mutt_buffy_notify () && option (OPTBEEPNEW))
+- beep ();
++ if (mutt_buffy_notify ())
++ {
++ menu->redraw |= REDRAW_FULL;
++ if (option (OPTBEEPNEW))
++ beep ();
++ }
+ }
+ else
+ do_buffy_notify = 1;
+@@ -532,6 +538,7 @@ int mutt_index_menu (void)
+ if (menu->redraw & REDRAW_FULL)
+ {
+ menu_redraw_full (menu);
++ draw_sidebar(menu->menu);
+ mutt_show_error ();
+ }
+
+@@ -554,9 +561,12 @@ int mutt_index_menu (void)
+
+ if (menu->redraw & REDRAW_STATUS)
+ {
++ DrawFullLine = 1;
+ menu_status_line (buf, sizeof (buf), menu, NONULL (Status));
++ DrawFullLine = 0;
+ move (option (OPTSTATUSONTOP) ? 0 : LINES-2, 0);
+ SETCOLOR (MT_COLOR_STATUS);
++ set_buffystats(Context);
+ mutt_paddstr (COLS, buf);
+ NORMAL_COLOR;
+ menu->redraw &= ~REDRAW_STATUS;
+@@ -569,7 +579,7 @@ int mutt_index_menu (void)
+ menu->oldcurrent = -1;
+
+ if (option (OPTARROWCURSOR))
+- move (menu->current - menu->top + menu->offset, 2);
++ move (menu->current - menu->top + menu->offset, SidebarWidth + 2);
+ else if (option (OPTBRAILLEFRIENDLY))
+ move (menu->current - menu->top + menu->offset, 0);
+ else
+@@ -1070,6 +1080,7 @@ int mutt_index_menu (void)
+ menu->redraw = REDRAW_FULL;
+ break;
+
++ case OP_SIDEBAR_OPEN:
+ case OP_MAIN_CHANGE_FOLDER:
+ case OP_MAIN_NEXT_UNREAD_MAILBOX:
+
+@@ -1101,7 +1112,11 @@ int mutt_index_menu (void)
+ {
+ mutt_buffy (buf, sizeof (buf));
+
+- if (mutt_enter_fname (cp, buf, sizeof (buf), &menu->redraw, 1) == -1)
++ if ( op == OP_SIDEBAR_OPEN ) {
++ if(!CurBuffy)
++ break;
++ strncpy( buf, CurBuffy->path, sizeof(buf) );
++ } else if (mutt_enter_fname (cp, buf, sizeof (buf), &menu->redraw, 1) == -1)
+ {
+ if (menu->menu == MENU_PAGER)
+ {
+@@ -1119,6 +1134,7 @@ int mutt_index_menu (void)
+ }
+
+ mutt_expand_path (buf, sizeof (buf));
++ set_curbuffy(buf);
+ if (mx_get_magic (buf) <= 0)
+ {
+ mutt_error (_("%s is not a mailbox."), buf);
+@@ -2209,6 +2225,12 @@ int mutt_index_menu (void)
+ mutt_what_key();
+ break;
+
++ case OP_SIDEBAR_SCROLL_UP:
++ case OP_SIDEBAR_SCROLL_DOWN:
++ case OP_SIDEBAR_NEXT:
++ case OP_SIDEBAR_PREV:
++ scroll_sidebar(op, menu->menu);
++ break;
+ default:
+ if (menu->menu == MENU_MAIN)
+ km_error_key (MENU_MAIN);
+diff -uNp -r mutt-1.5.22.orig/flags.c mutt-1.5.22/flags.c
+--- mutt-1.5.22.orig/flags.c Sun Feb 21 22:10:41 2010
++++ mutt-1.5.22/flags.c Fri Oct 18 10:18:45 2013
+@@ -22,8 +22,10 @@
+
+ #include "mutt.h"
+ #include "mutt_curses.h"
++#include "mutt_menu.h"
+ #include "sort.h"
+ #include "mx.h"
++#include "sidebar.h"
+
+ void _mutt_set_flag (CONTEXT *ctx, HEADER *h, int flag, int bf, int upd_ctx)
+ {
+@@ -263,6 +265,7 @@ void _mutt_set_flag (CONTEXT *ctx, HEADER *h, int flag
+ */
+ if (h->searched && (changed != h->changed || deleted != ctx->deleted || tagged != ctx->tagged || flagged != ctx->flagged))
+ h->searched = 0;
++ draw_sidebar(0);
+ }
+
+ void mutt_tag_set_flag (int flag, int bf)
+diff -uNp -r mutt-1.5.22.orig/functions.h mutt-1.5.22/functions.h
+--- mutt-1.5.22.orig/functions.h Sat Dec 3 19:10:04 2011
++++ mutt-1.5.22/functions.h Fri Oct 18 10:18:45 2013
+@@ -169,6 +169,11 @@ const struct binding_t OpMain[] = { /* map: index */
+ { "decrypt-save", OP_DECRYPT_SAVE, NULL },
+
+
++ { "sidebar-scroll-up", OP_SIDEBAR_SCROLL_UP, NULL },
++ { "sidebar-scroll-down", OP_SIDEBAR_SCROLL_DOWN, NULL },
++ { "sidebar-next", OP_SIDEBAR_NEXT, NULL },
++ { "sidebar-prev", OP_SIDEBAR_PREV, NULL },
++ { "sidebar-open", OP_SIDEBAR_OPEN, NULL },
+ { NULL, 0, NULL }
+ };
+
+@@ -272,6 +277,11 @@ const struct binding_t OpPager[] = { /* map: pager */
+
+ { "what-key", OP_WHAT_KEY, NULL },
+
++ { "sidebar-scroll-up", OP_SIDEBAR_SCROLL_UP, NULL },
++ { "sidebar-scroll-down", OP_SIDEBAR_SCROLL_DOWN, NULL },
++ { "sidebar-next", OP_SIDEBAR_NEXT, NULL },
++ { "sidebar-prev", OP_SIDEBAR_PREV, NULL },
++ { "sidebar-open", OP_SIDEBAR_OPEN, NULL },
+ { NULL, 0, NULL }
+ };
+
+diff -uNp -r mutt-1.5.22.orig/globals.h mutt-1.5.22/globals.h
+--- mutt-1.5.22.orig/globals.h Sat Dec 3 19:10:04 2011
++++ mutt-1.5.22/globals.h Fri Oct 18 10:18:45 2013
+@@ -117,6 +117,7 @@ WHERE short SearchContext;
+ WHERE char *SendCharset;
+ WHERE char *Sendmail;
+ WHERE char *Shell;
++WHERE char *SidebarDelim;
+ WHERE char *Signature;
+ WHERE char *SimpleSearch;
+ #if USE_SMTP
+@@ -208,6 +209,9 @@ WHERE short ScoreThresholdDelete;
+ WHERE short ScoreThresholdRead;
+ WHERE short ScoreThresholdFlag;
+
++WHERE struct buffy_t *CurBuffy INITVAL(0);
++WHERE short DrawFullLine INITVAL(0);
++WHERE short SidebarWidth;
+ #ifdef USE_IMAP
+ WHERE short ImapKeepalive;
+ WHERE short ImapPipelineDepth;
+diff -uNp -r mutt-1.5.22.orig/imap/command.c mutt-1.5.22/imap/command.c
+--- mutt-1.5.22.orig/imap/command.c Fri Oct 18 05:48:24 2013
++++ mutt-1.5.22/imap/command.c Fri Oct 18 10:18:45 2013
+@@ -1012,6 +1012,13 @@ static void cmd_parse_status (IMAP_DATA* idata, char*
+ opened */
+ status->uidnext = oldun;
+
++ /* Added to make the sidebar show the correct numbers */
++ if (status->messages)
++ {
++ inc->msgcount = status->messages;
++ inc->msg_unread = status->unseen;
++ }
++
+ FREE (&value);
+ return;
+ }
+diff -uNp -r mutt-1.5.22.orig/imap/imap.c mutt-1.5.22/imap/imap.c
+--- mutt-1.5.22.orig/imap/imap.c Fri Oct 18 05:48:24 2013
++++ mutt-1.5.22/imap/imap.c Fri Oct 18 10:18:45 2013
+@@ -1514,7 +1514,7 @@ int imap_buffy_check (int force)
+
+ imap_munge_mbox_name (munged, sizeof (munged), name);
+ snprintf (command, sizeof (command),
+- "STATUS %s (UIDNEXT UIDVALIDITY UNSEEN RECENT)", munged);
++ "STATUS %s (UIDNEXT UIDVALIDITY UNSEEN RECENT MESSAGES)", munged);
+
+ if (imap_exec (idata, command, IMAP_CMD_QUEUE) < 0)
+ {
+diff -uNp -r mutt-1.5.22.orig/init.h mutt-1.5.22/init.h
+--- mutt-1.5.22.orig/init.h Tue Jan 15 07:37:15 2013
++++ mutt-1.5.22/init.h Fri Oct 18 10:18:45 2013
+@@ -1966,6 +1966,27 @@ struct option_t MuttVars[] = {
+ ** not used.
+ ** (PGP only)
+ */
++ {"sidebar_delim", DT_STR, R_BOTH, UL &SidebarDelim, "|"},
++ /*
++ ** .pp
++ ** This specifies the delimiter between the sidebar (if visible) and
++ ** other screens.
++ */
++ { "sidebar_visible", DT_BOOL, R_BOTH, OPTSIDEBAR, 0 },
++ /*
++ ** .pp
++ ** This specifies whether or not to show sidebar (left-side list of folders).
++ */
++ { "sidebar_sort", DT_BOOL, R_BOTH, OPTSIDEBARSORT, 0 },
++ /*
++ ** .pp
++ ** This specifies whether or not to sort the sidebar alphabetically.
++ */
++ { "sidebar_width", DT_NUM, R_BOTH, UL &SidebarWidth, 0 },
++ /*
++ ** .pp
++ ** The width of the sidebar.
++ */
+ { "pgp_use_gpg_agent", DT_BOOL, R_NONE, OPTUSEGPGAGENT, 0},
+ /*
+ ** .pp
+diff -uNp -r mutt-1.5.22.orig/mailbox.h mutt-1.5.22/mailbox.h
+--- mutt-1.5.22.orig/mailbox.h Sun Feb 21 22:10:41 2010
++++ mutt-1.5.22/mailbox.h Fri Oct 18 10:18:45 2013
+@@ -27,6 +27,7 @@
+ #define M_NEWFOLDER (1<<4) /* create a new folder - same as M_APPEND, but uses
+ * safe_fopen() for mbox-style folders.
+ */
++#define M_PEEK (1<<5) /* revert atime back after taking a look (if applicable) */
+
+ /* mx_open_new_message() */
+ #define M_ADD_FROM 1 /* add a From_ line */
+diff -uNp -r mutt-1.5.22.orig/mbox.c mutt-1.5.22/mbox.c
+--- mutt-1.5.22.orig/mbox.c Fri Oct 18 05:48:24 2013
++++ mutt-1.5.22/mbox.c Fri Oct 18 10:18:45 2013
+@@ -100,6 +100,7 @@ int mmdf_parse_mailbox (CONTEXT *ctx)
+ mutt_perror (ctx->path);
+ return (-1);
+ }
++ ctx->atime = sb.st_atime;
+ ctx->mtime = sb.st_mtime;
+ ctx->size = sb.st_size;
+
+@@ -251,6 +252,7 @@ int mbox_parse_mailbox (CONTEXT *ctx)
+
+ ctx->size = sb.st_size;
+ ctx->mtime = sb.st_mtime;
++ ctx->atime = sb.st_atime;
+
+ #ifdef NFS_ATTRIBUTE_HACK
+ if (sb.st_mtime > sb.st_atime)
+diff -uNp -r mutt-1.5.22.orig/menu.c mutt-1.5.22/menu.c
+--- mutt-1.5.22.orig/menu.c Tue Jan 15 07:37:15 2013
++++ mutt-1.5.22/menu.c Fri Oct 18 10:18:45 2013
+@@ -24,6 +24,7 @@
+ #include "mutt_curses.h"
+ #include "mutt_menu.h"
+ #include "mbyte.h"
++#include "sidebar.h"
+
+ extern size_t UngetCount;
+
+@@ -186,7 +187,7 @@ static void menu_pad_string (char *s, size_t n)
+ {
+ char *scratch = safe_strdup (s);
+ int shift = option (OPTARROWCURSOR) ? 3 : 0;
+- int cols = COLS - shift;
++ int cols = COLS - shift - SidebarWidth;
+
+ mutt_format_string (s, n, cols, cols, FMT_LEFT, ' ', scratch, mutt_strlen (scratch), 1);
+ s[n - 1] = 0;
+@@ -239,6 +240,7 @@ void menu_redraw_index (MUTTMENU *menu)
+ int do_color;
+ int attr;
+
++ draw_sidebar(1);
+ for (i = menu->top; i < menu->top + menu->pagelen; i++)
+ {
+ if (i < menu->max)
+@@ -249,7 +251,7 @@ void menu_redraw_index (MUTTMENU *menu)
+ menu_pad_string (buf, sizeof (buf));
+
+ ATTRSET(attr);
+- move(i - menu->top + menu->offset, 0);
++ move(i - menu->top + menu->offset, SidebarWidth);
+ do_color = 1;
+
+ if (i == menu->current)
+@@ -272,7 +274,7 @@ void menu_redraw_index (MUTTMENU *menu)
+ else
+ {
+ NORMAL_COLOR;
+- CLEARLINE(i - menu->top + menu->offset);
++ CLEARLINE_WIN(i - menu->top + menu->offset);
+ }
+ }
+ NORMAL_COLOR;
+@@ -289,7 +291,7 @@ void menu_redraw_motion (MUTTMENU *menu)
+ return;
+ }
+
+- move (menu->oldcurrent + menu->offset - menu->top, 0);
++ move (menu->oldcurrent + menu->offset - menu->top, SidebarWidth);
+ ATTRSET(menu->color (menu->oldcurrent));
+
+ if (option (OPTARROWCURSOR))
+@@ -301,13 +303,13 @@ void menu_redraw_motion (MUTTMENU *menu)
+ {
+ menu_make_entry (buf, sizeof (buf), menu, menu->oldcurrent);
+ menu_pad_string (buf, sizeof (buf));
+- move (menu->oldcurrent + menu->offset - menu->top, 3);
++ move (menu->oldcurrent + menu->offset - menu->top, SidebarWidth + 3);
+ print_enriched_string (menu->color(menu->oldcurrent), (unsigned char *) buf, 1);
+ }
+
+ /* now draw it in the new location */
+ SETCOLOR(MT_COLOR_INDICATOR);
+- mvaddstr(menu->current + menu->offset - menu->top, 0, "->");
++ mvaddstr(menu->current + menu->offset - menu->top, SidebarWidth, "->");
+ }
+ else
+ {
+@@ -320,7 +322,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);
+- move(menu->current - menu->top + menu->offset, 0);
++ move(menu->current - menu->top + menu->offset, SidebarWidth);
+ 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)
+ char buf[LONG_STRING];
+ int attr = menu->color (menu->current);
+
+- move (menu->current + menu->offset - menu->top, 0);
++ move (menu->current + menu->offset - menu->top, SidebarWidth);
+ menu_make_entry (buf, sizeof (buf), menu, menu->current);
+ menu_pad_string (buf, sizeof (buf));
+
+@@ -872,7 +874,7 @@ int mutt_menuLoop (MUTTMENU *menu)
+
+
+ if (option (OPTARROWCURSOR))
+- move (menu->current - menu->top + menu->offset, 2);
++ move (menu->current - menu->top + menu->offset, SidebarWidth + 2);
+ else if (option (OPTBRAILLEFRIENDLY))
+ move (menu->current - menu->top + menu->offset, 0);
+ else
+diff -uNp -r mutt-1.5.22.orig/mh.c mutt-1.5.22/mh.c
+--- mutt-1.5.22.orig/mh.c Mon Apr 22 07:14:53 2013
++++ mutt-1.5.22/mh.c Fri Oct 18 10:18:45 2013
+@@ -295,6 +295,28 @@ void mh_buffy(BUFFY *b)
+ mhs_free_sequences (&mhs);
+ }
+
++void mh_buffy_update (const char *path, int *msgcount, int *msg_unread, int *msg_flagged)
++{
++ int i;
++ struct mh_sequences mhs;
++ memset (&mhs, 0, sizeof (mhs));
++
++ if (mh_read_sequences (&mhs, path) < 0)
++ return;
++
++ msgcount = 0;
++ msg_unread = 0;
++ msg_flagged = 0;
++ for (i = 0; i <= mhs.max; i++)
++ msgcount++;
++ if (mhs_check (&mhs, i) & MH_SEQ_UNSEEN) {
++ msg_unread++;
++ }
++ if (mhs_check (&mhs, i) & MH_SEQ_FLAGGED)
++ msg_flagged++;
++ mhs_free_sequences (&mhs);
++}
++
+ static int mh_mkstemp (CONTEXT * dest, FILE ** fp, char **tgt)
+ {
+ int fd;
+diff -uNp -r mutt-1.5.22.orig/mutt.h mutt-1.5.22/mutt.h
+--- mutt-1.5.22.orig/mutt.h Fri Oct 18 05:48:24 2013
++++ mutt-1.5.22/mutt.h Fri Oct 18 10:18:45 2013
+@@ -420,6 +420,8 @@ enum
+ OPTSAVEEMPTY,
+ OPTSAVENAME,
+ OPTSCORE,
++ OPTSIDEBAR,
++ OPTSIDEBARSORT,
+ OPTSIGDASHES,
+ OPTSIGONTOP,
+ OPTSORTRE,
+@@ -860,6 +862,7 @@ typedef struct _context
+ {
+ char *path;
+ FILE *fp;
++ time_t atime;
+ time_t mtime;
+ off_t size;
+ off_t vsize;
+@@ -894,6 +897,7 @@ typedef struct _context
+ unsigned int quiet : 1; /* inhibit status messages? */
+ unsigned int collapsed : 1; /* are all threads collapsed? */
+ unsigned int closing : 1; /* mailbox is being closed */
++ unsigned int peekonly : 1; /* just taking a glance, revert atime */
+
+ /* driver hooks */
+ void *data; /* driver specific data */
+diff -uNp -r mutt-1.5.22.orig/mutt_curses.h mutt-1.5.22/mutt_curses.h
+--- mutt-1.5.22.orig/mutt_curses.h Tue Jan 15 07:37:15 2013
++++ mutt-1.5.22/mutt_curses.h Fri Oct 18 10:22:32 2013
+@@ -64,6 +64,7 @@
+ #undef lines
+ #endif /* lines */
+
++#define CLEARLINE_WIN(x) move(x,SidebarWidth), clrtoeol()
+ #define CLEARLINE(x) move(x,0), clrtoeol()
+ #define CENTERLINE(x,y) move(y, (COLS-strlen(x))/2), addstr(x)
+ #define BEEP() do { if (option (OPTBEEP)) beep(); } while (0)
+@@ -120,6 +121,8 @@ enum
+ MT_COLOR_BOLD,
+ MT_COLOR_UNDERLINE,
+ MT_COLOR_INDEX,
++ MT_COLOR_NEW,
++ MT_COLOR_FLAGGED,
+ MT_COLOR_MAX
+ };
+
+diff -uNp -r mutt-1.5.22.orig/muttlib.c mutt-1.5.22/muttlib.c
+--- mutt-1.5.22.orig/muttlib.c Fri Oct 18 05:48:24 2013
++++ mutt-1.5.22/muttlib.c Fri Oct 18 10:18:45 2013
+@@ -1286,6 +1286,8 @@ void mutt_FormatString (char *dest, /* output buffer
+ pl = pw = 1;
+
+ /* see if there's room to add content, else ignore */
++ if ( DrawFullLine )
++ {
+ if ((col < COLS && wlen < destlen) || soft)
+ {
+ int pad;
+@@ -1329,6 +1331,52 @@ void mutt_FormatString (char *dest, /* output buffer
+ col += wid;
+ src += pl;
+ }
++ }
++ else
++ {
++ if ((col < COLS-SidebarWidth && wlen < destlen) || soft)
++ {
++ int pad;
++
++ /* get contents after padding */
++ mutt_FormatString (buf, sizeof (buf), 0, src + pl, callback, data, flags);
++ len = mutt_strlen (buf);
++ wid = mutt_strwidth (buf);
++
++ /* try to consume as many columns as we can, if we don't have
++ * memory for that, use as much memory as possible */
++ pad = (COLS - SidebarWidth - col - wid) / pw;
++ if (pad > 0 && wlen + (pad * pl) + len > destlen)
++ pad = ((signed)(destlen - wlen - len)) / pl;
++ if (pad > 0)
++ {
++ while (pad--)
++ {
++ memcpy (wptr, src, pl);
++ wptr += pl;
++ wlen += pl;
++ col += pw;
++ }
++ }
++ else if (soft && pad < 0)
++ {
++ /* \0-terminate dest for length computation in mutt_wstr_trunc() */
++ *wptr = 0;
++ /* make sure right part is at most as wide as display */
++ len = mutt_wstr_trunc (buf, destlen, COLS, &wid);
++ /* truncate left so that right part fits completely in */
++ wlen = mutt_wstr_trunc (dest, destlen - len, col + pad, &col);
++ wptr = dest + wlen;
++ }
++ if (len + wlen > destlen)
++ len = mutt_wstr_trunc (buf, destlen - wlen, COLS - SidebarWidth - col, NULL);
++ memcpy (wptr, buf, len);
++ wptr += len;
++ wlen += len;
++ col += wid;
++ src += pl;
++ }
++ }
+ break; /* skip rest of input */
+ }
+ else if (ch == '|')
+diff -uNp -r mutt-1.5.22.orig/mx.c mutt-1.5.22/mx.c
+--- mutt-1.5.22.orig/mx.c Fri Oct 18 05:48:24 2013
++++ mutt-1.5.22/mx.c Fri Oct 18 10:18:45 2013
+@@ -580,6 +580,7 @@ static int mx_open_mailbox_append (CONTEXT *ctx, int f
+ * M_APPEND open mailbox for appending
+ * M_READONLY open mailbox in read-only mode
+ * M_QUIET only print error messages
++ * M_PEEK revert atime where applicable
+ * ctx if non-null, context struct to use
+ */
+ CONTEXT *mx_open_mailbox (const char *path, int flags, CONTEXT *pctx)
+@@ -602,6 +603,8 @@ CONTEXT *mx_open_mailbox (const char *path, int flags,
+ ctx->quiet = 1;
+ if (flags & M_READONLY)
+ ctx->readonly = 1;
++ if (flags & M_PEEK)
++ ctx->peekonly = 1;
+
+ if (flags & (M_APPEND|M_NEWFOLDER))
+ {
+@@ -701,9 +704,21 @@ CONTEXT *mx_open_mailbox (const char *path, int flags,
+ void mx_fastclose_mailbox (CONTEXT *ctx)
+ {
+ int i;
++#ifndef BUFFY_SIZE
++ struct utimbuf ut;
++#endif
+
+ if(!ctx)
+ return;
++#ifndef BUFFY_SIZE
++ /* fix up the times so buffy won't get confused */
++ if (ctx->peekonly && ctx->path && ctx->mtime > ctx->atime)
++ {
++ ut.actime = ctx->atime;
++ ut.modtime = ctx->mtime;
++ utime (ctx->path, &ut);
++ }
++#endif
+
+ /* never announce that a mailbox we've just left has new mail. #3290
+ * XXX: really belongs in mx_close_mailbox, but this is a nice hook point */
+diff -uNp -r mutt-1.5.22.orig/mx.h mutt-1.5.22/mx.h
+--- mutt-1.5.22.orig/mx.h Mon Apr 22 07:14:53 2013
++++ mutt-1.5.22/mx.h Fri Oct 18 10:18:45 2013
+@@ -57,6 +57,7 @@ void mbox_reset_atime (CONTEXT *, struct stat *);
+ int mh_read_dir (CONTEXT *, const char *);
+ int mh_sync_mailbox (CONTEXT *, int *);
+ int mh_check_mailbox (CONTEXT *, int *);
++void mh_buffy_update (const char *, int *, int *, int *);
+ int mh_check_empty (const char *);
+
+ int maildir_read_dir (CONTEXT *);
+diff -uNp -r mutt-1.5.22.orig/pager.c mutt-1.5.22/pager.c
+--- mutt-1.5.22.orig/pager.c Mon Apr 22 07:17:32 2013
++++ mutt-1.5.22/pager.c Fri Oct 18 10:18:45 2013
+@@ -29,6 +29,7 @@
+ #include "pager.h"
+ #include "attach.h"
+ #include "mbyte.h"
++#include "sidebar.h"
+
+ #include "mutt_crypt.h"
+
+@@ -1095,6 +1096,7 @@ static int format_line (struct line_t **lineInfo, int
+ wchar_t wc;
+ mbstate_t mbstate;
+ int wrap_cols = mutt_term_width ((flags & M_PAGER_NOWRAP) ? 0 : Wrap);
++ wrap_cols -= SidebarWidth;
+
+ if (check_attachment_marker ((char *)buf) == 0)
+ wrap_cols = COLS;
+@@ -1746,7 +1748,7 @@ mutt_pager (const char *banner, const char *fname, int
+ if ((redraw & REDRAW_BODY) || topline != oldtopline)
+ {
+ do {
+- move (bodyoffset, 0);
++ move (bodyoffset, SidebarWidth);
+ curline = oldtopline = topline;
+ lines = 0;
+ force_redraw = 0;
+@@ -1759,6 +1761,7 @@ mutt_pager (const char *banner, const char *fname, int
+ &QuoteList, &q_level, &force_redraw, &SearchRE) > 0)
+ lines++;
+ curline++;
++ move(lines + bodyoffset, SidebarWidth);
+ }
+ last_offset = lineInfo[curline].offset;
+ } while (force_redraw);
+@@ -1771,6 +1774,7 @@ mutt_pager (const char *banner, const char *fname, int
+ addch ('~');
+ addch ('\n');
+ lines++;
++ move(lines + bodyoffset, SidebarWidth);
+ }
+ NORMAL_COLOR;
+
+@@ -1799,17 +1803,17 @@ mutt_pager (const char *banner, const char *fname, int
+
+ if (IsHeader (extra) || IsMsgAttach (extra))
+ {
+- size_t l1 = COLS * MB_LEN_MAX;
++ size_t l1 = (COLS-SidebarWidth) * MB_LEN_MAX;
+ size_t l2 = sizeof (buffer);
+ hfi.hdr = (IsHeader (extra)) ? extra->hdr : extra->bdy->hdr;
+ mutt_make_string_info (buffer, l1 < l2 ? l1 : l2, NONULL (PagerFmt), &hfi, M_FORMAT_MAKEPRINT);
+- mutt_paddstr (COLS, buffer);
++ mutt_paddstr (COLS-SidebarWidth, buffer);
+ }
+ else
+ {
+ char bn[STRING];
+ snprintf (bn, sizeof (bn), "%s (%s)", banner, pager_progress_str);
+- mutt_paddstr (COLS, bn);
++ mutt_paddstr (COLS-SidebarWidth, bn);
+ }
+ NORMAL_COLOR;
+ }
+@@ -1819,16 +1823,21 @@ mutt_pager (const char *banner, const char *fname, int
+ /* redraw the pager_index indicator, because the
+ * flags for this message might have changed. */
+ menu_redraw_current (index);
++ draw_sidebar(MENU_PAGER);
+
+ /* print out the index status bar */
+ menu_status_line (buffer, sizeof (buffer), index, NONULL(Status));
+
+- move (indexoffset + (option (OPTSTATUSONTOP) ? 0 : (indexlen - 1)), 0);
++ move (indexoffset + (option (OPTSTATUSONTOP) ? 0 : (indexlen - 1)), SidebarWidth);
+ SETCOLOR (MT_COLOR_STATUS);
+- mutt_paddstr (COLS, buffer);
++ mutt_paddstr (COLS-SidebarWidth, buffer);
+ NORMAL_COLOR;
+ }
+
++ /* if we're not using the index, update every time */
++ if ( index == 0 )
++ draw_sidebar(MENU_PAGER);
++
+ redraw = 0;
+
+ if (option(OPTBRAILLEFRIENDLY)) {
+@@ -2762,6 +2771,13 @@ search_next:
+ case OP_WHAT_KEY:
+ mutt_what_key ();
+ break;
++
++ case OP_SIDEBAR_SCROLL_UP:
++ case OP_SIDEBAR_SCROLL_DOWN:
++ case OP_SIDEBAR_NEXT:
++ case OP_SIDEBAR_PREV:
++ scroll_sidebar(ch, MENU_PAGER);
++ break;
+
+ default:
+ ch = -1;
+diff -uNp -r mutt-1.5.22.orig/sidebar.c mutt-1.5.22/sidebar.c
+--- mutt-1.5.22.orig/sidebar.c Thu Jan 1 01:00:00 1970
++++ mutt-1.5.22/sidebar.c Fri Oct 18 10:18:45 2013
+@@ -0,0 +1,333 @@
++/*
++ * Copyright (C) ????-2004 Justin Hibbits <jrh29@po.cwru.edu>
++ * Copyright (C) 2004 Thomer M. Gil <mutt@thomer.com>
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
++ */
++
++
++#if HAVE_CONFIG_H
++# include "config.h"
++#endif
++
++#include "mutt.h"
++#include "mutt_menu.h"
++#include "mutt_curses.h"
++#include "sidebar.h"
++#include "buffy.h"
++#include <libgen.h>
++#include "keymap.h"
++#include <stdbool.h>
++
++/*BUFFY *CurBuffy = 0;*/
++static BUFFY *TopBuffy = 0;
++static BUFFY *BottomBuffy = 0;
++static int known_lines = 0;
++
++static int quick_log10(int n)
++{
++ char string[32];
++ sprintf(string, "%d", n);
++ return strlen(string);
++}
++
++void calc_boundaries (int menu)
++{
++ BUFFY *tmp = Incoming;
++
++ if ( known_lines != LINES ) {
++ TopBuffy = BottomBuffy = 0;
++ known_lines = LINES;
++ }
++ for ( ; tmp->next != 0; tmp = tmp->next )
++ tmp->next->prev = tmp;
++
++ if ( TopBuffy == 0 && BottomBuffy == 0 )
++ TopBuffy = Incoming;
++ if ( BottomBuffy == 0 ) {
++ int count = LINES - 2 - (menu != MENU_PAGER || option(OPTSTATUSONTOP));
++ BottomBuffy = TopBuffy;
++ while ( --count && BottomBuffy->next )
++ BottomBuffy = BottomBuffy->next;
++ }
++ else if ( TopBuffy == CurBuffy->next ) {
++ int count = LINES - 2 - (menu != MENU_PAGER);
++ BottomBuffy = CurBuffy;
++ tmp = BottomBuffy;
++ while ( --count && tmp->prev)
++ tmp = tmp->prev;
++ TopBuffy = tmp;
++ }
++ else if ( BottomBuffy == CurBuffy->prev ) {
++ int count = LINES - 2 - (menu != MENU_PAGER);
++ TopBuffy = CurBuffy;
++ tmp = TopBuffy;
++ while ( --count && tmp->next )
++ tmp = tmp->next;
++ BottomBuffy = tmp;
++ }
++}
++
++char *make_sidebar_entry(char *box, int size, int new, int flagged)
++{
++ static char *entry = 0;
++ char *c;
++ int i = 0;
++ int delim_len = strlen(SidebarDelim);
++
++ c = realloc(entry, SidebarWidth - delim_len + 2);
++ if ( c ) entry = c;
++ entry[SidebarWidth - delim_len + 1] = 0;
++ for (; i < SidebarWidth - delim_len + 1; entry[i++] = ' ' );
++ i = strlen(box);
++ strncpy( entry, box, i < (SidebarWidth - delim_len + 1) ? i : (SidebarWidth - delim_len + 1) );
++
++ if (size == -1)
++ sprintf(entry + SidebarWidth - delim_len - 3, "?");
++ else if ( new ) {
++ if (flagged > 0) {
++ sprintf(
++ entry + SidebarWidth - delim_len - 5 - quick_log10(size) - quick_log10(new) - quick_log10(flagged),
++ "% d(%d)[%d]", size, new, flagged);
++ } else {
++ sprintf(
++ entry + SidebarWidth - delim_len - 3 - quick_log10(size) - quick_log10(new),
++ "% d(%d)", size, new);
++ }
++ } else if (flagged > 0) {
++ sprintf( entry + SidebarWidth - delim_len - 3 - quick_log10(size) - quick_log10(flagged), "% d[%d]", size, flagged);
++ } else {
++ sprintf( entry + SidebarWidth - delim_len - 1 - quick_log10(size), "% d", size);
++ }
++ return entry;
++}
++
++void set_curbuffy(char buf[LONG_STRING])
++{
++ BUFFY* tmp = CurBuffy = Incoming;
++
++ if (!Incoming)
++ return;
++
++ while(1) {
++ if(!strcmp(tmp->path, buf)) {
++ CurBuffy = tmp;
++ break;
++ }
++
++ if(tmp->next)
++ tmp = tmp->next;
++ else
++ break;
++ }
++}
++
++int draw_sidebar(int menu) {
++
++ int lines = option(OPTHELP) ? 1 : 0;
++ BUFFY *tmp;
++#ifndef USE_SLANG_CURSES
++ attr_t attrs;
++#endif
++ short delim_len = strlen(SidebarDelim);
++ short color_pair;
++
++ static bool initialized = false;
++ static int prev_show_value;
++ static short saveSidebarWidth;
++
++ /* initialize first time */
++ if(!initialized) {
++ prev_show_value = option(OPTSIDEBAR);
++ saveSidebarWidth = SidebarWidth;
++ if(!option(OPTSIDEBAR)) SidebarWidth = 0;
++ initialized = true;
++ }
++
++ /* save or restore the value SidebarWidth */
++ if(prev_show_value != option(OPTSIDEBAR)) {
++ if(prev_show_value && !option(OPTSIDEBAR)) {
++ saveSidebarWidth = SidebarWidth;
++ SidebarWidth = 0;
++ } else if(!prev_show_value && option(OPTSIDEBAR)) {
++ SidebarWidth = saveSidebarWidth;
++ }
++ prev_show_value = option(OPTSIDEBAR);
++ }
++
++
++// if ( SidebarWidth == 0 ) return 0;
++ if (SidebarWidth > 0 && option (OPTSIDEBAR)
++ && delim_len >= SidebarWidth) {
++ unset_option (OPTSIDEBAR);
++ /* saveSidebarWidth = SidebarWidth; */
++ if (saveSidebarWidth > delim_len) {
++ SidebarWidth = saveSidebarWidth;
++ mutt_error (_("Value for sidebar_delim is too long. Disabling sidebar."));
++ sleep (2);
++ } else {
++ SidebarWidth = 0;
++ mutt_error (_("Value for sidebar_delim is too long. Disabling sidebar. Please set your sidebar_width to a sane value."));
++ sleep (4); /* the advise to set a sane value should be seen long enough */
++ }
++ saveSidebarWidth = 0;
++ return (0);
++ }
++
++ if ( SidebarWidth == 0 || !option(OPTSIDEBAR)) {
++ if (SidebarWidth > 0) {
++ saveSidebarWidth = SidebarWidth;
++ SidebarWidth = 0;
++ }
++ unset_option(OPTSIDEBAR);
++ return 0;
++ }
++
++ /* get attributes for divider */
++ SETCOLOR(MT_COLOR_STATUS);
++#ifndef USE_SLANG_CURSES
++ attr_get(&attrs, &color_pair, 0);
++#else
++ color_pair = attr_get();
++#endif
++ SETCOLOR(MT_COLOR_NORMAL);
++
++ /* draw the divider */
++
++ for ( ; lines < LINES-1-(menu != MENU_PAGER || option(OPTSTATUSONTOP)); lines++ ) {
++ move(lines, SidebarWidth - delim_len);
++ addstr(NONULL(SidebarDelim));
++#ifndef USE_SLANG_CURSES
++ mvchgat(lines, SidebarWidth - delim_len, delim_len, 0, color_pair, NULL);
++#endif
++ }
++
++ if ( Incoming == 0 ) return 0;
++ lines = option(OPTHELP) ? 1 : 0; /* go back to the top */
++
++ if ( known_lines != LINES || TopBuffy == 0 || BottomBuffy == 0 )
++ calc_boundaries(menu);
++ if ( CurBuffy == 0 ) CurBuffy = Incoming;
++
++ tmp = TopBuffy;
++
++ SETCOLOR(MT_COLOR_NORMAL);
++
++ for ( ; tmp && lines < LINES-1 - (menu != MENU_PAGER || option(OPTSTATUSONTOP)); tmp = tmp->next ) {
++ if ( tmp == CurBuffy )
++ SETCOLOR(MT_COLOR_INDICATOR);
++ else if ( tmp->msg_unread > 0 )
++ SETCOLOR(MT_COLOR_NEW);
++ else if ( tmp->msg_flagged > 0 )
++ SETCOLOR(MT_COLOR_FLAGGED);
++ else
++ SETCOLOR(MT_COLOR_NORMAL);
++
++ move( lines, 0 );
++ if ( Context && !strcmp( tmp->path, Context->path ) ) {
++ tmp->msg_unread = Context->unread;
++ tmp->msgcount = Context->msgcount;
++ tmp->msg_flagged = Context->flagged;
++ }
++ // check whether Maildir is a prefix of the current folder's path
++ short maildir_is_prefix = 0;
++ if ( (strlen(tmp->path) > strlen(Maildir)) &&
++ (strncmp(Maildir, tmp->path, strlen(Maildir)) == 0) )
++ maildir_is_prefix = 1;
++ // calculate depth of current folder and generate its display name with indented spaces
++ int sidebar_folder_depth = 0;
++ char *sidebar_folder_name;
++ sidebar_folder_name = basename(tmp->path);
++ if ( maildir_is_prefix ) {
++ char *tmp_folder_name;
++ int i;
++ tmp_folder_name = tmp->path + strlen(Maildir);
++ for (i = 0; i < strlen(tmp->path) - strlen(Maildir); i++) {
++ if (tmp_folder_name[i] == '/') sidebar_folder_depth++;
++ }
++ if (sidebar_folder_depth > 0) {
++ sidebar_folder_name = malloc(strlen(basename(tmp->path)) + sidebar_folder_depth + 1);
++ for (i=0; i < sidebar_folder_depth; i++)
++ sidebar_folder_name[i]=' ';
++ sidebar_folder_name[i]=0;
++ strncat(sidebar_folder_name, basename(tmp->path), strlen(basename(tmp->path)) + sidebar_folder_depth);
++ }
++ }
++ printw( "%.*s", SidebarWidth - delim_len + 1,
++ make_sidebar_entry(sidebar_folder_name, tmp->msgcount,
++ tmp->msg_unread, tmp->msg_flagged));
++ if (sidebar_folder_depth > 0)
++ free(sidebar_folder_name);
++ lines++;
++ }
++ SETCOLOR(MT_COLOR_NORMAL);
++ for ( ; lines < LINES-1 - (menu != MENU_PAGER || option(OPTSTATUSONTOP)); lines++ ) {
++ int i = 0;
++ move( lines, 0 );
++ for ( ; i < SidebarWidth - delim_len; i++ )
++ addch(' ');
++ }
++ return 0;
++}
++
++
++void set_buffystats(CONTEXT* Context)
++{
++ BUFFY *tmp = Incoming;
++ while(tmp) {
++ if(Context && !strcmp(tmp->path, Context->path)) {
++ tmp->msg_unread = Context->unread;
++ tmp->msgcount = Context->msgcount;
++ break;
++ }
++ tmp = tmp->next;
++ }
++}
++
++void scroll_sidebar(int op, int menu)
++{
++ if(!SidebarWidth) return;
++ if(!CurBuffy) return;
++
++ switch (op) {
++ case OP_SIDEBAR_NEXT:
++ if ( CurBuffy->next == NULL ) return;
++ CurBuffy = CurBuffy->next;
++ break;
++ case OP_SIDEBAR_PREV:
++ if ( CurBuffy->prev == NULL ) return;
++ CurBuffy = CurBuffy->prev;
++ break;
++ case OP_SIDEBAR_SCROLL_UP:
++ CurBuffy = TopBuffy;
++ if ( CurBuffy != Incoming ) {
++ calc_boundaries(menu);
++ CurBuffy = CurBuffy->prev;
++ }
++ break;
++ case OP_SIDEBAR_SCROLL_DOWN:
++ CurBuffy = BottomBuffy;
++ if ( CurBuffy->next ) {
++ calc_boundaries(menu);
++ CurBuffy = CurBuffy->next;
++ }
++ break;
++ default:
++ return;
++ }
++ calc_boundaries(menu);
++ draw_sidebar(menu);
++}
++
+diff -uNp -r mutt-1.5.22.orig/sidebar.h mutt-1.5.22/sidebar.h
+--- mutt-1.5.22.orig/sidebar.h Thu Jan 1 01:00:00 1970
++++ mutt-1.5.22/sidebar.h Fri Oct 18 10:18:45 2013
+@@ -0,0 +1,36 @@
++/*
++ * Copyright (C) ????-2004 Justin Hibbits <jrh29@po.cwru.edu>
++ * Copyright (C) 2004 Thomer M. Gil <mutt@thomer.com>
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
++ */
++
++#ifndef SIDEBAR_H
++#define SIDEBAR_H
++
++struct MBOX_LIST {
++ char *path;
++ int msgcount;
++ int new;
++} MBLIST;
++
++/* parameter is whether or not to go to the status line */
++/* used for omitting the last | that covers up the status bar in the index */
++int draw_sidebar(int);
++void scroll_sidebar(int, int);
++void set_curbuffy(char*);
++void set_buffystats(CONTEXT*);
++
++#endif /* SIDEBAR_H */
+--- orig/Makefile.am.orig 2010-09-18 13:23:19.000000000 +0200
++++ new/Makefile.am 2010-09-18 13:25:19.000000000 +0200
+@@ -34,7 +34,7 @@
+ score.c send.c sendlib.c signal.c sort.c \
+ status.c system.c thread.c charset.c history.c lib.c \
+ muttlib.c editmsg.c mbyte.c \
+- url.c ascii.c crypt-mod.c crypt-mod.h safe_asprintf.c
++ url.c ascii.c crypt-mod.c crypt-mod.h safe_asprintf.c sidebar.c
+
+ nodist_mutt_SOURCES = $(BUILT_SOURCES)
+
+--- orig/Makefile.in.orig 2013-10-25 08:23:07.000000000 +0200
++++ new/Makefile.in 2013-10-25 08:26:20.000000000 +0200
+@@ -133,7 +133,7 @@
+ system.$(OBJEXT) thread.$(OBJEXT) charset.$(OBJEXT) \
+ history.$(OBJEXT) lib.$(OBJEXT) muttlib.$(OBJEXT) \
+ editmsg.$(OBJEXT) mbyte.$(OBJEXT) url.$(OBJEXT) \
+- ascii.$(OBJEXT) crypt-mod.$(OBJEXT) safe_asprintf.$(OBJEXT)
++ ascii.$(OBJEXT) crypt-mod.$(OBJEXT) safe_asprintf.$(OBJEXT) sidebar.$(OBJEXT)
+ am__objects_1 =
+ am__objects_2 = patchlist.$(OBJEXT) conststrings.$(OBJEXT) \
+ $(am__objects_1)
+@@ -472,7 +472,7 @@
+ score.c send.c sendlib.c signal.c sort.c \
+ status.c system.c thread.c charset.c history.c lib.c \
+ muttlib.c editmsg.c mbyte.c \
+- url.c ascii.c crypt-mod.c crypt-mod.h safe_asprintf.c
++ url.c ascii.c crypt-mod.c crypt-mod.h safe_asprintf.c sidebar.c
+
+ nodist_mutt_SOURCES = $(BUILT_SOURCES)
+ mutt_LDADD = @MUTT_LIB_OBJECTS@ @LIBOBJS@ $(LIBIMAP) $(MUTTLIBS) \
+@@ -504,7 +504,7 @@
+ README.SSL smime.h group.h \
+ muttbug pgppacket.h depcomp ascii.h BEWARE PATCHES patchlist.sh \
+ ChangeLog mkchangelog.sh mutt_idna.h \
+- snprintf.c regex.c crypt-gpgme.h hcachever.sh.in \
++ snprintf.c regex.c crypt-gpgme.h sidebar.h hcachever.sh.in \
+ txt2c.c txt2c.sh version.sh check_sec.sh
+
+ EXTRA_SCRIPTS = smime_keys
+*** mutt-1.5.20-orig/doc/Muttrc 2009-06-14 13:53:24.000000000 -0500
+--- mutt-1.5.20-patched/doc/Muttrc 2009-06-19 22:07:04.000000000 -0500
+***************
+*** 657,662 ****
+--- 657,682 ----
+ # $crypt_autosign, $crypt_replysign and $smime_is_default.
+ #
+ #
++ # set sidebar_visible=no
++ #
++ # Name: sidebar_visible
++ # Type: boolean
++ # Default: no
++ #
++ #
++ # This specifies whether or not to show sidebar (left-side list of folders).
++ #
++ #
++ # set sidebar_width=0
++ #
++ # Name: sidebar_width
++ # Type: number
++ # Default: 0
++ #
++ #
++ # The width of the sidebar.
++ #
++ #
+ # set crypt_autosign=no
+ #
+ # Name: crypt_autosign
diff --git a/trash_folder-1.5.18.patch b/trash_folder-1.5.18.patch
new file mode 100644
index 000000000000..37cf9c022d3b
--- /dev/null
+++ b/trash_folder-1.5.18.patch
@@ -0,0 +1,259 @@
+diff --git a/PATCHES b/PATCHES
+index e69de29..6a47dd7 100644
+--- a/PATCHES
++++ b/PATCHES
+@@ -0,0 +1 @@
++patch-1.5.16hg.cd.trash_folder.vl.1
+diff --git a/commands.c b/commands.c
+index 2fdcb7f..998f2fd 100644
+--- a/commands.c
++++ b/commands.c
+@@ -693,6 +693,7 @@ int _mutt_save_message (HEADER *h, CONTEXT *ctx, int delete, int decode, int dec
+ if (option (OPTDELETEUNTAG))
+ mutt_set_flag (Context, h, M_TAG, 0);
+ }
++ mutt_set_flag (Context, h, M_APPENDED, 1);
+
+ return 0;
+ }
+diff --git a/flags.c b/flags.c
+index 732eb01..6cda898 100644
+--- a/flags.c
++++ b/flags.c
+@@ -69,7 +69,13 @@ void _mutt_set_flag (CONTEXT *ctx, HEADER *h, int flag, int bf, int upd_ctx)
+ {
+ h->deleted = 0;
+ update = 1;
+- if (upd_ctx) ctx->deleted--;
++ if (upd_ctx)
++ {
++ ctx->deleted--;
++ if (h->appended)
++ ctx->appended--;
++ }
++ h->appended = 0; /* when undeleting, also reset the appended flag */
+ #ifdef USE_IMAP
+ /* see my comment above */
+ if (ctx->magic == M_IMAP)
+@@ -91,6 +97,17 @@ void _mutt_set_flag (CONTEXT *ctx, HEADER *h, int flag, int bf, int upd_ctx)
+ }
+ break;
+
++ case M_APPENDED:
++ if (bf)
++ {
++ if (!h->appended)
++ {
++ h->appended = 1;
++ if (upd_ctx) ctx->appended++;
++ }
++ }
++ break;
++
+ case M_NEW:
+
+ if (!mutt_bit_isset(ctx->rights,M_ACL_SEEN))
+diff --git a/globals.h b/globals.h
+index 15c0d14..9699a4d 100644
+--- a/globals.h
++++ b/globals.h
+@@ -143,6 +143,7 @@ WHERE char *StChars;
+ WHERE char *Status;
+ WHERE char *Tempdir;
+ WHERE char *Tochars;
++WHERE char *TrashPath;
+ WHERE char *Username;
+ WHERE char *Visual;
+
+diff --git a/imap/message.c b/imap/message.c
+index 77cef6e..aa21819 100644
+--- a/imap/message.c
++++ b/imap/message.c
+@@ -816,6 +816,7 @@ int imap_copy_messages (CONTEXT* ctx, HEADER* h, char* dest, int delete)
+ if (ctx->hdrs[n]->tagged)
+ {
+ mutt_set_flag (ctx, ctx->hdrs[n], M_DELETE, 1);
++ mutt_set_flag (ctx, ctx->hdrs[n], M_APPENDED, 1);
+ if (option (OPTDELETEUNTAG))
+ mutt_set_flag (ctx, ctx->hdrs[n], M_TAG, 0);
+ }
+@@ -823,6 +824,7 @@ int imap_copy_messages (CONTEXT* ctx, HEADER* h, char* dest, int delete)
+ else
+ {
+ mutt_set_flag (ctx, h, M_DELETE, 1);
++ mutt_set_flag (ctx, h, M_APPENDED, 1);
+ if (option (OPTDELETEUNTAG))
+ mutt_set_flag (ctx, h, M_TAG, 0);
+ }
+diff --git a/init.h b/init.h
+index 2674bef..5f8100f 100644
+--- a/init.h
++++ b/init.h
+@@ -2950,6 +2950,16 @@ struct option_t MuttVars[] = {
+ ** by \fIyou\fP. The sixth character is used to indicate when a mail
+ ** was sent to a mailing-list you subscribe to (default: L).
+ */
++ { "trash", DT_PATH, R_NONE, UL &TrashPath, 0 },
++ /*
++ ** .pp
++ ** If set, this variable specifies the path of the trash folder where the
++ ** mails marked for deletion will be moved, instead of being irremediably
++ ** purged.
++ ** .pp
++ ** NOTE: When you delete a message in the trash folder, it is really
++ ** deleted, so that you have a way to clean the trash.
++ */
+ #ifdef USE_SOCKET
+ { "tunnel", DT_STR, R_NONE, UL &Tunnel, UL 0 },
+ /*
+diff --git a/mutt.h b/mutt.h
+index 5930e14..9c07161 100644
+--- a/mutt.h
++++ b/mutt.h
+@@ -201,6 +201,7 @@ enum
+ M_DELETE,
+ M_UNDELETE,
+ M_DELETED,
++ M_APPENDED,
+ M_FLAG,
+ M_TAG,
+ M_UNTAG,
+@@ -711,6 +712,7 @@ typedef struct header
+ unsigned int mime : 1; /* has a MIME-Version header? */
+ unsigned int flagged : 1; /* marked important? */
+ unsigned int tagged : 1;
++ unsigned int appended : 1; /* has been saved */
+ unsigned int deleted : 1;
+ unsigned int changed : 1;
+ unsigned int attach_del : 1; /* has an attachment marked for deletion */
+@@ -882,6 +884,7 @@ typedef struct _context
+ int new; /* how many new messages? */
+ int unread; /* how many unread messages? */
+ int deleted; /* how many deleted messages */
++ int appended; /* how many saved messages? */
+ int flagged; /* how many flagged messages */
+ int msgnotreadyet; /* which msg "new" in pager, -1 if none */
+
+diff --git a/muttlib.c b/muttlib.c
+index 497b5f8..7860376 100644
+--- a/muttlib.c
++++ b/muttlib.c
+@@ -1433,7 +1433,9 @@ int mutt_save_confirm (const char *s, struct stat *st)
+
+ if (magic > 0 && !mx_access (s, W_OK))
+ {
+- if (option (OPTCONFIRMAPPEND))
++ if (option (OPTCONFIRMAPPEND) &&
++ (!TrashPath || (mutt_strcmp (s, TrashPath) != 0)))
++ /* if we're appending to the trash, there's no point in asking */
+ {
+ snprintf (tmp, sizeof (tmp), _("Append messages to %s?"), s);
+ if ((rc = mutt_yesorno (tmp, M_YES)) == M_NO)
+diff --git a/mx.c b/mx.c
+index afa6843..fe1fd1d 100644
+--- a/mx.c
++++ b/mx.c
+@@ -803,6 +803,53 @@ static int sync_mailbox (CONTEXT *ctx, int *index_hint)
+ return rc;
+ }
+
++/* move deleted mails to the trash folder */
++static int trash_append (CONTEXT *ctx)
++{
++ CONTEXT *ctx_trash;
++ int i = 0;
++ struct stat st, stc;
++
++ if (!TrashPath || !ctx->deleted ||
++ (ctx->magic == M_MAILDIR && option (OPTMAILDIRTRASH)))
++ return 0;
++
++ for (;i < ctx->msgcount && (!ctx->hdrs[i]->deleted ||
++ ctx->hdrs[i]->appended); i++);
++ if (i == ctx->msgcount)
++ return 0; /* nothing to be done */
++
++ if (mutt_save_confirm (TrashPath, &st) != 0)
++ {
++ mutt_error _("message(s) not deleted");
++ return -1;
++ }
++
++ if (lstat (ctx->path, &stc) == 0 && stc.st_ino == st.st_ino
++ && stc.st_dev == st.st_dev && stc.st_rdev == st.st_rdev)
++ return 0; /* we are in the trash folder: simple sync */
++
++ if ((ctx_trash = mx_open_mailbox (TrashPath, M_APPEND, NULL)) != NULL)
++ {
++ for (i = 0 ; i < ctx->msgcount ; i++)
++ if (ctx->hdrs[i]->deleted && !ctx->hdrs[i]->appended
++ && mutt_append_message (ctx_trash, ctx, ctx->hdrs[i], 0, 0) == -1)
++ {
++ mx_close_mailbox (ctx_trash, NULL);
++ return -1;
++ }
++
++ mx_close_mailbox (ctx_trash, NULL);
++ }
++ else
++ {
++ mutt_error _("Can't open trash folder");
++ return -1;
++ }
++
++ return 0;
++}
++
+ /* save changes and close mailbox */
+ int mx_close_mailbox (CONTEXT *ctx, int *index_hint)
+ {
+@@ -938,6 +985,7 @@ int mx_close_mailbox (CONTEXT *ctx, int *index_hint)
+ if (mutt_append_message (&f, ctx, ctx->hdrs[i], 0, CH_UPDATE_LEN) == 0)
+ {
+ mutt_set_flag (ctx, ctx->hdrs[i], M_DELETE, 1);
++ mutt_set_flag (ctx, ctx->hdrs[i], M_APPENDED, 1);
+ }
+ else
+ {
+@@ -959,6 +1007,14 @@ int mx_close_mailbox (CONTEXT *ctx, int *index_hint)
+ return 0;
+ }
+
++ /* copy mails to the trash before expunging */
++ if (purge && ctx->deleted)
++ if (trash_append (ctx) != 0)
++ {
++ ctx->closing = 0;
++ return -1;
++ }
++
+ #ifdef USE_IMAP
+ /* allow IMAP to preserve the deleted flag across sessions */
+ if (ctx->magic == M_IMAP)
+@@ -1154,6 +1210,12 @@ int mx_sync_mailbox (CONTEXT *ctx, int *index_hint)
+ msgcount = ctx->msgcount;
+ deleted = ctx->deleted;
+
++ if (purge && ctx->deleted)
++ {
++ if (trash_append (ctx) == -1)
++ return -1;
++ }
++
+ #ifdef USE_IMAP
+ if (ctx->magic == M_IMAP)
+ rc = imap_sync_mailbox (ctx, purge, index_hint);
+diff --git a/postpone.c b/postpone.c
+index bcb8607..c367247 100644
+--- a/postpone.c
++++ b/postpone.c
+@@ -279,6 +279,9 @@ int mutt_get_postponed (CONTEXT *ctx, HEADER *hdr, HEADER **cur, char *fcc, size
+ /* finished with this message, so delete it. */
+ mutt_set_flag (PostContext, h, M_DELETE, 1);
+
++ /* and consider it saved, so that it won't be moved to the trash folder */
++ mutt_set_flag (PostContext, h, M_APPENDED, 1);
++
+ /* update the count for the status display */
+ PostCount = PostContext->msgcount - PostContext->deleted;
+