diff --git a/app/javascript/mastodon/actions/notifications.js b/app/javascript/mastodon/actions/notifications.js
index daf95f934a..b2da6ce6e9 100644
--- a/app/javascript/mastodon/actions/notifications.js
+++ b/app/javascript/mastodon/actions/notifications.js
@@ -81,24 +81,21 @@ export const NOTIFICATIONS_FOR_REQUEST_EXPAND_REQUEST = 'NOTIFICATIONS_FOR_REQUE
 export const NOTIFICATIONS_FOR_REQUEST_EXPAND_SUCCESS = 'NOTIFICATIONS_FOR_REQUEST_EXPAND_SUCCESS';
 export const NOTIFICATIONS_FOR_REQUEST_EXPAND_FAIL    = 'NOTIFICATIONS_FOR_REQUEST_EXPAND_FAIL';
 
-const DEFAULT_NOTIFICATION_MESSAGES = {
-  'notification.admin.report': '{name} reported {target}',
-  'notification.admin.sign_up': '{name} signed up',
-  'notification.emoji_reaction': '{name} reacted your post with emoji',
-  'notification.favourite': '{name} favorited your post',
-  'notification.follow': '{name} followed you',
-  'notification.list_status': '{name} post is added to {listName}',
-  'notification.mention': 'Mention',
-  'notification.poll': 'A poll you voted in has ended',
-  'notification.reblog': '{name} boosted your post',
-  'notification.status': '{name} just posted',
-  'notification.status_reference': '{name} quoted your post',
-  'notification.update': '{name} edited a post',
-};
-
-defineMessages({
-  mention: { id: 'notification.mention', defaultMessage: '{name} mentioned you' },
+const messages = defineMessages({
+  // mention: { id: 'notification.mention', defaultMessage: '{name} mentioned you' },
   group: { id: 'notifications.group', defaultMessage: '{count} notifications' },
+  'message_admin.report': { id: 'notification.admin.report', defaultMessage: '{name} reported {target}' },
+  'message_admin.sign_up': { id: 'notification.admin.sign_up', defaultMessage: '{name} signed up' },
+  message_emoji_reaction: { id: 'notification.emoji_reaction', defaultMessage: '{name} reacted your post with emoji' },
+  message_favourite: { id: 'notification.favourite', defaultMessage: '{name} favorited your post' },
+  message_follow: { id: 'notification.follow', defaultMessage: '{name} followed you' },
+  message_list_status: { id: 'notification.list_status', defaultMessage: '{name} post is added to {listName}' },
+  message_mention: { id: 'notification.mention', defaultMessage: 'Mention' },
+  message_poll: { id: 'notification.poll', defaultMessage: 'A poll you voted in has ended' },
+  message_reblog: { id: 'notification.reblog', defaultMessage: '{name} boosted your post' },
+  message_status: { id: 'notification.status', defaultMessage: '{name} just posted' },
+  message_status_reference: { id: 'notification.status_reference', defaultMessage: '{name} quoted your post' },
+  message_update: { id: 'notification.update', defaultMessage: '{name} edited a post' },
 });
 
 const fetchRelatedRelationships = (dispatch, notifications) => {
@@ -176,7 +173,7 @@ export function updateNotifications(notification, intlMessages, intlLocale) {
 
     // Desktop notifications
     if (typeof window.Notification !== 'undefined' && showAlert && !filtered) {
-      const messageTemplate = intlMessages[`notification.${notification.type}`] || DEFAULT_NOTIFICATION_MESSAGES[`notification.${notification.type}`];
+      const messageTemplate = intlMessages[`notification.${notification.type}`] || messages[`message_${notification.type}`] || '[NO MESSAGE DEFINITION]';
       const title = new IntlMessageFormat(messageTemplate, intlLocale).format({
         name: notification.account.display_name.length > 0 ? notification.account.display_name : notification.account.username,
         listName: notification.list && notification.list.title,
diff --git a/app/javascript/mastodon/features/notifications/components/notification.jsx b/app/javascript/mastodon/features/notifications/components/notification.jsx
index a4bb98331c..7683176c1e 100644
--- a/app/javascript/mastodon/features/notifications/components/notification.jsx
+++ b/app/javascript/mastodon/features/notifications/components/notification.jsx
@@ -34,12 +34,12 @@ import { RelationshipsSeveranceEvent } from './relationships_severance_event';
 import Report from './report';
 
 const messages = defineMessages({
-  favourite: { id: 'notification.favourite', defaultMessage: '{name} favorited your status' },
-  emojiReaction: { id: 'notification.emoji_reaction', defaultMessage: '{name} reacted your status with emoji' },
+  favourite: { id: 'notification.favourite', defaultMessage: '{name} favorited your post' },
+  emojiReaction: { id: 'notification.emoji_reaction', defaultMessage: '{name} reacted your post with emoji' },
   follow: { id: 'notification.follow', defaultMessage: '{name} followed you' },
   ownPoll: { id: 'notification.own_poll', defaultMessage: 'Your poll has ended' },
   poll: { id: 'notification.poll', defaultMessage: 'A poll you voted in has ended' },
-  reblog: { id: 'notification.reblog', defaultMessage: '{name} boosted your status' },
+  reblog: { id: 'notification.reblog', defaultMessage: '{name} boosted your post' },
   status: { id: 'notification.status', defaultMessage: '{name} just posted' },
   listStatus: { id: 'notification.list_status', defaultMessage: '{name} post is added to {listName}' },
   statusReference: { id: 'notification.status_reference', defaultMessage: '{name} quoted your post' },
@@ -207,7 +207,7 @@ class Notification extends ImmutablePureComponent {
             <Icon id='star' icon={StarIcon} className='star-icon' />
 
             <span title={notification.get('created_at')}>
-              <FormattedMessage id='notification.favourite' defaultMessage='{name} favorited your status' values={{ name: link }} />
+              <FormattedMessage id='notification.favourite' defaultMessage='{name} favorited your post' values={{ name: link }} />
             </span>
           </div>
 
@@ -241,7 +241,7 @@ class Notification extends ImmutablePureComponent {
             </div>
 
             <span title={notification.get('created_at')}>
-              <FormattedMessage id='notification.emoji_reaction' defaultMessage='{name} reacted your status with emoji' values={{ name: link }} />
+              <FormattedMessage id='notification.emoji_reaction' defaultMessage='{name} reacted your post with emoji' values={{ name: link }} />
             </span>
           </div>
 
@@ -272,7 +272,7 @@ class Notification extends ImmutablePureComponent {
             <Icon id='retweet' icon={RepeatIcon} />
 
             <span title={notification.get('created_at')}>
-              <FormattedMessage id='notification.reblog' defaultMessage='{name} boosted your status' values={{ name: link }} />
+              <FormattedMessage id='notification.reblog' defaultMessage='{name} boosted your post' values={{ name: link }} />
             </span>
           </div>
 
diff --git a/app/javascript/mastodon/features/notifications_v2/components/notification_emoji_reaction.tsx b/app/javascript/mastodon/features/notifications_v2/components/notification_emoji_reaction.tsx
index c0f09fd67e..dbc85e6036 100644
--- a/app/javascript/mastodon/features/notifications_v2/components/notification_emoji_reaction.tsx
+++ b/app/javascript/mastodon/features/notifications_v2/components/notification_emoji_reaction.tsx
@@ -14,7 +14,7 @@ const labelRenderer: LabelRenderer = (displayedName, total, seeMoreHref) => {
     return (
       <FormattedMessage
         id='notification.emoji_reaction'
-        defaultMessage='{name} reacted your status with emoji'
+        defaultMessage='{name} reacted your post with emoji'
         values={{ name: displayedName }}
       />
     );
diff --git a/app/javascript/mastodon/features/notifications_v2/components/notification_favourite.tsx b/app/javascript/mastodon/features/notifications_v2/components/notification_favourite.tsx
index eba37fe937..49866540e5 100644
--- a/app/javascript/mastodon/features/notifications_v2/components/notification_favourite.tsx
+++ b/app/javascript/mastodon/features/notifications_v2/components/notification_favourite.tsx
@@ -14,7 +14,7 @@ const labelRenderer: LabelRenderer = (displayedName, total, seeMoreHref) => {
     return (
       <FormattedMessage
         id='notification.favourite'
-        defaultMessage='{name} favorited your status'
+        defaultMessage='{name} favorited your post'
         values={{ name: displayedName }}
       />
     );
diff --git a/app/javascript/mastodon/features/notifications_v2/components/notification_reblog.tsx b/app/javascript/mastodon/features/notifications_v2/components/notification_reblog.tsx
index 7b3bda85e5..36a798032b 100644
--- a/app/javascript/mastodon/features/notifications_v2/components/notification_reblog.tsx
+++ b/app/javascript/mastodon/features/notifications_v2/components/notification_reblog.tsx
@@ -14,7 +14,7 @@ const labelRenderer: LabelRenderer = (displayedName, total, seeMoreHref) => {
     return (
       <FormattedMessage
         id='notification.reblog'
-        defaultMessage='{name} boosted your status'
+        defaultMessage='{name} boosted your post'
         values={{ name: displayedName }}
       />
     );