diff --git a/app/soapbox/features/ui/components/compose_modal.tsx b/app/soapbox/features/ui/components/compose_modal.tsx
index edd5ea740..81a8c9254 100644
--- a/app/soapbox/features/ui/components/compose_modal.tsx
+++ b/app/soapbox/features/ui/components/compose_modal.tsx
@@ -11,7 +11,7 @@ import ComposeFormContainer from '../../compose/containers/compose_form_containe
 const messages = defineMessages({
   close: { id: 'lightbox.close', defaultMessage: 'Close' },
   confirm: { id: 'confirmations.delete.confirm', defaultMessage: 'Delete' },
-  discardConfirm: { id: 'confirmations.discard_edit.confirm', defaultMessage: 'Discard' },
+  cancelEditing: { id: 'confirmations.cancel_editing.confirm', defaultMessage: 'Cancel editing' },
 });
 
 interface IComposeModal {
@@ -33,12 +33,12 @@ const ComposeModal: React.FC<IComposeModal> = ({ onClose }) => {
       dispatch(openModal('CONFIRM', {
         icon: require('@tabler/icons/trash.svg'),
         heading: statusId
-          ? <FormattedMessage id='confirmations.discard_edit.heading' defaultMessage='Discard post changes' />
+          ? <FormattedMessage id='confirmations.cancel_editing.heading' defaultMessage='Cancel post editing' />
           : <FormattedMessage id='confirmations.delete.heading' defaultMessage='Delete post' />,
         message: statusId
-          ? <FormattedMessage id='confirmations.discard_edit.message' defaultMessage='Are you sure you want to discard changes to this post?' />
+          ? <FormattedMessage id='confirmations.cancel_editing.message' defaultMessage='Are you sure you want to cancel editing this post? All changes will be lost.' />
           : <FormattedMessage id='confirmations.delete.message' defaultMessage='Are you sure you want to delete this post?' />,
-        confirm: intl.formatMessage(statusId ? messages.discardConfirm : messages.confirm),
+        confirm: intl.formatMessage(statusId ? messages.cancelEditing : messages.confirm),
         onConfirm: () => {
           dispatch(closeModal('COMPOSE'));
           dispatch(cancelReplyCompose());
diff --git a/app/soapbox/locales/pl.json b/app/soapbox/locales/pl.json
index 8586cdcce..82bdc287c 100644
--- a/app/soapbox/locales/pl.json
+++ b/app/soapbox/locales/pl.json
@@ -339,9 +339,6 @@
   "confirmations.delete_list.confirm": "Usuń",
   "confirmations.delete_list.heading": "Usuń listę",
   "confirmations.delete_list.message": "Czy na pewno chcesz bezpowrotnie usunąć tą listę?",
-  "confirmations.discard_edit.confirm": "Odrzuć",
-  "confirmations.discard_edit.heading": "Odrzuć edycję wpisu",
-  "confirmations.discard_edit.message": "Czy na pewno chcesz odrzucić zmiany w tym wpisie?",
   "confirmations.domain_block.confirm": "Ukryj wszysyko z domeny",
   "confirmations.domain_block.heading": "Zablokuj {domain}",
   "confirmations.domain_block.message": "Czy na pewno chcesz zablokować całą domenę {domain}? Zwykle lepszym rozwiązaniem jest blokada lub wyciszenie kilku użytkowników.",
diff --git a/app/soapbox/reducers/__tests__/compose.test.ts b/app/soapbox/reducers/__tests__/compose.test.ts
index bb6906c6d..b1cc01b58 100644
--- a/app/soapbox/reducers/__tests__/compose.test.ts
+++ b/app/soapbox/reducers/__tests__/compose.test.ts
@@ -44,6 +44,7 @@ describe('compose reducer', () => {
         type: actions.COMPOSE_SET_STATUS,
         status: normalizeStatus(fromJS(require('soapbox/__fixtures__/pleroma-status-deleted.json'))),
         v: { software: 'Pleroma' },
+        withRedraft: true,
       };
 
       const result = reducer(undefined, action);