From 2c6e17e385038adb7b609e88d136f6bf78f3a18d Mon Sep 17 00:00:00 2001
From: Jan Palus <atler@pld-linux.org>
Date: Sat, 2 Jan 2016 18:53:57 +0100
Subject: [PATCH] up to 1.5.24

- removed forcedotlock patch (applied upstream)
- sidebar patch updated to latest version
- adjusted other patches
---
 mutt-cd.trash_folder.patch |   6 +-
 mutt-forcedotlock.patch    |  15 -
 mutt-pl.po-update.patch    | 369 +++++++++++---------
 mutt-rr.compressed.patch   |   6 +-
 mutt-sidebar.patch         | 669 +++++++++++++++++++------------------
 mutt-smime.rc.patch        |   4 +-
 mutt.spec                  |  11 +-
 7 files changed, 567 insertions(+), 513 deletions(-)
 delete mode 100644 mutt-forcedotlock.patch

diff --git a/mutt-cd.trash_folder.patch b/mutt-cd.trash_folder.patch
index 632541c..2317dd5 100644
--- a/mutt-cd.trash_folder.patch
+++ b/mutt-cd.trash_folder.patch
@@ -98,9 +98,9 @@ To sum up, it's more integrated and transparent to the user.
  WHERE char *Tempdir;
  WHERE char *Tochars;
 +WHERE char *TrashPath;
- WHERE char *Username;
- WHERE char *Visual;
- WHERE char *XtermTitle;
+ WHERE char *TSStatusFormat;
+ WHERE char *TSIconFormat;
+ WHERE short TSSupported;
 --- a/imap/message.c
 +++ b/imap/message.c
 @@ -876,6 +876,7 @@
diff --git a/mutt-forcedotlock.patch b/mutt-forcedotlock.patch
deleted file mode 100644
index 565da4b..0000000
--- a/mutt-forcedotlock.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- mutt-1.5.15/Makefile.am.orig	2007-06-03 12:32:52.028633000 +0200
-+++ mutt-1.5.15/Makefile.am	2007-06-03 13:05:48.801283592 +0200
-@@ -154,9 +154,9 @@
- 		rm -f $(DESTDIR)$(bindir)/mutt.dotlock ;		\
- 		ln -sf $(DESTDIR)$(bindir)/mutt_dotlock $(DESTDIR)$(bindir)/mutt.dotlock ; \
- 	fi
--	if test -f $(DESTDIR)$(bindir)/mutt_dotlock && test x@DOTLOCK_GROUP@ != x ; then \
--		chgrp @DOTLOCK_GROUP@ $(DESTDIR)$(bindir)/mutt_dotlock && \
--		chmod @DOTLOCK_PERMISSION@ $(DESTDIR)$(bindir)/mutt_dotlock || \
-+	if test -f $(DESTDIR)$(bindir)/mutt_dotlock && test x$(DOTLOCK_GROUP) != x ; then \
-+		chgrp $(DOTLOCK_GROUP) $(DESTDIR)$(bindir)/mutt_dotlock && \
-+		chmod $(DOTLOCK_PERMISSION) $(DESTDIR)$(bindir)/mutt_dotlock || \
- 		{ echo "Can't fix mutt_dotlock's permissions!  This is required to lock mailboxes in the mail spool directory." >&2 ; exit 1 ; } \
- 	fi
- 
diff --git a/mutt-pl.po-update.patch b/mutt-pl.po-update.patch
index b2eaa45..d245971 100644
--- a/mutt-pl.po-update.patch
+++ b/mutt-pl.po-update.patch
@@ -1,5 +1,5 @@
---- mutt-1.5.23/po/pl.po.orig	2014-03-12 17:27:50.000000000 +0100
-+++ mutt-1.5.23/po/pl.po	2014-06-06 17:07:11.026011591 +0200
+--- mutt-1.5.24/po/pl.po.orig	2016-01-02 18:46:16.401449059 +0100
++++ mutt-1.5.24/po/pl.po	2016-01-02 18:47:34.371037304 +0100
 @@ -2,6 +2,8 @@
  # Polskie teksty dla Mutta 1.x
  # 1998-2006 Pawe³ Dziekoñski
@@ -10,7 +10,7 @@
  # get it from http://home.elka.pw.edu.pl/~pkolodz2/pepesza.html
  #
 @@ -12,8 +14,8 @@
- "POT-Creation-Date: 2014-03-12 09:18-0700\n"
+ "POT-Creation-Date: 2016-01-02 18:46+0100\n"
  "PO-Revision-Date: 2007-11-02 11:11+0200\n"
  "Last-Translator: Pawe³ Dziekoñski <dzieko@gmail.com>\n"
 -"Language-Team: POLISH <pl@li.org>\n"
@@ -68,8 +68,8 @@
 -msgstr "-- Za³±czniki"
 +msgstr "---Za³±cznik: %s"
  
- #: attach.c:631 attach.c:663 attach.c:958 attach.c:1016 handler.c:1360
- #: pgpkey.c:570 pgpkey.c:759
+ #: attach.c:631 attach.c:663 attach.c:958 attach.c:1016 handler.c:1362
+ #: pgpkey.c:571 pgpkey.c:760
 @@ -241,7 +241,7 @@
  
  #: browser.c:929
@@ -82,27 +82,25 @@
 @@ -320,9 +320,9 @@
  msgstr "%s: nie ma takiego obiektu"
  
- #: color.c:391
+ #: color.c:392
 -#, fuzzy, c-format
 +#, c-format
  msgid "%s: command valid only for index, body, header objects"
 -msgstr "%s: polecenia mog± dotyczyæ tylko obiektów indeksu"
 +msgstr "%s: polecenie poprawne tylko dla indeksu, cia³a i nag³ówka"
  
- #: color.c:399
+ #: color.c:400
  #, c-format
-@@ -404,9 +404,8 @@
- msgstr "Wprowad¼ polecenie: "
+@@ -405,7 +405,7 @@
  
- #: commands.c:256
--#, fuzzy
- msgid "Warning: message has no From: header"
--msgstr "Ostrze¿enie: fragment tej wiadomo¶ci nie zosta³ podpisany."
-+msgstr "Ostrze¿enie: wiadomo¶æ nie ma nag³ówka From:"
+ #: commands.c:256 commands.c:266 recvcmd.c:148 recvcmd.c:161
+ msgid "Warning: message contains no From: header"
+-msgstr ""
++msgstr "Ostrze¿enie: list nie zawiera nag³ówka From:"
  
  #: commands.c:274 recvcmd.c:171
  msgid "Bounce message to: "
-@@ -593,9 +592,8 @@
+@@ -592,9 +592,8 @@
  msgstr "Opis"
  
  #: compose.c:117
@@ -113,7 +111,7 @@
  
  #: compose.c:122
  msgid "Sign, Encrypt"
-@@ -611,21 +609,19 @@
+@@ -610,21 +609,19 @@
  
  #: compose.c:128
  msgid "None"
@@ -136,56 +134,56 @@
 -msgstr " (PGP/MIME)"
 +msgstr " (S/MIME)"
  
- #: compose.c:150 compose.c:154
- msgid " sign as: "
-@@ -698,11 +694,11 @@
+ #: compose.c:145
+ msgid " (OppEnc mode)"
+@@ -701,11 +698,11 @@
  
- #: compose.c:842
+ #: compose.c:862
  msgid "The current attachment won't be converted."
 -msgstr "Bie¿±cy za³acznik nie zostanie przekonwertowany."
 +msgstr "Bie¿±cy za³±cznik nie zostanie przekonwertowany."
  
- #: compose.c:844
+ #: compose.c:864
  msgid "The current attachment will be converted."
 -msgstr "Bie¿±cy za³acznik zostanie przekonwertowany."
 +msgstr "Bie¿±cy za³±cznik zostanie przekonwertowany."
  
- #: compose.c:919
+ #: compose.c:939
  msgid "Invalid encoding."
-@@ -835,7 +831,7 @@
- 
- #: crypt-gpgme.c:871
+@@ -843,6 +840,8 @@
+ #: crypt-gpgme.c:948
  msgid "$pgp_sign_as unset and no default key specified in ~/.gnupg/gpg.conf"
--msgstr ""
-+msgstr "$pgp_sign_as nie jest ustawione, ani nie podano domy¶lnego klucza w ~/.gnupg/gpg.conf"
+ msgstr ""
++"$pgp_sign_as nie jest ustawione, ani nie podano domy¶lnego klucza w ~/.gnupg/"
++"gpg.conf"
  
- #: crypt-gpgme.c:1066
+ #: crypt-gpgme.c:1144
  msgid "Warning: One of the keys has been revoked\n"
-@@ -906,49 +902,43 @@
+@@ -913,49 +912,43 @@
  
- #: crypt-gpgme.c:1290
+ #: crypt-gpgme.c:1368
  msgid "aka: "
 -msgstr ""
 +msgstr "aka: "
  
- #: crypt-gpgme.c:1300
+ #: crypt-gpgme.c:1378
  msgid "KeyID "
 -msgstr ""
 +msgstr "KeyID "
  
- #: crypt-gpgme.c:1308
+ #: crypt-gpgme.c:1386
 -#, fuzzy
  msgid "created: "
 -msgstr "Utworzyæ %s?"
 +msgstr "utworzony: "
  
- #: crypt-gpgme.c:1378
+ #: crypt-gpgme.c:1456
 -#, fuzzy
  msgid "Error getting key information for KeyID "
 -msgstr "B³±d sprawdzania klucza: "
 +msgstr "B³±d pobierania informacji o kluczu KeyID "
  
- #: crypt-gpgme.c:1380
+ #: crypt-gpgme.c:1458
  msgid ": "
 -msgstr ""
 +msgstr ": "
@@ -194,25 +192,25 @@
  #. signature, so we display what a PGP user expects: The name,
  #. fingerprint and the key validity (which is neither fully or
  #. ultimate).
- #: crypt-gpgme.c:1387 crypt-gpgme.c:1402
+ #: crypt-gpgme.c:1465 crypt-gpgme.c:1480
 -#, fuzzy
  msgid "Good signature from:"
 -msgstr "Poprawny podpis z³o¿ony przez: "
 +msgstr "Poprawny podpis z³o¿ony przez:"
  
- #: crypt-gpgme.c:1394
+ #: crypt-gpgme.c:1472
 -#, fuzzy
  msgid "*BAD* signature from:"
 -msgstr "Poprawny podpis z³o¿ony przez: "
 +msgstr "*Z£Y* podpis z³o¿ony przez:"
  
- #: crypt-gpgme.c:1410
+ #: crypt-gpgme.c:1488
 -#, fuzzy
  msgid "Problem signature from:"
 -msgstr "Poprawny podpis z³o¿ony przez: "
 +msgstr "Problematyczny podpis z³o¿ony przez:"
  
- #: crypt-gpgme.c:1414
+ #: crypt-gpgme.c:1492
 -#, fuzzy
  msgid "               expires: "
 -msgstr "                aka: "
@@ -220,7 +218,7 @@
  
  #. Note: We don't need a current time output because GPGME avoids
  #. such an attack by separating the meta information from the
