diff --git a/app/src/main/java/eu/faircode/email/ActivityEml.java b/app/src/main/java/eu/faircode/email/ActivityEml.java
index d3f8081a2b..d503443a62 100644
--- a/app/src/main/java/eu/faircode/email/ActivityEml.java
+++ b/app/src/main/java/eu/faircode/email/ActivityEml.java
@@ -148,7 +148,7 @@ public class ActivityEml extends ActivityBase {
                     StringBuilder sb = new StringBuilder();
                     for (MessageHelper.AttachmentPart apart : parts.getAttachmentParts()) {
                         if (sb.length() > 0)
-                            sb.append("<br />");
+                            sb.append("<br>");
                         sb.append(apart.part.getContentType());
                         if (apart.disposition != null)
                             sb.append(' ').append(apart.disposition);
diff --git a/app/src/main/java/eu/faircode/email/EmailProvider.java b/app/src/main/java/eu/faircode/email/EmailProvider.java
index 5ef1181fa4..ba06d4f1a7 100644
--- a/app/src/main/java/eu/faircode/email/EmailProvider.java
+++ b/app/src/main/java/eu/faircode/email/EmailProvider.java
@@ -327,7 +327,7 @@ public class EmailProvider {
                             if (title == null)
                                 title = "";
                             else
-                                title += "<br />";
+                                title += "<br>";
                             title += xml.getText();
                         }
                         continue;
@@ -481,7 +481,7 @@ public class EmailProvider {
         if (provider.documentation == null)
             provider.documentation = new StringBuilder();
         else
-            provider.documentation.append("<br /><br />");
+            provider.documentation.append("<br><br>");
 
         provider.documentation.append("<a href=\"").append(href).append("\">").append(title).append("</a>");
     }
diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java
index bf7dd1ea20..16e598a5aa 100644
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@@ -612,7 +612,7 @@ public class FragmentCompose extends FragmentBase {
 
                 String ref = Helper.readText(refFile);
                 String plain = HtmlHelper.getText(ref);
-                String html = "<p>" + plain.replaceAll("\\r?\\n", "<br />") + "</p>";
+                String html = "<p>" + plain.replaceAll("\\r?\\n", "<br>") + "</p>";
 
                 try (BufferedWriter out = new BufferedWriter(new FileWriter(file))) {
                     out.write(body);
@@ -2041,7 +2041,7 @@ public class FragmentCompose extends FragmentBase {
 
                         draft.subject = args.getString("subject", "");
                         body = args.getString("body", "");
-                        body = body.replaceAll("\\r?\\n", "<br />");
+                        body = body.replaceAll("\\r?\\n", "<br>");
 
                         if (answer > 0) {
                             EntityAnswer a = db.answer().getAnswer(answer);
diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index 805edf6409..6f30c279b0 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -3829,7 +3829,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
                             int end = body.indexOf(PGP_END_MESSAGE);
                             if (begin >= 0 && begin < end) {
                                 String section = body.substring(begin, end + PGP_END_MESSAGE.length());
-                                String[] lines = section.split("<br />");
+                                String[] lines = section.split("<br>");
                                 List<String> disarmored = new ArrayList<>();
                                 for (String line : lines)
                                     if (!TextUtils.isEmpty(line) && !line.contains(": "))
diff --git a/app/src/main/java/eu/faircode/email/HtmlHelper.java b/app/src/main/java/eu/faircode/email/HtmlHelper.java
index 1ec79d30de..fb3ba99b23 100644
--- a/app/src/main/java/eu/faircode/email/HtmlHelper.java
+++ b/app/src/main/java/eu/faircode/email/HtmlHelper.java
@@ -152,7 +152,7 @@ public class HtmlHelper {
 
         // Pre formatted text
         for (Element code : document.select("pre")) {
-            code.html(code.html().replaceAll("\\r?\\n", "<br />"));
+            code.html(code.html().replaceAll("\\r?\\n", "<br>"));
             code.tagName("div");
         }
 
diff --git a/app/src/main/java/eu/faircode/email/Log.java b/app/src/main/java/eu/faircode/email/Log.java
index 30706fc449..1fbca4f9d2 100644
--- a/app/src/main/java/eu/faircode/email/Log.java
+++ b/app/src/main/java/eu/faircode/email/Log.java
@@ -388,7 +388,7 @@ public class Log {
             sb.append(ex.toString()).append("\n").append(android.util.Log.getStackTraceString(ex));
         if (log != null)
             sb.append(log);
-        String body = "<pre>" + sb.toString().replaceAll("\\r?\\n", "<br />") + "</pre>";
+        String body = "<pre>" + sb.toString().replaceAll("\\r?\\n", "<br>") + "</pre>";
 
         EntityMessage draft;
 
diff --git a/app/src/main/java/eu/faircode/email/MessageHelper.java b/app/src/main/java/eu/faircode/email/MessageHelper.java
index 4dabd92e98..60a178dc3d 100644
--- a/app/src/main/java/eu/faircode/email/MessageHelper.java
+++ b/app/src/main/java/eu/faircode/email/MessageHelper.java
@@ -864,7 +864,7 @@ public class MessageHelper {
 
             if (part.isMimeType("text/plain")) {
                 result = TextUtils.htmlEncode(result);
-                result = result.replaceAll("\\r?\\n", "<br />");
+                result = result.replaceAll("\\r?\\n", "<br>");
                 result = "<span>" + result + "</span>";
             }