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 f49ef644b1..a114e9bab0 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/ComposeText.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/ComposeText.java
@@ -196,7 +196,10 @@ public class ComposeText extends EmojiEditText {
 
   public void setDraftText(@Nullable CharSequence draftText) {
     setText("");
-    append(draftText);
+
+    if (draftText != null) {
+      append(draftText);
+    }
   }
 
   public void appendInvite(String invite) {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationIntents.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationIntents.java
index ead6d8a3a1..ba22a6fef7 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationIntents.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationIntents.java
@@ -421,7 +421,13 @@ public class ConversationIntents {
         intent.setType(dataType);
       }
 
-      return intent;
+      if (SignalStore.internalValues().useConversationFragmentV2()) {
+        Bundle args = ConversationIntents.createParentFragmentArguments(intent);
+
+        return intent.putExtras(args);
+      } else {
+        return intent;
+      }
     }
   }