diff --git a/lib/shared/messages/delete-entry-message-spec.js b/lib/shared/messages/delete-entry-message-spec.js
--- a/lib/shared/messages/delete-entry-message-spec.js
+++ b/lib/shared/messages/delete-entry-message-spec.js
@@ -17,12 +17,7 @@
 import type { RelativeUserInfo } from '../../types/user-types';
 import { prettyDate } from '../../utils/date-utils';
 import { ET, type EntityText } from '../../utils/entity-text';
-import { stringForUser } from '../user-utils';
-import {
-  pushTypes,
-  type MessageSpec,
-  type NotificationTextsParams,
-} from './message-spec';
+import { pushTypes, type MessageSpec } from './message-spec';
 import { assertSingleMessageInfo } from './utils';
 
 export const deleteEntryMessageSpec: MessageSpec<
@@ -114,18 +109,22 @@
   async notificationTexts(
     messageInfos: $ReadOnlyArray<MessageInfo>,
     threadInfo: ThreadInfo,
-    params: NotificationTextsParams,
   ): Promise<NotifTexts> {
     const messageInfo = assertSingleMessageInfo(messageInfos);
     invariant(
       messageInfo.type === messageTypes.DELETE_ENTRY,
       'messageInfo should be messageTypes.DELETE_ENTRY!',
     );
-    const prefix = stringForUser(messageInfo.creator);
-    const body =
-      `deleted an event in ${params.notifThreadName(threadInfo)} ` +
-      `scheduled for ${prettyDate(messageInfo.date)}: "${messageInfo.text}"`;
-    const merged = `${prefix} ${body}`;
+
+    const thread = ET.thread({ display: 'shortName', threadInfo });
+    const creator = ET.user({ userInfo: messageInfo.creator });
+    const date = prettyDate(messageInfo.date);
+
+    const prefix = ET`${creator}`;
+    let body = ET`deleted an event in ${thread}`;
+    body = ET`${body} scheduled for ${date}: "${messageInfo.text}"`;
+    const merged = ET`${prefix} ${body}`;
+
     return {
       merged,
       title: threadInfo.uiName,
diff --git a/lib/shared/messages/restore-entry-message-spec.js b/lib/shared/messages/restore-entry-message-spec.js
--- a/lib/shared/messages/restore-entry-message-spec.js
+++ b/lib/shared/messages/restore-entry-message-spec.js
@@ -17,12 +17,7 @@
 import type { RelativeUserInfo } from '../../types/user-types';
 import { prettyDate } from '../../utils/date-utils';
 import { ET, type EntityText } from '../../utils/entity-text';
-import { stringForUser } from '../user-utils';
-import {
-  pushTypes,
-  type MessageSpec,
-  type NotificationTextsParams,
-} from './message-spec';
+import { pushTypes, type MessageSpec } from './message-spec';
 import { assertSingleMessageInfo } from './utils';
 
 export const restoreEntryMessageSpec: MessageSpec<
@@ -114,18 +109,22 @@
   async notificationTexts(
     messageInfos: $ReadOnlyArray<MessageInfo>,
     threadInfo: ThreadInfo,
-    params: NotificationTextsParams,
   ): Promise<NotifTexts> {
     const messageInfo = assertSingleMessageInfo(messageInfos);
     invariant(
       messageInfo.type === messageTypes.RESTORE_ENTRY,
       'messageInfo should be messageTypes.RESTORE_ENTRY!',
     );
-    const prefix = stringForUser(messageInfo.creator);
-    const body =
-      `restored an event in ${params.notifThreadName(threadInfo)} ` +
-      `scheduled for ${prettyDate(messageInfo.date)}: "${messageInfo.text}"`;
-    const merged = `${prefix} ${body}`;
+
+    const thread = ET.thread({ display: 'shortName', threadInfo });
+    const creator = ET.user({ userInfo: messageInfo.creator });
+    const date = prettyDate(messageInfo.date);
+
+    const prefix = ET`${creator}`;
+    let body = ET`restored an event in ${thread}`;
+    body = ET`${body} scheduled for ${date}: "${messageInfo.text}"`;
+    const merged = ET`${prefix} ${body}`;
+
     return {
       merged,
       title: threadInfo.uiName,