diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/ChatView.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/ChatView.kt
index 71d82b5691..af9d77b1d0 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/ChatView.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/ChatView.kt
@@ -962,17 +962,8 @@ fun BoxWithConstraintsScope.ChatItemsList(
         // With default touchSlop when you scroll LazyColumn, you can unintentionally open reply view
         LocalViewConfiguration provides LocalViewConfiguration.current.bigTouchSlop()
       ) {
-        val dismissState = rememberDismissState(initialValue = DismissValue.Default) { false }
-        val directions = setOf(DismissDirection.EndToStart)
-        val swipeableModifier = SwipeToDismissModifier(
-          state = dismissState,
-          directions = directions,
-          swipeDistance = with(LocalDensity.current) { 30.dp.toPx() },
-        )
-        val swipedToEnd = (dismissState.overflow.value > 0f && directions.contains(DismissDirection.StartToEnd))
-        val swipedToStart = (dismissState.overflow.value < 0f && directions.contains(DismissDirection.EndToStart))
-        if (dismissState.isAnimationRunning && (swipedToStart || swipedToEnd)) {
-          LaunchedEffect(Unit) {
+        val dismissState = rememberDismissState(initialValue = DismissValue.Default) {
+          if (it == DismissValue.DismissedToStart) {
             scope.launch {
               if ((cItem.content is CIContent.SndMsgContent || cItem.content is CIContent.RcvMsgContent) && chat.chatInfo !is ChatInfo.Local) {
                 if (composeState.value.editing) {
@@ -983,7 +974,13 @@ fun BoxWithConstraintsScope.ChatItemsList(
               }
             }
           }
+          false
         }
+        val swipeableModifier = SwipeToDismissModifier(
+          state = dismissState,
+          directions = setOf(DismissDirection.EndToStart),
+          swipeDistance = with(LocalDensity.current) { 30.dp.toPx() },
+        )
         val provider = {
           providerForGallery(i, chatModel.chatItems.value, cItem.id) { indexInReversed ->
             scope.launch {
diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/helpers/Modifiers.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/helpers/Modifiers.kt
index 6990a69ebd..8ad877d879 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/helpers/Modifiers.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/helpers/Modifiers.kt
@@ -37,7 +37,7 @@ fun SwipeToDismissModifier(
   return Modifier.swipeable(
     state = state,
     anchors = anchors,
-    thresholds = { _, _ -> FractionalThreshold(0.5f) },
+    thresholds = { _, _ -> FractionalThreshold(0.99f) },
     orientation = Orientation.Horizontal,
     reverseDirection = isRtl,
   ).offset { IntOffset(state.offset.value.roundToInt(), 0) }