diff --git a/src/compose/ComposeBox.js b/src/compose/ComposeBox.js
index 3f644da3114..81b99ec2dc7 100644
--- a/src/compose/ComposeBox.js
+++ b/src/compose/ComposeBox.js
@@ -1,6 +1,6 @@
 /* @flow strict-local */
 import React, { PureComponent } from 'react';
-import { Platform, View, TextInput, findNodeHandle, ScrollView } from 'react-native';
+import { Platform, View, TextInput, findNodeHandle } from 'react-native';
 import type { LayoutEvent } from 'react-native/Libraries/Types/CoreEventTypes';
 import TextInputReset from 'react-native-text-input-reset';
 
@@ -32,6 +32,7 @@ import ComposeMenu from './ComposeMenu';
 import getComposeInputPlaceholder from './getComposeInputPlaceholder';
 import NotSubscribed from '../message/NotSubscribed';
 import AnnouncementOnly from '../message/AnnouncementOnly';
+import styles from '../styles';
 
 import {
   getAuth,
@@ -289,13 +290,18 @@ class ComposeBox extends PureComponent<Props, State> {
     },
     composeBox: {
       flexDirection: 'row',
-      alignItems: 'flex-end',
+      justifyContent: 'space-between',
+    },
+    composeMenu: {
+      alignSelf: 'flex-end',
     },
     composeText: {
+      alignSelf: 'center',
       paddingVertical: 8,
     },
     composeSendButton: {
       padding: 8,
+      alignSelf: 'flex-end',
     },
     topicInput: {
       borderWidth: 0,
@@ -356,11 +362,12 @@ class ComposeBox extends PureComponent<Props, State> {
         </View>
         <View style={[this.styles.composeBox, style]} onLayout={this.handleLayoutChange}>
           <ComposeMenu
+            style={this.styles.composeMenu}
             destinationNarrow={this.getDestinationNarrow()}
             expanded={isMenuExpanded}
             onExpandContract={this.handleComposeMenuToggle}
           />
-          <ScrollView contentContainerStyle={this.styles.composeText}>
+          <View style={[styles.flexed, this.styles.composeText]}>
             {this.getCanSelectTopic() && (
               <Input
                 style={this.styles.topicInput}
@@ -392,7 +399,7 @@ class ComposeBox extends PureComponent<Props, State> {
               onSelectionChange={this.handleMessageSelectionChange}
               onTouchStart={this.handleInputTouchStart}
             />
-          </ScrollView>
+          </View>
           <FloatingActionButton
             style={this.styles.composeSendButton}
             Icon={editMessage === null ? IconSend : IconDone}
diff --git a/src/compose/ComposeMenu.js b/src/compose/ComposeMenu.js
index 48ec92cc02c..b1ba2f8ef7f 100644
--- a/src/compose/ComposeMenu.js
+++ b/src/compose/ComposeMenu.js
@@ -4,6 +4,7 @@ import { Platform, StyleSheet, View } from 'react-native';
 import type { DocumentPickerResponse } from 'react-native-document-picker';
 // $FlowFixMe
 import ImagePicker from 'react-native-image-picker';
+import type { ViewStyleProp } from 'react-native/Libraries/StyleSheet/StyleSheet';
 
 import type { Dispatch, Narrow } from '../types';
 import { connect } from '../react-redux';
@@ -17,6 +18,7 @@ type Props = $ReadOnly<{|
   dispatch: Dispatch,
   expanded: boolean,
   destinationNarrow: Narrow,
+  style?: ViewStyleProp,
   onExpandContract: () => void,
 |}>;
 
@@ -141,10 +143,10 @@ class ComposeMenu extends PureComponent<Props> {
   });
 
   render() {
-    const { dispatch, expanded, onExpandContract } = this.props;
+    const { dispatch, expanded, onExpandContract, style } = this.props;
     const numIcons = Platform.OS === 'android' ? 4 : 3;
     return (
-      <View style={this.styles.composeMenu}>
+      <View style={[style, this.styles.composeMenu]}>
         <AnimatedComponent
           stylePropertyName="width"
           fullValue={40 * numIcons}