diff --git a/.ruby-version b/.ruby-version
index 54978911..ea897ac5 100644
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-ruby-3.4.5
+ruby-4.0.5
diff --git a/__tests__/components/highlighting_text.test.js b/__tests__/components/highlighting_text.test.js
index 15280356..c2067a3b 100644
--- a/__tests__/components/highlighting_text.test.js
+++ b/__tests__/components/highlighting_text.test.js
@@ -1,4 +1,6 @@
+import { Platform } from 'react-native'
 import HighlightingText from '../../src/components/text/highlighting_text'
+import editorHtml from '../../src/components/text/editor_html'
 import App from '../../src/stores/App'
 
 jest.mock('../../src/stores/App', () => ({
@@ -24,6 +26,38 @@ jest.mock('../../src/components/keyboard/editor_keyboard_avoiding_view', () => {
 })
 
 describe('HighlightingText font scaling', () => {
+  test('requests native WebView focus when focusing the editor', () => {
+    const requestFocus = jest.fn()
+    const editor = new HighlightingText({})
+    editor.webview = { current: { requestFocus } }
+    editor.editorConfig = () => ({ editable: true })
+    editor.injectJavaScript = jest.fn()
+
+    editor.syncEditor({ focus: true })
+
+    expect(requestFocus).toHaveBeenCalled()
+  })
+
+  test('keeps Android newlines in place instead of rewriting the document', () => {
+    expect(editorHtml).toContain('insertLineBreakInPlace')
+    expect(editorHtml).toContain('execCommand("insertLineBreak")')
+    expect(editorHtml).toMatch(/if \(!insertedNewline\) \{\s*insertLineBreakInPlace\(\)/)
+  })
+
+  test('enables the Android keyboard proxy only when autoFocus is set', () => {
+    const original = Platform.OS
+    Platform.OS = 'android'
+    try {
+      const with_focus = new HighlightingText({ autoFocus: true })
+      const without_focus = new HighlightingText({ autoFocus: false })
+      expect(with_focus.state.android_focus_proxy).toBe(true)
+      expect(without_focus.state.android_focus_proxy).toBe(false)
+    }
+    finally {
+      Platform.OS = original
+    }
+  })
+
   test('uses the full system font scale by default', () => {
     App.font_scale = 3.5
     const editor = new HighlightingText({})
diff --git a/android/app/build.gradle b/android/app/build.gradle
index 0e056a34..f28d532d 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -102,7 +102,7 @@ android {
         applicationId "blog.micro.android"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 98
+        versionCode 99
         versionName "3.0.2"
 
         buildConfigField "String", "REACT_NATIVE_RELEASE_LEVEL", "\"${findProperty('reactNativeReleaseLevel') ?: 'stable'}\""
diff --git a/mise.toml b/mise.toml
index c85867ad..f3d14c86 100644
--- a/mise.toml
+++ b/mise.toml
@@ -1,2 +1,2 @@
 [tools]
-ruby = "3.4.5"
+ruby = "4.0.5"
diff --git a/src/components/text/editor_html.js b/src/components/text/editor_html.js
index 6b29c4dc..69199c28 100644
--- a/src/components/text/editor_html.js
+++ b/src/components/text/editor_html.js
@@ -194,7 +194,7 @@ const editorHtml = String.raw`<!doctype html>
 
   </style>
 </head>
-<body><div class="editor_shell"><div contenteditable="true" class="editor" id="editor" spellcheck="true" autocapitalize="sentences"></div><div class="editor_bottom_scrim" aria-hidden="true"></div></div>
+<body><div class="editor_shell"><div contenteditable="true" class="editor" id="editor" spellcheck="true" autocapitalize="sentences" enterkeyhint="enter" inputmode="text"></div><div class="editor_bottom_scrim" aria-hidden="true"></div></div>
   <script>
     (function () {
       var isIgnoringInput = false;
@@ -601,6 +601,35 @@ const editorHtml = String.raw`<!doctype html>
         return text.length > 5000;
       }
 
+      function editorHasFocus(root) {
+        var active = document.activeElement;
+        return active === root || !!(root && root.contains(active));
+      }
+
+      function insertLineBreakInPlace() {
+        var root = editor();
+        var selection = window.getSelection();
+        if (!selection || selection.rangeCount === 0) {
+          return false;
+        }
+
+        try {
+          var range = selection.getRangeAt(0);
+          range.deleteContents();
+          var br = document.createElement("br");
+          range.insertNode(br);
+          range.setStartAfter(br);
+          range.collapse(true);
+          selection.removeAllRanges();
+          selection.addRange(range);
+          root.focus();
+          return true;
+        }
+        catch (error) {
+          return false;
+        }
+      }
+
       function applyStyles(selection, options) {
         var force = options && options.force;
         if ((!force && isIgnoringInput) || isComposing || isApplyingStyles) {
@@ -614,8 +643,12 @@ const editorHtml = String.raw`<!doctype html>
         }
 
         var saved = selection || currentSelection();
+        var hadFocus = options && options.hadFocus != null ? !!options.hadFocus : editorHasFocus(root);
         isApplyingStyles = true;
         root.innerHTML = highlightHtml(text);
+        if (hadFocus) {
+          root.focus();
+        }
         setSelectionRange(saved.start, saved.end);
         scheduleClampScrollOffsets();
         isApplyingStyles = false;
@@ -646,22 +679,26 @@ const editorHtml = String.raw`<!doctype html>
 
       function replaceSelectionWithText(insertedText) {
         var root = editor();
+        var hadFocus = editorHasFocus(root);
         var text = editorPlainText(root);
         var selection = currentSelection();
         var start = Math.min(selection.start, selection.end);
         var end = Math.max(selection.start, selection.end);
         var nextText = text.slice(0, start) + insertedText + text.slice(end);
         var nextPosition = start + insertedText.length;
+        var insertedNewline = insertedText.indexOf("\n") > -1;
 
         root.textContent = nextText;
         applyStyles({
           start: nextPosition,
           end: nextPosition
         }, {
-          force: true
+          force: true,
+          hadFocus: hadFocus || insertedNewline
         });
-        if (insertedText.indexOf("\n") > -1) {
+        if (insertedNewline) {
           setTimeout(function () {
+            editor().focus();
             setSelectionRange(nextPosition, nextPosition);
             scrollSelectionIntoView();
             sendSelectionNow();
@@ -770,6 +807,13 @@ const editorHtml = String.raw`<!doctype html>
           return;
         }
 
+        if (event.inputType === "insertParagraph" || event.inputType === "insertLineBreak") {
+          scheduleChange();
+          scheduleSelection();
+          scheduleClampScrollOffsets();
+          return;
+        }
+
         var root = editor();
         var data = event.data || "";
         var shouldForce = hasTrailingMarker(root);
@@ -798,7 +842,25 @@ const editorHtml = String.raw`<!doctype html>
 
           if (event.inputType === "insertParagraph" || event.inputType === "insertLineBreak") {
             event.preventDefault();
-            replaceSelectionWithText("\n");
+            var isAndroid = /Android/i.test(navigator.userAgent);
+            if (isAndroid) {
+              var insertedNewline = false;
+              try {
+                insertedNewline = document.execCommand("insertLineBreak");
+              }
+              catch (error) {
+                insertedNewline = false;
+              }
+              if (!insertedNewline) {
+                insertLineBreakInPlace();
+              }
+            }
+            else {
+              replaceSelectionWithText("\n");
+            }
+            scheduleChange();
+            scheduleSelection();
+            scheduleClampScrollOffsets();
             return;
           }
 
diff --git a/src/components/text/highlighting_text.js b/src/components/text/highlighting_text.js
index 7aad0bea..90371d50 100644
--- a/src/components/text/highlighting_text.js
+++ b/src/components/text/highlighting_text.js
@@ -1,6 +1,6 @@
 import * as React from 'react'
 import { observer } from 'mobx-react'
-import { Keyboard, Platform, StyleSheet, View } from 'react-native'
+import { Keyboard, Platform, StyleSheet, TextInput, View } from 'react-native'
 import { WebView } from 'react-native-webview'
 import App from '../../stores/App'
 import { EditorKeyboardFrameContext } from '../keyboard/editor_keyboard_avoiding_view'
@@ -15,7 +15,8 @@ export default class HighlightingText extends React.Component {
     this.state = {
       container_height: 0,
       measured_editor_height: 0,
-      keyboard_scroll_request: 0
+      keyboard_scroll_request: 0,
+      android_focus_proxy: Platform.OS === 'android' && !!props.autoFocus
     }
     this.container = React.createRef()
     this.webview = React.createRef()
@@ -27,6 +28,7 @@ export default class HighlightingText extends React.Component {
     this.keyboard_show_listener = null
     this.keyboard_hide_listener = null
     this.pending_focus_options = null
+    this.android_proxy_frame = null
   }
 
   componentDidMount() {
@@ -69,6 +71,9 @@ export default class HighlightingText extends React.Component {
   componentWillUnmount() {
     this.keyboard_show_listener?.remove()
     this.keyboard_hide_listener?.remove()
+    if (this.android_proxy_frame) {
+      cancelAnimationFrame(this.android_proxy_frame)
+    }
   }
 
   normalizedValue(props = this.props) {
@@ -290,6 +295,9 @@ export default class HighlightingText extends React.Component {
     }
 
     this.last_config = JSON.stringify(config)
+    if (payload.focus) {
+      this.webview.current?.requestFocus?.()
+    }
     this.injectJavaScript(`window.MicroBlogReactEditor.updateFromReact(${JSON.stringify(payload)})`)
   }
 
@@ -313,6 +321,14 @@ export default class HighlightingText extends React.Component {
       if (this.pending_focus_options) {
         this.focus(this.pending_focus_options)
       }
+      if (this.state.android_focus_proxy) {
+        this.focus({ cursorToEnd: true })
+        this.android_proxy_frame = requestAnimationFrame(() => {
+          this.setState({
+            android_focus_proxy: false
+          })
+        })
+      }
       return
     }
 
@@ -354,6 +370,21 @@ export default class HighlightingText extends React.Component {
 
     return (
       <View ref={this.container} onLayout={this.handleLayout} style={this.webviewStyle()}>
+        {
+          this.state.android_focus_proxy ?
+            <TextInput
+              style={styles.android_focus_proxy}
+              autoFocus={true}
+              caretHidden={true}
+              autoCorrect={false}
+              spellCheck={false}
+              showSoftInputOnFocus={true}
+              importantForAutofill="no"
+              importantForAccessibility="no-hide-descendants"
+              pointerEvents="none"
+            />
+            : null
+        }
         <WebView
           ref={this.webview}
           source={{ html: editorHtml, baseUrl: 'https://micro.blog' }}
@@ -383,5 +414,13 @@ export default class HighlightingText extends React.Component {
 const styles = StyleSheet.create({
   webview: {
     flex: 1
+  },
+  android_focus_proxy: {
+    position: 'absolute',
+    width: 1,
+    height: 1,
+    opacity: 0,
+    left: 0,
+    top: 0
   }
 })
