From 4a25e636472c083e3837ee0cddb2cdccb0643e89 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Thu, 17 Oct 2024 16:58:42 +0200
Subject: [PATCH] Process all body parts

---
 app/src/main/java/eu/faircode/email/MessageHelper.java | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/app/src/main/java/eu/faircode/email/MessageHelper.java b/app/src/main/java/eu/faircode/email/MessageHelper.java
index db8ee8fc00..fda0939692 100644
--- a/app/src/main/java/eu/faircode/email/MessageHelper.java
+++ b/app/src/main/java/eu/faircode/email/MessageHelper.java
@@ -4999,9 +4999,14 @@ public class MessageHelper {
                         for (int i = 0; i < mp.getCount(); i++) {
                             BodyPart bp = mp.getBodyPart(i);
                             if (isMimeType(bp, "multipart/signed") || isMimeType(bp, "multipart/encrypted")) {
+                                for (int j = 0; j < mp.getCount(); j++)
+                                    if (j != i)
+                                        getMessageParts(part, mp.getBodyPart(j), parts, null);
                                 part = (MimePart) bp;
                                 break;
                             } else if (isMimeType(bp, "application/pgp-encrypted") && i + 1 < mp.getCount()) {
+                                for (int j = 0; j < i; j++)
+                                    getMessageParts(part, mp.getBodyPart(j), parts, null);
                                 // Workaround Outlook problem
                                 //  --_xxxoutlookfr_
                                 // Content-Type: text/plain; charset="us-ascii"