diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java
index 618f3bf05..d1f125939 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java
@@ -303,8 +303,7 @@ public class ConversationFragment extends LoggingFragment implements Multiselect
                                                                conversationMessage.getMessageRecord(),
                                                                messageRequestViewModel.shouldShowMessageRequest(),
                                                                groupViewModel.isNonAdminInAnnouncementGroup()),
-            this::handleReplyMessage,
-            this::onViewHolderPositionTranslated
+            this::handleReplyMessage
     ).attachToRecyclerView(list);
 
     giphyMp4ProjectionRecycler = initializeGiphyMp4();
@@ -499,12 +498,6 @@ public class ConversationFragment extends LoggingFragment implements Multiselect
     }
   }
 
-  private void onViewHolderPositionTranslated(@NonNull RecyclerView recyclerView, @NonNull RecyclerView.ViewHolder viewHolder) {
-    if (viewHolder instanceof GiphyMp4Playable) {
-      giphyMp4ProjectionRecycler.updateVideoDisplayPositionAndSize(recyclerView, (GiphyMp4Playable) viewHolder);
-    }
-  }
-
   private int getStartPosition() {
     return conversationViewModel.getArgs().getStartingPosition();
   }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItemSwipeCallback.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItemSwipeCallback.java
index 8f7daed03..46b8ff42d 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItemSwipeCallback.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItemSwipeCallback.java
@@ -30,17 +30,14 @@ public class ConversationItemSwipeCallback extends ItemTouchHelper.SimpleCallbac
   private final SwipeAvailabilityProvider     swipeAvailabilityProvider;
   private final ConversationItemTouchListener itemTouchListener;
   private final OnSwipeListener               onSwipeListener;
-  private final OnViewHolderTranslated        onViewHolderTranslated;
 
   ConversationItemSwipeCallback(@NonNull SwipeAvailabilityProvider swipeAvailabilityProvider,
-                                @NonNull OnSwipeListener onSwipeListener,
-                                @NonNull OnViewHolderTranslated onViewHolderTranslated)
+                                @NonNull OnSwipeListener onSwipeListener)
   {
     super(0, ItemTouchHelper.END);
     this.itemTouchListener          = new ConversationItemTouchListener(this::updateLatestDownCoordinate);
     this.swipeAvailabilityProvider  = swipeAvailabilityProvider;
     this.onSwipeListener            = onSwipeListener;
-    this.onViewHolderTranslated     = onViewHolderTranslated;
     this.shouldTriggerSwipeFeedback = true;
     this.canTriggerSwipe            = true;
   }
@@ -93,14 +90,14 @@ public class ConversationItemSwipeCallback extends ItemTouchHelper.SimpleCallbac
 
     if (actionState == ItemTouchHelper.ACTION_STATE_SWIPE && isCorrectSwipeDir) {
       ConversationSwipeAnimationHelper.update((ConversationItem) viewHolder.itemView, Math.abs(dx), sign);
-      dispatchTranslationUpdate(recyclerView, viewHolder);
+      recyclerView.invalidate();
       handleSwipeFeedback((ConversationItem) viewHolder.itemView, Math.abs(dx));
       if (canTriggerSwipe) {
         setTouchListener(recyclerView, viewHolder, Math.abs(dx));
       }
     } else if (actionState == ItemTouchHelper.ACTION_STATE_IDLE || dx == 0) {
       ConversationSwipeAnimationHelper.update((ConversationItem) viewHolder.itemView, 0, 1);
-      dispatchTranslationUpdate(recyclerView, viewHolder);
+      recyclerView.invalidate();
     }
 
     if (dx == 0) {
@@ -109,10 +106,6 @@ public class ConversationItemSwipeCallback extends ItemTouchHelper.SimpleCallbac
     }
   }
 
-  private void dispatchTranslationUpdate(@NonNull RecyclerView recyclerView, @NonNull RecyclerView.ViewHolder viewHolder) {
-    onViewHolderTranslated.onViewHolderTranslated(recyclerView, viewHolder);
-  }
-
   private void handleSwipeFeedback(@NonNull ConversationItem item, float dx) {
     if (dx > SWIPE_SUCCESS_DX && shouldTriggerSwipeFeedback) {
       vibrate(item.getContext());
@@ -172,7 +165,7 @@ public class ConversationItemSwipeCallback extends ItemTouchHelper.SimpleCallbac
       ConversationSwipeAnimationHelper.update((ConversationItem) viewHolder.itemView,
                                               0f,
                                               getSignFromDirection(viewHolder.itemView));
-      dispatchTranslationUpdate(recyclerView, viewHolder);
+      recyclerView.invalidate();
     }
   }