diff --git a/lib/shared/messages/delete-entry-message-spec.js b/lib/shared/messages/delete-entry-message-spec.js
index f1b135d08..89c1341b0 100644
--- a/lib/shared/messages/delete-entry-message-spec.js
+++ b/lib/shared/messages/delete-entry-message-spec.js
@@ -1,138 +1,137 @@
 // @flow
 
 import invariant from 'invariant';
 
 import { messageTypes } from '../../types/message-types';
 import type {
   MessageInfo,
   ClientDBMessageInfo,
 } from '../../types/message-types';
 import type {
   DeleteEntryMessageData,
   DeleteEntryMessageInfo,
   RawDeleteEntryMessageInfo,
 } from '../../types/messages/delete-entry';
 import type { NotifTexts } from '../../types/notif-types';
 import type { ThreadInfo } from '../../types/thread-types';
 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<
   DeleteEntryMessageData,
   RawDeleteEntryMessageInfo,
   DeleteEntryMessageInfo,
 > = Object.freeze({
   messageContentForServerDB(
     data: DeleteEntryMessageData | RawDeleteEntryMessageInfo,
   ): string {
     return JSON.stringify({
       entryID: data.entryID,
       date: data.date,
       text: data.text,
     });
   },
 
   messageContentForClientDB(data: RawDeleteEntryMessageInfo): string {
     return this.messageContentForServerDB(data);
   },
 
   rawMessageInfoFromServerDBRow(row: Object): RawDeleteEntryMessageInfo {
     const content = JSON.parse(row.content);
     return {
       type: messageTypes.DELETE_ENTRY,
       id: row.id.toString(),
       threadID: row.threadID.toString(),
       time: row.time,
       creatorID: row.creatorID.toString(),
       entryID: content.entryID,
       date: content.date,
       text: content.text,
     };
   },
 
   rawMessageInfoFromClientDB(
     clientDBMessageInfo: ClientDBMessageInfo,
   ): RawDeleteEntryMessageInfo {
     invariant(
       clientDBMessageInfo.content !== undefined &&
         clientDBMessageInfo.content !== null,
       'content must be defined',
     );
     const content = JSON.parse(clientDBMessageInfo.content);
     const rawDeleteEntryMessageInfo: RawDeleteEntryMessageInfo = {
       type: messageTypes.DELETE_ENTRY,
       id: clientDBMessageInfo.id,
       threadID: clientDBMessageInfo.thread,
       time: parseInt(clientDBMessageInfo.time),
       creatorID: clientDBMessageInfo.user,
       entryID: content.entryID,
       date: content.date,
       text: content.text,
     };
     return rawDeleteEntryMessageInfo;
   },
 
   createMessageInfo(
     rawMessageInfo: RawDeleteEntryMessageInfo,
     creator: RelativeUserInfo,
   ): DeleteEntryMessageInfo {
     return {
       type: messageTypes.DELETE_ENTRY,
       id: rawMessageInfo.id,
       threadID: rawMessageInfo.threadID,
       creator,
       time: rawMessageInfo.time,
       entryID: rawMessageInfo.entryID,
       date: rawMessageInfo.date,
       text: rawMessageInfo.text,
     };
   },
 
   rawMessageInfoFromMessageData(
     messageData: DeleteEntryMessageData,
     id: ?string,
   ): RawDeleteEntryMessageInfo {
     invariant(id, 'RawDeleteEntryMessageInfo needs id');
     return { ...messageData, id };
   },
 
   robotext(messageInfo: DeleteEntryMessageInfo): EntityText {
     const date = prettyDate(messageInfo.date);
     const creator = ET.user({ userInfo: messageInfo.creator });
     const { text } = messageInfo;
     return ET`${creator} deleted an event scheduled for ${date}: "${text}"`;
   },
 
   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,
       body,
       prefix,
     };
   },
 
   generatesNotifs: async () => pushTypes.NOTIF,
 });
