diff --git a/res/drawable/compose_background.xml b/res/drawable/compose_background.xml
new file mode 100644
index 0000000000..c3369ec70f
--- /dev/null
+++ b/res/drawable/compose_background.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+       android:shape="rectangle">
+    <solid android:color="@android:color/transparent" />
+    <padding android:bottom="@dimen/conversation_activity_compose_padding"
+             android:left="@dimen/conversation_activity_compose_padding"
+             android:right="@dimen/conversation_activity_compose_padding"
+             android:top="@dimen/conversation_activity_compose_padding" />
+</shape>
\ No newline at end of file
diff --git a/res/layout/conversation_activity.xml b/res/layout/conversation_activity.xml
index 15e9930af5..e339d7951d 100644
--- a/res/layout/conversation_activity.xml
+++ b/res/layout/conversation_activity.xml
@@ -85,8 +85,7 @@
                         android:layout_weight="1.0"
                         android:autoText="true"
                         android:capitalize="sentences"
-                        android:background="#00ffffff"
-                        android:layout_margin="12dp"
+                        android:background="@drawable/compose_background"
                         android:paddingRight="0dp"
                         android:imeOptions="actionSend|flagNoEnterAction|flagNoExtractUi"
                         android:inputType="textShortMessage|textAutoCorrect|textCapSentences|textMultiLine"
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 3bdffa66d3..3a699f216e 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -14,6 +14,7 @@
     <dimen name="contact_selection_photo_size">50dp</dimen>
     <dimen name="thumbnail_max_size">230dp</dimen>
     <dimen name="preference_fragment_padding_side">8dp</dimen>
+    <dimen name="conversation_activity_compose_padding">12dp</dimen>
 
     <integer name="media_overview_cols">3</integer>
 </resources>