diff --git a/mozilla/mailnews/mime/src/mimeleaf.cpp b/mozilla/mailnews/mime/src/mimeleaf.cpp
index 402baa2d4a6..b5104e76f83 100644
--- a/mozilla/mailnews/mime/src/mimeleaf.cpp
+++ b/mozilla/mailnews/mime/src/mimeleaf.cpp
@@ -161,7 +161,9 @@ MimeLeaf_parse_buffer (char *buffer, PRInt32 size, MimeObject *obj)
 	  !obj->options->output_fn)
 	return 0;
 
-  if (leaf->decoder_data)
+  if (leaf->decoder_data &&
+      obj->options && 
+      obj->options->format_out != nsMimeOutput::nsMimeMessageDecrypt)
 	return MimeDecoderWrite (leaf->decoder_data, buffer, size);
   else
 	return ((MimeLeafClass *)obj->clazz)->parse_decoded_buffer (buffer, size,