diff --git a/app/html-cleaner/src/main/java/app/k9mail/html/cleaner/BodyCleaner.kt b/app/html-cleaner/src/main/java/app/k9mail/html/cleaner/BodyCleaner.kt
index 36b9ec0d5b..43a6d82738 100644
--- a/app/html-cleaner/src/main/java/app/k9mail/html/cleaner/BodyCleaner.kt
+++ b/app/html-cleaner/src/main/java/app/k9mail/html/cleaner/BodyCleaner.kt
@@ -13,7 +13,7 @@ internal class BodyCleaner {
init {
val allowList = Safelist.relaxed()
- .addTags("font", "hr", "ins", "del", "center", "map", "area", "title", "tt")
+ .addTags("font", "hr", "ins", "del", "center", "map", "area", "title", "tt", "kbd", "samp", "var")
.addAttributes("font", "color", "face", "size")
.addAttributes("a", "name")
.addAttributes("div", "align")
diff --git a/app/html-cleaner/src/test/java/app/k9mail/html/cleaner/HtmlSanitizerTest.kt b/app/html-cleaner/src/test/java/app/k9mail/html/cleaner/HtmlSanitizerTest.kt
index 1c80b1f540..d60ae8b381 100644
--- a/app/html-cleaner/src/test/java/app/k9mail/html/cleaner/HtmlSanitizerTest.kt
+++ b/app/html-cleaner/src/test/java/app/k9mail/html/cleaner/HtmlSanitizerTest.kt
@@ -447,7 +447,26 @@ class HtmlSanitizerTest {
@Test
fun `should keep 'tt' element`() {
- val html = """some text"""
+ assertTagsNotStripped("tt")
+ }
+
+ @Test
+ fun `should keep 'kbd' element`() {
+ assertTagsNotStripped("kbd")
+ }
+
+ @Test
+ fun `should keep 'samp' element`() {
+ assertTagsNotStripped("samp")
+ }
+
+ @Test
+ fun `should keep 'var' element`() {
+ assertTagsNotStripped("var")
+ }
+
+ private fun assertTagsNotStripped(element: String) {
+ val html = """<$element>some text"""
val result = htmlSanitizer.sanitize(html)
@@ -456,7 +475,7 @@ class HtmlSanitizerTest {
- some text
+ <$element>some text
""".trimIndent().trimLineBreaks()