Index: src/balsa-message.c
===================================================================
RCS file: /cvs/gnome/balsa/src/balsa-message.c,v
retrieving revision 1.354
diff -u -3 -p -r1.354 balsa-message.c
--- src/balsa-message.c	23 Mar 2005 10:56:26 -0000	1.354
+++ src/balsa-message.c	29 Mar 2005 17:11:33 -0000
@@ -4720,14 +4720,22 @@ libbalsa_msg_part_2440(LibBalsaMessage *
 	return;
     if (message->body_ref > chk_crypto->max_ref) {
 	if (chk_crypto->chk_mode == LB_MAILBOX_CHK_CRYPT_ALWAYS) {
-	    libbalsa_information
-		(LIBBALSA_INFORMATION_ERROR,
-		 _("The %s can not be performed because this message "
-		   "is displayed more than once.\n"
-		   "Please close the other instances of this message and try "
-		   "again."),
-		 rfc2440mode == GMIME_PART_RFC2440_ENCRYPTED ? _("decryption") :
-		 _("signature check and removal of the OpenPGP armor"));
+		if (rfc2440mode == GMIME_PART_RFC2440_ENCRYPTED) {
+			libbalsa_information
+			(LIBBALSA_INFORMATION_ERROR,
+			 _("The decryption can not be performed because this message "
+			   "is displayed more than once.\n"
+			   "Please close the other instances of this message and try "
+			   "again."));
+		} else {
+			libbalsa_information
+			(LIBBALSA_INFORMATION_ERROR,
+			 _("The signature check and removal of the OpenPGP armor can not"
+			   "be performed because this message is displayed more than once.\n"
+			   "Please close the other instances of this message and try "
+			   "again.")
+		);
+		}
 	    /* downgrade the check mode to avoid multiple errors popping up */
 	    chk_crypto->chk_mode = LB_MAILBOX_CHK_CRYPT_MAYBE;
 	}