-@@ -985,13 +975,13 @@
+@@ -992,13 +985,12 @@
  "[-- Error: decryption failed: %s --]\n"
  "\n"
  msgstr ""
@@ -228,52 +226,61 @@
 +"[-- B³±d: odszyfrowanie nie powiod³o siê: %s --]\n"
  "\n"
  
- #: crypt-gpgme.c:2124
--#, fuzzy, c-format
-+#, c-format
+ #: crypt-gpgme.c:2246
+-#, fuzzy
  msgid "Error extracting key data!\n"
 -msgstr "B³±d sprawdzania klucza: "
 +msgstr "B³±d wydobywania danych klucza!\n"
  
- #: crypt-gpgme.c:2304
+ #: crypt-gpgme.c:2431
  #, c-format
-@@ -1207,7 +1197,7 @@
- #: crypt-gpgme.c:3534
+@@ -1202,7 +1194,7 @@
+ #: crypt-gpgme.c:3642
  msgid "Error: certification chain to long - stopping here\n"
  msgstr ""
 -"B³±d: ³±ñcuch certyfikatów zbyt d³ugi - przetwarzanie zatrzymano tutaj\n"
 +"B³±d: ³añcuch certyfikatów zbyt d³ugi - przetwarzanie zatrzymano tutaj\n"
  
- #: crypt-gpgme.c:3545 pgpkey.c:580
+ #: crypt-gpgme.c:3653 pgpkey.c:581
  #, c-format
-@@ -1450,7 +1440,7 @@
+@@ -1316,7 +1308,7 @@
+ #: crypt-gpgme.c:4575
+ #, fuzzy, c-format
+ msgid "Error exporting key: %s\n"
+-msgstr "B³±d sprawdzania klucza: "
++msgstr "B³±d wydobywania danych klucza!\n"
+ 
+ #: crypt-gpgme.c:4591
+ #, fuzzy, c-format
+@@ -1504,8 +1496,7 @@
+ 
  #: cryptglue.c:89
  msgid "\"crypt_use_gpgme\" set but not built with GPGME support."
- msgstr ""
+-msgstr ""
 -"Ustawiono \"crypt_use_gpgme\" ale zbudowano Mutta bez wsparcia dla GPGME."
-+"Ustawiono \"crypt_use_gpgme\" ale zbudowano Mutta bez obs³ugi GPGME."
++msgstr "Ustawiono \"crypt_use_gpgme\" ale zbudowano Mutta bez obs³ugi GPGME."
  
  #: cryptglue.c:112
  msgid "Invoking S/MIME..."
-@@ -1622,7 +1612,7 @@
+@@ -1677,7 +1668,7 @@
  
- #: curs_main.c:1002
+ #: curs_main.c:1086
  msgid "Logged out of IMAP servers."
 -msgstr ""
 +msgstr "Wylogowano z serwerów IMAP."
  
- #: curs_main.c:1084
+ #: curs_main.c:1168
  msgid "Open mailbox in read-only mode"
-@@ -1656,7 +1646,7 @@
+@@ -1711,7 +1702,7 @@
  
- #: curs_main.c:1264
+ #: curs_main.c:1348
  msgid "Thread cannot be broken, message is not part of a thread"
 -msgstr ""
 +msgstr "W±tku nie mo¿na z³amaæ, list nie jest czê¶ci± w±tku"
  
- #: curs_main.c:1273
+ #: curs_main.c:1357
  msgid "link threads"
-@@ -1751,7 +1741,6 @@
+@@ -1806,7 +1797,6 @@
  #. * declared "static" (sigh)
  #.
  #: edit.c:41
@@ -281,7 +288,7 @@
  msgid ""
  "~~\t\tinsert a line beginning with a single ~\n"
  "~b users\tadd users to the Bcc: field\n"
-@@ -1763,8 +1752,8 @@
+@@ -1818,8 +1808,8 @@
  "~M messages\tsame as ~m, except include headers\n"
  "~p\t\tprint the message\n"
  msgstr ""
@@ -292,29 +299,30 @@
  "~c u¿ytkownicy\tdodaj u¿ytkowników do pola Cc:\n"
  "~f listy\tdo³±cz listy\n"
  "~F listy\tto samo co ~f ale do³±cz te¿ nag³ówki\n"
-@@ -1897,9 +1886,8 @@
+@@ -1952,9 +1942,9 @@
  msgstr "[-- Typ: %s/%s, Kodowanie: %s, Wielko¶æ: %s --]\n"
  
- #: handler.c:1279
+ #: handler.c:1281
 -#, fuzzy
  msgid "One or more parts of this message could not be displayed"
 -msgstr "Ostrze¿enie: fragment tej wiadomo¶ci nie zosta³ podpisany."
-+msgstr "Ostrze¿enie: co najmniej jeden fragment wiadomo¶ci nie móg³ byæ wy¶wietlony"
++msgstr ""
++"Ostrze¿enie: co najmniej jeden fragment wiadomo¶ci nie móg³ byæ wy¶wietlony"
  
- #: handler.c:1331
+ #: handler.c:1333
  #, c-format
-@@ -1981,9 +1969,8 @@
- msgstr "Nie mo¿na otworzyæ pliku tymczasowego!"
+@@ -2032,9 +2022,8 @@
+ msgstr "B³±d: multipart/signed nie ma protoko³u."
  
- #: handler.c:1790
+ #: handler.c:1821
 -#, fuzzy
  msgid "[-- This is an attachment "
 -msgstr "[-- Ten za³±cznik typu %s/%s "
 +msgstr "[-- To jest za³±cznik "
  
- #: handler.c:1792
+ #: handler.c:1823
  #, c-format
-@@ -2151,9 +2138,9 @@
+@@ -2210,9 +2199,9 @@
  msgstr "Skrzynka zosta³a zamkniêta"
  
  #: imap/imap.c:125
@@ -326,7 +334,7 @@
  
  #: imap/imap.c:189
  #, c-format
-@@ -2317,14 +2304,14 @@
+@@ -2376,14 +2365,14 @@
  msgstr "NieSpam: brak pasuj±cego wzorca"
  
  #: init.c:861
@@ -345,7 +353,7 @@
  
  #: init.c:1094
  msgid "attachments: no disposition"
-@@ -2396,9 +2383,9 @@
+@@ -2455,9 +2444,9 @@
  msgstr "%s nie jest ustawiony"
  
  #: init.c:1913
@@ -357,7 +365,7 @@
  
  #: init.c:2050
  #, c-format
-@@ -2406,17 +2393,17 @@
+@@ -2465,17 +2454,17 @@
  msgstr "%s: nieprawid³owy typ skrzynki"
  
  #: init.c:2081
@@ -379,7 +387,7 @@
  
  #: init.c:2142
  #, c-format
-@@ -2547,7 +2534,7 @@
+@@ -2606,7 +2595,7 @@
  
  #: lib.c:131
  msgid "Integer overflow -- can't allocate memory!"
@@ -388,7 +396,7 @@
  
  #: lib.c:138 lib.c:153 lib.c:185
  msgid "Out of memory!"
-@@ -2562,22 +2549,19 @@
+@@ -2621,22 +2610,19 @@
  "Aby zg³osiæ b³±d, odwied¼ stronê http://bugs.mutt.org/.\n"
  
  #: main.c:69
@@ -414,7 +422,7 @@
  msgid ""
  "Copyright (C) 1996-2007 Michael R. Elkins <me@mutt.org>\n"
  "Copyright (C) 1996-2002 Brandon Long <blong@fiction.net>\n"
-@@ -2591,13 +2575,14 @@
+@@ -2650,13 +2636,14 @@
  "Many others not mentioned here contributed code, fixes,\n"
  "and suggestions.\n"
  msgstr ""
@@ -432,7 +440,7 @@
  "\n"
  "Wielu innych twórców, nie wspomnianych tutaj,\n"
  "wnios³o wiele nowego kodu, poprawek i sugestii.\n"
-@@ -2638,7 +2623,6 @@
+@@ -2697,7 +2684,6 @@
  "02110-1301, USA.\n"
  
  #: main.c:115
@@ -440,7 +448,7 @@
  msgid ""
  "usage: mutt [<options>] [-z] [-f <file> | -yZ]\n"
  "       mutt [<options>] [-x] [-Hi <file>] [-s <subj>] [-bc <addr>] [-a "
-@@ -2653,15 +2637,16 @@
+@@ -2712,15 +2698,16 @@
  msgstr ""
  "u¿ycie: mutt [<opcje>]  [-z] [-f <plik> | -yZ]\n"
  "       mutt [<opcje>] [-x] [-Hi <plik>] [-s <temat>] [-bc <adres>] [-a "
@@ -460,7 +468,7 @@
  msgid ""
  "options:\n"
  "  -A <alias>\texpand the given alias\n"
-@@ -2673,10 +2658,11 @@
+@@ -2732,10 +2719,11 @@
  msgstr ""
  "opcje:\n"
  "  -A <alias>\tu¿yj aliasu\n"
@@ -474,7 +482,7 @@
  
  #: main.c:133
  msgid "  -d <level>\tlog debugging output to ~/.muttdebug0"
-@@ -2737,9 +2723,9 @@
+@@ -2796,9 +2784,9 @@
  msgstr "B³±d inicjalizacji terminala."
  
  #: main.c:666
@@ -486,7 +494,7 @@
  
  #: main.c:669
  #, c-format
-@@ -2762,7 +2748,7 @@
+@@ -2821,7 +2809,7 @@
  
  #: main.c:882
  msgid "Failed to parse mailto: link\n"
@@ -495,7 +503,7 @@
  
  #: main.c:894
  msgid "No recipients specified.\n"
-@@ -2909,9 +2895,8 @@
+@@ -2968,9 +2956,8 @@
  msgstr "Sprawdzanie %s..."
  
  #: mh.c:1385 mh.c:1463
@@ -506,86 +514,86 @@
  
  #: mh.c:1430
  msgid "maildir_commit_message(): unable to set time on file"
-@@ -3013,9 +2998,9 @@
+@@ -3072,9 +3059,9 @@
  msgstr "Nie mo¿na pobraæ certyfikatu z docelowego hosta"
  
- #: mutt_ssl.c:424
+ #: mutt_ssl.c:435
 -#, fuzzy, c-format
 +#, c-format
  msgid "%s connection using %s (%s)"
 -msgstr "Po³±czenie SSL przy u¿yciu %s (%s)"
 +msgstr "Po³±czenie %s przy u¿yciu %s (%s)"
  
- #: mutt_ssl.c:526
+ #: mutt_ssl.c:537
  msgid "Unknown"
-@@ -3039,24 +3024,22 @@
+@@ -3098,24 +3085,22 @@
  msgstr "Certyfikat serwera utraci³ wa¿no¶æ"
  
- #: mutt_ssl.c:826
+ #: mutt_ssl.c:837
 -#, fuzzy
  msgid "cannot get certificate subject"
 -msgstr "Nie mo¿na pobraæ certyfikatu z docelowego hosta"
 +msgstr "nie mo¿na pobraæ tytu³u certyfikatu"
  
