diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationAdapter.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationAdapter.java
index 45c45dede9..c521f0ddec 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationAdapter.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationAdapter.java
@@ -747,6 +747,7 @@ public class ConversationAdapter
       unbind();
 
       if (view != null) {
+        removeViewFromParent(view);
         container.addView(view);
       }
     }
@@ -754,6 +755,12 @@ public class ConversationAdapter
     void unbind() {
       container.removeAllViews();
     }
+
+    private void removeViewFromParent(@NonNull View view) {
+      if (view.getParent() != null) {
+        ((ViewGroup) view.getParent()).removeView(view);
+      }
+    }
   }
 
   private static class PlaceholderViewHolder extends RecyclerView.ViewHolder {