diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/recyclerview/ConversationListItemAnimator.java b/app/src/main/java/org/thoughtcrime/securesms/components/recyclerview/ConversationListItemAnimator.java
new file mode 100644
index 000000000..1438d3e66
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/recyclerview/ConversationListItemAnimator.java
@@ -0,0 +1,16 @@
+package org.thoughtcrime.securesms.components.recyclerview;
+
+
+import androidx.recyclerview.widget.DefaultItemAnimator;
+import androidx.recyclerview.widget.RecyclerView;
+
+public class ConversationListItemAnimator extends DefaultItemAnimator {
+
+  public ConversationListItemAnimator() {
+    setSupportsChangeAnimations(false);
+  }
+
+  @Override public boolean animateRemove(RecyclerView.ViewHolder holder) {
+    return super.animateRemove(holder);
+  }
+}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/recyclerview/DeleteItemAnimator.java b/app/src/main/java/org/thoughtcrime/securesms/components/recyclerview/DeleteItemAnimator.java
deleted file mode 100644
index 4fc116565..000000000
--- a/app/src/main/java/org/thoughtcrime/securesms/components/recyclerview/DeleteItemAnimator.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package org.thoughtcrime.securesms.components.recyclerview;
-
-
-import androidx.recyclerview.widget.DefaultItemAnimator;
-import androidx.recyclerview.widget.RecyclerView;
-
-public class DeleteItemAnimator extends DefaultItemAnimator {
-
-  public DeleteItemAnimator() {
-    setSupportsChangeAnimations(false);
-  }
-
-  @Override
-  public boolean animateAdd(RecyclerView.ViewHolder viewHolder) {
-    dispatchAddFinished(viewHolder);
-    return false;
-  }
-
-  @Override
-  public boolean animateMove(RecyclerView.ViewHolder viewHolder, int fromX, int fromY, int toX, int toY) {
-    dispatchMoveFinished(viewHolder);
-    return false;
-  }
-
-
-}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListAdapter.java b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListAdapter.java
index c1a626fb4..908833e2e 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListAdapter.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListAdapter.java
@@ -57,8 +57,6 @@ class ConversationListAdapter extends ListAdapter<Conversation, RecyclerView.Vie
 
     this.glideRequests               = glideRequests;
     this.onConversationClickListener = onConversationClickListener;
-
-    this.setHasStableIds(true);
   }
 
   @Override
@@ -171,23 +169,6 @@ class ConversationListAdapter extends ListAdapter<Conversation, RecyclerView.Vie
     return super.getItem(position);
   }
 
-  @Override
-  public long getItemId(int position) {
-    Conversation item = getItem(position);
-
-    if (item == null) {
-      return 0;
-    }
-
-    switch (item.getType()) {
-      case THREAD:          return item.getThreadRecord().getThreadId();
-      case PINNED_HEADER:   return -1;
-      case UNPINNED_HEADER: return -2;
-      case ARCHIVED_FOOTER: return -3;
-      default:              throw new AssertionError();
-    }
-  }
-
   public void setPagingController(@Nullable PagingController pagingController) {
     this.pagingController = pagingController;
   }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListFragment.java b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListFragment.java
index 57b849ca4..b09a8c918 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListFragment.java
@@ -26,6 +26,7 @@ import android.content.res.Resources;
 import android.content.res.TypedArray;
 import android.graphics.Canvas;
 import android.graphics.Color;
+import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.AsyncTask;
@@ -89,7 +90,7 @@ import org.thoughtcrime.securesms.components.UnreadPaymentsView;
 import org.thoughtcrime.securesms.components.menu.ActionItem;
 import org.thoughtcrime.securesms.components.menu.SignalBottomActionBar;
 import org.thoughtcrime.securesms.components.menu.SignalContextMenu;
