-Patch17: %{name}-esmtp.patch
-Patch18: %{name}-home_etc.patch
-Patch19: %{name}-Muttrc.patch
-#PatchXXX: %{name}-pgp_hook.patch
+Patch17: %{name}-home_etc.patch
+Patch18: %{name}-Muttrc.patch
+Patch19: %{name}-muttbug-tmp.patch
+Patch20: %{name}-folder_columns.patch
+Patch21: %{name}-nr.tag_prefix_cond.patch
+Patch22: %{name}-imap_mxcmp.patch
+Patch23: %{name}-imap_recent.patch