- #: mutt_ssl.c:836 mutt_ssl.c:845
+ #: mutt_ssl.c:847 mutt_ssl.c:856
 -#, fuzzy
  msgid "cannot get certificate common name"
 -msgstr "Nie mo¿na pobraæ certyfikatu z docelowego hosta"
 +msgstr "nie mo¿na pobraæ ogólnej nazwy certyfikatu"
  
- #: mutt_ssl.c:859
+ #: mutt_ssl.c:870
 -#, fuzzy, c-format
 +#, c-format
  msgid "certificate owner does not match hostname %s"
 -msgstr "W³a¶ciciel certyfikatu nie odpowiada nadawcy."
 +msgstr "w³a¶ciciel certyfikatu nie zgadza siê z hostem %s"
  
- #: mutt_ssl.c:900
+ #: mutt_ssl.c:911
 -#, fuzzy, c-format
 +#, c-format
  msgid "Certificate host check failed: %s"
 -msgstr "Certyfikat zosta³ zapisany"
 +msgstr "Weryfikacja hosta certyfikatu nie powiod³a siê: %s"
  
- #: mutt_ssl.c:978 mutt_ssl_gnutls.c:761
+ #: mutt_ssl.c:989 mutt_ssl_gnutls.c:860
  msgid "This certificate belongs to:"
-@@ -3089,7 +3072,7 @@
- #: mutt_ssl.c:1014 mutt_ssl_gnutls.c:883
+@@ -3148,7 +3133,7 @@
+ #: mutt_ssl.c:1025 mutt_ssl_gnutls.c:982
  #, c-format
  msgid "SSL Certificate check (certificate %d of %d in chain)"
 -msgstr ""
 +msgstr "Weryfikacja certyfikatu SSL (certyfikat %d z %d w ³añcuchu)"
  
- #: mutt_ssl.c:1022 mutt_ssl_gnutls.c:892
+ #: mutt_ssl.c:1033 mutt_ssl_gnutls.c:991
  msgid "(r)eject, accept (o)nce, (a)ccept always"
-@@ -3138,7 +3121,7 @@
- 
- #: mutt_ssl_gnutls.c:732
+@@ -3202,6 +3187,8 @@
+ #: mutt_ssl_gnutls.c:831
  msgid "Warning: Server certificate was signed using an insecure algorithm"
--msgstr ""
-+msgstr "Uwaga: certyfikat serwera zosta³ podpisany z u¿yciem algorytmu, który nie jest bezpieczny"
+ msgstr ""
++"Uwaga: certyfikat serwera zosta³ podpisany z u¿yciem algorytmu, który nie "
++"jest bezpieczny"
  
- #: mutt_ssl_gnutls.c:851
+ #: mutt_ssl_gnutls.c:950
  #, c-format
-@@ -3196,7 +3179,7 @@
+@@ -3259,7 +3246,7 @@
  
- #: muttlib.c:976
+ #: muttlib.c:971
  msgid "File is a directory, save under it? [(y)es, (n)o, (a)ll]"
 -msgstr "Ten plik jest katalogim, zapisaæ w nim? [(t)ak, (n)ie, (w)szystkie]"
 +msgstr "Ten plik jest katalogiem, zapisaæ w nim? [(t)ak, (n)ie, (w)szystkie]"
  
- #: muttlib.c:976
+ #: muttlib.c:971
  msgid "yna"
-@@ -3204,7 +3187,7 @@
+@@ -3267,7 +3254,7 @@
  
- #: muttlib.c:992
+ #: muttlib.c:987
  msgid "File is a directory, save under it?"
 -msgstr "Ten plik jest katalogim, zapisaæ w nim?"
 +msgstr "Ten plik jest katalogiem, zapisaæ w nim?"
  
- #: muttlib.c:996
+ #: muttlib.c:991
  msgid "File under directory: "
-@@ -3268,7 +3251,7 @@
+@@ -3331,7 +3318,7 @@
  #: mx.c:771
  #, c-format
  msgid "Could not synchronize mailbox %s!"
@@ -594,16 +602,16 @@
  
  #: mx.c:835
  #, c-format
-@@ -3328,7 +3311,7 @@
+@@ -3391,7 +3378,7 @@
  
- #: mx.c:1505
+ #: mx.c:1506
  msgid "Integer overflow -- can't allocate memory."
 -msgstr "Przepe³nienie zmiennej ca³kowitej - nie mo¿na zaalokowaæ pamiêci."
 +msgstr "Przepe³nienie zmiennej ca³kowitej - nie mo¿na przydzieliæ pamiêci."
  
  #: pager.c:1532
  msgid "PrevPg"
-@@ -3407,9 +3390,9 @@
+@@ -3470,9 +3457,9 @@
  msgstr "b³±d we wzorcu: %s"
  
  #: pattern.c:830
@@ -615,45 +623,80 @@
  
  #: pattern.c:840
  #, c-format
-@@ -3527,9 +3510,9 @@
- msgstr "Nie mo¿na wywo³aæ PGP"
+@@ -3592,7 +3579,8 @@
+ #: pgp.c:1682
+ #, fuzzy, c-format
+ msgid "PGP (s)ign, sign (a)s, %s format, (c)lear, or (o)ppenc mode off? "
+-msgstr "PGP: (z)aszyfruj, podpi(s)z, podpisz j(a)ko, o(b)a, %s , b(e)z PGP? "
++msgstr ""
++"PGP: (z)aszyfruj, podpi(s)z, podpisz j(a)ko, o(b)a, format %s, b(e)z PGP? "
+ 
+ #: pgp.c:1683 pgp.c:1709 pgp.c:1731
+ msgid "PGP/M(i)ME"
+@@ -3609,7 +3597,7 @@
+ #: pgp.c:1690
+ #, fuzzy
+ msgid "PGP (s)ign, sign (a)s, (c)lear, or (o)ppenc mode off? "
+-msgstr "PGP: (z)aszyfruj, podpi(s)z, podpisz j(a)ko, o(b)a, %s , b(e)z PGP? "
++msgstr "PGP: (z)aszyfruj, podpi(s)z, podpisz j(a)ko, o(b)a, b(e)z PGP? "
+ 
+ #: pgp.c:1691
+ msgid "safco"
+@@ -3620,42 +3608,41 @@
+ msgid ""
+ "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, %s format, (c)lear, or (o)ppenc "
+ "mode? "
+-msgstr "PGP: (z)aszyfruj, podpi(s)z, podpisz j(a)ko, o(b)a, %s , b(e)z PGP? "
++msgstr ""
++"PGP: (z)aszyfruj, podpi(s)z, podpisz j(a)ko, o(b)a, format %s, b(e)z PGP? "
+ 
+ #: pgp.c:1711
+ #, fuzzy
+ msgid "esabfcoi"
+-msgstr "zpjoga"
++msgstr "zsabfei"
+ 
+ #: pgp.c:1716
+ #, fuzzy
+ msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, (c)lear, or (o)ppenc mode? "
+-msgstr "PGP: (z)aszyfruj, podpi(s)z, podpisz j(a)ko, o(b)a, %s , b(e)z PGP? "
++msgstr "PGP: (z)aszyfruj, podpi(s)z, podpisz j(a)ko, o(b)a, b(e)z PGP? "
+ 
+ #: pgp.c:1717
+ #, fuzzy
+ msgid "esabfco"
+-msgstr "zpjoga"
++msgstr "zpabfe"
  
- #: pgp.c:1590
+ #: pgp.c:1730
 -#, fuzzy, c-format
 +#, c-format
  msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, %s format, or (c)lear? "
 -msgstr "PGP: (z)aszyfruj, podpi(s)z, podpisz j(a)ko, o(b)a, %s , b(e)z PGP? "
-+msgstr "PGP: (z)aszyfruj, podpi(s)z, podpisz j(a)ko, o(b)a, format %s, b(e)z PGP? "
++msgstr ""
++"PGP: (z)aszyfruj, podpi(s)z, podpisz j(a)ko, o(b)a, format %s, b(e)z PGP? "
  
- #: pgp.c:1591
- msgid "PGP/M(i)ME"
-@@ -3544,22 +3527,19 @@
- #. * it.  The 'i' key is appended in this version.
- #.
- #: pgp.c:1597
+ #: pgp.c:1733
 -#, fuzzy
  msgid "esabfci"
 -msgstr "zpjoga"
 +msgstr "zsabfei"
  
- #. The keys accepted *must* be a prefix of the accepted keys in the "if"
- #. * clause above since the switch statement below depends on it.
- #.
- #: pgp.c:1604
+ #: pgp.c:1738
 -#, fuzzy
  msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, or (c)lear? "
 -msgstr "PGP: (z)aszyfruj, podpi(s)z, podpisz j(a)ko, o(b)a, %s , b(e)z PGP? "
 +msgstr "PGP: (z)aszyfruj, podpi(s)z, podpisz j(a)ko, o(b)a, b(e)z PGP? "
  
- #: pgp.c:1605
+ #: pgp.c:1739
 -#, fuzzy
  msgid "esabfc"
 -msgstr "zpjoga"
 +msgstr "zpabfe"
  
- #: pgpinvoke.c:308
+ #: pgpinvoke.c:309
  msgid "Fetching PGP key..."
-@@ -3607,9 +3587,9 @@
+@@ -3699,9 +3686,9 @@
  msgstr "Polecenie UIDL nie jest obs³ugiwane przez serwer."
  
  #: pop.c:296
@@ -665,7 +708,7 @@
  
  #: pop.c:411 pop.c:801
  #, c-format
-@@ -3668,7 +3648,7 @@
+@@ -3760,7 +3747,7 @@
  
  #: pop_auth.c:188
  msgid "POP timestamp is invalid!"
@@ -674,28 +717,19 @@
  
  #: pop_auth.c:193
  msgid "Authenticating (APOP)..."
-@@ -3684,9 +3664,9 @@
+@@ -3776,9 +3763,9 @@
  msgstr "Polecenie USER nie jest obs³ugiwane przez serwer."
  
- #: pop_lib.c:56
+ #: pop_lib.c:57
 -#, fuzzy, c-format
 +#, c-format
  msgid "Invalid POP URL: %s\n"
 -msgstr "B³êdny URL SMTP: %s"
 +msgstr "B³êdny URL POP: %s\n"
  
- #: pop_lib.c:207
+ #: pop_lib.c:208
  msgid "Unable to leave messages on server."
-@@ -3844,7 +3824,7 @@
- 
- #: recvcmd.c:148 recvcmd.c:161
- msgid "Warning: message contains no From: header"
--msgstr ""
-+msgstr "Ostrze¿enie: list nie zawiera nag³ówka From:"
- 
- #: recvcmd.c:241
- msgid "Error bouncing message!"
-@@ -3978,7 +3958,7 @@
+@@ -4072,7 +4059,7 @@
  
  #: score.c:122
  msgid "Error: score: invalid number"
@@ -704,36 +738,27 @@
  
  #: send.c:251
  msgid "No subject, abort?"
-@@ -4075,9 +4055,8 @@
+@@ -4169,9 +4156,8 @@
  
  #. check to see if the user wants copies of all attachments
