diff --git a/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java b/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java
index 5079462ca1..0b1379864e 100644
--- a/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java
+++ b/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java
@@ -2542,6 +2542,11 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
     searchViewItem.collapseActionView();
   }
 
+  @Override
+  public void onForwardClicked() {
+    inputPanel.clearQuote();
+  }
+
   @Override
   public void onAttachmentChanged() {
     handleSecurityChange(isSecureText, isDefaultSms);
diff --git a/src/org/thoughtcrime/securesms/conversation/ConversationFragment.java b/src/org/thoughtcrime/securesms/conversation/ConversationFragment.java
index 3859eb13cd..a35d2801b7 100644
--- a/src/org/thoughtcrime/securesms/conversation/ConversationFragment.java
+++ b/src/org/thoughtcrime/securesms/conversation/ConversationFragment.java
@@ -520,6 +520,8 @@ public class ConversationFragment extends Fragment
   }
 
   private void handleForwardMessage(MessageRecord message) {
+    listener.onForwardClicked();
+
     SimpleTask.run(getLifecycle(), () -> {
       Intent composeIntent = new Intent(getActivity(), ShareActivity.class);
       composeIntent.putExtra(Intent.EXTRA_TEXT, message.getDisplayBody(requireContext()).toString());
@@ -803,6 +805,7 @@ public class ConversationFragment extends Fragment
     void setThreadId(long threadId);
     void handleReplyMessage(MessageRecord messageRecord);
     void onMessageActionToolbarOpened();
+    void onForwardClicked();
   }
 
   private class ConversationScrollListener extends OnScrollListener {