diff -uNr mutt.orig/files/extra-patch-ifdef mutt/files/extra-patch-ifdef
--- mutt.orig/files/extra-patch-ifdef	2018-12-04 11:23:03.000000000 +1300
+++ mutt/files/extra-patch-ifdef	2018-12-14 10:07:13.504277000 +1300
@@ -1,9 +1,7 @@
 --- PATCHES.orig	2018-11-29 22:49:51 UTC
 +++ PATCHES
-@@ -1,2 +1,3 @@
+@@ -0,0 +1 @@
 +patch-1.5.4.cd.ifdef.1
- vvv.quote
- vvv.initials
 --- init.c.orig	2018-11-24 19:06:11 UTC
 +++ init.c
 @@ -650,6 +650,52 @@ static mbchar_table *parse_mbchar_table 
diff -uNr mutt.orig/files/extra-patch-reverse_reply mutt/files/extra-patch-reverse_reply
--- mutt.orig/files/extra-patch-reverse_reply	2018-12-04 11:23:03.000000000 +1300
+++ mutt/files/extra-patch-reverse_reply	2018-12-14 10:07:49.088663000 +1300
@@ -1,10 +1,7 @@
 --- PATCHES.orig	2018-11-29 22:55:14 UTC
 +++ PATCHES
-@@ -1,3 +1,4 @@
+@@ -0,0 +1 @@
 +patch-1.5.6.cb.reverse_reply.2
- patch-1.5.4.cd.ifdef.1
- vvv.quote
- vvv.initials
 --- init.h.orig	2018-11-29 22:55:14 UTC
 +++ init.h
 @@ -2820,6 +2820,13 @@ struct option_t MuttVars[] = {