diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index e588e33b77..7324901f31 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -2255,7 +2255,8 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                         message.headers, message.blocklist != null && message.blocklist);
                 if (BuildConfig.DEBUG && headers instanceof SpannableStringBuilder) {
                     SpannableStringBuilder ssb = (SpannableStringBuilder) headers;
-                    ssb.append("TLS=" + message.tls)
+                    ssb.append('\n')
+                            .append("TLS=" + message.tls)
                             .append(" DKIM=" + message.dkim)
                             .append(" SPF=" + message.spf)
                             .append(" DMARC=" + message.dmarc)
diff --git a/app/src/main/java/eu/faircode/email/HtmlHelper.java b/app/src/main/java/eu/faircode/email/HtmlHelper.java
index fb53ee6b25..50f7fc1d2c 100644
--- a/app/src/main/java/eu/faircode/email/HtmlHelper.java
+++ b/app/src/main/java/eu/faircode/email/HtmlHelper.java
@@ -2400,8 +2400,8 @@ public class HtmlHelper {
             ByteArrayInputStream bis = new ByteArrayInputStream(headers.getBytes());
             String[] received = new InternetHeaders(bis).getHeader("Received");
             if (received != null && received.length > 0) {
-                ssb.append('\n');
                 for (int i = received.length - 1; i >= 0; i--) {
+                    ssb.append('\n');
                     String h = MimeUtility.unfold(received[i]);
 
                     int semi = h.lastIndexOf(';');
@@ -2470,7 +2470,7 @@ public class HtmlHelper {
                     if (tls != null)
                         ssb.setSpan(new ForegroundColorSpan(tls ? colorVerified : colorWarning), t, ssb.length(), 0);
 
-                    ssb.append("\n\n");
+                    ssb.append("\n");
                 }
             }
         } catch (Throwable ex) {