diff --git a/kuvert b/kuvert
index d0892f0..0bbba76 100755
--- a/kuvert
+++ b/kuvert
@@ -518,7 +518,15 @@ sub process_file
     
 		#Check if mail needs to be dropped due to
 		#encrypt option being specyfied and lack of key
-		%actions = grep {$_ ne 'drop'} %actions;
+		#%actions = grep {$_ ne 'drop'} %actions;
+		foreach my $key (keys %actions)
+		{
+			if ($actions{$key} eq 'drop')
+			{
+				delete $actions{$key};
+				logit("Dropping mail to $key due to lack of encryption key");
+			}
+		}
 			
     my ($orig_header,$cryptoin);
     # prepare various stuff we need only when encrypting or signing
@@ -649,8 +657,6 @@ sub findaction
 	#Encrypt or drop everything
 	if ($actions{$addr}=~/^encrypt/)
 	{
-		my $thisaction=$1;
-	  $actions{$addr}=$thisaction;
 		$actions{$addr}=$specialkeys{$addr}||$email2key{$addr}||"drop";
 	}