ports/183301: Mutt 1.5.22 port fails to install with sidebar patch enabled

[ganthore]

>Number:         183301
>Category:       ports
>Synopsis:       Mutt 1.5.22 port fails to install with sidebar patch enabled
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Fri Oct 25 15:40:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     ganthore
>Release:        FreeBSD 10.0-BETA1
>Organization:
Red Hat
>Environment:
FreeBSD  10.0-BETA1 FreeBSD 10.0-BETA1 #0 r256420: Sun Oct 13 01:43:07 UTC 2013     root at snap.freebsd.org:/usr/obj/usr/src/sys/GENERIC  amd64
>Description:
I was trying to install mutt 1.5.22 today while enabling the sidebar patch. I am unable to install the software at the moment. It complains that the sidebar patch did not apply correctly...

root@:/usr/ports/mail/mutt # make
===>   mutt-1.5.22 depends on file: /usr/local/sbin/pkg - found
===> Fetching all distfiles required by mutt-1.5.22 for building
===>  Extracting for mutt-1.5.22
=> SHA256 Checksum OK for mutt/mutt-1.5.22.tar.gz.
=> SHA256 Checksum OK for mutt/patch-1.5.22.rr.compressed.gz.
=> SHA256 Checksum OK for mutt/patch-1.5.22.vvv.nntp.gz.
=> SHA256 Checksum OK for mutt/patch-1.5.22.vvv.nntp_ru.gz.
=> SHA256 Checksum OK for mutt/patch-1.5.22.vvv.initials.gz.
=> SHA256 Checksum OK for mutt/patch-1.5.22.vvv.quote.gz.
===>  Patching for mutt-1.5.22
===>  Applying distribution patches for mutt-1.5.22
===>  Applying FreeBSD patches for mutt-1.5.22
1 out of 5 hunks failed--saving rejects to buffy.c.rej
1 out of 9 hunks failed--saving rejects to curs_main.c.rej
1 out of 3 hunks failed--saving rejects to Makefile.in.rej
5 out of 10 hunks failed--saving rejects to menu.c.rej
2 out of 8 hunks failed--saving rejects to pager.c.rej
3 out of 11 hunks failed--saving rejects to compose.c.rej
*** Error code 1

If I disable the sidebar patch, everything compiles correctly. The sidebar website only has a posting for the 1.5.21 patch so I'm curious as to where the 1.5.22 patch is coming from?
>How-To-Repeat:
1) Update ports tree
portsnap fetch update

2) Clean and configure mutt, make sure to enable the sidebar patch
cd /usr/ports/mail/mutt
make clean
make config

3) Attempt to build mutt
make
>Fix:
No known fix, the patch does not apply cleanly. Possible that there is a fix upstream?

>Release-Note:
>Audit-Trail:
>Unformatted: