diff --git a/packages/rocketchat-channel-settings-mail-messages/client/lib/ChannelSettings.coffee b/packages/rocketchat-channel-settings-mail-messages/client/lib/ChannelSettings.coffee
deleted file mode 100644
index 9c4e420f5e9..00000000000
--- a/packages/rocketchat-channel-settings-mail-messages/client/lib/ChannelSettings.coffee
+++ /dev/null
@@ -1,3 +0,0 @@
-RocketChat.ChannelSettings.addOption
-	id: 'mail-messages'
-	template: 'channelSettingsMailMessages'
diff --git a/packages/rocketchat-channel-settings-mail-messages/client/lib/startup.coffee b/packages/rocketchat-channel-settings-mail-messages/client/lib/startup.coffee
new file mode 100644
index 00000000000..ecdfc26de46
--- /dev/null
+++ b/packages/rocketchat-channel-settings-mail-messages/client/lib/startup.coffee
@@ -0,0 +1,9 @@
+Meteor.startup ->
+	RocketChat.ChannelSettings.addOption
+		id: 'mail-messages'
+		template: 'channelSettingsMailMessages'
+
+	RocketChat.callbacks.add 'roomExit', (mainNode) ->
+		instance = Blaze.getView($('.messages-box')?[0])?.templateInstance()
+		instance?.resetSelection(false)
+	, RocketChat.callbacks.priority.MEDIUM, 'room-exit-mail-messages'
diff --git a/packages/rocketchat-channel-settings-mail-messages/client/views/mailMessagesInstructions.coffee b/packages/rocketchat-channel-settings-mail-messages/client/views/mailMessagesInstructions.coffee
index f95e8f0aba5..ed30d543765 100644
--- a/packages/rocketchat-channel-settings-mail-messages/client/views/mailMessagesInstructions.coffee
+++ b/packages/rocketchat-channel-settings-mail-messages/client/views/mailMessagesInstructions.coffee
@@ -76,4 +76,4 @@ Template.mailMessagesInstructions.onCreated ->
 
 	@autorun =>
 		if Session.get('channelSettingsMailMessages') isnt Session.get('openedRoom')
-			RocketChat.TabBar.setTemplate('channelSettings')
+			this.reset()
diff --git a/packages/rocketchat-channel-settings-mail-messages/package.js b/packages/rocketchat-channel-settings-mail-messages/package.js
index 673d2f8b02e..d5344ae5826 100644
--- a/packages/rocketchat-channel-settings-mail-messages/package.js
+++ b/packages/rocketchat-channel-settings-mail-messages/package.js
@@ -19,7 +19,7 @@ Package.onUse(function(api) {
 	]);
 
 	api.addFiles([
-		'client/lib/ChannelSettings.coffee',
+		'client/lib/startup.coffee',
 		'client/stylesheets/mail-messages.less',
 		'client/views/channelSettingsMailMessages.html',
 		'client/views/channelSettingsMailMessages.coffee',
diff --git a/packages/rocketchat-channel-settings/client/views/channelSettings.html b/packages/rocketchat-channel-settings/client/views/channelSettings.html
index 4317cf72b55..f2c87034387 100644
--- a/packages/rocketchat-channel-settings/client/views/channelSettings.html
+++ b/packages/rocketchat-channel-settings/client/views/channelSettings.html
@@ -6,16 +6,18 @@
 			</div>
 			<form>
 				<ul class="list clearfix">
-					<li>
-						<label>{{_ "Name"}}</label>
-						<div>
-							{{#if editing 'roomName'}}
-								<input type="text" name="roomName" value="{{roomName}}" class="editing" /> <button type="button" class="button secondary cancel">{{_ "Cancel"}}</button> <button type="button" class="button primary save">{{_ "Save"}}</button>
-							{{else}}
-								<span>{{roomName}}{{#if canEdit}} <i class="octicon octicon-pencil" data-edit="roomName"></i>{{/if}}</span>
-							{{/if}}
-						</div>
-					</li>
+					{{#if notDirect}}
+						<li>
+							<label>{{_ "Name"}}</label>
+							<div>
+								{{#if editing 'roomName'}}
+									<input type="text" name="roomName" value="{{roomName}}" class="editing" /> <button type="button" class="button secondary cancel">{{_ "Cancel"}}</button> <button type="button" class="button primary save">{{_ "Save"}}</button>
+								{{else}}
+									<span>{{roomName}}{{#if canEdit}} <i class="octicon octicon-pencil" data-edit="roomName"></i>{{/if}}</span>
+								{{/if}}
+							</div>
+						</li>
+					{{/if}}
 					<li>
 						<label>{{_ "Topic"}}</label>
 						<div>
@@ -26,19 +28,21 @@
 							{{/if}}
 						</div>
 					</li>
-					<li>
-						<label>{{_ "Type"}}</label>
-						<div>
-							{{#if editing 'roomType'}}
-								<label><input type="radio" name="roomType" class="editing" value="c" checked="{{$eq roomType 'c'}}" /> {{_ "Channel"}}</label>
-								<label><input type="radio" name="roomType" value="p" checked="{{$eq roomType 'p'}}" /> {{_ "Private_Group"}}</label>
-								<button type="button" class="button secondary cancel">{{_ "Cancel"}}</button>
-								<button type="button" class="button primary save">{{_ "Save"}}</button>
-							{{else}}
-								<span>{{roomTypeDescription}}{{#if canEdit}} <i class="octicon octicon-pencil" data-edit="roomType"></i>{{/if}}</span>
-							{{/if}}
-						</div>
-					</li>
+					{{#if notDirect}}
+						<li>
+							<label>{{_ "Type"}}</label>
+							<div>
+								{{#if editing 'roomType'}}
+									<label><input type="radio" name="roomType" class="editing" value="c" checked="{{$eq roomType 'c'}}" /> {{_ "Channel"}}</label>
+									<label><input type="radio" name="roomType" value="p" checked="{{$eq roomType 'p'}}" /> {{_ "Private_Group"}}</label>
+									<button type="button" class="button secondary cancel">{{_ "Cancel"}}</button>
+									<button type="button" class="button primary save">{{_ "Save"}}</button>
+								{{else}}
+									<span>{{roomTypeDescription}}{{#if canEdit}} <i class="octicon octicon-pencil" data-edit="roomType"></i>{{/if}}</span>
+								{{/if}}
+							</div>
+						</li>
+					{{/if}}
 					{{#each channelSettings}}
 						{{> Template.dynamic template=template data=data}}
 					{{/each}}
diff --git a/packages/rocketchat-lib/client/lib/roomExit.coffee b/packages/rocketchat-lib/client/lib/roomExit.coffee
index 7ee736f5e2e..d7da9ed4a87 100644
--- a/packages/rocketchat-lib/client/lib/roomExit.coffee
+++ b/packages/rocketchat-lib/client/lib/roomExit.coffee
@@ -1,4 +1,6 @@
 @roomExit = ->
+	RocketChat.callbacks.run 'roomExit'
+
 	BlazeLayout.render 'main', {center: 'none'}
 
 	if currentTracker?