-# compressed folders need an autotools rerun
-features/compressed-folders -p0
-features/compressed-folders.ranty-fix
-features/compressed-folders.debian
-
# build system patches
-misc/autotools-update.diff
-debian-specific/Md.sasl2_needs_md5.diff -p0
-debian-specific/dont_rebuild_po_files.diff -p0
-debian-specific/build_doc_adjustments.diff -p0
-misc/doc-fix-reldate.h-location
+misc/am-maintainer-mode
+misc/hg.pmdef.debugtime
+debian-specific/build_doc_adjustments.diff
+debian-specific/sort-patchlist
# features
features/ifdef
-features/maildir-mtime
features/xtitles
features/trash-folder
features/purge-message
+features/sensible_browser_position
features-old/patch-1.5.4.vk.pgp_verbose_mime
+features/compressed-folders
+features/compressed-folders.debian
# Debian config
-debian-specific/Md.Muttrc.diff -p0
-debian-specific/Md.etc_mailname_gethostbyname.diff -p0
-debian-specific/use_usr_bin_editor.diff -p0
-debian-specific/correct_docdir_in_man_page.diff -p0
-debian-specific/dont_document_not_present_features.diff -p0
-misc/define-pgp_getkeys_command.diff -p0
+debian-specific/Muttrc
+debian-specific/Md.etc_mailname_gethostbyname.diff
+debian-specific/use_usr_bin_editor.diff
+debian-specific/correct_docdir_in_man_page.diff
+debian-specific/dont_document_not_present_features.diff
+debian-specific/document_debian_defaults
+debian-specific/assumed_charset-compat
+misc/define-pgp_getkeys_command.diff
misc/gpg.rc-paths
+misc/smime.rc
+
+# patches integrated from upstream mercurial
+# drop them with a new upstream release
+upstream/533209-mutt_perror.patch
+upstream/533459-unmailboxes.patch
+upstream/533439-mbox-time.patch
+upstream/531430-imapuser.patch
+upstream/534543-imap-port.patch
+
+# the following two patches are also in upstream hg repo
+# plese drop them if there is a new release
+misc/hyphen-as-minus.patch
+#misc/manpage-typos.patch
+misc/smime_keys-manpage.patch
+
+mutt.org
+# extra patches for mutt-patched
+mutt-patched/sidebar
+mutt-patched/sidebar-dotted
+mutt-patched/sidebar-sorted
+
+# not applying cleanly at the moment
+#mutt-patched/nntp
# unapplied patches for custom packages
-# not-applied/patch-1.5.8.hr.sensible_browser_position.3
# not-applied/chdir
# not-applied/indexcolor
# not-applied/w3mface