diff --git a/res/layout/conversation_item_received.xml b/res/layout/conversation_item_received.xml
index 7b6f21f13d..62d48b1787 100644
--- a/res/layout/conversation_item_received.xml
+++ b/res/layout/conversation_item_received.xml
@@ -41,8 +41,9 @@
 
             <ImageView
                 android:id="@+id/moderator_icon_image_view"
-                android:layout_width="20dp"
-                android:layout_height="20dp"
+                android:layout_width="16dp"
+                android:layout_height="16dp"
+                android:layout_marginEnd="1.5dp"
                 android:src="@drawable/icon_crown"
                 android:layout_alignParentEnd="true"
                 android:layout_alignParentBottom="true" />
diff --git a/src/org/thoughtcrime/securesms/conversation/ConversationItem.java b/src/org/thoughtcrime/securesms/conversation/ConversationItem.java
index 350f2fe6e0..fe227250d6 100644
--- a/src/org/thoughtcrime/securesms/conversation/ConversationItem.java
+++ b/src/org/thoughtcrime/securesms/conversation/ConversationItem.java
@@ -936,7 +936,7 @@ public class ConversationItem extends LinearLayout
         contactPhoto.setVisibility(VISIBLE);
         int visibility;
         if (conversationRecipient.getName() != null && conversationRecipient.getName().equals("Loki Public Chat")) {
-          boolean isModerator = LokiGroupChatAPI.Companion.isUserModerator(TextSecurePreferences.getLocalNumber(getContext()), LokiGroupChatAPI.getPublicChatServerID(), LokiGroupChatAPI.getPublicChatServer());
+          boolean isModerator = LokiGroupChatAPI.Companion.isUserModerator(current.getRecipient().getAddress().toString(), LokiGroupChatAPI.getPublicChatServerID(), LokiGroupChatAPI.getPublicChatServer());
           visibility = isModerator ? View.VISIBLE : View.GONE;
         } else {
           visibility = View.GONE;