Fix padding and ordering

app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageView.kt

@@ -267,6 +267,7 @@ class VisibleMessageView : LinearLayout {
             binding.messageStatusImageView.isVisible =
                 iconID != null && (!message.isSent || isLastMessage || disappearing)
 
+            binding.messageStatusImageView.bringToFront()
             if (disappearing && !message.isPending) updateExpirationTimer(message, iconColor)
         } else {
             binding.messageStatusTextView.isVisible = false
@@ -344,6 +345,8 @@ class VisibleMessageView : LinearLayout {
     private fun updateExpirationTimer(message: MessageRecord, iconColor: Int?) {
         val expirationTimerView = ExpirationTimerView(binding.messageStatusImageView, iconColor)
 
+        if (!message.isOutgoing) binding.messageStatusTextView.bringToFront()
+
         if (message.expiresIn > 0) {
             expirationTimerView.setPercentComplete(0.0f)
             if (message.expireStarted > 0) {

app/src/main/res/layout/view_visible_message.xml

@@ -152,6 +152,7 @@
                 android:id="@+id/messageStatusTextView"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_marginHorizontal="2dp"
                 android:layout_gravity="center"
                 android:textSize="@dimen/very_small_font_size"
                 tools:text="Sent" />