diff --git a/app/components/combined_system_message/combined_system_message.js b/app/components/combined_system_message/combined_system_message.js
index bc6075859..edf43bf40 100644
--- a/app/components/combined_system_message/combined_system_message.js
+++ b/app/components/combined_system_message/combined_system_message.js
@@ -25,6 +25,10 @@ const postTypeMessage = {
             id: t('combined_system_message.joined_channel.one'),
             defaultMessage: '{firstUser} **joined the channel**.',
         },
+        one_you: {
+            id: t('combined_system_message.joined_channel.one_you'),
+            defaultMessage: 'You **joined the channel**.',
+        },
         two: {
             id: t('combined_system_message.joined_channel.two'),
             defaultMessage: '{firstUser} and {secondUser} **joined the channel**.',
@@ -75,6 +79,10 @@ const postTypeMessage = {
             id: t('combined_system_message.left_channel.one'),
             defaultMessage: '{firstUser} **left the channel**.',
         },
+        one_you: {
+            id: t('combined_system_message.left_channel.one_you'),
+            defaultMessage: 'You **left the channel**.',
+        },
         two: {
             id: t('combined_system_message.left_channel.two'),
             defaultMessage: '{firstUser} and {secondUser} **left the channel**.',
@@ -89,6 +97,10 @@ const postTypeMessage = {
             id: t('combined_system_message.joined_team.one'),
             defaultMessage: '{firstUser} **joined the team**.',
         },
+        one_you: {
+            id: t('combined_system_message.joined_team.one_you'),
+            defaultMessage: 'You **joined the team**.',
+        },
         two: {
             id: t('combined_system_message.joined_team.two'),
             defaultMessage: '{firstUser} and {secondUser} **joined the team**.',
@@ -139,6 +151,10 @@ const postTypeMessage = {
             id: t('combined_system_message.left_team.one'),
             defaultMessage: '{firstUser} **left the team**.',
         },
+        one_you: {
+            id: t('combined_system_message.left_team.one_you'),
+            defaultMessage: 'You **left the team**.',
+        },
         two: {
             id: t('combined_system_message.left_team.two'),
             defaultMessage: '{firstUser} and {secondUser} **left the team**.',