-import org.thoughtcrime.securesms.components.recyclerview.DeleteItemAnimator;
+import org.thoughtcrime.securesms.components.recyclerview.ConversationListItemAnimator;
 import org.thoughtcrime.securesms.components.registration.PulsingFloatingActionButton;
 import org.thoughtcrime.securesms.components.reminder.DozeReminder;
 import org.thoughtcrime.securesms.components.reminder.ExpiredBuildReminder;
@@ -270,7 +271,7 @@ public class ConversationListFragment extends MainFragment implements ActionMode
     cameraFab.show();
 
     list.setLayoutManager(new LinearLayoutManager(requireActivity()));
-    list.setItemAnimator(new DeleteItemAnimator());
+    list.setItemAnimator(new ConversationListItemAnimator());
     list.addOnScrollListener(new ScrollListener());
 
     snapToTopDataObserver = new SnapToTopDataObserver(list);
@@ -638,7 +639,7 @@ public class ConversationListFragment extends MainFragment implements ActionMode
 
     viewModel.getSearchResult().observe(getViewLifecycleOwner(), this::onSearchResultChanged);
     viewModel.getMegaphone().observe(getViewLifecycleOwner(), this::onMegaphoneChanged);
-    viewModel.getConversationList().observe(getViewLifecycleOwner(), this::onSubmitList);
+    viewModel.getConversationList().observe(getViewLifecycleOwner(), this::onConversationListChanged);
     viewModel.hasNoConversations().observe(getViewLifecycleOwner(), this::updateEmptyState);
     viewModel.getPipeState().observe(getViewLifecycleOwner(), this::updateProxyStatus);
 
@@ -655,6 +656,17 @@ public class ConversationListFragment extends MainFragment implements ActionMode
     viewModel.getUnreadPaymentsLiveData().observe(getViewLifecycleOwner(), this::onUnreadPaymentsChanged);
   }
 
+  private void onConversationListChanged(@NonNull List<Conversation> conversations) {
+    LinearLayoutManager layoutManager    = (LinearLayoutManager) list.getLayoutManager();
+    int                 firstVisibleItem = layoutManager != null ? layoutManager.findFirstCompletelyVisibleItemPosition() : -1;
+
+    defaultAdapter.submitList(conversations, () -> {
+     if (firstVisibleItem == 0) {
+       list.scrollToPosition(0);
+     }
+    });
+  }
+
   private void onUnreadPaymentsChanged(@NonNull Optional<UnreadPayments> unreadPayments) {
     if (unreadPayments.isPresent()) {
       paymentNotificationView.get().setListener(new PaymentNotificationListener(unreadPayments.get()));
@@ -1336,8 +1348,9 @@ public class ConversationListFragment extends MainFragment implements ActionMode
 
   private class ArchiveListenerCallback extends ItemTouchHelper.SimpleCallback {
 
-    private static final int ARCHIVE_SWIPE_START_COLOR = 0xFF28782A;
-    private static final int ARCHIVE_SWIPE_END_COLOR   = 0xFF329635;
+    private static final int   ARCHIVE_SWIPE_START_COLOR = 0xFF28782A;
+    private static final int   ARCHIVE_SWIPE_END_COLOR   = 0xFF329635;
+    private static final float MIN_ICON_SCALE            = 0.75f;
 
     ArchiveListenerCallback() {
       super(0, ItemTouchHelper.RIGHT);
@@ -1392,11 +1405,11 @@ public class ConversationListFragment extends MainFragment implements ActionMode
 
         float scale;
         if (dX < scaleStartPoint) {
-          scale = 0.5f;
+          scale = MIN_ICON_SCALE;
         } else if (dX > scaleEndPoint) {
           scale = 1f;
         } else {
-          scale = Math.min(1f, 0.5f + ((dX - scaleStartPoint) / (scaleEndPoint - scaleStartPoint)) * (1f - 0.5f));
+          scale = Math.min(1f, MIN_ICON_SCALE + ((dX - scaleStartPoint) / (scaleEndPoint - scaleStartPoint)) * (1f - MIN_ICON_SCALE));
         }
 
         if (dX > 0) {