diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index ff8285d7d9..f93f20d9e2 100644
Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ
diff --git a/app/src/main/java/eu/faircode/email/ActivityView.java b/app/src/main/java/eu/faircode/email/ActivityView.java
index ba875ac130..d4c85eb48a 100644
--- a/app/src/main/java/eu/faircode/email/ActivityView.java
+++ b/app/src/main/java/eu/faircode/email/ActivityView.java
@@ -999,11 +999,17 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
                     if (message.content) {
                         String body = message.read(context);
                         if (body != null) {
+                            // https://tools.ietf.org/html/rfc4880#section-6.2
                             int begin = body.indexOf(PGP_BEGIN_MESSAGE);
                             int end = body.indexOf(PGP_END_MESSAGE);
                             if (begin >= 0 && begin < end) {
                                 String section = body.substring(begin, end + PGP_END_MESSAGE.length());
-                                section = section.replace("<br />", "\n\r");
+                                String[] lines = section.split("<br />");
+                                List<String> disarmored = new ArrayList<>();
+                                for (String line : lines)
+                                    if (!TextUtils.isEmpty(line) && !line.contains(": "))
+                                        disarmored.add(line);
+                                section = TextUtils.join("\n\r", disarmored);
 
                                 inline = true;
                                 encrypted = new ByteArrayInputStream(section.getBytes());