diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/ComposeText.java b/app/src/main/java/org/thoughtcrime/securesms/components/ComposeText.java
index 80593a9fd9..8a37d82466 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/ComposeText.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/ComposeText.java
@@ -181,11 +181,8 @@ public class ComposeText extends EmojiEditText {
   }
 
   public void setDraftText(@Nullable CharSequence draftText) {
-    setText("", BufferType.EDITABLE);
-
-    if (draftText != null) {
-      append(draftText);
-    }
+    setText(draftText != null ? draftText : "", BufferType.EDITABLE);
+    setSelection(length());
   }
 
   public void appendInvite(String invite) {