Merge remote-tracking branch 'loki/dev' into action-bar-back-buttons

res/layout/message_details_header.xml

@@ -155,6 +155,7 @@
     <View
         android:id="@+id/separator"
         android:layout_width="match_parent"
+        android:layout_marginTop="@dimen/medium_spacing"
         android:layout_height="1px"
         android:background="?android:dividerHorizontal" />
 

src/org/thoughtcrime/securesms/loki/views/UserView.kt

@@ -90,7 +90,7 @@ class UserView : LinearLayout {
         actionIndicatorImageView.setImageResource(R.drawable.ic_baseline_edit_24)
         profilePictureView.glide = glide
         profilePictureView.update()
-        nameTextView.text = getUserDisplayName(address)
+        nameTextView.text = if (user.isGroupRecipient) user.name else getUserDisplayName(address)
         when (actionIndicator) {
             ActionIndicator.None -> {
                 actionIndicatorImageView.visibility = View.GONE