diff --git a/mutt-1.5.21-testcert.patch b/mutt-1.5.21-testcert.patch
deleted file mode 100644
index 0d0c86d..0000000
--- a/mutt-1.5.21-testcert.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -up mutt-1.5.21/mutt_ssl_gnutls.c.old mutt-1.5.21/mutt_ssl_gnutls.c
---- mutt-1.5.21/mutt_ssl_gnutls.c.old	2011-03-23 11:46:28.760386765 +0100
-+++ mutt-1.5.21/mutt_ssl_gnutls.c	2011-03-23 14:34:45.839456449 +0100
-@@ -978,6 +978,7 @@ static int tls_check_certificate (CONNEC
-   unsigned int cert_list_size = 0;
-   gnutls_certificate_status certstat;
-   int certerr, i, preauthrc, savedcert, rc = 0;
-+  int rcpeer;
- 
-   if (gnutls_auth_get_type (state) != GNUTLS_CRD_CERTIFICATE)
-   {
-@@ -1003,6 +1004,9 @@ static int tls_check_certificate (CONNEC
-   for (i = 0; i < cert_list_size; i++) {
-     rc = tls_check_preauth(&cert_list[i], certstat, conn->account.host, i,
-                            &certerr, &savedcert);
-+    if (i == 0)
-+      rcpeer = rc;
-+
-     preauthrc += rc;
- 
-     if (savedcert)
-@@ -1028,7 +1032,7 @@ static int tls_check_certificate (CONNEC
-         dprint (1, (debugfile, "error trusting certificate %d: %d\n", i, rc));
- 
-       certstat = tls_verify_peers (state);
--      if (!certstat)
-+      if (!certstat && !rcpeer)
-         return 1;
-     }
-   }
diff --git a/mutt.spec b/mutt.spec
index 0a8a47a..bd04a74 100644
--- a/mutt.spec
+++ b/mutt.spec
@@ -28,7 +28,6 @@ Source: ftp://ftp.mutt.org/pub/mutt/devel/mutt-%{version}.tar.gz
 Source1: mutt_ldap_query
 Patch3: mutt-1.5.18-muttrc.patch
 Patch4: mutt-1.5.18-manual.patch
-Patch7: mutt-1.5.21-testcert.patch
 Patch8: mutt-1.5.21-cabundle.patch
 Patch9: mutt-1.5.21-gpgme-1.2.0.patch
 Patch10: mutt-1.5.21-pophash.patch
@@ -75,7 +74,6 @@ for selecting groups of messages.
 #FIXME ./prepare -V
 %patch3 -p1 -b .muttrc
 %patch4 -p1 -b .manual
-%patch7 -p1 -b .testcert
 %patch8 -p1 -b .cabundle
 %patch9 -p1 -b .gpgme-1.2.0
 %patch10 -p1 -b .pophash
@@ -176,7 +174,8 @@ ln -sf ./muttrc.5 $RPM_BUILD_ROOT%{_mandir}/man5/muttrc.local.5
 %changelog
 * Mon Dec 02 2013 Jan Pacner <jpacner@redhat.com> - 5:1.5.22-1
 - new release (Resolves: #1034263)
-- use inline sed instead of patch
+- use inline sed instead of nodotlock patch
+- patches removed: testcert, hdrcnt, certscomp, updating
 
 * Mon Oct 21 2013 Honza Horak <hhorak@redhat.com> - 5:1.5.21-26
 - Fixed patch for certificates comparison