-Patch14: %{name}-LIBOBJ.patch
-Patch15: %{name}-pgp_hook.patch
-Patch16: %{name}-manual.patch
-Patch17: %{name}-send_charset.patch
-Patch18: %{name}-xface.patch
-Patch19: %{name}-sasl2.patch
-Patch20: %{name}-nntp.patch
+Patch14: %{name}-pgp_hook.patch
+Patch15: %{name}-manual.patch
+Patch16: %{name}-send_charset.patch
+Patch17: %{name}-xface.patch
+Patch18: %{name}-sasl2.patch
+Patch19: %{name}-nntp.patch
+Patch20: %{name}-esmtp.patch
+Patch21: %{name}-home_etc.patch
+Patch22: %{name}-kill_warnings.patch