More decryption key detection fixes.

1 files changed, 1 insertions, 21 deletions

diff --git a/commands.c b/commands.c
index 683bae02..2c8f5df4 100644
--- a/commands.c
+++ b/commands.c
@@ -89,27 +89,7 @@ int mutt_display_message (HEADER *cur)
     {
 #ifdef HAVE_SMIME
       if (cur->security & APPLICATION_SMIME)
-      {
-	ADDRESS *t;
-	int found = 0;
-	for (t = cur->env->to; !found && t; t = t->next)
-	  if (mutt_addr_is_user (t))
-	  {
-	    found = 1;
-	    smime_getkeys (t->mailbox);
-	  }
-	for (t = cur->env->cc; !found && t; t = t->next)
-	  if (mutt_addr_is_user (t))
-	  {
-	    found = 1;
-	    smime_getkeys (t->mailbox);
-	  }
-	if (!found && (t = mutt_default_from()))
-	{
-	  smime_getkeys (t->mailbox);
-	  rfc822_free_address (&t);
-	}
-      }
+	smime_getkeys (cur->env);
 #endif
       if(!crypt_valid_passphrase(cur->security))
 	return 0;