diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageView.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageView.kt
index ea93f233a..968d91d42 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageView.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageView.kt
@@ -169,10 +169,10 @@ class VisibleMessageView : LinearLayout {
             swipeToReplyIconRect.bottom = height - bottomVOffset
             swipeToReplyIcon.bounds = swipeToReplyIconRect
             swipeToReplyIcon.alpha = (255.0f * (min(abs(translationX), threshold) / threshold)).roundToInt()
-            swipeToReplyIcon.draw(canvas)
         } else {
             swipeToReplyIcon.alpha = 0
         }
+        swipeToReplyIcon.draw(canvas)
         super.onDraw(canvas)
     }
 
@@ -234,6 +234,7 @@ class VisibleMessageView : LinearLayout {
         animate()
             .translationX(0.0f)
             .setDuration(150)
+            .setUpdateListener { postInvalidate() } // Ensure onDraw(canvas:) is called
             .start()
     }