diff --git a/packages/rocketchat-channel-settings/client/views/channelSettings.html b/packages/rocketchat-channel-settings/client/views/channelSettings.html
index 4cd38d31a1ae..5ac205f7eda4 100644
--- a/packages/rocketchat-channel-settings/client/views/channelSettings.html
+++ b/packages/rocketchat-channel-settings/client/views/channelSettings.html
@@ -65,7 +65,7 @@
 		{{#with settings.t}}
 			<div class="rc-user-info__row rc-user-info__row--separator">
 				<div class="rc-switch-double">
-					<div class="rc-switch-double__label {{equal true value 'disabled'}}">
+					<div class="rc-switch-double__label {{equal false value 'disabled'}}">
 						{{_ "Public"}}{{equal default value '*'}}
 						<div class="rc-switch-double__description">
 							{{_ "Everyone_can_access_this_channel"}}
@@ -79,7 +79,7 @@
 							</span>
 						</label>
 					</div>
-					<div class="rc-switch-double__label  {{equal false value 'disabled'}}">
+					<div class="rc-switch-double__label {{equal true value 'disabled'}}">
 						{{_ "Private"}}
 						<div class="rc-switch-double__description">
 							{{_ "Just_invited_people_can_access_this_channel"}}
@@ -93,7 +93,7 @@
 		{{#with settings.ro}}
 			<div class="rc-user-info__row rc-user-info__row--separator">
 				<div class="rc-switch-double">
-					<div class="rc-switch-double__label  {{equal true value 'disabled'}}">
+					<div class="rc-switch-double__label {{equal false value 'disabled'}}">
 						{{_ "Colaborative"}}{{equal default value '*'}}
 						<div class="rc-switch-double__description">
 							{{_ "All_users_in_the_channel_can_write_new_messages"}}
@@ -107,7 +107,7 @@
 							</span>
 						</label>
 					</div>
-					<div class="rc-switch-double__label {{equal false value 'disabled'}}">
+					<div class="rc-switch-double__label {{equal true value 'disabled'}}">
 						{{_ "Read_only"}}
 						<div class="rc-switch-double__description">
 							{{_ "Only_authorized_users_can_write_new_messages"}}
@@ -163,6 +163,25 @@
 			</div>
 			{{/if}}
 		{{/with}}
+
+		 {{#with settings.sysMes}}
+			{{#if canView}}
+				<div class="rc-user-info__row">
+					<div class="rc-switch rc-switch--blue">
+						<label class="rc-switch__label">
+							<span class="rc-switch__text">
+								{{_ label}}{{equal default value '*'}}
+							</span>
+							<input type="checkbox" class="rc-switch__input js-input-check" name="archived" checked="{{checked}}" disabled="{{./disabled}}">
+							<span class="rc-switch__button">
+								<span class="rc-switch__button-inside"></span>
+							</span>
+						</label>
+					</div>
+				</div>
+			{{/if}}
+		{{/with}}
+
 		{{#with settings.broadcast}}
 			{{#if canView}}
 			<div class="rc-user-info__row">
diff --git a/packages/rocketchat-channel-settings/client/views/channelSettings.js b/packages/rocketchat-channel-settings/client/views/channelSettings.js
index 4e3375d3c57b..922a44c9d75c 100644
--- a/packages/rocketchat-channel-settings/client/views/channelSettings.js
+++ b/packages/rocketchat-channel-settings/client/views/channelSettings.js
@@ -248,6 +248,33 @@ Template.channelSettingsEditing.onCreated(function() {
 				});
 			}
 		},
+		sysMes: {
+			type: 'boolean',
+			label: 'System_messages',
+			isToggle: true,
+			processing: new ReactiveVar(false),
+			canView() {
+				return RocketChat.roomTypes.roomTypes[room.t].allowRoomSettingChange(
+					room,
+					RoomSettingsEnum.SYSTEM_MESSAGES
+				);
+			},
+			getValue() {
+				return room.sysMes !== false;
+			},
+			canEdit() {
+				return RocketChat.authz.hasAllPermission('edit-room', room._id);
+			},
+			save(value) {
+				return call('saveRoomSettings', room._id, 'systemMessages', value).then(
+					() => {
+						toastr.success(
+							TAPi18n.__('System_messages_setting_changed_successfully')
+						);
+					}
+				);
+			}
+		},
 		archived: {
 			type: 'boolean',
 			label: 'Room_archivation_state_true',
diff --git a/packages/rocketchat-lib/lib/RoomTypeConfig.js b/packages/rocketchat-lib/lib/RoomTypeConfig.js
index 20bb932467b4..7ab4efcc7289 100644
--- a/packages/rocketchat-lib/lib/RoomTypeConfig.js
+++ b/packages/rocketchat-lib/lib/RoomTypeConfig.js
@@ -7,7 +7,8 @@ export const RoomSettingsEnum = {
 	REACT_WHEN_READ_ONLY: 'reactWhenReadOnly',
 	ARCHIVE_OR_UNARCHIVE: 'archiveOrUnarchive',
 	JOIN_CODE: 'joinCode',
-	BROADCAST: 'broadcast'
+	BROADCAST: 'broadcast',
+	SYSTEM_MESSAGES: 'systemMessages'
 };
 
 export const UiTextContext = {
diff --git a/packages/rocketchat-lib/lib/roomTypes/direct.js b/packages/rocketchat-lib/lib/roomTypes/direct.js
index a1e32f1a536a..5ea839f7d1e8 100644
--- a/packages/rocketchat-lib/lib/roomTypes/direct.js
+++ b/packages/rocketchat-lib/lib/roomTypes/direct.js
@@ -82,6 +82,7 @@ export class DirectMessageRoomType extends RoomTypeConfig {
 	allowRoomSettingChange(room, setting) {
 		switch (setting) {
 			case RoomSettingsEnum.NAME:
+			case RoomSettingsEnum.SYSTEM_MESSAGES:
 			case RoomSettingsEnum.DESCRIPTION:
 			case RoomSettingsEnum.READ_ONLY:
 			case RoomSettingsEnum.REACT_WHEN_READ_ONLY:
diff --git a/packages/rocketchat-lib/lib/roomTypes/private.js b/packages/rocketchat-lib/lib/roomTypes/private.js
index e887fa392102..50504941fb7c 100644
--- a/packages/rocketchat-lib/lib/roomTypes/private.js
+++ b/packages/rocketchat-lib/lib/roomTypes/private.js
@@ -66,6 +66,7 @@ export class PrivateRoomType extends RoomTypeConfig {
 				return !room.broadcast;
 			case RoomSettingsEnum.REACT_WHEN_READ_ONLY:
 				return !room.broadcast && room.ro;
+			case RoomSettingsEnum.SYSTEM_MESSAGES:
 			default:
 				return true;
 		}
diff --git a/packages/rocketchat-lib/lib/roomTypes/public.js b/packages/rocketchat-lib/lib/roomTypes/public.js
index 8569b4a7c508..12c2af629601 100644
--- a/packages/rocketchat-lib/lib/roomTypes/public.js
+++ b/packages/rocketchat-lib/lib/roomTypes/public.js
@@ -75,6 +75,7 @@ export class PublicRoomType extends RoomTypeConfig {
 				return !room.broadcast;
 			case RoomSettingsEnum.REACT_WHEN_READ_ONLY:
 				return !room.broadcast && room.ro;
+			case RoomSettingsEnum.SYSTEM_MESSAGES:
 			default:
 				return true;
 		}
diff --git a/packages/rocketchat-theme/client/imports/components/userInfo.css b/packages/rocketchat-theme/client/imports/components/userInfo.css
index d2dff7892095..b3bab1b952a8 100644
--- a/packages/rocketchat-theme/client/imports/components/userInfo.css
+++ b/packages/rocketchat-theme/client/imports/components/userInfo.css
@@ -142,10 +142,6 @@
 			}
 		}
 
-		& .rc-switch-double__label {
-			color: #a1a1a1;
-		}
-
 		&--separator {
 
 			margin: 14px 0;
@@ -294,6 +290,8 @@
 
 	word-break: break-word;
 
+	color: #444;
+
 	&__description {
 		margin: 5px 2px;
 
@@ -314,7 +312,7 @@
 		}
 
 		&.disabled {
-			color: inherit;
+			opacity: 0.3;
 		}
 	}
 
diff --git a/server/publications/room.js b/server/publications/room.js
index c9912b3cb06b..a2bfa46da5e8 100644
--- a/server/publications/room.js
+++ b/server/publications/room.js
@@ -32,6 +32,7 @@ const fields = {
 	label: 1,
 	ro: 1,
 	reactWhenReadOnly: 1,
+	sysMes: 1,
 	sentiment: 1,
 	tokenpass: 1,
 	streamingOptions: 1,