diff -ru  /usr/ports/mail/mutt-devel/Makefile ./Makefile
--- /usr/ports/mail/mutt-devel/Makefile	Tue Jul 18 18:05:06 2006
+++ ./Makefile	Sat Jul 22 08:13:19 2006
@@ -123,7 +123,7 @@
 		ftp://ftp3.mutt.org.ua/pub/mutt/mutt-${VVV_PATCH_VERSION}/:vvv \
 		http://www.spinnaker.de/mutt/compressed/:rr \
 		http://cedricduval.free.fr/mutt/patches/download/:cd \
-		http://thomer.com/mutt/:thomer
+		http://lunar-linux.org/~tchan/mutt/:tchan
 DISTNAME=	mutt-${PORTVERSION}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
@@ -194,7 +194,6 @@
 WITH_MUTT_IMAP_HEADER_CACHE=	yes
 .endif
 .if defined(WITH_MUTT_SIDEBAR_PATCH)
-IGNORE=	cannot install: the WITH_MUTT_SIDEBAR_PATCH does not work at the moment
 .if defined(WITH_MUTT_NNTP)
 IGNORE=	cannot install: the WITH_MUTT_SIDEBAR_PATCH and WITH_MUTT_NNTP are not compatible
 .endif
@@ -420,8 +419,8 @@
 PATCHFILES+=	p0-patch-${DW_MBOX_PATCH_VERSION}.dw.mbox-hook.1:dw
 .endif
 .if defined(WITH_MUTT_SIDEBAR_PATCH)
-SIDEBAR_PATCH=	patch-1.5.11.sidebar.20060225.txt
-DISTFILES+=	${SIDEBAR_PATCH}:thomer
+SIDEBAR_PATCH=	patch-1.5.12.sidebar.20060720.txt
+DISTFILES+=	${SIDEBAR_PATCH}:tchan
 XML_NEEDED=	yes
 pre-patch::
 	@${GUNZIP_CMD} -c ${DISTDIR}/${DIST_SUBDIR}/${SIDEBAR_PATCH} > ${WRKDIR}/patch-sidebar
diff -ru  /usr/ports/mail/mutt-devel/distinfo ./distinfo
--- /usr/ports/mail/mutt-devel/distinfo	Tue Jul 18 18:05:06 2006
+++ ./distinfo	Sat Jul 22 08:13:22 2006
@@ -19,6 +19,9 @@
 MD5 (mutt/p0-patch-1.5.6.dw.mbox-hook.1) = 9e29a6778ab07a4de3442691e4573fea
 SHA256 (mutt/p0-patch-1.5.6.dw.mbox-hook.1) = ec9511b86a595f9b4f1f96b05d9e9e12e997bc62b0a0f2b5a36e2817dee61406
 SIZE (mutt/p0-patch-1.5.6.dw.mbox-hook.1) = 6405
+MD5 (mutt/patch-1.5.12.sidebar.20060720.txt) = aec38e08ace75aa8a36cb5f6ae318b4b
+SHA256 (mutt/patch-1.5.12.sidebar.20060720.txt) = 5373460e9846cf86d6da2192de37cc6ac98f37dc15e7820b6681ae86b9bed9d5
+SIZE (mutt/patch-1.5.12.sidebar.20060720.txt) = 47695
 MD5 (mutt/patch-1.5.9.tt.assumed_charset.2.gz) = 45cacc5155f1865ace31c72e2bffee63
 SHA256 (mutt/patch-1.5.9.tt.assumed_charset.2.gz) = 41ae6d049d2d39c3bb01d534a760372ec571bc51e90c259f529c477aa41d3d7e
 SIZE (mutt/patch-1.5.9.tt.assumed_charset.2.gz) = 2555