diff --git a/lib/shared/messages/restore-entry-message-spec.js b/lib/shared/messages/restore-entry-message-spec.js
index 9b972d37c..9a14f0775 100644
--- a/lib/shared/messages/restore-entry-message-spec.js
+++ b/lib/shared/messages/restore-entry-message-spec.js
@@ -1,138 +1,137 @@
 // @flow
 
 import invariant from 'invariant';
 
 import { messageTypes } from '../../types/message-types';
 import type {
   MessageInfo,
   ClientDBMessageInfo,
 } from '../../types/message-types';
 import type {
   RawRestoreEntryMessageInfo,
   RestoreEntryMessageData,
   RestoreEntryMessageInfo,
 } from '../../types/messages/restore-entry';
 import type { NotifTexts } from '../../types/notif-types';
 import type { ThreadInfo } from '../../types/thread-types';
 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<
   RestoreEntryMessageData,
   RawRestoreEntryMessageInfo,
   RestoreEntryMessageInfo,
 > = Object.freeze({
   messageContentForServerDB(
     data: RestoreEntryMessageData | RawRestoreEntryMessageInfo,
   ): string {
     return JSON.stringify({
       entryID: data.entryID,
       date: data.date,
       text: data.text,
     });
   },
 
   messageContentForClientDB(data: RawRestoreEntryMessageInfo): string {
     return this.messageContentForServerDB(data);
   },
 
   rawMessageInfoFromServerDBRow(row: Object): RawRestoreEntryMessageInfo {
     const content = JSON.parse(row.content);
     return {
       type: messageTypes.RESTORE_ENTRY,
       id: row.id.toString(),
       threadID: row.threadID.toString(),
       time: row.time,
       creatorID: row.creatorID.toString(),
       entryID: content.entryID,
       date: content.date,
       text: content.text,
     };
   },
 
   rawMessageInfoFromClientDB(
     clientDBMessageInfo: ClientDBMessageInfo,
   ): RawRestoreEntryMessageInfo {
     invariant(
       clientDBMessageInfo.content !== undefined &&
         clientDBMessageInfo.content !== null,
       'content must be defined',
     );
     const content = JSON.parse(clientDBMessageInfo.content);
     const rawRestoreEntryMessageInfo: RawRestoreEntryMessageInfo = {
       type: messageTypes.RESTORE_ENTRY,
       id: clientDBMessageInfo.id,
       threadID: clientDBMessageInfo.thread,
       time: parseInt(clientDBMessageInfo.time),
       creatorID: clientDBMessageInfo.user,
       entryID: content.entryID,
       date: content.date,
       text: content.text,
     };
     return rawRestoreEntryMessageInfo;
   },
 
   createMessageInfo(
     rawMessageInfo: RawRestoreEntryMessageInfo,
     creator: RelativeUserInfo,
   ): RestoreEntryMessageInfo {
     return {
       type: messageTypes.RESTORE_ENTRY,
       id: rawMessageInfo.id,
       threadID: rawMessageInfo.threadID,
       creator,
       time: rawMessageInfo.time,
       entryID: rawMessageInfo.entryID,
       date: rawMessageInfo.date,
       text: rawMessageInfo.text,
     };
   },
 
   rawMessageInfoFromMessageData(
     messageData: RestoreEntryMessageData,
     id: ?string,
   ): RawRestoreEntryMessageInfo {
     invariant(id, 'RawRestoreEntryMessageInfo needs id');
     return { ...messageData, id };
   },
 
   robotext(messageInfo: RestoreEntryMessageInfo): EntityText {
     const date = prettyDate(messageInfo.date);
     const creator = ET.user({ userInfo: messageInfo.creator });
     const { text } = messageInfo;
     return ET`${creator} restored an event scheduled for ${date}: "${text}"`;
   },
 
   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,
       body,
       prefix,
     };
   },
 
   generatesNotifs: async () => pushTypes.NOTIF,
 });