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