From 6167ddb4a81c2a5ae707948ebab1b6d8b0233d44 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Sun, 19 Mar 2017 20:16:11 +0100
Subject: [PATCH] don't mark message as delivery_failed when cancel didn't
 work. fixes #2387

---
 .../java/eu/siacs/conversations/ui/ConversationFragment.java    | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
index 124a2c4b7..50667f5cd 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
@@ -815,8 +815,6 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa
 		Transferable transferable = message.getTransferable();
 		if (transferable != null) {
 			transferable.cancel();
-		} else {
-			activity.xmppConnectionService.markMessage(message, Message.STATUS_SEND_FAILED);
 		}
 	}