diff --git a/briar-android/res/drawable/round_button.xml b/briar-android/res/drawable/round_button.xml
deleted file mode 100644
index 421deb97a..000000000
--- a/briar-android/res/drawable/round_button.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-	A FAB does not work, because even with fabSize="mini" it will be too big due to shadow drawing
-	on lower API levels
--->
-<selector
-	xmlns:android="http://schemas.android.com/apk/res/android">
-	<item>
-		<shape android:shape="oval">
-			<solid android:color="@color/briar_primary"/>
-		</shape>
-	</item>
-</selector>
\ No newline at end of file
diff --git a/briar-android/res/drawable/social_send_now_white.xml b/briar-android/res/drawable/social_send_now_white.xml
index 43662f48b..29d5069d5 100644
--- a/briar-android/res/drawable/social_send_now_white.xml
+++ b/briar-android/res/drawable/social_send_now_white.xml
@@ -1,6 +1,6 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
+        android:width="38dp"
+        android:height="38dp"
         android:viewportHeight="24.0"
         android:viewportWidth="24.0">
 	<path
diff --git a/briar-android/res/layout/activity_conversation.xml b/briar-android/res/layout/activity_conversation.xml
index 19f951744..8f0fa1a34 100644
--- a/briar-android/res/layout/activity_conversation.xml
+++ b/briar-android/res/layout/activity_conversation.xml
@@ -46,33 +46,9 @@
 
 	<View style="@style/Divider.Horizontal"/>
 
-	<LinearLayout
+	<include
+		layout="@layout/text_input_field"
 		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:background="@color/button_bar_background"
-		android:orientation="horizontal"
-		android:paddingLeft="@dimen/margin_medium"
-		android:paddingStart="@dimen/margin_medium">
-
-		<EditText
-			android:id="@+id/contentView"
-			android:layout_width="0dp"
-			android:layout_height="match_parent"
-			android:layout_weight="1"
-			android:hint="@string/private_message_hint"
-			android:inputType="text|textMultiLine|textCapSentences"/>
-
-		<ImageButton
-			android:id="@+id/sendButton"
-			android:layout_width="38dp"
-			android:layout_height="38dp"
-			android:layout_margin="@dimen/margin_small"
-			android:background="@drawable/round_button"
-			android:src="@drawable/social_send_now_white"
-			android:contentDescription="@string/send"
-		    android:elevation="@dimen/margin_tiny"
-			/>
-
-	</LinearLayout>
+		android:layout_height="wrap_content"/>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/briar-android/res/layout/text_input_field.xml b/briar-android/res/layout/text_input_field.xml
index c59e93c7e..8b60f7b44 100644
--- a/briar-android/res/layout/text_input_field.xml
+++ b/briar-android/res/layout/text_input_field.xml
@@ -6,6 +6,7 @@
 	android:layout_height="wrap_content"
 	android:background="@color/button_bar_background"
 	android:elevation="@dimen/margin_tiny"
+	android:gravity="bottom"
 	android:orientation="horizontal"
 	android:paddingLeft="@dimen/margin_large"
 	android:paddingStart="@dimen/margin_large">
@@ -21,8 +22,8 @@
 
 	<ImageView
 		android:id="@+id/btn_send"
-		android:layout_width="38dp"
-		android:layout_height="38dp"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
 		android:layout_margin="@dimen/margin_medium"
 		android:background="?attr/selectableItemBackground"
 		android:clickable="true"
diff --git a/briar-android/src/org/briarproject/android/contact/ConversationActivity.java b/briar-android/src/org/briarproject/android/contact/ConversationActivity.java
index 116d2a635..46a40ba0f 100644
--- a/briar-android/src/org/briarproject/android/contact/ConversationActivity.java
+++ b/briar-android/src/org/briarproject/android/contact/ConversationActivity.java
@@ -18,7 +18,6 @@ import android.view.MenuItem;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.widget.EditText;
-import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.TextView;
 import android.widget.Toast;
@@ -108,7 +107,7 @@ public class ConversationActivity extends BriarActivity
 	private TextView toolbarTitle;
 	private BriarRecyclerView list;
 	private EditText content;
-	private ImageButton sendButton;
+	private View sendButton;
 
 	// Fields that are accessed from background threads must be volatile
 	@Inject
@@ -169,8 +168,8 @@ public class ConversationActivity extends BriarActivity
 		list.setAdapter(adapter);
 		list.setEmptyText(getString(R.string.no_private_messages));
 
-		content = (EditText) findViewById(R.id.contentView);
-		sendButton = (ImageButton) findViewById(R.id.sendButton);
+		content = (EditText) findViewById(R.id.input_text);
+		sendButton = findViewById(R.id.btn_send);
 		if (sendButton != null) {
 			// Enabled after loading the conversation
 			sendButton.setEnabled(false);