Debug

res/layout/conversation_item_received.xml

@@ -45,15 +45,22 @@
         </RelativeLayout>
 
         <LinearLayout
-            android:id="@+id/body_bubble"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:layout_toStartOf="@+id/indicators_parent"
+            android:layout_alignWithParentIfMissing="true"
+            android:clipToPadding="false"
+            android:clipChildren="false">
+
+            <LinearLayout
+                android:id="@+id/body_bubble"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
                 android:layout_marginEnd="@dimen/massive_spacing"
                 android:layout_marginStart="12dp"
                 android:paddingTop="@dimen/medium_spacing"
                 android:paddingBottom="@dimen/medium_spacing"
-            android:layout_toStartOf="@+id/indicators_parent"
-            android:layout_alignWithParentIfMissing="true"
                 android:orientation="vertical"
                 android:clipToPadding="false"
                 android:clipChildren="false"
@@ -201,6 +208,8 @@
 
             </LinearLayout>
 
+        </LinearLayout>
+
         <org.thoughtcrime.securesms.components.AlertView
             android:id="@+id/indicators_parent"
             android:layout_width="wrap_content"
@@ -210,4 +219,5 @@
             android:gravity="center_vertical"/>
 
     </RelativeLayout>
+
 </org.thoughtcrime.securesms.conversation.ConversationItem>

res/layout/conversation_item_sent.xml

@@ -23,15 +23,22 @@
         android:clipChildren="false">
 
         <LinearLayout
-            android:id="@+id/body_bubble"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical"
+            android:layout_toStartOf="@+id/indicators_parent"
+            android:layout_alignWithParentIfMissing="true"
+            android:clipToPadding="false"
+            android:clipChildren="false">
+
+            <LinearLayout
+                android:id="@+id/body_bubble"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
                 android:layout_marginStart="@dimen/massive_spacing"
                 android:paddingTop="@dimen/medium_spacing"
                 android:paddingBottom="@dimen/medium_spacing"
-            android:layout_toStartOf="@+id/indicators_parent"
-            android:layout_alignWithParentIfMissing="true"
                 android:layout_gravity="end"
                 android:clipToPadding="false"
                 android:clipChildren="false"
@@ -154,6 +161,8 @@
 
             </LinearLayout>
 
+        </LinearLayout>
+
         <org.thoughtcrime.securesms.components.AlertView
             android:id="@+id/indicators_parent"
             android:layout_width="wrap_content"

src/org/thoughtcrime/securesms/conversation/ConversationActivity.java

@@ -547,6 +547,8 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
 
     DatabaseFactory.getLokiThreadDatabase(this).setDelegate(this);
 
+    inputPanel.setHint("Message");
+
     updateSessionRestoreBanner();
 
     Log.i(TAG, "onResume() Finished: " + (System.currentTimeMillis() - getIntent().getLongExtra(TIMING_EXTRA, 0)));

src/org/thoughtcrime/securesms/conversation/ConversationItem.java

@@ -1053,12 +1053,6 @@ public class ConversationItem extends LinearLayout
     int spacingTop = readDimen(context, R.dimen.conversation_vertical_message_spacing_collapse);
     int spacingBottom = spacingTop;
 
-    boolean isOutgoingStack = current.isOutgoing() && previous.orNull() != null && previous.get().isOutgoing();
-
-    if (isOutgoingStack) {
-      spacingTop = readDimen(context, R.dimen.conversation_vertical_message_spacing_default);
-    }
-
     if (isStartOfMessageCluster(current, previous, isGroupThread)) {
       spacingTop = readDimen(context, R.dimen.conversation_vertical_message_spacing_default);
     }