diff --git a/briar-android/src/main/res/layout/list_item_thread.xml b/briar-android/src/main/res/layout/list_item_thread.xml
index b0e5ec126d65cb26fabd47e6f5ea6475d507b52b..beca4fa1a02c75570cb95a91fb0ee80a890fdde8 100644
--- a/briar-android/src/main/res/layout/list_item_thread.xml
+++ b/briar-android/src/main/res/layout/list_item_thread.xml
@@ -77,32 +77,20 @@
 			app:layout_constraintLeft_toLeftOf="parent"
 			app:layout_constraintTop_toTopOf="parent"/>
 
-		<com.vanniktech.emoji.EmojiTextView
-			android:id="@+id/text"
-			android:layout_width="0dp"
-			android:layout_height="wrap_content"
-			android:padding="@dimen/margin_medium"
-			android:textColor="?android:attr/textColorPrimary"
-			android:textIsSelectable="true"
-			android:textSize="@dimen/text_size_medium"
-			app:layout_constraintEnd_toEndOf="parent"
-			app:layout_constraintStart_toStartOf="parent"
-			app:layout_constraintTop_toBottomOf="@+id/divider"
-			tools:text="Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua."/>
-
 		<org.briarproject.briar.android.view.AuthorView
 			android:id="@+id/author"
 			android:layout_width="0dp"
 			android:layout_height="wrap_content"
-			android:layout_marginBottom="@dimen/margin_medium"
-			android:layout_marginEnd="@dimen/margin_medium"
-			android:layout_marginLeft="@dimen/margin_medium"
-			android:layout_marginRight="@dimen/margin_medium"
-			android:layout_marginStart="@dimen/margin_medium"
-			app:layout_constraintBottom_toBottomOf="parent"
+			android:paddingEnd="@dimen/margin_medium"
+			android:paddingLeft="@dimen/margin_medium"
+			android:paddingRight="@dimen/margin_medium"
+			android:paddingStart="@dimen/margin_medium"
+			android:paddingTop="@dimen/margin_medium"
+			app:layout_constraintBottom_toBottomOf="@+id/text"
 			app:layout_constraintEnd_toStartOf="@+id/btn_reply"
-			app:layout_constraintStart_toStartOf="@id/text"
-			app:layout_constraintTop_toBottomOf="@id/text"
+			app:layout_constraintStart_toStartOf="parent"
+			app:layout_constraintTop_toTopOf="parent"
+			app:layout_constraintVertical_bias="0.0"
 			app:persona="commenter"/>
 
 		<TextView
@@ -110,15 +98,28 @@
 			style="@style/BriarButtonFlat.Positive.Tiny"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
-			android:layout_marginEnd="@dimen/margin_medium"
-			android:layout_marginLeft="@dimen/margin_medium"
-			android:layout_marginRight="@dimen/margin_medium"
-			android:layout_marginStart="@dimen/margin_medium"
+			android:paddingEnd="@dimen/margin_medium"
+			android:paddingLeft="@dimen/margin_medium"
+			android:paddingRight="@dimen/margin_medium"
+			android:paddingStart="@dimen/margin_medium"
 			android:text="@string/btn_reply"
 			android:textSize="@dimen/text_size_tiny"
+			app:layout_constraintEnd_toEndOf="parent"
+			app:layout_constraintTop_toTopOf="@+id/divider"/>
+
+		<com.vanniktech.emoji.EmojiTextView
+			android:id="@+id/text"
+			android:layout_width="0dp"
+			android:layout_height="wrap_content"
+			android:padding="@dimen/margin_medium"
+			android:textColor="?android:attr/textColorPrimary"
+			android:textIsSelectable="true"
+			android:textSize="@dimen/text_size_medium"
 			app:layout_constraintBottom_toBottomOf="parent"
 			app:layout_constraintEnd_toEndOf="parent"
-			app:layout_constraintTop_toBottomOf="@+id/text"/>
+			app:layout_constraintStart_toStartOf="parent"
+			app:layout_constraintTop_toBottomOf="@id/author"
+			tools:text="Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua."/>
 
 	</android.support.constraint.ConstraintLayout>