diff --git a/android/app/build.gradle b/android/app/build.gradle
index e1dd87a5..38b7fd39 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -94,8 +94,8 @@ android {
         applicationId 'cc.agentlabs.opencode'
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 42
-        versionName "0.4.15"
+        versionCode 43
+        versionName "0.4.16"
 
         buildConfigField "String", "REACT_NATIVE_RELEASE_LEVEL", "\"${findProperty('reactNativeReleaseLevel') ?: 'stable'}\""
     }
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 8bbdbdc2..7dbd16e8 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -15,6 +15,10 @@
     </intent>
   </queries>
   <application android:name=".MainApplication" android:label="@string/app_name" android:icon="@mipmap/ic_launcher" android:roundIcon="@mipmap/ic_launcher_round" android:allowBackup="true" android:theme="@style/AppTheme" android:supportsRtl="true" android:usesCleartextTraffic="true" android:enableOnBackInvokedCallback="false" android:fullBackupContent="@xml/secure_store_backup_rules" android:dataExtractionRules="@xml/secure_store_data_extraction_rules">
+    <!-- Edge-to-edge keyboard: tell the OS to resize content when the keyboard
+         opens, not overlay it. Requires targetSdk 35+ (Android 12L). On older
+         devices the meta-data is simply ignored. -->
+    <meta-data android:name="android:activity.keyboardEdgeInsetsBehavior" android:value="resizes-content" />
     <meta-data android:name="expo.modules.updates.ENABLED" android:value="false"/>
     <meta-data android:name="expo.modules.updates.EXPO_UPDATES_CHECK_ON_LAUNCH" android:value="ALWAYS"/>
     <meta-data android:name="expo.modules.updates.EXPO_UPDATES_LAUNCH_WAIT_MS" android:value="0"/>
diff --git a/app.json b/app.json
index f3ff1218..42b96fea 100644
--- a/app.json
+++ b/app.json
@@ -2,7 +2,7 @@
   "expo": {
     "name": "OpenCode",
     "slug": "opencode-mobile",
-    "version": "0.4.15",
+    "version": "0.4.16",
     "orientation": "portrait",
     "scheme": "opencode",
     "userInterfaceStyle": "automatic",
diff --git a/app/session/[id].tsx b/app/session/[id].tsx
index 97f885f0..cb5eccdc 100644
--- a/app/session/[id].tsx
+++ b/app/session/[id].tsx
@@ -593,18 +593,15 @@ export default function SessionScreen() {
 
       <KeyboardAvoidingView
         style={[s.container, isDark && s.containerDark]}
-        // Both platforms use "padding" so the composer/toolbar is pushed up
-        // above the keyboard via JS-measured keyboard height.
+        // iOS: "padding" pushes the composer above the keyboard via JS-measured
+        // keyboard height. The offset accounts for the navigation header.
         //
-        // Android previously relied on the native android:windowSoftInputMode
-        // (adjustResize, see AndroidManifest.xml) with behavior={undefined}
-        // to let the OS resize the window (see #70/#53). Since adopting
-        // Expo's mandatory edge-to-edge display, Android no longer resizes
-        // the window when the keyboard opens — the system assumes insets are
-        // handled dynamically — so adjustResize became a no-op and the
-        // bottom toolbar + input were left completely hidden behind the
-        // keyboard (#147). "padding" restores avoidance without depending
-        // on native resize.
+        // Android: the manifest now declares
+        //   android:activity.keyboardEdgeInsetsBehavior = "resizes-content"
+        // which tells the OS to shrink the content area when the keyboard opens,
+        // even with edge-to-edge enabled. This restores adjustResize behavior
+        // that edge-to-edge previously broke (#147, #194). "padding" acts as a
+        // safety net on older devices where the meta-data is ignored.
         behavior="padding"
         keyboardVerticalOffset={Platform.OS === "ios" ? 90 : 0}
       >
@@ -810,6 +807,7 @@ export default function SessionScreen() {
               editable={!speech.listening}
               multiline
               maxLength={10000}
+              submitBehavior="newline"
               testID="chat-message-input"
             />
             {/* Stop button: only when busy and no input */}