From 8e0fb6a23a7e0910a9b13dc80205cdb41c0f2c7b Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Tue, 25 Apr 2017 18:16:55 +0200
Subject: [PATCH] avoid rare race condition when saving draft message

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

diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
index e054f41e6..0e02d47b2 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
@@ -1131,6 +1131,7 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa
 			mEditMessage.append(conversation.getDraftMessage());
 			conversation.setDraftMessage(null);
 		}
+		conversation.setNextMessage(mEditMessage.getText().toString());
 		updateChatMsgHint();
 		new Handler().post(new Runnable() {
 			@Override