diff --git a/_locales/en/messages.json b/_locales/en/messages.json
index e02281131..c7c4ff9c8 100644
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@@ -959,7 +959,7 @@
     "description": "Text shown in the confirmation dialog for deleting a message locally"
   },
   "deleteForEveryoneWarning": {
-    "message": "This message will be permanently deleted for everyone in the conversation. Members will be able to see that you deleted a message.",
+    "message": "This message will be deleted for everyone in the conversation if they’re on a recent version of Signal. They will be able to see that you deleted a message.",
     "description": "Text shown in the confirmation dialog for deleting a message for everyone"
   },
   "deleteThisMessage": {
diff --git a/ts/components/conversation/Message.tsx b/ts/components/conversation/Message.tsx
index fd62ce23b..4da81c99b 100644
--- a/ts/components/conversation/Message.tsx
+++ b/ts/components/conversation/Message.tsx
@@ -237,8 +237,6 @@ export class Message extends React.PureComponent<Props, State> {
   public constructor(props: Props) {
     super(props);
 
-    const { canDeleteForEveryone } = props;
-
     this.wideMl = window.matchMedia('(min-width: 926px)');
     this.wideMl.addEventListener('change', this.handleWideMlChange);
 
@@ -256,14 +254,20 @@ export class Message extends React.PureComponent<Props, State> {
       isWide: this.wideMl.matches,
 
       containerWidth: 0,
-      canDeleteForEveryone,
+      canDeleteForEveryone: props.canDeleteForEveryone,
     };
   }
 
   public static getDerivedStateFromProps(props: Props, state: State): State {
+    const newState = {
+      ...state,
+      canDeleteForEveryone:
+        props.canDeleteForEveryone && state.canDeleteForEveryone,
+    };
+
     if (!props.isSelected) {
       return {
-        ...state,
+        ...newState,
         isSelected: false,
         prevSelectedCounter: 0,
       };
@@ -274,13 +278,13 @@ export class Message extends React.PureComponent<Props, State> {
       props.isSelectedCounter !== state.prevSelectedCounter
     ) {
       return {
-        ...state,
+        ...newState,
         isSelected: props.isSelected,
         prevSelectedCounter: props.isSelectedCounter,
       };
     }
 
-    return state;
+    return newState;
   }
 
   public handleWideMlChange = (event: MediaQueryListEvent): void => {