From f49ed187f430951d687ac13701d25ef303dda686 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Wed, 21 Feb 2024 08:39:25 +0100
Subject: [PATCH] Improved extra parts formatting

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

diff --git a/app/src/main/java/eu/faircode/email/MessageHelper.java b/app/src/main/java/eu/faircode/email/MessageHelper.java
index ebc43dd424..6f9e2e187a 100644
--- a/app/src/main/java/eu/faircode/email/MessageHelper.java
+++ b/app/src/main/java/eu/faircode/email/MessageHelper.java
@@ -3718,6 +3718,7 @@ public class MessageHelper {
 
             parts.addAll(extra);
 
+            boolean first = true;
             for (PartHolder h : parts) {
 /*
                 int size = h.part.getSize();
@@ -4001,13 +4002,13 @@ public class MessageHelper {
                                 StandardCharsets.US_ASCII.equals(cs) ||
                                 StandardCharsets.ISO_8859_1.equals(cs))
                             result = new String(result.getBytes(StandardCharsets.ISO_8859_1), StandardCharsets.UTF_8);
-                        result = Markdown.toHtml(result);
+                        result = (first ? "" : "<br><hr>") + Markdown.toHtml(result);
                     } catch (Throwable ex) {
                         Log.e(ex);
                         result = HtmlHelper.formatPlainText(result);
                     }
                 } else if (h.isPatch() || h.isLog()) {
-                    result = "<hr>" +
+                    result = (first ? "" : "<br><hr>") +
                             "<pre style=\"font-family: monospace; font-size:small;\">" +
                             HtmlHelper.formatPlainText(result) +
                             "</pre>";
@@ -4048,6 +4049,7 @@ public class MessageHelper {
                     Log.w("Unexpected content type=" + h.contentType);
 
                 sb.append(result);
+                first = false;
             }
 
             return sb.toString();