diff --git a/assets/images/icon-send.png b/assets/images/icon-send.png
new file mode 100644
index 000000000000..d943835597ef
Binary files /dev/null and b/assets/images/icon-send.png differ
diff --git a/src/page/HomePage/Report/ReportHistoryCompose.js b/src/page/HomePage/Report/ReportHistoryCompose.js
index 9777c0a592dc..71e2c90051b0 100644
--- a/src/page/HomePage/Report/ReportHistoryCompose.js
+++ b/src/page/HomePage/Report/ReportHistoryCompose.js
@@ -1,8 +1,9 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import {View} from 'react-native';
+import {View, Image, TouchableOpacity} from 'react-native';
 import styles from '../../../style/StyleSheet';
 import TextInputFocusable from '../../../components/TextInputFocusable';
+import sendIcon from '../../../../assets/images/icon-send.png';
 
 const propTypes = {
     // A method to call when the form is submitted
@@ -75,22 +76,29 @@ class ReportHistoryCompose extends React.Component {
     render() {
         return (
             <View style={[styles.chatItemCompose]}>
-                <TextInputFocusable
-                    multiline
-                    blurOnSubmit
-                    textAlignVertical="top"
-                    numberOfLines={1}
-                    minHeight={40}
-                    maxHeight={60}
-                    placeholder="Write something..."
-                    placeholderTextColor="#7D8B8F"
-                    onChangeText={this.updateComment}
-                    onKeyPress={this.triggerSubmitShortcut}
-                    style={[styles.textInput]}
-                    value={this.state.comment}
-                    returnKeyType="send"
-                    onSubmitEditing={this.submitForm}
-                />
+                <View style={[styles.chatItemComposeBox, styles.flexRow]}>
+                    <TextInputFocusable
+                        multiline
+                        textAlignVertical="top"
+                        placeholder="Write something..."
+                        placeholderTextColor="#7D8B8F"
+                        onChangeText={this.updateComment}
+                        onKeyPress={this.triggerSubmitShortcut}
+                        style={[styles.textInput, styles.textInputCompose, styles.flex4]}
+                        value={this.state.comment}
+                    />
+                    <TouchableOpacity
+                        style={[styles.chatItemSubmitButton, styles.buttonSuccess]}
+                        onPress={this.submitForm}
+                        underlayColor="#fff"
+                    >
+                        <Image
+                            resizeMode="contain"
+                            style={[styles.chatItemSubmitButtonIcon]}
+                            source={sendIcon}
+                        />
+                    </TouchableOpacity>
+                </View>
             </View>
         );
     }
diff --git a/src/style/StyleSheet.js b/src/style/StyleSheet.js
index 3311f27a7b07..dbc5248c07fb 100644
--- a/src/style/StyleSheet.js
+++ b/src/style/StyleSheet.js
@@ -22,6 +22,9 @@ const styles = {
     mr2: {
         marginRight: 8,
     },
+    mr3: {
+        marginRight: 12,
+    },
 
     ml1: {
         marginLeft: 10,
@@ -135,11 +138,13 @@ const styles = {
     textInput: {
         backgroundColor: colors.componentBG,
         borderRadius: 8,
+        height: 40,
         borderColor: colors.border,
         borderWidth: 1,
         color: colors.text,
         fontFamily: 'GTAmericaExp-Regular',
         padding: 12,
+        textAlignVertical: 'center',
     },
 
     textInputReversed: {
@@ -457,6 +462,40 @@ const styles = {
         paddingBottom: 20,
         paddingLeft: 20,
         paddingRight: 20,
+        display: 'flex',
+    },
+
+    chatItemComposeBox: {
+        backgroundColor: '#FFFFFF',
+        borderWidth: 1,
+        borderColor: colors.border,
+        borderRadius: 8,
+        minHeight: 40,
+    },
+
+    textInputCompose: {
+        borderWidth: 0,
+        outline: 0,
+        height: 'auto',
+        minHeight: 38,
+        padding: 10,
+    },
+
+    chatItemSubmitButton: {
+        alignSelf: 'flex-end',
+        borderRadius: 6,
+        height: 32,
+        paddingTop: 8,
+        paddingRight: 6,
+        paddingBottom: 8,
+        paddingLeft: 6,
+        margin: 3,
+        justifyContent: 'center',
+    },
+
+    chatItemSubmitButtonIcon: {
+        height: 20,
+        width: 20,
     },
 
     hamburgerOpenAbsolute: {