diff -up evolution-data-server-2.22.3/camel/camel-smime-context.c.display-smime-sign-and-encrypt evolution-data-server-2.22.3/camel/camel-smime-context.c
--- evolution-data-server-2.22.3/camel/camel-smime-context.c.display-smime-sign-and-encrypt	2009-04-02 13:22:32.000000000 +0200
+++ evolution-data-server-2.22.3/camel/camel-smime-context.c	2009-04-02 13:22:42.000000000 +0200
@@ -970,7 +970,8 @@ sm_decrypt(CamelCipherContext *context, 
 	camel_data_wrapper_construct_from_stream((CamelDataWrapper *)opart, ostream);
 
 	if (NSS_CMSMessage_IsSigned(cmsg)) {
-		valid = sm_verify_cmsg(context, cmsg, NULL, ex);
+		camel_stream_reset (ostream);
+		valid = sm_verify_cmsg (context, cmsg, ostream, ex);
 	} else {
 		valid = camel_cipher_validity_new();
 		valid->encrypt.description = g_strdup(_("Encrypted content"));