diff --git a/mail/mutt/Makefile.inc b/mail/mutt/Makefile.inc
index aa408f7ee89..4aa07c7dbe9 100644
--- a/mail/mutt/Makefile.inc
+++ b/mail/mutt/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.40 2013/03/11 12:17:36 sthen Exp $
+# $OpenBSD: Makefile.inc,v 1.41 2013/03/14 10:14:10 sthen Exp $
 
 CATEGORIES=	mail
 
@@ -39,6 +39,7 @@ CONFIGURE_ARGS+=--enable-external_dotlock \
 		--with-gss \
 		--with-ssl
 FAKE_FLAGS=	sysconfdir="${PREFIX}/share/examples/mutt"
+PATCH_DIST_STRIP= -p1
 
 .if defined(DEBUG)
 CONFIGURE_ARGS+=--enable-debug
@@ -61,7 +62,6 @@ WANTLIB+=		ncurses
 DIST_COMPRESSED?=	patch-${VERSION}.rr.compressed.1.gz:0
 .if ${FLAVOR:Mcompressed}
 PATCHFILES+=		${DIST_COMPRESSED}
-PATCH_DIST_STRIP=	-p1
 CONFIGURE_ARGS+=	--enable-compressed
 .else
 SUPDISTFILES+=		${DIST_COMPRESSED}
diff --git a/mail/mutt/snapshot/Makefile b/mail/mutt/snapshot/Makefile
index 8d877d82f6e..dce1f51a943 100644
--- a/mail/mutt/snapshot/Makefile
+++ b/mail/mutt/snapshot/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.72 2013/02/09 14:49:51 sthen Exp $
+# $OpenBSD: Makefile,v 1.73 2013/03/14 10:14:10 sthen Exp $
 
 COMMENT=	tty-based e-mail client, development version
 
 DISTNAME=	mutt-1.5.21
 EPOCH=		0
-REVISION=	0
+REVISION=	1
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=mutt/} \
 		${MASTER_SITES_MUTT:=devel/}
 
@@ -32,9 +32,10 @@ MUTTRCDIR=	doc/
 DIST_COMPRESSED=compressed-5302767aa6aa.gz:2
 DIST_SIDEBAR=	sidebar-5302767aa6aa.gz:2
 
+PATCHFILES+=	trashfolder-5302767aa6aa.gz:2
+
 .if ${FLAVOR:Msidebar}
 PATCHFILES+=		${DIST_SIDEBAR}
-PATCH_DIST_STRIP=	-p1
 .else
 SUPDISTFILES+=		${DIST_SIDEBAR}
 .endif
diff --git a/mail/mutt/snapshot/distinfo b/mail/mutt/snapshot/distinfo
index 3fcd5f3a246..88ce1e2efbf 100644
--- a/mail/mutt/snapshot/distinfo
+++ b/mail/mutt/snapshot/distinfo
@@ -1,15 +1,8 @@
-MD5 (mutt/compressed-5302767aa6aa.gz) = 2Z9fL+jDFfd0SBxUO5vCFQ==
-MD5 (mutt/mutt-1.5.21.tar.gz) = op248dUeLxDAcL+I6KVT/Q==
-MD5 (mutt/sidebar-5302767aa6aa.gz) = f5h+PEGkJ4ATX3T2V5xFfw==
-RMD160 (mutt/compressed-5302767aa6aa.gz) = idHgV+jNI+DfOsviOinP9eefjBw=
-RMD160 (mutt/mutt-1.5.21.tar.gz) = sjWkKXKuQQWSJTzcEXqQuvJ59Ho=
-RMD160 (mutt/sidebar-5302767aa6aa.gz) = xP2BhsvKPa0w3iU7ZzucRcuavyY=
-SHA1 (mutt/compressed-5302767aa6aa.gz) = 4cbAMQZX23U3Whon6LNDouxHy9U=
-SHA1 (mutt/mutt-1.5.21.tar.gz) = qEdfJhjOXV0zv/hcCv/fIasddrk=
-SHA1 (mutt/sidebar-5302767aa6aa.gz) = P4fajiCSE6I/Io9IrFVL7uFa3Ao=
 SHA256 (mutt/compressed-5302767aa6aa.gz) = wip+TwZMzA3Gu1WF5ZBR96hKvz6qfd5JalqB9bn/uB0=
 SHA256 (mutt/mutt-1.5.21.tar.gz) = IUHzbo0PT3HJymeAAB58xnn+MT5kOVP8B/ABIj5nxKA=
 SHA256 (mutt/sidebar-5302767aa6aa.gz) = TJdd4RHwJfmiM5hHKGKNmLEGCvpIVIvNBumPXN1Juh8=
