diff --git a/public/configuration/UITexts_en.json5.example b/public/configuration/UITexts_en.json5.example
index 4b4fcdf..90c1aa1 100644
--- a/public/configuration/UITexts_en.json5.example
+++ b/public/configuration/UITexts_en.json5.example
@@ -772,4 +772,13 @@
     'usersettings.success.password':                    "Password updated successfully.",
     'usersettings.success.email':                       "Email updated successfully.",
     'usersettings.success.username':                    "Username updated. Please log in again with your new name.",
+
+    // ------------------------------------------------------------------------
+    // Mentions
+    // ------------------------------------------------------------------------
+    'mentions.window.title':    'Mentions',
+    'mentions.window.empty':    'No mentions',
+    'mentions.window.markall':  'Mark all as read',
+    'mentions.tab.title':       'Mentions',
+    'mentions.notification':    '%sender% mentioned you in %room%',
 }
diff --git a/public/configuration/UITexts_nl.json5.example b/public/configuration/UITexts_nl.json5.example
index d3aa55a..8e76beb 100644
--- a/public/configuration/UITexts_nl.json5.example
+++ b/public/configuration/UITexts_nl.json5.example
@@ -774,4 +774,13 @@
     'usersettings.success.password':                    "Wachtwoord succesvol bijgewerkt.",
     'usersettings.success.email':                       "E-mail succesvol bijgewerkt.",
     'usersettings.success.username':                    "Gebruikersnaam bijgewerkt. Log opnieuw in met je nieuwe naam.",
+
+    // ------------------------------------------------------------------------
+    // Mentions
+    // ------------------------------------------------------------------------
+    'mentions.window.title':    'Vermeldingen',
+    'mentions.window.empty':    'Geen vermeldingen',
+    'mentions.window.markall':  'Alles als gelezen markeren',
+    'mentions.tab.title':       'Vermeldingen',
+    'mentions.notification':    '%sender% heeft je genoemd in %room%',
 }
diff --git a/src/components/chat-history/ChatHistoryView.tsx b/src/components/chat-history/ChatHistoryView.tsx
index dac3f07..19d7611 100644
--- a/src/components/chat-history/ChatHistoryView.tsx
+++ b/src/components/chat-history/ChatHistoryView.tsx
@@ -15,7 +15,7 @@ export const ChatHistoryView: FC<{}> = props =>
     const [searchText, setSearchText] = useState<string>('');
     const [activeTab, setActiveTab] = useState<string>(TAB_CHAT);
     const { chatHistory = [] } = useChatHistory();
-    const { mentions } = useMentionsSnapshot();
+    const { mentions, unreadCount } = useMentionsSnapshot();
     const onMentionRowClick = useMentionRowClick();
     const { onClickChat } = useOnClickChat();
     const elementRef = useRef<HTMLDivElement>(null);
@@ -98,7 +98,7 @@ export const ChatHistoryView: FC<{}> = props =>
                 <NitroCardTabsItemView isActive={ activeTab === TAB_CHAT } onClick={ () => setActiveTab(TAB_CHAT) }>
                     { LocalizeText('room.chathistory.button.text') }
                 </NitroCardTabsItemView>
-                <NitroCardTabsItemView count={ mentions.reduce((n, m) => n + (m.read ? 0 : 1), 0) } isActive={ activeTab === TAB_MENTIONS } onClick={ () => setActiveTab(TAB_MENTIONS) }>
+                <NitroCardTabsItemView count={ unreadCount } isActive={ activeTab === TAB_MENTIONS } onClick={ () => setActiveTab(TAB_MENTIONS) }>
                     { LocalizeText('mentions.tab.title') }
                 </NitroCardTabsItemView>
             </NitroCardTabsView>