diff --git a/res/layout/conversation_item_received.xml b/res/layout/conversation_item_received.xml
index 7d7377ab78..950b33b615 100644
--- a/res/layout/conversation_item_received.xml
+++ b/res/layout/conversation_item_received.xml
@@ -25,17 +25,24 @@
         android:clipToPadding="false"
         android:clipChildren="false">
 
-        <org.thoughtcrime.securesms.components.AvatarImageView
-            android:id="@+id/contact_photo"
-            android:foreground="@drawable/contact_photo_background"
+        <FrameLayout
+            android:id="@+id/contact_photo_container"
             android:layout_width="36dp"
-            android:layout_height="36dp"
-            android:layout_marginBottom="6dp"
+            android:layout_height="wrap_content"
             android:layout_alignParentLeft="true"
             android:layout_alignParentStart="true"
-            android:layout_alignParentBottom="true"
-            android:cropToPadding="true"
-            android:contentDescription="@string/conversation_item_received__contact_photo_description" />
+            android:layout_alignParentBottom="true">
+
+            <org.thoughtcrime.securesms.components.AvatarImageView
+                android:id="@+id/contact_photo"
+                android:foreground="@drawable/contact_photo_background"
+                android:layout_width="36dp"
+                android:layout_height="36dp"
+                android:layout_marginBottom="6dp"
+                android:cropToPadding="true"
+                android:contentDescription="@string/conversation_item_received__contact_photo_description" />
+
+        </FrameLayout>
 
         <LinearLayout
             android:id="@+id/body_bubble"
@@ -45,8 +52,8 @@
             android:layout_marginEnd="@dimen/message_bubble_edge_margin"
             android:layout_marginLeft="8dp"
             android:layout_marginStart="8dp"
-            android:layout_toRightOf="@id/contact_photo"
-            android:layout_toEndOf="@id/contact_photo"
+            android:layout_toRightOf="@id/contact_photo_container"
+            android:layout_toEndOf="@id/contact_photo_container"
             android:orientation="vertical"
             android:clipToPadding="false"
             android:clipChildren="false"
diff --git a/src/org/thoughtcrime/securesms/ConversationItem.java b/src/org/thoughtcrime/securesms/ConversationItem.java
index f93b2258f4..ad9280f6a0 100644
--- a/src/org/thoughtcrime/securesms/ConversationItem.java
+++ b/src/org/thoughtcrime/securesms/ConversationItem.java
@@ -109,7 +109,7 @@ public class ConversationItem extends LinearLayout
   private Recipient     recipient;
   private GlideRequests glideRequests;
 
-  protected ViewGroup            bodyBubble;
+  protected ViewGroup              bodyBubble;
   private   QuoteView              quoteView;
   private   TextView               bodyText;
   private   ConversationItemFooter footer;
@@ -117,6 +117,7 @@ public class ConversationItem extends LinearLayout
   private   TextView               groupSenderProfileName;
   private   View                   groupSenderHolder;
   private   AvatarImageView        contactPhoto;
+  private   ViewGroup              contactPhotoHolder;
   private   AlertView              alertView;
   private   ViewGroup              container;
 
@@ -164,6 +165,7 @@ public class ConversationItem extends LinearLayout
     this.groupSenderProfileName  =            findViewById(R.id.group_message_sender_profile);
     this.alertView               =            findViewById(R.id.indicators_parent);
     this.contactPhoto            =            findViewById(R.id.contact_photo);
+    this.contactPhotoHolder      =            findViewById(R.id.contact_photo_container);
     this.bodyBubble              =            findViewById(R.id.body_bubble);
     this.mediaThumbnailStub      = new Stub<>(findViewById(R.id.image_view_stub));
     this.audioViewStub           = new Stub<>(findViewById(R.id.audio_view_stub));
@@ -702,6 +704,8 @@ public class ConversationItem extends LinearLayout
 
   private void setAuthor(@NonNull MessageRecord current, @NonNull Optional<MessageRecord> previous, @NonNull Optional<MessageRecord> next, boolean isGroupThread) {
     if (isGroupThread && !current.isOutgoing()) {
+      contactPhotoHolder.setVisibility(VISIBLE);
+
       if (!previous.isPresent() || previous.get().isUpdate() || !current.getRecipient().getAddress().equals(previous.get().getRecipient().getAddress()) ||
           !DateUtils.isSameDay(previous.get().getTimestamp(), current.getTimestamp()))
       {
@@ -713,13 +717,13 @@ public class ConversationItem extends LinearLayout
       if (!next.isPresent() || next.get().isUpdate() || !current.getRecipient().getAddress().equals(next.get().getRecipient().getAddress())) {
         contactPhoto.setVisibility(VISIBLE);
       } else {
-        contactPhoto.setVisibility(INVISIBLE);
+        contactPhoto.setVisibility(GONE);
       }
     } else {
       groupSenderHolder.setVisibility(GONE);
 
-      if (contactPhoto != null) {
-        contactPhoto.setVisibility(GONE);
+      if (contactPhotoHolder != null) {
+        contactPhotoHolder.setVisibility(GONE);
       }
     }
   }