+SHA256 (mutt/trashfolder-5302767aa6aa.gz) = Axw0VlOhhfUcvzg66Hj21wCJzwGllJrePo+S5flXtBg=
 SIZE (mutt/compressed-5302767aa6aa.gz) = 6315
 SIZE (mutt/mutt-1.5.21.tar.gz) = 3716886
 SIZE (mutt/sidebar-5302767aa6aa.gz) = 11762
+SIZE (mutt/trashfolder-5302767aa6aa.gz) = 2793
diff --git a/mail/mutt/snapshot/patches/patch-muttlib_c b/mail/mutt/snapshot/patches/patch-muttlib_c
index 01b2f16874a..faa878a3168 100644
--- a/mail/mutt/snapshot/patches/patch-muttlib_c
+++ b/mail/mutt/snapshot/patches/patch-muttlib_c
@@ -1,11 +1,11 @@
-$OpenBSD: patch-muttlib_c,v 1.3 2010/10/02 01:22:12 sthen Exp $
+$OpenBSD: patch-muttlib_c,v 1.4 2013/03/14 10:14:10 sthen Exp $
 
 fix segfault when $message_cachedir is set and opening a POP3 mailbox.
 upstream 1a4c43138685, fixes bug#3457
 
---- muttlib.c.orig	Sat Oct  2 01:51:47 2010
-+++ muttlib.c	Sat Oct  2 01:52:34 2010
-@@ -1960,6 +1960,7 @@ void mutt_encode_path (char *dest, size_t dlen, const 
+--- muttlib.c.orig	Wed Mar 13 16:22:39 2013
++++ muttlib.c	Wed Mar 13 16:22:40 2013
+@@ -1962,6 +1962,7 @@ void mutt_encode_path (char *dest, size_t dlen, const 
  {
    char *p = safe_strdup (src);
    int rc = mutt_convert_string (&p, Charset, "utf-8", 0);
diff --git a/mail/mutt/stable/distinfo b/mail/mutt/stable/distinfo
index f4d8d293868..2e547fcf6da 100644
--- a/mail/mutt/stable/distinfo
+++ b/mail/mutt/stable/distinfo
@@ -1,9 +1,3 @@
-MD5 (mutt/mutt-1.4.2.3.tar.gz) = 3LlGYYJ90JD6gT5z4SLqDA==
-MD5 (mutt/patch-1.4.2.3.rr.compressed.1.gz) = 5oGEW+UVoC9GB9tm177ZGQ==
-RMD160 (mutt/mutt-1.4.2.3.tar.gz) = WeZsMIzUln5YetHcc912x/DQbvE=
-RMD160 (mutt/patch-1.4.2.3.rr.compressed.1.gz) = jNJD5iMjfOuSzaUBeqaccviYZEU=
-SHA1 (mutt/mutt-1.4.2.3.tar.gz) = sj5Ghz8CR+haRBfPM41k6mmMmyw=
-SHA1 (mutt/patch-1.4.2.3.rr.compressed.1.gz) = mvc6oKN/H5LM8B1TepshZH9jbwQ=
 SHA256 (mutt/mutt-1.4.2.3.tar.gz) = Gkkg5e/M1qg5Mq9CI8tWiVYVj2Lp9ZV5isxABKymrOU=
 SHA256 (mutt/patch-1.4.2.3.rr.compressed.1.gz) = YnUw8z8J5xqlCHxqQIQ4ommT74hGrAhBn29tFj2egic=
 SIZE (mutt/mutt-1.4.2.3.tar.gz) = 2646433