- #: send.c:1706
+ #: send.c:1769
 -#, fuzzy
  msgid "Save attachments in Fcc?"
 -msgstr "obejrzyj za³±cznik jako tekst"
 +msgstr "Zapisaæ za³±czniki w Fcc?"
  
- #: send.c:1815
+ #: send.c:1878
  msgid "Could not send the message."
-@@ -4112,7 +4091,7 @@
+@@ -4206,7 +4192,7 @@
  
- #: sendlib.c:2350
+ #: sendlib.c:2357
  msgid "$sendmail must be set in order to send mail."
 -msgstr ""
 +msgstr "Do wysy³ania poczty musi byæ ustawiony $sendmail."
  
- #: sendlib.c:2421
- #, c-format
-@@ -4203,7 +4182,7 @@
+ #: sendlib.c:2428
  #, c-format
- msgid "Warning: You have not yet decided to trust ID %s. (any key to continue)"
- msgstr ""
--"Ostrze¿enie: nie oke¶lono poziomu zaufania dla %s (dow. klawisz by "
-+"Ostrze¿enie: nie okre¶lono poziomu zaufania dla %s (dow. klawisz by "
- "kontynuowaæ)."
- 
- #: smime.c:781
-@@ -4335,7 +4314,7 @@
+@@ -4428,7 +4414,7 @@
  
  #: smtp.c:258
  msgid "No from address given"
@@ -742,7 +767,7 @@
  
  #: smtp.c:314
  msgid "SMTP session failed: read error"
-@@ -4347,7 +4326,7 @@
+@@ -4440,7 +4426,7 @@
  
  #: smtp.c:318
  msgid "Invalid server response"
@@ -751,7 +776,7 @@
  
  #: smtp.c:341
  #, c-format
-@@ -4363,9 +4342,9 @@
+@@ -4456,9 +4442,9 @@
  msgstr "Uwierzytelnianie SMTP wymaga SASL"
  
  #: smtp.c:493
@@ -763,7 +788,7 @@
  
  #: smtp.c:510
  msgid "SASL authentication failed"
-@@ -4619,7 +4598,7 @@
+@@ -4712,7 +4698,7 @@
  
  #: ../keymap_alldefs.h:61
  msgid "display message and toggle header weeding"
@@ -772,7 +797,7 @@
  
  #: ../keymap_alldefs.h:62
  msgid "display a message"
-@@ -4627,7 +4606,7 @@
+@@ -4720,7 +4706,7 @@
  
  #: ../keymap_alldefs.h:63
  msgid "edit the raw message"
@@ -781,7 +806,7 @@
  
  #: ../keymap_alldefs.h:64
  msgid "delete the char in front of the cursor"
-@@ -4707,7 +4686,7 @@
+@@ -4800,7 +4786,7 @@
  
  #: ../keymap_alldefs.h:83
  msgid "capitalize the word"
@@ -790,7 +815,7 @@
  
  #: ../keymap_alldefs.h:84
  msgid "convert the word to lower case"
-@@ -4811,7 +4790,7 @@
+@@ -4904,7 +4890,7 @@
  
  #: ../keymap_alldefs.h:109
  msgid "logout from all IMAP servers"
@@ -799,7 +824,7 @@
  
  #: ../keymap_alldefs.h:110
  msgid "retrieve mail from POP server"
-@@ -5006,9 +4985,8 @@
+@@ -5099,9 +5085,8 @@
  msgstr "u¿yj bie¿±cego listu jako wzorca dla nowych wiadomo¶ci"
  
  #: ../keymap_alldefs.h:158
@@ -810,7 +835,7 @@
  
  #: ../keymap_alldefs.h:159
  msgid "search for a regular expression"
-@@ -5152,7 +5130,7 @@
+@@ -5245,7 +5230,7 @@
  
  #: ../keymap_alldefs.h:194
  msgid "Insert a remailer into the chain"
@@ -819,7 +844,7 @@
  
  #: ../keymap_alldefs.h:195
  msgid "Delete a remailer from the chain"
-@@ -5164,15 +5142,15 @@
+@@ -5257,15 +5242,15 @@
  
  #: ../keymap_alldefs.h:197
  msgid "Select the next element of the chain"
@@ -838,3 +863,23 @@
  
  #: ../keymap_alldefs.h:200
  msgid "make decrypted copy"
+@@ -5283,9 +5268,8 @@
+ msgid "show S/MIME options"
+ msgstr "poka¿ opcje S/MIME"
+ 
+-#, fuzzy
+ #~ msgid "Warning: message has no From: header"
+-#~ msgstr "Ostrze¿enie: fragment tej wiadomo¶ci nie zosta³ podpisany."
++#~ msgstr "Ostrze¿enie: wiadomo¶æ nie ma nag³ówka From:"
+ 
+ #~ msgid ""
+ #~ "[-- Error: malformed PGP/MIME message! --]\n"
+@@ -5316,7 +5300,7 @@
+ #~ msgid ""
+ #~ "Warning: You have not yet decided to trust ID %s. (any key to continue)"
+ #~ msgstr ""
+-#~ "Ostrze¿enie: nie oke¶lono poziomu zaufania dla %s (dow. klawisz by "
++#~ "Ostrze¿enie: nie okre¶lono poziomu zaufania dla %s (dow. klawisz by "
+ #~ "kontynuowaæ)."
+ 
+ #~ msgid "No output from OpenSSL.."
diff --git a/mutt-rr.compressed.patch b/mutt-rr.compressed.patch
index 97b6cd2..46ba156 100644
--- a/mutt-rr.compressed.patch
+++ b/mutt-rr.compressed.patch
@@ -985,9 +985,9 @@ diff -udprP mutt-1.5.19.orig/doc/muttrc.man.head mutt-1.5.19/doc/muttrc.man.head
 --- mutt-1.5.19.orig/doc/muttrc.man.head	2008-11-26 20:48:48.000000000 +0200
 +++ mutt-1.5.19/doc/muttrc.man.head	2009-01-06 19:16:04.000000000 +0200
 @@ -345,6 +345,24 @@ specify the ID of the public key to be u
- to a certain recipient.  The meaning of "key ID" is to be taken
- broadly: This can be a different e-mail address, a numerical key ID,
- or even just an arbitrary search string.
+ \fBcrypt-hook\fPs result in the use of multiple \fIkey-id\fPs for 
+ a recipient.
+ 
 +.PP
 +.nf
 +\fBopen-hook\fP \fIregexp\fP "\fIcommand\fP"
diff --git a/mutt-sidebar.patch b/mutt-sidebar.patch
index c800888..0e08bfb 100644
--- a/mutt-sidebar.patch
+++ b/mutt-sidebar.patch
@@ -1,5 +1,5 @@
-*** mutt-1.5.23-orig/buffy.c	2014-03-12 11:03:44.000000000 -0500
---- mutt-1.5.23/buffy.c	2014-04-12 15:33:54.000000000 -0500
+*** mutt-1.5.24-orig/buffy.c	2015-08-30 12:06:38.000000000 -0500
+--- mutt-1.5.24/buffy.c	2015-09-16 23:18:13.000000000 -0500
 ***************
 *** 161,166 ****
 --- 161,209 ----
@@ -112,82 +112,83 @@
     {
       mailbox->magic = 0;
 ***************
-*** 340,345 ****
---- 393,464 ----
-    return rc;
-  }
+*** 357,362 ****
+--- 410,482 ----
   
-+ /* update message counts for the sidebar */
+    return 0;
+  }
++   
++  /* update message counts for the sidebar */
 + void buffy_maildir_update (BUFFY* mailbox)
 + {
-+   char path[_POSIX_PATH_MAX];
-+   DIR *dirp;
-+   struct dirent *de;
-+   char *p;
-+ 
-+   if(!option(OPTSIDEBAR))
-+       return;
-+ 
-+   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++;
-+         }
-+       }
-+     }
-+   }
++  char path[_POSIX_PATH_MAX];
++  DIR *dirp;
++  struct dirent *de;
++  char *p;
++ 
++  if(!option(OPTSIDEBAR))
++      return;
++ 
++  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++;
++        }
++      }
++    }
++  }
 + 
-+   mailbox->sb_last_checked = time(NULL);
-+   closedir (dirp);
++  mailbox->sb_last_checked = time(NULL);
++  closedir (dirp);
 + }
 + 
   /* returns 1 if mailbox has new mail */ 
   static int buffy_mbox_hasnew (BUFFY* mailbox, struct stat *sb)
   {
 ***************
-*** 351,357 ****
+*** 368,374 ****
     else
       statcheck = sb->st_mtime > sb->st_atime
         || (mailbox->newly_created && sb->st_ctime == sb->st_mtime && sb->st_ctime == sb->st_atime);
@@ -195,7 +196,7 @@
     {
       if (!option(OPTMAILCHECKRECENT) || sb->st_mtime > mailbox->last_visited)
       {
---- 470,476 ----
+--- 488,494 ----
     else
       statcheck = sb->st_mtime > sb->st_atime
         || (mailbox->newly_created && sb->st_ctime == sb->st_mtime && sb->st_ctime == sb->st_atime);
@@ -204,8 +205,8 @@
       if (!option(OPTMAILCHECKRECENT) || sb->st_mtime > mailbox->last_visited)
       {
 ***************
-*** 371,376 ****
---- 490,516 ----
+*** 388,393 ****
+--- 508,534 ----
     return rc;
   }
   
@@ -234,7 +235,7 @@
   {
     BUFFY *tmp;
 ***************
-*** 444,460 ****
+*** 461,477 ****
         {
         case M_MBOX:
         case M_MMDF:
@@ -252,7 +253,7 @@
   	if (tmp->new)
   	  BuffyCount++;
   	break;
---- 584,603 ----
+--- 602,621 ----
         {
         case M_MBOX:
         case M_MMDF:
@@ -273,8 +274,8 @@
   	if (tmp->new)
   	  BuffyCount++;
   	break;
-*** mutt-1.5.23-orig/buffy.h	2014-03-12 11:03:44.000000000 -0500
---- mutt-1.5.23/buffy.h	2014-04-11 10:14:01.000000000 -0500
+*** mutt-1.5.24-orig/buffy.h	2015-08-30 12:06:38.000000000 -0500
+--- mutt-1.5.24/buffy.h	2015-09-16 23:18:13.000000000 -0500
 ***************
 *** 23,35 ****
 --- 23,41 ----
@@ -297,21 +298,21 @@
   }
   BUFFY;
   
-*** mutt-1.5.23-orig/color.c	2014-03-12 11:03:45.000000000 -0500
---- mutt-1.5.23/color.c	2014-04-11 10:14:01.000000000 -0500
+*** mutt-1.5.24-orig/color.c	2015-08-30 12:06:38.000000000 -0500
+--- mutt-1.5.24/color.c	2015-09-16 23:18:13.000000000 -0500
 ***************
-*** 93,98 ****
---- 93,100 ----
-    { "bold",		MT_COLOR_BOLD },
+*** 94,99 ****
+--- 94,101 ----
     { "underline",	MT_COLOR_UNDERLINE },
     { "index",		MT_COLOR_INDEX },
+    { "prompt",		MT_COLOR_PROMPT },
 +   { "sidebar_new",	MT_COLOR_NEW },
 +   { "sidebar_flagged",	MT_COLOR_FLAGGED },
     { NULL,		0 }
   };
   
-*** mutt-1.5.23-orig/compose.c	2014-03-12 11:03:45.000000000 -0500
---- mutt-1.5.23/compose.c	2014-04-12 12:15:56.000000000 -0500
+*** mutt-1.5.24-orig/compose.c	2015-08-30 12:06:38.000000000 -0500
+--- mutt-1.5.24/compose.c	2015-09-16 23:18:13.000000000 -0500
 ***************
 *** 72,78 ****
   
@@ -347,16 +348,16 @@
     if ((WithCrypto & (APPLICATION_PGP | APPLICATION_SMIME)) == 0)
     {
 ***************
-*** 142,148 ****
-    }
+*** 145,151 ****
+        addstr (_(" (OppEnc mode)"));
   
     clrtoeol ();
 !   move (HDR_CRYPTINFO, 0);
     clrtoeol ();
   
     if ((WithCrypto & APPLICATION_PGP)
---- 142,148 ----
-    }
+--- 145,151 ----
+        addstr (_(" (OppEnc mode)"));
   
     clrtoeol ();
 !   move (HDR_CRYPTINFO, SidebarWidth);
@@ -364,7 +365,7 @@
   
     if ((WithCrypto & APPLICATION_PGP)
 ***************
-*** 159,165 ****
+*** 162,168 ****
         && (msg->security & ENCRYPT)
         && SmimeCryptAlg
         && *SmimeCryptAlg) {
@@ -372,7 +373,7 @@
   		NONULL(SmimeCryptAlg));
     }
   }
---- 159,165 ----
+--- 162,168 ----
         && (msg->security & ENCRYPT)
         && SmimeCryptAlg
         && *SmimeCryptAlg) {
@@ -381,7 +382,7 @@
     }
   }
 ***************
