-Patch9: %{name}-crypt-autoselectkey.patch
-Patch10: %{name}-manual.patch
-Patch11: %{name}-xface.patch
-Patch12: %{name}-Muttrc_mbox_path.patch
-Patch13: %{name}-po.patch
-Patch14: %{name}-home_etc.patch
-Patch15: %{name}-Muttrc.patch
-Patch16: %{name}-muttbug-tmp.patch
-Patch17: %{name}-folder_columns.patch
-Patch18: %{name}-imap_recent.patch
-Patch19: %{name}-Muttrc.head.patch
-Patch20: %{name}-smime.rc.patch
-Patch21: %{name}-sidebar.patch
-Patch22: %{name}-imap_fast_trash.patch
-Patch23: %{name}-db.patch
+Patch5: %{name}-crypt-autoselectkey.patch
+Patch6: %{name}-manual.patch
+Patch7: %{name}-xface.patch
+Patch8: %{name}-Muttrc_mbox_path.patch
+Patch9: %{name}-po.patch
+Patch10: %{name}-Muttrc.head.patch
+Patch11: %{name}-smime.rc.patch
+Patch12: %{name}-db.patch
+Patch13: format-security.patch
+Patch14: %{name}-keep_to.patch
+Patch15: %{name}-vvv.initials.patch
+# applied during %%install
+Patch50: %{name}-Muttrc.patch
+# bcond-related patches
+Patch101: %{name}-home_etc.patch