diff --git a/app/src/main/java/awais/instagrabber/adapters/DirectItemsAdapter.java b/app/src/main/java/awais/instagrabber/adapters/DirectItemsAdapter.java
index f910dfdb..3fed9ac2 100644
--- a/app/src/main/java/awais/instagrabber/adapters/DirectItemsAdapter.java
+++ b/app/src/main/java/awais/instagrabber/adapters/DirectItemsAdapter.java
@@ -69,7 +69,7 @@ public final class DirectItemsAdapter extends RecyclerView.Adapter<RecyclerView.
             if (bothHeaders) {
                 return oldItem.date.equals(newItem.date);
             }
-            if (oldItem.item != null && newItem.item != null) {
+            if (oldItem.item != null && oldItem.item.getClientContext() != null && newItem.item != null) {
                 return oldItem.item.getClientContext().equals(newItem.item.getClientContext());
             }
             return false;
diff --git a/app/src/main/java/awais/instagrabber/repositories/responses/directmessages/DirectThread.java b/app/src/main/java/awais/instagrabber/repositories/responses/directmessages/DirectThread.java
index 05cf9fd6..ab595914 100644
--- a/app/src/main/java/awais/instagrabber/repositories/responses/directmessages/DirectThread.java
+++ b/app/src/main/java/awais/instagrabber/repositories/responses/directmessages/DirectThread.java
@@ -10,7 +10,7 @@ public class DirectThread {
     private final String threadId;
     private final String threadV2Id;
     private final List<DirectUser> users;
-    private final List<String> leftUsers;
+    private final List<DirectUser> leftUsers;
     private final List<String> adminUserIds;
     private final List<DirectItem> items;
     private final long lastActivityAt;
@@ -42,7 +42,7 @@ public class DirectThread {
     public DirectThread(final String threadId,
                         final String threadV2Id,
                         final List<DirectUser> users,
-                        final List<String> leftUsers,
+                        final List<DirectUser> leftUsers,
                         final List<String> adminUserIds,
                         final List<DirectItem> items,
                         final long lastActivityAt,
@@ -115,7 +115,7 @@ public class DirectThread {
         return users;
     }
 
-    public List<String> getLeftUsers() {
+    public List<DirectUser> getLeftUsers() {
         return leftUsers;
     }
 
diff --git a/app/src/main/res/layout/layout_dm_base.xml b/app/src/main/res/layout/layout_dm_base.xml
index f6ff6c7d..2716809f 100644
--- a/app/src/main/res/layout/layout_dm_base.xml
+++ b/app/src/main/res/layout/layout_dm_base.xml
@@ -123,6 +123,7 @@
             app:layout_constraintStart_toEndOf="@id/ivProfilePic"
             app:layout_constraintTop_toBottomOf="@id/tvUsername"
             app:layout_constraintWidth_min="wrap"
+            app:layout_constraintWidth_max="230dp"
             app:viewPartInfo="@id/message_info"
             app:viewPartMain="@id/message">