diff --git a/app/src/main/java/com/jerboa/util/markwon/ScriptRewriteSupportPlugin.kt b/app/src/main/java/com/jerboa/util/markwon/ScriptRewriteSupportPlugin.kt
index 49a00dab4..9862a46a6 100644
--- a/app/src/main/java/com/jerboa/util/markwon/ScriptRewriteSupportPlugin.kt
+++ b/app/src/main/java/com/jerboa/util/markwon/ScriptRewriteSupportPlugin.kt
@@ -13,8 +13,20 @@ class ScriptRewriteSupportPlugin : AbstractMarkwonPlugin() {
         )
 
     companion object {
-        val SUPERSCRIPT_RGX = Regex("""\^([^\n^]+)\^""")
-        val SUBSCRIPT_RGX = Regex("""(?<!~)~([^\n~]+)~""")
+        /*
+         * Superscript has the definition:
+         * Any text between a '^' that is not interrupted by a linebreak where the starting
+         * or ending text can't be a whitespace character.
+         */
+        val SUPERSCRIPT_RGX = Regex("""\^(?!\s)([^\n^]+)(?<!\s)\^""")
+
+        /*
+         * Subscript has the definition:
+         * Any text between a tilde that is not interrupted by a linebreak where the starting
+         * or ending text can't be a whitespace character. And where the starting the tilde is not prefixed
+         * by another tilde. (To prevent matching with strikethrough)
+         */
+        val SUBSCRIPT_RGX = Regex("""(?<!~)~(?!\s)([^\n~]+)(?<!\s)~""")
 
         fun rewriteLemmyScriptToMarkwonScript(text: String): String =
             text
diff --git a/app/src/test/java/com/jerboa/util/markwon/ScriptRewriteSupportPluginTest.kt b/app/src/test/java/com/jerboa/util/markwon/ScriptRewriteSupportPluginTest.kt
index 0164bacf4..eebd3639a 100644
--- a/app/src/test/java/com/jerboa/util/markwon/ScriptRewriteSupportPluginTest.kt
+++ b/app/src/test/java/com/jerboa/util/markwon/ScriptRewriteSupportPluginTest.kt
@@ -39,5 +39,22 @@ class ScriptRewriteSupportPluginTest {
             listOf("~~text~~", "~~text~~"),
             // Intended to fail, else it will increase the complexity of the regex by a huge margin
             listOf("~~text~", "~~text~"),
+            listOf("~text~~", "<sub>text</sub>~"),
+            listOf(
+                "Tesla model X (range ~ 260kms) first, now a model Y LR (range ~ 480kms)",
+                "Tesla model X (range ~ 260kms) first, now a model Y LR (range ~ 480kms)",
+            ),
+            listOf("~ 5 ~ 6 ~", "~ 5 ~ 6 ~"),
+            listOf("^ ^", "^ ^"),
+            listOf("^", "^"),
+            listOf("~", "~"),
+            listOf("~~", "~~"),
+            listOf("~~~", "~~~"),
+            listOf("^ 99 ^", "^ 99 ^"),
+            listOf("^ 99^", "^ 99^"),
+            listOf("^99 ^", "^99 ^"),
+            listOf("~ 99 ~", "~ 99 ~"),
+            listOf("~ 99~", "~ 99~"),
+            listOf("~99 ~", "~99 ~"),
         )
 }