diff --git a/app/src/main/res/layout/activity_topic_edit_row.xml b/app/src/main/res/layout/activity_topic_edit_row.xml
new file mode 100644
index 00000000..8251e987
--- /dev/null
+++ b/app/src/main/res/layout/activity_topic_edit_row.xml
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginBottom="5dp"
+    android:paddingEnd="4dp"
+    android:paddingStart="4dp">
+
+    <android.support.v7.widget.CardView xmlns:card_view="http://schemas.android.com/apk/res-auto"
+        android:id="@+id/card_view"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_gravity="center"
+        android:foreground="?android:attr/selectableItemBackground"
+        card_view:cardBackgroundColor="@color/card_background"
+        card_view:cardCornerRadius="5dp"
+        card_view:cardElevation="2dp"
+        card_view:cardPreventCornerOverlap="false"
+        card_view:cardUseCompatPadding="true">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
+            <RelativeLayout
+                android:id="@+id/header"
+                android:layout_width="wrap_content"
+                android:layout_height="0dp"
+                android:layout_weight="1"
+                android:clickable="true"
+                android:focusable="true"
+                android:paddingLeft="16dp"
+                android:paddingRight="16dp"
+                android:paddingTop="16dp">
+
+                <FrameLayout
+                    android:id="@+id/thumbnail_holder"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentTop="true"
+                    android:layout_centerVertical="true"
+                    android:layout_marginEnd="16dp">
+
+                    <ImageView
+                        android:id="@+id/thumbnail"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center"
+                        android:adjustViewBounds="true"
+                        android:contentDescription="@string/post_thumbnail"
+                        android:maxHeight="@dimen/thumbnail_size"
+                        android:maxWidth="@dimen/thumbnail_size"
+                        android:src="@drawable/ic_default_user_thumbnail" />
+                </FrameLayout>
+
+                <TextView
+                    android:id="@+id/username"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentTop="true"
+                    android:layout_toEndOf="@+id/thumbnail_holder"
+                    android:ellipsize="end"
+                    android:maxLines="1"
+                    android:text="@string/post_author"
+                    android:textColor="@color/primary_text"
+                    android:textStyle="bold" />
+
+                <EditText
+                    android:id="@+id/edit_message_subject"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@+id/username"
+                    android:layout_toEndOf="@+id/thumbnail_holder"
+                    android:hint="@string/subject"
+                    android:inputType="textMultiLine"
+                    android:maxLength="80"
+                    android:textSize="10sp"
+                    tools:ignore="SmallSp" />
+            </RelativeLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                android:paddingLeft="16dp"
+                android:paddingRight="16dp">
+
+                <android.support.design.widget.TextInputLayout
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:orientation="vertical">
+
+                    <EditText
+                        android:id="@+id/edit_message_text"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:hint="@string/post_message"
+                        android:inputType="textMultiLine" />
+                </android.support.design.widget.TextInputLayout>
+
+                <android.support.v7.widget.AppCompatImageButton
+                    android:id="@+id/edit_message_submit"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="bottom"
+                    android:layout_marginBottom="5dp"
+                    android:layout_marginEnd="5dp"
+                    android:background="@color/card_background"
+                    android:contentDescription="@string/submit"
+                    android:src="@drawable/ic_send" />
+            </LinearLayout>
+        </LinearLayout>
+    </android.support.v7.widget.CardView>
+</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_topic_quick_reply_row.xml b/app/src/main/res/layout/activity_topic_quick_reply_row.xml
index c77d3c07..29c342f0 100644
--- a/app/src/main/res/layout/activity_topic_quick_reply_row.xml
+++ b/app/src/main/res/layout/activity_topic_quick_reply_row.xml
@@ -73,7 +73,7 @@
                     android:layout_height="wrap_content"
                     android:layout_below="@+id/username"
                     android:layout_toEndOf="@+id/thumbnail_holder"
-                    android:hint="@string/quick_reply_subject"
+                    android:hint="@string/subject"
                     android:inputType="textMultiLine"
                     android:maxLength="80"
                     android:textSize="10sp"
@@ -109,7 +109,7 @@
                     android:layout_marginBottom="5dp"
                     android:layout_marginEnd="5dp"
                     android:background="@color/card_background"
-                    android:contentDescription="@string/quick_reply_submit"
+                    android:contentDescription="@string/submit"
                     android:src="@drawable/ic_send" />
             </LinearLayout>
         </LinearLayout>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 1e0e3803..19d976d4 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -50,8 +50,9 @@
     <string name="button_next">next</string>
     <string name="button_last">last</string>
     <string name="quick_reply">Quick reply&#8230;</string>
-    <string name="quick_reply_subject">Subject&#8230;</string>
-    <string name="quick_reply_submit">Submit</string>
+    <string name="subject">Subject&#8230;</string>
+    <string name="submit">Submit</string>
+    <string name="post_message">Message&#8230;</string>
 
     <!--Profile Activity-->
     <string name="username">Username</string>