diff --git a/Clover/app/src/main/java/org/floens/chan/ui/fragment/ReplyFragment.java b/Clover/app/src/main/java/org/floens/chan/ui/fragment/ReplyFragment.java
index a8467a38..d0d1be7c 100644
--- a/Clover/app/src/main/java/org/floens/chan/ui/fragment/ReplyFragment.java
+++ b/Clover/app/src/main/java/org/floens/chan/ui/fragment/ReplyFragment.java
@@ -245,6 +245,10 @@ public class ReplyFragment extends DialogFragment {
             subjectView.setVisibility(View.GONE);
         }
 
+        if (loadable.isThreadMode()) {
+            subjectView.setVisibility(View.GONE);
+        }
+
         cancelButton = (Button) container.findViewById(R.id.reply_cancel);
         cancelButton.setOnClickListener(new OnClickListener() {
             @Override
diff --git a/Clover/app/src/main/res/layout/reply_input.xml b/Clover/app/src/main/res/layout/reply_input.xml
index edcc6681..7fbbf9e1 100644
--- a/Clover/app/src/main/res/layout/reply_input.xml
+++ b/Clover/app/src/main/res/layout/reply_input.xml
@@ -25,16 +25,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     android:layout_height="wrap_content"
     android:orientation="vertical">
 
-    <EditText
-        android:id="@+id/reply_comment"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:hint="@string/reply_comment"
-        android:imeActionLabel="@string/reply_submit"
-        android:inputType="textMultiLine|textCapSentences|textAutoCorrect"
-        android:minLines="4"
-        android:textSize="16sp"/>
-
     <com.micromobs.android.floatlabel.FloatLabelEditText
         android:id="@+id/reply_name"
         android:layout_width="match_parent"
@@ -46,26 +36,35 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
         floatlabel:textSize="16sp"/>
 
     <com.micromobs.android.floatlabel.FloatLabelEditText
-        android:id="@+id/reply_email"
+        android:id="@+id/reply_subject"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:inputType="textEmailAddress"
         floatlabel:fitScreenWidth="full"
-        floatlabel:hint="@string/reply_email"
+        floatlabel:hint="@string/reply_subject"
         floatlabel:textColorHintFocused="@color/holo_blue_dark"
         floatlabel:textColorHintUnFocused="@android:color/darker_gray"
         floatlabel:textSize="16sp"/>
 
     <com.micromobs.android.floatlabel.FloatLabelEditText
-        android:id="@+id/reply_subject"
+        android:id="@+id/reply_email"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         floatlabel:fitScreenWidth="full"
-        floatlabel:hint="@string/reply_subject"
+        floatlabel:hint="@string/reply_email"
         floatlabel:textColorHintFocused="@color/holo_blue_dark"
         floatlabel:textColorHintUnFocused="@android:color/darker_gray"
         floatlabel:textSize="16sp"/>
 
+    <EditText
+        android:id="@+id/reply_comment"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:hint="@string/reply_comment"
+        android:imeActionLabel="@string/reply_submit"
+        android:inputType="textMultiLine|textCapSentences|textAutoCorrect"
+        android:minLines="4"
+        android:textSize="16sp"/>
+
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/Clover/app/src/main/res/values/strings.xml b/Clover/app/src/main/res/values/strings.xml
index cee652ea..2dd66ada 100644
--- a/Clover/app/src/main/res/values/strings.xml
+++ b/Clover/app/src/main/res/values/strings.xml
@@ -109,7 +109,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     <string name="reply">Reply to</string>
     <string name="reply_to_board">Make thread in</string>
     <string name="reply_name">Name</string>
-    <string name="reply_email">Email</string>
+    <string name="reply_email">Options</string>
     <string name="reply_subject">Subject</string>
     <string name="reply_comment">Comment</string>
     <string name="reply_file">Pick file</string>