- for (i = 0; i < g_mime_multipart_get_count (multipart); i++) {
- show_message_part (g_mime_multipart_get_part (multipart, i),
- state, format, params, i == 0);
+ if (decryptedpart) {
+ /* We emit the useless application/pgp-encrypted version
+ * part here only to keep the emitted output as consistent
+ * as possible between decrypted output and the
+ * unprocessed multipart/mime. For some strange reason,
+ * the actual encrypted data is the second part of the
+ * multipart. */
+ show_message_part (g_mime_multipart_get_part (multipart, 0), state, format, params, TRUE);
+ show_message_part (decryptedpart, state, format, params, FALSE);
+ } else {
+ for (i = 0; i < g_mime_multipart_get_count (multipart); i++) {
+ show_message_part (g_mime_multipart_get_part (multipart, i),
+ state, format, params, i == 0);
+ }