Index: crypt-gpgme.c
===================================================================
RCS file: /home/roessler/cvs/mutt/crypt-gpgme.c,v
retrieving revision 3.10
diff -p -u -r3.10 crypt-gpgme.c
--- crypt-gpgme.c	21 Oct 2005 04:35:37 -0000	3.10
+++ crypt-gpgme.c	11 Jun 2006 16:14:38 -0000
@@ -3560,15 +3560,15 @@ static crypt_key_t *crypt_select_key (cr
 
   helpstr[0] = 0;
   mutt_make_help (buf, sizeof (buf), _("Exit  "), menu_to_use, OP_EXIT);
-  strcat (helpstr, buf);	/* __STRCAT_CHECKED__ */
+  safe_strcat (helpstr, sizeof (helpstr), buf);
   mutt_make_help (buf, sizeof (buf), _("Select  "), menu_to_use,
 		  OP_GENERIC_SELECT_ENTRY);
-  strcat (helpstr, buf);	/* __STRCAT_CHECKED__ */
+  safe_strcat (helpstr, sizeof (helpstr), buf);
   mutt_make_help (buf, sizeof (buf), _("Check key  "),
                   menu_to_use, OP_VERIFY_KEY);
-  strcat (helpstr, buf);	/* __STRCAT_CHECKED__ */
+  safe_strcat (helpstr, sizeof (helpstr), buf);
   mutt_make_help (buf, sizeof (buf), _("Help"), menu_to_use, OP_HELP);
-  strcat (helpstr, buf);	/* __STRCAT_CHECKED__ */
+  safe_strcat (helpstr, sizeof (helpstr), buf);
 
   menu = mutt_new_menu ();
   menu->max = i;
Index: pgpkey.c
===================================================================
RCS file: /home/roessler/cvs/mutt/pgpkey.c,v
retrieving revision 3.11
diff -p -u -r3.11 pgpkey.c
--- pgpkey.c	17 Sep 2005 20:46:11 -0000	3.11
+++ pgpkey.c	11 Jun 2006 16:14:38 -0000
@@ -512,14 +512,14 @@ static pgp_key_t pgp_select_key (pgp_key
 
   helpstr[0] = 0;
   mutt_make_help (buf, sizeof (buf), _("Exit  "), MENU_PGP, OP_EXIT);
-  strcat (helpstr, buf);	/* __STRCAT_CHECKED__ */
+  safe_strcat (helpstr, sizeof (helpstr), buf);
   mutt_make_help (buf, sizeof (buf), _("Select  "), MENU_PGP,
 		  OP_GENERIC_SELECT_ENTRY);
-  strcat (helpstr, buf);	/* __STRCAT_CHECKED__ */
+  safe_strcat (helpstr, sizeof (helpstr), buf);
   mutt_make_help (buf, sizeof (buf), _("Check key  "), MENU_PGP, OP_VERIFY_KEY);
-  strcat (helpstr, buf);	/* __STRCAT_CHECKED__ */
+  safe_strcat (helpstr, sizeof (helpstr), buf);
   mutt_make_help (buf, sizeof (buf), _("Help"), MENU_PGP, OP_HELP);
-  strcat (helpstr, buf);	/* __STRCAT_CHECKED__ */
+  safe_strcat (helpstr, sizeof (helpstr), buf);
 
   menu = mutt_new_menu ();
   menu->max = i;
Index: smime.c
===================================================================
RCS file: /home/roessler/cvs/mutt/smime.c,v
retrieving revision 3.48
diff -p -u -r3.48 smime.c
--- smime.c	16 Dec 2005 18:49:40 -0000	3.48
+++ smime.c	11 Jun 2006 16:14:40 -0000
@@ -361,7 +361,7 @@ char* smime_ask_for_key (char *prompt, c
   int numFields, hash_suffix, done, cur; /* The current entry */
   MUTTMENU* menu;
   unsigned int hash;
-  char helpstr[HUGE_STRING*3];
+  char helpstr[LONG_STRING];
   char qry[256];
   char title[256];
 
@@ -429,12 +429,12 @@ char* smime_ask_for_key (char *prompt, c
     /* Make Helpstring */
     helpstr[0] = 0;
     mutt_make_help (buf, sizeof (buf), _("Exit  "), MENU_SMIME, OP_EXIT);
-    strcat (helpstr, buf);	/* __STRCAT_CHECKED__ */
+    safe_strcat (helpstr, sizeof (helpstr), buf);
     mutt_make_help (buf, sizeof (buf), _("Select  "), MENU_SMIME,
         OP_GENERIC_SELECT_ENTRY);
-    strcat (helpstr, buf);	/* __STRCAT_CHECKED__ */
+    safe_strcat (helpstr, sizeof (helpstr), buf);
     mutt_make_help (buf, sizeof(buf), _("Help"), MENU_SMIME, OP_HELP);
-    strcat (helpstr, buf);	/* __STRCAT_CHECKED__ */
+    safe_strcat (helpstr, sizeof (helpstr), buf);
   
     /* Create the menu */
     menu = mutt_new_menu();