-*** 172,178 ****
+*** 175,181 ****
     int c;
     char *t;
   
@@ -389,7 +390,7 @@
   
     if (!chain)
     {
---- 172,178 ----
+--- 175,181 ----
     int c;
     char *t;
   
@@ -398,7 +399,7 @@
     if (!chain)
     {
 ***************
-*** 187,193 ****
+*** 190,196 ****
       if (t && t[0] == '0' && t[1] == '\0')
         t = "<random>";
       
@@ -406,7 +407,7 @@
         break;
   
       addstr (NONULL(t));
---- 187,193 ----
+--- 190,196 ----
       if (t && t[0] == '0' && t[1] == '\0')
         t = "<random>";
       
@@ -415,7 +416,7 @@
   
       addstr (NONULL(t));
 ***************
-*** 239,245 ****
+*** 242,248 ****
   
     buf[0] = 0;
     rfc822_write_address (buf, sizeof (buf), addr, 1);
@@ -423,7 +424,7 @@
     mutt_paddstr (W, buf);
   }
   
---- 239,245 ----
+--- 242,248 ----
   
     buf[0] = 0;
     rfc822_write_address (buf, sizeof (buf), addr, 1);
@@ -432,7 +433,7 @@
   }
   
 ***************
-*** 249,258 ****
+*** 252,261 ****
     draw_envelope_addr (HDR_TO, msg->env->to);
     draw_envelope_addr (HDR_CC, msg->env->cc);
     draw_envelope_addr (HDR_BCC, msg->env->bcc);
@@ -443,7 +444,7 @@
     mutt_paddstr (W, fcc);
   
     if (WithCrypto)
---- 249,258 ----
+--- 252,261 ----
     draw_envelope_addr (HDR_TO, msg->env->to);
     draw_envelope_addr (HDR_CC, msg->env->cc);
     draw_envelope_addr (HDR_BCC, msg->env->bcc);
@@ -455,7 +456,7 @@
   
     if (WithCrypto)
 ***************
-*** 263,269 ****
+*** 266,272 ****
   #endif
   
     SETCOLOR (MT_COLOR_STATUS);
@@ -463,7 +464,7 @@
     clrtoeol ();
   
     NORMAL_COLOR;
---- 263,269 ----
+--- 266,272 ----
   #endif
   
     SETCOLOR (MT_COLOR_STATUS);
@@ -472,7 +473,7 @@
   
     NORMAL_COLOR;
 ***************
-*** 299,305 ****
+*** 302,308 ****
     /* redraw the expanded list so the user can see the result */
     buf[0] = 0;
     rfc822_write_address (buf, sizeof (buf), *addr, 1);
@@ -480,7 +481,7 @@
     mutt_paddstr (W, buf);
     
     return 0;
---- 299,305 ----
+--- 302,308 ----
     /* redraw the expanded list so the user can see the result */
     buf[0] = 0;
     rfc822_write_address (buf, sizeof (buf), *addr, 1);
@@ -489,7 +490,7 @@
     
     return 0;
 ***************
