diff --git a/_locales/en/messages.json b/_locales/en/messages.json
index 4fb53c2c7..93139c59f 100644
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@@ -453,6 +453,10 @@
   "unverify": {
     "message": "Mark As Not Verified"
   },
+  "markAllAsRead": {
+    "message": "Mark All as Read",
+    "description": "Shown on a menu to mark the whole convo as read."
+  },
   "isNotVerified": {
     "message": "You have not verified your safety number with $name$.",
     "description": "Summary state shown at top of the safety number screen if user has not verified contact.",
diff --git a/_locales/fr/messages.json b/_locales/fr/messages.json
index ce2ede2c3..cd4d099bc 100644
--- a/_locales/fr/messages.json
+++ b/_locales/fr/messages.json
@@ -363,6 +363,10 @@
             }
         }
     },
+    "markAllAsRead": {
+        "message": "Tout Marquer Comme Lu",
+        "description": "Shown on a menu to mark the whole convo as read."
+    },
     "isNotVerified": {
         "message": "Vous n’avez pas vérifié votre numéro de sécurité avec $name$",
         "description": "Summary state shown at top of the safety number screen if user has not verified contact.",
diff --git a/ts/components/ConversationListItem.tsx b/ts/components/ConversationListItem.tsx
index c436a7992..643b5fa46 100644
--- a/ts/components/ConversationListItem.tsx
+++ b/ts/components/ConversationListItem.tsx
@@ -42,6 +42,7 @@ type PropsHousekeeping = {
   onUnblockContact?: () => void;
   onInviteContacts?: () => void;
   onClearNickname?: () => void;
+  onMarkAllRead: () => void;
   theme: DefaultTheme;
 };
 
@@ -62,7 +63,6 @@ class ConversationListItem extends React.PureComponent<Props> {
   public renderAvatar() {
     const {
       avatarPath,
-      i18n,
       name,
       phoneNumber,
       profileName,
diff --git a/ts/components/conversation/ConversationHeader.tsx b/ts/components/conversation/ConversationHeader.tsx
index f291de213..c6a28b013 100644
--- a/ts/components/conversation/ConversationHeader.tsx
+++ b/ts/components/conversation/ConversationHeader.tsx
@@ -83,6 +83,8 @@ interface Props {
   onAvatarClick?: (userPubKey: string) => void;
   onUpdateGroupName: () => void;
 
+  onMarkAllRead: () => void;
+
   memberAvatars?: Array<ConversationAvatar>; // this is added by usingClosedConversationDetails
   theme: DefaultTheme;
 }
diff --git a/ts/components/session/conversation/SessionConversation.tsx b/ts/components/session/conversation/SessionConversation.tsx
index 6becc6e27..57073b6e8 100644
--- a/ts/components/session/conversation/SessionConversation.tsx
+++ b/ts/components/session/conversation/SessionConversation.tsx
@@ -434,6 +434,10 @@ export class SessionConversation extends React.Component<Props, State> {
         window.Whisper.events.trigger('inviteContacts', conversation);
       },
 
+      onMarkAllRead: () => {
+        void conversation.markReadBouncy(Date.now());
+      },
+
       onAddModerators: () => {
         window.Whisper.events.trigger('addModerators', conversation);
       },
diff --git a/ts/components/session/menu/ConversationHeaderMenu.tsx b/ts/components/session/menu/ConversationHeaderMenu.tsx
index 9dcd0a37e..967e7e2ad 100644
--- a/ts/components/session/menu/ConversationHeaderMenu.tsx
+++ b/ts/components/session/menu/ConversationHeaderMenu.tsx
@@ -4,6 +4,7 @@ import {
   getAddModeratorsMenuItem,
   getBlockMenuItem,
   getCopyMenuItem,
+  getMarkAllReadMenuItem,
   getDeleteContactMenuItem,
   getDeleteMessagesMenuItem,
   getDisappearingMenuItem,
@@ -31,6 +32,7 @@ export type PropsConversationHeaderMenu = {
   onInviteContacts?: () => void;
 
   onLeaveGroup: () => void;
+  onMarkAllRead: () => void;
   onAddModerators: () => void;
   onRemoveModerators: () => void;
   onUpdateGroupName: () => void;
@@ -55,6 +57,7 @@ export const ConversationHeaderMenu = (props: PropsConversationHeaderMenu) => {
     onDeleteMessages,
     onDeleteContact,
     onCopyPublicKey,
+    onMarkAllRead,
     onLeaveGroup,
     onAddModerators,
     onRemoveModerators,
@@ -86,6 +89,7 @@ export const ConversationHeaderMenu = (props: PropsConversationHeaderMenu) => {
       )}
 
       {getCopyMenuItem(isPublic, isGroup, onCopyPublicKey, window.i18n)}
+      {getMarkAllReadMenuItem(onMarkAllRead, window.i18n)}
       {getDeleteMessagesMenuItem(isPublic, onDeleteMessages, window.i18n)}
       {getAddModeratorsMenuItem(
         isAdmin,
diff --git a/ts/components/session/menu/ConversationListItemContextMenu.tsx b/ts/components/session/menu/ConversationListItemContextMenu.tsx
index 7c3eadfb5..883a1a62d 100644
--- a/ts/components/session/menu/ConversationListItemContextMenu.tsx
+++ b/ts/components/session/menu/ConversationListItemContextMenu.tsx
@@ -5,6 +5,7 @@ import {
   getBlockMenuItem,
   getClearNicknameMenuItem,
   getCopyMenuItem,
+  getMarkAllReadMenuItem,
   getDeleteContactMenuItem,
   getDeleteMessagesMenuItem,
   getInviteContactMenuItem,
@@ -25,6 +26,7 @@ export type PropsContextConversationItem = {
   onDeleteContact?: () => void;
   onLeaveGroup?: () => void;
   onBlockContact?: () => void;
+  onMarkAllRead: () => void;
   onCopyPublicKey?: () => void;
   onUnblockContact?: () => void;
   onInviteContacts?: () => void;
@@ -48,6 +50,7 @@ export const ConversationListItemContextMenu = (
     onBlockContact,
     onClearNickname,
     onCopyPublicKey,
+    onMarkAllRead,
     onUnblockContact,
     onInviteContacts,
     onLeaveGroup,
@@ -81,6 +84,8 @@ export const ConversationListItemContextMenu = (
         onCopyPublicKey,
         window.i18n
       )}
+      {getMarkAllReadMenuItem(onMarkAllRead, window.i18n)}
+
       {getDeleteMessagesMenuItem(isPublic, onDeleteMessages, window.i18n)}
       {getInviteContactMenuItem(
         type === 'group',
diff --git a/ts/components/session/menu/Menu.tsx b/ts/components/session/menu/Menu.tsx
index 30eb5e38f..11ce15e1e 100644
--- a/ts/components/session/menu/Menu.tsx
+++ b/ts/components/session/menu/Menu.tsx
@@ -205,6 +205,13 @@ export function getCopyMenuItem(
   return null;
 }
 
+export function getMarkAllReadMenuItem(
+  action: any,
+  i18n: LocalizerType
+): JSX.Element | null {
+  return <Item onClick={action}>{i18n('markAllAsRead')}</Item>;
+}
+
 export function getDisappearingMenuItem(
   isPublic: boolean | undefined,
   isKickedFromGroup: boolean | undefined,
diff --git a/ts/models/conversation.ts b/ts/models/conversation.ts
index 1c93332ba..240974cd5 100644
--- a/ts/models/conversation.ts
+++ b/ts/models/conversation.ts
@@ -423,6 +423,9 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
       onInviteContacts: () => {
         window.Whisper.events.trigger('inviteContacts', this);
       },
+      onMarkAllRead: () => {
+        void this.markReadBouncy(Date.now());
+      },
       onClearNickname: () => {
         void this.setLokiProfile({ displayName: null });
       },
@@ -468,7 +471,6 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
   }
 
   public async getUnreadCount() {
-    window.log.warn('getUnreadCount is slow');
     const unreadCount = await getUnreadCountByConversation(this.id);
 
     return unreadCount;
diff --git a/ts/state/ducks/conversations.ts b/ts/state/ducks/conversations.ts
index f06f85492..aadf704eb 100644
--- a/ts/state/ducks/conversations.ts
+++ b/ts/state/ducks/conversations.ts
@@ -87,15 +87,16 @@ export interface ConversationType {
   groupAdmins?: Array<string>; // admins for closed groups and moderators for open groups
   members?: Array<string>; // members for closed groups only
 
-  onClick?: () => any;
-  onBlockContact?: () => any;
-  onUnblockContact?: () => any;
-  onCopyPublicKey?: () => any;
-  onDeleteContact?: () => any;
-  onLeaveGroup?: () => any;
-  onDeleteMessages?: () => any;
-  onInviteContacts?: () => any;
-  onClearNickname?: () => any;
+  onClick?: () => void;
+  onBlockContact?: () => void;
+  onUnblockContact?: () => void;
+  onCopyPublicKey?: () => void;
+  onDeleteContact?: () => void;
+  onLeaveGroup?: () => void;
+  onDeleteMessages?: () => void;
+  onInviteContacts?: () => void;
+  onMarkAllRead?: () => void;
+  onClearNickname?: () => void;
 }
 
 export type ConversationLookupType = {