diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageView.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageView.kt
index 1118c79146..9c2ce89a4f 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageView.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageView.kt
@@ -22,6 +22,7 @@ import kotlinx.android.synthetic.main.view_visible_message.view.*
 import kotlinx.android.synthetic.main.view_visible_message.view.profilePictureView
 import network.loki.messenger.R
 import org.session.libsession.messaging.contacts.Contact.ContactContext
+import org.session.libsession.messaging.open_groups.OpenGroupAPIV2
 import org.session.libsession.utilities.ViewUtil
 import org.thoughtcrime.securesms.database.DatabaseFactory
 import org.thoughtcrime.securesms.database.model.MessageRecord
@@ -79,15 +80,25 @@ class VisibleMessageView : LinearLayout {
         val thread = threadDB.getRecipientForThreadId(threadID)
         val contactDB = DatabaseFactory.getSessionContactDatabase(context)
         val isGroupThread = (thread?.isGroupRecipient == true)
+        val isStartOfMessageCluster = isStartOfMessageCluster(message, previous, isGroupThread)
+        val isEndOfMessageCluster = isEndOfMessageCluster(message, next, isGroupThread)
         // Show profile picture and sender name if this is a group thread AND
         // the message is incoming
         if (isGroupThread && !message.isOutgoing) {
-            profilePictureContainer.visibility = View.VISIBLE
+            thread!!
+            profilePictureContainer.visibility = if (isEndOfMessageCluster) View.VISIBLE else View.INVISIBLE
             profilePictureView.publicKey = senderSessionID
-            // TODO: Set glide on the profile picture view and update it
-            // TODO: Show crown if this is an open group and the user is a moderator; otherwise hide it
-            senderNameTextView.visibility = View.VISIBLE
-            val context = if (thread?.isOpenGroupRecipient == true) ContactContext.OPEN_GROUP else ContactContext.REGULAR
+            profilePictureView.glide = glide
+            profilePictureView.update()
+            if (thread.isOpenGroupRecipient) {
+                val openGroup = DatabaseFactory.getLokiThreadDatabase(context).getOpenGroupChat(threadID)!!
+                val isModerator = OpenGroupAPIV2.isUserModerator(senderSessionID, openGroup.room, openGroup.server)
+                moderatorIconImageView.visibility = if (isModerator) View.VISIBLE else View.INVISIBLE
+            } else {
+                moderatorIconImageView.visibility = View.INVISIBLE
+            }
+            senderNameTextView.isVisible = isStartOfMessageCluster
+            val context = if (thread.isOpenGroupRecipient) ContactContext.OPEN_GROUP else ContactContext.REGULAR
             senderNameTextView.text = contactDB.getContactWithSessionID(senderSessionID)?.displayName(context) ?: senderSessionID
         } else {
             profilePictureContainer.visibility = View.GONE
@@ -111,8 +122,6 @@ class VisibleMessageView : LinearLayout {
             else resources.getDimension(R.dimen.very_large_spacing).toInt()
         messageContentContainer.layoutParams = messageContentContainerLayoutParams
         // Set inter-message spacing
-        val isStartOfMessageCluster = isStartOfMessageCluster(message, previous, isGroupThread)
-        val isEndOfMessageCluster = isEndOfMessageCluster(message, next, isGroupThread)
         setMessageSpacing(isStartOfMessageCluster, isEndOfMessageCluster)
         // Gravity
         val gravity = if (message.isOutgoing) Gravity.RIGHT else Gravity.LEFT
diff --git a/app/src/main/res/layout/view_visible_message.xml b/app/src/main/res/layout/view_visible_message.xml
index 366a64cc56..7148d07a05 100644
--- a/app/src/main/res/layout/view_visible_message.xml
+++ b/app/src/main/res/layout/view_visible_message.xml
@@ -33,18 +33,19 @@
                 android:layout_height="0dp" />
 
             <RelativeLayout
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content" >
+                android:layout_width="26dp"
+                android:layout_height="32dp" >
 
                 <org.thoughtcrime.securesms.loki.views.ProfilePictureView
                     android:id="@+id/profilePictureView"
                     android:layout_width="@dimen/very_small_profile_picture_size"
-                    android:layout_height="@dimen/very_small_profile_picture_size" />
+                    android:layout_height="@dimen/very_small_profile_picture_size"
+                    android:layout_marginTop="3dp" />
 
                 <ImageView
                     android:id="@+id/moderatorIconImageView"
-                    android:layout_width="20dp"
-                    android:layout_height="20dp"
+                    android:layout_width="16dp"
+                    android:layout_height="16dp"
                     android:src="@drawable/ic_crown"
                     android:layout_alignParentEnd="true"
                     android:layout_alignParentBottom="true" />
@@ -68,6 +69,8 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="4dp"
+                android:layout_marginStart="12dp"
+                android:layout_marginEnd="12dp"
                 android:textColor="@color/text"
                 android:textStyle="bold"
                 android:maxLines="1"