--- commands.c.orig2	Fri May 31 10:14:06 2002
+++ commands.c	Fri May 31 10:32:00 2002
@@ -197,7 +197,7 @@
     {
       if (cur->security & GOODSIGN)
       {
-	if (!smime_verify_sender(cur))
+	if (option(OPTSMIMENOSENDER) || !smime_verify_sender(cur))
 	  mutt_message ( _("S/MIME signature successfully verified."));
 	else
 	  mutt_error ( _("S/MIME certificate owner does not match sender."));
--- init.h.orig2	Fri May 31 10:14:05 2002
+++ init.h	Fri May 31 10:54:55 2002
@@ -1435,6 +1435,15 @@
   ** This flag controls wether you want to be asked to enter a label for a certificate
   ** about to be added to the database or not. It is set by default.
   */
+  { "smime_dont_check_sender",	DT_BOOL, R_NONE, OPTSMIMENOSENDER, 0 },
+  /*
+  ** .pp
+  ** This flag controls wether you want the skip the check for the sender's
+  ** email address against the email address stored in the certificate. 
+  ** This can be useful if most of your email senders use SMIMEv3 which no
+  ** longer needs email-addresses as part of the certificates.
+  ** It is not set by default.
+  */
   { "smime_decrypt_use_default_key",	DT_BOOL, R_NONE, OPTSDEFAULTDECRYPTKEY, 1 },
   /*
   ** .pp
--- mutt.h.orig2	Fri May 31 10:14:06 2002
+++ mutt.h	Fri May 31 10:24:03 2002
@@ -453,6 +453,7 @@
 #ifdef HAVE_SMIME
   OPTSMIMEISDEFAULT,
   OPTASKCERTLABEL,
+  OPTSMIMENOSENDER,
   OPTSDEFAULTDECRYPTKEY,
 #endif
 #ifdef HAVE_PGP
--- contrib/smime.rc.orig	Sat Mar  2 12:59:50 2002
+++ contrib/smime.rc	Fri May 31 17:09:04 2002
@@ -6,9 +6,12 @@
 # will be the default method unless the following option is set
 set smime_is_default
 
-# Uncoment this if you don't want to set labels for certificates you add.
+# Uncomment this if you don't want to set labels for certificates you add.
 # unset smime_ask_cert_label
 
+# Uncomment this if you don't want to check for sender's email address
+# set smime_dont_check_sender = yes
+
 # Passphrase expiration
 set smime_timeout=300
 
@@ -23,9 +26,9 @@
 
 # The (default) keyfile for signing/decrypting.  Uncomment the following
 # line and replace the keyid with your own.
-set smime_default_key="12345678.0"
+# set smime_default_key="12345678.0"
 
-# Uncommen to make mutt ask what key to use when trying to decrypt a message.
+# Uncomment to make mutt ask what key to use when trying to decrypt a message.
 # It will use the default key above (if that was set) else.
 # unset smime_decrypt_use_default_key