-*** 544,550 ****
+*** 562,568 ****
   	if (mutt_get_field ("Subject: ", buf, sizeof (buf), 0) == 0)
   	{
   	  mutt_str_replace (&msg->env->subject, buf);
@@ -497,7 +498,7 @@
   	  if (msg->env->subject)
   	    mutt_paddstr (W, msg->env->subject);
   	  else
---- 544,550 ----
+--- 562,568 ----
   	if (mutt_get_field ("Subject: ", buf, sizeof (buf), 0) == 0)
   	{
   	  mutt_str_replace (&msg->env->subject, buf);
@@ -506,7 +507,7 @@
   	    mutt_paddstr (W, msg->env->subject);
   	  else
 ***************
-*** 562,568 ****
+*** 580,586 ****
   	{
   	  strfcpy (fcc, buf, fcclen);
   	  mutt_pretty_mailbox (fcc, fcclen);
@@ -514,7 +515,7 @@
   	  mutt_paddstr (W, fcc);
   	  fccSet = 1;
   	}
---- 562,568 ----
+--- 580,586 ----
   	{
   	  strfcpy (fcc, buf, fcclen);
   	  mutt_pretty_mailbox (fcc, fcclen);
@@ -522,11 +523,11 @@
   	  mutt_paddstr (W, fcc);
   	  fccSet = 1;
   	}
-*** mutt-1.5.23-orig/configure.ac	2014-03-12 11:26:40.000000000 -0500
---- mutt-1.5.23/configure.ac	2014-04-11 10:14:01.000000000 -0500
+*** mutt-1.5.24-orig/configure.ac	2015-08-30 12:24:20.000000000 -0500
+--- mutt-1.5.24/configure.ac	2015-09-16 23:18:13.000000000 -0500
 ***************
-*** 1276,1281 ****
---- 1276,1283 ----
+*** 1302,1307 ****
+--- 1302,1309 ----
     AC_DEFINE(HAVE_LANGINFO_YESEXPR,1,[ Define if you have <langinfo.h> and nl_langinfo(YESEXPR). ])
   fi
   
@@ -535,8 +536,8 @@
   dnl Documentation tools
   have_openjade="no"
   AC_PATH_PROG([OSPCAT], [ospcat], [none])
-*** mutt-1.5.23-orig/curs_main.c	2014-03-12 11:06:17.000000000 -0500
---- mutt-1.5.23/curs_main.c	2014-04-12 21:45:21.000000000 -0500
+*** mutt-1.5.24-orig/curs_main.c	2015-08-30 12:06:38.000000000 -0500
+--- mutt-1.5.24/curs_main.c	2015-09-16 23:18:13.000000000 -0500
 ***************
 *** 26,32 ****
 --- 26,34 ----
@@ -550,7 +551,7 @@
   #ifdef USE_POP
   #include "pop.h"
 ***************
-*** 519,538 ****
+*** 596,615 ****
          menu->redraw |= REDRAW_STATUS;
        if (do_buffy_notify)
        {
@@ -571,7 +572,7 @@
       }
   
       if (menu->menu == MENU_MAIN)
---- 521,551 ----
+--- 598,628 ----
          menu->redraw |= REDRAW_STATUS;
        if (do_buffy_notify)
        {
@@ -604,8 +605,8 @@
   
       if (menu->menu == MENU_MAIN)
 ***************
-*** 554,562 ****
---- 567,578 ----
+*** 631,639 ****
+--- 644,655 ----
   
         if (menu->redraw & REDRAW_STATUS)
         {
@@ -619,7 +620,7 @@
   	NORMAL_COLOR;
   	menu->redraw &= ~REDRAW_STATUS;
 ***************
-*** 569,575 ****
+*** 653,659 ****
   	menu->oldcurrent = -1;
   
         if (option (OPTARROWCURSOR))
@@ -627,7 +628,7 @@
         else if (option (OPTBRAILLEFRIENDLY))
   	move (menu->current - menu->top + menu->offset, 0);
         else
---- 585,591 ----
+--- 669,675 ----
   	menu->oldcurrent = -1;
   
         if (option (OPTARROWCURSOR))
@@ -636,8 +637,8 @@
   	move (menu->current - menu->top + menu->offset, 0);
         else
 ***************
-*** 1011,1016 ****
---- 1027,1033 ----
+*** 1095,1100 ****
+--- 1111,1117 ----
   	  break;
   
   	CHECK_MSGCOUNT;
@@ -646,8 +647,8 @@
   	{
   	  int oldvcount = Context->vcount;
 ***************
-*** 1070,1075 ****
---- 1087,1093 ----
+*** 1154,1159 ****
+--- 1171,1177 ----
   	  menu->redraw = REDRAW_FULL;
   	break;
   
@@ -656,7 +657,7 @@
         case OP_MAIN_NEXT_UNREAD_MAILBOX:
   
 ***************
-*** 1101,1107 ****
+*** 1185,1191 ****
   	{
   	  mutt_buffy (buf, sizeof (buf));
   
@@ -664,7 +665,7 @@
   	  {
   	    if (menu->menu == MENU_PAGER)
   	    {
---- 1119,1129 ----
+--- 1203,1213 ----
   	{
   	  mutt_buffy (buf, sizeof (buf));
   
@@ -677,8 +678,8 @@
   	    if (menu->menu == MENU_PAGER)
   	    {
 ***************
-*** 1119,1124 ****
---- 1141,1147 ----
+*** 1203,1208 ****
+--- 1225,1231 ----
   	}
   
   	mutt_expand_path (buf, sizeof (buf));
@@ -687,8 +688,8 @@
   	{
   	  mutt_error (_("%s is not a mailbox."), buf);
 ***************
-*** 2209,2214 ****
---- 2232,2243 ----
+*** 2293,2298 ****
+--- 2316,2327 ----
   	mutt_what_key();
   	break;
   
@@ -701,8 +702,8 @@
         default:
   	if (menu->menu == MENU_MAIN)
   	  km_error_key (MENU_MAIN);
-*** mutt-1.5.23-orig/flags.c	2014-03-12 11:03:45.000000000 -0500
---- mutt-1.5.23/flags.c	2014-04-11 10:14:01.000000000 -0500
+*** mutt-1.5.24-orig/flags.c	2015-08-30 12:06:38.000000000 -0500
+--- mutt-1.5.24/flags.c	2015-09-16 23:18:13.000000000 -0500
 ***************
 *** 22,29 ****
 --- 22,31 ----
@@ -726,8 +727,8 @@
   }
   
   void mutt_tag_set_flag (int flag, int bf)
-*** mutt-1.5.23-orig/functions.h	2014-03-12 11:03:45.000000000 -0500
---- mutt-1.5.23/functions.h	2014-04-11 10:14:01.000000000 -0500
+*** mutt-1.5.24-orig/functions.h	2015-08-30 12:06:38.000000000 -0500
+--- mutt-1.5.24/functions.h	2015-09-16 23:18:13.000000000 -0500
 ***************
 *** 169,174 ****
 --- 169,179 ----
@@ -756,11 +757,11 @@
     { NULL,		0,				NULL }
   };
   
-*** mutt-1.5.23-orig/globals.h	2014-03-12 11:06:17.000000000 -0500
---- mutt-1.5.23/globals.h	2014-04-11 10:14:01.000000000 -0500
+*** mutt-1.5.24-orig/globals.h	2015-08-30 12:06:38.000000000 -0500
+--- mutt-1.5.24/globals.h	2015-09-16 23:18:13.000000000 -0500
 ***************
-*** 117,122 ****
---- 117,125 ----
+*** 118,123 ****
+--- 118,126 ----
   WHERE char *SendCharset;
   WHERE char *Sendmail;
   WHERE char *Shell;
@@ -771,8 +772,8 @@
   WHERE char *SimpleSearch;
   #if USE_SMTP
 ***************
-*** 208,213 ****
---- 211,219 ----
+*** 213,218 ****
+--- 216,224 ----
   WHERE short ScoreThresholdRead;
   WHERE short ScoreThresholdFlag;
   
@@ -782,89 +783,98 @@
   #ifdef USE_IMAP
   WHERE short ImapKeepalive;
   WHERE short ImapPipelineDepth;
-*** mutt-1.5.23-orig/handler.c	2014-03-12 11:03:45.000000000 -0500
---- mutt-1.5.23/handler.c	2014-04-11 10:14:01.000000000 -0500
+*** mutt-1.5.24-orig/handler.c	2015-08-30 12:06:38.000000000 -0500
+--- mutt-1.5.24/handler.c	2015-09-16 23:18:13.000000000 -0500
 ***************
-*** 1599,1604 ****
---- 1599,1609 ----
-    size_t tmplength = 0;
-    int rc = 0;
+*** 1603,1608 ****
+--- 1603,1613 ----
+  
+    fseeko (s->fpin, b->offset, 0);
   
 + #ifdef HAVE_FMEMOPEN
 +   char *temp;
 +   size_t tempsize;
 + #endif
 + 
-    int oflags = s->flags;
-    
-    /* first determine which handler to use to process this part */
+    /* see if we need to decode this part before processing it */
+    if (b->encoding == ENCBASE64 || b->encoding == ENCQUOTEDPRINTABLE ||
+        b->encoding == ENCUUENCODED || plaintext ||
 ***************
-*** 1711,1716 ****
---- 1716,1729 ----
-        {
-  	/* decode to a tempfile, saving the original destination */
-  	fp = s->fpout;
+*** 1618,1623 ****
+--- 1623,1636 ----
+      {
+        /* decode to a tempfile, saving the original destination */
+        fp = s->fpout;
 + #ifdef HAVE_FMEMOPEN
-+ 	if ((s->fpout = open_memstream(&temp, &tempsize)) == NULL)
-+ 	{
-+ 	  mutt_error _("Unable to open memory stream!");
-+ 	  dprint (1, (debugfile, "Can't open memory stream.\n"));
-+ 	  goto bail;
-+ 	}
++      if ((s->fpout = open_memstream(&temp, &tempsize)) == NULL)
++      {
++        mutt_error _("Unable to open memory stream!");
++        dprint (1, (debugfile, "Can't open memory stream.\n"));
++        return -1;
++      }
 + #else
-  	mutt_mktemp (tempfile, sizeof (tempfile));
-  	if ((s->fpout = safe_fopen (tempfile, "w")) == NULL)
-  	{
+        mutt_mktemp (tempfile, sizeof (tempfile));
+        if ((s->fpout = safe_fopen (tempfile, "w")) == NULL)
+        {
 ***************
-*** 1718,1723 ****
---- 1731,1737 ----
-  	  dprint (1, (debugfile, "Can't open %s.\n", tempfile));
-  	  goto bail;
-  	}
+*** 1625,1630 ****
+--- 1638,1644 ----
+          dprint (1, (debugfile, "Can't open %s.\n", tempfile));
+          return -1;
+        }
 + #endif
-  	/* decoding the attachment changes the size and offset, so save a copy
-  	 * of the "real" values now, and restore them after processing
-  	 */
-***************
-*** 1746,1753 ****
---- 1760,1778 ----
-  	/* restore final destination and substitute the tempfile for input */
-  	s->fpout = fp;
-  	fp = s->fpin;
+        /* decoding the attachment changes the size and offset, so save a copy
+          * of the "real" values now, and restore them after processing
+          */
+***************
+*** 1653,1661 ****
+        /* restore final destination and substitute the tempfile for input */
+        s->fpout = fp;
+        fp = s->fpin;
+        s->fpin = fopen (tempfile, "r");
+        unlink (tempfile);
+! 
+        /* restore the prefix */
+        s->prefix = savePrefix;
+      }
+--- 1667,1685 ----
+        /* restore final destination and substitute the tempfile for input */
+        s->fpout = fp;
+        fp = s->fpin;
 + #ifdef HAVE_FMEMOPEN
-+ 	if(tempsize)
-+ 		s->fpin = fmemopen(temp, tempsize, "r");
-+ 	else /* fmemopen cannot handle zero-length buffers */
-+ 		s->fpin = safe_fopen ("/dev/null", "r");
-+ 	if(s->fpin == NULL) {
-+ 		mutt_perror("failed to re-open memstream!");
-+ 		return (-1);
-+ 	}
++       if(tempsize)
++         s->fpin = fmemopen(temp, tempsize, "r");
++       else /* fmemopen cannot handle zero-length buffers */
++         s->fpin = safe_fopen ("/dev/null", "r");
++       if(s->fpin == NULL) {
++        mutt_perror("failed to re-open memstream!");
++        return (-1);
++       }
 + #else
-  	s->fpin = fopen (tempfile, "r");
-  	unlink (tempfile);
-+ #endif
-  
-  	/* restore the prefix */
-  	s->prefix = savePrefix;
+        s->fpin = fopen (tempfile, "r");
+        unlink (tempfile);
+! #endif
+        /* restore the prefix */
+        s->prefix = savePrefix;
+      }
 ***************
-*** 1773,1778 ****
---- 1798,1807 ----
+*** 1680,1685 ****
+--- 1704,1713 ----
   
-  	/* restore the original source stream */
-  	safe_fclose (&s->fpin);
+        /* restore the original source stream */
+        safe_fclose (&s->fpin);
 + #ifdef HAVE_FMEMOPEN
-+ 	if(tempsize)
-+ 	    FREE(&temp);
++       if(tempsize)
++           FREE(&temp);
 + #endif
-  	s->fpin = fp;
-        }
+        s->fpin = fp;
       }
-*** mutt-1.5.23-orig/init.h	2014-03-12 11:06:17.000000000 -0500
---- mutt-1.5.23/init.h	2014-04-11 10:14:01.000000000 -0500
+    }
+*** mutt-1.5.24-orig/init.h	2015-08-30 12:06:38.000000000 -0500
+--- mutt-1.5.24/init.h	2015-09-16 23:18:13.000000000 -0500
 ***************
-*** 1966,1971 ****
---- 1966,2019 ----
+*** 2016,2021 ****
+--- 2016,2069 ----
     ** not used.
     ** (PGP only)
     */
@@ -919,8 +929,8 @@
     { "pgp_use_gpg_agent", DT_BOOL, R_NONE, OPTUSEGPGAGENT, 0},
     /*
     ** .pp
-*** mutt-1.5.23-orig/mailbox.h	2014-03-12 11:03:45.000000000 -0500
---- mutt-1.5.23/mailbox.h	2014-04-11 10:14:01.000000000 -0500
+*** mutt-1.5.24-orig/mailbox.h	2015-08-30 12:06:38.000000000 -0500
+--- mutt-1.5.24/mailbox.h	2015-09-16 23:18:13.000000000 -0500
 ***************
 *** 27,32 ****
 --- 27,33 ----
@@ -930,9 +940,9 @@
 + #define M_PEEK		(1<<5) /* revert atime back after taking a look (if applicable) */
   
   /* mx_open_new_message() */
-  #define M_ADD_FROM	1	/* add a From_ line */
-*** mutt-1.5.23-orig/main.c	2014-03-12 11:06:17.000000000 -0500
---- mutt-1.5.23/main.c	2014-04-11 10:14:01.000000000 -0500
+  #define M_ADD_FROM	(1<<0)	/* add a From_ line */
+*** mutt-1.5.24-orig/main.c	2015-08-30 12:06:38.000000000 -0500
+--- mutt-1.5.24/main.c	2015-09-16 23:18:13.000000000 -0500
 ***************
 *** 50,55 ****
 --- 50,56 ----
@@ -961,8 +971,8 @@
     char *includeFile = NULL;
     char *draftFile = NULL;
 ***************
-*** 1025,1030 ****
---- 1026,1038 ----
+*** 1036,1041 ****
+--- 1037,1049 ----
         strfcpy (folder, NONULL(Spoolfile), sizeof (folder));
       mutt_expand_path (folder, sizeof (folder));
   
@@ -977,8 +987,8 @@
       mutt_str_replace (&LastFolder, folder);
   
 ***************
-*** 1047,1052 ****
---- 1055,1061 ----
+*** 1058,1063 ****
+--- 1066,1072 ----
       if((Context = mx_open_mailbox (folder, ((flags & M_RO) || option (OPTREADONLY)) ? M_READONLY : 0, NULL))
          || !explicit_folder)
       {
@@ -986,11 +996,11 @@
         mutt_index_menu ();
         if (Context)
   	FREE (&Context);
-*** mutt-1.5.23-orig/Makefile.am	2014-03-12 11:03:44.000000000 -0500
---- mutt-1.5.23/Makefile.am	2014-04-11 10:14:01.000000000 -0500
+*** mutt-1.5.24-orig/Makefile.am	2015-08-30 12:06:38.000000000 -0500
+--- mutt-1.5.24/Makefile.am	2015-09-16 23:18:13.000000000 -0500
 ***************
-*** 32,37 ****
---- 32,38 ----
+*** 33,38 ****
+--- 33,39 ----
   	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 \
@@ -998,63 +1008,75 @@
   	muttlib.c editmsg.c mbyte.c \
   	url.c ascii.c crypt-mod.c crypt-mod.h safe_asprintf.c
   
-*** mutt-1.5.23-orig/Makefile.in	2014-03-12 11:26:44.000000000 -0500
---- mutt-1.5.23/Makefile.in	2014-04-12 12:12:38.000000000 -0500
-***************
-*** 129,135 ****
+*** mutt-1.5.24-orig/Makefile.in	2015-08-30 12:24:26.000000000 -0500
+--- mutt-1.5.24/Makefile.in	2015-09-16 23:18:13.000000000 -0500
+***************
+*** 83,92 ****
+  	$(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
+  EXTRA_PROGRAMS = mutt_dotlock$(EXEEXT) pgpring$(EXEEXT) \
+  	pgpewrap$(EXEEXT) mutt_md5$(EXEEXT)
+  bin_PROGRAMS = mutt$(EXEEXT) $(DOTLOCK_TARGET) $(PGPAUX_TARGET)
+--- 83,92 ----
+  	$(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 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)
+***************
+*** 128,136 ****
+  	score.$(OBJEXT) send.$(OBJEXT) sendlib.$(OBJEXT) \
+  	signal.$(OBJEXT) sort.$(OBJEXT) status.$(OBJEXT) \
   	system.$(OBJEXT) thread.$(OBJEXT) charset.$(OBJEXT) \
-  	history.$(OBJEXT) lib.$(OBJEXT) muttlib.$(OBJEXT) \
-  	editmsg.$(OBJEXT) mbyte.$(OBJEXT) url.$(OBJEXT) \
+! 	history.$(OBJEXT) lib.$(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)
---- 129,136 ----
+--- 128,137 ----
+  	score.$(OBJEXT) send.$(OBJEXT) sendlib.$(OBJEXT) \
+  	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) \
-! 	sidebar.$(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)
 ***************
-*** 468,474 ****
+*** 474,479 ****
+--- 475,481 ----
+  	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 \
-! 	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
   
-  nodist_mutt_SOURCES = $(BUILT_SOURCES)
-  mutt_LDADD = @MUTT_LIB_OBJECTS@ @LIBOBJS@ $(LIBIMAP) $(MUTTLIBS) \
---- 469,476 ----
-  	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 \
-! 	sidebar.c
-  
-  nodist_mutt_SOURCES = $(BUILT_SOURCES)
-  mutt_LDADD = @MUTT_LIB_OBJECTS@ @LIBOBJS@ $(LIBIMAP) $(MUTTLIBS) \
-***************
-*** 500,506 ****
-  	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 \
-  	txt2c.c txt2c.sh version.sh check_sec.sh
-  
-  EXTRA_SCRIPTS = smime_keys
---- 502,508 ----
-  	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 sidebar.h hcachever.sh.in \
-  	txt2c.c txt2c.sh version.sh check_sec.sh
-  
-  EXTRA_SCRIPTS = smime_keys
-*** mutt-1.5.23-orig/mbox.c	2014-03-12 11:03:45.000000000 -0500
---- mutt-1.5.23/mbox.c	2014-04-11 10:14:01.000000000 -0500
+***************
+*** 804,809 ****
+--- 806,812 ----
+  @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@
++ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sidebar.Po@am__quote@
+  @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@
+*** mutt-1.5.24-orig/mbox.c	2015-08-30 12:06:38.000000000 -0500
+--- mutt-1.5.24/mbox.c	2015-09-16 23:18:13.000000000 -0500
 ***************
 *** 100,105 ****
 --- 100,106 ----
@@ -1075,8 +1097,8 @@
   
   #ifdef NFS_ATTRIBUTE_HACK
     if (sb.st_mtime > sb.st_atime)
-*** mutt-1.5.23-orig/menu.c	2014-03-12 11:03:45.000000000 -0500
---- mutt-1.5.23/menu.c	2014-04-12 21:31:16.000000000 -0500
+*** mutt-1.5.24-orig/menu.c	2015-08-30 12:06:38.000000000 -0500
+--- mutt-1.5.24/menu.c	2015-09-16 23:18:13.000000000 -0500
 ***************
 *** 24,29 ****
 --- 24,30 ----
@@ -1245,8 +1267,8 @@
       else if (option (OPTBRAILLEFRIENDLY))
         move (menu->current - menu->top + menu->offset, 0);
       else
-*** mutt-1.5.23-orig/mh.c	2014-03-12 11:03:45.000000000 -0500
---- mutt-1.5.23/mh.c	2014-04-11 11:04:59.000000000 -0500
+*** mutt-1.5.24-orig/mh.c	2015-08-30 12:06:38.000000000 -0500
+--- mutt-1.5.24/mh.c	2015-09-16 23:18:13.000000000 -0500
 ***************
 *** 295,300 ****
 --- 295,326 ----
@@ -1282,8 +1304,8 @@
   static int mh_mkstemp (CONTEXT * dest, FILE ** fp, char **tgt)
   {
     int fd;
-*** mutt-1.5.23-orig/mutt_curses.h	2014-03-12 11:03:45.000000000 -0500
---- mutt-1.5.23/mutt_curses.h	2014-04-11 10:14:01.000000000 -0500
+*** mutt-1.5.24-orig/mutt_curses.h	2015-08-30 12:06:38.000000000 -0500
+--- mutt-1.5.24/mutt_curses.h	2015-09-16 23:18:13.000000000 -0500
 ***************
 *** 64,69 ****
 --- 64,70 ----
@@ -1295,18 +1317,18 @@
   #define CENTERLINE(x,y) move(y, (COLS-strlen(x))/2), addstr(x)
   #define BEEP() do { if (option (OPTBEEP)) beep(); } while (0)
 ***************
-*** 120,125 ****
---- 121,128 ----
-    MT_COLOR_BOLD,
+*** 121,126 ****
+--- 122,129 ----
     MT_COLOR_UNDERLINE,
     MT_COLOR_INDEX,
+    MT_COLOR_PROMPT,
 +   MT_COLOR_NEW,
 +   MT_COLOR_FLAGGED,
     MT_COLOR_MAX
   };
   
-*** mutt-1.5.23-orig/mutt_menu.h	2014-03-12 11:06:17.000000000 -0500
---- mutt-1.5.23/mutt_menu.h	2014-04-11 10:14:01.000000000 -0500
+*** mutt-1.5.24-orig/mutt_menu.h	2015-08-30 12:06:38.000000000 -0500
+--- mutt-1.5.24/mutt_menu.h	2015-09-16 23:18:13.000000000 -0500
 ***************
 *** 34,39 ****
 --- 34,40 ----
@@ -1317,11 +1339,11 @@
   
   #define M_MODEFMT "-- Mutt: %s"
   
-*** mutt-1.5.23-orig/mutt.h	2014-03-12 11:06:17.000000000 -0500
---- mutt-1.5.23/mutt.h	2014-04-11 10:14:01.000000000 -0500
+*** mutt-1.5.24-orig/mutt.h	2015-08-30 12:06:38.000000000 -0500
+--- mutt-1.5.24/mutt.h	2015-09-16 23:18:13.000000000 -0500
 ***************
-*** 421,426 ****
---- 421,430 ----
+*** 423,428 ****
+--- 423,432 ----
     OPTSAVEEMPTY,
     OPTSAVENAME,
     OPTSCORE,
@@ -1333,8 +1355,8 @@
     OPTSIGONTOP,
     OPTSORTRE,
 ***************
-*** 861,866 ****
---- 865,871 ----
+*** 866,871 ****
+--- 870,876 ----
   {
     char *path;
     FILE *fp;
@@ -1343,8 +1365,8 @@
     off_t size;
     off_t vsize;
 ***************
-*** 895,900 ****
---- 900,906 ----
+*** 900,905 ****
+--- 905,911 ----
     unsigned int quiet : 1;	/* inhibit status messages? */
     unsigned int collapsed : 1;   /* are all threads collapsed? */
     unsigned int closing : 1;	/* mailbox is being closed */
@@ -1352,11 +1374,11 @@
   
     /* driver hooks */
     void *data;			/* driver specific data */
-*** mutt-1.5.23-orig/muttlib.c	2014-03-12 11:03:45.000000000 -0500
---- mutt-1.5.23/muttlib.c	2014-04-11 10:14:01.000000000 -0500
+*** mutt-1.5.24-orig/muttlib.c	2015-08-30 12:06:38.000000000 -0500
+--- mutt-1.5.24/muttlib.c	2015-09-16 23:18:13.000000000 -0500
 ***************
-*** 1281,1286 ****
---- 1281,1288 ----
+*** 1276,1281 ****
+--- 1276,1283 ----
   	  pl = pw = 1;
   
   	/* see if there's room to add content, else ignore */
@@ -1366,8 +1388,8 @@
   	{
   	  int pad;
 ***************
-*** 1324,1329 ****
---- 1326,1377 ----
+*** 1319,1324 ****
+--- 1321,1372 ----
   	  col += wid;
   	  src += pl;
   	}
@@ -1420,8 +1442,8 @@
   	break; /* skip rest of input */
         }
         else if (ch == '|')
-*** mutt-1.5.23-orig/mx.c	2014-03-12 11:03:45.000000000 -0500
---- mutt-1.5.23/mx.c	2014-04-11 10:14:01.000000000 -0500
+*** mutt-1.5.24-orig/mx.c	2015-08-30 12:06:38.000000000 -0500
+--- mutt-1.5.24/mx.c	2015-09-16 23:18:13.000000000 -0500
 ***************
 *** 580,585 ****
 --- 580,586 ----
@@ -1509,8 +1531,8 @@
     }
   
     if (read_msgs && quadoption (OPT_MOVE) != M_NO)
-*** mutt-1.5.23-orig/mx.h	2014-03-12 11:03:45.000000000 -0500
---- mutt-1.5.23/mx.h	2014-04-11 11:11:47.000000000 -0500
+*** mutt-1.5.24-orig/mx.h	2015-08-30 12:06:38.000000000 -0500
+--- mutt-1.5.24/mx.h	2015-09-16 23:18:13.000000000 -0500
 ***************
 *** 57,62 ****
 --- 57,63 ----
@@ -1521,8 +1543,8 @@
   int mh_check_empty (const char *);
   
   int maildir_read_dir (CONTEXT *);
-*** mutt-1.5.23-orig/OPS	2014-03-12 11:03:44.000000000 -0500
---- mutt-1.5.23/OPS	2014-04-11 10:14:01.000000000 -0500
+*** mutt-1.5.24-orig/OPS	2015-08-30 12:06:38.000000000 -0500
+--- mutt-1.5.24/OPS	2015-09-16 23:18:13.000000000 -0500
 ***************
 *** 179,181 ****
 --- 179,186 ----
@@ -1534,8 +1556,8 @@
 + OP_SIDEBAR_NEXT "go down to next mailbox"
 + OP_SIDEBAR_PREV "go to previous mailbox"
 + OP_SIDEBAR_OPEN "open hilighted mailbox"
-*** mutt-1.5.23-orig/pager.c	2014-03-12 11:06:17.000000000 -0500
---- mutt-1.5.23/pager.c	2014-04-12 21:53:15.000000000 -0500
+*** mutt-1.5.24-orig/pager.c	2015-08-30 12:06:38.000000000 -0500
+--- mutt-1.5.24/pager.c	2015-09-16 23:18:13.000000000 -0500
 ***************
 *** 29,34 ****
 --- 29,35 ----
@@ -1632,8 +1654,8 @@
 ! 	mutt_paddstr (COLS, bn);
         }
         NORMAL_COLOR;
-      }
-  
+        if (option(OPTTSENABLED) && TSSupported)
+        {
 --- 1793,1831 ----
         hfi.ctx = Context;
         hfi.pager_progress = pager_progress_str;
@@ -1672,10 +1694,10 @@
 +       if(!option(OPTSTATUSONTOP) || PagerIndexLines == 0)
 +           DrawFullLine = 0; /* reset */
         NORMAL_COLOR;
-      }
-  
+        if (option(OPTTSENABLED) && TSSupported)
+        {
 ***************
-*** 1819,1834 ****
+*** 1826,1841 ****
         /* redraw the pager_index indicator, because the
          * flags for this message might have changed. */
         menu_redraw_current (index);
@@ -1692,7 +1714,7 @@
       redraw = 0;
   
       if (option(OPTBRAILLEFRIENDLY)) {
---- 1834,1855 ----
+--- 1841,1862 ----
         /* redraw the pager_index indicator, because the
          * flags for this message might have changed. */
         menu_redraw_current (index);
@@ -1716,8 +1738,8 @@
   
       if (option(OPTBRAILLEFRIENDLY)) {
 ***************
-*** 2763,2768 ****
---- 2784,2796 ----
+*** 2770,2775 ****
+--- 2791,2803 ----
   	mutt_what_key ();
   	break;
   
@@ -1731,8 +1753,8 @@
         default:
   	ch = -1;
   	break;
-*** mutt-1.5.23-orig/pattern.c	2014-03-12 11:03:45.000000000 -0500
---- mutt-1.5.23/pattern.c	2014-04-11 10:14:01.000000000 -0500
+*** mutt-1.5.24-orig/pattern.c	2015-08-30 12:06:38.000000000 -0500
+--- mutt-1.5.24/pattern.c	2015-09-16 23:18:13.000000000 -0500
 ***************
 *** 154,159 ****
 --- 154,163 ----
@@ -1829,14 +1851,14 @@
       }
     }
   
-*** mutt-1.5.23-orig/PATCHES	2014-03-12 11:03:44.000000000 -0500
---- mutt-1.5.23/PATCHES	2014-04-12 12:36:35.000000000 -0500
+*** mutt-1.5.24-orig/PATCHES	2015-08-30 12:06:38.000000000 -0500
+--- mutt-1.5.24/PATCHES	2015-11-11 09:39:02.000000000 -0600
 ***************
 *** 0 ****
 --- 1 ----
-+ patch-1.5.23.sidebar.20140412.txt
-*** mutt-1.5.23-orig/protos.h	2014-03-12 11:06:17.000000000 -0500
---- mutt-1.5.23/protos.h	2014-04-11 10:14:01.000000000 -0500
++ patch-1.5.24.sidebar.20151111.txt
+*** mutt-1.5.24-orig/protos.h	2015-08-30 12:06:38.000000000 -0500
+--- mutt-1.5.24/protos.h	2015-09-16 23:18:13.000000000 -0500
 ***************
 *** 36,41 ****
 --- 36,48 ----
@@ -1853,11 +1875,11 @@
   void mutt_make_string_info (char *, size_t, const char *, struct hdr_format_info *, format_flag);
   
   int mutt_extract_token (BUFFER *, BUFFER *, int);
-*** mutt-1.5.23-orig/sidebar.c	1969-12-31 18:00:00.000000000 -0600
---- mutt-1.5.23/sidebar.c	2014-04-11 10:14:01.000000000 -0500
+*** mutt-1.5.24-orig/sidebar.c	1969-12-31 18:00:00.000000000 -0600
+--- mutt-1.5.24/sidebar.c	2015-11-11 09:38:45.000000000 -0600
 ***************
 *** 0 ****
---- 1,405 ----
+--- 1,410 ----
 + /*
 +  * Copyright (C) ????-2004 Justin Hibbits <jrh29@po.cwru.edu>
 +  * Copyright (C) 2004 Thomer M. Gil <mutt@thomer.com>
@@ -1975,8 +1997,12 @@
 + 		break;
 + 
 + 	case 'S':
-+ 		snprintf (fmt, sizeof (fmt), "%%%sd", prefix);
-+ 		snprintf (dest, destlen, fmt, sbe->size);
++                 if(!optional) {
++ 		    snprintf (fmt, sizeof (fmt), "%%%sd", prefix);
++ 		    snprintf (dest, destlen, fmt, sbe->size);
++                 } else if (sbe->size == 0) {
++                     optional = 0;
++                 }
 + 		break;
 + 
 + 	case 'N':
@@ -2156,8 +2182,9 @@
 + 			SETCOLOR(MT_COLOR_NORMAL);
 + 
 + 		move( lines, 0 );
-+ 		if ( Context && (!strcmp(tmp->path, Context->path)||
-+ 				 !strcmp(tmp->realpath, Context->path)) ) {
++ 		if ( Context && Context->path &&
++                         (!strcmp(tmp->path, Context->path)||
++ 			 !strcmp(tmp->realpath, Context->path)) ) {
 + 			tmp->msg_unread = Context->unread;
 + 			tmp->msgcount = Context->msgcount;
 + 			tmp->msg_flagged = Context->flagged;
@@ -2170,7 +2197,7 @@
 + 		/* 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) + ((Maildir[strlen(Maildir) - 1] == '/' || Maildir[strlen(Maildir) - 1] == '}') ? 0 : 1));
++ 		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;
@@ -2263,8 +2290,8 @@
 + 	draw_sidebar(menu);
 + }
 + 
-*** mutt-1.5.23-orig/sidebar.h	1969-12-31 18:00:00.000000000 -0600
---- mutt-1.5.23/sidebar.h	2014-04-11 10:14:01.000000000 -0500
+*** mutt-1.5.24-orig/sidebar.h	1969-12-31 18:00:00.000000000 -0600
+--- mutt-1.5.24/sidebar.h	2015-09-16 23:18:13.000000000 -0500
 ***************
 *** 0 ****
 --- 1,36 ----
@@ -2304,8 +2331,8 @@
 + void set_buffystats(CONTEXT*);
 + 
 + #endif /* SIDEBAR_H */
-*** mutt-1.5.23-orig/doc/Muttrc	2014-03-12 11:27:11.000000000 -0500
---- mutt-1.5.23/doc/Muttrc	2014-04-11 10:14:01.000000000 -0500
+*** mutt-1.5.24-orig/doc/Muttrc	2015-08-30 12:24:53.000000000 -0500
+--- mutt-1.5.24/doc/Muttrc	2015-09-16 23:18:13.000000000 -0500
 ***************
 *** 657,662 ****
 --- 657,682 ----
@@ -2335,10 +2362,10 @@
   # set crypt_autosign=no
   #
   # Name: crypt_autosign
-*** mutt-1.5.23-orig/imap/imap.c	2014-03-12 11:03:45.000000000 -0500
---- mutt-1.5.23/imap/imap.c	2014-04-11 10:14:01.000000000 -0500
+*** mutt-1.5.24-orig/imap/imap.c	2015-08-30 12:06:38.000000000 -0500
+--- mutt-1.5.24/imap/imap.c	2015-09-16 23:18:13.000000000 -0500
 ***************
-*** 1514,1520 ****
+*** 1523,1529 ****
   
       imap_munge_mbox_name (munged, sizeof (munged), name);
       snprintf (command, sizeof (command),
@@ -2346,7 +2373,7 @@
   
       if (imap_exec (idata, command, IMAP_CMD_QUEUE) < 0)
       {
---- 1514,1520 ----
+--- 1523,1529 ----
   
       imap_munge_mbox_name (munged, sizeof (munged), name);
       snprintf (command, sizeof (command),
@@ -2354,8 +2381,8 @@
   
       if (imap_exec (idata, command, IMAP_CMD_QUEUE) < 0)
       {
-*** mutt-1.5.23-orig/imap/command.c	2014-03-12 11:03:45.000000000 -0500
---- mutt-1.5.23/imap/command.c	2014-04-11 10:14:01.000000000 -0500
+*** mutt-1.5.24-orig/imap/command.c	2015-08-30 12:06:38.000000000 -0500
+--- mutt-1.5.24/imap/command.c	2015-09-16 23:18:13.000000000 -0500
 ***************
 *** 1012,1017 ****
 --- 1012,1024 ----
diff --git a/mutt-smime.rc.patch b/mutt-smime.rc.patch
index d4e111b..1bef8a9 100644
--- a/mutt-smime.rc.patch
+++ b/mutt-smime.rc.patch
@@ -7,7 +7,7 @@
 -set smime_is_default
 +# set smime_is_default
  
- # Uncoment this if you don't want to set labels for certificates you add.
+ # Uncomment this if you don't want to set labels for certificates you add.
  # unset smime_ask_cert_label
 @@ -13,30 +13,31 @@
  set smime_timeout=300
@@ -30,7 +30,7 @@
 -set smime_default_key="12345678.0"
 +# set smime_default_key="12345678.0"
  
- # Uncommen to make mutt ask what key to use when trying to decrypt a message.
+ # Uncomment to make mutt ask what key to use when trying to decrypt a message.
  # It will use the default key above (if that was set) else.
  # unset smime_decrypt_use_default_key
  
diff --git a/mutt.spec b/mutt.spec
index 9c19cf0..4312a58 100644
--- a/mutt.spec
+++ b/mutt.spec
@@ -28,20 +28,18 @@ Summary(ru.UTF-8):	Почтовая клиентская программа Mutt
 Summary(tr.UTF-8):	Mutt elektronik posta programı
 Summary(uk.UTF-8):	Поштова клієнтська програма Mutt
 Name:		mutt
-Version:	1.5.23
-Release:	3
+Version:	1.5.24
+Release:	1
 Epoch:		6
 License:	GPL v2+
 Group:		Applications/Mail
 # temporarily dead? (Jun 2014)
-#Source0:	ftp://ftp.mutt.org/mutt/devel/%{name}-%{version}.tar.gz
-Source0:	http://downloads.sourceforge.net/mutt/%{name}-%{version}.tar.gz
-# Source0-md5:	11f5b6a3eeba1afa1257fe93c9f26bff
+Source0:	ftp://ftp.mutt.org/pub/mutt/%{name}-%{version}.tar.gz
+# Source0-md5:	7f25d27f3c7c82285ac07aac35f5f0f2
 Source1:	%{name}.desktop
 Source2:	%{name}.png
 Source3:	%{name}.1.pl
 Patch0:		%{name}-pl.po-update.patch
-Patch1:		%{name}-forcedotlock.patch
 # http://mutt.org.ua/download/
 Patch2:		%{name}-rr.compressed.patch
 Patch3:		%{name}-bj.status-time.patch
@@ -155,7 +153,6 @@ Mutt - це невеликий, але потужний повноекранни
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
-- 
2.43.0