--- mutt_ssl_gnutls.c.orig

+++ mutt_ssl_gnutls.c

@@ -999,6 +999,7 @@

   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)

   {

@@ -1024,6 +1025,9 @@

   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)

@@ -1049,7 +1053,7 @@

         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/pager.c b/pager.c

--- pager.c

+++ pager.c

@@ -1187,10 +1187,17 @@

       last_special = special;

     }

-    if (IsWPrint (wc))

+    if (IsWPrint (wc) || (Charset_is_utf8 && wc == 0x00A0))

     {

       if (wc == ' ')

 	space = ch;

+      else if (Charset_is_utf8 && wc == 0x00A0)

+      {

+	/* Convert non-breaking space to normal space. The local variable

+	 * `space' is not set here so that the caller of this function won't

+	 * attempt to wrap at this character. */

+	wc = ' ';

+      }

       t = wcwidth (wc);

       if (col + t > wrap_cols)

 	break;