diff --git a/mail/courier/files/extrapatch-maildir__maildirfilter.c b/mail/courier/files/extrapatch-maildir__maildirfilter.c
deleted file mode 100644
index 1e353fb88cb3..000000000000
--- a/mail/courier/files/extrapatch-maildir__maildirfilter.c
+++ /dev/null
@@ -1,18 +0,0 @@
---- maildir/maildirfilter.c.orig	Sat Jul  1 02:44:48 2006
-+++ maildir/maildirfilter.c	Sat Dec  9 21:38:05 2006
-@@ -100,13 +100,13 @@
- 
- 	/* rule name: may not already exist */
- 	*errcode=MF_ERR_EXISTS;
--	
-+{
- 	struct maildirfilterrule *pom;
- 	for (pom=r->first; pom->next; pom=pom->next) {
- 	    if (p!=pom && !strcmp(name, pom->rulename))
- 		return (-1);
- 	}
--
-+}
- 	/* rule type: we must know what it is */
- 
- 	switch (type)	{
diff --git a/mail/courier/files/extrapatch-webmail__folder.c b/mail/courier/files/extrapatch-webmail__folder.c
deleted file mode 100644
index a4f79cd51ae2..000000000000
--- a/mail/courier/files/extrapatch-webmail__folder.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- webmail/folder.c.orig	Sun Jul 23 00:09:04 2006
-+++ webmail/folder.c	Sat Dec  9 22:23:23 2006
-@@ -287,7 +287,7 @@
- 			(unsigned long)pos);
- 		return;
- 	    }
--	    
-+{
- 	    char *cur = malloc(strlen(deldir)+5);
- 	    strcpy(cur, deldir);
- 	    strcat(cur, "/cur");
-@@ -298,7 +298,7 @@
- 	    maildir_info_destroy(&minfo);
- 	    free(deldir);
- 	    free(cur);
--	    
-+}
- 	}
- 	else if (*cgi("cmdmove"))
- 	{
diff --git a/mail/courier/files/extrapatch-webmail__newmsg.c b/mail/courier/files/extrapatch-webmail__newmsg.c
deleted file mode 100644
index 0fa698c7588b..000000000000
--- a/mail/courier/files/extrapatch-webmail__newmsg.c
+++ /dev/null
@@ -1,18 +0,0 @@
---- webmail/newmsg.c.orig	Sun Jul 30 21:01:42 2006
-+++ webmail/newmsg.c	Sat Dec  9 22:27:06 2006
-@@ -630,13 +630,14 @@
- 	printf("<table width=\"100%%\" border=\"0\" cellspacing=\"0\" cellpadding=\"4\" class=\"new-message-box\"><tr><td>\n");
- 
- 	printf("<table border=\"0\" width=\"100%%\">\n");
-+{
- 	int wbnochangingfrom=auth_getoptionenvint("wbnochangingfrom");
- 	if (wbnochangingfrom < 2)
- 		newmsg_header_rfc822(fromlab, "headerfrom", curfrom,
- 			*cgi("from") ? cgi("from"):
- 			pref_from && *pref_from ? pref_from:
- 			login_fromhdr(), wbnochangingfrom ? 1:0);
--
-+}
- 	printf("<tr valign=\"middle\"><th align=\"right\">"
- 	       "<p class=\"new-message-header\">"
- 	       "<span class=\"new-message-header-addressbook\">"