diff -upk.orig mutt-1.4.2.2i.orig/imap/browse.c mutt-1.4.2.2i/imap/browse.c
--- mutt-1.4.2.2i.orig/imap/browse.c	2007-04-01 20:47:27 +0000
+++ mutt-1.4.2.2i/imap/browse.c	2007-04-01 20:37:05 +0000
@@ -52,7 +52,7 @@ int imap_browse (char* path, struct brow
   int i;
   int nsup;
   char ctmp;
-  int nns;
+  int nns = 0;
   char *cur_folder;
   short showparents = 0;
   int noselect;
diff -upk.orig mutt-1.4.2.2i.orig/mutt_ssl.c mutt-1.4.2.2i/mutt_ssl.c
--- mutt-1.4.2.2i.orig/mutt_ssl.c	2007-04-01 20:47:27 +0000
+++ mutt-1.4.2.2i/mutt_ssl.c	2007-04-01 20:46:51 +0000
@@ -409,9 +409,9 @@ static void x509_fingerprint (char *s, i
   {
     for (j = 0; j < (int) n; j++)
     {
-      char ch[8];
-      snprintf (ch, 8, "%02X%s", md[j], (j % 2 ? " " : ""));
-      strncat (s, ch, l);
+      char ch[9];
+      snprintf (ch, sizeof ch, "%02X%s", md[j], (j % 2 ? " " : ""));
+      strncat (s, ch, l - 1);
     }
   }
 }
@@ -623,9 +623,9 @@ static int ssl_check_certificate (sslsoc
   
   helpstr[0] = '\0';
   mutt_make_help (buf, sizeof (buf), _("Exit  "), MENU_GENERIC, OP_EXIT);
-  strncat (helpstr, buf, sizeof (helpstr));
+  strncat (helpstr, buf, sizeof (helpstr) - 1);
   mutt_make_help (buf, sizeof (buf), _("Help"), MENU_GENERIC, OP_HELP);
-  strncat (helpstr, buf, sizeof (helpstr));
+  strncat (helpstr, buf, sizeof (helpstr) - 1);
   menu->help = helpstr;
 
   done = 0;
diff -upk.orig mutt-1.4.2.2i.orig/mx.c mutt-1.4.2.2i/mx.c
--- mutt-1.4.2.2i.orig/mx.c	2007-04-01 20:47:28 +0000
+++ mutt-1.4.2.2i/mx.c	2007-04-01 20:39:45 +0000
@@ -160,6 +160,7 @@ int mx_lock_file (const char *path, int 
   int count;
   int attempt;
   struct stat prev_sb;
+  memset (&prev_sb, 0, sizeof (prev_sb));
 #endif
   int r = 0;
 
diff -upk.orig mutt-1.4.2.2i.orig/newsrc.c mutt-1.4.2.2i/newsrc.c
--- mutt-1.4.2.2i.orig/newsrc.c	2007-04-01 20:47:28 +0000
+++ mutt-1.4.2.2i/newsrc.c	2007-04-01 20:41:58 +0000
@@ -874,8 +874,8 @@ int nntp_save_cache_group (CONTEXT *ctx)
       fputs (buf, f);
       if (h->env->references)
 	mutt_write_references (h->env->references, f);
-      snprintf (buf, sizeof(buf), "\t%ld\t%d\tXref: %s\n", NONULL(h->content->length),
-	    NONULL(h->lines), NONULL(h->env->xref));
+      snprintf (buf, sizeof(buf), "\t%ld\t%d\tXref: %s\n", h->content->length,
+	    h->lines, NONULL(h->env->xref));
       if (fputs (buf, f) == EOF)
       {
 	fclose (f);