Also let <wbr> go through sanitization because why not

If someone is motivated enough to use them, we might as well keep them

Author: LunarX

HtmlCleaner/src/main/java/com/infomaniak/html/cleaner/BodyCleaner.kt

@@ -30,7 +30,23 @@ internal class BodyCleaner {
 
     init {
         val allowList = Safelist.relaxed()
-            .addTags("area", "button", "center", "del", "font", "hr", "ins", "kbd", "map", "samp", "style", "title", "tt", "var")
+            .addTags(
+                "area",
+                "button",
+                "center",
+                "del",
+                "font",
+                "hr",
+                "ins",
+                "kbd",
+                "map",
+                "samp",
+                "style",
+                "title",
+                "tt",
+                "var",
+                "wbr",
+            )
             .addAttributes(":all", "class", "dir", "id", "style")
             .addAttributes("a", "name")
             // Allow all URI schemes in links. Removing all protocols makes the list of protocols empty which means allow all protocols

app/src/main/java/com/infomaniak/mail/utils/HtmlFormatter.kt

@@ -153,13 +153,13 @@ class HtmlFormatter(private val html: String) {
         private const val PRIMARY_COLOR_CODE = "--kmail-primary-color"
         private const val KMAIL_MESSAGE_ID = "kmail-message-content"
 
-        private val DETECT_BUT_DO_NOT_BREAK = setOf(' ')
-        private val BREAK_CHARACTERS = setOf(':', '/', '~', '.', ',', '-', '_', '?', '#', '%', '=', '&')
         private const val ZERO_WIDTH_SPACE = 0x200B.toChar()
         private const val BREAK_LIMIT = 30
         // Across a few handpicked representative emails, average text node length for text nodes bigger than 30 characters seems
         // to be centered between 60 and 120
         private const val OPTIMAL_STRING_LENGTH = 120
+        private val DETECT_BUT_DO_NOT_BREAK = setOf(' ', ZERO_WIDTH_SPACE) // ZWSP could already be present in the original html
+        private val BREAK_CHARACTERS = setOf(':', '/', '~', '.', ',', '-', '_', '?', '#', '%', '=', '&')
 
         private fun Context.loadCss(@RawRes cssResId: Int, customColors: List<Pair<String, Int>> = emptyList()): String {
             var css = readRawResource(cssResId)