diff --git a/app/src/assets/scss/util/_function.scss b/app/src/assets/scss/util/_function.scss
index 344099b1a..1c3b51924 100644
--- a/app/src/assets/scss/util/_function.scss
+++ b/app/src/assets/scss/util/_function.scss
@@ -91,10 +91,6 @@
     }
   }
 
-  &__displayblock {
-    display: block;
-  }
-
   &__block {
     width: 100%;
   }
diff --git a/app/src/config/editor.ts b/app/src/config/editor.ts
index 79447c8a8..472e6b961 100644
--- a/app/src/config/editor.ts
+++ b/app/src/config/editor.ts
@@ -333,16 +333,14 @@ export const editor = {
                 (editor.element.querySelector("#dynamicLoadBlocks") as HTMLInputElement).value = "1024";
             }
 
-            const markdown = {
-                inlineSup: (editor.element.querySelector("#editorMarkdownInlineSup") as HTMLInputElement).checked,
-                inlineSub: (editor.element.querySelector("#editorMarkdownInlineSub") as HTMLInputElement).checked,
-                inlineTag: (editor.element.querySelector("#editorMarkdownInlineTag") as HTMLInputElement).checked,
-                inlineMath: (editor.element.querySelector("#editorMarkdownInlineMath") as HTMLInputElement).checked
-            };
-
             fetchPost("/api/setting/setEditor", {
                 fullWidth: (editor.element.querySelector("#fullWidth") as HTMLInputElement).checked,
-                markdown: markdown,
+                markdown:  {
+                    inlineSup: (editor.element.querySelector("#editorMarkdownInlineSup") as HTMLInputElement).checked,
+                    inlineSub: (editor.element.querySelector("#editorMarkdownInlineSub") as HTMLInputElement).checked,
+                    inlineTag: (editor.element.querySelector("#editorMarkdownInlineTag") as HTMLInputElement).checked,
+                    inlineMath: (editor.element.querySelector("#editorMarkdownInlineMath") as HTMLInputElement).checked
+                },
                 allowHTMLBLockScript: (editor.element.querySelector("#allowHTMLBLockScript") as HTMLInputElement).checked,
                 justify: (editor.element.querySelector("#justify") as HTMLInputElement).checked,
                 rtl: (editor.element.querySelector("#rtl") as HTMLInputElement).checked,
diff --git a/app/src/mobile/settings/editor.ts b/app/src/mobile/settings/editor.ts
index 6ff3e3c81..2f46c1e46 100644
--- a/app/src/mobile/settings/editor.ts
+++ b/app/src/mobile/settings/editor.ts
@@ -14,6 +14,12 @@ const setEditor = (modelMainElement: Element) => {
         dynamicLoadBlocks = 1024;
         (modelMainElement.querySelector("#dynamicLoadBlocks") as HTMLInputElement).value = "1024";
     }
+    window.siyuan.config.editor.markdown=  {
+        inlineSup: (modelMainElement.querySelector("#editorMarkdownInlineSup") as HTMLInputElement).checked,
+            inlineSub: (modelMainElement.querySelector("#editorMarkdownInlineSub") as HTMLInputElement).checked,
+        inlineTag: (modelMainElement.querySelector("#editorMarkdownInlineTag") as HTMLInputElement).checked,
+        inlineMath: (modelMainElement.querySelector("#editorMarkdownInlineMath") as HTMLInputElement).checked
+    };
     window.siyuan.config.editor.dynamicLoadBlocks = dynamicLoadBlocks;
     window.siyuan.config.editor.justify = (modelMainElement.querySelector("#justify") as HTMLInputElement).checked;
     window.siyuan.config.editor.rtl = (modelMainElement.querySelector("#rtl") as HTMLInputElement).checked;
@@ -163,82 +169,122 @@ export const initEditor = () => {
     <span class="fn__space"></span>
     <input class="b3-switch fn__flex-center" id="virtualBlockRef" type="checkbox"${window.siyuan.config.editor.virtualBlockRef ? " checked" : ""}/>
 </label>
-<div class="b3-label fn__displayblock">
+<div class="b3-label">
     ${window.siyuan.languages.md9}
     <span class="fn__hr"></span>
     <input class="b3-text-field fn__block" id="virtualBlockRefInclude" value="${window.siyuan.config.editor.virtualBlockRefInclude}" />
     <div class="b3-label__text">${window.siyuan.languages.md36}</div>
 </div>
-<div class="b3-label fn__displayblock">
+<div class="b3-label">
     ${window.siyuan.languages.md35}
     <span class="fn__hr"></span>
     <input class="b3-text-field fn__block" id="virtualBlockRefExclude" value="${window.siyuan.config.editor.virtualBlockRefExclude}" />
     <div class="b3-label__text">${window.siyuan.languages.md36}</div>
     <div class="b3-label__text">${window.siyuan.languages.md41}</div>
 </div>
-<div class="b3-label fn__displayblock">
+<div class="b3-label">
     ${window.siyuan.languages.md39}
     <span class="fn__hr"></span>
     <input class="b3-text-field fn__block" id="plantUMLServePath" value="${window.siyuan.config.editor.plantUMLServePath}"/>
     <div class="b3-label__text">${window.siyuan.languages.md40}</div>
 </div>
-<div class="b3-label fn__displayblock">
+<div class="b3-label">
     ${window.siyuan.languages.dynamicLoadBlocks}
     <span class="fn__hr"></span>
     <input class="b3-text-field fn__block" id="dynamicLoadBlocks" type="number" min="48" max="1024" value="${window.siyuan.config.editor.dynamicLoadBlocks}"/>
     <div class="b3-label__text">${window.siyuan.languages.dynamicLoadBlocksTip}</div>
 </div>
-<div class="b3-label fn__displayblock">
+<div class="b3-label">
     ${window.siyuan.languages.md37}
     <span class="fn__hr"></span>
     <input class="b3-text-field fn__block" id="blockRefDynamicAnchorTextMaxLen" type="number" min="1" max="5120" value="${window.siyuan.config.editor.blockRefDynamicAnchorTextMaxLen}"/>
     <div class="b3-label__text">${window.siyuan.languages.md38}</div>
 </div>
-<div class="b3-label fn__displayblock">
+<div class="b3-label">
     ${window.siyuan.languages.backlinkExpand}
     <span class="fn__hr"></span>
     <input class="b3-text-field fn__block" id="backlinkExpandCount" type="number" min="0" max="512" value="${window.siyuan.config.editor.backlinkExpandCount}"/>
     <div class="b3-label__text">${window.siyuan.languages.backlinkExpandTip}</div>
 </div>
-<div class="b3-label fn__displayblock">
+<div class="b3-label">
     ${window.siyuan.languages.backmentionExpand}
     <span class="fn__hr"></span>
     <input class="b3-text-field fn__block" id="backmentionExpandCount" type="number" min="-1" max="512" value="${window.siyuan.config.editor.backmentionExpandCount}"/>
     <div class="b3-label__text">${window.siyuan.languages.backmentionExpandTip}</div>
 </div>
-<div class="b3-label fn__displayblock">
+<div class="b3-label">
     ${window.siyuan.languages.generateHistory}
     <span class="fn__hr"></span>
     <input class="b3-text-field fn__block" id="generateHistoryInterval" type="number" min="0" max="120" value="${window.siyuan.config.editor.generateHistoryInterval}"/>
     <div class="b3-label__text">${window.siyuan.languages.generateHistoryInterval}</div>
 </div>
-<div class="b3-label fn__displayblock">
+<div class="b3-label">
     ${window.siyuan.languages.historyRetentionDays} 
     <a href="javascript:void(0)" id="clearHistory">${window.siyuan.languages.clearHistory}</a>
     <span class="fn__hr"></span>
     <input class="b3-text-field fn__block" id="historyRetentionDays" type="number" min="0" value="${window.siyuan.config.editor.historyRetentionDays}"/>
     <div class="b3-label__text">${window.siyuan.languages.historyRetentionDaysTip}</div>
 </div>
-<div class="b3-label fn__displayblock">
+<div class="b3-label">
     ${window.siyuan.languages.fontSize} 
     <span class="ft__on-surface">${window.siyuan.config.editor.fontSize}</span>
     <div class="fn__hr"></div>
     <input id="fontSize" class="b3-slider fn__block" max="72" min="9" step="1" type="range" value="${window.siyuan.config.editor.fontSize}">
     <div class="b3-label__text">${window.siyuan.languages.fontSizeTip}</div>
 </div>
-<div class="b3-label fn__displayblock">
+<div class="b3-label">
     ${window.siyuan.languages.md29} 
     <span class="ft__on-surface">${window.siyuan.config.editor.codeTabSpaces}</span>
     <div class="fn__hr"></div>
     <input class="b3-slider fn__block" id="codeTabSpaces" max="8" min="0" step="2" type="range" value="${window.siyuan.config.editor.codeTabSpaces}">
     <div class="b3-label__text">${window.siyuan.languages.md30}</div>
 </div>
-<div class="b3-label fn__displayblock">
+<div class="b3-label">
     ${window.siyuan.languages.katexMacros}
     <div class="fn__hr"></div>
     <textarea class="b3-text-field fn__block" id="katexMacros">${window.siyuan.config.editor.katexMacros}</textarea>
     <div class="b3-label__text">${window.siyuan.languages.katexMacrosTip}</div>
-</div>`,
+</div>
+<label class="fn__flex b3-label">
+    <div class="fn__flex-1">
+       ${window.siyuan.languages.allowHTMLBLockScript}
+        <div class="b3-label__text">${window.siyuan.languages.allowHTMLBLockScriptTip}</div>
+    </div>
+    <span class="fn__space"></span>
+    <input class="b3-switch fn__flex-center" id="allowHTMLBLockScript" type="checkbox"${window.siyuan.config.editor.allowHTMLBLockScript ? " checked" : ""}/>
+</label>
+<label class="fn__flex b3-label">
+    <div class="fn__flex-1">
+       ${window.siyuan.languages.editorMarkdownInlineSup}
+        <div class="b3-label__text">${window.siyuan.languages.editorMarkdownInlineSupTip}</div>
+    </div>
+    <span class="fn__space"></span>
+    <input class="b3-switch fn__flex-center" id="editorMarkdownInlineSup" type="checkbox"${window.siyuan.config.editor.markdown.inlineSup ? " checked" : ""}/>
+</label>
+<label class="fn__flex b3-label">
+    <div class="fn__flex-1">
+       ${window.siyuan.languages.editorMarkdownInlineSub}
+        <div class="b3-label__text">${window.siyuan.languages.editorMarkdownInlineSubTip}</div>
+    </div>
+    <span class="fn__space"></span>
+    <input class="b3-switch fn__flex-center" id="editorMarkdownInlineSub" type="checkbox"${window.siyuan.config.editor.markdown.inlineSub ? " checked" : ""}/>
+</label>
+<label class="fn__flex b3-label">
+    <div class="fn__flex-1">
+       ${window.siyuan.languages.editorMarkdownInlineTag}
+        <div class="b3-label__text">${window.siyuan.languages.editorMarkdownInlineTagTip}</div>
+    </div>
+    <span class="fn__space"></span>
+    <input class="b3-switch fn__flex-center" id="editorMarkdownInlineTag" type="checkbox"${window.siyuan.config.editor.markdown.inlineTag ? " checked" : ""}/>
+</label>
+<label class="fn__flex b3-label">
+    <div class="fn__flex-1">
+       ${window.siyuan.languages.editorMarkdownInlineMath}
+        <div class="b3-label__text">${window.siyuan.languages.editorMarkdownInlineMathTip}</div>
+    </div>
+    <span class="fn__space"></span>
+    <input class="b3-switch fn__flex-center" id="editorMarkdownInlineMath" type="checkbox"${window.siyuan.config.editor.markdown.inlineMath ? " checked" : ""}/>
+</label>`,
         bindEvent(modelMainElement: HTMLElement) {
             modelMainElement.querySelector("#clearHistory").addEventListener("click", () => {
                 confirmDialog(window.siyuan.languages.clearHistory, window.siyuan.languages.confirmClearHistory, () => {