-diff -dur -x '*~' -x '*.orig' mutt-1.5.10.orig/PATCHES mutt-1.5.10/PATCHES
---- mutt-1.5.10.orig/PATCHES 2005-10-07 09:29:54.000000000 +0200
-+++ mutt-1.5.10/PATCHES 2005-10-07 09:30:06.000000000 +0200
-@@ -1,2 +1,3 @@
- vvv.quote
-+patch-1.3.27.cd.trash_folder.1
- rr.compressed
-diff -dur -x '*~' -x '*.orig' mutt-1.5.10.orig/commands.c mutt-1.5.10/commands.c
---- mutt-1.5.10.orig/commands.c 2005-08-02 09:08:00.000000000 +0200
-+++ mutt-1.5.10/commands.c 2005-10-07 09:32:06.000000000 +0200
-@@ -690,6 +690,7 @@
+# vim:ft=diff:
+This is the trash folder patch by Cedric Duval <cedricduval@free.fr>.
+
+With this patch, if the trash variable is set to a path (unset by default), the
+deleted mails will be moved to a trash folder instead of being irremediably
+purged when syncing the mailbox.
+
+For instance, set trash="~/Mail/trash" will cause every deleted mail to go to
+this folder.
+
+Note that the append to the trash folder doesn't occur until the resync is
+done. This allows you to change your mind and undo deletes, and thus the moves
+to the trash folder are unnecessary.
+
+Notes
+
+ * You might also want to have a look at the purge message feature below
+ which is related to this patch.
+ * IMAP is now supported. To retain the previous behavior, add this to your
+ muttrc:
+ folder-hook ^imap:// 'unset trash'
+
+FAQ
+
+Every once in a while, someone asks what are the advantages of this patch over
+a macro based solution. Here's an attempt to answer this question:
+
+ * The folder history doesn't clutter up with unwanted trash entries.
+ * Delayed move to the trash allows to change one's mind.
+ * No need to treat the case of "normal folders" and trash folders
+ separately with folder-hooks, and to create two sets of macros (one for
+ the index, one for the pager).
+ * Works not only with delete-message, but also with every deletion
+ functions like delete-pattern, delete-thread or delete-subthread.
+
+To sum up, it's more integrated and transparent to the user.
+
+* Patch last synced with upstream:
+ - Date: 2007-02-15
+ - File: http://cedricduval.free.fr/mutt/patches/download/patch-1.5.5.1.cd.trash_folder.3.4
+
+* Changes made:
+ - Updated to 1.5.13:
+ - structure of _mutt_save_message changed (commands.c)
+ - context of option (OPTCONFIRMAPPEND) changed (muttlib.c)
+ - Fixed indentation of "appended" in mutt.h.
+
+== END PATCH
+--- a/commands.c
++++ b/commands.c
+@@ -717,6 +717,7 @@