From 920f0a151a16b76024b2409f06988686c5e4ea70 Mon Sep 17 00:00:00 2001
From: Renato Becker <renato.augusto.becker@gmail.com>
Date: Fri, 22 Mar 2019 14:10:16 -0300
Subject: [PATCH 01/24] [IMPROVE] Ignore agent status when queuing incoming
 livechats via Guest Pool (#13818)

* Several improvements regarding Guest Pool routing method.

* rename const `agents` to `allAgents`.
---
 app/livechat/server/api/lib/livechat.js |  4 +++-
 app/livechat/server/lib/Livechat.js     |  7 +-----
 app/livechat/server/lib/QueueMethods.js | 32 +++++++++++++++++--------
 3 files changed, 26 insertions(+), 17 deletions(-)

diff --git a/app/livechat/server/api/lib/livechat.js b/app/livechat/server/api/lib/livechat.js
index d4fa9ac5599f..24b906dfdec9 100644
--- a/app/livechat/server/api/lib/livechat.js
+++ b/app/livechat/server/api/lib/livechat.js
@@ -3,9 +3,11 @@ import { Random } from 'meteor/random';
 import { Users, Rooms, LivechatVisitors, LivechatDepartment, LivechatTrigger } from '../../../../models';
 import _ from 'underscore';
 import { Livechat } from '../../lib/Livechat';
+import { settings as rcSettings } from '../../../../settings';
 
 export function online() {
-	return Users.findOnlineAgents().count() > 0;
+	const onlineAgents = Livechat.getOnlineAgents();
+	return (onlineAgents && onlineAgents.count() > 0) || rcSettings.get('Livechat_guest_pool_with_no_agents');
 }
 
 export function findTriggers() {
diff --git a/app/livechat/server/lib/Livechat.js b/app/livechat/server/lib/Livechat.js
index 4fbebf13a155..b66eb6d9feb4 100644
--- a/app/livechat/server/lib/Livechat.js
+++ b/app/livechat/server/lib/Livechat.js
@@ -533,12 +533,7 @@ export const Livechat = {
 		const agentIds = [];
 		// get the agents of the department
 		if (departmentId) {
-			let agents = Livechat.getOnlineAgents(departmentId);
-
-			if (agents.count() === 0 && settings.get('Livechat_guest_pool_with_no_agents')) {
-				agents = Livechat.getAgents(departmentId);
-			}
-
+			const agents = Livechat.getAgents(departmentId);
 			if (agents.count() === 0) {
 				return false;
 			}
diff --git a/app/livechat/server/lib/QueueMethods.js b/app/livechat/server/lib/QueueMethods.js
index e03aa2c93e36..6dd4642913c2 100644
--- a/app/livechat/server/lib/QueueMethods.js
+++ b/app/livechat/server/lib/QueueMethods.js
@@ -91,21 +91,23 @@ export const QueueMethods = {
 	 * only the client until paired with an agent
 	 */
 	'Guest_Pool'(guest, message, roomInfo) {
-		let agents = Livechat.getOnlineAgents(guest.department);
-
-		if (agents.count() === 0 && settings.get('Livechat_guest_pool_with_no_agents')) {
-			agents = Livechat.getAgents(guest.department);
+		const onlineAgents = Livechat.getOnlineAgents(guest.department);
+		if (settings.get('Livechat_guest_pool_with_no_agents') === false) {
+			if (!onlineAgents || onlineAgents.count() === 0) {
+				throw new Meteor.Error('no-agent-online', 'Sorry, no online agents');
+			}
 		}
 
-		if (agents.count() === 0) {
-			throw new Meteor.Error('no-agent-online', 'Sorry, no online agents');
+		const allAgents = Livechat.getAgents(guest.department);
+		if (allAgents.count() === 0) {
+			throw new Meteor.Error('no-agent-available', 'Sorry, no available agents.');
 		}
 
 		Rooms.updateLivechatRoomCount();
 
 		const agentIds = [];
 
-		agents.forEach((agent) => {
+		allAgents.forEach((agent) => {
 			if (guest.department) {
 				agentIds.push(agent.agentId);
 			} else {
@@ -157,16 +159,26 @@ export const QueueMethods = {
 		LivechatInquiry.insert(inquiry);
 		Rooms.insert(room);
 
-		// Alert the agents of the queued request
-		agentIds.forEach((agentId) => {
+		// Alert only the online agents of the queued request
+		onlineAgents.forEach((agent) => {
+			const { _id, active, emails, language, status, statusConnection, username } = agent;
+
 			sendNotification({
 				// fake a subscription in order to make use of the function defined above
 				subscription: {
 					rid: room._id,
 					t : room.t,
 					u: {
-						_id : agentId,
+						_id,
 					},
+					receiver: [{
+						active,
+						emails,
+						language,
+						status,
+						statusConnection,
+						username,
+					}],
 				},
 				sender: room.v,
 				hasMentionToAll: true, // consider all agents to be in the room

From ceb653921ba7f80f40208731de40a514c4914f03 Mon Sep 17 00:00:00 2001
From: Renato Becker <renato.augusto.becker@gmail.com>
Date: Fri, 22 Mar 2019 14:37:10 -0300
Subject: [PATCH 02/24] [IMPROVE] Filter agents with autocomplete input instead
 of select element (#13730)

Closes #13728
---
 .../views/app/livechatCurrentChats.html       | 15 +++----
 .../client/views/app/livechatCurrentChats.js  | 44 +++++++++++++++----
 2 files changed, 40 insertions(+), 19 deletions(-)

diff --git a/app/livechat/client/views/app/livechatCurrentChats.html b/app/livechat/client/views/app/livechatCurrentChats.html
index 4606ad8e4f09..7771bbcb1888 100644
--- a/app/livechat/client/views/app/livechatCurrentChats.html
+++ b/app/livechat/client/views/app/livechatCurrentChats.html
@@ -9,12 +9,7 @@
 
 				<div class="form-group">
 					<label for="agent">{{_ "Served_By"}}</label>
-					<select name="agent">
-						<option value=""></option>
-						{{#each agents}}
-							<option value="{{_id}}">{{username}}</option>
-						{{/each}}
-					</select>
+					{{> inputAutocomplete settings=agentAutocompleteSettings id="agent" class="rc-input__element" autocomplete="off"}}
 				</div>
 				<div class="form-group">
 					<label for="status">{{_ "Status"}}</label>
@@ -57,11 +52,11 @@
 								{{#if isClosed}}
 									<td><a href="#remove" class="remove-livechat-room"><i class="icon-trash"></i></a></td>
 								{{else}}
-									<td>&nbsp;</td>	
-								{{/if}}	
-							{{else}}						
+									<td>&nbsp;</td>
+								{{/if}}
+							{{else}}
 								<td>&nbsp;</td>
-							{{/requiresPermission}}									
+							{{/requiresPermission}}
 						</tr>
 					{{/each}}
 				</tbody>
diff --git a/app/livechat/client/views/app/livechatCurrentChats.js b/app/livechat/client/views/app/livechatCurrentChats.js
index b0f7147ceab7..b73c32cb4365 100644
--- a/app/livechat/client/views/app/livechatCurrentChats.js
+++ b/app/livechat/client/views/app/livechatCurrentChats.js
@@ -3,9 +3,8 @@ import { Mongo } from 'meteor/mongo';
 import { ReactiveVar } from 'meteor/reactive-var';
 import { FlowRouter } from 'meteor/kadira:flow-router';
 import { Template } from 'meteor/templating';
-import { modal } from '../../../../ui-utils';
-import { t, handleError } from '../../../../utils';
-import { AgentUsers } from '../../collections/AgentUsers';
+import { modal } from '/app/ui-utils';
+import { t, handleError } from '/app/utils';
 import _ from 'underscore';
 import moment from 'moment';
 
@@ -27,12 +26,27 @@ Template.livechatCurrentChats.helpers({
 	status() {
 		return this.open ? t('Opened') : t('Closed');
 	},
-	agents() {
-		return AgentUsers.find({}, { sort: { name: 1 } });
-	},
 	isClosed() {
 		return !this.open;
 	},
+	agentAutocompleteSettings() {
+		return {
+			limit: 10,
+			inputDelay: 300,
+			rules: [{
+				collection: 'UserAndRoom',
+				subscription: 'userAutocomplete',
+				field: 'username',
+				template: Template.userSearch,
+				noMatchTemplate: Template.userSearchEmpty,
+				matchAll: true,
+				selector(match) {
+					return { term: match };
+				},
+				sort: 'username',
+			}],
+		};
+	},
 });
 
 Template.livechatCurrentChats.events({
@@ -64,6 +78,10 @@ Template.livechatCurrentChats.events({
 			delete filter.to;
 		}
 
+		if (!_.isEmpty(instance.selectedAgent.get())) {
+			filter.agent = instance.selectedAgent.get();
+		}
+
 		instance.filter.set(filter);
 		instance.limit.set(20);
 	},
@@ -95,14 +113,22 @@ Template.livechatCurrentChats.events({
 			});
 		});
 	},
+	'autocompleteselect input[id=agent]'(event, template, agent) {
+		template.selectedAgent.set(agent._id);
+	},
+
+	'input [id=agent]'(event, template) {
+		const input = event.currentTarget;
+		if (input.value === '') {
+			template.selectedAgent.set();
+		}
+	},
 });
 
 Template.livechatCurrentChats.onCreated(function() {
 	this.limit = new ReactiveVar(20);
 	this.filter = new ReactiveVar({});
-
-	this.subscribe('livechat:agents');
-
+	this.selectedAgent = new ReactiveVar;
 	this.autorun(() => {
 		this.subscribe('livechat:rooms', this.filter.get(), 0, this.limit.get());
 	});

From be18e1898dcfe16a8699f53e40e737de066debe7 Mon Sep 17 00:00:00 2001
From: Guilherme Gazzo <guilhermegazzo@gmail.com>
Date: Fri, 22 Mar 2019 16:51:06 -0300
Subject: [PATCH 03/24] Rename Threads to Discussion (#13782)

---
 .../server/methods/saveRoomSettings.js        |   2 +-
 .../client/createDiscussionMessageAction.js   |  53 ++++++
 .../client/discussionFromMessageBox.js        |  36 ++++
 app/discussion/client/index.js                |  16 ++
 .../client/lib/discussionsOfRoom.js           |   3 +
 .../lib/messageTypes/discussionMessage.js     |  17 ++
 .../client/public/stylesheets/discussion.css  |  22 +++
 .../client/tabBar.js                          |  11 +-
 .../client/views/DiscussionList.html}         |   4 +-
 .../client/views/DiscussionList.js}           |  12 +-
 .../client/views/DiscussionTabbar.html}       |   8 +-
 .../client/views/DiscussionTabbar.js}         |  25 ++-
 .../creationDialog/CreateDiscussion.html}     |  63 +++----
 .../views/creationDialog/CreateDiscussion.js} |  68 ++++----
 app/{threading => discussion}/index.js        |   0
 .../lib/discussionRoomType.js}                |  12 +-
 .../server/authorization.js                   |   0
 app/discussion/server/config.js               |  38 ++++
 .../server/hooks/joinDiscussionOnMessage.js}  |   9 +-
 .../hooks/propagateDiscussionMetadata.js      |  27 +++
 app/discussion/server/index.js                |  14 ++
 .../server/methods/createDiscussion.js        | 133 ++++++++++++++
 .../server/permissions.js                     |   6 +-
 .../discussionParentAutocomplete.js}          |   8 +-
 .../server/publications/discussionsOfRoom.js  |  32 ++++
 app/lib/lib/roomTypes/private.js              |   2 +-
 app/lib/lib/roomTypes/public.js               |   2 +-
 app/lib/server/functions/addUserToRoom.js     |   2 +-
 app/lib/server/functions/cleanRoomHistory.js  |  14 +-
 app/lib/server/methods/cleanRoomHistory.js    |   4 +-
 .../client/messageAttachment.html             |   5 +-
 .../client/stylesheets/messageAttachments.css |   2 +
 app/models/server/models/Messages.js          |  46 ++---
 app/models/server/models/Rooms.js             |   6 +-
 .../server/cronPruneMessages.js               |   6 +-
 .../client/imports/components/header.css      |   2 +
 app/theme/client/imports/components/modal.css |   2 -
 .../components/modal/create-channel.css       |   4 +-
 .../client/imports/components/userInfo.css    |   2 +
 app/theme/client/imports/forms/button.css     |   7 +-
 app/theme/client/imports/forms/input.css      |  10 +-
 app/theme/client/imports/general/base_old.css |   8 -
 .../client/imports/general/variables.css      |   4 +-
 .../client/createThreadMessageAction.js       |  49 ------
 app/threading/client/index.js                 |  20 ---
 .../client/lib/messageTypes/threadMessage.js  |  32 ----
 app/threading/client/lib/threadsOfRoom.js     |   3 -
 .../client/public/stylesheets/threading.css   |  34 ----
 app/threading/client/threadFromMessageBox.js  |  33 ----
 .../views/fieldTypeThreadLastMessageAge.html  |   7 -
 .../views/fieldTypeThreadLastMessageAge.js    |  12 --
 .../views/fieldTypeThreadReplyCounter.html    |  19 --
 .../views/fieldTypeThreadReplyCounter.js      |  30 ----
 app/threading/server/config.js                |  42 -----
 .../server/hooks/propagateThreadMetadata.js   |  28 ---
 app/threading/server/index.js                 |  14 --
 app/threading/server/methods/createThread.js  | 162 ------------------
 .../server/publications/threadsOfRoom.js      |  31 ----
 app/ui-account/client/accountPreferences.html |   8 +-
 app/ui-account/client/accountPreferences.js   |   2 +-
 .../client/views/cleanHistory.html            |   4 +-
 .../client/views/cleanHistory.js              |  14 +-
 app/ui-message/client/message.html            |  19 +-
 app/ui-message/client/message.js              |  11 ++
 app/ui-message/client/messageBox.js           |   2 +-
 app/ui-sidenav/client/chatRoomItem.js         |   2 +-
 app/ui-sidenav/client/roomList.js             |   8 +-
 app/ui-sidenav/client/sidebarHeader.js        |  50 +++---
 app/ui-sidenav/client/sortlist.html           |   9 +
 app/ui-sidenav/client/sortlist.js             |   4 +
 app/ui-utils/client/lib/RoomManager.js        |   6 +-
 app/ui-utils/client/lib/modal.html            |  12 +-
 app/ui-utils/client/lib/modal.js              |   5 +
 .../client/components/header/headerRoom.html  |   2 +-
 app/ui/client/components/header/headerRoom.js |   8 +-
 app/ui/client/lib/chatMessages.js             |   6 +-
 app/ui/client/views/app/room.js               |   5 +
 client/importPackages.js                      |   2 +-
 client/importsCss.js                          |   1 -
 packages/rocketchat-i18n/i18n/de.i18n.json    |  29 +---
 packages/rocketchat-i18n/i18n/en.i18n.json    |  53 +++---
 private/client/imports/general/variables.css  |   4 +-
 private/public/icons.svg                      |   3 +
 server/importPackages.js                      |   2 +-
 server/startup/migrations/index.js            |   1 +
 server/startup/migrations/v139.js             | 118 +++++++++++++
 tests/end-to-end/api/00-miscellaneous.js      |   2 +-
 .../ui/{15-threading.js => 15-discussion.js}  |  16 +-
 .../{threading.page.js => discussion.page.js} |  46 ++---
 tests/pageobjects/side-nav.page.js            |   2 +-
 90 files changed, 873 insertions(+), 846 deletions(-)
 create mode 100644 app/discussion/client/createDiscussionMessageAction.js
 create mode 100644 app/discussion/client/discussionFromMessageBox.js
 create mode 100644 app/discussion/client/index.js
 create mode 100644 app/discussion/client/lib/discussionsOfRoom.js
 create mode 100644 app/discussion/client/lib/messageTypes/discussionMessage.js
 create mode 100644 app/discussion/client/public/stylesheets/discussion.css
 rename app/{threading => discussion}/client/tabBar.js (51%)
 rename app/{threading/client/views/ThreadList.html => discussion/client/views/DiscussionList.html} (76%)
 rename app/{threading/client/views/ThreadList.js => discussion/client/views/DiscussionList.js} (70%)
 rename app/{threading/client/views/ThreadsTabbar.html => discussion/client/views/DiscussionTabbar.html} (62%)
 rename app/{threading/client/views/ThreadsTabbar.js => discussion/client/views/DiscussionTabbar.js} (66%)
 rename app/{threading/client/views/creationDialog/CreateThread.html => discussion/client/views/creationDialog/CreateDiscussion.html} (59%)
 rename app/{threading/client/views/creationDialog/CreateThread.js => discussion/client/views/creationDialog/CreateDiscussion.js} (79%)
 rename app/{threading => discussion}/index.js (100%)
 rename app/{threading/lib/threadRoomType.js => discussion/lib/discussionRoomType.js} (50%)
 rename app/{threading => discussion}/server/authorization.js (100%)
 create mode 100644 app/discussion/server/config.js
 rename app/{threading/server/hooks/joinThreadOnMessage.js => discussion/server/hooks/joinDiscussionOnMessage.js} (67%)
 create mode 100644 app/discussion/server/hooks/propagateDiscussionMetadata.js
 create mode 100644 app/discussion/server/index.js
 create mode 100644 app/discussion/server/methods/createDiscussion.js
 rename app/{threading => discussion}/server/permissions.js (60%)
 rename app/{threading/server/publications/threadParentAutocomplete.js => discussion/server/publications/discussionParentAutocomplete.js} (69%)
 create mode 100644 app/discussion/server/publications/discussionsOfRoom.js
 delete mode 100644 app/threading/client/createThreadMessageAction.js
 delete mode 100644 app/threading/client/index.js
 delete mode 100644 app/threading/client/lib/messageTypes/threadMessage.js
 delete mode 100644 app/threading/client/lib/threadsOfRoom.js
 delete mode 100644 app/threading/client/public/stylesheets/threading.css
 delete mode 100644 app/threading/client/threadFromMessageBox.js
 delete mode 100644 app/threading/client/views/fieldTypeThreadLastMessageAge.html
 delete mode 100644 app/threading/client/views/fieldTypeThreadLastMessageAge.js
 delete mode 100644 app/threading/client/views/fieldTypeThreadReplyCounter.html
 delete mode 100644 app/threading/client/views/fieldTypeThreadReplyCounter.js
 delete mode 100644 app/threading/server/config.js
 delete mode 100644 app/threading/server/hooks/propagateThreadMetadata.js
 delete mode 100644 app/threading/server/index.js
 delete mode 100644 app/threading/server/methods/createThread.js
 delete mode 100644 app/threading/server/publications/threadsOfRoom.js
 create mode 100644 server/startup/migrations/v139.js
 rename tests/end-to-end/ui/{15-threading.js => 15-discussion.js} (78%)
 rename tests/pageobjects/{threading.page.js => discussion.page.js} (50%)

diff --git a/app/channel-settings/server/methods/saveRoomSettings.js b/app/channel-settings/server/methods/saveRoomSettings.js
index ee21ae0523c7..3223584951e4 100644
--- a/app/channel-settings/server/methods/saveRoomSettings.js
+++ b/app/channel-settings/server/methods/saveRoomSettings.js
@@ -60,7 +60,7 @@ Meteor.methods({
 		}
 
 		if (room.prid) {
-			throw new Meteor.Error('error-action-not-allowed', 'Editing thread room is not allowed', {
+			throw new Meteor.Error('error-action-not-allowed', 'Editing discussion room is not allowed', {
 				method: 'saveRoomSettings',
 				action: 'Editing_room',
 			});
diff --git a/app/discussion/client/createDiscussionMessageAction.js b/app/discussion/client/createDiscussionMessageAction.js
new file mode 100644
index 000000000000..eebf5853d009
--- /dev/null
+++ b/app/discussion/client/createDiscussionMessageAction.js
@@ -0,0 +1,53 @@
+import { Meteor } from 'meteor/meteor';
+import { Tracker } from 'meteor/tracker';
+
+import { Subscriptions } from '../../models/client';
+import { settings } from '../../settings/client';
+import { hasPermission } from '../../authorization/client';
+import { MessageAction, modal } from '../../ui-utils/client';
+import { t } from '../../utils/client';
+
+const condition = (rid, uid) => {
+	if (!Subscriptions.findOne({ rid })) {
+		return false;
+	}
+	return uid !== Meteor.userId() ? hasPermission('start-discussion-other-user') : hasPermission('start-discussion');
+};
+
+Meteor.startup(function() {
+	Tracker.autorun(() => {
+		if (!settings.get('Discussion_enabled')) {
+			return MessageAction.removeButton('start-discussion');
+		}
+
+		MessageAction.addButton({
+			id: 'start-discussion',
+			icon: 'discussion',
+			label: 'Discussion_start',
+			context: ['message', 'message-mobile'],
+			async action() {
+				const [, message] = this._arguments;
+
+				modal.open({
+					title: t('Discussion_title'),
+					modifier: 'modal',
+					content: 'CreateDiscussion',
+					data: { rid: message.rid, message, onCreate() {
+						modal.close();
+					} },
+					confirmOnEnter: false,
+					showConfirmButton: false,
+					showCancelButton: false,
+				});
+			},
+			condition({ rid, u: { _id: uid }, drid, dcount }) {
+				if (drid || !isNaN(dcount)) {
+					return false;
+				}
+				return condition(rid, uid);
+			},
+			order: 0,
+			group: 'menu',
+		});
+	});
+});
diff --git a/app/discussion/client/discussionFromMessageBox.js b/app/discussion/client/discussionFromMessageBox.js
new file mode 100644
index 000000000000..dbade46fc93d
--- /dev/null
+++ b/app/discussion/client/discussionFromMessageBox.js
@@ -0,0 +1,36 @@
+import { Meteor } from 'meteor/meteor';
+import { Tracker } from 'meteor/tracker';
+
+import { messageBox, modal } from '../../ui-utils/client';
+import { t } from '../../utils/client';
+import { settings } from '../../settings/client';
+
+Meteor.startup(function() {
+	Tracker.autorun(() => {
+		if (!settings.get('Discussion_enabled')) {
+			return messageBox.actions.remove('Create_new', /start-discussion/);
+		}
+		messageBox.actions.add('Create_new', 'Discussion', {
+			id: 'start-discussion',
+			icon: 'discussion',
+			condition: () => true,
+			action(data) {
+				modal.open({
+					title: t('Discussion_title'),
+					modifier: 'modal',
+					content: 'CreateDiscussion',
+					data: {
+						...data,
+						onCreate() {
+							modal.close();
+						},
+					},
+					showConfirmButton: false,
+					showCancelButton: false,
+					confirmOnEnter: false,
+				});
+			},
+		});
+
+	});
+});
diff --git a/app/discussion/client/index.js b/app/discussion/client/index.js
new file mode 100644
index 000000000000..9a7bdc13cd5d
--- /dev/null
+++ b/app/discussion/client/index.js
@@ -0,0 +1,16 @@
+// Templates
+import './views/creationDialog/CreateDiscussion';
+import './views/DiscussionList';
+import './views/DiscussionTabbar';
+
+// Other UI extensions
+import './lib/messageTypes/discussionMessage';
+import './lib/discussionsOfRoom';
+import './createDiscussionMessageAction';
+import './discussionFromMessageBox';
+import './tabBar';
+
+import '../lib/discussionRoomType';
+
+// Style
+import './public/stylesheets/discussion.css';
diff --git a/app/discussion/client/lib/discussionsOfRoom.js b/app/discussion/client/lib/discussionsOfRoom.js
new file mode 100644
index 000000000000..a620af48a42d
--- /dev/null
+++ b/app/discussion/client/lib/discussionsOfRoom.js
@@ -0,0 +1,3 @@
+import { Mongo } from 'meteor/mongo';
+
+export const DiscussionOfRoom = new Mongo.Collection('rocketchat_discussions_of_room');
diff --git a/app/discussion/client/lib/messageTypes/discussionMessage.js b/app/discussion/client/lib/messageTypes/discussionMessage.js
new file mode 100644
index 000000000000..5dc928a7f38e
--- /dev/null
+++ b/app/discussion/client/lib/messageTypes/discussionMessage.js
@@ -0,0 +1,17 @@
+import { Meteor } from 'meteor/meteor';
+
+import { MessageTypes } from '../../../../ui-utils/client';
+
+Meteor.startup(function() {
+	MessageTypes.registerType({
+		id: 'discussion-created',
+		system: false,
+		message: 'discussion-created',
+		data(message) {
+			return {
+				// channelLink: `<a class="mention-link" data-channel= ${ message.channels[0]._id }  title="">${ TAPi18n.__('discussion') }</a>`,
+				message: `<svg class="rc-icon" aria-hidden="true"><use xlink:href="#icon-discussion"></use></svg> ${ message.msg }`,
+			};
+		},
+	});
+});
diff --git a/app/discussion/client/public/stylesheets/discussion.css b/app/discussion/client/public/stylesheets/discussion.css
new file mode 100644
index 000000000000..93c6d4e8e20f
--- /dev/null
+++ b/app/discussion/client/public/stylesheets/discussion.css
@@ -0,0 +1,22 @@
+.message-discussion {
+	display: flex;
+
+	padding: 0.5rem 0;
+	align-items: center;
+}
+
+.discussion-reply-lm {
+	padding: 4px 8px;
+
+	color: var(--color-gray);
+
+	font-size: 12px;
+}
+
+.discussions-list .load-more {
+	text-align: center;
+	text-transform: lowercase;
+
+	font-style: italic;
+	line-height: 40px;
+}
diff --git a/app/threading/client/tabBar.js b/app/discussion/client/tabBar.js
similarity index 51%
rename from app/threading/client/tabBar.js
rename to app/discussion/client/tabBar.js
index ccff24215665..8ab8d47bda70 100644
--- a/app/threading/client/tabBar.js
+++ b/app/discussion/client/tabBar.js
@@ -1,13 +1,14 @@
 import { Meteor } from 'meteor/meteor';
-import { TabBar } from '../../ui-utils';
+
+import { TabBar } from '../../ui-utils/client';
 
 Meteor.startup(function() {
 	return TabBar.addButton({
 		groups: ['channel', 'group', 'direct'],
-		id: 'threads',
-		i18nTitle: 'Threads',
-		icon: 'thread',
-		template: 'threadsTabbar',
+		id: 'discussions',
+		i18nTitle: 'Discussions',
+		icon: 'discussion',
+		template: 'discussionsTabbar',
 		order: 10,
 	});
 });
diff --git a/app/threading/client/views/ThreadList.html b/app/discussion/client/views/DiscussionList.html
similarity index 76%
rename from app/threading/client/views/ThreadList.html
rename to app/discussion/client/views/DiscussionList.html
index 35df571080ba..4792f63418ce 100644
--- a/app/threading/client/views/ThreadList.html
+++ b/app/discussion/client/views/DiscussionList.html
@@ -1,7 +1,7 @@
-<template name="ThreadList">
+<template name="DiscussionList">
 	{{#if rooms}}
 		<h3 class="rooms-list__type">
-			{{_ "Threads"}}
+			{{_ "Discussion"}}
 		</h3>
 		<ul class="rooms-list__list">
 			{{#each room in rooms}} {{> chatRoomItem room }} {{/each}}
diff --git a/app/threading/client/views/ThreadList.js b/app/discussion/client/views/DiscussionList.js
similarity index 70%
rename from app/threading/client/views/ThreadList.js
rename to app/discussion/client/views/DiscussionList.js
index 96dcccb1ca65..54562f5fce40 100644
--- a/app/threading/client/views/ThreadList.js
+++ b/app/discussion/client/views/DiscussionList.js
@@ -1,9 +1,13 @@
 import { Meteor } from 'meteor/meteor';
 import { Template } from 'meteor/templating';
-import { ChatSubscription } from '../../../models';
-import { getUserPreference } from '../../../utils';
-import { settings } from '../../../settings';
-Template.ThreadList.helpers({
+
+import { ChatSubscription } from '../../../models/client';
+import { getUserPreference } from '../../../utils/client';
+import { settings } from '../../../settings/client';
+
+import './DiscussionList.html';
+
+Template.DiscussionList.helpers({
 	rooms() {
 		const user = Meteor.userId();
 		const sortBy = getUserPreference(user, 'sidebarSortby') || 'alphabetical';
diff --git a/app/threading/client/views/ThreadsTabbar.html b/app/discussion/client/views/DiscussionTabbar.html
similarity index 62%
rename from app/threading/client/views/ThreadsTabbar.html
rename to app/discussion/client/views/DiscussionTabbar.html
index 502f83585d43..e13803e67551 100644
--- a/app/threading/client/views/ThreadsTabbar.html
+++ b/app/discussion/client/views/DiscussionTabbar.html
@@ -1,12 +1,12 @@
-<template name="threadsTabbar">
+<template name="discussionsTabbar">
 	{{#if Template.subscriptionsReady}}
 		{{#unless hasMessages}}
-			<div class="list-view threads-list flex-tab__header">
-					<h2>{{_ "No_threads_yet"}}</h2>
+			<div class="list-view discussions-list flex-tab__header">
+					<h2>{{_ "No_discussions_yet"}}</h2>
 			</div>
 		{{/unless}}
 	{{/if}}
-	<div class="flex-tab__result threads-list js-list">
+	<div class="flex-tab__result discussions-list js-list">
 		<ul class="list clearfix">
 			{{#each messages}}
 				{{#nrr nrrargs 'message' message}}{{/nrr}}
diff --git a/app/threading/client/views/ThreadsTabbar.js b/app/discussion/client/views/DiscussionTabbar.js
similarity index 66%
rename from app/threading/client/views/ThreadsTabbar.js
rename to app/discussion/client/views/DiscussionTabbar.js
index ea328c8d809e..5b048fd0367a 100644
--- a/app/threading/client/views/ThreadsTabbar.js
+++ b/app/discussion/client/views/DiscussionTabbar.js
@@ -1,20 +1,19 @@
 import _ from 'underscore';
 import { ReactiveVar } from 'meteor/reactive-var';
 import { Template } from 'meteor/templating';
-import { ThreadsOfRoom } from '../lib/threadsOfRoom';
 
-Template.threadsTabbar.helpers({
+import { DiscussionOfRoom } from '../lib/discussionsOfRoom';
+
+import './DiscussionTabbar.html';
+
+Template.discussionsTabbar.helpers({
 	hasMessages() {
-		return ThreadsOfRoom.find({
+		return DiscussionOfRoom.find({
 			rid: this.rid,
-		}, {
-			sort: {
-				ts: -1,
-			},
 		}).count() > 0;
 	},
 	messages() {
-		return ThreadsOfRoom.find({
+		return DiscussionOfRoom.find({
 			rid: this.rid,
 		}, {
 			sort: {
@@ -30,13 +29,13 @@ Template.threadsTabbar.helpers({
 	},
 });
 
-Template.threadsTabbar.onCreated(function() {
+Template.discussionsTabbar.onCreated(function() {
 	this.hasMore = new ReactiveVar(true);
 	this.limit = new ReactiveVar(50);
 	return this.autorun(() => {
 		const data = Template.currentData();
-		return this.subscribe('threadsOfRoom', data.rid, this.limit.get(), () => {
-			if (ThreadsOfRoom.find({
+		return this.subscribe('discussionsOfRoom', data.rid, this.limit.get(), () => {
+			if (DiscussionOfRoom.find({
 				rid: data.rid,
 			}).count() < this.limit.get()) {
 				return this.hasMore.set(false);
@@ -45,9 +44,9 @@ Template.threadsTabbar.onCreated(function() {
 	});
 });
 
-Template.threadsTabbar.events({
+Template.discussionsTabbar.events({
 	'scroll .js-list': _.throttle(function(e, instance) {
-		if (e.target.scrollTop >= e.target.scrollHeight - e.target.clientHeight && instance.hasMore.get()) {
+		if (e.target.scrollTop >= e.target.scrollHeight - e.target.clientHeight - 10 && instance.hasMore.get()) {
 			return instance.limit.set(instance.limit.get() + 50);
 		}
 	}, 200),
diff --git a/app/threading/client/views/creationDialog/CreateThread.html b/app/discussion/client/views/creationDialog/CreateDiscussion.html
similarity index 59%
rename from app/threading/client/views/creationDialog/CreateThread.html
rename to app/discussion/client/views/creationDialog/CreateDiscussion.html
index 9f9aec325a96..68f300872b08 100644
--- a/app/threading/client/views/creationDialog/CreateThread.html
+++ b/app/discussion/client/views/creationDialog/CreateDiscussion.html
@@ -1,11 +1,11 @@
-<template name="CreateThread">
+<template name="CreateDiscussion">
 
 	<section class="create-channel">
 		<div class="create-channel__wrapper">
-			<p class="create-channel__description">{{_ "Threading_description"}}</p>
-			<form id="create-thread" class="create-channel__content">
+			<p class="create-channel__description">{{_ "Discussion_description"}}</p>
+			<form id="create-discussion" class="create-channel__content">
 				{{#unless disabled}}
-				{{> SearchCreateThread
+				{{> SearchCreateDiscussion
 					onClickTag=onClickTagRoom
 					deleteLastItem=deleteLastItemRoom
 					list=selectedRoom
@@ -13,8 +13,8 @@
 					collection=roomCollection
 					field='name'
 					sort='name'
-					label="Thread_target_channel"
-					placeholder="Thread_target_channel_description"
+					label="Discussion_target_channel"
+					placeholder="Discussion_target_channel_description"
 					name="parentChannel"
 					disabled=disabled
 					selector=roomSelector
@@ -25,48 +25,49 @@
 				}} {{else}}
 					<div class="rc-input" disabled>
 						<label class="rc-input__label">
-							<div class="rc-input__title">{{_ "Thread_target_channel"}}</div>
+							<div class="rc-input__title">{{_ "Discussion_target_channel"}}</div>
 							<div class="rc-input__wrapper">
 								<input disabled name="parentChannel" id="parentChannel" value={{parentChannel}} class="rc-input__element" />
 							</div>
 						</label>
 					</div>
 				{{/unless}}
-				{{> SearchCreateThread
-					onClickTag=onClickTagUser
-					deleteLastItem=deleteLastItemUser
-					list=selectedUsers
-					onSelect=onSelectUser
-					collection='UserAndRoom'
-					subscription='userAutocomplete'
-					field='username'
-					sort='username'
-					label="Invite_Users"
-					placeholder="Username_Placeholder"
-					name="users"
-					icon="at"
-					noMatchTemplate="userSearchEmpty"
-					templateItem="popupList_item_default"
-					modifier=userModifier
-				}}
+
 				<div class="create-channel__inputs">
 					<div class="rc-input">
 						<label class="rc-input__label">
-							<div class="rc-input__title">{{_ "Thread_name"}}</div>
+							<div class="rc-input__title">{{_ "Discussion_name"}}</div>
 							<div class="rc-input__wrapper">
 								<div class="rc-input__icon">
-									{{> icon block="rc-input__icon-svg" icon="thread"}}
+									{{> icon block="rc-input__icon-svg" icon="discussion"}}
 								</div>
-								<input name="thread_name" id="thread_name" class="rc-input__element" placeholder="{{_ 'New_thread_name'}}"
+								<input name="discussion_name" id="discussion_name" class="rc-input__element" placeholder="{{_ 'New_discussion_name'}}"
 									maxlength="{{maxMessageLength}}" value="{{channelName}}"/>
 							</div>
 						</label>
 					</div>
+					{{> SearchCreateDiscussion
+						onClickTag=onClickTagUser
+						deleteLastItem=deleteLastItemUser
+						list=selectedUsers
+						onSelect=onSelectUser
+						collection='UserAndRoom'
+						subscription='userAutocomplete'
+						field='username'
+						sort='username'
+						label="Invite_Users"
+						placeholder="Username_Placeholder"
+						name="users"
+						icon="at"
+						noMatchTemplate="userSearchEmpty"
+						templateItem="popupList_item_default"
+						modifier=userModifier
+					}}
 					<div class="rc-input">
 						<label class="rc-input__label">
-							<div class="rc-input__title">{{_ "Threading_first_message_title"}}</div>
+							<div class="rc-input__title">{{_ "Discussion_first_message_title"}}</div>
 							<div class="rc-input__wrapper">
-								<textarea name="thread_message" id="thread_message" class="rc-input__element" placeholder="{{_ 'New_thread_first_message'}}"
+								<textarea rows="5" name="discussion_message" id="discussion_message" class="rc-input__element" placeholder="{{_ 'New_discussion_first_message'}}"
 									maxlength="{{maxMessageLength}}"></textarea>
 							</div>
 						</label>
@@ -74,13 +75,13 @@
 				</div>
 			</form>
 			<div class="rc-input">
-				<button form="create-thread" class="rc-button rc-button--primary js-save-thread {{createIsDisabled}}" {{createIsDisabled}}>{{_ " Create "}}</button>
+				<button form="create-discussion" class="rc-button rc-button--primary js-save-discussion {{createIsDisabled}}" {{createIsDisabled}}>{{_ " Create "}}</button>
 			</div>
 		</div>
 	</section>
 </template>
 
-<template name="SearchCreateThread">
+<template name="SearchCreateDiscussion">
 	<div class="rc-input" id='search-{{name}}' {{disabled}}>
 		<label class="rc-input__label">
 			<div class="rc-input__title">{{_ label}}</div>
diff --git a/app/threading/client/views/creationDialog/CreateThread.js b/app/discussion/client/views/creationDialog/CreateDiscussion.js
similarity index 79%
rename from app/threading/client/views/creationDialog/CreateThread.js
rename to app/discussion/client/views/creationDialog/CreateDiscussion.js
index d9e351be8294..7b61774ac694 100755
--- a/app/threading/client/views/creationDialog/CreateThread.js
+++ b/app/discussion/client/views/creationDialog/CreateDiscussion.js
@@ -1,19 +1,19 @@
 import { Meteor } from 'meteor/meteor';
-import { roomTypes } from '../../../../utils';
-import { callbacks } from '../../../../callbacks';
 import { Template } from 'meteor/templating';
 import { ReactiveVar } from 'meteor/reactive-var';
 import { AutoComplete } from 'meteor/mizzao:autocomplete';
-import { ChatRoom, ChatSubscription } from '../../../../models';
 import { Blaze } from 'meteor/blaze';
-import { call } from '../../../../ui-utils';
-
 import { TAPi18n } from 'meteor/tap:i18n';
 import toastr from 'toastr';
 
+import { roomTypes } from '../../../../utils/client';
+import { callbacks } from '../../../../callbacks/client';
+import { ChatRoom, ChatSubscription } from '../../../../models/client';
+import { call } from '../../../../ui-utils/client';
 
-Template.CreateThread.helpers({
+import './CreateDiscussion.html';
 
+Template.CreateDiscussion.helpers({
 	onSelectUser() {
 		return Template.instance().onSelectUser;
 	},
@@ -25,14 +25,11 @@ Template.CreateThread.helpers({
 	targetChannelText() {
 		const instance = Template.instance();
 		const parentChannel = instance.parentChannel.get();
-		return parentChannel && `${ TAPi18n.__('Thread_target_channel_prefix') } "${ parentChannel }"`;
+		return parentChannel && `${ TAPi18n.__('Discussion_target_channel_prefix') } "${ parentChannel }"`;
 	},
 	createIsDisabled() {
-		const instance = Template.instance();
-		if (instance.reply.get() && instance.parentChannel.get()) {
-			return '';
-		}
-		return 'disabled';
+		const { parentChannel, discussionName } = Template.instance();
+		return parentChannel.get() && discussionName.get() ? '' : 'disabled';
 	},
 	parentChannel() {
 		const instance = Template.instance();
@@ -41,7 +38,7 @@ Template.CreateThread.helpers({
 	selectedUsers() {
 		const myUsername = Meteor.user().username;
 		const { message } = this;
-		const users = Template.instance().selectedUsers.get();
+		const users = Template.instance().selectedUsers.get().map((e) => e);
 		if (message) {
 			users.unshift(message.u);
 		}
@@ -85,24 +82,24 @@ Template.CreateThread.helpers({
 		};
 	},
 	channelName() {
-		return Template.instance().threadName.get();
+		return Template.instance().discussionName.get();
 	},
 });
 
-Template.CreateThread.events({
-	'input #thread_name'(e, t) {
-		t.threadName.set(e.target.value);
+Template.CreateDiscussion.events({
+	'input #discussion_name'(e, t) {
+		t.discussionName.set(e.target.value);
 	},
-	'input #thread_message'(e, t) {
+	'input #discussion_message'(e, t) {
 		const { value } = e.target;
 		t.reply.set(value);
 	},
-	async 'submit #create-thread, click .js-save-thread'(event, instance) {
+	async 'submit #create-discussion, click .js-save-discussion'(event, instance) {
 		event.preventDefault();
 		const parentChannel = instance.parentChannel.get();
 
 		const { pmid } = instance;
-		const t_name = instance.threadName.get();
+		const t_name = instance.discussionName.get();
 		const users = instance.selectedUsers.get().map(({ username }) => username).filter((value, index, self) => self.indexOf(value) === index);
 
 		const prid = instance.parentChannelId.get();
@@ -112,9 +109,9 @@ Template.CreateThread.events({
 			const errorText = TAPi18n.__('Invalid_room_name', `${ parentChannel }...`);
 			return toastr.error(errorText);
 		}
-		const result = await call('createThread', { prid, pmid, t_name, reply, users });
+		const result = await call('createDiscussion', { prid, pmid, t_name, reply, users });
 		// callback to enable tracking
-		callbacks.run('afterCreateThread', Meteor.user(), result);
+		callbacks.run('afterDiscussion', Meteor.user(), result);
 
 		if (instance.data.onCreate) {
 			instance.data.onCreate(result);
@@ -124,16 +121,18 @@ Template.CreateThread.events({
 	},
 });
 
-Template.CreateThread.onRendered(function() {
-	this.find(this.data.rid ? '#thread_name' : '#parentChannel').focus();
+Template.CreateDiscussion.onRendered(function() {
+	this.find(this.data.rid ? '#discussion_name' : '#parentChannel').focus();
 });
+
 const suggestName = (name, msg) => [name, msg].filter((e) => e).join(' - ').substr(0, 140);
-Template.CreateThread.onCreated(function() {
+
+Template.CreateDiscussion.onCreated(function() {
 	const { rid, message: msg } = this.data;
 
 	const parentRoom = rid && ChatSubscription.findOne({ rid });
 
-	// if creating a thread from inside a thread, uses the same channel as parent channel
+	// if creating a discussion from inside a discussion, uses the same channel as parent channel
 	const room = parentRoom && parentRoom.prid ? ChatSubscription.findOne({ rid: parentRoom.prid }) : parentRoom;
 
 	if (room) {
@@ -141,7 +140,7 @@ Template.CreateThread.onCreated(function() {
 	}
 
 	const roomName = room && roomTypes.getRoomName(room.t, room);
-	this.threadName = new ReactiveVar(suggestName(roomName, msg && msg.msg));
+	this.discussionName = new ReactiveVar(suggestName(roomName, msg && msg.msg));
 
 	this.pmid = msg && msg._id;
 
@@ -174,7 +173,6 @@ Template.CreateThread.onCreated(function() {
 		this.parentChannelId.set(room && (room.rid || room._id));
 	});
 
-
 	this.selectedUsers = new ReactiveVar([]);
 	this.onSelectUser = ({ item: user }) => {
 
@@ -182,6 +180,9 @@ Template.CreateThread.onCreated(function() {
 			return;
 		}
 
+		if (user.username === Meteor.user().username) {
+			return;
+		}
 		const users = this.selectedUsers.get();
 		if (!users.find((u) => user.username === u.username)) {
 			this.selectedUsers.set([...users, user]);
@@ -196,9 +197,8 @@ Template.CreateThread.onCreated(function() {
 		this.selectedUsers.set(arr);
 	});
 
-
 	// callback to allow setting a parent Channel or e. g. tracking the event using Piwik or GA
-	const { parentChannel, reply } = callbacks.run('openThreadCreationScreen') || {};
+	const { parentChannel, reply } = callbacks.run('openDiscussionCreationScreen') || {};
 
 	if (parentChannel) {
 		this.parentChannel.set(parentChannel);
@@ -208,7 +208,7 @@ Template.CreateThread.onCreated(function() {
 	}
 });
 
-Template.SearchCreateThread.helpers({
+Template.SearchCreateDiscussion.helpers({
 	list() {
 		return this.list;
 	},
@@ -234,7 +234,7 @@ Template.SearchCreateThread.helpers({
 	},
 });
 
-Template.SearchCreateThread.events({
+Template.SearchCreateDiscussion.events({
 	'input input'(e, t) {
 		const input = e.target;
 		const position = input.selectionEnd || input.selectionStart;
@@ -267,7 +267,7 @@ Template.SearchCreateThread.events({
 		return onClickTag & onClickTag(Blaze.getData(target));
 	},
 });
-Template.SearchCreateThread.onRendered(function() {
+Template.SearchCreateDiscussion.onRendered(function() {
 
 	const { name } = this.data;
 
@@ -275,7 +275,7 @@ Template.SearchCreateThread.onRendered(function() {
 	this.ac.$element = $(this.ac.element);
 });
 
-Template.SearchCreateThread.onCreated(function() {
+Template.SearchCreateDiscussion.onCreated(function() {
 	this.filter = new ReactiveVar('');
 	this.selected = new ReactiveVar([]);
 	this.onClickTag = this.data.onClickTag;
diff --git a/app/threading/index.js b/app/discussion/index.js
similarity index 100%
rename from app/threading/index.js
rename to app/discussion/index.js
diff --git a/app/threading/lib/threadRoomType.js b/app/discussion/lib/discussionRoomType.js
similarity index 50%
rename from app/threading/lib/threadRoomType.js
rename to app/discussion/lib/discussionRoomType.js
index a75e55a9c3cd..b229e638a26b 100644
--- a/app/threading/lib/threadRoomType.js
+++ b/app/discussion/lib/discussionRoomType.js
@@ -1,21 +1,21 @@
 import { Meteor } from 'meteor/meteor';
 import { RoomTypeConfig, roomTypes, getUserPreference } from '../../utils';
 
-export class ThreadRoomType extends RoomTypeConfig {
+export class DiscussionRoomType extends RoomTypeConfig {
 	constructor() {
 		super({
 			identifier: 't',
 			order: 25,
-			label: 'Threads',
+			label: 'Discussion',
 		});
 
-		// we need a custom template in order to have a custom query showing the subscriptions to threads
-		this.customTemplate = 'ThreadList';
+		// we need a custom template in order to have a custom query showing the subscriptions to discussions
+		this.customTemplate = 'DiscussionList';
 	}
 
 	condition() {
-		return getUserPreference(Meteor.userId(), 'sidebarShowThreads');
+		return getUserPreference(Meteor.userId(), 'sidebarShowDiscussion');
 	}
 }
 
-roomTypes.add(new ThreadRoomType());
+roomTypes.add(new DiscussionRoomType());
diff --git a/app/threading/server/authorization.js b/app/discussion/server/authorization.js
similarity index 100%
rename from app/threading/server/authorization.js
rename to app/discussion/server/authorization.js
diff --git a/app/discussion/server/config.js b/app/discussion/server/config.js
new file mode 100644
index 000000000000..5155c5769c74
--- /dev/null
+++ b/app/discussion/server/config.js
@@ -0,0 +1,38 @@
+import { Meteor } from 'meteor/meteor';
+import { settings } from '../../settings';
+
+Meteor.startup(() => {
+	settings.addGroup('Discussion', function() {
+		// the channel for which discussions are created if none is explicitly chosen
+
+		this.add('Discussion_enabled', true, {
+			group: 'Discussion',
+			i18nLabel: 'Enable',
+			type: 'boolean',
+			public: true,
+		});
+	});
+
+	settings.add('Accounts_Default_User_Preferences_sidebarShowDiscussion', true, {
+		group: 'Accounts',
+		section: 'Accounts_Default_User_Preferences',
+		type: 'boolean',
+		public: true,
+		i18nLabel: 'Group_discussions',
+	});
+
+	const globalQuery = {
+		_id: 'RetentionPolicy_Enabled',
+		value: true,
+	};
+
+	settings.add('RetentionPolicy_DoNotExcludeDiscussion', true, {
+		group: 'RetentionPolicy',
+		section: 'Global Policy',
+		type: 'boolean',
+		public: true,
+		i18nLabel: 'RetentionPolicy_DoNotExcludeDiscussion',
+		i18nDescription: 'RetentionPolicy_DoNotExcludeDiscussion_Description',
+		enableQuery: globalQuery,
+	});
+});
diff --git a/app/threading/server/hooks/joinThreadOnMessage.js b/app/discussion/server/hooks/joinDiscussionOnMessage.js
similarity index 67%
rename from app/threading/server/hooks/joinThreadOnMessage.js
rename to app/discussion/server/hooks/joinDiscussionOnMessage.js
index 00452c544349..755850edbb4a 100644
--- a/app/threading/server/hooks/joinThreadOnMessage.js
+++ b/app/discussion/server/hooks/joinDiscussionOnMessage.js
@@ -1,15 +1,16 @@
 import { Meteor } from 'meteor/meteor';
-import { callbacks } from '../../../callbacks';
-import { Subscriptions } from '../../../models';
+
+import { callbacks } from '../../../callbacks/server';
+import { Subscriptions } from '../../../models/server';
 
 callbacks.add('beforeSaveMessage', (message, room) => {
 
-	// abort if room is not a thread
+	// abort if room is not a discussion
 	if (!room || !room.prid) {
 		return message;
 	}
 
-	// check if user already joined the thread
+	// check if user already joined the discussion
 	const sub = Subscriptions.findOneByRoomIdAndUserId(room._id, message.u._id, { fields: { _id: 1 } });
 	if (sub) {
 		return message;
diff --git a/app/discussion/server/hooks/propagateDiscussionMetadata.js b/app/discussion/server/hooks/propagateDiscussionMetadata.js
new file mode 100644
index 000000000000..68e0a3d96b06
--- /dev/null
+++ b/app/discussion/server/hooks/propagateDiscussionMetadata.js
@@ -0,0 +1,27 @@
+import { callbacks } from '../../../callbacks/server';
+import { Messages, Rooms } from '../../../models/server';
+import { deleteRoom } from '../../../lib/server';
+/**
+ * We need to propagate the writing of new message in a discussion to the linking
+ * system message
+ */
+callbacks.add('afterSaveMessage', function(message, { _id, prid } = {}) {
+	if (prid) {
+		Messages.refreshDiscussionMetadata({ rid: _id }, message);
+	}
+	return message;
+}, callbacks.priority.LOW, 'PropagateDiscussionMetadata');
+
+callbacks.add('afterDeleteMessage', function(message, { _id, prid } = {}) {
+	if (prid) {
+		Messages.refreshDiscussionMetadata({ rid: _id }, message);
+	}
+	if (message.drid) {
+		deleteRoom(message.drid);
+	}
+	return message;
+}, callbacks.priority.LOW, 'PropagateDiscussionMetadata');
+
+callbacks.add('afterDeleteRoom', function(rid) {
+	Rooms.find({ prid: rid }, { fields: { _id: 1 } }).forEach(({ _id }) => deleteRoom(_id));
+}, 'DeleteDiscussionChain');
diff --git a/app/discussion/server/index.js b/app/discussion/server/index.js
new file mode 100644
index 000000000000..f16ff5ab6f01
--- /dev/null
+++ b/app/discussion/server/index.js
@@ -0,0 +1,14 @@
+import './config';
+import './authorization';
+import './permissions';
+
+import './hooks/joinDiscussionOnMessage';
+import './hooks/propagateDiscussionMetadata';
+import './publications/discussionParentAutocomplete';
+import './publications/discussionsOfRoom';
+
+// Methods
+import './methods/createDiscussion';
+
+// Lib
+import '../lib/discussionRoomType';
diff --git a/app/discussion/server/methods/createDiscussion.js b/app/discussion/server/methods/createDiscussion.js
new file mode 100644
index 000000000000..34dc47922ff3
--- /dev/null
+++ b/app/discussion/server/methods/createDiscussion.js
@@ -0,0 +1,133 @@
+import { Meteor } from 'meteor/meteor';
+import { Random } from 'meteor/random';
+
+import { hasAtLeastOnePermission, canAccessRoom } from '../../../authorization/server';
+import { Messages, Rooms } from '../../../models/server';
+import { createRoom, addUserToRoom, sendMessage, attachMessage } from '../../../lib/server';
+import { settings } from '../../../settings/server';
+
+const getParentRoom = (rid) => {
+	const room = Rooms.findOne(rid);
+	return room && (room.prid ? Rooms.findOne(room.prid, { fields: { _id: 1 } }) : room);
+};
+
+const createDiscussionMessage = (rid, user, drid, msg, message_embedded) => {
+	const welcomeMessage = {
+		msg,
+		rid,
+		drid,
+		attachments: [message_embedded].filter((e) => e),
+	};
+	return Messages.createWithTypeRoomIdMessageAndUser('discussion-created', rid, '', user, welcomeMessage);
+};
+
+const mentionMessage = (rid, { _id, username, name }, message_embedded) => {
+	const welcomeMessage = {
+		rid,
+		u: { _id, username, name },
+		ts: new Date(),
+		_updatedAt: new Date(),
+		attachments: [message_embedded].filter((e) => e),
+	};
+
+	return Messages.insert(welcomeMessage);
+};
+
+const create = ({ prid, pmid, t_name, reply, users }) => {
+	// if you set both, prid and pmid, and the rooms doesnt match... should throw an error)
+	let message = false;
+	if (pmid) {
+		message = Messages.findOne({ _id: pmid });
+		if (prid) {
+			if (prid !== getParentRoom(message.rid)._id) {
+				throw new Meteor.Error('error-invalid-arguments', { method: 'DiscussionCreation' });
+			}
+		} else {
+			prid = message.rid;
+		}
+	}
+
+	if (!prid) {
+		throw new Meteor.Error('error-invalid-arguments', { method: 'DiscussionCreation' });
+	}
+
+	const p_room = Rooms.findOne(prid);
+
+	if (p_room.prid) {
+		throw new Meteor.Error('error-nested-discussion', 'Cannot create nested discussions', { method: 'DiscussionCreation' });
+	}
+
+	const user = Meteor.user();
+
+	if (!canAccessRoom(p_room, user)) {
+		throw new Meteor.Error('error-not-allowed', { method: 'DiscussionCreation' });
+	}
+
+	if (pmid) {
+		const discussionAlreadyExists = Rooms.findOne({
+			prid,
+			pmid,
+		}, {
+			fields: { _id: 1 },
+		});
+		if (discussionAlreadyExists) { // do not allow multiple discussions to the same message'\
+			addUserToRoom(discussionAlreadyExists._id, user);
+			return discussionAlreadyExists;
+		}
+	}
+
+	const name = Random.id();
+
+	// auto invite the replied message owner
+	const invitedUsers = message ? [message.u.username, ...users] : users;
+
+	// discussions are always created as private groups
+	const discussion = createRoom('p', name, user.username, [...new Set(invitedUsers)], false, {
+		fname: t_name,
+		description: message.msg, // TODO discussions remove
+		topic: p_room.name, // TODO discussions remove
+		prid,
+	});
+
+	if (pmid) {
+		mentionMessage(discussion._id, user, attachMessage(message, p_room));
+
+		createDiscussionMessage(message.rid, user, discussion._id, t_name, attachMessage(message, p_room));
+	} else {
+		createDiscussionMessage(prid, user, discussion._id, t_name);
+	}
+
+	if (reply) {
+		sendMessage(user, { msg: reply }, discussion);
+	}
+	return discussion;
+};
+
+Meteor.methods({
+	/**
+	* Create discussion by room or message
+	* @constructor
+	* @param {string} prid - Parent Room Id - The room id, optional if you send pmid.
+	* @param {string} pmid - Parent Message Id - Create the discussion by a message, optional.
+	* @param {string} reply - The reply, optional
+	* @param {string} t_name - discussion name
+	* @param {string[]} users - users to be added
+	*/
+	createDiscussion({ prid, pmid, t_name, reply, users }) {
+
+		if (!settings.get('Discussion_enabled')) {
+			throw new Meteor.Error('error-action-not-allowed', 'You are not allowed to create a discussion', { method: 'createDiscussion' });
+		}
+
+		const uid = Meteor.userId();
+		if (!uid) {
+			throw new Meteor.Error('error-invalid-user', 'Invalid user', { method: 'DiscussionCreation' });
+		}
+
+		if (!hasAtLeastOnePermission(uid, ['start-discussion', 'start-discussion-other-user'])) {
+			throw new Meteor.Error('error-action-not-allowed', 'You are not allowed to create a discussion', { method: 'createDiscussion' });
+		}
+
+		return create({ uid, prid, pmid, t_name, reply, users });
+	},
+});
diff --git a/app/threading/server/permissions.js b/app/discussion/server/permissions.js
similarity index 60%
rename from app/threading/server/permissions.js
rename to app/discussion/server/permissions.js
index 7faecc6e3543..4e89b97c6679 100644
--- a/app/threading/server/permissions.js
+++ b/app/discussion/server/permissions.js
@@ -2,10 +2,10 @@ import { Meteor } from 'meteor/meteor';
 import { Permissions } from '../../models';
 
 Meteor.startup(() => {
-	// Add permissions for threading
+	// Add permissions for discussion
 	const permissions = [
-		{ _id: 'start-thread', roles: ['admin', 'user', 'expert', 'guest'] },
-		{ _id: 'start-thread-other-user', roles: ['admin', 'user', 'expert', 'owner'] },
+		{ _id: 'start-discussion', roles: ['admin', 'user', 'expert', 'guest'] },
+		{ _id: 'start-discussion-other-user', roles: ['admin', 'user', 'expert', 'owner'] },
 	];
 
 	for (const permission of permissions) {
diff --git a/app/threading/server/publications/threadParentAutocomplete.js b/app/discussion/server/publications/discussionParentAutocomplete.js
similarity index 69%
rename from app/threading/server/publications/threadParentAutocomplete.js
rename to app/discussion/server/publications/discussionParentAutocomplete.js
index b1b7d2f884e3..4d0e38822494 100644
--- a/app/threading/server/publications/threadParentAutocomplete.js
+++ b/app/discussion/server/publications/discussionParentAutocomplete.js
@@ -1,9 +1,9 @@
 import { Meteor } from 'meteor/meteor';
-import { Rooms } from '../../../models';
 
-import { hasPermission } from '../../../authorization';
+import { Rooms } from '../../../models/server';
+import { hasPermission } from '../../../authorization/server';
 
-Meteor.publish('threadParentAutocomplete', function(selector) {
+Meteor.publish('discussionParentAutocomplete', function(selector) {
 	if (!this.userId) {
 		return this.ready();
 	}
@@ -24,7 +24,7 @@ Meteor.publish('threadParentAutocomplete', function(selector) {
 		},
 	};
 
-	const cursorHandle = Rooms.findThreadParentByNameStarting(selector.name, options).observeChanges({
+	const cursorHandle = Rooms.findDiscussionParentByNameStarting(selector.name, options).observeChanges({
 		added(_id, record) {
 			return pub.added('autocompleteRecords', _id, record);
 		},
diff --git a/app/discussion/server/publications/discussionsOfRoom.js b/app/discussion/server/publications/discussionsOfRoom.js
new file mode 100644
index 000000000000..eebd89a5c7cf
--- /dev/null
+++ b/app/discussion/server/publications/discussionsOfRoom.js
@@ -0,0 +1,32 @@
+import { Meteor } from 'meteor/meteor';
+
+import { Messages } from '../../../models/server';
+
+Meteor.publish('discussionsOfRoom', function(rid, limit = 50) {
+	if (!this.userId) {
+		return this.ready();
+	}
+
+	const publication = this;
+
+	if (!Meteor.call('canAccessRoom', rid, this.userId)) {
+		return this.ready();
+	}
+
+	const cursorHandle = Messages.find({ rid, drid: { $exists: true } }, { sort: { ts: -1 }, limit }).observeChanges({
+		added(_id, record) {
+			return publication.added('rocketchat_discussions_of_room', _id, record);
+		},
+		changed(_id, record) {
+			return publication.changed('rocketchat_discussions_of_room', _id, record);
+		},
+		removed(_id) {
+			return publication.removed('rocketchat_discussions_of_room', _id);
+		},
+	});
+
+	this.ready();
+	return this.onStop(function() {
+		return cursorHandle.stop();
+	});
+});
diff --git a/app/lib/lib/roomTypes/private.js b/app/lib/lib/roomTypes/private.js
index 728b1aebca1a..19ce495b76ad 100644
--- a/app/lib/lib/roomTypes/private.js
+++ b/app/lib/lib/roomTypes/private.js
@@ -31,7 +31,7 @@ export class PrivateRoomType extends RoomTypeConfig {
 
 	getIcon(roomData) {
 		if (roomData.prid) {
-			return 'thread';
+			return 'discussion';
 		}
 		return this.icon;
 	}
diff --git a/app/lib/lib/roomTypes/public.js b/app/lib/lib/roomTypes/public.js
index ba0f4d718df6..c8d526e6c4de 100644
--- a/app/lib/lib/roomTypes/public.js
+++ b/app/lib/lib/roomTypes/public.js
@@ -31,7 +31,7 @@ export class PublicRoomType extends RoomTypeConfig {
 
 	getIcon(roomData) {
 		if (roomData.prid) {
-			return 'thread';
+			return 'discussion';
 		}
 		return this.icon;
 	}
diff --git a/app/lib/server/functions/addUserToRoom.js b/app/lib/server/functions/addUserToRoom.js
index d5147358a675..e108b2a72c25 100644
--- a/app/lib/server/functions/addUserToRoom.js
+++ b/app/lib/server/functions/addUserToRoom.js
@@ -45,7 +45,7 @@ export const addUserToRoom = function(rid, user, inviter, silenced) {
 				},
 			});
 		} else if (room.prid) {
-			Messages.createUserJoinWithRoomIdAndUserThread(rid, user, { ts: now });
+			Messages.createUserJoinWithRoomIdAndUserDiscussion(rid, user, { ts: now });
 		} else {
 			Messages.createUserJoinWithRoomIdAndUser(rid, user, { ts: now });
 		}
diff --git a/app/lib/server/functions/cleanRoomHistory.js b/app/lib/server/functions/cleanRoomHistory.js
index 0b01ae385e7a..58d64a456d61 100644
--- a/app/lib/server/functions/cleanRoomHistory.js
+++ b/app/lib/server/functions/cleanRoomHistory.js
@@ -4,7 +4,7 @@ import { Messages, Rooms } from '../../../models';
 import { Notifications } from '../../../notifications';
 import { deleteRoom } from './deleteRoom';
 
-export const cleanRoomHistory = function({ rid, latest = new Date(), oldest = new Date('0001-01-01T00:00:00Z'), inclusive = true, limit = 0, excludePinned = true, ignoreThreads = true, filesOnly = false, fromUsers = [] }) {
+export const cleanRoomHistory = function({ rid, latest = new Date(), oldest = new Date('0001-01-01T00:00:00Z'), inclusive = true, limit = 0, excludePinned = true, ignoreDiscussion = true, filesOnly = false, fromUsers = [] }) {
 	const gt = inclusive ? '$gte' : '$gt';
 	const lt = inclusive ? '$lte' : '$lt';
 
@@ -16,7 +16,7 @@ export const cleanRoomHistory = function({ rid, latest = new Date(), oldest = ne
 	Messages.findFilesByRoomIdPinnedTimestampAndUsers(
 		rid,
 		excludePinned,
-		ignoreThreads,
+		ignoreDiscussion,
 		ts,
 		fromUsers,
 		{ fields: { 'file._id': 1, pinned: 1 }, limit }
@@ -31,18 +31,18 @@ export const cleanRoomHistory = function({ rid, latest = new Date(), oldest = ne
 		return fileCount;
 	}
 
-	if (!ignoreThreads) {
-		Messages.findThreadByRoomIdPinnedTimestampAndUsers(rid, excludePinned, ts, fromUsers, { fields: { trid: 1 }, ...(limit && { limit }) }).fetch()
-			.forEach(({ trid }) => deleteRoom(trid));
+	if (!ignoreDiscussion) {
+		Messages.findDiscussionByRoomIdPinnedTimestampAndUsers(rid, excludePinned, ts, fromUsers, { fields: { drid: 1 }, ...(limit && { limit }) }).fetch()
+			.forEach(({ drid }) => deleteRoom(drid));
 	}
 
-	const count = Messages.removeByIdPinnedTimestampLimitAndUsers(rid, excludePinned, ignoreThreads, ts, limit, fromUsers);
+	const count = Messages.removeByIdPinnedTimestampLimitAndUsers(rid, excludePinned, ignoreDiscussion, ts, limit, fromUsers);
 	if (count) {
 		Rooms.resetLastMessageById(rid);
 		Notifications.notifyRoom(rid, 'deleteMessageBulk', {
 			rid,
 			excludePinned,
-			ignoreThreads,
+			ignoreDiscussion,
 			ts,
 			users: fromUsers,
 		});
diff --git a/app/lib/server/methods/cleanRoomHistory.js b/app/lib/server/methods/cleanRoomHistory.js
index 82f95895db06..6d937f265a31 100644
--- a/app/lib/server/methods/cleanRoomHistory.js
+++ b/app/lib/server/methods/cleanRoomHistory.js
@@ -4,7 +4,7 @@ import { hasPermission } from '../../../authorization';
 import { cleanRoomHistory } from '../functions';
 
 Meteor.methods({
-	cleanRoomHistory({ roomId, latest, oldest, inclusive = true, limit, excludePinned = false, ignoreThreads = true, filesOnly = false, fromUsers = [] }) {
+	cleanRoomHistory({ roomId, latest, oldest, inclusive = true, limit, excludePinned = false, ignoreDiscussion = true, filesOnly = false, fromUsers = [] }) {
 		check(roomId, String);
 		check(latest, Date);
 		check(oldest, Date);
@@ -24,6 +24,6 @@ Meteor.methods({
 			throw new Meteor.Error('error-not-allowed', 'Not allowed', { method: 'cleanRoomHistory' });
 		}
 
-		return cleanRoomHistory({ rid: roomId, latest, oldest, inclusive, limit, excludePinned, ignoreThreads, filesOnly, fromUsers });
+		return cleanRoomHistory({ rid: roomId, latest, oldest, inclusive, limit, excludePinned, ignoreDiscussion, filesOnly, fromUsers });
 	},
 });
diff --git a/app/message-attachments/client/messageAttachment.html b/app/message-attachments/client/messageAttachment.html
index 877c05341e2f..c1c936477da6 100644
--- a/app/message-attachments/client/messageAttachment.html
+++ b/app/message-attachments/client/messageAttachment.html
@@ -6,7 +6,8 @@
 		{{else}}
 			{{pretext}}
 		{{/if}}
-		<div class="attachment-block">
+		<div class="color-primary-font-color {{# unless $eq color 'none'}}attachment-block{{/unless}}">
+
 			<div class="attachment-block-border background-info-font-color" style="background-color: {{color}}"></div>
 			{{#if author_name}}
 				{{#if author_link}}
@@ -56,7 +57,7 @@
 					{{#if title_link}}
 						<a href="{{title_link}}" target="_blank" rel="noopener noreferrer">{{title}}</a>
 						{{#if title_link_download}}
-							<a class="attachment-download-icon" href="{{title_link}}" target="_blank" download="" rel="noopener noreferrer">{{> icon icon="download"}}</a>
+							<a class="attachment-download-icon rc-tooltip" aria-label="{{_ 'Download'}}" href="{{title_link}}" target="_blank" download="" rel="noopener noreferrer">{{> icon icon="download"}}</a>
 						{{/if}}
 					{{else}}
 						{{title}}
diff --git a/app/message-attachments/client/stylesheets/messageAttachments.css b/app/message-attachments/client/stylesheets/messageAttachments.css
index 87ac58ce5e05..b71694263442 100644
--- a/app/message-attachments/client/stylesheets/messageAttachments.css
+++ b/app/message-attachments/client/stylesheets/messageAttachments.css
@@ -89,6 +89,8 @@ html.rtl .attachment {
 		display: flex;
 
 		margin-top: 4px;
+
+		align-items: center;
 		flex-wrap: wrap;
 
 		& .attachment-field {
diff --git a/app/models/server/models/Messages.js b/app/models/server/models/Messages.js
index 11b002d80b24..7cbbba4d16ca 100644
--- a/app/models/server/models/Messages.js
+++ b/app/models/server/models/Messages.js
@@ -26,8 +26,8 @@ export class Messages extends Base {
 		this.tryEnsureIndex({ slackBotId: 1, slackTs: 1 }, { sparse: true });
 		this.tryEnsureIndex({ unread: 1 }, { sparse: true });
 
-		// threads
-		this.tryEnsureIndex({ trid: 1 }, { sparse: true });
+		// discussions
+		this.tryEnsureIndex({ drid: 1 }, { sparse: true });
 	}
 
 	setReactions(messageId, reactions) {
@@ -152,7 +152,7 @@ export class Messages extends Base {
 		return this.find(query, { fields: { 'file._id': 1 }, ...options });
 	}
 
-	findFilesByRoomIdPinnedTimestampAndUsers(rid, excludePinned, ignoreThreads = true, ts, users = [], options = {}) {
+	findFilesByRoomIdPinnedTimestampAndUsers(rid, excludePinned, ignoreDiscussion = true, ts, users = [], options = {}) {
 		const query = {
 			rid,
 			ts,
@@ -163,8 +163,8 @@ export class Messages extends Base {
 			query.pinned = { $ne: true };
 		}
 
-		if (ignoreThreads) {
-			query.trid = { $exists: 0 };
+		if (ignoreDiscussion) {
+			query.drid = { $exists: 0 };
 		}
 
 		if (users.length) {
@@ -174,11 +174,11 @@ export class Messages extends Base {
 		return this.find(query, { fields: { 'file._id': 1 }, ...options });
 	}
 
-	findThreadByRoomIdPinnedTimestampAndUsers(rid, excludePinned, ts, users = [], options = {}) {
+	findDiscussionByRoomIdPinnedTimestampAndUsers(rid, excludePinned, ts, users = [], options = {}) {
 		const query = {
 			rid,
 			ts,
-			trid: { $exists: 1 },
+			drid: { $exists: 1 },
 		};
 
 		if (excludePinned) {
@@ -763,7 +763,7 @@ export class Messages extends Base {
 		return this.createWithTypeRoomIdMessageAndUser('uj', roomId, message, user, extraData);
 	}
 
-	createUserJoinWithRoomIdAndUserThread(roomId, user, extraData) {
+	createUserJoinWithRoomIdAndUserDiscussion(roomId, user, extraData) {
 		const message = user.username;
 		return this.createWithTypeRoomIdMessageAndUser('ut', roomId, message, user, extraData);
 	}
@@ -860,7 +860,7 @@ export class Messages extends Base {
 		return this.remove(query);
 	}
 
-	removeByIdPinnedTimestampLimitAndUsers(rid, pinned, ignoreThreads = true, ts, limit, users = []) {
+	removeByIdPinnedTimestampLimitAndUsers(rid, pinned, ignoreDiscussion = true, ts, limit, users = []) {
 		const query = {
 			rid,
 			ts,
@@ -870,8 +870,8 @@ export class Messages extends Base {
 			query.pinned = { $ne: true };
 		}
 
-		if (ignoreThreads) {
-			query.trid = { $exists: 0 };
+		if (ignoreDiscussion) {
+			query.drid = { $exists: 0 };
 		}
 
 		if (users.length) {
@@ -965,17 +965,17 @@ export class Messages extends Base {
 	}
 
 	/**
-	 * Copy metadata from the thread to the system message in the parent channel
-	 * which links to the thread.
+	 * Copy metadata from the discussion to the system message in the parent channel
+	 * which links to the discussion.
 	 * Since we don't pass this metadata into the model's function, it is not a subject
 	 * to race conditions: If multiple updates occur, the current state will be updated
-	 * only if the new state of the thread room is really newer.
+	 * only if the new state of the discussion room is really newer.
 	 */
-	refreshThreadMetadata({ rid }) {
+	refreshDiscussionMetadata({ rid }) {
 		if (!rid) {
 			return false;
 		}
-		const { lm, msgs: count } = Rooms.findOneById(rid, {
+		const { lm: dlm, msgs: dcount } = Rooms.findOneById(rid, {
 			fields: {
 				msgs: 1,
 				lm: 1,
@@ -983,21 +983,13 @@ export class Messages extends Base {
 		});
 
 		const query = {
-			trid: rid,
+			drid: rid,
 		};
 
 		return this.update(query, {
 			$set: {
-				'attachments.0.fields': [
-					{
-						type: 'messageCounter',
-						count,
-					},
-					{
-						type: 'lastMessageAge',
-						lm,
-					},
-				],
+				dcount,
+				dlm,
 			},
 		}, { multi: 1 });
 	}
diff --git a/app/models/server/models/Rooms.js b/app/models/server/models/Rooms.js
index 4708e61d404f..c77eb8472d0a 100644
--- a/app/models/server/models/Rooms.js
+++ b/app/models/server/models/Rooms.js
@@ -19,7 +19,7 @@ export class Rooms extends Base {
 		this.tryEnsureIndex({ departmentId: 1 }, { sparse: 1 });
 		this.tryEnsureIndex({ ts: 1 });
 
-		// threads
+		// discussions
 		this.tryEnsureIndex({ prid: 1 });
 	}
 
@@ -1369,8 +1369,8 @@ export class Rooms extends Base {
 	}
 
 	// ############################
-	// Threads
-	findThreadParentByNameStarting(name, options) {
+	// Discussion
+	findDiscussionParentByNameStarting(name, options) {
 		const nameRegex = new RegExp(`^${ s.trim(s.escapeRegExp(name)) }`, 'i');
 
 		const query = {
diff --git a/app/retention-policy/server/cronPruneMessages.js b/app/retention-policy/server/cronPruneMessages.js
index 3ed38a12ff81..3d057a6dd128 100644
--- a/app/retention-policy/server/cronPruneMessages.js
+++ b/app/retention-policy/server/cronPruneMessages.js
@@ -21,7 +21,7 @@ function job() {
 	const now = new Date();
 	const filesOnly = settings.get('RetentionPolicy_FilesOnly');
 	const excludePinned = settings.get('RetentionPolicy_ExcludePinned');
-	const ignoreThreads = settings.get('RetentionPolicy_DoNotExcludeThreads');
+	const ignoreDiscussion = settings.get('RetentionPolicy_DoNotExcludeDiscussion');
 
 	// get all rooms with default values
 	types.forEach((type) => {
@@ -37,7 +37,7 @@ function job() {
 			],
 			'retention.overrideGlobal': { $ne: true },
 		}, { fields : { _id: 1 } }).forEach(({ _id: rid }) => {
-			cleanRoomHistory({ rid, latest, oldest, filesOnly, excludePinned, ignoreThreads });
+			cleanRoomHistory({ rid, latest, oldest, filesOnly, excludePinned, ignoreDiscussion });
 		});
 	});
 
@@ -49,7 +49,7 @@ function job() {
 	}).forEach((room) => {
 		const { maxAge = 30, filesOnly, excludePinned } = room.retention;
 		const latest = new Date(now.getTime() - maxAge * toDays);
-		cleanRoomHistory({ rid: room._id, latest, oldest, filesOnly, excludePinned, ignoreThreads });
+		cleanRoomHistory({ rid: room._id, latest, oldest, filesOnly, excludePinned, ignoreDiscussion });
 	});
 	lastPrune = new Date(now.getTime() - gracePeriod);
 }
diff --git a/app/theme/client/imports/components/header.css b/app/theme/client/imports/components/header.css
index e0c0813cd585..d531340325f9 100644
--- a/app/theme/client/imports/components/header.css
+++ b/app/theme/client/imports/components/header.css
@@ -10,6 +10,8 @@
 
 		padding: 0 0.25rem;
 
+		cursor: pointer;
+
 		justify-content: center;
 	}
 
diff --git a/app/theme/client/imports/components/modal.css b/app/theme/client/imports/components/modal.css
index 8e0721558656..796cfea59dde 100644
--- a/app/theme/client/imports/components/modal.css
+++ b/app/theme/client/imports/components/modal.css
@@ -7,8 +7,6 @@
 	height: auto;
 	max-height: 100%;
 
-	padding: 0;
-
 	animation: dropdown-show 0.3s cubic-bezier(0.45, 0.05, 0.55, 0.95);
 
 	border: none;
diff --git a/app/theme/client/imports/components/modal/create-channel.css b/app/theme/client/imports/components/modal/create-channel.css
index 52a98ea02024..8fd3fb876a66 100644
--- a/app/theme/client/imports/components/modal/create-channel.css
+++ b/app/theme/client/imports/components/modal/create-channel.css
@@ -24,8 +24,8 @@
 	}
 
 	&__switches,
-	&__inputs:not(:only-child),
-	& .rc-input:not(:only-child) {
+	&__inputs:not(:only-of-type),
+	& .rc-input:not(:only-of-type) {
 		margin-bottom: var(--create-channel-gap-between-elements);
 	}
 
diff --git a/app/theme/client/imports/components/userInfo.css b/app/theme/client/imports/components/userInfo.css
index afdfa97c5b84..878ba63af14b 100644
--- a/app/theme/client/imports/components/userInfo.css
+++ b/app/theme/client/imports/components/userInfo.css
@@ -94,6 +94,8 @@
 		overflow-x: hidden;
 		overflow-y: auto;
 
+		flex: 1;
+
 		margin: 0 -1.5rem;
 		padding: 0 1.5rem;
 
diff --git a/app/theme/client/imports/forms/button.css b/app/theme/client/imports/forms/button.css
index f4595e11eb60..4c6a156a4fd0 100644
--- a/app/theme/client/imports/forms/button.css
+++ b/app/theme/client/imports/forms/button.css
@@ -18,8 +18,8 @@
 
 	display: flex;
 
-	min-height: 40px;
-	max-height: 40px;
+	height: 40px;
+
 	padding: 0 1.5rem;
 
 	cursor: pointer;
@@ -120,7 +120,10 @@
 	}
 
 	&--small {
+		height: var(--button-height-small);
 		padding: var(--button-padding-small);
+
+		font-size: var(--button-text-size-small);
 	}
 
 	&--square {
diff --git a/app/theme/client/imports/forms/input.css b/app/theme/client/imports/forms/input.css
index 7c708ab4b3ba..d530a866b789 100644
--- a/app/theme/client/imports/forms/input.css
+++ b/app/theme/client/imports/forms/input.css
@@ -1,3 +1,8 @@
+textarea.rc-input__element {
+	font-family: inherit;
+	line-height: 0.5rem 1rem;
+}
+
 .rc-input {
 	position: relative;
 
@@ -45,11 +50,6 @@
 		}
 	}
 
-	textarea.&__element {
-		font-family: inherit;
-		line-height: 2rem;
-	}
-
 	&__element {
 		width: 100%;
 		padding: 0 1rem;
diff --git a/app/theme/client/imports/general/base_old.css b/app/theme/client/imports/general/base_old.css
index 21c0c4db1363..64649b5b307f 100644
--- a/app/theme/client/imports/general/base_old.css
+++ b/app/theme/client/imports/general/base_old.css
@@ -2878,14 +2878,6 @@ rc-old select,
 		line-height: 40px;
 	}
 
-	& button {
-		font-weight: 400;
-
-		&:hover {
-			text-decoration: underline;
-		}
-	}
-
 	& .body {
 		transition: opacity 1s linear;
 
diff --git a/app/theme/client/imports/general/variables.css b/app/theme/client/imports/general/variables.css
index 524e1bb2a02d..53ad5e5e1bf0 100644
--- a/app/theme/client/imports/general/variables.css
+++ b/app/theme/client/imports/general/variables.css
@@ -89,7 +89,9 @@
 	*/
 	--button-square-size: 36px;
 	--button-padding: 0.782rem;
-	--button-padding-small: 0.5rem;
+	--button-padding-small: 0 0.5rem;
+	--button-height-small: 28px;
+	--button-text-size-small: 13px;
 	--button-text-size: var(--input-font-size);
 	--button-border-width: var(--border);
 	--button-border-radius: var(--border-radius);
diff --git a/app/threading/client/createThreadMessageAction.js b/app/threading/client/createThreadMessageAction.js
deleted file mode 100644
index 17c924d4c629..000000000000
--- a/app/threading/client/createThreadMessageAction.js
+++ /dev/null
@@ -1,49 +0,0 @@
-import { Meteor } from 'meteor/meteor';
-import { Tracker } from 'meteor/tracker';
-import { Subscriptions } from '../../models';
-import { settings } from '../../settings';
-import { hasPermission } from '../../authorization';
-import { MessageAction, modal } from '../../ui-utils';
-
-
-const condition = (rid, uid) => {
-	if (!Subscriptions.findOne({ rid })) {
-		return false;
-	}
-	return uid !== Meteor.userId() ? hasPermission('start-thread-other-user') : hasPermission('start-thread');
-};
-
-Meteor.startup(function() {
-	Tracker.autorun(() => {
-		if (settings.get('Thread_from_context_menu') !== 'button') {
-			return MessageAction.removeButton('start-thread');
-		}
-
-		MessageAction.addButton({
-			id: 'start-thread',
-			icon: 'thread',
-			label: 'Thread_start',
-			context: ['message', 'message-mobile'],
-			async action() {
-				const [, message] = this._arguments;
-
-				modal.open({
-					content: 'CreateThread',
-					data: { rid: message.rid, message, onCreate() {
-						modal.close();
-					} },
-					showConfirmButton: false,
-					showCancelButton: false,
-				});
-			},
-			condition({ rid, u: { _id: uid }, attachments }) {
-				if (attachments && attachments[0] && attachments[0].fields && attachments[0].fields[0].type === 'messageCounter') {
-					return false;
-				}
-				return condition(rid, uid);
-			},
-			order: 0,
-			group: 'menu',
-		});
-	});
-});
diff --git a/app/threading/client/index.js b/app/threading/client/index.js
deleted file mode 100644
index 41920c3c03dd..000000000000
--- a/app/threading/client/index.js
+++ /dev/null
@@ -1,20 +0,0 @@
-// Templates
-import './views/creationDialog/CreateThread.html';
-import './views/creationDialog/CreateThread';
-import './views/ThreadList.html';
-import './views/ThreadList';
-import './views/ThreadsTabbar.html';
-import './views/ThreadsTabbar';
-import './views/fieldTypeThreadReplyCounter.html';
-import './views/fieldTypeThreadReplyCounter';
-import './views/fieldTypeThreadLastMessageAge.html';
-import './views/fieldTypeThreadLastMessageAge';
-
-// Other UI extensions
-import './lib/messageTypes/threadMessage';
-import './lib/threadsOfRoom';
-import './createThreadMessageAction';
-import './threadFromMessageBox';
-import './tabBar';
-
-import '../lib/threadRoomType';
diff --git a/app/threading/client/lib/messageTypes/threadMessage.js b/app/threading/client/lib/messageTypes/threadMessage.js
deleted file mode 100644
index b1563ff6f0fd..000000000000
--- a/app/threading/client/lib/messageTypes/threadMessage.js
+++ /dev/null
@@ -1,32 +0,0 @@
-import { Meteor } from 'meteor/meteor';
-import { TAPi18n } from 'meteor/tap:i18n';
-import { MessageTypes } from '../../../../ui-utils';
-
-Meteor.startup(function() {
-	MessageTypes.registerType({
-		id: 'thread-created',
-		system: true,
-		message: 'thread-created',
-		data(message) {
-			return {
-				// channelLink: `<a class="mention-link" data-channel= ${ message.channels[0]._id }  title="">${ TAPi18n.__('thread') }</a>`,
-				message: message.msg,
-				username: `<a class="mention-link" data-username=${ message.u.username } title="">@${ message.u.username }</a>`,
-			};
-		},
-	});
-
-	MessageTypes.registerType({
-		id: 'thread-welcome',
-		system: true,
-		message: 'thread-welcome',
-		data(message) {
-			const threadChannelName = TAPi18n.__('a_direct_message');
-
-			return {
-				parentChannel: `<a class="mention-link" data-channel= ${ threadChannelName }  title="">${ threadChannelName }</a>`,
-				username: `<a class="mention-link" data-username= ${ message.mentions[0].name } title="">@${ message.mentions[0].name }</a>`,
-			};
-		},
-	});
-});
diff --git a/app/threading/client/lib/threadsOfRoom.js b/app/threading/client/lib/threadsOfRoom.js
deleted file mode 100644
index 76d63d68195e..000000000000
--- a/app/threading/client/lib/threadsOfRoom.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import { Mongo } from 'meteor/mongo';
-
-export const ThreadsOfRoom = new Mongo.Collection('rocketchat_threads_of_room');
diff --git a/app/threading/client/public/stylesheets/threading.css b/app/threading/client/public/stylesheets/threading.css
deleted file mode 100644
index 1c22bfb6f154..000000000000
--- a/app/threading/client/public/stylesheets/threading.css
+++ /dev/null
@@ -1,34 +0,0 @@
-.attachment-fields button {
-	min-height: auto;
-	padding: 3px;
-
-	font-weight: normal;
-}
-
-.attachment-fields button:hover {
-	text-decoration: none;
-}
-
-.attachment-fields button.no-replies {
-	opacity: 0.4;
-}
-
-.threads-list .empty {
-	margin-top: 60px;
-
-	text-align: center;
-
-	color: #7f7f7f;
-}
-
-.threads-list .load-more {
-	text-align: center;
-	text-transform: lowercase;
-
-	font-style: italic;
-	line-height: 40px;
-}
-
-.threads-list .load-more .load-more-loading {
-	color: #aaaaaa;
-}
diff --git a/app/threading/client/threadFromMessageBox.js b/app/threading/client/threadFromMessageBox.js
deleted file mode 100644
index d146cb3efbc0..000000000000
--- a/app/threading/client/threadFromMessageBox.js
+++ /dev/null
@@ -1,33 +0,0 @@
-import { Meteor } from 'meteor/meteor';
-import { Tracker } from 'meteor/tracker';
-import { messageBox, modal } from '../../ui-utils';
-import { settings } from '../../settings';
-
-Meteor.startup(function() {
-	Tracker.autorun(() => {
-		if (settings.get('Thread_from_context_menu') !== 'button') {
-			return messageBox.actions.remove('Create_new', /start-thread/);
-		}
-		messageBox.actions.add('Create_new', 'Thread', {
-			id: 'start-thread',
-			icon: 'thread',
-			condition: () => true,
-			action(data) {
-				modal.open({
-					// title: t('Message_info'),
-					content: 'CreateThread',
-					data: {
-						...data,
-						onCreate() {
-							modal.close();
-						},
-					},
-					showConfirmButton: false,
-					showCancelButton: false,
-					// confirmButtonText: t('Close'),
-				});
-			},
-		});
-
-	});
-});
diff --git a/app/threading/client/views/fieldTypeThreadLastMessageAge.html b/app/threading/client/views/fieldTypeThreadLastMessageAge.html
deleted file mode 100644
index 93fc2f4bb17f..000000000000
--- a/app/threading/client/views/fieldTypeThreadLastMessageAge.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<template name="LastMessageAge">
-	{{#with field}}
-		{{#if lastMessageAge}}
-			<button class="rc-tags__tag rc-tags--no-icon">{{lastMessageAge}}</button>
-		{{/if}}
-	{{/with}}
-</template>
diff --git a/app/threading/client/views/fieldTypeThreadLastMessageAge.js b/app/threading/client/views/fieldTypeThreadLastMessageAge.js
deleted file mode 100644
index f96450e23f64..000000000000
--- a/app/threading/client/views/fieldTypeThreadLastMessageAge.js
+++ /dev/null
@@ -1,12 +0,0 @@
-import { registerFieldTemplate } from '../../../message-attachments';
-import { Template } from 'meteor/templating';
-import moment from 'moment';
-
-Template.LastMessageAge.helpers({
-	lastMessageAge() {
-		const lastMessageTimestamp = Template.instance().data.field.lm;
-		return lastMessageTimestamp && moment(lastMessageTimestamp).format('LLL');
-	},
-});
-
-registerFieldTemplate('lastMessageAge', 'LastMessageAge', {});
diff --git a/app/threading/client/views/fieldTypeThreadReplyCounter.html b/app/threading/client/views/fieldTypeThreadReplyCounter.html
deleted file mode 100644
index bdc7ea5b7a74..000000000000
--- a/app/threading/client/views/fieldTypeThreadReplyCounter.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<template name="MessageCounter">
-	{{#with field}}
-		{{#if hasReplies}}
-			<button
-				class="js-navigate-to-thread rc-tags__tag rc-tags--no-icon"
-				data-rid={{roomId}}
-			>
-				<span class='reply-counter'>{{replyCount}}</span>&nbsp;{{_ i18nKeyReply}}
-			</button>
-		{{else}}
-		<button
-				class="js-navigate-to-thread rc-tags__tag rc-tags--no-icon no-replies"
-				data-rid={{roomId}}
-			>
-				{{_ "No_replies_yet" }}
-			</button>
-		{{/if}}
-	{{/with}}
-</template>
diff --git a/app/threading/client/views/fieldTypeThreadReplyCounter.js b/app/threading/client/views/fieldTypeThreadReplyCounter.js
deleted file mode 100644
index cf027fd60179..000000000000
--- a/app/threading/client/views/fieldTypeThreadReplyCounter.js
+++ /dev/null
@@ -1,30 +0,0 @@
-import { registerFieldTemplate } from '../../../message-attachments';
-import { Template } from 'meteor/templating';
-import { FlowRouter } from 'meteor/kadira:flow-router';
-
-Template.MessageCounter.helpers({
-	hasReplies() {
-		return Template.instance().data.field.count > 0;
-	},
-
-	replyCount() {
-		return Template.instance().data.field.count;
-	},
-
-	i18nKeyReply() {
-		return Template.instance().data.field.count > 1
-			? 'Replies'
-			: 'Reply';
-	},
-
-});
-
-const events = {
-	'click .js-navigate-to-thread'(event) {
-		event.preventDefault();
-		const [, { trid }] = this._arguments;
-		FlowRouter.goToRoomById(trid);
-	},
-};
-
-registerFieldTemplate('messageCounter', 'MessageCounter', events);
diff --git a/app/threading/server/config.js b/app/threading/server/config.js
deleted file mode 100644
index 1550f965995f..000000000000
--- a/app/threading/server/config.js
+++ /dev/null
@@ -1,42 +0,0 @@
-import { Meteor } from 'meteor/meteor';
-import { settings } from '../../settings';
-
-Meteor.startup(() => {
-	settings.addGroup('Threading', function() {
-		// the channel for which threads are created if none is explicitly chosen
-
-		this.add('Thread_from_context_menu', 'button', {
-			group: 'Threading',
-			i18nLabel: 'Thread_from_context_menu',
-			type: 'select',
-			values: [
-				{ key: 'button', i18nLabel: 'Threading_context_menu_button' },
-				{ key: 'none', i18nLabel: 'Threading_context_menu_none' },
-			],
-			public: true,
-		});
-	});
-
-	settings.add('Accounts_Default_User_Preferences_sidebarShowThreads', true, {
-		group: 'Accounts',
-		section: 'Accounts_Default_User_Preferences',
-		type: 'boolean',
-		public: true,
-		i18nLabel: 'Threads_in_sidebar',
-	});
-
-	const globalQuery = {
-		_id: 'RetentionPolicy_Enabled',
-		value: true,
-	};
-
-	settings.add('RetentionPolicy_DoNotExcludeThreads', true, {
-		group: 'RetentionPolicy',
-		section: 'Global Policy',
-		type: 'boolean',
-		public: true,
-		i18nLabel: 'RetentionPolicy_DoNotExcludeThreads',
-		i18nDescription: 'RetentionPolicy_DoNotExcludeThreads_Description',
-		enableQuery: globalQuery,
-	});
-});
diff --git a/app/threading/server/hooks/propagateThreadMetadata.js b/app/threading/server/hooks/propagateThreadMetadata.js
deleted file mode 100644
index 946b5bb298cd..000000000000
--- a/app/threading/server/hooks/propagateThreadMetadata.js
+++ /dev/null
@@ -1,28 +0,0 @@
-
-import { callbacks } from '../../../callbacks';
-import { Messages, Rooms } from '../../../models';
-import { deleteRoom } from '../../../lib';
-/**
- * We need to propagate the writing of new message in a thread to the linking
- * system message
- */
-callbacks.add('afterSaveMessage', function(message, { _id, prid } = {}) {
-	if (prid) {
-		Messages.refreshThreadMetadata({ rid: _id }, message);
-	}
-	return message;
-}, callbacks.priority.LOW, 'PropagateThreadMetadata');
-
-callbacks.add('afterDeleteMessage', function(message, { _id, prid } = {}) {
-	if (prid) {
-		Messages.refreshThreadMetadata({ rid: _id }, message);
-	}
-	if (message.trid) {
-		deleteRoom(message.trid);
-	}
-	return message;
-}, callbacks.priority.LOW, 'PropagateThreadMetadata');
-
-callbacks.add('afterDeleteRoom', function(rid) {
-	Rooms.find({ prid: rid }, { fields: { _id: 1 } }).forEach(({ _id }) => deleteRoom(_id));
-}, 'DeleteThreadChain');
diff --git a/app/threading/server/index.js b/app/threading/server/index.js
deleted file mode 100644
index 4940d472c405..000000000000
--- a/app/threading/server/index.js
+++ /dev/null
@@ -1,14 +0,0 @@
-import './config';
-import './authorization';
-import './permissions';
-
-import './hooks/joinThreadOnMessage';
-import './hooks/propagateThreadMetadata';
-import './publications/threadParentAutocomplete';
-import './publications/threadsOfRoom';
-
-// Methods
-import './methods/createThread';
-
-// Lib
-import '../lib/threadRoomType';
diff --git a/app/threading/server/methods/createThread.js b/app/threading/server/methods/createThread.js
deleted file mode 100644
index 681f47dda83f..000000000000
--- a/app/threading/server/methods/createThread.js
+++ /dev/null
@@ -1,162 +0,0 @@
-/* UserRoles RoomRoles*/
-// import { FlowRouter } from 'meteor/kadira:flow-router';
-import { Meteor } from 'meteor/meteor';
-import { Random } from 'meteor/random';
-// import { getAvatarUrlFromUsername } from '../../../utils';
-import { hasAtLeastOnePermission, canAccessRoom } from '../../../authorization';
-import { Messages, Rooms } from '../../../models';
-import { createRoom, addUserToRoom, sendMessage, attachMessage } from '../../../lib';
-
-const fields = [
-	{
-		type: 'messageCounter',
-		count: 0,
-	},
-	{
-		type: 'lastMessageAge',
-		lm: null,
-	},
-];
-
-export const createThreadMessage = (rid, user, trid, msg, message_embedded) => {
-	const welcomeMessage = {
-		msg,
-		rid,
-		trid,
-		attachments: [{
-			fields,
-		}, message_embedded].filter((e) => e),
-	};
-	return Messages.createWithTypeRoomIdMessageAndUser('thread-created', trid, '', user, welcomeMessage);
-};
-
-export const mentionThreadMessage = (rid, user, msg, message_embedded) => {
-	const welcomeMessage = {
-		msg,
-		rid,
-		attachments: [message_embedded].filter((e) => e),
-	};
-	return Messages.createWithTypeRoomIdMessageAndUser('thread-created', rid, '', user, welcomeMessage);
-};
-
-const cloneMessage = ({ _id, ...msg }) => ({ ...msg });
-
-export const create = ({ prid, pmid, t_name, reply, users }) => {
-	// if you set both, prid and pmid, and the rooms doesnt match... should throw an error)
-	let message = false;
-	if (pmid) {
-		message = Messages.findOne({ _id: pmid });
-		if (prid) {
-			if (prid !== message.rid) {
-				throw new Meteor.Error('error-invalid-arguments', { method: 'ThreadCreation' });
-			}
-		} else {
-			prid = message.rid;
-		}
-	}
-
-	if (!prid) {
-		throw new Meteor.Error('error-invalid-arguments', { method: 'ThreadCreation' });
-	}
-	const p_room = Rooms.findOne(prid);
-
-	if (p_room.prid) {
-		throw new Meteor.Error('error-nested-thread', 'Cannot create nested threads', { method: 'ThreadCreation' });
-	}
-
-	const user = Meteor.user();
-
-	if (!canAccessRoom(p_room, user)) {
-		throw new Meteor.Error('error-not-allowed', { method: 'ThreadCreation' });
-	}
-
-	if (pmid) {
-		const threadAlreadyExists = Rooms.findOne({
-			prid,
-			pmid,
-		}, {
-			fields: { _id: 1 },
-		});
-		if (threadAlreadyExists) { // do not allow multiple threads to the same message'\
-			addUserToRoom(threadAlreadyExists._id, user);
-			return threadAlreadyExists;
-		}
-	}
-
-	const name = Random.id();
-
-	// auto invite the replied message owner
-	const invitedUsers = message ? [message.u.username, ...users] : users;
-
-	// threads are always created as private groups
-	const thread = createRoom('p', name, user.username, [...new Set(invitedUsers)], false, {
-		fname: t_name,
-		description: message.msg, // TODO threads remove
-		topic: p_room.name, // TODO threads remove
-		prid,
-	});
-
-	if (pmid) {
-		const clonedMessage = cloneMessage(message);
-
-		Messages.update({
-			_id: message._id,
-		}, {
-			...clonedMessage,
-			attachments: [
-				{ fields },
-				...(message.attachments || []),
-			],
-			trid: thread._id,
-		});
-
-		mentionThreadMessage(thread._id, user, reply, attachMessage(message, p_room));
-
-		// check if the message is in the latest 10 messages sent to the room
-		// if not creates a new message saying about the thread creation
-		const lastMessageIds = Messages.findByRoomId(message.rid, {
-			sort: {
-				ts: -1,
-			},
-			limit: 15,
-			fields: {
-				_id: 1,
-			},
-		}).fetch();
-
-		if (!lastMessageIds.find((msg) => msg._id === message._id)) {
-			createThreadMessage(message.rid, user, thread._id, reply, attachMessage(message, p_room));
-		}
-	} else {
-		createThreadMessage(prid, user, thread._id, reply);
-		if (reply) {
-			sendMessage(user, { msg: reply }, thread);
-		}
-	}
-	return thread;
-};
-
-Meteor.methods({
-	/**
-	* Create thread by room or message
-	* @constructor
-	* @param {string} prid - Parent Room Id - The room id, optional if you send pmid.
-	* @param {string} pmid - Parent Message Id - Create the thread by a message, optional.
-	* @param {string} reply - The reply, optional
-	* @param {string} t_name - thread name
-	* @param {string[]} users - users to be added
-	*/
-	createThread({ prid, pmid, t_name, reply, users }) {
-
-		const uid = Meteor.userId();
-		if (!uid) {
-			throw new Meteor.Error('error-invalid-user', 'Invalid user', { method: 'ThreadCreation' });
-		}
-
-		if (!hasAtLeastOnePermission(uid, ['start-thread', 'start-thread-other-user'])) {
-			throw new Meteor.Error('error-action-not-allowed', 'You are not allowed to create a thread', { method: 'createThread' });
-		}
-
-		return create({ uid, prid, pmid, t_name, reply, users });
-	},
-});
diff --git a/app/threading/server/publications/threadsOfRoom.js b/app/threading/server/publications/threadsOfRoom.js
deleted file mode 100644
index 6172bb77e643..000000000000
--- a/app/threading/server/publications/threadsOfRoom.js
+++ /dev/null
@@ -1,31 +0,0 @@
-import { Meteor } from 'meteor/meteor';
-import { Messages } from '../../../models';
-
-Meteor.publish('threadsOfRoom', function(rid, limit = 50) {
-	if (!this.userId) {
-		return this.ready();
-	}
-
-	const publication = this;
-
-	if (!Meteor.call('canAccessRoom', rid, this.userId)) {
-		return this.ready();
-	}
-
-	const cursorHandle = Messages.find({ rid, trid: { $exists: 1 } }, { sort: { ts: -1 }, limit }).observeChanges({
-		added(_id, record) {
-			return publication.added('rocketchat_threads_of_room', _id, record);
-		},
-		changed(_id, record) {
-			return publication.changed('rocketchat_threads_of_room', _id, record);
-		},
-		removed(_id) {
-			return publication.removed('rocketchat_threads_of_room', _id);
-		},
-	});
-
-	this.ready();
-	return this.onStop(function() {
-		return cursorHandle.stop();
-	});
-});
diff --git a/app/ui-account/client/accountPreferences.html b/app/ui-account/client/accountPreferences.html
index e201dab06fbb..76e95a26c038 100644
--- a/app/ui-account/client/accountPreferences.html
+++ b/app/ui-account/client/accountPreferences.html
@@ -271,11 +271,11 @@ <h1>{{_ "Sidebar"}}</h1>
 							</div>
 						</div>
 
-						<div class="input-line double-col" id="sidebarShowThreads">
-							<label class="setting-label">{{_ "Threads_in_sidebar"}}</label>
+						<div class="input-line double-col" id="sidebarShowDiscussion">
+							<label class="setting-label">{{_ "Group_discussions"}}</label>
 							<div>
-								<label><input type="radio" name="sidebarShowThreads" value="true" checked="{{checked 'sidebarShowThreads' true}}"/> {{_ "True"}}</label>
-								<label><input type="radio" name="sidebarShowThreads" value="false" checked="{{checked 'sidebarShowThreads' false}}"/> {{_ "False"}}</label>
+								<label><input type="radio" name="sidebarShowDiscussion" value="true" checked="{{checked 'sidebarShowDiscussion' true}}"/> {{_ "True"}}</label>
+								<label><input type="radio" name="sidebarShowDiscussion" value="false" checked="{{checked 'sidebarShowDiscussion' false}}"/> {{_ "False"}}</label>
 							</div>
 						</div>
 					</div>
diff --git a/app/ui-account/client/accountPreferences.js b/app/ui-account/client/accountPreferences.js
index 3713f9167b54..83faa1bbb363 100644
--- a/app/ui-account/client/accountPreferences.js
+++ b/app/ui-account/client/accountPreferences.js
@@ -167,7 +167,7 @@ Template.accountPreferences.onCreated(function() {
 		data.desktopNotifications = $('#desktopNotifications').find('select').val();
 		data.mobileNotifications = $('#mobileNotifications').find('select').val();
 		data.unreadAlert = JSON.parse($('#unreadAlert').find('input:checked').val());
-		data.sidebarShowThreads = JSON.parse($('#sidebarShowThreads').find('input:checked').val());
+		data.sidebarShowDiscussion = JSON.parse($('#sidebarShowDiscussion').find('input:checked').val());
 		data.notificationsSoundVolume = parseInt($('#notificationsSoundVolume').val());
 		data.roomCounterSidebar = JSON.parse($('#roomCounterSidebar').find('input:checked').val());
 		data.highlights = _.compact(_.map($('[name=highlights]').val().split(/,|\n/), function(e) {
diff --git a/app/ui-clean-history/client/views/cleanHistory.html b/app/ui-clean-history/client/views/cleanHistory.html
index 3c74e9501ee8..4fd732db2177 100644
--- a/app/ui-clean-history/client/views/cleanHistory.html
+++ b/app/ui-clean-history/client/views/cleanHistory.html
@@ -69,9 +69,9 @@
 			<span class="rc-checkbox__text rc-text__small">{{_ "Exclude_pinned"}}</span>
 		</label>
 		<label class="rc-checkbox">
-			<input type="checkbox" name="ignoreThreads" class="rc-checkbox__input">
+			<input type="checkbox" name="ignoreDiscussion" class="rc-checkbox__input">
 			{{> icon icon="check" block="rc-checkbox__icon"}}
-			<span class="rc-checkbox__text rc-text__small">{{_ "RetentionPolicy_DoNotExcludeThreads"}}</span>
+			<span class="rc-checkbox__text rc-text__small">{{_ "RetentionPolicy_DoNotExcludeDiscussion"}}</span>
 		</label>
 		<label class="rc-checkbox">
 			<input type="checkbox" name="filesOnly" class="rc-checkbox__input">
diff --git a/app/ui-clean-history/client/views/cleanHistory.js b/app/ui-clean-history/client/views/cleanHistory.js
index 855f75813e4c..c988e6de42f0 100644
--- a/app/ui-clean-history/client/views/cleanHistory.js
+++ b/app/ui-clean-history/client/views/cleanHistory.js
@@ -22,7 +22,7 @@ const getRoomName = function() {
 	return t('conversation_with_s', roomTypes.getRoomName(room.t, room));
 };
 
-const purgeWorker = function(roomId, oldest, latest, inclusive, limit, excludePinned, ignoreThreads, filesOnly, fromUsers) {
+const purgeWorker = function(roomId, oldest, latest, inclusive, limit, excludePinned, ignoreDiscussion, filesOnly, fromUsers) {
 	return call('cleanRoomHistory', {
 		roomId,
 		latest,
@@ -30,7 +30,7 @@ const purgeWorker = function(roomId, oldest, latest, inclusive, limit, excludePi
 		inclusive,
 		limit,
 		excludePinned,
-		ignoreThreads,
+		ignoreDiscussion,
 		filesOnly,
 		fromUsers,
 	});
@@ -140,7 +140,7 @@ Template.cleanHistory.onCreated(function() {
 	this.cleanHistoryExcludePinned = new ReactiveVar(false);
 	this.cleanHistoryFilesOnly = new ReactiveVar(false);
 
-	this.ignoreThreads = new ReactiveVar(false);
+	this.ignoreDiscussion = new ReactiveVar(false);
 
 
 	this.cleanHistoryBusy = new ReactiveVar(false);
@@ -274,8 +274,8 @@ Template.cleanHistory.events({
 	'change [name=filesOnly]'(e, instance) {
 		instance.cleanHistoryFilesOnly.set(e.target.checked);
 	},
-	'change [name=ignoreThreads]'(e, instance) {
-		instance.ignoreThreads.set(e.target.checked);
+	'change [name=ignoreDiscussion]'(e, instance) {
+		instance.ignoreDiscussion.set(e.target.checked);
 	},
 	'click .js-prune'(e, instance) {
 
@@ -299,7 +299,7 @@ Template.cleanHistory.events({
 			const metaCleanHistoryInclusive = instance.cleanHistoryInclusive.get();
 			const metaCleanHistoryExcludePinned = instance.cleanHistoryExcludePinned.get();
 			const metaCleanHistoryFilesOnly = instance.cleanHistoryFilesOnly.get();
-			const ignoreThreads = instance.ignoreThreads.get();
+			const ignoreDiscussion = instance.ignoreDiscussion.get();
 
 			let fromDate = new Date('0001-01-01T00:00:00Z');
 			let toDate = new Date('9999-12-31T23:59:59Z');
@@ -318,7 +318,7 @@ Template.cleanHistory.events({
 			let count = 0;
 			let result;
 			do {
-				result = await purgeWorker(roomId, fromDate, toDate, metaCleanHistoryInclusive, limit, metaCleanHistoryExcludePinned, ignoreThreads, metaCleanHistoryFilesOnly, users);
+				result = await purgeWorker(roomId, fromDate, toDate, metaCleanHistoryInclusive, limit, metaCleanHistoryExcludePinned, ignoreDiscussion, metaCleanHistoryFilesOnly, users);
 				count += result;
 			} while (result === limit);
 
diff --git a/app/ui-message/client/message.html b/app/ui-message/client/message.html
index 94a1c298fa7b..e94649cdb49c 100644
--- a/app/ui-message/client/message.html
+++ b/app/ui-message/client/message.html
@@ -58,7 +58,7 @@
 		{{#if isIgnored}}
 			<span class="toggle-hidden icon-right-dir" data-message="{{_id}}"> {{_ "Message_Ignored"}} </span>
 		{{/if}}
-		<div class="body color-primary-font-color {{system true}}" dir="auto" data-unread-text="{{_ "Unread_Messages"}}">
+		<div class="body {{bodyClass}}" dir="auto" data-unread-text="{{_ "Unread_Messages"}}">
 			{{#if isSnippet}}
 				<div class="snippet-name">{{_ "Snippet_name"}}: {{snippetName}}</div>
 			{{/if}}
@@ -76,6 +76,23 @@
 				{{injectIndex . @index}} {{> messageAttachment}}
 			{{/each}}
 		</div>
+
+		{{#if drid}}
+			<div class="message-discussion">
+				{{#if $gt dcount 0}}
+					<button class="js-navigate-to-discussion rc-button rc-button--primary rc-button--small" data-rid={{roomId}}>
+						<!-- {{> icon icon="discussion"}} -->
+						<span class='reply-counter'>{{dcount}}</span>&nbsp;{{_ i18nKeyReply}}
+					</button>
+				{{else}}
+					<button class="js-navigate-to-discussion rc-button rc-button--primary rc-button--small no-replies" data-rid={{roomId}}>
+						{{_ "No_messages_yet" }}
+					</button>
+				{{/if}}
+				<span class="discussion-reply-lm">{{dlm}}</span>
+			</div>
+		{{/if}}
+
 		{{#with readReceipt}}
 		<div class="read-receipt {{readByEveryone}}">
 			{{> icon icon="check" }}
diff --git a/app/ui-message/client/message.js b/app/ui-message/client/message.js
index 03bfc06a571c..3b5e504f0104 100644
--- a/app/ui-message/client/message.js
+++ b/app/ui-message/client/message.js
@@ -68,6 +68,14 @@ async function renderPdfToCanvas(canvasId, pdfLink) {
 }
 
 Template.message.helpers({
+	i18nKeyReply() {
+		return this.dcount > 1
+			? 'messages'
+			: 'message';
+	},
+	dlm() {
+		return this.dlm && moment(this.dlm).format('LLL');
+	},
 	encodeURI(text) {
 		return encodeURI(text);
 	},
@@ -177,6 +185,9 @@ Template.message.helpers({
 	body() {
 		return Template.instance().body;
 	},
+	bodyClass() {
+		return MessageTypes.isSystemMessage(this) ? 'color-info-font-color' : 'color-primary-font-color';
+	},
 	system(returnClass) {
 		if (MessageTypes.isSystemMessage(this)) {
 			if (returnClass) {
diff --git a/app/ui-message/client/messageBox.js b/app/ui-message/client/messageBox.js
index 72738a8eada4..fd341b02d080 100644
--- a/app/ui-message/client/messageBox.js
+++ b/app/ui-message/client/messageBox.js
@@ -317,7 +317,7 @@ Template.messageBox.events({
 	'click .cancel-reply'(event, instance) {
 
 		const input = instance.find('.js-input-message');
-		const messages = $(input).data('reply');
+		const messages = $(input).data('reply') || [];
 		const filtered = messages.filter((msg) => msg._id !== this._id);
 
 		$(input)
diff --git a/app/ui-sidenav/client/chatRoomItem.js b/app/ui-sidenav/client/chatRoomItem.js
index b1001c5069a1..9c34389ca154 100644
--- a/app/ui-sidenav/client/chatRoomItem.js
+++ b/app/ui-sidenav/client/chatRoomItem.js
@@ -40,7 +40,7 @@ Template.chatRoomItem.helpers({
 		};
 		roomData.username = roomData.username || roomData.name;
 
-		// hide icon for threads
+		// hide icon for discussions
 		if (this.prid) {
 			roomData.darken = true;
 		}
diff --git a/app/ui-sidenav/client/roomList.js b/app/ui-sidenav/client/roomList.js
index 08832c01a963..d7ca891becbc 100644
--- a/app/ui-sidenav/client/roomList.js
+++ b/app/ui-sidenav/client/roomList.js
@@ -23,7 +23,7 @@ Template.roomList.helpers({
 				'settings.preferences.sidebarSortby': 1,
 				'settings.preferences.sidebarShowFavorites': 1,
 				'settings.preferences.sidebarShowUnread': 1,
-				'settings.preferences.sidebarShowThreads': 1,
+				'settings.preferences.sidebarShowDiscussion': 1,
 				'services.tokenpass': 1,
 			},
 		});
@@ -59,7 +59,7 @@ Template.roomList.helpers({
 				types = ['c', 'p', 'd'];
 			}
 
-			if (this.identifier === 'thread') {
+			if (this.identifier === 'discussion') {
 				types = ['c', 'p', 'd'];
 				query.prid = { $exists: true };
 			}
@@ -74,8 +74,8 @@ Template.roomList.helpers({
 				query.tokens = { $exists: true };
 			}
 
-			// if we display threads as a separate group, we should hide them from the other lists
-			if (getUserPreference(user, 'sidebarShowThreads')) {
+			// if we display discussions as a separate group, we should hide them from the other lists
+			if (getUserPreference(user, 'sidebarShowDiscussion')) {
 				query.prid = { $exists: false };
 			}
 
diff --git a/app/ui-sidenav/client/sidebarHeader.js b/app/ui-sidenav/client/sidebarHeader.js
index df3d038a71eb..7ccd972f0fcd 100644
--- a/app/ui-sidenav/client/sidebarHeader.js
+++ b/app/ui-sidenav/client/sidebarHeader.js
@@ -167,6 +167,29 @@ const toolbarButtons = (user) => [{
 	icon: 'edit-rounded',
 	condition: () => hasAtLeastOnePermission(['create-c', 'create-p']),
 	action: (e) => {
+
+
+		const createChannel = (e) => {
+			e.preventDefault();
+			modal.open({
+				title: t('Create_A_New_Channel'),
+				content: 'createChannel',
+				data: {
+					onCreate() {
+						modal.close();
+					},
+				},
+				modifier: 'modal',
+				showConfirmButton: false,
+				showCancelButton: false,
+				confirmOnEnter: false,
+			});
+		};
+
+		const discussionEnabled = settings.get('Discussion_enabled');
+		if (!discussionEnabled) {
+			return createChannel(e);
+		}
 		const config = {
 			columns: [
 				{
@@ -176,37 +199,22 @@ const toolbarButtons = (user) => [{
 								{
 									icon: 'hashtag',
 									name: t('Channel'),
-									action: (e) => {
-										e.preventDefault();
-										modal.open({
-											title: t('Create_A_New_Channel'),
-											content: 'createChannel',
-											data: {
-												onCreate() {
-													modal.close();
-												},
-											},
-											modalClass: 'modal',
-											showConfirmButton: false,
-											showCancelButton: false,
-											confirmOnEnter: false,
-										});
-									},
+									action: createChannel,
 								},
 								{
-									icon: 'thread',
-									name: t('Thread'),
+									icon: 'discussion',
+									name: t('Discussion'),
 									action: (e) => {
 										e.preventDefault();
 										modal.open({
-											title: t('Threading_title'),
-											content: 'CreateThread',
+											title: t('Discussion_title'),
+											content: 'CreateDiscussion',
 											data: {
 												onCreate() {
 													modal.close();
 												},
 											},
-											modalClass: 'modal',
+											modifier: 'modal',
 											showConfirmButton: false,
 											showCancelButton: false,
 											confirmOnEnter: false,
diff --git a/app/ui-sidenav/client/sortlist.html b/app/ui-sidenav/client/sortlist.html
index 44984c5e69cc..fa8efb05de23 100644
--- a/app/ui-sidenav/client/sortlist.html
+++ b/app/ui-sidenav/client/sortlist.html
@@ -22,6 +22,15 @@
 		</ul>
 		<span class="rc-popover__divider"></span>
 		<ul class="rc-popover__list">
+			<li class="rc-popover__item {{bold 'sidebarShowDiscussion'}}">
+				<label class="rc-popover__label">
+					<input type="checkbox" name="sidebarShowDiscussion" class="hidden" checked="{{checked 'sidebarShowDiscussion'}}" />
+					<span class="rc-popover__icon">
+						{{> icon block="rc-popover__icon-element" icon='discussion' }}
+					</span>
+					<span class="rc-popover__item-text">{{_ "Group_discussions"}}</span>
+				</label>
+			</li>
 			<li class="rc-popover__item {{bold 'sidebarGroupByType'}}">
 				<label class="rc-popover__label">
 					<input type="checkbox" name="sidebarGroupByType" class="hidden" checked="{{checked 'sidebarGroupByType'}}"/>
diff --git a/app/ui-sidenav/client/sortlist.js b/app/ui-sidenav/client/sortlist.js
index c93ab0480ca9..5bb94df0e1d9 100644
--- a/app/ui-sidenav/client/sortlist.js
+++ b/app/ui-sidenav/client/sortlist.js
@@ -6,6 +6,10 @@ import { settings } from '../../settings';
 
 const checked = function(prop, field) {
 	const userId = Meteor.userId();
+
+	if (prop === 'sidebarShowDiscussion') {
+		return getUserPreference(userId, 'sidebarShowDiscussion');
+	}
 	if (prop === 'sidebarShowFavorites') {
 		return getUserPreference(userId, 'sidebarShowFavorites');
 	}
diff --git a/app/ui-utils/client/lib/RoomManager.js b/app/ui-utils/client/lib/RoomManager.js
index d7319e27a6c3..61fed0fc04ac 100644
--- a/app/ui-utils/client/lib/RoomManager.js
+++ b/app/ui-utils/client/lib/RoomManager.js
@@ -18,13 +18,13 @@ import { mainReady } from './mainReady';
 const maxRoomsOpen = parseInt(localStorage && localStorage.getItem('rc-maxRoomsOpen')) || 5 ;
 
 const onDeleteMessageStream = (msg) => ChatMessage.remove({ _id: msg._id });
-const onDeleteMessageBulkStream = ({ rid, ts, excludePinned, ignoreThreads, users }) => {
+const onDeleteMessageBulkStream = ({ rid, ts, excludePinned, ignoreDiscussion, users }) => {
 	const query = { rid, ts };
 	if (excludePinned) {
 		query.pinned = { $ne: true };
 	}
-	if (ignoreThreads) {
-		query.trid = { $exists: false };
+	if (ignoreDiscussion) {
+		query.drid = { $exists: false };
 	}
 	if (users && users.length) {
 		query['u.username'] = { $in: users };
diff --git a/app/ui-utils/client/lib/modal.html b/app/ui-utils/client/lib/modal.html
index 1df3486e447c..d31f2fd32147 100644
--- a/app/ui-utils/client/lib/modal.html
+++ b/app/ui-utils/client/lib/modal.html
@@ -1,6 +1,6 @@
 <template name="rc_modal">
 	<div class="rc-modal-wrapper">
-		<dialog class="rc-modal rc-modal--{{modalClass}}" data-modal="modal">
+		<dialog class="rc-modal rc-modal--{{modifier}}" data-modal="modal">
 			{{#if template}}
 				{{> Template.dynamic template=template data=data}}
 			{{else}}
@@ -51,10 +51,12 @@ <h1 class="rc-modal__title">
 						</label>
 					{{/if}}
 					</section>
-					<footer class="rc-modal__footer {{#unless showFooter}}rc-modal__footer--empty{{/unless}}">
-						<input class="rc-button rc-button--nude js-close {{#unless showCancelButton}}rc-button--invisible{{/unless}}" type="submit" data-button="cancel" value="{{cancelButtonText}}">
-						<input style="background-color:{{confirmButtonColor}}" class="rc-button rc-button--primary js-confirm {{#unless showConfirmButton}}rc-button--invisible{{/unless}}" type="submit" data-button="create" value="{{confirmButtonText}}">
-					</footer>
+					{{# if showFooter }}
+						<footer class="rc-modal__footer {{#unless showFooter}}rc-modal__footer--empty{{/unless}}">
+							<input class="rc-button rc-button--nude js-close {{#unless showCancelButton}}rc-button--invisible{{/unless}}" type="submit" data-button="cancel" value="{{cancelButtonText}}">
+							<input style="background-color:{{confirmButtonColor}}" class="rc-button rc-button--primary js-confirm {{#unless showConfirmButton}}rc-button--invisible{{/unless}}" type="submit" data-button="create" value="{{confirmButtonText}}">
+						</footer>
+					{{/if}}
 			{{/if}}
 			</dialog>
 	</div>
diff --git a/app/ui-utils/client/lib/modal.js b/app/ui-utils/client/lib/modal.js
index af2e94359132..cd2f7e482e5e 100644
--- a/app/ui-utils/client/lib/modal.js
+++ b/app/ui-utils/client/lib/modal.js
@@ -93,6 +93,11 @@ export const modal = {
 };
 
 Template.rc_modal.helpers({
+
+	showFooter() {
+		const { showCancelButton, showConfirmButton } = this;
+		return showCancelButton || showConfirmButton;
+	},
 	hasAction() {
 		return !!this.action;
 	},
diff --git a/app/ui/client/components/header/headerRoom.html b/app/ui/client/components/header/headerRoom.html
index 0d35cd590143..3ebf61f7811c 100644
--- a/app/ui/client/components/header/headerRoom.html
+++ b/app/ui/client/components/header/headerRoom.html
@@ -6,7 +6,7 @@
 				{{> burger}}
 			</div>
 
-			{{#if isThread}}
+			{{#if isDiscussion}}
 				<div class="rc-header__block rc-header__block--action js-open-parent-channel">
 					<span class="rc-header__first-icon">{{> icon block="rc-header__icon rc-header__icon" icon="back"}}</span>
 				</div>
diff --git a/app/ui/client/components/header/headerRoom.js b/app/ui/client/components/header/headerRoom.js
index 16f017c571b4..5b461b1d1bfc 100644
--- a/app/ui/client/components/header/headerRoom.js
+++ b/app/ui/client/components/header/headerRoom.js
@@ -17,7 +17,7 @@ const isSubscribed = (_id) => ChatSubscription.find({ rid: _id }).count() > 0;
 
 const favoritesEnabled = () => settings.get('Favorite_Rooms');
 
-const isThread = ({ _id }) => {
+const isDiscussion = ({ _id }) => {
 	const room = ChatRoom.findOne({ _id });
 	return !!(room && room.prid);
 };
@@ -36,8 +36,8 @@ Template.headerRoom.helpers({
 		return TabBar.getButtons();
 	},
 
-	isThread() {
-		return isThread(Template.instance().data);
+	isDiscussion() {
+		return isDiscussion(Template.instance().data);
 	},
 
 	isTranslated() {
@@ -115,7 +115,7 @@ Template.headerRoom.helpers({
 	},
 
 	showToggleFavorite() {
-		return !isThread(Template.instance().data) && isSubscribed(this._id) && favoritesEnabled();
+		return !isDiscussion(Template.instance().data) && isSubscribed(this._id) && favoritesEnabled();
 	},
 
 	fixedHeight() {
diff --git a/app/ui/client/lib/chatMessages.js b/app/ui/client/lib/chatMessages.js
index 8d781bd0db83..b8a438dd495d 100644
--- a/app/ui/client/lib/chatMessages.js
+++ b/app/ui/client/lib/chatMessages.js
@@ -360,13 +360,13 @@ export const ChatMessages = class ChatMessages {
 	confirmDeleteMsg(message, done = function() {}) {
 		if (MessageTypes.isSystemMessage(message)) { return; }
 
-		const room = message.trid && Rooms.findOne({
-			_id: message.trid,
+		const room = message.drid && Rooms.findOne({
+			_id: message.drid,
 			prid: { $exists: true },
 		});
 		modal.open({
 			title: t('Are_you_sure'),
-			text: room ? t('The_message_is_a_thread_you_will_not_be_able_to_recover') : t('You_will_not_be_able_to_recover'),
+			text: room ? t('The_message_is_a_discussion_you_will_not_be_able_to_recover') : t('You_will_not_be_able_to_recover'),
 			type: 'warning',
 			showCancelButton: true,
 			confirmButtonColor: '#DD6B55',
diff --git a/app/ui/client/views/app/room.js b/app/ui/client/views/app/room.js
index 2b3a3cd75b4f..7eb49a118e62 100644
--- a/app/ui/client/views/app/room.js
+++ b/app/ui/client/views/app/room.js
@@ -856,6 +856,11 @@ Template.room.events({
 			Meteor.call('sendMessage', msgObject);
 		});
 	},
+	'click .js-navigate-to-discussion'(event) {
+		event.preventDefault();
+		const [, { drid }] = this._arguments;
+		FlowRouter.goToRoomById(drid);
+	},
 });
 
 
diff --git a/client/importPackages.js b/client/importPackages.js
index 1a90880a51e9..1726c6826124 100644
--- a/client/importPackages.js
+++ b/client/importPackages.js
@@ -95,7 +95,7 @@ import '../app/version-check';
 import '../app/search';
 import '../app/chatpal-search';
 import '../app/lazy-load';
-import '../app/threading';
+import '../app/discussion';
 import '../app/mail-messages';
 import '../app/utils';
 import '../app/settings';
diff --git a/client/importsCss.js b/client/importsCss.js
index 802298147674..b7ea1be16037 100644
--- a/client/importsCss.js
+++ b/client/importsCss.js
@@ -39,4 +39,3 @@ import '../app/ui-vrecord/client/vrecord.css';
 import '../app/videobridge/client/stylesheets/video.less';
 import '../app/wordpress/client/wordpress-login-button.css';
 import '../app/katex/katex.min.css';
-import '../app/threading/client/public/stylesheets/threading.css';
diff --git a/packages/rocketchat-i18n/i18n/de.i18n.json b/packages/rocketchat-i18n/i18n/de.i18n.json
index 5561a205c5e6..d642c4823e16 100644
--- a/packages/rocketchat-i18n/i18n/de.i18n.json
+++ b/packages/rocketchat-i18n/i18n/de.i18n.json
@@ -2012,9 +2012,9 @@
   "New_encryption_password": "Neues Verschlüsselungs-Passwort",
   "New_role": "Neue Rolle",
   "New_Room_Notification": "Neuer-Raum-Benachrichtigung",
-  "New_thread": "Neuer Thread",
-  "New_thread_name": "Ein sinnvoller Name für den Thread-Raum",
-  "New_thread_first_message": "Üblicherweise beginnt ein Thread mit einer Frage, bspw. \"Wie lade ich ein Bild hoch?\"",
+  "New_discussion": "Neuer Diskussion",
+  "New_discussion_name": "Ein sinnvoller Name für den Diskussion-Raum",
+  "New_discussion_first_message": "Üblicherweise beginnt ein Diskussion mit einer Frage, bspw. \"Wie lade ich ein Bild hoch?\"",
   "New_Trigger": "Neuer Trigger",
   "New_version_available_(s)": "Neue Version verfügbar (%s)",
   "New_videocall_request": "Neuer Video-Anruf",
@@ -2025,6 +2025,7 @@
   "No_channel_with_name_%s_was_found": "Es wurde kein Kanal mit dem Namen <strong>\"%s\"</strong> gefunden!",
   "No_channels_yet": "bisher nirgendwo dabei",
   "No_direct_messages_yet": "Sie haben bisher keine Konversationen gestartet",
+  "No_discussions_yet": "Keine Discussion vorhanden",
   "No_Encryption": "Keine Verschlüsselung",
   "No_group_with_name_%s_was_found": "Es wurde keine private Gruppe mit dem Namen <strong>\"%s\"</strong> gefunden!",
   "No_groups_yet": "Sie sind kein Mitglied einer privaten Gruppe",
@@ -2745,28 +2746,6 @@
   "This_month": "Diesen Monat",
   "This_room_has_been_archived_by__username_": "Dieser Raum wurde von __username__ archiviert",
   "This_room_has_been_unarchived_by__username_": "Dieser Raum wurde von __username__ aus dem Archiv geholt",
-  "Thread_creation_on_home": "Threads von der Home-Seite aus anlegen",
-  "Thread_default_parent_Channel": "Standard-Kanal für neue Threads",
-  "Thread_from_context_menu": "Threads im Kontext-Menü",
-  "Thread_invitations_threshold_description": "Max. Anzahl der Benutzer, die automatisch zu einem öffentlichen Thread hinzugezogen werden",
-  "Thread_invitations_threshold": "Max. Anzahl automatisch einzuladender Benutzer",
-  "Thread_name": "Thread Name",
-  "Thread_slash_command_description": "Erstelle einen Thread zum aktuellen Kanal",
-  "Thread_slash_command_params": "Ihre Nachricht",
-  "Thread_start": "Thread starten",
-  "Thread_target_channel_description": "Wähle einen Kanal oder eine Gruppe aus, die zu Deinem Anliegen passt",
-  "Thread_target_channel_prefix": "Du erstellst einen Thread in",
-  "Thread_target_channel_suffix": "- wähle einen anderen übergeordneten Kanal aus",
-  "Thread_target_channel": "Übergeordneter Kanal oder Gruppe",
-  "thread-created": "Ich habe einen neuen Thread angelegt: \"__message__\"",
-  "thread-welcome": "Danke __username__, dass Du einen neuen Thread angelegt hast! Ich habe für Dich Mitglieder aus __parentChannel__ eingeladen. Tipp: mit \"@all\" kannst Du sie anstupsen, wenn sich länger niemand melden sollte ;)",
-  "thread": "Thread",
-  "Threading_context_menu_button": "Separater Button",
-  "Threading_context_menu_none": "Unsichtbar",
-  "Threading_description": "Erstelle einen Thread, um wichtigen Dingen mehr Raum zu geben. Dort kannst Du mit allen verfügbaren Mitgliedern schreiben, ohne andere zu stören. So sorgst Du für etwas mehr Ordnung in Eurem Chat.",
-  "Threading_first_message_title": "Deine Nachricht",
-  "Threads": "Threads",
-  "Threading_title": "Einen neuen Thread anlegen",
   "This_week": "Diese Woche",
   "Thursday": "Donnerstag",
   "Time_in_seconds": "Zeit in Sekunden",
diff --git a/packages/rocketchat-i18n/i18n/en.i18n.json b/packages/rocketchat-i18n/i18n/en.i18n.json
index f8c75f4ae3a4..66d08f10110f 100644
--- a/packages/rocketchat-i18n/i18n/en.i18n.json
+++ b/packages/rocketchat-i18n/i18n/en.i18n.json
@@ -1037,6 +1037,16 @@
   "Display_offline_form": "Display Offline Form",
   "Display_unread_counter": "Display number of unread messages",
   "Displays_action_text": "Displays action text",
+  "Discussion_name": "Discussion name",
+  "Discussions": "Discussions",
+  "Discussion_start": "Start a discussion",
+  "Discussion_target_channel_description": "Select a channel which is related to what you want to ask",
+  "Discussion_target_channel_prefix": "You are creating a discussion in",
+  "Discussion_target_channel": "Parent channel or group",
+  "discussion-created": "__message__",
+  "Discussion_description": "Help keeping an overview about what's going on! By creating a discussion, a sub-channel of the one you selected is created and both are linked.",
+  "Discussion_first_message_title": "Your message",
+  "Discussion_title": "Create a new discussion",
   "Dont_ask_me_again": "Don't ask me again!",
   "Dont_ask_me_again_list": "Don't ask me again list",
   "Do_not_display_unread_counter": "Do not display any counter of this channel",
@@ -1422,6 +1432,7 @@
   "Graphql_CORS": "GraphQL CORS",
   "Graphql_Subscription_Port": "GraphQL Subscription Port",
   "Group_by_Type": "Group by Type",
+  "Group_discussions": "Group discussions",
   "Group_favorites": "Group favorites",
   "Group_mentions_disabled_x_members": "Group mentions `@all` and `@here` have been disabled for rooms with more than __total__ members.",
   "Group_mentions_only": "Group mentions only",
@@ -1920,7 +1931,6 @@
   "Mentions_default": "Mentions (default)",
   "Mentions_only": "Mentions only",
   "Merge_Channels": "Merge Channels",
-  "Message": "Message",
   "Message_AllowBadWordsFilter": "Allow Message bad words filtering",
   "Message_AllowDeleting": "Allow Message Deleting",
   "Message_AllowDeleting_BlockDeleteInMinutes": "Block Message Deleting After (n) Minutes",
@@ -1991,9 +2001,10 @@
   "Message_VideoRecorderEnabled": "Video Recorder Enabled",
   "Message_VideoRecorderEnabledDescription": "Requires 'video/webm' files to be an accepted media type within 'File Upload' settings.",
   "Message_view_mode_info": "This changes the amount of space messages take up on screen.",
-  "messages": "Messages",
+  "message": "message",
+  "Message": "Message",
+  "messages": "messages",
   "Messages": "Messages",
-  "Mmessages": "messages",
   "Messages_that_are_sent_to_the_Incoming_WebHook_will_be_posted_here": "Messages that are sent to the Incoming WebHook will be posted here.",
   "Meta": "Meta",
   "Meta_custom": "Custom Meta Tags",
@@ -2041,6 +2052,9 @@
   "New_Application": "New Application",
   "New_Custom_Field": "New Custom Field",
   "New_Department": "New Department",
+  "New_discussion": "New discussion",
+  "New_discussion_name": "A meaningful name for the discussion room",
+  "New_discussion_first_message": "Usually, a discussion starts with a question, like \"How do I upload a picture?\"",
   "New_integration": "New integration",
   "New_line_message_compose_input": "`%s` - New line in message compose input",
   "New_logs": "New logs",
@@ -2053,9 +2067,6 @@
   "New_encryption_password": "New encryption password",
   "New_role": "New role",
   "New_Room_Notification": "New Room Notification",
-  "New_thread": "New thread",
-  "New_thread_name": "A meaningful name for the thread room",
-  "New_thread_first_message": "Usually, a thread starts with a question, like \"How do I upload a picture?\"",
   "New_Trigger": "New Trigger",
   "New_version_available_(s)": "New version available (%s)",
   "New_videocall_request": "New Video Call Request",
@@ -2075,13 +2086,12 @@
   "No_messages_yet": "No messages yet",
   "No_pages_yet_Try_hitting_Reload_Pages_button": "No pages yet. Try hitting \"Reload Pages\" button.",
   "No_pinned_messages": "No pinned messages",
-  "No_replies_yet": "No replies yet",
   "No_results_found": "No results found",
   "No_results_found_for": "No results found for:",
   "No_snippet_messages": "No snippet",
   "No_starred_messages": "No starred messages",
   "No_such_command": "No such command: `/__command__`",
-  "No_threads_yet": "No threads yet",
+  "No_discussions_yet": "No discussions yet",
   "No_user_with_username_%s_was_found": "No user with username <strong>\"%s\"</strong> was found!",
   "Nobody_available": "Nobody available",
   "Node_version": "Node Version",
@@ -2387,7 +2397,7 @@
   "Retail": "Retail",
   "Retention_setting_changed_successfully": "Retention policy setting changed successfully",
   "RetentionPolicy": "Retention Policy",
-  "RetentionPolicy_DoNotExcludeThreads": "Do not exclude thread messages",
+  "RetentionPolicy_DoNotExcludeDiscussion": "Do not exclude discussion messages",
   "RetentionPolicy_RoomWarning": "Messages older than __time__ are automatically pruned here",
   "RetentionPolicy_RoomWarning_Unpinned": "Unpinned messages older than __time__ are automatically pruned here",
   "RetentionPolicy_RoomWarning_FilesOnly": "Files older than __time__ are automatically pruned here (messages stay intact)",
@@ -2720,7 +2730,7 @@
   "The_emails_are_being_sent": "The emails are being sent.",
   "The_field_is_required": "The field %s is required.",
   "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "The image resize will not work because we can not detect ImageMagick or GraphicsMagick installed on your server.",
-  "The_message_is_a_thread_you_will_not_be_able_to_recover": "The message is a thread you will not be able to recover the messages!",
+  "The_message_is_a_discussion_you_will_not_be_able_to_recover": "The message is a discussion you will not be able to recover the messages!",
   "The_peer__peer__does_not_exist": "The peer <em>__peer__</em> does not exist.",
   "The_redirectUri_is_required": "The redirectUri is required",
   "The_server_will_restart_in_s_seconds": "The server will restart in %s seconds",
@@ -2794,29 +2804,8 @@
   "This_month": "This Month",
   "This_room_has_been_archived_by__username_": "This room has been archived by __username__",
   "This_room_has_been_unarchived_by__username_": "This room has been unarchived by __username__",
-  "Thread_creation_on_home": "Create threads on home screen",
-  "Thread_default_parent_Channel": "Default channel for new Threads",
-  "Thread_from_context_menu": "Threads in context-menu",
-  "Thread_invitations_threshold_description": "Max. count of users who are automatically being invited into a public thread",
-  "Thread_invitations_threshold": "Max. users to be automatically invited",
-  "Thread_name": "Thread name",
-  "Thread_slash_command_description": "Creates a thread for the current channel",
-  "Thread_slash_command_params": "your message",
-  "Thread_start": "Start a thread",
-  "Thread_target_channel_description": "Select a channel which is related to what you want to ask",
-  "Thread_target_channel_prefix": "You are creating a thread in",
-  "Thread_target_channel_suffix": "- select a different parent channel",
-  "Thread_target_channel": "Parent channel or group",
-  "thread-created": "Started a new thread: \"__message__\"",
-  "thread-welcome": "Thanks __username__ for creating a thread! I invited some members from __parentChannel__ who shall be able to help you. Hint: You can poke them with \"@all\", in case there's nothing happening for a longer time ;)",
   "thread": "thread",
-  "Threading_context_menu_button": "Dedicated button",
-  "Threading_context_menu_none": "Invisible",
-  "Threading_description": "Help keeping an overview about what's going on! By creating a thread, a sub-channel of the one you selected is created and both are linked.",
-  "Threading_first_message_title": "Your message",
-  "Threads_in_sidebar": "Show threads category on sidebar",
   "Threads": "Threads",
-  "Threading_title": "Create a new thread",
   "This_week": "This Week",
   "Thursday": "Thursday",
   "Time_in_seconds": "Time in seconds",
@@ -3177,4 +3166,4 @@
   "Your_question": "Your question",
   "Your_server_link": "Your server link",
   "Your_workspace_is_ready": "Your workspace is ready to use 🎉"
-}
\ No newline at end of file
+}
diff --git a/private/client/imports/general/variables.css b/private/client/imports/general/variables.css
index 4e1741d3238b..b39e0ed7c83f 100644
--- a/private/client/imports/general/variables.css
+++ b/private/client/imports/general/variables.css
@@ -89,7 +89,9 @@
 	*/
 	--button-square-size: 36px;
 	--button-padding: 0.782rem;
-	--button-padding-small: 0.5rem;
+	--button-padding-small: 0 0.5rem;
+	--button-height-small: 28px;
+	--button-text-size-small: 13px;
 	--button-text-size: var(--input-font-size);
 	--button-border-width: var(--border);
 	--button-border-radius: var(--border-radius);
diff --git a/private/public/icons.svg b/private/public/icons.svg
index 040fac989798..3c91828d41b5 100644
--- a/private/public/icons.svg
+++ b/private/public/icons.svg
@@ -83,6 +83,9 @@
 <symbol id="icon-discover" viewBox="0 0 20 20" fill="currentColor">
   <path d="M6.40211645,13.5 L4.36976532,13.5 C5.08834307,14.6534694 6.15151935,15.5700421 7.41528581,16.1057095 C6.99352323,15.3908207 6.64680853,14.5042677 6.40211645,13.5 Z M6.12601749,12 C6.043753,11.3607602 6,10.6905991 6,10 C6,9.4873059 6.02411418,8.98587614 6.07019789,8.5 L3.54187189,8.5 C3.43036499,8.98199332 3.37142857,9.4841153 3.37142857,10 C3.37142857,10.697025 3.47901938,11.3689256 3.67849919,12 L6.12601749,12 Z M6.29075852,7 C6.53582402,5.7891713 6.92480779,4.72565214 7.41528581,3.89429054 C5.97389689,4.50524604 4.79344659,5.61170376 4.08759864,7 L6.29075852,7 Z M13.7092415,7 L15.9124014,7 C15.2065534,5.61170376 14.0261031,4.50524604 12.5847142,3.89429054 C13.0751922,4.72565214 13.464176,5.7891713 13.7092415,7 Z M13.9298021,8.5 C13.9758858,8.98587614 14,9.4873059 14,10 C14,10.6905991 13.956247,11.3607602 13.8739825,12 L16.3215008,12 C16.5209806,11.3689256 16.6285714,10.697025 16.6285714,10 C16.6285714,9.4841153 16.569635,8.98199332 16.4581281,8.5 L13.9298021,8.5 Z M13.5978835,13.5 C13.3531915,14.5042677 13.0064768,15.3908207 12.5847142,16.1057095 C13.8484806,15.5700421 14.9116569,14.6534694 15.6302347,13.5 L13.5978835,13.5 Z M7.87449573,13.5 C8.31545266,15.3608884 9.10249541,16.6 10,16.6 C10.8975046,16.6 11.6845473,15.3608884 12.1255043,13.5 L7.87449573,13.5 Z M7.61266,12 L12.38734,12 C12.4605549,11.3840508 12.5,10.7290943 12.5,10.05 C12.5,9.51599804 12.4756096,8.99692139 12.4295883,8.5 L7.57041167,8.5 C7.5243904,8.99692139 7.5,9.51599804 7.5,10.05 C7.5,10.7290943 7.53944513,11.3840508 7.61266,12 Z M7.7870057,7 L12.2129943,7 C11.7942682,4.91878844 10.9603738,3.5 10,3.5 C9.03962624,3.5 8.20573179,4.91878844 7.7870057,7 Z M10,18 C5.58217143,18 2,14.4178286 2,10 C2,5.58125714 5.58217143,2 10,2 C14.4187429,2 18,5.58125714 18,10 C18,14.4178286 14.4187429,18 10,18 Z"/>
 </symbol>
+<symbol version="1.1" id="icon-discussion" viewBox="0 0 20   20 " fill="currentColor">
+    <path d="M3.36312881,15.7593532 C3.32888874,15.7771726 3.29959994,15.7925621 3.27370934,15.8064174 C3.73031444,16.1917386 4.92393678,16.4549204 7.10274479,16.4476544 L7.21881505,16.4476539 C8.55574002,16.4476543 9.6998097,16.021859 10.6510241,15.170268 L12.188241,15.2712054 C11.5513943,15.8887667 11.2142468,16.2130071 11.1767984,16.2439265 C10.1491488,17.09241 8.76567843,17.5637907 7.21881505,17.5637907 L7.10806092,17.5644215 L6.97721254,17.5644231 C4.30241208,17.5644231 2.62246666,17.1951018 2.10341288,16.0930165 C1.82161029,15.4951149 2.13151102,15.1455492 2.84114675,14.7722012 C3.31318797,14.5227311 3.32172914,14.5103228 3.24657386,14.3473099 C3.20302404,14.2436958 3.16526615,14.1604157 3.07972552,13.9763174 C2.74839464,13.2684751 2.62592155,12.9023078 2.62592155,12.4061039 C2.62592155,11.562445 2.83045155,10.7486059 3.21214892,10.0211892 C3.42204019,9.66099218 3.78721597,9.06536542 4.270822,8.82818513 C4.270822,8.80275057 4.53792399,10.0211892 4.53792399,10 C4.45304843,10.1183326 4.36401443,10.2496015 4.270822,10.3938065 C3.78721597,11.0991197 3.7445882,11.6631394 3.7445882,12.4061039 C3.7445882,12.6985231 3.82924269,12.9394008 4.09330148,13.5047226 C4.19543836,13.7251753 4.22995648,13.801243 4.270822,13.8994264 C4.58782821,14.5810467 4.36137367,15.1036933 3.78721597,15.5080098 C3.65916127,15.5981847 3.55361796,15.6588423 3.36312881,15.7593532 Z M16.5696621,12.3226926 C16.5350205,12.3039671 16.4951623,12.2829692 16.4468239,12.2578135 C16.2265134,12.1415693 16.1048536,12.0716493 15.9574055,11.9678178 C15.2986909,11.5039571 15.0399564,10.9068098 15.4049351,10.1218159 C15.4504792,10.0121781 15.4903754,9.92425877 15.608285,9.66976084 C15.914896,9.01333804 16.0132801,8.73339397 16.0132801,8.39198996 C16.0132801,5.80517045 13.90418,3.70028722 11.3120655,3.70028722 C8.71995111,3.70028722 6.61085101,5.80517045 6.61085101,8.39198996 C6.61085101,11.1096858 8.86296092,13.082961 11.9786225,13.082961 L12.112848,13.0829616 C14.6633683,13.0914671 16.0501708,12.7797435 16.5696621,12.3226926 Z M16.5612822,10.6280948 C16.4685253,10.8294269 16.4833349,10.8509584 17.0358533,11.1429611 C17.8499187,11.5712649 18.2032866,11.969896 17.8824254,12.6506683 C17.2857779,13.9175051 15.3458564,14.3439799 12.2581228,14.3439799 L12.1073975,14.3439799 L11.9780624,14.3432467 C8.14202747,14.3432482 5.34836876,11.8401459 5.34836876,8.39198996 C5.34836876,5.10955211 8.0234498,2.44 11.3120655,2.44 C14.6008168,2.44 17.276494,5.10968724 17.276494,8.39198996 C17.276494,8.96303774 17.1353362,9.38506819 16.7528285,10.2022436 C16.6539056,10.4151439 16.6101724,10.5116034 16.5612822,10.6280948 Z" id="path-1"></path>
+</symbol>
 <symbol id="icon-download" viewBox="0 0 20 20" fill="currentColor">
   <path d="M13.0661854,13.8691048 L13.0661854,13.8691048 C13.3204823,14.1197896 13.3234104,14.5291581 13.0727256,14.783455 C13.0705612,14.7856506 13.0683811,14.7878308 13.0661854,14.7899952 L10.6543517,17.1675709 C10.2650167,17.5513757 9.63962467,17.5513757 9.25028971,17.1675709 L6.83845596,14.7899952 C6.58415908,14.5393104 6.58123091,14.1299419 6.83191572,13.875645 C6.83408017,13.8734494 6.83626031,13.8712692 6.83845596,13.8691048 L6.83845596,13.8691048 C7.09749077,13.6137493 7.51358056,13.6137493 7.77261537,13.8691048 L9.25137581,15.3268606 L9.25137581,10.0339893 C9.25137581,9.66917735 9.54711432,9.37343883 9.91192627,9.37343883 L9.91192627,9.37343883 C10.2767382,9.37343883 10.5724767,9.66917735 10.5724767,10.0339893 L10.5724767,15.4065019 L12.132026,13.8691048 C12.3910608,13.6137493 12.8071506,13.6137493 13.0661854,13.8691048 Z M14.9987456,5.44238699 C16.7017593,5.72193582 18,7.18117469 18,8.93932691 C18,10.897313 16.3898681,12.4845743 14.4036697,12.4845743 L12.8484335,12.4845743 C12.4888034,12.4845743 12.1972656,12.1930365 12.1972656,11.8334064 L12.1972656,11.8334064 C12.1972656,11.4737763 12.4888034,11.1822385 12.8484335,11.1822385 L14.4036697,11.1822385 C15.6602442,11.1822385 16.6788991,10.1780528 16.6788991,8.93932691 C16.6788991,7.70060103 15.6602442,6.69641529 14.4036697,6.69641529 L13.7431193,6.69641529 L13.7431193,6.0452474 C13.7431193,5.20611051 13.0530627,4.52585566 12.2018349,4.52585566 C11.8271022,4.52585566 11.4747517,4.6573116 11.1968202,4.89324889 L10.6727099,5.33816841 L10.2459585,4.80158937 C9.74752164,4.17487601 8.98815837,3.80233578 8.16513761,3.80233578 C6.70588984,3.80233578 5.52293578,4.96848696 5.52293578,6.40700734 C5.52293578,6.70702583 5.574134,6.99923245 5.67311153,7.27528801 L5.98438594,8.14345504 L4.86238532,8.14345504 C4.01115745,8.14345504 3.32110092,8.8237099 3.32110092,9.66284679 C3.32110092,10.5019837 4.01115745,11.1822385 4.86238532,11.1822385 L6.77545553,11.1822385 C7.13508563,11.1822385 7.42662342,11.4737763 7.42662342,11.8334064 L7.42662342,11.8334064 C7.42662342,12.1930365 7.13508563,12.4845743 6.77545553,12.4845743 L4.86238532,12.4845743 C3.28153356,12.4845743 2,11.2212439 2,9.66284679 C2,8.31713817 2.95559925,7.19145146 4.23434884,6.90925214 C4.21276266,6.74369761 4.20183486,6.57602338 4.20183486,6.40700734 C4.20183486,4.24922677 5.97626595,2.5 8.16513761,2.5 C9.18633879,2.5 10.1442246,2.88377985 10.8671476,3.5484842 C11.2727861,3.3374289 11.7287839,3.22351988 12.2018349,3.22351988 C13.5727949,3.22351988 14.718642,4.17365257 14.9987456,5.44238699 Z"/>
 </symbol>
diff --git a/server/importPackages.js b/server/importPackages.js
index 314d0ff406d6..8f29cef9eb0b 100644
--- a/server/importPackages.js
+++ b/server/importPackages.js
@@ -102,7 +102,7 @@ import '../app/blockstack';
 import '../app/version-check';
 import '../app/search';
 import '../app/chatpal-search';
-import '../app/threading';
+import '../app/discussion';
 import '../app/bigbluebutton';
 import '../app/mail-messages';
 import '../app/utils';
diff --git a/server/startup/migrations/index.js b/server/startup/migrations/index.js
index ea224eaf4e93..fac1f2fd867f 100644
--- a/server/startup/migrations/index.js
+++ b/server/startup/migrations/index.js
@@ -136,4 +136,5 @@ import './v135';
 import './v136';
 import './v137';
 import './v138';
+import './v139';
 import './xrun';
diff --git a/server/startup/migrations/v139.js b/server/startup/migrations/v139.js
new file mode 100644
index 000000000000..58cd2cfeafb9
--- /dev/null
+++ b/server/startup/migrations/v139.js
@@ -0,0 +1,118 @@
+import { Migrations } from '../../../app/migrations/server';
+import { Messages, Permissions, Rooms, Settings } from '../../../app/models/server';
+
+const getField = (msg, fieldType, fieldName) => {
+	if (!msg.attachments) {
+		return;
+	}
+	const [attachments] = msg.attachments;
+	if (!attachments) {
+		return;
+	}
+	if (!attachments.fields) {
+		return;
+	}
+	const field = attachments.fields.find(({ type }) => fieldType === type);
+	return field && field[fieldName];
+};
+
+Migrations.add({
+	version: 139,
+	up() {
+		Messages.find({ trid: { $exists: true } }).forEach((msg) => {
+			const dlm = getField(msg, 'lastMessageAge', 'lm');
+			const dcount = getField(msg, 'messageCounter', 'count');
+			if (dlm === undefined || dcount === undefined) {
+				return;
+			}
+
+			const update = {
+				$set: {
+					t: 'discussion-created',
+					dlm,
+					dcount,
+				},
+				$unset: {
+					attachments: 1,
+				},
+			};
+
+			if (msg.t) {
+				const room = Rooms.findOne({ _id: msg.trid }, { fields: { fname: 1 } });
+				if (room) {
+					update.$set.msg = room.fname;
+				}
+			}
+
+			Messages.update({ _id: msg._id }, update);
+		});
+
+		Messages.update({ t: 'thread-created' }, {
+			$set: {
+				t: 'discussion-created',
+			},
+		}, { multi: true });
+
+		Messages.update({ trid: { $exists: true } }, {
+			$rename: {
+				trid: 'drid',
+			},
+		}, { multi: true });
+
+		const settingEnabled = Settings.findOne({ _id: 'Thread_from_context_menu' });
+		const settingRetention = Settings.findOne({ _id: 'RetentionPolicy_DoNotExcludeThreads' });
+		const settingSidebar = Settings.findOne({ _id: 'Accounts_Default_User_Preferences_sidebarShowThreads' });
+
+		if (settingEnabled) {
+			Settings.upsert({
+				_id: 'Discussion_enabled',
+			}, {
+				$set: {
+					value: settingEnabled.value !== 'none',
+				},
+			});
+		}
+
+		if (settingRetention) {
+			Settings.upsert({
+				_id: 'RetentionPolicy_DoNotExcludeDiscussion',
+			}, {
+				$set: {
+					value: settingRetention.value,
+				},
+			});
+		}
+
+		if (settingSidebar) {
+			Settings.upsert({
+				_id: 'Accounts_Default_User_Preferences_sidebarShowDiscussion',
+			}, {
+				$set: {
+					value: settingSidebar.value,
+				},
+			});
+		}
+
+		Settings.remove({
+			_id: {
+				$in: ['Thread_from_context_menu', 'Accounts_Default_User_Preferences_sidebarShowThreads', 'RetentionPolicy_DoNotExcludeThreads'],
+			},
+		});
+
+		Permissions.find({
+			_id: { $in: ['start-thread', 'start-thread-other-user'] },
+		}).forEach((perm) => {
+			Permissions.remove({ _id: perm._id });
+
+			const newId = perm._id === 'start-thread' ? 'start-discussion' : 'start-discussion-other-user';
+
+			delete perm._id;
+
+			Permissions.upsert({
+				_id: newId,
+			}, {
+				$set: perm,
+			});
+		});
+	},
+});
diff --git a/tests/end-to-end/api/00-miscellaneous.js b/tests/end-to-end/api/00-miscellaneous.js
index 314a53bd9604..1dba5d0a756c 100644
--- a/tests/end-to-end/api/00-miscellaneous.js
+++ b/tests/end-to-end/api/00-miscellaneous.js
@@ -109,7 +109,7 @@ describe('miscellaneous', function() {
 				const allUserPreferencesKeys = ['enableAutoAway', 'idleTimeLimit', 'desktopNotificationDuration', 'audioNotifications',
 					'desktopNotifications', 'mobileNotifications', 'unreadAlert', 'useEmojis', 'convertAsciiEmoji', 'autoImageLoad',
 					'saveMobileBandwidth', 'collapseMediaByDefault', 'hideUsernames', 'hideRoles', 'hideFlexTab', 'hideAvatars',
-					'sidebarViewMode', 'sidebarHideAvatar', 'sidebarShowUnread', 'sidebarShowThreads', 'sidebarShowFavorites', 'sidebarGroupByType',
+					'sidebarViewMode', 'sidebarHideAvatar', 'sidebarShowUnread', 'sidebarShowDiscussion', 'sidebarShowFavorites', 'sidebarGroupByType',
 					'sendOnEnter', 'messageViewMode', 'emailNotificationMode', 'roomCounterSidebar', 'newRoomNotification', 'newMessageNotification',
 					'muteFocusedConversations', 'notificationsSoundVolume'];
 				expect(res.body).to.have.property('success', true);
diff --git a/tests/end-to-end/ui/15-threading.js b/tests/end-to-end/ui/15-discussion.js
similarity index 78%
rename from tests/end-to-end/ui/15-threading.js
rename to tests/end-to-end/ui/15-discussion.js
index 3a4a1748495c..5d94a9dc6342 100644
--- a/tests/end-to-end/ui/15-threading.js
+++ b/tests/end-to-end/ui/15-discussion.js
@@ -5,14 +5,14 @@ quotes, prefer-template, no-undef, no-unused-vars*/
 import mainContent from '../../pageobjects/main-content.page';
 import sideNav from '../../pageobjects/side-nav.page';
 import { sendEscape } from '../../pageobjects/keyboard';
-import { threading } from '../../pageobjects/threading.page';
+import { discussion } from '../../pageobjects/discussion.page';
 import { username, email, password } from '../../data/user.js';
 import { checkIfUserIsValid } from '../../data/checks';
 const parentChannelName = 'unit-testing';
-const threadName = 'Lorem ipsum dolor sit amet';
+const discussionName = 'Lorem ipsum dolor sit amet';
 const message = 'Lorem ipsum dolor sit amet, consectetur adipiscing elit.';
 
-describe('[Threading]', function () {
+describe('[Discussion]', function () {
 
 	before(function () {
 		checkIfUserIsValid(username, email, password);
@@ -30,8 +30,8 @@ describe('[Threading]', function () {
 	});
 
 	describe('via creation screen', function() {
-		it('Create a thread', function () {
-			threading.createThread(parentChannelName, threadName, message);
+		it('Create a discussion', function () {
+			discussion.createDiscussion(parentChannelName, discussionName, message);
 		});
 	});
 
@@ -41,9 +41,9 @@ describe('[Threading]', function () {
 			mainContent.sendMessage(message);
 		});
 
-		it('it should show a dialog for starting a thread', () => {
+		it('it should show a dialog for starting a discussion', () => {
 			mainContent.openMessageActionMenu();
-			threading.startThreadContextItem.click();
+			discussion.startDiscussionContextItem.click();
 		});
 
 		it('it should have create a new room', function () {
@@ -57,7 +57,7 @@ describe('[Threading]', function () {
 
 	after(function () {
 		it('remove parent channel', () => {
-			threading.deleteRoom(parentChannelName);
+			discussion.deleteRoom(parentChannelName);
 		});
 	});
 
diff --git a/tests/pageobjects/threading.page.js b/tests/pageobjects/discussion.page.js
similarity index 50%
rename from tests/pageobjects/threading.page.js
rename to tests/pageobjects/discussion.page.js
index 32f3c127db40..8ec6fa695f42 100644
--- a/tests/pageobjects/threading.page.js
+++ b/tests/pageobjects/discussion.page.js
@@ -4,10 +4,10 @@ import sideNav from './side-nav.page';
 import flexTab from './flex-tab.page';
 import global from './global';
 
-class Threading extends Page {
+class Discussion extends Page {
 	// Sidebar - this should actually be part of the sidebar-file - leaving it here for mergability
-	get newThreadButton() {
-		return browser.element('.menu-nav .js-create-thread');
+	get newDiscussionButton() {
+		return browser.element('.menu-nav .js-create-discussion');
 	}
 
 	// Global - this should actually be part of the global-file - leaving it here for mergability
@@ -22,39 +22,39 @@ class Threading extends Page {
 	}
 
 	// Action Menu
-	get startThreadContextItem() { return browser.element('[data-id="start-thread"][data-type="message-action"]'); }
+	get startDiscussionContextItem() { return browser.element('[data-id="start-discussion"][data-type="message-action"]'); }
 
 	// Modal
-	get createThreadModal() {
-		return browser.element('#create-thread');
+	get createDiscussionModal() {
+		return browser.element('#create-discussion');
 	}
 
-	get threadName() {
-		return browser.element('#create-thread #thread_name');
+	get discussionName() {
+		return browser.element('#create-discussion #discussion_name');
 	}
 
-	get threadMessage() {
-		return browser.element('#create-thread #thread_message');
+	get discussionMessage() {
+		return browser.element('#create-discussion #discussion_message');
 	}
 
 	get parentChannelName() {
-		return browser.element('#create-thread #parentChannel');
+		return browser.element('#create-discussion #parentChannel');
 	}
 
-	get saveThreadButton() {
-		return browser.element('.js-save-thread');
+	get saveDiscussionButton() {
+		return browser.element('.js-save-discussion');
 	}
 
 	// Sequences
 
-	createThread(parentChannelName, name, message) {
+	createDiscussion(parentChannelName, name, message) {
 		sideNav.newChannelBtnToolbar.waitForVisible(1000);
 		sideNav.newChannelBtnToolbar.click();
-		sideNav.newThreadBtn.waitForVisible(1000);
-		sideNav.newThreadBtn.click();
-		this.createThreadModal.waitForVisible(1000);
-		this.threadName.setValue(name);
-		this.threadMessage.setValue(message);
+		sideNav.newDiscussionBtn.waitForVisible(1000);
+		sideNav.newDiscussionBtn.click();
+		this.createDiscussionModal.waitForVisible(1000);
+		this.discussionName.setValue(name);
+		this.discussionMessage.setValue(message);
 		this.parentChannelName.waitForVisible(1000);
 		this.parentChannelName.setValue(parentChannelName);
 
@@ -65,13 +65,13 @@ class Threading extends Page {
 		list.element('.rc-popup-list__item').click();
 
 		browser.waitUntil(function() {
-			return browser.isEnabled('.js-save-thread');
+			return browser.isEnabled('.js-save-discussion');
 		}, 5000);
 
-		this.saveThreadButton.click();
+		this.saveDiscussionButton.click();
 	}
 }
 
-const threading = new Threading();
+const discussion = new Discussion();
 
-export { threading };
+export { discussion };
diff --git a/tests/pageobjects/side-nav.page.js b/tests/pageobjects/side-nav.page.js
index f17511a920d1..38c7b1c9a14a 100644
--- a/tests/pageobjects/side-nav.page.js
+++ b/tests/pageobjects/side-nav.page.js
@@ -32,7 +32,7 @@ class SideNav extends Page {
 	get newChannelBtnToolbar() { return browser.element('.sidebar__toolbar-button-icon--edit-rounded'); }
 
 	get newChannelBtn() { return browser.element('.rc-popover__icon-element--hashtag'); }
-	get newThreadBtn() { return browser.element('.rc-popover__icon-element--thread'); }
+	get newDiscussionBtn() { return browser.element('.rc-popover__icon-element--discussion'); }
 
 	get newChannelIcon() { return browser.element('.toolbar__icon.toolbar__search-create-channel'); }
 

From f21a969bf2f78be0212eb749087792b407909417 Mon Sep 17 00:00:00 2001
From: Marcelo Schmidt <marcelo.schmidt@rocket.chat>
Date: Fri, 22 Mar 2019 18:31:46 -0300
Subject: [PATCH 04/24] [NEW] Allow sending long messages as attachments
 (#13819)

<!-- INSTRUCTION: Inform the issue number that this PR closes, or remove the line below -->
Closes #7267

<!-- INSTRUCTION: Tell us more about your PR with screen shots if you can -->

![image](https://user-images.githubusercontent.com/1986378/54716519-a92a1200-4b34-11e9-88b4-fe2962a0fc6f.png)
---
 app/lib/server/startup/settings.js         |  4 ++++
 app/ui-message/client/messageBox.js        |  2 +-
 app/ui/client/lib/chatMessages.js          | 27 +++++++++++++++++++++-
 packages/rocketchat-i18n/i18n/en.i18n.json |  2 ++
 4 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/app/lib/server/startup/settings.js b/app/lib/server/startup/settings.js
index 0ce3523992cb..630daf1845ba 100644
--- a/app/lib/server/startup/settings.js
+++ b/app/lib/server/startup/settings.js
@@ -980,6 +980,10 @@ settings.addGroup('Message', function() {
 		type: 'int',
 		public: true,
 	});
+	this.add('Message_AllowConvertLongMessagesToAttachment', true, {
+		type: 'boolean',
+		public: true,
+	});
 	this.add('Message_ShowFormattingTips', true, {
 		type: 'boolean',
 		public: true,
diff --git a/app/ui-message/client/messageBox.js b/app/ui-message/client/messageBox.js
index fd341b02d080..805a6d8add19 100644
--- a/app/ui-message/client/messageBox.js
+++ b/app/ui-message/client/messageBox.js
@@ -235,7 +235,7 @@ Template.messageBox.helpers({
 		return getUserPreference(Meteor.userId(), 'useEmojis');
 	},
 	maxMessageLength() {
-		return settings.get('Message_MaxAllowedSize');
+		return settings.get('Message_AllowConvertLongMessagesToAttachment') ? null : settings.get('Message_MaxAllowedSize');
 	},
 	isSendIconDisabled() {
 		return !Template.instance().sendIconDisabled.get();
diff --git a/app/ui/client/lib/chatMessages.js b/app/ui/client/lib/chatMessages.js
index b8a438dd495d..0690d225681a 100644
--- a/app/ui/client/lib/chatMessages.js
+++ b/app/ui/client/lib/chatMessages.js
@@ -19,6 +19,7 @@ import _ from 'underscore';
 import s from 'underscore.string';
 import moment from 'moment';
 import toastr from 'toastr';
+import { fileUpload } from './fileUpload';
 
 let sendOnEnter = '';
 
@@ -269,7 +270,31 @@ export const ChatMessages = class ChatMessages {
 
 			// checks for the final msgObject.msg size before actually sending the message
 			if (this.isMessageTooLong(msgObject.msg)) {
-				return toastr.error(t('Message_too_long'));
+				if (!settings.get('FileUpload_Enabled') || !settings.get('Message_AllowConvertLongMessagesToAttachment') || this.editing.id) {
+					return toastr.error(t('Message_too_long'));
+				}
+				return modal.open({
+					text: t('Message_too_long_as_an_attachment_question'),
+					title: '',
+					type: 'warning',
+					showCancelButton: true,
+					confirmButtonText: t('Yes'),
+					cancelButtonText: t('No'),
+					closeOnConfirm: true,
+				}, () => {
+					const contentType = 'text/plain';
+					const messageBlob = new Blob([msgObject.msg], { type: contentType });
+					const fileName = `${ Meteor.user().username } - ${ new Date() }.txt`;
+					const file = new File([messageBlob], fileName, { type: contentType, lastModified: Date.now() });
+					fileUpload([{ file, name: fileName }]);
+					this.clearCurrentDraft();
+					input.value = '';
+					$(input).trigger('change').trigger('input');
+					this.hasValue.set(false);
+					this.stopTyping(rid);
+					this.saveTextMessageBox(rid, '');
+					return done();
+				}, done);
 			}
 
 			this.clearCurrentDraft();
diff --git a/packages/rocketchat-i18n/i18n/en.i18n.json b/packages/rocketchat-i18n/i18n/en.i18n.json
index 66d08f10110f..351e1a8669bb 100644
--- a/packages/rocketchat-i18n/i18n/en.i18n.json
+++ b/packages/rocketchat-i18n/i18n/en.i18n.json
@@ -1932,6 +1932,7 @@
   "Mentions_only": "Mentions only",
   "Merge_Channels": "Merge Channels",
   "Message_AllowBadWordsFilter": "Allow Message bad words filtering",
+  "Message_AllowConvertLongMessagesToAttachment": "Allow converting long messages to attachment",
   "Message_AllowDeleting": "Allow Message Deleting",
   "Message_AllowDeleting_BlockDeleteInMinutes": "Block Message Deleting After (n) Minutes",
   "Message_AllowDeleting_BlockDeleteInMinutes_Description": "Enter 0 to disable blocking.",
@@ -1997,6 +1998,7 @@
   "Message_TimeFormat": "Time Format",
   "Message_TimeFormat_Description": "See also: <a href=\"http://momentjs.com/docs/#/displaying/format/\" target=\"momemt\">Moment.js</a>",
   "Message_too_long": "Message too long",
+  "Message_too_long_as_an_attachment_question": "Message too long. Send it as an attachment instead?",
   "Message_UserId": "User Id",
   "Message_VideoRecorderEnabled": "Video Recorder Enabled",
   "Message_VideoRecorderEnabledDescription": "Requires 'video/webm' files to be an accepted media type within 'File Upload' settings.",

From f776cf68d68220e812d2f7c44c1dc49654d98e0b Mon Sep 17 00:00:00 2001
From: Aditya Bhardwaj <aditya.1998bhardwaj@gmail.com>
Date: Sat, 23 Mar 2019 03:06:11 +0530
Subject: [PATCH 05/24] [IMPROVE] Join channels by sending a message or join
 button (#13752)

---
 .../views/creationDialog/CreateDiscussion.js  |  1 +
 .../hooks/propagateDiscussionMetadata.js      |  1 +
 app/discussion/server/index.js                |  1 -
 app/lib/lib/roomTypes/private.js              |  5 ---
 app/ui-message/client/messageBox.html         | 30 +++++++++-------
 app/ui-message/client/messageBox.js           | 21 +++++++++--
 .../client/messageBoxNotSubscribed.html       |  9 +++--
 .../client/messageBoxNotSubscribed.js         | 36 +++++++++----------
 app/ui/client/lib/chatMessages.js             |  9 +++--
 server/startup/migrations/v139.js             |  1 +
 10 files changed, 68 insertions(+), 46 deletions(-)

diff --git a/app/discussion/client/views/creationDialog/CreateDiscussion.js b/app/discussion/client/views/creationDialog/CreateDiscussion.js
index 7b61774ac694..48c18676f0bf 100755
--- a/app/discussion/client/views/creationDialog/CreateDiscussion.js
+++ b/app/discussion/client/views/creationDialog/CreateDiscussion.js
@@ -1,4 +1,5 @@
 import { Meteor } from 'meteor/meteor';
+
 import { Template } from 'meteor/templating';
 import { ReactiveVar } from 'meteor/reactive-var';
 import { AutoComplete } from 'meteor/mizzao:autocomplete';
diff --git a/app/discussion/server/hooks/propagateDiscussionMetadata.js b/app/discussion/server/hooks/propagateDiscussionMetadata.js
index 68e0a3d96b06..9724de1cd1de 100644
--- a/app/discussion/server/hooks/propagateDiscussionMetadata.js
+++ b/app/discussion/server/hooks/propagateDiscussionMetadata.js
@@ -1,6 +1,7 @@
 import { callbacks } from '../../../callbacks/server';
 import { Messages, Rooms } from '../../../models/server';
 import { deleteRoom } from '../../../lib/server';
+
 /**
  * We need to propagate the writing of new message in a discussion to the linking
  * system message
diff --git a/app/discussion/server/index.js b/app/discussion/server/index.js
index f16ff5ab6f01..5e8fadefa943 100644
--- a/app/discussion/server/index.js
+++ b/app/discussion/server/index.js
@@ -2,7 +2,6 @@ import './config';
 import './authorization';
 import './permissions';
 
-import './hooks/joinDiscussionOnMessage';
 import './hooks/propagateDiscussionMetadata';
 import './publications/discussionParentAutocomplete';
 import './publications/discussionsOfRoom';
diff --git a/app/lib/lib/roomTypes/private.js b/app/lib/lib/roomTypes/private.js
index 19ce495b76ad..98e775423f17 100644
--- a/app/lib/lib/roomTypes/private.js
+++ b/app/lib/lib/roomTypes/private.js
@@ -70,11 +70,6 @@ export class PrivateRoomType extends RoomTypeConfig {
 	}
 
 	canSendMessage(roomId) {
-		const room = ChatRoom.findOne({ _id: roomId, t: 'p' }, { fields: { prid: 1 } });
-		if (room.prid) {
-			return true;
-		}
-
 		// TODO: remove duplicated code
 		return ChatSubscription.find({
 			rid: roomId,
diff --git a/app/ui-message/client/messageBox.html b/app/ui-message/client/messageBox.html
index 84cdef104f38..761c72ca5137 100644
--- a/app/ui-message/client/messageBox.html
+++ b/app/ui-message/client/messageBox.html
@@ -1,6 +1,6 @@
 <template name="messageBox">
 	<div class="rc-message-box rc-new {{#if isEmbedded}}rc-message-box--embedded{{/if}}">
-		{{#if subscribed}}
+		{{#unless isAnonymousOrJoinCode}}
 			{{> messageBoxTyping rid=_id}}
 
 			{{#if canSend}}
@@ -25,16 +25,22 @@
 							{{> icon block="rc-input__icon-svg" icon="send"}}
 						</span>
 					{{else}}
-						{{#if isAudioMessageAllowed}}
-							{{> messageBoxAudioMessage rid=_id}}
-						{{/if}}
-						<span class="rc-message-box__action-menu" data-desktop>
-							{{#if actions}}
-								<span class="rc-message-box__icon">
-									{{> icon block="rc-input__icon-svg" icon="plus"}}
-								</span>
+						{{#if subscribed}}
+							{{#if isAudioMessageAllowed}}
+								{{> messageBoxAudioMessage rid=_id}}
 							{{/if}}
-						</span>
+							<span class="rc-message-box__action-menu" data-desktop>
+								{{#if actions}}
+									<span class="rc-message-box__icon">
+										{{> icon block="rc-input__icon-svg" icon="plus"}}
+									</span>
+								{{/if}}
+							</span>
+						{{else}}
+							<span class="rc-message-box__icon">
+								<strong><a href="#" class="js-join"> {{_"join"}}</a></strong>
+							</span>
+						{{/if}}
 					{{/unless}}
 					<span class="rc-message-box__action-label js-message-actions" data-small>
 						{{#each actions}}
@@ -75,7 +81,7 @@
 				</div>
 			{{/if}}
 		{{else}}
-			{{> messageBoxNotSubscribed rid=_id}}
-		{{/if}}
+			{{> messageBoxNotSubscribed _id=_id}}
+		{{/unless}}
 	</div>
 </template>
diff --git a/app/ui-message/client/messageBox.js b/app/ui-message/client/messageBox.js
index 805a6d8add19..ebb590cdedd9 100644
--- a/app/ui-message/client/messageBox.js
+++ b/app/ui-message/client/messageBox.js
@@ -15,9 +15,10 @@ import {
 	fileUpload,
 	KonchatNotification,
 } from '../../ui';
-import { Layout, messageBox, popover, RoomManager } from '../../ui-utils';
+import { Layout, messageBox, popover, RoomManager, call } from '../../ui-utils';
 import { t, roomTypes, getUserPreference } from '../../utils';
 import moment from 'moment';
+
 import './messageBoxReplyPreview';
 import './messageBoxTyping';
 import './messageBoxAudioMessage';
@@ -253,6 +254,12 @@ Template.messageBox.helpers({
 		return Object.values(actionGroups)
 			.reduce((actions, actionGroup) => [...actions, ...actionGroup], []);
 	},
+	isAnonymousOrJoinCode() {
+		const room = Session.get(`roomData${ this._id }`);
+		return !Meteor.userId() || (!ChatSubscription.findOne({
+			rid: this._id,
+		}) && room && room.joinCodeRequired);
+	},
 	showFormattingTips() {
 		return settings.get('Message_ShowFormattingTips');
 	},
@@ -278,6 +285,16 @@ Template.messageBox.helpers({
 });
 
 Template.messageBox.events({
+	'click .js-join'(event) {
+		event.stopPropagation();
+		event.preventDefault();
+
+		const joinCodeInput = Template.instance().find('[name=joinCode]');
+		const joinCode = joinCodeInput && joinCodeInput.value;
+
+		call('joinRoom', this._id, joinCode);
+	},
+
 	'click .emoji-picker-icon'(event) {
 		event.stopPropagation();
 		event.preventDefault();
@@ -373,7 +390,7 @@ Template.messageBox.events({
 			chatMessages[this._id].valueChanged(this._id, event, Template.instance());
 		}
 	},
-	'click .js-send'(event, instance) {
+	async 'click .js-send'(event, instance) {
 		const { input } = chatMessages[RoomManager.openedRoom];
 		chatMessages[this._id].send(this._id, input, () => {
 			input.updateAutogrow();
diff --git a/app/ui-message/client/messageBoxNotSubscribed.html b/app/ui-message/client/messageBoxNotSubscribed.html
index 05da494859ba..feccd6e089b2 100644
--- a/app/ui-message/client/messageBoxNotSubscribed.html
+++ b/app/ui-message/client/messageBoxNotSubscribed.html
@@ -1,15 +1,14 @@
-<template name="messageBoxNotSubscribed" args="rid">
+<template name="messageBoxNotSubscribed" args="_id">
 	{{#if customTemplate}}
 		{{> Template.dynamic customTemplate }}
 	{{else}}
 		{{#if canJoinRoom}}
 			<div class="rc-message-box__join">
 				{{{_ "you_are_in_preview_mode_of" room_name=roomName}}}
-				{{#if isJoinCodeRequired}}
-					<input type="password" name="joinCode" placeholder="{{_ 'Password'}}" class="rc-input__element rc-message-box__join-code">
-				{{/if}}
 
-				<button class="rc-button rc-button--primary rc-button--small rc-message-box__join-button js-join">{{_ "join"}}</button>
+				<input type="password" name="joinCode" placeholder="{{_ 'Password'}}" class="rc-input__element rc-message-box__join-code">
+
+				<button class="rc-button rc-button--primary rc-button--small rc-message-box__join-button js-join-code">{{_ "join"}}</button>
 			</div>
 		{{/if}}
 
diff --git a/app/ui-message/client/messageBoxNotSubscribed.js b/app/ui-message/client/messageBoxNotSubscribed.js
index e9cf456d4dba..f3fe690e670d 100644
--- a/app/ui-message/client/messageBoxNotSubscribed.js
+++ b/app/ui-message/client/messageBoxNotSubscribed.js
@@ -2,26 +2,26 @@ import { Meteor } from 'meteor/meteor';
 import { Session } from 'meteor/session';
 import { Template } from 'meteor/templating';
 import { settings } from '../../settings';
-import { RoomHistoryManager, RoomManager, call } from '../../ui-utils';
-import { t, roomTypes } from '../../utils';
+import { call } from '../../ui-utils';
+import { roomTypes } from '../../utils';
+import { RoomManager, RoomHistoryManager } from '../../ui-utils';
 import { hasAllPermission } from '../../authorization';
-import toastr from 'toastr';
 import './messageBoxNotSubscribed.html';
 
 
 Template.messageBoxNotSubscribed.helpers({
 	customTemplate() {
-		return roomTypes.getNotSubscribedTpl(this.rid);
+		return roomTypes.getNotSubscribedTpl(this._id);
 	},
 	canJoinRoom() {
-		return Meteor.userId() && roomTypes.verifyShowJoinLink(this.rid);
+		return Meteor.userId() && roomTypes.verifyShowJoinLink(this._id);
 	},
 	roomName() {
-		const room = Session.get(`roomData${ this.rid }`);
+		const room = Session.get(`roomData${ this._id }`);
 		return roomTypes.getRoomName(room.t, room);
 	},
 	isJoinCodeRequired() {
-		const room = Session.get(`roomData${ this.rid }`);
+		const room = Session.get(`roomData${ this._id }`);
 		return room && room.joinCodeRequired;
 	},
 	isAnonymousReadAllowed() {
@@ -36,26 +36,24 @@ Template.messageBoxNotSubscribed.helpers({
 });
 
 Template.messageBoxNotSubscribed.events({
-	async 'click .js-join'(event) {
+	async 'click .js-join-code'(event) {
 		event.stopPropagation();
 		event.preventDefault();
 
 		const joinCodeInput = Template.instance().find('[name=joinCode]');
 		const joinCode = joinCodeInput && joinCodeInput.value;
 
-		try {
-			await call('joinRoom', this.rid, joinCode);
-			if (hasAllPermission('preview-c-room') === false && RoomHistoryManager.getRoom(this.rid).loaded === 0) {
-				RoomManager.getOpenedRoomByRid(this.rid).streamActive = false;
-				RoomManager.getOpenedRoomByRid(this.rid).ready = false;
-				RoomHistoryManager.getRoom(this.rid).loaded = null;
-				RoomManager.computation.invalidate();
-			}
-		} catch (error) {
-			toastr.error(t(error.reason));
+		await call('joinRoom', this._id, joinCode);
+
+		if (hasAllPermission('preview-c-room') === false && RoomHistoryManager.getRoom(this._id).loaded === 0) {
+			RoomManager.getOpenedRoomByRid(this._id).streamActive = false;
+			RoomManager.getOpenedRoomByRid(this._id).ready = false;
+			RoomHistoryManager.getRoom(this._id).loaded = null;
+			RoomManager.computation.invalidate();
 		}
-	},
 
+
+	},
 	'click .js-register'(event) {
 		event.stopPropagation();
 		event.preventDefault();
diff --git a/app/ui/client/lib/chatMessages.js b/app/ui/client/lib/chatMessages.js
index 0690d225681a..d55d377abc93 100644
--- a/app/ui/client/lib/chatMessages.js
+++ b/app/ui/client/lib/chatMessages.js
@@ -6,12 +6,12 @@ import { FlowRouter } from 'meteor/kadira:flow-router';
 import { Session } from 'meteor/session';
 import { TAPi18n } from 'meteor/tap:i18n';
 import { t, getUserPreference, slashCommands, handleError } from '../../../utils';
-import { MessageAction, messageProperties, MessageTypes, readMessage, modal } from '../../../ui-utils';
+import { MessageAction, messageProperties, MessageTypes, readMessage, modal, call } from '../../../ui-utils';
 import { settings } from '../../../settings';
 import { callbacks } from '../../../callbacks';
 import { promises } from '../../../promises';
 import { hasAtLeastOnePermission } from '../../../authorization';
-import { Messages, Rooms, ChatMessage } from '../../../models';
+import { Messages, Rooms, ChatMessage, ChatSubscription } from '../../../models';
 import { emoji } from '../../../emoji';
 import { KonchatNotification } from './notification';
 import { MsgTyping } from './msgTyping';
@@ -239,6 +239,11 @@ export const ChatMessages = class ChatMessages {
 	* * @param {function?} done callback
 	*/
 	async send(rid, input, done = function() {}) {
+
+		if (!ChatSubscription.findOne({ rid })) {
+			await call('joinRoom', rid);
+		}
+
 		if (s.trim(input.value) !== '') {
 			readMessage.enable();
 			readMessage.readNow();
diff --git a/server/startup/migrations/v139.js b/server/startup/migrations/v139.js
index 58cd2cfeafb9..bb8a984902df 100644
--- a/server/startup/migrations/v139.js
+++ b/server/startup/migrations/v139.js
@@ -1,4 +1,5 @@
 import { Migrations } from '../../../app/migrations/server';
+
 import { Messages, Permissions, Rooms, Settings } from '../../../app/models/server';
 
 const getField = (msg, fieldType, fieldName) => {

From bc1722ab71ced6406e5dbd28dabb43807a1d2413 Mon Sep 17 00:00:00 2001
From: Marcelo Schmidt <marcelo.schmidt@rocket.chat>
Date: Fri, 22 Mar 2019 20:08:23 -0300
Subject: [PATCH 06/24] [FIX] wrong importing of e2e (#13863)

---
 app/e2e/client/accountEncryption.js | 2 +-
 app/e2e/client/events.js            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/e2e/client/accountEncryption.js b/app/e2e/client/accountEncryption.js
index 4632b064a84d..60fc2aa3ec5d 100644
--- a/app/e2e/client/accountEncryption.js
+++ b/app/e2e/client/accountEncryption.js
@@ -4,7 +4,7 @@ import toastr from 'toastr';
 import s from 'underscore.string';
 import { settings } from '../../settings';
 import { t } from '../../utils';
-import { e2e } from '..';
+import { e2e } from './rocketchat.e2e';
 
 Template.accountEncryption.helpers({
 	isEnabled() {
diff --git a/app/e2e/client/events.js b/app/e2e/client/events.js
index cfa22a5bbf8b..fea692b5bd00 100644
--- a/app/e2e/client/events.js
+++ b/app/e2e/client/events.js
@@ -1,5 +1,5 @@
 import { Accounts } from 'meteor/accounts-base';
-import { e2e } from '..';
+import { e2e } from './rocketchat.e2e';
 
 Accounts.onLogout(() => {
 	e2e.stopClient();

From be6b13e9b97c802c551beb369a532c54b1d00c4d Mon Sep 17 00:00:00 2001
From: Aditya Bhardwaj <aditya.1998bhardwaj@gmail.com>
Date: Mon, 25 Mar 2019 19:30:03 +0530
Subject: [PATCH 07/24] [IMPROVE] Remove user from role dialog fixed (#13874)

---
 app/authorization/client/views/permissionsRole.js | 1 +
 packages/rocketchat-i18n/i18n/en.i18n.json        | 1 +
 2 files changed, 2 insertions(+)

diff --git a/app/authorization/client/views/permissionsRole.js b/app/authorization/client/views/permissionsRole.js
index 86b1eea7f63e..0a23e17f2cd1 100644
--- a/app/authorization/client/views/permissionsRole.js
+++ b/app/authorization/client/views/permissionsRole.js
@@ -115,6 +115,7 @@ Template.permissionsRole.events({
 		e.preventDefault();
 		modal.open({
 			title: t('Are_you_sure'),
+			text: t('The_user_s_will_be_removed_from_role_s', this.username, FlowRouter.getParam('name')),
 			type: 'warning',
 			showCancelButton: true,
 			confirmButtonColor: '#DD6B55',
diff --git a/packages/rocketchat-i18n/i18n/en.i18n.json b/packages/rocketchat-i18n/i18n/en.i18n.json
index 351e1a8669bb..6a629e510fa2 100644
--- a/packages/rocketchat-i18n/i18n/en.i18n.json
+++ b/packages/rocketchat-i18n/i18n/en.i18n.json
@@ -2738,6 +2738,7 @@
   "The_server_will_restart_in_s_seconds": "The server will restart in %s seconds",
   "The_setting_s_is_configured_to_s_and_you_are_accessing_from_s": "The setting <strong>%s</strong> is configured to <strong>%s</strong> and you are accessing from <strong>%s</strong>!",
   "The_user_will_be_removed_from_s": "The user will be removed from %s",
+  "The_user_s_will_be_removed_from_role_s": "The user %s will be removed from role %s",
   "The_user_wont_be_able_to_type_in_s": "The user won't be able to type in %s",
   "Theme": "Theme",
   "theme-color-attention-color": "Attention Color",

From e1e6de5f6a9827cc079ce918f9ede5c0a1558e1a Mon Sep 17 00:00:00 2001
From: Gabriel Engel <gabriel.engel@gmail.com>
Date: Mon, 25 Mar 2019 11:52:37 -0300
Subject: [PATCH 08/24] LingoHub based on develop (#13891)

---
 packages/rocketchat-i18n/i18n/af.i18n.json    |   5 +-
 packages/rocketchat-i18n/i18n/ar.i18n.json    |   5 +-
 packages/rocketchat-i18n/i18n/az.i18n.json    |   5 +-
 packages/rocketchat-i18n/i18n/be-BY.i18n.json |   5 +-
 packages/rocketchat-i18n/i18n/bg.i18n.json    |   5 +-
 packages/rocketchat-i18n/i18n/bs.i18n.json    |   5 +-
 packages/rocketchat-i18n/i18n/ca.i18n.json    |   5 +-
 packages/rocketchat-i18n/i18n/cs.i18n.json    |   5 +-
 packages/rocketchat-i18n/i18n/cy.i18n.json    |   5 +-
 packages/rocketchat-i18n/i18n/da.i18n.json    |   5 +-
 packages/rocketchat-i18n/i18n/de-AT.i18n.json |   5 +-
 packages/rocketchat-i18n/i18n/de.i18n.json    |  18 +-
 packages/rocketchat-i18n/i18n/el.i18n.json    |   5 +-
 packages/rocketchat-i18n/i18n/en.i18n.json    |   2 +-
 packages/rocketchat-i18n/i18n/eo.i18n.json    |   5 +-
 packages/rocketchat-i18n/i18n/es.i18n.json    |   5 +-
 packages/rocketchat-i18n/i18n/fa.i18n.json    |   5 +-
 packages/rocketchat-i18n/i18n/fi.i18n.json    |   5 +-
 packages/rocketchat-i18n/i18n/fr.i18n.json    |   5 +-
 packages/rocketchat-i18n/i18n/he.i18n.json    |   3 +-
 packages/rocketchat-i18n/i18n/hi-IN.i18n.json | 197 ++++++++++++++++++
 packages/rocketchat-i18n/i18n/hr.i18n.json    | 145 ++++++++++++-
 packages/rocketchat-i18n/i18n/hu.i18n.json    |   5 +-
 packages/rocketchat-i18n/i18n/id.i18n.json    |   5 +-
 packages/rocketchat-i18n/i18n/it.i18n.json    |   8 +-
 packages/rocketchat-i18n/i18n/ja.i18n.json    |  55 ++---
 packages/rocketchat-i18n/i18n/km.i18n.json    |  42 +++-
 packages/rocketchat-i18n/i18n/ko.i18n.json    |   5 +-
 packages/rocketchat-i18n/i18n/ku.i18n.json    |   5 +-
 packages/rocketchat-i18n/i18n/lo.i18n.json    |   5 +-
 packages/rocketchat-i18n/i18n/lt.i18n.json    |   5 +-
 packages/rocketchat-i18n/i18n/lv.i18n.json    |   5 +-
 packages/rocketchat-i18n/i18n/mn.i18n.json    |   5 +-
 packages/rocketchat-i18n/i18n/ms-MY.i18n.json |   5 +-
 packages/rocketchat-i18n/i18n/nl.i18n.json    |   5 +-
 packages/rocketchat-i18n/i18n/no.i18n.json    |   5 +-
 packages/rocketchat-i18n/i18n/pl.i18n.json    |   5 +-
 packages/rocketchat-i18n/i18n/pt-BR.i18n.json |  78 +++++--
 packages/rocketchat-i18n/i18n/pt.i18n.json    | 143 ++++++++-----
 packages/rocketchat-i18n/i18n/ro.i18n.json    |   5 +-
 packages/rocketchat-i18n/i18n/ru.i18n.json    |  24 +--
 packages/rocketchat-i18n/i18n/sk-SK.i18n.json |   5 +-
 packages/rocketchat-i18n/i18n/sl-SI.i18n.json |   5 +-
 packages/rocketchat-i18n/i18n/sq.i18n.json    |   5 +-
 packages/rocketchat-i18n/i18n/sr.i18n.json    |   5 +-
 packages/rocketchat-i18n/i18n/sv.i18n.json    |   8 +-
 packages/rocketchat-i18n/i18n/ta-IN.i18n.json |   5 +-
 packages/rocketchat-i18n/i18n/th-TH.i18n.json |   5 +-
 packages/rocketchat-i18n/i18n/tr.i18n.json    |  33 +--
 packages/rocketchat-i18n/i18n/ug.i18n.json    |   3 +-
 packages/rocketchat-i18n/i18n/uk.i18n.json    |   5 +-
 packages/rocketchat-i18n/i18n/vi-VN.i18n.json |   5 +-
 packages/rocketchat-i18n/i18n/zh-HK.i18n.json |   5 +-
 packages/rocketchat-i18n/i18n/zh-TW.i18n.json |   5 +-
 packages/rocketchat-i18n/i18n/zh.i18n.json    |  67 +++---
 .../.app/i18n/hi-IN.i18n.json                 |  51 +++++
 .../.app/i18n/hr.i18n.json                    |  12 +-
 .../.app/i18n/pt.i18n.json                    |   2 +-
 58 files changed, 698 insertions(+), 393 deletions(-)
 create mode 100644 packages/rocketchat-i18n/i18n/hi-IN.i18n.json
 create mode 100644 packages/rocketchat-livechat/.app/i18n/hi-IN.i18n.json

diff --git a/packages/rocketchat-i18n/i18n/af.i18n.json b/packages/rocketchat-i18n/i18n/af.i18n.json
index 51f7dc5dbb4d..63ee04cdc03e 100644
--- a/packages/rocketchat-i18n/i18n/af.i18n.json
+++ b/packages/rocketchat-i18n/i18n/af.i18n.json
@@ -1713,7 +1713,6 @@
   "Mentions_default": "Mentions (standaard)",
   "Mentions_only": "Slegs opmerkings",
   "Merge_Channels": "Merge kanale",
-  "Message": "boodskap",
   "Message_AllowBadWordsFilter": "Laat Boodskap van verkeerde woorde filter",
   "Message_AllowDeleting": "Laat boodskap uitvee",
   "Message_AllowDeleting_BlockDeleteInMinutes": "Blokboodskap verwyder na (n) notules",
@@ -1781,9 +1780,9 @@
   "Message_VideoRecorderEnabled": "Video-opnemer geaktiveer",
   "Message_VideoRecorderEnabledDescription": "Vereis 'video / webm'-lêers om 'n aanvaarde media tipe te wees binne' Lêeroplaaier 'instellings.",
   "Message_view_mode_info": "Dit verander die hoeveelheid spasie boodskappe wat op die skerm opgeneem word.",
+  "Message": "boodskap",
   "messages": "boodskappe",
   "Messages": "boodskappe",
-  "Mmessages": "boodskappe",
   "Messages_that_are_sent_to_the_Incoming_WebHook_will_be_posted_here": "Boodskappe wat na die Inkomende WebHook gestuur word, sal hier verskyn.",
   "Meta": "meta",
   "Meta_custom": "Aangepaste Meta Tags",
@@ -2512,8 +2511,6 @@
   "This_is_a_push_test_messsage": "Dit is 'n druk toets boodskap",
   "This_room_has_been_archived_by__username_": "Hierdie kamer is geargiveer deur __username__",
   "This_room_has_been_unarchived_by__username_": "Hierdie kamer is gearchiveer deur __username__",
-  "Thread_slash_command_params": "jou boodskap",
-  "Threading_context_menu_none": "onsigbare",
   "Thursday": "Donderdag",
   "Time_in_seconds": "Tyd in sekondes",
   "Title": "Titel",
diff --git a/packages/rocketchat-i18n/i18n/ar.i18n.json b/packages/rocketchat-i18n/i18n/ar.i18n.json
index 9bb62e884bc5..774ee762f9c4 100644
--- a/packages/rocketchat-i18n/i18n/ar.i18n.json
+++ b/packages/rocketchat-i18n/i18n/ar.i18n.json
@@ -1713,7 +1713,6 @@
   "Mentions_default": "تنويهات (افتراضي)",
   "Mentions_only": "يشير فقط",
   "Merge_Channels": "دمج القنوات",
-  "Message": "رسالة",
   "Message_AllowBadWordsFilter": "السماح رسالة سيئة الكلمات الترشيح",
   "Message_AllowDeleting": "السماح بحذف الرسائل",
   "Message_AllowDeleting_BlockDeleteInMinutes": "حظر حذف الرسائل بعد (ن) دقائق",
@@ -1781,9 +1780,9 @@
   "Message_VideoRecorderEnabled": "تم تفعيل مُسجّل الفيديو",
   "Message_VideoRecorderEnabledDescription": "تتطلب ملفات \"فيديو / ويب\" أن تكون نوع وسائط مقبول ضمن إعدادات \"تحميل الملف\".",
   "Message_view_mode_info": "هذا يغير من كمية الرسائل الفضاء يستغرق على الشاشة.",
+  "Message": "رسالة",
   "messages": "الرسائل",
   "Messages": "الرسائل",
-  "Mmessages": "رسائل",
   "Messages_that_are_sent_to_the_Incoming_WebHook_will_be_posted_here": "وسوف يتم نشر الرسائل التي يتم إرسالها إلى الواردة WebHook هنا.",
   "Meta": "ميتا",
   "Meta_custom": "وسوم الميتا المُخصصة",
@@ -2512,8 +2511,6 @@
   "This_is_a_push_test_messsage": "هذا هو بإرسال رسالة اختبار الضغط",
   "This_room_has_been_archived_by__username_": "تم أرشفة هذه الغرفة التي __username__",
   "This_room_has_been_unarchived_by__username_": "تم إلغاء أرشفة هذه الغرفة التي __username__",
-  "Thread_slash_command_params": "رسالتك",
-  "Threading_context_menu_none": "خفي",
   "Thursday": "الخميس",
   "Time_in_seconds": "الوقت بالثواني",
   "Title": "العنوان",
diff --git a/packages/rocketchat-i18n/i18n/az.i18n.json b/packages/rocketchat-i18n/i18n/az.i18n.json
index cb3a3019b8b9..f48ee175ce63 100644
--- a/packages/rocketchat-i18n/i18n/az.i18n.json
+++ b/packages/rocketchat-i18n/i18n/az.i18n.json
@@ -1713,7 +1713,6 @@
   "Mentions_default": "Mentions (default)",
   "Mentions_only": "Mentions yalnız",
   "Merge_Channels": "Kanalları birləşdirin",
-  "Message": "Mesaj",
   "Message_AllowBadWordsFilter": "Mesajı pis sözlərlə filtrelemeye icazə verin",
   "Message_AllowDeleting": "Mesajın silinmesine icazə verin",
   "Message_AllowDeleting_BlockDeleteInMinutes": "(N) dəqiqələrdən sonra mesajı silin",
@@ -1781,9 +1780,9 @@
   "Message_VideoRecorderEnabled": "Video yazma qurğusu aktivdir",
   "Message_VideoRecorderEnabledDescription": "'Fayl yüklə' parametrləri daxilində qəbul edilən media növü olmaq üçün 'video / webm' faylları tələb olunur.",
   "Message_view_mode_info": "Bu, yer mesajlarının ekranda çəkilməsini azaldır.",
+  "Message": "Mesaj",
   "messages": "Mesajlar",
   "Messages": "Mesajlar",
-  "Mmessages": "mesajlar",
   "Messages_that_are_sent_to_the_Incoming_WebHook_will_be_posted_here": "Daxil olan WebHook-a göndərilən mesajlar burada yerləşdiriləcək.",
   "Meta": "Meta",
   "Meta_custom": "Xüsusi Meta Tags",
@@ -2512,8 +2511,6 @@
   "This_is_a_push_test_messsage": "Bu təkan testi mesajıdır",
   "This_room_has_been_archived_by__username_": "Bu otaq __username__ tərəfindən arşivlendi",
   "This_room_has_been_unarchived_by__username_": "Bu otaq __username__ tərəfindən arşivlenmişdir",
-  "Thread_slash_command_params": "sənin mesajın",
-  "Threading_context_menu_none": "Görünməz",
   "Thursday": "Cümə axşamı",
   "Time_in_seconds": "Saniyə saniyəm",
   "Title": "Başlıq",
diff --git a/packages/rocketchat-i18n/i18n/be-BY.i18n.json b/packages/rocketchat-i18n/i18n/be-BY.i18n.json
index ad4617f88630..b069fced32ac 100644
--- a/packages/rocketchat-i18n/i18n/be-BY.i18n.json
+++ b/packages/rocketchat-i18n/i18n/be-BY.i18n.json
@@ -1728,7 +1728,6 @@
   "Mentions_default": "Згадкі (па змаўчанні)",
   "Mentions_only": "згадкі толькі",
   "Merge_Channels": "аб'яднаць каналы",
-  "Message": "паведамленне",
   "Message_AllowBadWordsFilter": "Дазволіць паведамленне дрэнныя словы фільтрацыі",
   "Message_AllowDeleting": "Дазволіць выдаленне паведамленняў",
   "Message_AllowDeleting_BlockDeleteInMinutes": "Блок паведамленняў Выдаленне Пасля таго, як (п) хвілін",
@@ -1796,9 +1795,9 @@
   "Message_VideoRecorderEnabled": "Video Recorder Enabled",
   "Message_VideoRecorderEnabledDescription": "Патрабуецца «/ WebM відэа» файлы, каб быць прынятым тыпам носьбіта ў наладах «File Upload».",
   "Message_view_mode_info": "Гэта змяняе колькасць касмічных паведамленняў займае на экране.",
+  "Message": "паведамленне",
   "messages": "паведамлення",
   "Messages": "паведамлення",
-  "Mmessages": "паведамлення",
   "Messages_that_are_sent_to_the_Incoming_WebHook_will_be_posted_here": "Паведамленні, адпраўленыя на Уваходная WebHook будуць размешчаны тут.",
   "Meta": "Meta",
   "Meta_custom": "Прыстасаваныя мета-тэгі",
@@ -2529,8 +2528,6 @@
   "This_is_a_push_test_messsage": "Гэта штуршок тэставае паведамленне",
   "This_room_has_been_archived_by__username_": "Гэты нумар быў архівуюцца __username__",
   "This_room_has_been_unarchived_by__username_": "Гэты нумар быў разархіваваць па __username__",
-  "Thread_slash_command_params": "тваё паведамленне",
-  "Threading_context_menu_none": "нябачны",
   "Thursday": "чацвер",
   "Time_in_seconds": "Час у секундах",
   "Title": "тытульны",
diff --git a/packages/rocketchat-i18n/i18n/bg.i18n.json b/packages/rocketchat-i18n/i18n/bg.i18n.json
index 5bbeb0c648bb..3edd360f4d95 100644
--- a/packages/rocketchat-i18n/i18n/bg.i18n.json
+++ b/packages/rocketchat-i18n/i18n/bg.i18n.json
@@ -1713,7 +1713,6 @@
   "Mentions_default": "Посочвания (по подразбиране)",
   "Mentions_only": "Само споменава",
   "Merge_Channels": "Обединяване на канали",
-  "Message": "Съобщение",
   "Message_AllowBadWordsFilter": "Позволете на филтъра да филтрира лоши думи",
   "Message_AllowDeleting": "Разрешаване на изтриването на съобщения",
   "Message_AllowDeleting_BlockDeleteInMinutes": "Блокиране на съобщението след (n) минути",
@@ -1781,9 +1780,9 @@
   "Message_VideoRecorderEnabled": "Видеорекордерът е активиран",
   "Message_VideoRecorderEnabledDescription": "Изисква файловете \"видео / уеб\" да бъдат приети типове медии в настройките \"Качване на файлове\".",
   "Message_view_mode_info": "Това променя броя на космическите съобщения, които се заемат на екрана.",
+  "Message": "Съобщение",
   "messages": "Съобщения",
   "Messages": "Съобщения",
-  "Mmessages": "съобщения",
   "Messages_that_are_sent_to_the_Incoming_WebHook_will_be_posted_here": "Съобщенията, които се изпращат в Incoming WebHook, ще бъдат публикувани тук.",
   "Meta": "Мета",
   "Meta_custom": "Персонализирани мета тагове",
@@ -2512,8 +2511,6 @@
   "This_is_a_push_test_messsage": "Това е съобщение за пробно изпитание",
   "This_room_has_been_archived_by__username_": "Тази стая е архивирана от __username__",
   "This_room_has_been_unarchived_by__username_": "Тази стая е деархивирана от __username__",
-  "Thread_slash_command_params": "твоето съобщение",
-  "Threading_context_menu_none": "невидим",
   "Thursday": "четвъртък",
   "Time_in_seconds": "Времето в секунди",
   "Title": "Заглавие",
diff --git a/packages/rocketchat-i18n/i18n/bs.i18n.json b/packages/rocketchat-i18n/i18n/bs.i18n.json
index 4a36d925c9cf..f9cab989a15f 100644
--- a/packages/rocketchat-i18n/i18n/bs.i18n.json
+++ b/packages/rocketchat-i18n/i18n/bs.i18n.json
@@ -1713,7 +1713,6 @@
   "Mentions_default": "Spominjanja (zadano)",
   "Mentions_only": "Samo spomenuti",
   "Merge_Channels": "Spoji kanale",
-  "Message": "Poruka",
   "Message_AllowBadWordsFilter": "Dopusti filtriranje loših riječi u porukama",
   "Message_AllowDeleting": "Dopusti Brisanje Poruka",
   "Message_AllowDeleting_BlockDeleteInMinutes": "Blokiraj Brisanje Poruka Nakon (n) minuta",
@@ -1781,9 +1780,9 @@
   "Message_VideoRecorderEnabled": "Video snimač omogućen",
   "Message_VideoRecorderEnabledDescription": "Zahtjeva da 'video/webm' datoteke budu omogućene u 'Prijenosu datoteka' postavci.",
   "Message_view_mode_info": "Ovo mijenja količinu prostora koju poruka zauzima na ekranu.",
+  "Message": "Poruka",
   "messages": "Poruke",
   "Messages": "Poruke",
-  "Mmessages": "poruke",
   "Messages_that_are_sent_to_the_Incoming_WebHook_will_be_posted_here": "Poruke koje se šalju na dolazeći WebHook bit će objavljene ovdje.",
   "Meta": "Meta",
   "Meta_custom": "Prilagođene meta oznake",
@@ -2512,8 +2511,6 @@
   "This_is_a_push_test_messsage": "Ovo je push obavijest",
   "This_room_has_been_archived_by__username_": "__username__ je arhivirao ovu sobu",
   "This_room_has_been_unarchived_by__username_": "__username__ je dearhivirao ovu sobu",
-  "Thread_slash_command_params": "tvoja poruka",
-  "Threading_context_menu_none": "Nevidljiv",
   "Thursday": "Četvrtak",
   "Time_in_seconds": "Vrijeme u sekundama",
   "Title": "Naslov",
diff --git a/packages/rocketchat-i18n/i18n/ca.i18n.json b/packages/rocketchat-i18n/i18n/ca.i18n.json
index d645cb2deda7..1b7852cc10a1 100644
--- a/packages/rocketchat-i18n/i18n/ca.i18n.json
+++ b/packages/rocketchat-i18n/i18n/ca.i18n.json
@@ -1712,7 +1712,6 @@
   "Mentions_default": "Mencions (per defecte)",
   "Mentions_only": "Només mencions",
   "Merge_Channels": "Combina canals",
-  "Message": "Missatge",
   "Message_AllowBadWordsFilter": "Permet el filtratge de paraulotes",
   "Message_AllowDeleting": "Permet l'eliminació de missatges",
   "Message_AllowDeleting_BlockDeleteInMinutes": "Bloqueja l'eliminació de missatges després de (n) minuts",
@@ -1780,9 +1779,9 @@
   "Message_VideoRecorderEnabled": "Gravadora de vídeo activa",
   "Message_VideoRecorderEnabledDescription": "Requereix que els fitxers de tipus 'video/webm' siguin admesos a la configuració de  'Puja fitxers'.",
   "Message_view_mode_info": "Això canvia l'espai que ocupen els missatges en pantalla.",
+  "Message": "Missatge",
   "messages": "Missatges",
   "Messages": "Missatges",
-  "Mmessages": "missatges",
   "Messages_that_are_sent_to_the_Incoming_WebHook_will_be_posted_here": "Els missatges enviats al WebHook d'entrada seran publicats aquí.",
   "Meta": "Meta",
   "Meta_custom": "Etiquetes Meta personalitzades",
@@ -2511,8 +2510,6 @@
   "This_is_a_push_test_messsage": "Això és un missatge push de prova",
   "This_room_has_been_archived_by__username_": "__username__ ha arxivat aquesta sala.",
   "This_room_has_been_unarchived_by__username_": "__username__ ha desarxivat aquesta sala.",
-  "Thread_slash_command_params": "el teu missatge",
-  "Threading_context_menu_none": "Invisible",
   "Thursday": "dijous",
   "Time_in_seconds": "Temps en segons",
   "Title": "Títol",
diff --git a/packages/rocketchat-i18n/i18n/cs.i18n.json b/packages/rocketchat-i18n/i18n/cs.i18n.json
index cfeb08a4de4e..47617a613630 100644
--- a/packages/rocketchat-i18n/i18n/cs.i18n.json
+++ b/packages/rocketchat-i18n/i18n/cs.i18n.json
@@ -1716,7 +1716,6 @@
   "Mentions": "Zmínky",
   "Mentions_default": "Zmínky (výchozí)",
   "Mentions_only": "Pouze zmínky",
-  "Message": "Zpráva",
   "Message_AllowBadWordsFilter": "Povolit filtrování sprostých slov",
   "Message_AllowDeleting": "Povolit mazání zpráv",
   "Message_AllowDeleting_BlockDeleteInMinutes": "Blokovat mazání zpráv po (n) minutách",
@@ -1784,9 +1783,9 @@
   "Message_VideoRecorderEnabled": "Video nahrávání povoleno",
   "Message_VideoRecorderEnabledDescription": "Vyžaduje přidání 'video/webm' mezi povolené typy souborů v nastavení",
   "Message_view_mode_info": "Tím se změní místo, které zprávy zabírají na obrazovce.",
+  "Message": "Zpráva",
   "messages": "Zprávy",
   "Messages": "Zprávy",
-  "Mmessages": "zpráv",
   "Messages_that_are_sent_to_the_Incoming_WebHook_will_be_posted_here": "Zprávy, které jsou odesílány do příchozí WebHook integrace budou zveřejněny zde.",
   "Meta": "Meta informace",
   "Meta_custom": "Vlastní meta tagy",
@@ -2515,8 +2514,6 @@
   "This_is_a_push_test_messsage": "Toto je testovací notifikace",
   "This_room_has_been_archived_by__username_": "Tato místnost byla archivována uživatelem __username__",
   "This_room_has_been_unarchived_by__username_": "Tato místnost byla úspěšně odarchivována uživatelem __username__",
-  "Thread_slash_command_params": "vaše zpráva",
-  "Threading_context_menu_none": "Neviditelný",
   "Thursday": "Čtvrtek",
   "Time_in_seconds": "Čas v sekundách",
   "Title": "Název",
diff --git a/packages/rocketchat-i18n/i18n/cy.i18n.json b/packages/rocketchat-i18n/i18n/cy.i18n.json
index 33fb2021e753..ce98ef9802bf 100644
--- a/packages/rocketchat-i18n/i18n/cy.i18n.json
+++ b/packages/rocketchat-i18n/i18n/cy.i18n.json
@@ -1712,7 +1712,6 @@
   "Mentions_default": "Mentions (diofyn)",
   "Mentions_only": "Mentiadau yn unig",
   "Merge_Channels": "Sianeli Cyfuno",
-  "Message": "Neges",
   "Message_AllowBadWordsFilter": "Caniatáu hidlo geiriau drwg Neges",
   "Message_AllowDeleting": "Caniatáu Dileu Neges",
   "Message_AllowDeleting_BlockDeleteInMinutes": "Neges Bloc yn Dileu Ar ôl (n) Cofnodion",
@@ -1780,9 +1779,9 @@
   "Message_VideoRecorderEnabled": "Graffydd Fideo wedi'i alluogi",
   "Message_VideoRecorderEnabledDescription": "Angen ffeiliau 'fideo / webm' i fod yn fath cyfryngau a dderbynnir o fewn gosodiadau 'Llwythiad Ffeil'.",
   "Message_view_mode_info": "Mae hyn yn newid faint o negeseuon gofod sy'n eu cymryd ar y sgrin.",
+  "Message": "Neges",
   "messages": "Negeseuon",
   "Messages": "Negeseuon",
-  "Mmessages": "negeseuon",
   "Messages_that_are_sent_to_the_Incoming_WebHook_will_be_posted_here": "Bydd negeseuon sy'n cael eu hanfon at y WebHook sy'n dod i mewn yn cael eu postio yma.",
   "Meta": "Meta",
   "Meta_custom": "Tags Meta Custom",
@@ -2511,8 +2510,6 @@
   "This_is_a_push_test_messsage": "Mae hwn yn neges prawf gwthio",
   "This_room_has_been_archived_by__username_": "Archifwyd yr ystafell hon gan __username__",
   "This_room_has_been_unarchived_by__username_": "Anfonwyd yr ystafell hon gan __username__",
-  "Thread_slash_command_params": "dy neges",
-  "Threading_context_menu_none": "Anweledig",
   "Thursday": "Dydd Iau",
   "Time_in_seconds": "Amser mewn eiliadau",
   "Title": "Teitl",
diff --git a/packages/rocketchat-i18n/i18n/da.i18n.json b/packages/rocketchat-i18n/i18n/da.i18n.json
index 37ad521f801c..26697505c17b 100644
--- a/packages/rocketchat-i18n/i18n/da.i18n.json
+++ b/packages/rocketchat-i18n/i18n/da.i18n.json
@@ -1808,7 +1808,6 @@
   "Mentions_default": "Mentioner (standard)",
   "Mentions_only": "Kun mentioner",
   "Merge_Channels": "Flette kanaler",
-  "Message": "Besked",
   "Message_AllowBadWordsFilter": "Tillad besked om dårlig ordfiltrering",
   "Message_AllowDeleting": "Tillad besked sletning",
   "Message_AllowDeleting_BlockDeleteInMinutes": "Bloker besked sletter efter (n) minutter",
@@ -1876,9 +1875,9 @@
   "Message_VideoRecorderEnabled": "Videooptager aktiveret",
   "Message_VideoRecorderEnabledDescription": "Kræver 'video / webm'-filer for at være en accepteret medietype inden for' Filopload '-indstillinger.",
   "Message_view_mode_info": "Dette ændrer mængden af ​​mellemrumsmeddelelser, der optages på skærmen.",
+  "Message": "Besked",
   "messages": "Meddelelser",
   "Messages": "Meddelelser",
-  "Mmessages": "Beskeder",
   "Messages_that_are_sent_to_the_Incoming_WebHook_will_be_posted_here": "Meddelelser, der sendes til den indkommende webhook, bliver sendt her.",
   "Meta": "Meta",
   "Meta_custom": "Brugerdefinerede Meta Tags",
@@ -2630,8 +2629,6 @@
   "This_is_a_push_test_messsage": "Dette er en push test besked",
   "This_room_has_been_archived_by__username_": "Dette værelse er blevet arkiveret af __username__",
   "This_room_has_been_unarchived_by__username_": "Dette værelse er blevet arkiveret af __username__",
-  "Thread_slash_command_params": "din besked",
-  "Threading_context_menu_none": "Usynlig",
   "Thursday": "torsdag",
   "Time_in_seconds": "Tid i sekunder",
   "Title": "Titel",
diff --git a/packages/rocketchat-i18n/i18n/de-AT.i18n.json b/packages/rocketchat-i18n/i18n/de-AT.i18n.json
index 624390240434..cae9a7452c4e 100644
--- a/packages/rocketchat-i18n/i18n/de-AT.i18n.json
+++ b/packages/rocketchat-i18n/i18n/de-AT.i18n.json
@@ -1714,7 +1714,6 @@
   "Mentions_default": "Erwähnungen (Standard)",
   "Mentions_only": "Erwähnt nur",
   "Merge_Channels": "Kanäle zusammenführen",
-  "Message": "Nachricht",
   "Message_AllowBadWordsFilter": "Wortfilter für Nachrichten aktivieren",
   "Message_AllowDeleting": "Das Löschen von Nachrichten erlauben",
   "Message_AllowDeleting_BlockDeleteInMinutes": "Das Löschen von Nachrichten nach (n) Minuten sperren",
@@ -1782,9 +1781,9 @@
   "Message_VideoRecorderEnabled": "Videoaufnahmen eingeschaltet",
   "Message_VideoRecorderEnabledDescription": "Videoformat auf webm beim \"Datei hochladen\" einschränken? (Video abspielen funktioniert dann in fast allen Browsern)",
   "Message_view_mode_info": "Dadurch ändert sich der Platzbedarf für Nachrichten auf dem Bildschirm.",
+  "Message": "Nachricht",
   "messages": "Nachrichten",
   "Messages": "Nachrichten",
-  "Mmessages": "Mitteilungen",
   "Messages_that_are_sent_to_the_Incoming_WebHook_will_be_posted_here": "Nachrichten, die an den eingehenden Webhook gesendet werden, werden hier veröffentlicht.",
   "Meta": "Metadaten",
   "Meta_custom": "Benutzerdefinierte Meta-Tags",
@@ -2513,8 +2512,6 @@
   "This_is_a_push_test_messsage": "Dies ist eine Test-Push-Nachricht.",
   "This_room_has_been_archived_by__username_": "Dieser Raum wurde von __username__ archiviert",
   "This_room_has_been_unarchived_by__username_": "Dieser Raum wurde von __username__ unarchiviert",
-  "Thread_slash_command_params": "ihre Nachricht",
-  "Threading_context_menu_none": "Unsichtbar",
   "Thursday": "Donnerstag",
   "Time_in_seconds": "Zeit in Sekunden",
   "Title": "Titel",
diff --git a/packages/rocketchat-i18n/i18n/de.i18n.json b/packages/rocketchat-i18n/i18n/de.i18n.json
index d642c4823e16..52bfba580e15 100644
--- a/packages/rocketchat-i18n/i18n/de.i18n.json
+++ b/packages/rocketchat-i18n/i18n/de.i18n.json
@@ -1012,6 +1012,9 @@
   "Display_offline_form": "Formular für Offline-Kontakt anzeigen",
   "Display_unread_counter": "Anzahl der ungelesenen Nachrichten anzeigen",
   "Displays_action_text": "Zeigt den Aktionstext",
+  "Discussion_target_channel_description": "Wähle einen Kanal oder eine Gruppe aus, die zu Deinem Anliegen passt",
+  "Discussion_target_channel": "Übergeordneter Kanal oder Gruppe",
+  "Discussion_first_message_title": "Deine Nachricht",
   "Dont_ask_me_again": "Nicht noch einmal fragen!",
   "Dont_ask_me_again_list": "Frag mich nicht nochmal Liste",
   "Do_not_display_unread_counter": "Keinerlei Zähler für diesen Kanal anzeigen",
@@ -1879,7 +1882,6 @@
   "Mentions_default": "Erwähnungen (Standard)",
   "Mentions_only": "Nur Erwähnungen",
   "Merge_Channels": "Kanäle zusammenführen",
-  "Message": "Nachricht",
   "Message_AllowBadWordsFilter": "Wortfilter für Nachrichten verwenden",
   "Message_AllowDeleting": "Löschen von Nachrichten erlauben",
   "Message_AllowDeleting_BlockDeleteInMinutes": "Löschen von Nachrichten nach (n) Minuten sperren",
@@ -1950,9 +1952,9 @@
   "Message_VideoRecorderEnabled": "Videoaufnahme eingeschaltet",
   "Message_VideoRecorderEnabledDescription": "Erfordert, dass der Medientyp 'video/webm' in den \"Datei-Upload\"-Einstellungen als Medientyp akzeptiert wird",
   "Message_view_mode_info": "Dadurch ändert sich der Platzbedarf für Nachrichten auf dem Bildschirm",
+  "Message": "Nachricht",
   "messages": "Nachrichten",
   "Messages": "Nachrichten",
-  "Mmessages": "Nachrichten",
   "Messages_that_are_sent_to_the_Incoming_WebHook_will_be_posted_here": "Nachrichten, die an den eingehenden Webhook gesendet werden, werden hier veröffentlicht",
   "Meta": "Metadaten",
   "Meta_custom": "Benutzerdefinierte Meta-Tags",
@@ -2000,6 +2002,9 @@
   "New_Application": "Neue Anwendung",
   "New_Custom_Field": "Neues benutzerdefiniertes Feld",
   "New_Department": "Neue Abteilung",
+  "New_discussion": "Neuer Diskussion",
+  "New_discussion_name": "Ein sinnvoller Name für den Diskussion-Raum",
+  "New_discussion_first_message": "Üblicherweise beginnt ein Diskussion mit einer Frage, bspw. \"Wie lade ich ein Bild hoch?\"",
   "New_integration": "Neue Integration",
   "New_line_message_compose_input": "`%s` - Zeilenumbruch einfügen",
   "New_logs": "Neue Logs",
@@ -2012,9 +2017,6 @@
   "New_encryption_password": "Neues Verschlüsselungs-Passwort",
   "New_role": "Neue Rolle",
   "New_Room_Notification": "Neuer-Raum-Benachrichtigung",
-  "New_discussion": "Neuer Diskussion",
-  "New_discussion_name": "Ein sinnvoller Name für den Diskussion-Raum",
-  "New_discussion_first_message": "Üblicherweise beginnt ein Diskussion mit einer Frage, bspw. \"Wie lade ich ein Bild hoch?\"",
   "New_Trigger": "Neuer Trigger",
   "New_version_available_(s)": "Neue Version verfügbar (%s)",
   "New_videocall_request": "Neuer Video-Anruf",
@@ -2025,7 +2027,6 @@
   "No_channel_with_name_%s_was_found": "Es wurde kein Kanal mit dem Namen <strong>\"%s\"</strong> gefunden!",
   "No_channels_yet": "bisher nirgendwo dabei",
   "No_direct_messages_yet": "Sie haben bisher keine Konversationen gestartet",
-  "No_discussions_yet": "Keine Discussion vorhanden",
   "No_Encryption": "Keine Verschlüsselung",
   "No_group_with_name_%s_was_found": "Es wurde keine private Gruppe mit dem Namen <strong>\"%s\"</strong> gefunden!",
   "No_groups_yet": "Sie sind kein Mitglied einer privaten Gruppe",
@@ -2035,13 +2036,12 @@
   "No_messages_yet": "Bisher keine Nachrichten",
   "No_pages_yet_Try_hitting_Reload_Pages_button": "Bisher keine Seite. Versicherung die Seite neu zu laden",
   "No_pinned_messages": "Es wurden bisher keine Nachrichten fixiert",
-  "No_replies_yet": "Bisher keine Antworten",
   "No_results_found": "Keine Ergebnisse gefunden",
   "No_results_found_for": "Keine Ergebnisse gefunden für:",
   "No_snippet_messages": "Keine Snippets vorhanden",
   "No_starred_messages": "Es wurden bisher keine Nachrichten favorisiert",
   "No_such_command": "Es gibt keinen Befehl '/__command__'",
-  "No_threads_yet": "Keine Threads vorhanden",
+  "No_discussions_yet": "Keine Discussion vorhanden",
   "No_user_with_username_%s_was_found": "Es wurde kein Benutzer mit dem Namen <strong>\"%s\"</strong> gefunden!",
   "Nobody_available": "Es ist niemand verfügbar",
   "Node_version": "Node-Version",
@@ -2746,6 +2746,8 @@
   "This_month": "Diesen Monat",
   "This_room_has_been_archived_by__username_": "Dieser Raum wurde von __username__ archiviert",
   "This_room_has_been_unarchived_by__username_": "Dieser Raum wurde von __username__ aus dem Archiv geholt",
+  "thread": "Thread",
+  "Threads": "Threads",
   "This_week": "Diese Woche",
   "Thursday": "Donnerstag",
   "Time_in_seconds": "Zeit in Sekunden",
diff --git a/packages/rocketchat-i18n/i18n/el.i18n.json b/packages/rocketchat-i18n/i18n/el.i18n.json
index 8ce070f96dff..9107c5560487 100644
--- a/packages/rocketchat-i18n/i18n/el.i18n.json
+++ b/packages/rocketchat-i18n/i18n/el.i18n.json
@@ -1713,7 +1713,6 @@
   "Mentions_default": "Αναφέρει (προεπιλογή)",
   "Mentions_only": "Αναφέρει μόνο",
   "Merge_Channels": "Συγχώνευση καναλιών",
-  "Message": "Μήνυμα",
   "Message_AllowBadWordsFilter": "Επιτρέψτε Μήνυμα κακές λέξεις φιλτράρισμα",
   "Message_AllowDeleting": "Επιτρέπεται διαγραφή μηνυμάτων",
   "Message_AllowDeleting_BlockDeleteInMinutes": "Αποκλεισμός μηνυμάτων Διαγραφή Μετά (n) Λεπτά",
@@ -1781,9 +1780,9 @@
   "Message_VideoRecorderEnabled": "Εγγραφή βίντεο Ενεργοποιημένη",
   "Message_VideoRecorderEnabledDescription": "Απαιτεί τα αρχεία βίντεο / webm να είναι ένας αποδεκτός τύπος μέσου στο πλαίσιο των ρυθμίσεων \"Μεταφόρτωση αρχείων\".",
   "Message_view_mode_info": "Αυτό αλλάζει το ποσό των μηνυμάτων χώρο καταλαμβάνουν στην οθόνη.",
+  "Message": "Μήνυμα",
   "messages": "μηνύματα",
   "Messages": "μηνύματα",
-  "Mmessages": "μηνυμάτων",
   "Messages_that_are_sent_to_the_Incoming_WebHook_will_be_posted_here": "Τα μηνύματα που αποστέλλονται στο Incoming WebHook θα αναρτηθούν εδώ.",
   "Meta": "Meta",
   "Meta_custom": "Custom Meta Tags",
@@ -2512,8 +2511,6 @@
   "This_is_a_push_test_messsage": "Αυτή είναι μια δοκιμή ώθησης messsage",
   "This_room_has_been_archived_by__username_": "Αυτό το δωμάτιο έχει αρχειοθετηθεί από το χρήστη __username__",
   "This_room_has_been_unarchived_by__username_": "Αυτό το δωμάτιο έχει αρχειοθετηθεί από το χρήστη __username__",
-  "Thread_slash_command_params": "το μήνυμά σου",
-  "Threading_context_menu_none": "Αόρατος",
   "Thursday": "Πέμπτη",
   "Time_in_seconds": "Χρόνος σε δευτερόλεπτα",
   "Title": "Τίτλος",
diff --git a/packages/rocketchat-i18n/i18n/en.i18n.json b/packages/rocketchat-i18n/i18n/en.i18n.json
index 6a629e510fa2..cbe4c283c1e4 100644
--- a/packages/rocketchat-i18n/i18n/en.i18n.json
+++ b/packages/rocketchat-i18n/i18n/en.i18n.json
@@ -3169,4 +3169,4 @@
   "Your_question": "Your question",
   "Your_server_link": "Your server link",
   "Your_workspace_is_ready": "Your workspace is ready to use 🎉"
-}
+}
\ No newline at end of file
diff --git a/packages/rocketchat-i18n/i18n/eo.i18n.json b/packages/rocketchat-i18n/i18n/eo.i18n.json
index c73a188cef22..6e87e1ba7aa5 100644
--- a/packages/rocketchat-i18n/i18n/eo.i18n.json
+++ b/packages/rocketchat-i18n/i18n/eo.i18n.json
@@ -1713,7 +1713,6 @@
   "Mentions_default": "Mencioj (defaŭlte)",
   "Mentions_only": "Mencioj nur",
   "Merge_Channels": "Kunfandi Kanaloj",
-  "Message": "Mesaĝo",
   "Message_AllowBadWordsFilter": "Permesu filtri malbonajn vortojn",
   "Message_AllowDeleting": "Permesi Mesaĝon Forigante",
   "Message_AllowDeleting_BlockDeleteInMinutes": "Bloko Mesaĝo Foriganta Post (N) Minutoj",
@@ -1781,9 +1780,9 @@
   "Message_VideoRecorderEnabled": "Video Recordilo Enabled",
   "Message_VideoRecorderEnabledDescription": "Postulas 'video / webm' dosierojn esti akceptita amaskomunikila tipo ene de 'Dosieraj Alŝutoj' agordoj.",
   "Message_view_mode_info": "Ĉi tio ŝanĝas la kvanton de spacaj mesaĝoj en la ekrano.",
+  "Message": "Mesaĝo",
   "messages": "Mesaĝoj",
   "Messages": "Mesaĝoj",
-  "Mmessages": "mesaĝoj",
   "Messages_that_are_sent_to_the_Incoming_WebHook_will_be_posted_here": "Mesaĝoj senditaj al la venonta TTT-ejo estos poŝtitaj ĉi tie.",
   "Meta": "Metas",
   "Meta_custom": "Propra Meta Etikedoj",
@@ -2512,8 +2511,6 @@
   "This_is_a_push_test_messsage": "Ĉi tio estas push-testa mesaĝo",
   "This_room_has_been_archived_by__username_": "Ĉi tiu ĉambro estis arkivita de __username__",
   "This_room_has_been_unarchived_by__username_": "Ĉi tiu ĉambro estis neatendita de __username__",
-  "Thread_slash_command_params": "via mesaĝo",
-  "Threading_context_menu_none": "Nevidebla",
   "Thursday": "Ĵaŭdo",
   "Time_in_seconds": "Tempo en sekundoj",
   "Title": "Titolo",
diff --git a/packages/rocketchat-i18n/i18n/es.i18n.json b/packages/rocketchat-i18n/i18n/es.i18n.json
index 1031eec00e72..2ed79cc943bb 100644
--- a/packages/rocketchat-i18n/i18n/es.i18n.json
+++ b/packages/rocketchat-i18n/i18n/es.i18n.json
@@ -1726,7 +1726,6 @@
   "Mentions_default": "Menciones (por defecto)",
   "Mentions_only": "Solo menciones",
   "Merge_Channels": "Combinar canales",
-  "Message": "Mensaje",
   "Message_AllowBadWordsFilter": "Permitir el filtrado de malas palabras en los Mensajes",
   "Message_AllowDeleting": "Permitir la eliminación de mensajes",
   "Message_AllowDeleting_BlockDeleteInMinutes": "Bloquear la Eliminación de Mensajes Despues de (n) Minutos",
@@ -1794,9 +1793,9 @@
   "Message_VideoRecorderEnabled": "Activar grabador de video",
   "Message_VideoRecorderEnabledDescription": "Requer que los archivos de tipo 'video/webm' sean un tipo de medio aceptado en la configuracion 'Subida ficheros'.",
   "Message_view_mode_info": "Esto cambia la cantidad de mensajes espacio ocupan en la pantalla.",
+  "Message": "Mensaje",
   "messages": "Mensajes",
   "Messages": "Mensajes",
-  "Mmessages": "mensajes",
   "Messages_that_are_sent_to_the_Incoming_WebHook_will_be_posted_here": "Los mensajes enviados al WebHook de entrada serán publicados aquí.",
   "Meta": "Meta",
   "Meta_custom": "Metaetiquetas personalizadas",
@@ -2525,8 +2524,6 @@
   "This_is_a_push_test_messsage": "Este es un mensaje de prueba push",
   "This_room_has_been_archived_by__username_": "Esta sala ha sido archivada por __username__",
   "This_room_has_been_unarchived_by__username_": "Esta sala ha sido desarchivada por __username__",
-  "Thread_slash_command_params": "tu mensaje",
-  "Threading_context_menu_none": "Invisible",
   "Thursday": "Jueves",
   "Time_in_seconds": "Tiempo en segundos",
   "Title": "Título",
diff --git a/packages/rocketchat-i18n/i18n/fa.i18n.json b/packages/rocketchat-i18n/i18n/fa.i18n.json
index cf488d6b9278..869cf652d077 100644
--- a/packages/rocketchat-i18n/i18n/fa.i18n.json
+++ b/packages/rocketchat-i18n/i18n/fa.i18n.json
@@ -1720,7 +1720,6 @@
   "Mentions_default": "اشاره ها (پیش فرض)",
   "Mentions_only": "فقط به ذکر است",
   "Merge_Channels": "ادغام کانال ها",
-  "Message": "پیام",
   "Message_AllowBadWordsFilter": "اجازه می دهد پیام کلمات بد فیلتر",
   "Message_AllowDeleting": "اجازه می دهد پیام حذف",
   "Message_AllowDeleting_BlockDeleteInMinutes": "بلوک پیام حذف پس از (N) دقیقه",
@@ -1788,9 +1787,9 @@
   "Message_VideoRecorderEnabled": "ضبط ویدئو فعال",
   "Message_VideoRecorderEnabledDescription": "نیاز به فایل های 'video / webm' برای نوع رسانه پذیرفته شده در تنظیمات 'Upload File' است.",
   "Message_view_mode_info": "این تغییر مقدار از پیام های فضایی را بر روی صفحه نمایش.",
+  "Message": "پیام",
   "messages": "پیام ها",
   "Messages": "پیام ها",
-  "Mmessages": "پیام ها",
   "Messages_that_are_sent_to_the_Incoming_WebHook_will_be_posted_here": "پیام هایی که به ورودی WebHook ارسال خواهد شد در اینجا نوشته شده است.",
   "Meta": "متا",
   "Meta_custom": "سفارشی متا تگ",
@@ -2519,8 +2518,6 @@
   "This_is_a_push_test_messsage": "این messsage آزمون فشار است",
   "This_room_has_been_archived_by__username_": "این اتاق شده است _نام کاربری_ آرشیو",
   "This_room_has_been_unarchived_by__username_": "این اتاق شده است _نام کاربری_ از بایگانی خارج شد",
-  "Thread_slash_command_params": "پیام شما",
-  "Threading_context_menu_none": "پنهان",
   "Thursday": "پنج شنبه",
   "Time_in_seconds": "زمان در ثانیه",
   "Title": "عنوان",
diff --git a/packages/rocketchat-i18n/i18n/fi.i18n.json b/packages/rocketchat-i18n/i18n/fi.i18n.json
index 5c342e88a58e..ae47ef3902af 100644
--- a/packages/rocketchat-i18n/i18n/fi.i18n.json
+++ b/packages/rocketchat-i18n/i18n/fi.i18n.json
@@ -1713,7 +1713,6 @@
   "Mentions_default": "Maininnat (oletus)",
   "Mentions_only": "Vain maininnat",
   "Merge_Channels": "Yhdistä kanavat",
-  "Message": "Viestit",
   "Message_AllowBadWordsFilter": "Salli viestien sopimattomien sanojen suodatus",
   "Message_AllowDeleting": "Salli viestin poisto",
   "Message_AllowDeleting_BlockDeleteInMinutes": "Estä viestien poistaminen (n) minuutin jälkeen",
@@ -1781,9 +1780,9 @@
   "Message_VideoRecorderEnabled": "Videonauhoitus käytössä",
   "Message_VideoRecorderEnabledDescription": "Vaatii 'video/webm'-tiedostot hyväksytyksi mediatyypiksi 'File Upload'-asetuksissa.",
   "Message_view_mode_info": "Tämä muuttaa sitä, kuinka paljon tilaa viestit vievät ruudulla.",
+  "Message": "Viestit",
   "messages": "Viestit",
   "Messages": "Viestit",
-  "Mmessages": "viestien",
   "Messages_that_are_sent_to_the_Incoming_WebHook_will_be_posted_here": "Viestit, jotka lähetetään sisääntulevaan WebHookiin, postataan tänne",
   "Meta": "Meta",
   "Meta_custom": "Mukautetut Meta Tags",
@@ -2512,8 +2511,6 @@
   "This_is_a_push_test_messsage": "Tämä on testi-pushviesti",
   "This_room_has_been_archived_by__username_": "Tämä huone on arkistoitu käyttäjän __username__ toimesta",
   "This_room_has_been_unarchived_by__username_": "Tämä huone on palautettu arkistosta käyttäjän __username__ toimesta",
-  "Thread_slash_command_params": "viestisi",
-  "Threading_context_menu_none": "Näkymätön",
   "Thursday": "torstai",
   "Time_in_seconds": "Aika sekunneissa",
   "Title": "Otsikko",
diff --git a/packages/rocketchat-i18n/i18n/fr.i18n.json b/packages/rocketchat-i18n/i18n/fr.i18n.json
index 6ded3282f3fe..8b5e0a644636 100644
--- a/packages/rocketchat-i18n/i18n/fr.i18n.json
+++ b/packages/rocketchat-i18n/i18n/fr.i18n.json
@@ -1714,7 +1714,6 @@
   "Mentions_default": "Mentions (défaut)",
   "Mentions_only": "Mentions seulement",
   "Merge_Channels": "Fusionner les chaînes",
-  "Message": "Message",
   "Message_AllowBadWordsFilter": "Autoriser le filtrage des mots interdits dans les messages",
   "Message_AllowDeleting": "Autoriser la suppression de message",
   "Message_AllowDeleting_BlockDeleteInMinutes": "Bloquer la suppression des messages après (n) minutes",
@@ -1782,9 +1781,9 @@
   "Message_VideoRecorderEnabled": "Enregistreur vidéo activé",
   "Message_VideoRecorderEnabledDescription": "Nécessite que le type de média \"video/webm\" soit accepté dans les paramètres d'envoi des fichiers.",
   "Message_view_mode_info": "Cela modifie l'espace pris par les messages à l'écran.",
+  "Message": "Message",
   "messages": "Messages",
   "Messages": "Messages",
-  "Mmessages": "messages",
   "Messages_that_are_sent_to_the_Incoming_WebHook_will_be_posted_here": "Les messages envoyés au WebHook Entrant seront postés ici.",
   "Meta": "Meta",
   "Meta_custom": "Balises Meta personnalisées",
@@ -2514,8 +2513,6 @@
   "This_is_a_push_test_messsage": "Ceci est une notification de test",
   "This_room_has_been_archived_by__username_": "Ce salon a été archivé par __username__",
   "This_room_has_been_unarchived_by__username_": "Ce salon a été désarchivé par __username__",
-  "Thread_slash_command_params": "votre message",
-  "Threading_context_menu_none": "Invisible",
   "Thursday": "Jeudi",
   "Time_in_seconds": "Temps en secondes",
   "Title": "Titre",
diff --git a/packages/rocketchat-i18n/i18n/he.i18n.json b/packages/rocketchat-i18n/i18n/he.i18n.json
index 094800158560..df8ef49ebdfd 100644
--- a/packages/rocketchat-i18n/i18n/he.i18n.json
+++ b/packages/rocketchat-i18n/i18n/he.i18n.json
@@ -819,7 +819,6 @@
   "Mentions_default": "אזכורים (ברירת מחדל)",
   "Mentions_only": "אזכורים בלבד",
   "Merge_Channels": "מזג ערוצים",
-  "Message": "הודעה",
   "Message_AllowBadWordsFilter": "אפשר סינון מילים רעות",
   "Message_AllowDeleting": "לאפשר מחיקת הודעות",
   "Message_AllowDeleting_BlockDeleteInMinutes": "בלוק הודעה מחיק אחרי (n) פרוטוקול",
@@ -857,6 +856,7 @@
   "Message_TimeFormat_Description": "ראו גם: <a href=\"http://momentjs.com/docs/#/displaying/format/\" target=\"momemt\">Moment.js</a>",
   "Message_too_long": "ההודעה ארוכה מדי",
   "Message_view_mode_info": "זה משנה את כמות הודעות החלל תופסת על מסך.",
+  "Message": "הודעה",
   "messages": "הודעות",
   "Messages": "הודעות",
   "Messages_that_are_sent_to_the_Incoming_WebHook_will_be_posted_here": "הודעות נשלחות אל נכנס WebHook תפורסמנה כאן.",
@@ -1271,7 +1271,6 @@
   "This_is_a_push_test_messsage": "זוהי הודעת בדיקה של ה-push",
   "This_room_has_been_archived_by__username_": "חדר זה כבר בארכיון ידי __שם משתמש__",
   "This_room_has_been_unarchived_by__username_": "חדר זה הוסר מארכיון ידי __שם משתמש__",
-  "Threading_context_menu_none": "בלתי נראה",
   "Thursday": "יום חמישי",
   "Time_in_seconds": "זמן בשניות",
   "Title": "כותרת",
diff --git a/packages/rocketchat-i18n/i18n/hi-IN.i18n.json b/packages/rocketchat-i18n/i18n/hi-IN.i18n.json
new file mode 100644
index 000000000000..e720bf5fae05
--- /dev/null
+++ b/packages/rocketchat-i18n/i18n/hi-IN.i18n.json
@@ -0,0 +1,197 @@
+{
+  "403": "प्रतिबंधित",
+  "500": "आंतरिक सर्वर त्रुटि",
+  "#channel": "#चैनल",
+  "0_Errors_Only": "0 - त्रुटियां केवल",
+  "12_Hour": "12-घंटे की घड़ी",
+  "1_Errors_and_Information": "1 - त्रुटियां और सूचना",
+  "24_Hour": "24-घंटे की घड़ी",
+  "2_Erros_Information_and_Debug": "2 - त्रुटियां, सूचना और डिबग",
+  "@username": "@यूज़रनेम",
+  "@username_message": "@यूज़रनेम <message0>",
+  "__username__is_no_longer__role__defined_by__user_by_": "__username__ is no longer __role__ by __user_by__",
+  "__username__was_set__role__by__user_by_": "__username__ was set __role__ by __user_by__",
+  "%_of_conversations": "% बातचीत",
+  "Accept": "स्वीकार करें",
+  "Accept_incoming_livechat_requests_even_if_there_are_no_online_agents": "यदि कोई ऑनलाइन एजेंट नहीं हैं, तो भी इनकमिंग लाइवचैट अनुरोध स्वीकार करें",
+  "Accept_with_no_online_agents": "कोई ऑनलाइन एजेंटों के साथ स्वीकार करें",
+  "access-mailer": "मेलर स्क्रीन एक्सेस करें",
+  "access-mailer_description": "सभी उपयोगकर्ताओं को बड़े पैमाने पर ईमेल भेजने की अनुमति।",
+  "access-permissions": "अनुमतियाँ स्क्रीन एक्सेस करें",
+  "access-permissions_description": "विभिन्न भूमिकाओं के लिए अनुमतियों को संशोधित करें।",
+  "Access_not_authorized": "प्रवेश अधिकृत नहीं है",
+  "Access_Token_URL": "एक्सेस टोकन URL",
+  "Accessing_permissions": "अक्सेस्सिंग की अनुमति",
+  "Account_SID": "खाता एसआईडी",
+  "Accounts": "खाता",
+  "Accounts_Admin_Email_Approval_Needed_Default": "<p>The user <b>[name] ([email])</b> has been registered.</p><p>Please check \"Administration -> Users\" to activate or delete it.</p>",
+  "Accounts_Admin_Email_Approval_Needed_Subject_Default": "एक नया उपयोगकर्ता पंजीकृत है और उसे अनुमोदन की आवश्यकता है",
+  "Accounts_Admin_Email_Approval_Needed_With_Reason_Default": "<p>The user <b>[name] ([email])</b> has been registered.</p><p>Reason: <b>[reason]</b></p><p>Please check \"Administration -> Users\" to activate or delete it.</p>",
+  "Accounts_AllowAnonymousRead": "अनाम पढ़ने की अनुमति दें",
+  "Accounts_AllowAnonymousWrite": "अनाम लिखने की अनुमति दें",
+  "Accounts_AllowDeleteOwnAccount": "उपयोगकर्ताओं को स्वयं का खाता हटाने की अनुमति दें",
+  "Accounts_AllowedDomainsList": "अनुमत डोमेन सूची",
+  "Accounts_AllowedDomainsList_Description": "अनुमत डोमेन की कोमा-पृथक सूची",
+  "Accounts_AllowEmailChange": "ईमेल परिवर्तन की अनुमति दें",
+  "Accounts_AllowPasswordChange": "पासवर्ड बदलने की अनुमति दें",
+  "Accounts_AllowRealNameChange": "नाम बदलने की अनुमति दें",
+  "Accounts_AllowUserAvatarChange": "उपयोगकर्ता अवतार परिवर्तन की अनुमति दें",
+  "Accounts_AllowUsernameChange": "उपयोगकर्ता नाम बदलने की अनुमति दें",
+  "Accounts_AllowUserProfileChange": "उपयोगकर्ता प्रोफ़ाइल बदलने की अनुमति दें",
+  "Accounts_AvatarBlockUnauthenticatedAccess": "अपुष्ट एक्सेस को अवतारों से ब्लॉक करें",
+  "Accounts_AvatarCacheTime": "अवतार कैश समय",
+  "Accounts_AvatarCacheTime_description": "HTTP प्रोटोकॉल को अवतार छवियों को कैश करने के लिए सेकंड की संख्या बताई गई है।",
+  "Accounts_AvatarResize": "अवतार का आकार बदलें",
+  "Accounts_AvatarSize": "अवतार का आकार",
+  "Accounts_AvatarExternalProviderUrl": "अवतार बाहरी प्रदाता URL",
+  "Accounts_AvatarExternalProviderUrl_Description": "उदाहरण: `https://acme.com/api/v1/ {उपयोगकर्ता नाम}`",
+  "Accounts_BlockedDomainsList": "अवरुद्ध डोमेन सूची",
+  "Accounts_BlockedDomainsList_Description": "अवरुद्ध डोमेन की कोमा से अलग सूची",
+  "Accounts_BlockedUsernameList": "अवरुद्ध उपयोगकर्ता नाम सूची",
+  "Accounts_BlockedUsernameList_Description": "कॉमा-अवरुद्ध उपयोगकर्ता नाम की अलग-अलग सूची (केस-असंवेदनशील)",
+  "Accounts_CustomFields_Description": "एक वैध JSON होना चाहिए जहां कुंजियाँ फ़ील्ड नाम हैं जिसमें फ़ील्ड सेटिंग्स का शब्दकोश है। उदाहरण:<br/><code>{\n \"role\": {\n  \"type\": \"select\",\n  \"defaultValue\": \"student\",\n  \"options\": [\"teacher\", \"student\"],\n  \"required\": true,\n  \"modifyRecordField\": {\n   \"array\": true,\n   \"field\": \"roles\"\n  }\n },\n \"twitter\": {\n  \"type\": \"text\",\n  \"required\": true,\n  \"minLength\": 2,\n  \"maxLength\": 10\n }\n}</code> ",
+  "Accounts_CustomFieldsToShowInUserInfo": "कस्टम फ़ील्ड उपयोगकर्ता जानकारी में दिखाने के लिए",
+  "Accounts_Default_User_Preferences": "डिफ़ॉल्ट उपयोगकर्ता प्राथमिकताएं",
+  "Accounts_Default_User_Preferences_audioNotifications": "ऑडियो सूचनाएं डिफ़ॉल्ट चेतावनी",
+  "Accounts_Default_User_Preferences_desktopNotifications": "डेस्कटॉप सूचनाएं डिफ़ॉल्ट चेतावनी",
+  "Accounts_Default_User_Preferences_mobileNotifications": "मोबाइल सूचनाएं डिफ़ॉल्ट चेतावनी",
+  "Accounts_Default_User_Preferences_not_available": "उपयोगकर्ता प्राथमिकताएँ प्राप्त करने में विफल, क्योंकि वे उपयोगकर्ता द्वारा अभी तक सेट नहीं किए गए हैं",
+  "Accounts_DefaultUsernamePrefixSuggestion": "डिफ़ॉल्ट उपयोगकर्ता नाम उपसर्ग सुझाव",
+  "Accounts_denyUnverifiedEmail": "अयोग्य ईमेल अस्वीकार करें",
+  "Accounts_Email_Activated": "[name]<br/><br/><p>आपका खाता सक्रिय हो गया था।</p>",
+  "Accounts_Email_Activated_Subject": "खाता सक्रिय किया गया",
+  "Accounts_Email_Approved": "[name]<br/><br/><p>आपका खाता स्वीकृत हो गया।</p>",
+  "Accounts_Email_Approved_Subject": "खाता स्वीकृत हुआ",
+  "Accounts_Email_Deactivated": "[name] <br0/> <br1/> <P2> आपका खाता निष्क्रिय कर दिया गया।</p>",
+  "Accounts_Enrollment_Email_Default": "<h1>Welcome to <strong>[Site_Name]</strong></h1><p>Go to <a href=\"[Site_URL]\">[Site_URL]</a> and try the best open source chat solution available today!</p>",
+  "Accounts_Email_Deactivated_Subject": "खाता निष्क्रिय किया गया",
+  "Accounts_EmailVerification": "ई - मेल सत्यापन",
+  "Accounts_EmailVerification_Description": "सुनिश्चित करें कि आपके पास इस सुविधा का उपयोग करने के लिए SMTP सेटिंग्स सही हैं",
+  "Accounts_Enrollment_Email_Subject_Default": "[Site_Name] में आपका स्वागत है",
+  "Accounts_Enrollment_Email": "नामांकन ईमेल",
+  "Accounts_Enrollment_Email_Description": "आप निम्नलिखित प्लेसहोल्डर का उपयोग कर सकते हैं: <br0 /> <ul> <li> [name], [fname], [lname] उपयोगकर्ता के पूर्ण नाम के लिए, क्रमशः पहला नाम या अंतिम नाम। </ li2> <li>। ईमेल] उपयोगकर्ता के ईमेल के लिए। </ li3> <li> [Site_Name] और [Site_URL] क्रमशः अनुप्रयोग नाम और URL के लिए। </ li4> </ ul1>\n",
+  "Accounts_ForgetUserSessionOnWindowClose": "विंडो बंद होने पर उपयोगकर्ता सत्र को भूल जाएं",
+  "Accounts_Iframe_api_method": "API विधि",
+  "Accounts_Iframe_api_url": "API URL",
+  "Accounts_iframe_enabled": "सक्रिय",
+  "Accounts_iframe_url": "Iframe URL",
+  "Accounts_LoginExpiration": "दिन में प्रवेश की समाप्ति",
+  "Accounts_ManuallyApproveNewUsers": "नए उपयोगकर्ताओं को मैन्युअल रूप से अनुमोदित करें",
+  "Accounts_OAuth_Custom_Authorize_Path": "पथ अधिकृत करें",
+  "Accounts_OAuth_Custom_Button_Color": "बटन का रंग",
+  "Accounts_OAuth_Custom_Button_Label_Color": "बटन टेक्स्ट का रंग",
+  "Accounts_OAuth_Custom_Button_Label_Text": "बटन टेक्स्ट",
+  "Accounts_OAuth_Custom_Enable": "सक्षम करें",
+  "Accounts_OAuth_Custom_id": "Id",
+  "Accounts_OAuth_Custom_Identity_Path": "पहचान पथ",
+  "Accounts_OAuth_Custom_Identity_Token_Sent_Via": "के जरिए पहचान टोकन भेजा गया",
+  "Accounts_OAuth_Custom_Login_Style": "लॉगिन शैली",
+  "Accounts_OAuth_Custom_Merge_Users": "उपयोगकर्ताओं को मर्ज करें",
+  "Accounts_OAuth_Custom_Scope": "क्षेत्र",
+  "Accounts_OAuth_Custom_Secret": "गुप्त",
+  "Accounts_OAuth_Custom_Token_Path": "टोकन पथ",
+  "Accounts_OAuth_Custom_Token_Sent_Via": "के जरिए टोकन भेजा गया",
+  "Accounts_OAuth_Custom_Username_Field": "उपयोगकर्ता नाम फ़ील्ड",
+  "Accounts_OAuth_Drupal": "Drupal लॉगिन सक्षम है",
+  "Accounts_OAuth_Drupal_callback_url": "Drupal oAuth2 रीडायरेक्ट URI",
+  "Accounts_OAuth_Drupal_id": "Drupal oAuth2 क्लाइंट आईडी",
+  "Accounts_OAuth_Drupal_secret": "Drupal oAuth2 क्लाइंट सीक्रेट",
+  "Accounts_OAuth_Facebook": "फेसबुक लोगिन",
+  "Accounts_OAuth_Facebook_callback_url": "फेसबुक कॉलबैक URL",
+  "Accounts_OAuth_Facebook_id": "फेसबुक ऐप आईडी",
+  "Accounts_OAuth_Facebook_secret": "फेसबुक सीक्रेट",
+  "Accounts_OAuth_Github": "OAuth सक्षम",
+  "Accounts_OAuth_Github_callback_url": "GitHub कॉलबैक यूआरएल",
+  "Accounts_OAuth_GitHub_Enterprise": "OAuth सक्षम",
+  "Accounts_OAuth_GitHub_Enterprise_callback_url": "GitHub एंटरप्राइज़ कॉलबैक URL",
+  "Accounts_OAuth_GitHub_Enterprise_id": "क्लाइंट  ID",
+  "Accounts_OAuth_GitHub_Enterprise_secret": "क्लाइंट Secret",
+  "Accounts_OAuth_Github_id": "क्लाइंट Id",
+  "Accounts_OAuth_Github_secret": "क्लाइंट Secret",
+  "Accounts_OAuth_Gitlab": "OAuth सक्षम",
+  "Accounts_OAuth_Gitlab_callback_url": "GitLab कॉलबैक URL",
+  "Accounts_OAuth_Gitlab_id": "Gitlab Id",
+  "Accounts_OAuth_Gitlab_secret": "क्लाइंट Secret",
+  "Accounts_OAuth_Google": "Google लॉगिन",
+  "Accounts_OAuth_Google_callback_url": "Google कॉलबैक URL",
+  "Accounts_OAuth_Google_id": "Google Id",
+  "Accounts_OAuth_Google_secret": "Google Secret",
+  "Accounts_OAuth_Linkedin": "LinkedIn लॉगिन",
+  "Accounts_OAuth_Linkedin_callback_url": "LinkedIn कॉलबैक URL",
+  "Accounts_OAuth_Linkedin_id": "LinkedIn Id",
+  "Accounts_OAuth_Linkedin_secret": "LinkedIn Secret",
+  "Accounts_OAuth_Meteor": "Meteor Login",
+  "Accounts_OAuth_Meteor_callback_url": "Meteor कॉलबैक URL",
+  "Accounts_OAuth_Meteor_id": "Meteor Id",
+  "Accounts_OAuth_Meteor_secret": "Meteor Secret",
+  "Accounts_OAuth_Proxy_host": "प्रॉक्सी होस्ट",
+  "Accounts_OAuth_Proxy_services": "प्रॉक्सी सेवाएँ",
+  "Accounts_OAuth_Tokenpass": "Tokenpass लॉगइन",
+  "Accounts_OAuth_Tokenpass_callback_url": "Tokenpass कॉलबैक URL",
+  "Accounts_OAuth_Tokenpass_id": "Tokenpass Id",
+  "Accounts_OAuth_Tokenpass_secret": "Tokenpass Secret",
+  "Accounts_OAuth_Twitter": "ट्विटर लॉगइन",
+  "Accounts_OAuth_Twitter_callback_url": "ट्विटर कॉलबैक URL",
+  "Accounts_OAuth_Twitter_id": "ट्विटर Id",
+  "Accounts_OAuth_Twitter_secret": "ट्विटर Secret",
+  "Accounts_OAuth_Wordpress": "वर्डप्रेस लॉगिन",
+  "Accounts_OAuth_Wordpress_authorize_path": "पथ अधिकृत करें",
+  "Accounts_OAuth_Wordpress_callback_url": "वर्डप्रेस कॉलबैक URL",
+  "Accounts_OAuth_Wordpress_id": "वर्डप्रेस Id",
+  "Accounts_OAuth_Wordpress_identity_path": "पहचान पथ",
+  "Accounts_OAuth_Wordpress_identity_token_sent_via": "पहचान टोकन भेजा गया",
+  "Accounts_OAuth_Wordpress_scope": "क्षेत्र",
+  "Accounts_OAuth_Wordpress_secret": "वर्डप्रेस Secret",
+  "Accounts_OAuth_Wordpress_server_type_custom": "कस्टम",
+  "Accounts_OAuth_Wordpress_server_type_wordpress_com": "Wordpress.com",
+  "Accounts_OAuth_Wordpress_server_type_wp_oauth_server": "WP OAuth Server Plugin",
+  "Accounts_OAuth_Wordpress_token_path": "टोकन पथ",
+  "Accounts_Password_Policy_AtLeastOneLowercase": "कम से कम एक लोअरकेस में",
+  "Accounts_Password_Policy_AtLeastOneLowercase_Description": "लागू करें कि पासवर्ड में कम से कम एक लोअरकेस वर्ण हो।",
+  "Accounts_Password_Policy_AtLeastOneNumber": "कम से कम एक नंबर",
+  "Accounts_Password_Policy_AtLeastOneNumber_Description": "लागू करें कि एक पासवर्ड में कम से कम एक संख्यात्मक चरित्र होता है।",
+  "Accounts_Password_Policy_AtLeastOneUppercase_Description": "लागू करें कि पासवर्ड में कम से कम एक लोअरकेस वर्ण हो।",
+  "Additional_Feedback": "अतिरिक्त प्रतिक्रिया",
+  "App_status_auto_enabled": "सक्रिय",
+  "App_status_manually_enabled": "सक्रिय",
+  "Appearance": "दिखावट",
+  "Audio_Notifications_Default_Alert": "ऑडियो सूचनाएं डिफ़ॉल्ट चेतावनी",
+  "Cancel": "रद्द करना",
+  "Cancel_message_input": "रद्द करना",
+  "CAS_enabled": "सक्रिय",
+  "Client_Secret": "क्लाइंट Secret",
+  "Custom": "कस्टम",
+  "Desktop_Notifications_Default_Alert": "डेस्कटॉप सूचनाएं डिफ़ॉल्ट चेतावनी",
+  "Enable": "सक्षम करें",
+  "Enabled": "सक्रिय",
+  "How_friendly_was_the_chat_agent": "चैट एजेंट कितना दोस्ताना था?",
+  "How_knowledgeable_was_the_chat_agent": "चैट एजेंट कितना जानकार था?",
+  "How_responsive_was_the_chat_agent": "चैट एजेंट कितना उत्तरदायी था?",
+  "How_satisfied_were_you_with_this_chat": "आप इस चैट से कितने संतुष्ट थे?",
+  "Installation": "स्थापना",
+  "LDAP_Authentication": "सक्षम करें",
+  "LDAP_Enable": "सक्षम करें",
+  "LDAP_User_Search_Scope": "क्षेत्र",
+  "Mobile_Notifications_Default_Alert": "मोबाइल सूचनाएं डिफ़ॉल्ट चेतावनी",
+  "New_messages": "नए संदेश",
+  "Options": "विकल्प",
+  "Please_answer_survey": "कृपया इस चैट के बारे में त्वरित सर्वेक्षण का उत्तर देने के लिए एक क्षण लें",
+  "Please_fill_name_and_email": "कृपया नाम और ईमेल भरें",
+  "Push_enable": "सक्षम करें",
+  "RetentionPolicy_Enabled": "सक्रिय",
+  "Scope": "क्षेत्र",
+  "Select_a_department": "एक विभाग का चयन करें",
+  "Send": "\nभेजना",
+  "Skip": "छोड़ें",
+  "Start_Chat": "बातचीत शुरू ",
+  "Survey": "सर्वेक्षण",
+  "Survey_instructions": "प्रत्येक प्रश्न को अपनी संतुष्टि के अनुसार रेट करें, 1 मतलब कि आप पूरी तरह से असंतुष्ट हैं और 5 का अर्थ है कि आप पूरी तरह से संतुष्ट हैं।",
+  "Thank_you_for_your_feedback": "आपकी प्रतिक्रिया के लिए आपका धन्यवाद",
+  "Type_your_email": "अपना ईमेल टाइप करें",
+  "Type_your_message": "अपना संदेश टाइप करें",
+  "Type_your_name": "अपना नाम लिखें",
+  "Upload_file_question": "दस्तावेज अपलोड करें?",
+  "We_are_offline_Sorry_for_the_inconvenience": "हम ऑफ़लाइन हैं। असुविधा के लिए खेद है।",
+  "Yes": "हाँ",
+  "You": "आप"
+}
\ No newline at end of file
diff --git a/packages/rocketchat-i18n/i18n/hr.i18n.json b/packages/rocketchat-i18n/i18n/hr.i18n.json
index 4a36d925c9cf..420d45de524d 100644
--- a/packages/rocketchat-i18n/i18n/hr.i18n.json
+++ b/packages/rocketchat-i18n/i18n/hr.i18n.json
@@ -3,12 +3,15 @@
   "500": "Interna pogreška poslužitelja",
   "#channel": "#soba",
   "0_Errors_Only": "0 - Samo Pogreške",
+  "12_Hour": "12-satni sat",
   "1_Errors_and_Information": "1 - Pogreške i informacije",
+  "24_Hour": "24-satni sat",
   "2_Erros_Information_and_Debug": "2 - Pogreške, informacije i ispravak pogrešaka",
   "@username": "@korisničko.ime",
   "@username_message": "@korisničko.ime <message>",
   "__username__is_no_longer__role__defined_by__user_by_": "__user_by__ je uklonio __username__ iz __role__ grupe",
   "__username__was_set__role__by__user_by_": "__user_by__ je postavio __username__ u __role__ grupu ",
+  "%_of_conversations": "% razgovora",
   "Accept": "Prihvati",
   "Accept_incoming_livechat_requests_even_if_there_are_no_online_agents": "Prihvatite livechate zahtjev čak i ako nema aktivnih agenata",
   "Accept_with_no_online_agents": "Prihvati bez aktivnih agenata",
@@ -22,10 +25,10 @@
   "Account_SID": "SID račun",
   "Accounts": "Računi",
   "Accounts_Admin_Email_Approval_Needed_Default": "<p>Korisnik <b>[ime] ([email])</b> registriran je.</p><p>Potvrdite \"Administrator -\" Korisnici da biste ga aktivirali ili izbrisali.</p>",
-  "Accounts_Admin_Email_Approval_Needed_Subject_Default": "Novi korisnik registriran i potreban je odobrenje",
+  "Accounts_Admin_Email_Approval_Needed_Subject_Default": "Novi korisnik registriran i potrebno je odobrenje",
   "Accounts_Admin_Email_Approval_Needed_With_Reason_Default": "<p>Korisnik <b>[ime] ([email])</b> registriran je.</p><p>Razlog: <b>[razlog]</b></p><p>Provjerite \"Administracija -\" Korisnici da biste ga aktivirali ili izbrisali.</p>",
   "Accounts_AllowAnonymousRead": "Dopusti anonimno čitanje",
-  "Accounts_AllowAnonymousWrite": "Dopusti Anonimno pisanje",
+  "Accounts_AllowAnonymousWrite": "Dopusti anonimno pisanje",
   "Accounts_AllowDeleteOwnAccount": "Dopusti korisnicima da izbrišu svoj račun",
   "Accounts_AllowedDomainsList": "Popis dopuštenih domena",
   "Accounts_AllowedDomainsList_Description": "Popis dopuštenih domena, odvojene zarezom",
@@ -35,10 +38,13 @@
   "Accounts_AllowUserAvatarChange": "Dopusti Promjenu Avatara",
   "Accounts_AllowUsernameChange": "Dopusti promjenu korisničkog imena",
   "Accounts_AllowUserProfileChange": "Dopusti Promjenu Profila",
+  "Accounts_AvatarBlockUnauthenticatedAccess": "Blokiranje neovlaštenog pristupa avatarima",
   "Accounts_AvatarCacheTime": "Avatar vrijeme predmemorije",
   "Accounts_AvatarCacheTime_description": "Broj sekundi HTTP protokola je ispričano kako bi predmemorirala slike avatara.",
   "Accounts_AvatarResize": "Promjeni veličinu Avatara",
   "Accounts_AvatarSize": "Veličina Avatara",
+  "Accounts_AvatarExternalProviderUrl": "URL vanjskog pružatelja avatara",
+  "Accounts_AvatarExternalProviderUrl_Description": "Primjer: `https://acme.com/api/v1/ {username}`",
   "Accounts_BlockedDomainsList": "Popis blokiranih domena",
   "Accounts_BlockedDomainsList_Description": "Popis blokiranih domena odvojenih zarezom",
   "Accounts_BlockedUsernameList": "Popis blokiranih korisničkih imena",
@@ -172,6 +178,9 @@
   "Accounts_RequireNameForSignUp": "Zahtijevaj ime pri prijavi",
   "Accounts_RequirePasswordConfirmation": "Zahtjevaj potvrdu lozinke",
   "Accounts_SearchFields": "Polja koja treba razmotriti u pretraživanju",
+  "Accounts_Send_Email_When_Activating": "Pošalji email korisniku kada je korisnik aktiviran",
+  "Accounts_Send_Email_When_Deactivating": "Pošalji email korisniku kada je korisnik deaktiviran",
+  "Accounts_Directory_DefaultView": "Zadani popis direktorija",
   "Accounts_SetDefaultAvatar": "Namjesti zadani Avatar",
   "Accounts_SetDefaultAvatar_Description": "Pokušava odrediti zadani avatar prema OAuth računu ili Gravataru",
   "Accounts_ShowFormLogin": "Prikaži obrazac za prijavu",
@@ -212,6 +221,7 @@
   "Additional_Feedback": "Dodatne povratne informacije",
   "additional_integrations_Bots": "Ako tražite kako integrirati svoj bot, nemojte gledati dalje od našeg Hubot adaptera. <a href='https://github.com/RocketChat/hubot-rocketchat' target='_blank'>https://github.com/RocketChat/hubot-rocketchat</a>",
   "additional_integrations_Zapier": "Tražite li integrirati drugi softver i aplikacije s Rocket.Chat, ali nemate vremena za ručno raditi? Onda predlažemo da koristite Zapier koji u potpunosti podržavamo. Pročitajte više o našoj dokumentaciji. <a href='https://rocket.chat/docs/administrator-guides/integrations/zapier/using-zaps/' target='_blank'>https://rocket.chat/docs/administrator-guides/integrations/zapier/using-zaps/</a>",
+  "Admin_disabled_encryption": "Vaš administrator nije omogućio E2E šifriranje.",
   "Admin_Info": "Informacije o administratoru",
   "Administration": "Administracija",
   "Adult_images_are_not_allowed": "Slike za odrasle nisu dopuštene",
@@ -225,6 +235,7 @@
   "Alias_Format": "Format pseudonima",
   "Alias_Format_Description": "Uvezi poruke sa Slacka s pseudonimom; %s će biti zamjeno s korisničkim imenom korisnika. Ako je prazno, pseudonim neće biti korišten.",
   "Alias_Set": "Alias namješten",
+  "Aliases": "Pseudonimi",
   "All": "Svi",
   "All_added_tokens_will_be_required_by_the_user": "Korisnik će zahtijevati sve dodane oznake",
   "All_channels": "Svi kanali",
@@ -232,10 +243,13 @@
   "All_messages": "Sve poruke",
   "All_users": "Svi korisnici",
   "All_users_in_the_channel_can_write_new_messages": "Svi korisnici kanala mogu pisati nove poruke",
+  "Allow_collect_and_store_HTTP_header_informations": "Dopusti prikupljanje i pohranjivanje HTTP zaglavlja",
+  "Allow_collect_and_store_HTTP_header_informations_description": "Ova postavka određuje dopušta li Livechat pohranu podataka prikupljenih iz zaglavlja HTTP-a, kao što su IP adresa, korisnički agent i tako dalje.",
   "Allow_Invalid_SelfSigned_Certs": "Dopusti neispravne samopotpisane certifikate",
   "Allow_Invalid_SelfSigned_Certs_Description": "Dopusti nevažeće i samopotpisane SSL certifikate za poveznicu validacije i pretpregleda.",
   "Allow_switching_departments": "Dopustite posjetitelju prebacivanje odjela",
   "Allow_Marketing_Emails": "Dopusti marketing e-poštu",
+  "Almost_done": "Skoro gotovo",
   "Alphabetical": "abecedni",
   "Always_open_in_new_window": "Uvijek otvori u novom prozoru",
   "Analytics": "Analitika",
@@ -250,9 +264,11 @@
   "Animals_and_Nature": "Životinje i Priroda",
   "Announcement": "Obavijest",
   "API": "API",
+  "API_Add_Personal_Access_Token": "Dodajte novi osobni pristupni token",
   "API_Allow_Infinite_Count": "Dopusti uzimajući sve",
   "API_Allow_Infinite_Count_Description": "Treba li se pozivima na REST API dopustiti da sve vratiti u jednom pozivu?",
   "API_Analytics": "Analitika",
+  "api-bypass-rate-limit": "Zaobilazak ograničenja upita za REST API",
   "API_CORS_Origin": "CORS podrijetlo",
   "API_Default_Count": "Zadani broj",
   "API_Default_Count_Description": "Zadani broj za rezultate REST API-ja ako potrošač nije pružio.",
@@ -271,11 +287,26 @@
   "API_Enable_CORS": "Omogući CORS",
   "API_Enable_Direct_Message_History_EndPoint": "Omogući završnu točku izravne poruke",
   "API_Enable_Direct_Message_History_EndPoint_Description": "To omogućuje `/ api / v1 / im.history.others` koji omogućuje gledanje izravnih poruka koje su drugi korisnici poslali da pozivatelj nije dio.",
+  "API_Enable_Rate_Limiter_Dev": "Omogući ograničenje upita u razvoju",
+  "API_Enable_Rate_Limiter_Dev_Description": "Treba li ograničiti količinu upita na krajnje točke u razvojnom okruženju?",
+  "API_Enable_Rate_Limiter_Limit_Calls_Default": "Zadani broj poziva za ograničenje upita",
+  "API_Enable_Rate_Limiter_Limit_Calls_Default_Description": "Broj zadanih poziva za svaku krajnju točku REST API-ja, dopušteno unutar vremenskog raspona definiranog ispod",
+  "API_Enable_Rate_Limiter_Limit_Time_Default": "Zadano vremensko ograničenje upita (u ms)",
+  "API_Enable_Rate_Limiter_Limit_Time_Default_Description": "Zadano vrijeme prekida za ograničavanje broja poziva na svakoj krajnjoj točki REST API-ja (u ms)",
+  "API_Enable_Personal_Access_Tokens": "Omogući osobne pristupne tokene za REST API",
+  "API_Enable_Personal_Access_Tokens_Description": "Omogući osobne pristupne tokene za upotrebu s REST API-jem",
   "API_Enable_Shields": "Omogući štitove",
   "API_Enable_Shields_Description": "Omogući štitove dostupne na `/ api / v1 / shield.svg`",
   "API_GitHub_Enterprise_URL": "GitHub Enterprise URL",
   "API_GitHub_Enterprise_URL_Description": "Na primjer: http://domain.com (isključujući kosu crtu na kraju)",
   "API_Gitlab_URL": "GitLab link",
+  "API_Personal_Access_Token_Name": "Naziv tokena za osobni pristup",
+  "API_Personal_Access_Tokens_To_REST_API": "Osobni tokeni za pristup na REST API",
+  "API_Personal_Access_Tokens_Remove_Modal": "Jeste li sigurni da želite ukloniti ovaj osobni pristupni token?",
+  "API_Personal_Access_Token_Generated": "Osobni token za pristup uspješno je generiran",
+  "API_Personal_Access_Token_Generated_Text_Token_s_UserId_s": "Pažljivo spremite svoj token jer ga nećete moći vidjeti poslije. <br/>Token: <strong>__token __ </strong><br/>Vaš korisnički Id: <strong>__userId __ </strong>",
+  "API_Personal_Access_Tokens_Regenerate_Modal": "Ako ste izgubili ili zaboravili svoj token, možete ga regenerirati, ali imajte na umu da sve aplikacije koje koriste ovaj token trebaju biti ažurirane",
+  "API_Personal_Access_Tokens_Regenerate_It": "Obnovite token",
   "API_Shield_Types": "Vrste štitova",
   "API_Shield_Types_Description": "Vrste štitova koji će se omogućiti kao popis odvojene zarezima, odaberite za \"online\", \"kanal\" ili \"*\" za sve",
   "API_Token": "API token",
@@ -288,6 +319,7 @@
   "Apiai_Key": "Api.ai ključ",
   "Apiai_Language": "Api.ai Jezik",
   "App_author_homepage": "početnu stranicu autora",
+  "App_Details": "Pojedinosti o aplikaciji",
   "App_Information": "Informacije o aplikaciji",
   "App_Installation": "Instalacija aplikacije",
   "App_status_auto_enabled": "Omogućeno",
@@ -301,6 +333,8 @@
   "App_status_manually_enabled": "Omogućeno",
   "App_status_unknown": "Nepoznato",
   "App_support_url": "podrška url",
+  "App_Url_to_Install_From": "Instalirajte iz URL-a",
+  "App_Url_to_Install_From_File": "Instalirajte iz datoteke",
   "Appearance": "Izgled",
   "Application_added": "Aplikacija dodana",
   "Application_Name": "Naziv aplikacije",
@@ -308,6 +342,7 @@
   "Apply": "primijeniti",
   "Apply_and_refresh_all_clients": "Primjeni i osvježi sve klijente",
   "Apps": "Apps",
+  "Apps_Engine_Version": "Verzija Apps Enginea",
   "Apps_Framework_enabled": "Omogućite Okvir za aplikacije",
   "Apps_Settings": "Postavke aplikacije",
   "Apps_WhatIsIt": "Aplikacije: Koje su to?",
@@ -323,9 +358,11 @@
   "Are_you_sure": "Jesi li siguran?",
   "Are_you_sure_you_want_to_delete_your_account": "Sigurni ste da želite izbrisati svoj račun?",
   "Are_you_sure_you_want_to_disable_Facebook_integration": "Jeste li sigurni da želite onemogućiti Facebook integraciju?",
+  "Assets": "Assetsi",
   "assign-admin-role": "Dodijelite administratorsku ulogu",
   "assign-admin-role_description": "Dopuštenje za dodjelu administratorske uloge drugim korisnicima",
   "Assign_admin": "Dodijeli administratora",
+  "assign-roles": "Dodjeljivanje uloga",
   "at": "na",
   "At_least_one_added_token_is_required_by_the_user": "Korisnik traži najmanje jedan dodani token",
   "AtlassianCrowd": "Atlassian Crowd",
@@ -337,6 +374,7 @@
   "Audio_Notifications_Default_Alert": "Zvučni obavijesti Zadani upozorenje",
   "Audio_Notifications_Value": "Audio obavijesti zadane poruke",
   "Auth_Token": "Autorizacijski token",
+  "Authentication": "Autentifikacija",
   "Author": "Autor",
   "Author_Information": "Informacije o autoru",
   "Authorization_URL": "URL za autorizaciju",
@@ -345,6 +383,7 @@
   "auto-translate_description": "Dopuštenje za korištenje alata za automatsko prevođenje",
   "Auto_Load_Images": "Automatski učitaj slike",
   "Auto_Translate": "Automatsko Prevoditelj",
+  "AutoLinker": "AutoLinker",
   "AutoLinker_Email": "AutoLinker Email",
   "AutoLinker_Phone": "AutoLinker Telefon",
   "AutoLinker_Phone_Description": "Automatski povezuj brojeve telefona. npr: '(123) 456-7890`",
@@ -355,6 +394,7 @@
   "AutoLinker_Urls_www": "AutoLinker \"www\" URL-ovi",
   "AutoLinker_UrlsRegExp": "AutoLinker URL Regularne ekspresije",
   "Automatic_Translation": "Automatski prijevod",
+  "Author_Site": "Autor",
   "AutoTranslate": "Automatsko Prevoditelj",
   "AutoTranslate_Change_Language_Description": "Promjena jezika automatskog prevođenja ne prevodi prethodne poruke.",
   "AutoTranslate_Enabled": "Omogući automatsko prevođenje",
@@ -366,6 +406,10 @@
   "Avatar_changed_successfully": "Avatar je uspješno promijenjen",
   "Avatar_URL": "URL Avatara",
   "Avatar_url_invalid_or_error": "Navedeni URL nije valjan ili nije dostupan. Pokušajte ponovno, ali s različitim URLom.",
+  "Avg_chat_duration": "Prosječno trajanje razgovora",
+  "Avg_first_response_time": "Prosječno vrijeme prvog odgovora",
+  "Avg_response_time": "Prosječno vrijeme odgovora",
+  "Avg_reaction_time": "Prosječno vrijeme reakcije",
   "away": "odsutan",
   "Away": "Odsutan",
   "away_female": "odsutna",
@@ -384,8 +428,12 @@
   "ban-user": "Ban User",
   "ban-user_description": "Dopuštenje zabrane korisnika s kanala",
   "Beta_feature_Depends_on_Video_Conference_to_be_enabled": "Beta značajka. Omogućuje se ovisi o video konferenciji.",
+  "Best_first_response_time": "Najbolje vrijeme prvog odgovora",
   "Block_User": "Blokiraj korisnika",
   "Blockchain": "Blockchain",
+  "Blockstack_Auth_Description": "Opis autorizacije",
+  "Blockstack_ButtonLabelText": "Tekst gumba",
+  "Blockstack_Generate_Username": "Izradi korisničko ime",
   "Body": "Tijelo",
   "bold": "podebljaj",
   "bot_request": "Bot zahtjev",
@@ -396,12 +444,19 @@
   "Broadcast_channel": "Kanal emitiranja",
   "Broadcast_channel_Description": "Samo ovlašteni korisnici mogu napisati nove poruke, ali ostali će korisnici moći odgovoriti",
   "Broadcast_Connected_Instances": "Prijenos povezanih primjeraka",
+  "Broadcasting_api_key": "API ključ za emitiranje",
+  "Broadcasting_client_id": "ID klijenta za emitiranje",
+  "Broadcasting_client_secret": "Tajna klijenta za emitiranje",
+  "Broadcasting_enabled": "Omogućeno emitiranje",
+  "Broadcasting_media_server_url": "URL emitiranja medijskog poslužitelja",
   "Bugsnag_api_key": "API ključ Bugsnaga",
   "Build_Environment": "Izgradite okoliš",
   "bulk-create-c": "Skupni rasporedi kanala",
   "bulk-create-c_description": "Dozvola za skupljanje kanala",
   "bulk-register-user": "Skupni rasporedi kanala",
   "bulk-register-user_description": "Dozvola za skupljanje kanala",
+  "Busiest_day": "Najprometniji dan",
+  "Busiest_time": "Najprometnije vrijeme",
   "busy": "zaposlen",
   "Busy": "Zaposlen",
   "busy_female": "zauzeta",
@@ -410,7 +465,9 @@
   "Busy_male": "Zauzet",
   "by": "od",
   "cache_cleared": "Predmemorija očišćena",
+  "call-management": "Upravljanje pozivima",
   "Cancel": "Otkaži",
+  "Canceled": "Otkazano",
   "Cancel_message_input": "Otkaži",
   "Cannot_invite_users_to_direct_rooms": "Ne mogu pozvati korisnike da izravne sobe",
   "Cannot_open_conversation_with_yourself": "Nije moguće izravno poručiti sa sobom",
@@ -432,7 +489,10 @@
   "CAS_Sync_User_Data_FieldMap_Description": "Koristite ovaj ulaz JSON za izradu internih atributa (ključa) od vanjskih atributa (vrijednost).<br/>Primjer, \"{\" email \":\"% e-mail% \",\" ime \":\"% ime1%,% prezime% \"}<br/><br/>Karta atributa uvijek je interpolirana. U CAS 1.0, dostupan je samo atribut \"korisničko ime\". Dostupni unutarnji atributi su: korisničko ime, ime, e-mail, sobe; soba je odvojeni popis mjesta za pridruživanje korisniku, primjerice: {\"sobe\": \"% team%,% odjel%\"} pridružit će se korisnicima CAS-a na stvaranju kanala njihovog tima i odjela.",
   "CAS_version": "CAS verzija",
   "CAS_version_Description": "Koristite samo podržanu CAS verziju koju podržava CAS SSO usluga.",
+  "Categories": "Kategorije",
   "CDN_PREFIX": "CDN Prefiks",
+  "CDN_PREFIX_ALL": "Koristite CDN prefiks za sve assetse",
+  "CDN_JSCSS_PREFIX": "CDN prefiks za JS/CSS",
   "Certificates_and_Keys": "Certifikati i ključevi",
   "Change_Room_Type": "Mijenjam tip sobe",
   "Changing_email": "Promjena email",
@@ -512,12 +572,15 @@
   "Choose_the_username_that_this_integration_will_post_as": "Odaberite korisničko ime za koje će ova integracija objavljivati.",
   "clean-channel-history": "Očisti povijest kanala",
   "clean-channel-history_description": "Dozvola za brisanje povijesti s kanala",
+  "Clean_Usernames": "Očisti korisnička imena",
   "clear": "Očisti",
   "Clear_all_unreads_question": "Očisti sve nepročitane?",
   "clear_cache_now": "Očisti sada predmemoriju",
   "clear_history": "Očisti Povijest",
   "Click_here": "Kliknite ovdje",
   "Click_here_for_more_info": "Kliknite ovdje za više informacija",
+  "Click_here_to_enter_your_encryption_password": "Kliknite ovdje da biste unijeli zaporku za šifriranje",
+  "Click_here_to_view_and_copy_your_password": "Kliknite ovdje da biste pogledali i kopirali zaporku.",
   "Click_the_messages_you_would_like_to_send_by_email": "Kliknite poruke koje biste željeli poslati e-poštom",
   "Click_to_join": "Pridružite se!",
   "Client_ID": "ID klijenta",
@@ -532,35 +595,60 @@
   "Closed": "Zatvoreno",
   "Closed_by_visitor": "Zatvorio posjetitelj",
   "Closing_chat": "Zatvaranje chata",
+  "Cloud": "Cloud",
+  "Cloud_connect": "Rocket.Chat Cloud Connect",
+  "Cloud_what_is_it": "Što je ovo?",
+  "Cloud_what_is_it_description": "Rocket.Chat Cloud Connect omogućuje vam povezivanje vašeg Rocket.Chat radnog prostora koje ste sami ugradili u naš Cloud. Na taj način možete upravljati licencama, naplatom i podrškom u Rocket.Chat Cloudu.",
+  "Cloud_workspace_connected_plus_account": "Vaš radni prostor sada je spojen na Rocket.Chat Cloud i pridružen je račun.",
+  "Cloud_workspace_connected_without_account": "Vaš radni prostor sada je povezan s oblakom Rocket.Chat. Ako želite, možete se prijaviti na Rocket.Chat Cloud i povezati vaš radni prostor s vašim Cloud računom.",
+  "Cloud_login_to_cloud": "Prijava u Rocket.Chat Cloud",
+  "Cloud_address_to_send_registration_to": "Adresa za slanje e-pošte za registraciju u Cloudu.",
+  "Cloud_update_email": "Ažuriraj e-poštu",
+  "Cloud_manually_input_token": "Ručno unesite token primljen iz e-pošte za registraciju u Cloudu.",
+  "Cloud_registration_required": "Potrebna je registracija",
+  "Cloud_registration_required_description": "Izgleda da tijekom postavljanja niste odabrali registrirati svoj radni prostor.",
+  "Cloud_registration_requried_link_text": "Kliknite ovdje da biste registrirali svoj radni prostor.",
+  "Cloud_error_in_authenticating": "Pri provjeri autentičnosti primljena je pogreška",
+  "Cloud_error_code": "Kod:",
+  "Collaborative": "Kolaborativni",
   "Collapse_Embedded_Media_By_Default": "Zadano sakrij sve ugrađene medije",
   "color": "Boja",
   "Color": "Boja",
+  "Colors": "Boje",
   "Commands": "Naredbe",
   "Comment_to_leave_on_closing_session": "Komentar ostaviti na završnoj sesiji",
   "Common_Access": "Zajednički pristup",
   "Community": "Zajednica",
   "Compact": "Kompaktan",
   "Condensed": "Kondenzovan",
+  "Completed": "Završeno",
   "Computer": "Računalo",
+  "Confirm_new_encryption_password": "Potvrdi novu lozinku za šifriranje",
   "Confirm_password": "Potvrdi svoju lozinku",
+  "Connect": "Povezati",
   "Connection_Closed": "Veza je zatvorena",
   "Connection_Reset": "Ponovno postavljanje veze",
   "Consulting": "savjetodavni",
   "Consumer_Goods": "Potrošačka dobra",
   "Contains_Security_Fixes": "Sadrži sigurnosne popravke",
+  "Contact": "Kontakt",
   "Content": "Sadržaj",
   "Continue": "Nastaviti",
   "Continuous_sound_notifications_for_new_livechat_room": "Neprekidne obavijesti o zvuku za novu sobu za livechat",
   "Conversation": "Razgovor",
+  "Conversations": "Razgovori",
   "Conversation_closed": "Razgovor je zatvoren: __comment__.",
   "Conversation_finished_message": "Poruka za završetak razgovora",
+  "Conversations_per_day": "Razgovora po danu",
   "conversation_with_s": "razgovor s %s",
   "Convert_Ascii_Emojis": "Pretvori ASCII u Emoji",
   "Copied": "Kopirano",
   "Copy": "Kopiraj",
   "Copy_to_clipboard": "Kopiraj u međuspremnik",
   "COPY_TO_CLIPBOARD": "KOPIRATI U MEĐUSPREMNIK",
+  "could-not-access-webdav": "Nije moguće pristupiti WebDAV-u",
   "Count": "Broj",
+  "Counters": "Brojači",
   "Country": "Zemlja",
   "Country_Afghanistan": "Avganistan",
   "Country_Albania": "Albanija",
@@ -809,6 +897,7 @@
   "create-d_description": "Dopuštenje za pokretanje izravnih poruka",
   "create-p": "Izradite privatne kanale",
   "create-p_description": "Dozvola za stvaranje privatnih kanala",
+  "create-personal-access-tokens": "Stvorite osobne pristupne tokene",
   "create-user": "Stvorite Korisnika",
   "create-user_description": "Dozvola za stvaranje korisnika",
   "Create_A_New_Channel": "Napravi novu sobu",
@@ -818,13 +907,16 @@
   "Created_at_s_by_s": "<strong>%s</strong> je stvorio <strong>%s</strong>",
   "Created_at_s_by_s_triggered_by_s": "Izrađeno na lokaciji <strong>%s</strong> za <strong>%s</strong> pokreće korisnik <strong>%s</strong>",
   "CRM_Integration": "CRM Integracija",
+  "CROWD_Allow_Custom_Username": "Dopusti prilagođeno korisničko ime u Rocket.Chat-u",
   "CROWD_Reject_Unauthorized": "Odbije neautorizirano",
   "Crowd_sync_interval_Description": "Interval između sinkronizacija. Primjer \"svakih 24 sata\" ili \"prvi dan u tjednu\", više primjera na [Cron Text Parser] (http://bunkat.github.io/later/parsers.html#text)",
   "Current_Chats": "Trenutni Razgovori",
+  "Current_File": "Trenutna datoteka",
   "Current_Status": "Trenutni status",
   "Custom": "Prilagođeno",
   "Custom CSS": "Prilagođeni CSS",
   "Custom_agent": "Prilagođeni agent",
+  "Custom_dates": "Prilagođeni datumi",
   "Custom_emoji": "Posebni Emotikon",
   "Custom_Emoji": "Posebni Emotikon",
   "Custom_Emoji_Add": "Dodaj Novi Emotikon",
@@ -854,14 +946,32 @@
   "Customize": "Prilagođavanje",
   "CustomSoundsFilesystem": "Datoteku sustava prilagođenih zvukova",
   "Dashboard": "Kontrolna ploča",
+  "Data_processing_consent_text": "Tekst suglasnosti za obradu podataka",
+  "Data_processing_consent_text_description": "Koristite ovu postavku da biste objasnili da možete prikupljati, pohranjivati i obrađivati osobne podatke korisnika tijekom razgovora.",
   "Date": "Datum",
   "Date_From": "Od",
   "Date_to": "za",
   "days": "dana",
   "DB_Migration": "Baza podataka migracija",
   "DB_Migration_Date": "Datum migracije baze",
+  "DDP_Rate_Limit_IP_Enabled": "Ograniči po IP-iju: omogućeno",
+  "DDP_Rate_Limit_IP_Requests_Allowed": "Ograniči po IP-iju: dopušteni zahtjevi",
+  "DDP_Rate_Limit_IP_Interval_Time": "Ograniči po IP-iju: vrijeme intervala",
+  "DDP_Rate_Limit_User_Enabled": "Ograniči po korisniku: omogućeno",
+  "DDP_Rate_Limit_User_Requests_Allowed": "Ograniči po korisniku: dopušteni zahtjevi",
+  "DDP_Rate_Limit_User_Interval_Time": "Ograniči po korisniku: vrijeme intervala",
+  "DDP_Rate_Limit_Connection_Enabled": "Ograniči po konekciji: omogućeno",
+  "DDP_Rate_Limit_Connection_Requests_Allowed": "Ograniči po konekciji: dopušteni zahtjevi",
+  "DDP_Rate_Limit_Connection_Interval_Time": "Ograniči po konekciji: vrijeme intervala",
+  "DDP_Rate_Limit_User_By_Method_Enabled": "Ograniči po korisniku i metodi: omogućeno",
+  "DDP_Rate_Limit_User_By_Method_Requests_Allowed": "Ograniči po korisniku i metodi: dopušteni zahtjevi",
+  "DDP_Rate_Limit_User_By_Method_Interval_Time": "Ograniči po korisniku i metodi: vrijeme intervala",
+  "DDP_Rate_Limit_Connection_By_Method_Enabled": "Ograniči po konekciji i metodi: omogućeno",
+  "DDP_Rate_Limit_Connection_By_Method_Requests_Allowed": "Ograniči po konekciji i metodi: dopušteni zahtjevi",
+  "DDP_Rate_Limit_Connection_By_Method_Interval_Time": "Ograniči po konekciji i metodi: vrijeme intervala",
   "Deactivate": "Isključi",
   "Decline": "Odbij",
+  "Decode_Key": "Ključ za dekodiranje",
   "Default": "Zadano",
   "Delete": "Obriši",
   "delete-c": "Izbriši javne kanale",
@@ -895,10 +1005,13 @@
   "Desktop_Notifications_Duration": "Trajanje Desktop obavijesti",
   "Desktop_Notifications_Duration_Description": "Vrijeme u sekundama za prikaz obavijesti radne površine. Ovo može utjecati na OSX centar za notifikacije. Unesit 0 kako bi koristili zadane postavke pretraživača.",
   "Desktop_Notifications_Enabled": "Desktop Obavijesti su omogućene",
+  "Desktop_Notifications_Not_Enabled": "Obavijesti na radnoj površini nisu omogućene",
+  "Details": "Detalji",
   "Different_Style_For_User_Mentions": "Različiti stil za korisnike spominje",
   "Direct_message_someone": "Pošalji izravnu poruku",
   "Direct_Messages": "Izravne Poruke",
   "Direct_Reply": "Izravni odgovor",
+  "Direct_Reply_Advice": "Možete izravno odgovoriti na ovu poruku e-pošte. Nemojte mijenjati prethodne poruke e-pošte u niti.",
   "Direct_Reply_Debug": "Izravni odgovor za ispravljanje pogrešaka",
   "Direct_Reply_Debug_Description": "[Čuvajte se] Uključivanje načina uklanjanja pogrešaka prikazuje \"Plain Text Password\" u Admin konzoli.",
   "Direct_Reply_Delete": "Izbrišite presretane poruke e-pošte",
@@ -924,6 +1037,16 @@
   "Display_offline_form": "Prikaz izvanmrežnog obrasca",
   "Display_unread_counter": "Prikaz broja nepročitanih poruka",
   "Displays_action_text": "Prikazuje tekst akcije",
+  "Discussion_name": "Naziv rasprave",
+  "Discussions": "Rasprave",
+  "Discussion_start": "Započni raspravu",
+  "Discussion_target_channel_description": "Odaberite kanal koji je povezan s onim što želite pitati",
+  "Discussion_target_channel_prefix": "Izrađujete raspravu u",
+  "Discussion_target_channel": "Nadređeni kanal ili grupa",
+  "discussion-created": "__message__",
+  "Discussion_description": "Pomozite održavati pregled onoga što se događa! Stvaranjem rasprave kreira se podkanal onog koji ste odabrali i oba su povezana.",
+  "Discussion_first_message_title": "Vaša poruka",
+  "Discussion_title": "Stvorite novu raspravu",
   "Dont_ask_me_again": "Ne pitaj me više!",
   "Dont_ask_me_again_list": "Nemoj me više pitati",
   "Do_not_display_unread_counter": "Nemoj prikazivati ​​brojač ovog kanala",
@@ -935,16 +1058,22 @@
   "Domain_removed": "Domena uklonjena",
   "Domains": "Domene",
   "Domains_allowed_to_embed_the_livechat_widget": "Popisom domena odvojenih zarezima omogućeno je ugrađivanje widgeta uživo. Ostavite prazno kako biste omogućili sve domene.",
+  "Downloading_file_from_external_URL": "Preuzimanje datoteke s vanjskog URL-a",
   "Download_My_Data": "Preuzmite svoje podatke",
   "Download_Snippet": "Preuzmi",
   "Drop_to_upload_file": "Ispusti datoteku kako bi ju prenio",
   "Dry_run": "Testno pokretanje",
   "Dry_run_description": "Poslat ćemo samo jedan email, istoj adresi koja je u Od polju. Email mora pripadati postojećem korisniku.",
+  "duplicated-account": "Dupli račun",
   "Duplicate_archived_channel_name": "Arhivirana soba s nazivom ' %s' već postoji",
   "Duplicate_archived_private_group_name": "Arhivirana Privatna grupa s nazivom ' %s' već postoji",
   "Duplicate_channel_name": "Soba s nazivom '%s' ne postoji",
+  "Duplicated_Email_address_will_be_ignored": "Dupla adresa e-pošte bit će zanemarena.",
   "Duplicate_private_group_name": "Privatna Grupa s nazivom ' %s' postoji",
   "Duration": "Trajanje",
+  "E2E Encryption": "E2E šifriranje",
+  "E2E_Enabled": "E2E omogućeno",
+  "E2E_Enable_description": "Omogući opciju za stvaranje šifriranih grupa i mogućnost izmjene grupa i izravnih poruke za šifriranje",
   "Edit": "Uredi",
   "edit-message": "Uredite poruku",
   "edit-message_description": "Dozvola za uređivanje poruke unutar sobe",
@@ -983,6 +1112,8 @@
   "Email_Placeholder": "Molim upišite svoju adresu e-pošte...",
   "Email_Placeholder_any": "Unesite adrese e-pošte ...",
   "Email_subject": "Subjekt",
+  "email_style_label": "Stil e-pošte",
+  "email_style_description": "Izbjegavajte ugniježđene selektore",
   "Email_verified": "Email provjeren",
   "Emoji": "Emoji",
   "EmojiCustomFilesystem": "Datotečni sustav Emotikona",
@@ -993,6 +1124,7 @@
   "Enable_Svg_Favicon": "Omogući SVG favicon",
   "Enable_two-factor_authentication": "Omogući autentifikaciju s dva faktora",
   "Enabled": "Omogućeno",
+  "Encrypted": "Kodirano",
   "Encrypted_message": "Zaštićena poruka",
   "End_OTR": "Završi SP",
   "Enter_a_regex": "Unesite regex",
@@ -1478,7 +1610,7 @@
   "Katex_Parenthesis_Syntax_Description": "Dopusti korištenje \\[katex blokova\\] i \\(inline katex\\) sintakse",
   "Keep_default_user_settings": "Zadržite zadane postavke",
   "Keyboard_Shortcuts_Edit_Previous_Message": "Uredi prethodnu poruku",
-  "Keyboard_Shortcuts_Keys_1": "<kbd>Ctrl</kbd>+ <kbd>p</kbd>",
+  "Keyboard_Shortcuts_Keys_1": "<kbd>Command</kbd> (ili <kbd>Ctrl</kbd>) + <kbd>p</kbd> ili<kbd>Command</kbd> (ili <kbd>Ctrl</kbd>) + <kbd>k</kbd>",
   "Keyboard_Shortcuts_Keys_2": "<kbd>strelica gore</kbd>",
   "Keyboard_Shortcuts_Keys_3": "<kbd>Naredba</kbd>(ili <kbd>Alt</kbd>) + <kbd>Strelica lijevo</kbd>",
   "Keyboard_Shortcuts_Keys_4": "<kbd>Naredba</kbd>(ili <kbd>Alt</kbd>) + <kbd>strelica gore</kbd>",
@@ -1713,7 +1845,6 @@
   "Mentions_default": "Spominjanja (zadano)",
   "Mentions_only": "Samo spomenuti",
   "Merge_Channels": "Spoji kanale",
-  "Message": "Poruka",
   "Message_AllowBadWordsFilter": "Dopusti filtriranje loših riječi u porukama",
   "Message_AllowDeleting": "Dopusti Brisanje Poruka",
   "Message_AllowDeleting_BlockDeleteInMinutes": "Blokiraj Brisanje Poruka Nakon (n) minuta",
@@ -1781,9 +1912,9 @@
   "Message_VideoRecorderEnabled": "Video snimač omogućen",
   "Message_VideoRecorderEnabledDescription": "Zahtjeva da 'video/webm' datoteke budu omogućene u 'Prijenosu datoteka' postavci.",
   "Message_view_mode_info": "Ovo mijenja količinu prostora koju poruka zauzima na ekranu.",
+  "Message": "Poruka",
   "messages": "Poruke",
   "Messages": "Poruke",
-  "Mmessages": "poruke",
   "Messages_that_are_sent_to_the_Incoming_WebHook_will_be_posted_here": "Poruke koje se šalju na dolazeći WebHook bit će objavljene ovdje.",
   "Meta": "Meta",
   "Meta_custom": "Prilagođene meta oznake",
@@ -2163,7 +2294,7 @@
   "RetentionPolicyRoom_FilesOnly": "Spusti samo datoteke, zadržite poruke",
   "RetentionPolicyRoom_MaxAge": "Maksimalna dob poruka u danima (zadana vrijednost: __max__)",
   "RetentionPolicyRoom_OverrideGlobal": "Poništi globalno zadržavanje pravila",
-  "RetentionPolicyRoom_ReadTheDocs": "Pazi! Ugađanje ovih postavki bez veće pažnje može uništiti sve povijesti poruka. Pročitajte dokumentaciju prije nego što uključite značajku <a href = 'https: //rocket.chat/docs/administrator-guides/retention-policies/'>ovdje</a>.",
+  "RetentionPolicyRoom_ReadTheDocs": "Pazi! Ugađanje ovih postavki bez veće pažnje može uništiti sve povijesti poruka. Pročitajte dokumentaciju prije nego što uključite značajku <a href=\"https://rocket.chat/docs/administrator-guides/retention-policies/\">ovdje</a>.",
   "Retry_Count": "Ponovite račun",
   "Role": "Uloga",
   "Role_Editing": "Uređivanje Uloge",
@@ -2512,8 +2643,6 @@
   "This_is_a_push_test_messsage": "Ovo je push obavijest",
   "This_room_has_been_archived_by__username_": "__username__ je arhivirao ovu sobu",
   "This_room_has_been_unarchived_by__username_": "__username__ je dearhivirao ovu sobu",
-  "Thread_slash_command_params": "tvoja poruka",
-  "Threading_context_menu_none": "Nevidljiv",
   "Thursday": "Četvrtak",
   "Time_in_seconds": "Vrijeme u sekundama",
   "Title": "Naslov",
diff --git a/packages/rocketchat-i18n/i18n/hu.i18n.json b/packages/rocketchat-i18n/i18n/hu.i18n.json
index 2f9029b28bee..86968dbb3786 100644
--- a/packages/rocketchat-i18n/i18n/hu.i18n.json
+++ b/packages/rocketchat-i18n/i18n/hu.i18n.json
@@ -1713,7 +1713,6 @@
   "Mentions_default": "Szerint (alapértelmezett)",
   "Mentions_only": "Csak megemlít",
   "Merge_Channels": "Csatornák egyesítése",
-  "Message": "Üzenet",
   "Message_AllowBadWordsFilter": "Engedélyezés Message csúnya szavak szűrésével",
   "Message_AllowDeleting": "Engedélyezés Message törlése",
   "Message_AllowDeleting_BlockDeleteInMinutes": "Blokk Üzenet törlése után (n) a jegyzőkönyvet",
@@ -1781,9 +1780,9 @@
   "Message_VideoRecorderEnabled": "Videofelvevő engedélyezve",
   "Message_VideoRecorderEnabledDescription": "Szükséges, hogy a \"video / webm\" fájlok elfogadott média típus legyenek a \"Fájl feltöltése\" beállításai között.",
   "Message_view_mode_info": "Ez megváltoztatja a tárterületet üzeneteket veszi fel a képernyőn.",
+  "Message": "Üzenet",
   "messages": "Üzenetek",
   "Messages": "Üzenetek",
-  "Mmessages": "üzenetek",
   "Messages_that_are_sent_to_the_Incoming_WebHook_will_be_posted_here": "Küldött üzenetek a Bejövő WebHook felteszik itt.",
   "Meta": "meta",
   "Meta_custom": "Egyéni metacímke",
@@ -2512,8 +2511,6 @@
   "This_is_a_push_test_messsage": "Ez egy push teszt messsage",
   "This_room_has_been_archived_by__username_": "Ez a szoba már archiválásra __username__",
   "This_room_has_been_unarchived_by__username_": "Ez a szoba már nem archivált által __username__",
-  "Thread_slash_command_params": "az üzeneted",
-  "Threading_context_menu_none": "Láthatatlan",
   "Thursday": "csütörtök",
   "Time_in_seconds": "Az az idő másodpercben",
   "Title": "Cím",
diff --git a/packages/rocketchat-i18n/i18n/id.i18n.json b/packages/rocketchat-i18n/i18n/id.i18n.json
index 1a357cd4f748..005966e2dd34 100644
--- a/packages/rocketchat-i18n/i18n/id.i18n.json
+++ b/packages/rocketchat-i18n/i18n/id.i18n.json
@@ -1713,7 +1713,6 @@
   "Mentions_default": "Menyebutkan (default)",
   "Mentions_only": "Penyebutan saja",
   "Merge_Channels": "Gabungkan Saluran",
-  "Message": "Pesan",
   "Message_AllowBadWordsFilter": "Memungkinkan Pesan kata-kata buruk penyaringan",
   "Message_AllowDeleting": "Ijinkan Penghapusan Pesan",
   "Message_AllowDeleting_BlockDeleteInMinutes": "Blokir Pesan Menghapus Setelah (n) Menit",
@@ -1781,9 +1780,9 @@
   "Message_VideoRecorderEnabled": "Perekam Video Diaktifkan",
   "Message_VideoRecorderEnabledDescription": "Membutuhkan file 'video / webm' untuk menjadi jenis media yang diterima dalam setelan 'Upload File'.",
   "Message_view_mode_info": "Hal ini akan mengubah jumlah pesan ruang mengambil di layar.",
+  "Message": "Pesan",
   "messages": "Pesan",
   "Messages": "Pesan",
-  "Mmessages": "pesan",
   "Messages_that_are_sent_to_the_Incoming_WebHook_will_be_posted_here": "Pesan yang dikirim ke masuk WebHook akan diposting di sini.",
   "Meta": "Meta",
   "Meta_custom": "Tag Meta Khusus",
@@ -2512,8 +2511,6 @@
   "This_is_a_push_test_messsage": "Ini adalah messsage dorongan uji",
   "This_room_has_been_archived_by__username_": "Ruangan ini telah diarsipkan oleh __username__",
   "This_room_has_been_unarchived_by__username_": "Ruangan ini telah diarsipkan oleh __username__",
-  "Thread_slash_command_params": "pesan Anda",
-  "Threading_context_menu_none": "Invisible",
   "Thursday": "Kamis",
   "Time_in_seconds": "Waktu dalam detik",
   "Title": "Judul",
diff --git a/packages/rocketchat-i18n/i18n/it.i18n.json b/packages/rocketchat-i18n/i18n/it.i18n.json
index 930fb8ff3599..f0efd3ddea12 100644
--- a/packages/rocketchat-i18n/i18n/it.i18n.json
+++ b/packages/rocketchat-i18n/i18n/it.i18n.json
@@ -178,6 +178,8 @@
   "Accounts_RequireNameForSignUp": "Richiedi il nome per la registrazione",
   "Accounts_RequirePasswordConfirmation": "Richiede conferma della password",
   "Accounts_SearchFields": "Campi da considerare nella ricerca",
+  "Accounts_Send_Email_When_Activating": "Invia mail all'utente quando quando è attivato",
+  "Accounts_Send_Email_When_Deactivating": "Invia mail all'utente quando quando è inattivato",
   "Accounts_SetDefaultAvatar": "Imposta avatar predefinito",
   "Accounts_SetDefaultAvatar_Description": "Prova a determinare l'avatar predefinito in base all'account OAuth o a Gravatar",
   "Accounts_ShowFormLogin": "Mostra la maschera di accesso predefinita",
@@ -218,6 +220,7 @@
   "Additional_Feedback": "Feedback aggiuntivo",
   "additional_integrations_Bots": "Se stai cercando come integrare il tuo bot, non cercare oltre il nostro adattatore Hubot. <a href='https://github.com/RocketChat/hubot-rocketchat' target='_blank'>https://github.com/RocketChat/hubot-rocketchat</a>",
   "additional_integrations_Zapier": "Stai cercando di integrare altri software e applicazioni con Rocket.Chat ma non hai il tempo di farlo manualmente? Quindi ti suggeriamo di utilizzare Zapier che supportiamo pienamente. Leggi di più sulla nostra documentazione. <a href='https://rocket.chat/docs/administrator-guides/integrations/zapier/using-zaps/' target='_blank'>https://rocket.chat/docs/administrator-guides/integrations/zapier/using-zaps/</a>",
+  "Admin_disabled_encryption": "Il tuo amministratotre non ha abilitato la criptazione E2E",
   "Admin_Info": "Informazioni di amministrazione",
   "Administration": "Amministrazione",
   "Adult_images_are_not_allowed": "Non sono ammesse immagini per adulti",
@@ -1711,7 +1714,6 @@
   "Mentions_default": "Menzioni (default)",
   "Mentions_only": "Solo le menzioni",
   "Merge_Channels": "Unisci canali",
-  "Message": "Messaggio",
   "Message_AllowBadWordsFilter": "Permette di filtrare le parolacce dai messaggi",
   "Message_AllowDeleting": "Permetti eliminazione messaggi",
   "Message_AllowDeleting_BlockDeleteInMinutes": "Eliminazione Dopo (n) Minuti del Blocco del Messaggio",
@@ -1779,9 +1781,9 @@
   "Message_VideoRecorderEnabled": "Registrazione Video Abilitata",
   "Message_VideoRecorderEnabledDescription": "Richiede che i file del tipo 'video/webm' siano fra gli accettati nella sezione 'Caricamento File'.",
   "Message_view_mode_info": "Questo cambia il numero di spazio nei messaggi sullo schermo.",
+  "Message": "Messaggio",
   "messages": "Messaggi",
   "Messages": "Messaggi",
-  "Mmessages": "messaggi",
   "Messages_that_are_sent_to_the_Incoming_WebHook_will_be_posted_here": "I messaggi inviati WebHook In Arrivo verranno pubblicati qui.",
   "Meta": "Meta",
   "Meta_custom": "Meta tag personalizzati",
@@ -2510,8 +2512,6 @@
   "This_is_a_push_test_messsage": "Questa è una prova di notifica push",
   "This_room_has_been_archived_by__username_": "Questo canale è stato archiviato da __username__",
   "This_room_has_been_unarchived_by__username_": "Questo canale è stato disarchiviato da __username__",
-  "Thread_slash_command_params": "il tuo messaggio",
-  "Threading_context_menu_none": "Invisibile",
   "Thursday": "Giovedì",
   "Time_in_seconds": "Tempo in secondi",
   "Title": "Titolo",
diff --git a/packages/rocketchat-i18n/i18n/ja.i18n.json b/packages/rocketchat-i18n/i18n/ja.i18n.json
index 427f8ab4c693..2a7a6e5b92fc 100644
--- a/packages/rocketchat-i18n/i18n/ja.i18n.json
+++ b/packages/rocketchat-i18n/i18n/ja.i18n.json
@@ -1037,6 +1037,16 @@
   "Display_offline_form": "オフラインフォームの表示",
   "Display_unread_counter": "未読メッセージの数を表示する",
   "Displays_action_text": "操作テキストを表示",
+  "Discussion_name": "ディスカッション名",
+  "Discussions": "ディスカッション",
+  "Discussion_start": "ディスカッションを開始する",
+  "Discussion_target_channel_description": "聞きたいことに関連するチャンネルを選択してください",
+  "Discussion_target_channel_prefix": "ディスカッションを作成しています：",
+  "Discussion_target_channel": "親チャンネルまたはグループ",
+  "discussion-created": "新しいディスカッション \\\"__message__\\\" を始めました。",
+  "Discussion_description": "何が起こっているのかについての概要を把握するのを手伝ってください！ディスカッションを作成することで、選択したもののサブチャンネルが作成され、両方がリンクされます。",
+  "Discussion_first_message_title": "あなたのメッセージ",
+  "Discussion_title": "新しいディスカッションを作成する",
   "Dont_ask_me_again": "今後このメッセージを表示しない",
   "Dont_ask_me_again_list": "今後このメッセージを表示しないリスト",
   "Do_not_display_unread_counter": "このチャンネルのカウンタを表示しない",
@@ -1253,7 +1263,6 @@
   "every_hour": "1時間に1回",
   "every_six_hours": "6時間に1回",
   "every_day": "毎日1回",
-  "Every_Workspace": "すべてのワークスペース",
   "Everyone_can_access_this_channel": "誰もがこのチャンネルにアクセスできます",
   "Example_s": "例: <code class=\"inline\">%s</code>",
   "Exclude_Botnames": "ボットを除外する",
@@ -1265,6 +1274,7 @@
   "Export_My_Data": "マイデータをエクスポートする",
   "expression": "式",
   "Extended": "拡張",
+  "External_Domains": "外部ドメイン",
   "External_Queue_Service_URL": "外部キューサービスのURL",
   "External_Service": "外部サービス",
   "Facebook_Page": "Facebookのページ",
@@ -1422,6 +1432,7 @@
   "Graphql_CORS": "GraphQL CORS",
   "Graphql_Subscription_Port": "GraphQLサブスクリプションポート",
   "Group_by_Type": "グループ別",
+  "Group_discussions": "グループディスカッション",
   "Group_favorites": "グループのお気に入り",
   "Group_mentions_disabled_x_members": "__total__人以上のメンバーがいるルームでは、グループへの`@all`と`@here`は無効になっています。",
   "Group_mentions_only": "グループメンションのみ",
@@ -1833,8 +1844,8 @@
   "Loading...": "読み込み中...",
   "Loading_more_from_history": "さらに履歴を読み込み中",
   "Loading_suggestion": "候補を読み込み中...",
+  "Local_Domains": "ローカルドメイン",
   "Local_Password": "ローカルパスワード",
-  "Local_Workspace": "ローカルのワークスペース",
   "Localization": "ローカライズ",
   "Log_Exceptions_to_Channel_Description": "キャプチャされたすべての例外を受け取るチャンネル。例外を無視するには、空のままにします。",
   "Log_Exceptions_to_Channel": "チャンネルへの例外のログ",
@@ -1920,8 +1931,8 @@
   "Mentions_default": "メンション (デフォルト)",
   "Mentions_only": "メンションのみ",
   "Merge_Channels": "チャンネルをマージする",
-  "Message": "メッセージ",
   "Message_AllowBadWordsFilter": "メッセージの悪い言葉フィルタリングを許可する",
+  "Message_AllowConvertLongMessagesToAttachment": "長いメッセージを添付ファイルに変換することを許可する",
   "Message_AllowDeleting": "メッセージの削除を許可する",
   "Message_AllowDeleting_BlockDeleteInMinutes": "ブロックメッセージの削除 (n) は分後に",
   "Message_AllowDeleting_BlockDeleteInMinutes_Description": "ブロッキングを無効にするには0を入力します。",
@@ -1987,13 +1998,15 @@
   "Message_TimeFormat": "時刻のフォーマット",
   "Message_TimeFormat_Description": "参考: <a href=\"http://momentjs.com/docs/#/displaying/format/\" target=\"momemt\">Moment.js</a>",
   "Message_too_long": "メッセージが長すぎです",
+  "Message_too_long_as_an_attachment_question": "メッセージが長すぎます。代わりに添付ファイルとして送信しますか？",
   "Message_UserId": "メッセージのユーザーID",
   "Message_VideoRecorderEnabled": "ビデオレコーダー有効",
   "Message_VideoRecorderEnabledDescription": "'ファイル/アップロード'設定で 'video / webm'ファイルを受け入れ可能なメディアタイプにする必要があります。",
   "Message_view_mode_info": "これにより、メッセージが画面上で占める領域の量が変更されます。",
+  "message": "メッセージ",
+  "Message": "メッセージ",
   "messages": "メッセージ",
   "Messages": "メッセージ",
-  "Mmessages": "メッセージ",
   "Messages_that_are_sent_to_the_Incoming_WebHook_will_be_posted_here": "Incoming WebHook へ送信されたメッセージは、こちらへ投稿されます。",
   "Meta": "メタ情報",
   "Meta_custom": "カスタムメタタグ",
@@ -2041,6 +2054,9 @@
   "New_Application": "新しいアプリケーション",
   "New_Custom_Field": "新しいカスタムフィールド",
   "New_Department": "新しい部門",
+  "New_discussion": "新しいディスカッション",
+  "New_discussion_name": "ディスカッションルームのわかりやすい名前",
+  "New_discussion_first_message": "通常、ディスカッションは「写真をアップロードする方法を教えてください」などの質問で始まります。",
   "New_integration": "新しいサービス連携",
   "New_line_message_compose_input": "`%s` - メッセージに改行を入力します",
   "New_logs": "新しい履歴",
@@ -2053,9 +2069,6 @@
   "New_encryption_password": "新しい暗号化パスワード",
   "New_role": "新しいロール",
   "New_Room_Notification": "新しいルームの通知",
-  "New_thread": "新しいスレッド",
-  "New_thread_name": "スレッドルームのわかりやすい名前",
-  "New_thread_first_message": "通常、スレッドは「写真をアップロードする方法を教えてください」のような質問から始まります。",
   "New_Trigger": "新規トリガー",
   "New_version_available_(s)": "新しいバージョンが利用可能です (%s)",
   "New_videocall_request": "新しいビデオ通話を要求",
@@ -2075,13 +2088,12 @@
   "No_messages_yet": "メッセージはまだありません",
   "No_pages_yet_Try_hitting_Reload_Pages_button": "ページはまだありません。 \"Reload Page\"ボタンを押してみてください。",
   "No_pinned_messages": "ピン留めされたメッセージはありません",
-  "No_replies_yet": "まだ回答はありません",
   "No_results_found": "メッセージは、見つかりませんでした",
   "No_results_found_for": "次の検索結果はありません: ",
   "No_snippet_messages": "スニペットなし",
   "No_starred_messages": "スターをつけたメッセージはありません",
   "No_such_command": "そのようなコマンドはありません: `/__command__`",
-  "No_threads_yet": "まだスレッドはありません",
+  "No_discussions_yet": "まだディスカッションはありません",
   "No_user_with_username_%s_was_found": "<strong>\"%s\"</strong> というユーザーは、見つかりませんでした!",
   "Nobody_available": "誰も利用できません",
   "Node_version": "Node バージョン",
@@ -2387,7 +2399,7 @@
   "Retail": "小売り",
   "Retention_setting_changed_successfully": "保持ポリシーの設定が正常に変更されました",
   "RetentionPolicy": "保持ポリシー",
-  "RetentionPolicy_DoNotExcludeThreads": "スレッドメッセージを除外しない",
+  "RetentionPolicy_DoNotExcludeDiscussion": "ディスカッションメッセージを除外しない",
   "RetentionPolicy_RoomWarning": "__time__経過した古いメッセージは自動的に整理されます",
   "RetentionPolicy_RoomWarning_Unpinned": "__time__経過したピン留めしていない古いメッセージは自動的に整理されます",
   "RetentionPolicy_RoomWarning_FilesOnly": "__time__経過した古いファイルは自動的に整理されます (メッセージはそのまま残ります)",
@@ -2720,7 +2732,7 @@
   "The_emails_are_being_sent": "メールは送信されました",
   "The_field_is_required": "%s 項目は、必須です。",
   "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "サーバーにインストールされたImageMagickまたはGraphicsMagickを検出できないため、イメージのサイズ変更は機能しません。",
-  "The_message_is_a_thread_you_will_not_be_able_to_recover": "メッセージはあなたがメッセージを復元できないスレッドです！",
+  "The_message_is_a_discussion_you_will_not_be_able_to_recover": "メッセージはあなたがメッセージを復元できないディスカッションです！",
   "The_peer__peer__does_not_exist": "ピア <em>__peer__ </em> は存在しません。",
   "The_redirectUri_is_required": "リダイレクト先 URI は必須です",
   "The_server_will_restart_in_s_seconds": "%s 秒後にサーバーを再起動します",
@@ -2794,29 +2806,8 @@
   "This_month": "今月",
   "This_room_has_been_archived_by__username_": "このルームは__username__によってアーカイブされています",
   "This_room_has_been_unarchived_by__username_": "このルームは__username__によってアーカイブ解除されています",
-  "Thread_creation_on_home": "ホーム画面にスレッドを作成する",
-  "Thread_default_parent_Channel": "新しいスレッドのデフォルトチャンネル",
-  "Thread_from_context_menu": "コンテキストメニューのスレッド",
-  "Thread_invitations_threshold_description": "公開スレッドに自動的に招待されるユーザーの最大数",
-  "Thread_invitations_threshold": "自動的に招待されるユーザーの最大数",
-  "Thread_name": "スレッド名",
-  "Thread_slash_command_description": "現在のチャンネルのスレッドを作成します",
-  "Thread_slash_command_params": "あなたのメッセージ",
-  "Thread_start": "スレッドを開始する",
-  "Thread_target_channel_description": "聞きたいことに関連するチャンネルを選択してください",
-  "Thread_target_channel_prefix": "スレッドを作成しています：",
-  "Thread_target_channel_suffix": "- 別の親チャンネルを選択",
-  "Thread_target_channel": "親チャンネルまたはグループ",
-  "thread-created": "新しいスレッド \"__message__\" を始めました。",
-  "thread-welcome": "スレッドを作成してくれてありがとう、__username__！ __parentChannel__に何人かのメンバーを招待しました。 ヒント：長い間何も起こらない場合は、\"@all\" で彼らに気がつかせることができます。",
   "thread": "スレッド",
-  "Threading_context_menu_button": "専用ボタン",
-  "Threading_context_menu_none": "非表示",
-  "Threading_description": "何が起こっているのかについての概要を把握するのを手伝ってください！ スレッドを作成することで、選択したもののサブチャンネルが作成され、両方がリンクされます。",
-  "Threading_first_message_title": "あなたのメッセージ",
-  "Threads_in_sidebar": "サイドバーにスレッドのカテゴリを表示する",
   "Threads": "スレッド",
-  "Threading_title": "新しいスレッドを作る",
   "This_week": "今週",
   "Thursday": "木曜日",
   "Time_in_seconds": "時間を秒数で指定",
diff --git a/packages/rocketchat-i18n/i18n/km.i18n.json b/packages/rocketchat-i18n/i18n/km.i18n.json
index f1d9addee3d4..98126677723d 100644
--- a/packages/rocketchat-i18n/i18n/km.i18n.json
+++ b/packages/rocketchat-i18n/i18n/km.i18n.json
@@ -591,6 +591,7 @@
   "Cloud_update_email": "ធ្វើបច្ចុប្បន្នភាពអ៊ីមែល",
   "Cloud_registration_required": "ត្រូវការ​ការ​ចុះឈ្មោះ",
   "Cloud_registration_requried_link_text": "សូមចុចត្រង់នេះដើម្បីចុះឈ្មោះកន្លែងធ្វើការរបស់អ្នក។",
+  "Cloud_error_in_authenticating": "កំហុសបានទទួលខណៈពេលផ្ទៀងផ្ទាត់",
   "Cloud_error_code": "លេខកូដ:",
   "Collaborative": "សហការ",
   "Collapse_Embedded_Media_By_Default": "វេញប្រព័ន្ធផ្សព្វផ្សាយដែលបានបង្កប់ដោយលំនាំដើម",
@@ -879,6 +880,7 @@
   "create-d_description": "ការអនុញ្ញាតដើម្បីចាប់ផ្តើមសារដោយផ្ទាល់",
   "create-p": "បង្កើតឆានែលឯកជន",
   "create-p_description": "សិទ្ធិក្នុងការបង្កើតឆានែលឯកជន",
+  "create-personal-access-tokens": "បង្កើតនិមិត្តសញ្ញាការចូលប្រើផ្ទាល់ខ្លួន",
   "create-user": "បង្កើតអ្នកប្រើ",
   "create-user_description": "សិទ្ធិក្នុងការបង្កើតអ្នកប្រើ",
   "Create_A_New_Channel": "បង្កើតឆានែលថ្មី",
@@ -888,6 +890,7 @@
   "Created_at_s_by_s": "បានបង្កើតនូវ <strong>%s</strong> by <strong>%s</strong>",
   "Created_at_s_by_s_triggered_by_s": "បានបង្កើតនៅ <strong>%s</strong>ដោយ <strong>%s</strong>ដែលបានបង្កឡើងដោយ <strong>%s</strong>",
   "CRM_Integration": "សមាហរណកម្ម CRM",
+  "CROWD_Allow_Custom_Username": "អនុញ្ញាតឈ្មោះអ្នកប្រើផ្ទាល់ខ្លួននៅក្នុង Rocket.Chat",
   "CROWD_Reject_Unauthorized": "បដិសេធមិនមានសិទ្ធិ",
   "Crowd_sync_interval_Description": "ចន្លោះពេលរវាងការធ្វើសមកាលកម្ម។ ឧទាហរណ៍ \"រៀងរាល់ 24 ម៉ោង\" ឬ `នៅថ្ងៃដំបូងនៃសប្តាហ៍ 'ឧទាហរណ៍ជាច្រើនទៀតនៅ [Cron Text Parser] (http://bunkat.github.io/later/parsers.html#text)",
   "Current_Chats": "ការជជែកបច្ចុប្បន្ន",
@@ -926,12 +929,28 @@
   "Customize": "ប្ដូរតាមបំណង",
   "CustomSoundsFilesystem": "ប្រព័ន្ធសម្លេងផ្ទាល់ខ្លួន",
   "Dashboard": "ផ្ទាំងគ្រប់គ្រង",
+  "Data_processing_consent_text": "អត្ថបទយល់ព្រមលើដំណើរការទិន្នន័យ",
   "Date": "កាលបរិច្ឆេទ",
   "Date_From": "ចាប់​ពី",
   "Date_to": "ទៅ",
   "days": "ថ្ងៃ",
   "DB_Migration": "ប្ដូរមូលដ្ឋានទិន្នន័យ",
   "DB_Migration_Date": "មូលដ្ឋានទិន្នន័យការធ្វើចំណាកស្រុកកាលបរិច្ឆេទ",
+  "DDP_Rate_Limit_IP_Enabled": "កំណត់ដោយ IP: បានបើក",
+  "DDP_Rate_Limit_IP_Requests_Allowed": "កំណត់ដោយ IP: ការស្នើសុំត្រូវបានអនុញ្ញាត",
+  "DDP_Rate_Limit_IP_Interval_Time": "កំណត់ដោយ IP: ចន្លោះពេល",
+  "DDP_Rate_Limit_User_Enabled": "កំណត់ដោយអ្នកប្រើ: បានបើក",
+  "DDP_Rate_Limit_User_Requests_Allowed": "កំណត់ដោយអ្នកប្រើ: ការស្នើសុំត្រូវបានអនុញ្ញាត",
+  "DDP_Rate_Limit_User_Interval_Time": "កំណត់ដោយអ្នកប្រើ: ចន្លោះពេល",
+  "DDP_Rate_Limit_Connection_Enabled": "ដែនកំណត់ដោយការតភ្ជាប់: បានបើក",
+  "DDP_Rate_Limit_Connection_Requests_Allowed": "កំណត់ដោយការភ្ជាប់: ការស្នើសុំត្រូវបានអនុញ្ញាត",
+  "DDP_Rate_Limit_Connection_Interval_Time": "កំណត់ដោយការតភ្ជាប់: ចន្លោះពេល",
+  "DDP_Rate_Limit_User_By_Method_Enabled": "កំណត់ដោយអ្នកប្រើក្នុងមួយវិធី: បានបើក",
+  "DDP_Rate_Limit_User_By_Method_Requests_Allowed": "កំណត់ដោយអ្នកប្រើប្រាស់ក្នុងមួយវិធី: ការស្នើសុំត្រូវបានអនុញ្ញាត",
+  "DDP_Rate_Limit_User_By_Method_Interval_Time": "កំណត់ដោយអ្នកប្រើក្នុងមួយវិធី: ចន្លោះពេល",
+  "DDP_Rate_Limit_Connection_By_Method_Enabled": "ដែនកំណត់ដោយការតភ្ជាប់តាមវិធីសាស្រ្ត: បានបើក",
+  "DDP_Rate_Limit_Connection_By_Method_Requests_Allowed": "ដែនកំណត់ដោយការតភ្ជាប់តាមវិធីសាស្រ្ត: ការស្នើសុំត្រូវបានអនុញ្ញាត",
+  "DDP_Rate_Limit_Connection_By_Method_Interval_Time": "កំណត់ដោយការតភ្ជាប់តាមវិធីមួយ: ចន្លោះពេល",
   "Deactivate": "ធ្វើឲ្យមិនសកម្ម",
   "Decline": "បដិសេធ",
   "Decode_Key": "សោរដោះលេខកូដ",
@@ -968,6 +987,7 @@
   "Desktop_Notifications_Duration": "ការជូនដំណឹងរយៈព​​េល",
   "Desktop_Notifications_Duration_Description": "វិនាទីដើម្បីបង្ហាញសេចក្តីជូនដំណឹងផ្ទៃតុ។ នេះអាចប៉ះពាល់ដល់ការជូនដំណឹងប្រព័ន្ធប្រតិបត្តិការ OS X មជ្ឈមណ្ឌល។ បញ្ចូល 0 ដើម្បីប្រើការកំណត់កម្មវិធីរុករកលំនាំដើមនិងមិនប៉ះពាល់ដល់ប្រព័ន្ធប្រតិបត្តិការ X បានការជូនដំណឹងមជ្ឈមណ្ឌល។",
   "Desktop_Notifications_Enabled": "ជំនូនដំណឹងលើ Desktop ត្រូវបានអនុញ្ញាតិ",
+  "Desktop_Notifications_Not_Enabled": "ការជូនដំណឹងផ្ទៃតុមិនត្រូវបានបើកទេ",
   "Details": "លម្អិត",
   "Different_Style_For_User_Mentions": "រចនាប័ទ្មផ្សេងគ្នាសម្រាប់អ្នកប្រើប្រាស់លើកឡើង",
   "Direct_message_someone": "មាននរណាម្នាក់បានផ្ញើសារដោយផ្ទាល់",
@@ -999,6 +1019,15 @@
   "Display_offline_form": "សំណុំបែបបទដែលបានបង្ហាញនៅក្រៅបណ្ដាញ",
   "Display_unread_counter": "បង្ហាញចំនួនសារមិនទាន់អាន",
   "Displays_action_text": "អត្ថបទសកម្មភាពបង្ហាញ",
+  "Discussion_name": "ឈ្មោះពិភាក្សា",
+  "Discussions": "ការពិភាក្សា",
+  "Discussion_start": "ចាប់ផ្ដើមការពិភាក្សា",
+  "Discussion_target_channel_description": "ជ្រើសរើសឆានែលដែលទាក់ទងនឹងអ្វីដែលអ្នកចង់សួរ",
+  "Discussion_target_channel_prefix": "អ្នកកំពុងបង្កើតការពិភាក្សា",
+  "Discussion_target_channel": "ឆានែលឬក្រុមមេ",
+  "discussion-created": "__message__",
+  "Discussion_first_message_title": "សារ​របស់​អ្នក",
+  "Discussion_title": "បង្កើតការពិភាក្សាថ្មី",
   "Dont_ask_me_again": "កុំសួរខ្ញុំម្ដងទៀត!",
   "Dont_ask_me_again_list": "កុំសួរខ្ញុំម្តងទៀត",
   "Do_not_display_unread_counter": "កុំបង្ហាញការរាប់នៃឆានែលនេះ",
@@ -1771,6 +1800,7 @@
   "Loading...": "កំពុង​ដំណើរការ...",
   "Loading_more_from_history": "លោតច្រើនទៀតពីប្រវត្តិ",
   "Loading_suggestion": "កំពុង​មើល​ការ​សម្រេច​ចិត្ត...",
+  "Local_Password": "លេខសំងាត់ក្នុងស្រុក",
   "Localization": "មូលដ្ឋានីយកម្ម",
   "Log_Exceptions_to_Channel_Description": "ឆានែលដែលនឹងទទួលបានករណីលើកលែងដែលបានចាប់យកទាំងអស់។ ទុកឱ្យទទេដើម្បីមិនអើពើការលើកលែង។",
   "Log_Exceptions_to_Channel": "កត់ត្រាករណីលើកលែងទៅឆានែល",
@@ -1856,8 +1886,8 @@
   "Mentions_default": "បានលើកឡើង (លំនាំដើម)",
   "Mentions_only": "មានតែសំដីប៉ុណ្ណោះ",
   "Merge_Channels": "បញ្ចូលឆានែលចូលគ្នា",
-  "Message": "សារ",
   "Message_AllowBadWordsFilter": "អនុញ្ញាតឱ្យសារតម្រងពាក្យអាក្រក់",
+  "Message_AllowConvertLongMessagesToAttachment": "អនុញ្ញាតឱ្យបម្លែងសារវែងទៅជាឯកសារភ្ជាប់",
   "Message_AllowDeleting": "អនុញ្ញាត​ឱ្យ​មាន​ការ​លុប​សារ",
   "Message_AllowDeleting_BlockDeleteInMinutes": "សារបានប្លុកកំពុងលប់នៅពេលប៉ុន្មាននាទីខាងមុខនេះ",
   "Message_AllowDeleting_BlockDeleteInMinutes_Description": "បញ្ចូល 0 ដើម្បីបិទប្លុក។",
@@ -1898,6 +1928,7 @@
   "Message_HideType_ru": "លាក់សារ \"អ្នកប្រើដែលបានដកចេញ\"",
   "Message_HideType_uj": "លាក់ \"អ្នកប្រើប្រាស់ចូលរួម\" សារ",
   "Message_HideType_ul": "លាក់ \"អ្នកប្រើចាកចេញ\" សារ",
+  "Message_Id": "លេខសម្គាល់សារ",
   "Message_Ignored": "សារនេះត្រូវបានមិនអើពើ",
   "Message_info": "ព័ត៌មានសារ",
   "Message_KeepHistory": "រក្សា​​ប្រវត្តិ​សារ",
@@ -1916,17 +1947,21 @@
   "Message_ShowEditedStatus": "បង្ហាញ​ស្ថានភាព​អត្ថបទ​​ដែល​បាន​កែ​សម្រួល",
   "Message_ShowFormattingTips": "បង្ហាញទ្រង់ទ្រាយដំបូន្មាន",
   "Message_starring": "សារសម្តែង",
+  "Message_Time": "ពេលវេលាសារ",
   "Message_TimeAndDateFormat": "ទ្រង់ទ្រាយពេលវេលានិងកាលបរិច្ឆេទ",
   "Message_TimeAndDateFormat_Description": "សូមមើលផងដែរ: <a href=\"http://momentjs.com/docs/#/displaying/format/\" target=\"momemt\" >Moment.js</a>",
   "Message_TimeFormat": "ទ្រង់ទ្រាយពេលវេលា",
   "Message_TimeFormat_Description": "សូមមើលផងដែរ: <a href=\"http://momentjs.com/docs/#/displaying/format/\" target=\"momemt\">Moment.js</a>",
   "Message_too_long": "សារយូរពេក",
+  "Message_too_long_as_an_attachment_question": "សារវែងពេក។ ផ្ញើវាជាឯកសារភ្ជាប់ជំនួសវិញ?",
+  "Message_UserId": "លេខ​សម្គាល់​អ្នក​ប្រើ",
   "Message_VideoRecorderEnabled": "ថតវីដេអូបានប្រើ",
   "Message_VideoRecorderEnabledDescription": "តម្រូវឱ្យឯកសារ 'វីដេអូ / WebM' ជាប្រភេទប្រព័ន្ធដែលបានទទួលនៅក្នុង 'ការផ្ទុកឡើងឯកសារ' ការកំណត់។",
   "Message_view_mode_info": "នេះនឹងផ្លាស់ប្តូចំនួននៃសារដែលមានទំហំយកឡើងនៅលើអេក្រង់។",
+  "message": "សារ",
+  "Message": "សារ",
   "messages": "សារ",
   "Messages": "សារ",
-  "Mmessages": "សារ",
   "Messages_that_are_sent_to_the_Incoming_WebHook_will_be_posted_here": "សារដែលត្រូវបានបញ្ជូនទៅចូល WebHook នឹងត្រូវបានបង្ហោះនៅទីនេះ។",
   "Meta": "មេតា",
   "Meta_custom": "ស្លាកមេតាផ្ទាល់ខ្លួន",
@@ -1961,6 +1996,7 @@
   "Mute_user": "អ្នកប្រើដែលបានបិទ",
   "Muted": "ស្ងាត់",
   "My_Account": "គណនី​របស់ខ្ញុំ",
+  "My Data": "ទិន្នន័យរបស់ខ្ញុំ",
   "My_location": "ទីតាំងរបស់ខ្ញុំ",
   "n_messages": "%s សារ",
   "N_new_messages": "សារថ្មី %s បាន",
@@ -2683,8 +2719,6 @@
   "This_month": "ខែ​នេះ",
   "This_room_has_been_archived_by__username_": "បន្ទប់នេះត្រូវបានទុកក្នុងប័ណ្ណសារដោយ __username__",
   "This_room_has_been_unarchived_by__username_": "បន្ទប់នេះត្រូវបាន unarchived ដោយ __username__",
-  "Thread_slash_command_params": "សារ​របស់​អ្នក",
-  "Threading_context_menu_none": "មិន​បង្ហាញ",
   "This_week": "ស​ប្តា​ហ៍​នេះ",
   "Thursday": "ព្រហស្បតិ៍",
   "Time_in_seconds": "ពេលវេលានៅក្នុងវិនាទី",
diff --git a/packages/rocketchat-i18n/i18n/ko.i18n.json b/packages/rocketchat-i18n/i18n/ko.i18n.json
index dae8b1288837..014e30c0b38f 100644
--- a/packages/rocketchat-i18n/i18n/ko.i18n.json
+++ b/packages/rocketchat-i18n/i18n/ko.i18n.json
@@ -1832,7 +1832,6 @@
   "Mentions_default": "멘션 (기본값)",
   "Mentions_only": "멘션만",
   "Merge_Channels": "대화방 병합",
-  "Message": "메시지",
   "Message_AllowBadWordsFilter": "메시지에 비속어 필터링 허용",
   "Message_AllowDeleting": "메시지 삭제 허용",
   "Message_AllowDeleting_BlockDeleteInMinutes": "(N) 분 후 차단 메시지 삭제",
@@ -1900,9 +1899,9 @@
   "Message_VideoRecorderEnabled": "화상 레코더 사용",
   "Message_VideoRecorderEnabledDescription": "'파일 업로드' 설정에서 허용된 미디어 유형에 'video/webm' 형식을 설정해야 합니다.",
   "Message_view_mode_info": "화면상의 대량의 메시지 공간이 변경됩니다.",
+  "Message": "메시지",
   "messages": "메시지",
   "Messages": "메시지",
-  "Mmessages": "메시지",
   "Messages_that_are_sent_to_the_Incoming_WebHook_will_be_posted_here": "Webhook으로 들어오는 메시지가 이곳에 게시됩니다.",
   "Meta": "메타정보",
   "Meta_custom": "사용자 정의 메타 태그",
@@ -2674,8 +2673,6 @@
   "This_month": "이번 달",
   "This_room_has_been_archived_by__username_": "__username__님이 이 대화방을 보관처리 했습니다.",
   "This_room_has_been_unarchived_by__username_": "__username__님이 이 대화방의 보관처리를 취소했습니다.",
-  "Thread_slash_command_params": "메시지",
-  "Threading_context_menu_none": "보이지 않음",
   "This_week": "이번 주",
   "Thursday": "목요일",
   "Time_in_seconds": "시간 (초)",
diff --git a/packages/rocketchat-i18n/i18n/ku.i18n.json b/packages/rocketchat-i18n/i18n/ku.i18n.json
index de510df84c0d..99bb42faeb74 100644
--- a/packages/rocketchat-i18n/i18n/ku.i18n.json
+++ b/packages/rocketchat-i18n/i18n/ku.i18n.json
@@ -1712,7 +1712,6 @@
   "Mentions_default": "Behsa (default)",
   "Mentions_only": "Tenê Mentions",
   "Merge_Channels": "Channels Merge",
-  "Message": "Agah",
   "Message_AllowBadWordsFilter": "Destûrê bide Message gotinên xerab Filtering",
   "Message_AllowDeleting": "Destûrê bide Message Deleting",
   "Message_AllowDeleting_BlockDeleteInMinutes": "Block Message Deleting Piştî (n) Minutes",
@@ -1780,9 +1779,9 @@
   "Message_VideoRecorderEnabled": "Vebijêrk Video Video",
   "Message_VideoRecorderEnabledDescription": "Pêdivî ye ku pelên vîdyoy / webm 'yên ku di mîhengên çapemeniyê de' mîhengên pelê vekirî 'tête qebûl kirin.",
   "Message_view_mode_info": "Ev guhertin li gorî mêjera mesajên space xwe bavêjin û xwe li ser ekranê.",
+  "Message": "Agah",
   "messages": "Messages",
   "Messages": "Messages",
-  "Mmessages": "peyam",
   "Messages_that_are_sent_to_the_Incoming_WebHook_will_be_posted_here": "ئەو نامانەی ئەنێردرێن بۆ WebHookە هاتوەکان لێرە دا ئەنرێت",
   "Meta": "Meta",
   "Meta_custom": "Meta Taybet",
@@ -2511,8 +2510,6 @@
   "This_is_a_push_test_messsage": "Ev messsage test push e",
   "This_room_has_been_archived_by__username_": "Vê odeyê hatiye dîtin by __username__ arşîvkirin",
   "This_room_has_been_unarchived_by__username_": "Vê odeyê hatiye dîtin by __username__ unarchived",
-  "Thread_slash_command_params": "peyama we",
-  "Threading_context_menu_none": "Nedît",
   "Thursday": "Pêncşem",
   "Time_in_seconds": "Time in seconds",
   "Title": "Nav",
diff --git a/packages/rocketchat-i18n/i18n/lo.i18n.json b/packages/rocketchat-i18n/i18n/lo.i18n.json
index ed402114368f..c39ebd0a5c34 100644
--- a/packages/rocketchat-i18n/i18n/lo.i18n.json
+++ b/packages/rocketchat-i18n/i18n/lo.i18n.json
@@ -1713,7 +1713,6 @@
   "Mentions_default": "ກ່າວ (ມາດຕະຖານ)",
   "Mentions_only": "Mentions only",
   "Merge_Channels": "Merge Channels",
-  "Message": "ຂໍ້ຄວາມ",
   "Message_AllowBadWordsFilter": "ອະນຸຍາດໃຫ້ຂໍ້ຄວາມຄໍາເວົ້າບໍ່ດີການກັ່ນຕອງ",
   "Message_AllowDeleting": "ອະນຸຍາດໃຫ້ຂໍ້ຄວາມລຶບ",
   "Message_AllowDeleting_BlockDeleteInMinutes": "Block ຂໍ້ຄວາມລຶບຫຼັງຈາກ (n) ນາທີ",
@@ -1781,9 +1780,9 @@
   "Message_VideoRecorderEnabled": "Video Recorder Enabled",
   "Message_VideoRecorderEnabledDescription": "ຕ້ອງການໄຟລ໌ 'video / webm' ເປັນສື່ມວນຊົນທີ່ຍອມຮັບພາຍໃນ 'ການອັບໂຫລດໄຟລ໌'.",
   "Message_view_mode_info": "ການປ່ຽນແປງນີ້ຈໍານວນຂອງຂໍ້ຄວາມຊ່ອງທີ່ໃຊ້ເວລາເຖິງໃນຫນ້າຈໍ.",
+  "Message": "ຂໍ້ຄວາມ",
   "messages": "ຂໍ້ຄວາມ",
   "Messages": "ຂໍ້ຄວາມ",
-  "Mmessages": "ຂໍ້ຄວາມ",
   "Messages_that_are_sent_to_the_Incoming_WebHook_will_be_posted_here": "ຂໍ້ຄວາມທີ່ຖືກສົ່ງໄປທີ່ເຂົ້າມາ WebHook ຈະໄດ້ຮັບການຈັດພີມມາທີ່ນີ້.",
   "Meta": "Meta",
   "Meta_custom": "Custom Meta Tags",
@@ -2512,8 +2511,6 @@
   "This_is_a_push_test_messsage": "ນີ້ເປັນ messsage ການທົດສອບການຊຸກຍູ້",
   "This_room_has_been_archived_by__username_": "ຫ້ອງນີ້ໄດ້ຮັບການຮັກສາໄວ້ໂດຍ __username__",
   "This_room_has_been_unarchived_by__username_": "ຫ້ອງນີ້ໄດ້ຮັບການ unarchived ໂດຍ __username__",
-  "Thread_slash_command_params": "ຂໍ້​ຄວາມ​ຂອງ​ເຈົ້າ",
-  "Threading_context_menu_none": "ທີ່ເບິ່ງບໍ່ເຫັນ",
   "Thursday": "ວັນພະຫັດ",
   "Time_in_seconds": "ທີ່ໃຊ້ເວລາໃນວິນາທີ",
   "Title": "Title",
diff --git a/packages/rocketchat-i18n/i18n/lt.i18n.json b/packages/rocketchat-i18n/i18n/lt.i18n.json
index c786cda41327..7f6eb24753f3 100644
--- a/packages/rocketchat-i18n/i18n/lt.i18n.json
+++ b/packages/rocketchat-i18n/i18n/lt.i18n.json
@@ -1713,7 +1713,6 @@
   "Mentions_default": "Minimas (pagal nutylėjimą)",
   "Mentions_only": "Minima tik",
   "Merge_Channels": "Sujungti kanalus",
-  "Message": "Pranešimas",
   "Message_AllowBadWordsFilter": "Leisti pranešimui blogus žodžius filtruoti",
   "Message_AllowDeleting": "Leisti pranešimus ištrinti",
   "Message_AllowDeleting_BlockDeleteInMinutes": "Blokuoti pranešimą ištrinant po (n) minučių",
@@ -1781,9 +1780,9 @@
   "Message_VideoRecorderEnabled": "Vaizdo įrašymo įrenginys įjungtas",
   "Message_VideoRecorderEnabledDescription": "Reikalaujama, kad \"video / webm\" failai būtų priimtini medijos tipo parametrai \"Failo įkėlimas\".",
   "Message_view_mode_info": "Tai pakeičia kosminių pranešimų kiekį ekrane.",
+  "Message": "Pranešimas",
   "messages": "Žinutės",
   "Messages": "Žinutės",
-  "Mmessages": "pranešimai",
   "Messages_that_are_sent_to_the_Incoming_WebHook_will_be_posted_here": "Pranešimai, siunčiami į \"Incoming WebHook\", bus paskelbti čia.",
   "Meta": "Meta",
   "Meta_custom": "Tinkinti meta žymeles",
@@ -2512,8 +2511,6 @@
   "This_is_a_push_test_messsage": "Tai stumti bandymo pranešimą",
   "This_room_has_been_archived_by__username_": "Šis kambarys buvo archyvuotas pagal __username__",
   "This_room_has_been_unarchived_by__username_": "Šis kambarys buvo unarchyvuotas __username__",
-  "Thread_slash_command_params": "tavo žinutė",
-  "Threading_context_menu_none": "Nematomas",
   "Thursday": "Ketvirtadienis",
   "Time_in_seconds": "Laikas sekundėmis",
   "Title": "Pavadinimas",
diff --git a/packages/rocketchat-i18n/i18n/lv.i18n.json b/packages/rocketchat-i18n/i18n/lv.i18n.json
index 276a4bcdf56e..b63b02193f42 100644
--- a/packages/rocketchat-i18n/i18n/lv.i18n.json
+++ b/packages/rocketchat-i18n/i18n/lv.i18n.json
@@ -1712,7 +1712,6 @@
   "Mentions_default": "Pieminējumi (Noklusējums)",
   "Mentions_only": "Tikai pieminējumus",
   "Merge_Channels": "Apvienot kanālus",
-  "Message": "Ziņojums",
   "Message_AllowBadWordsFilter": "Atļaut rupjo vārdu filtru ziņojumam",
   "Message_AllowDeleting": "Atļaut ziņojumu dzēšanu",
   "Message_AllowDeleting_BlockDeleteInMinutes": "Bloķēt ziņojumu dzēšanu pēc (n) minūtēm",
@@ -1780,9 +1779,9 @@
   "Message_VideoRecorderEnabled": "Videoieraksts ir iespējots",
   "Message_VideoRecorderEnabledDescription": "Nepieciešams, lai iestatījumos \"Failu augšupielāde\" faili \"video / webm\" būtu pieņemama multivides veida.",
   "Message_view_mode_info": "Tas maina to cik daudz vietas ziņojumi aizņem uz ekrāna.",
+  "Message": "Ziņojums",
   "messages": "Ziņojumi",
   "Messages": "Ziņojumi",
-  "Mmessages": "ziņojumi",
   "Messages_that_are_sent_to_the_Incoming_WebHook_will_be_posted_here": "Ziņojumi, kas tiek sūtīti uz Ienākošo WebHook, tiks ievietoti šeit.",
   "Meta": "Meta",
   "Meta_custom": "Pielāgoti meta tagi",
@@ -2511,8 +2510,6 @@
   "This_is_a_push_test_messsage": "Šis ir push testa ziņojums",
   "This_room_has_been_archived_by__username_": "Šo istabu ir arhivē lietotājvārds",
   "This_room_has_been_unarchived_by__username_": "Šo istabu ir atkārtoti izņēma no arhīva lietotājvārds",
-  "Thread_slash_command_params": "Jūsu ziņojums",
-  "Threading_context_menu_none": "Neredzams",
   "Thursday": "Ceturtdiena",
   "Time_in_seconds": "Laiks sekundēs",
   "Title": "Virsraksts",
diff --git a/packages/rocketchat-i18n/i18n/mn.i18n.json b/packages/rocketchat-i18n/i18n/mn.i18n.json
index 26c28b7ecb15..eb700a36237d 100644
--- a/packages/rocketchat-i18n/i18n/mn.i18n.json
+++ b/packages/rocketchat-i18n/i18n/mn.i18n.json
@@ -1713,7 +1713,6 @@
   "Mentions_default": "Урамшуулал (үндсэн)",
   "Mentions_only": "Зөвхөн санал хүсэлт",
   "Merge_Channels": "Сувгуудыг нийлүүлэх",
-  "Message": "Захиа",
   "Message_AllowBadWordsFilter": "Муу үгсийг шүүж мессежийг зөвшөөрөх",
   "Message_AllowDeleting": "Мессеж устгахыг зөвшөөрөх",
   "Message_AllowDeleting_BlockDeleteInMinutes": "(N) минутын дараа устгах зурвас",
@@ -1781,9 +1780,9 @@
   "Message_VideoRecorderEnabled": "Видео бичлэг хийх боломжтой",
   "Message_VideoRecorderEnabledDescription": "'Файл байршуулах' тохиргоон доторх 'видео / вэбм' файлуудыг хүлээн зөвшөөрсөн хэвлэл мэдээллийн төрлийг сонгохыг шаарддаг.",
   "Message_view_mode_info": "Энэ нь дэлгэц дээр хийгдэх санах ойн хэмжээ өөрчлөгддөг.",
+  "Message": "Захиа",
   "messages": "Мессежүүд",
   "Messages": "Мессежүүд",
-  "Mmessages": "зурвасууд",
   "Messages_that_are_sent_to_the_Incoming_WebHook_will_be_posted_here": "Ирж буй WebHook руу илгээгдсэн зурвасууд энд тавигдана.",
   "Meta": "Мета",
   "Meta_custom": "Custom Meta Tags",
@@ -2512,8 +2511,6 @@
   "This_is_a_push_test_messsage": "Энэ нь түлхэх туршилтын зурвас юм",
   "This_room_has_been_archived_by__username_": "Энэ өрөөг __усername__ архивласан байна.",
   "This_room_has_been_unarchived_by__username_": "Энэ өрөөг ___хэрэглэгчийн нэрээр андуураагүй байна.",
-  "Thread_slash_command_params": "таны зурвас",
-  "Threading_context_menu_none": "Далд",
   "Thursday": "Пүрэв гарагт",
   "Time_in_seconds": "Секундын дотор",
   "Title": "Гарчиг",
diff --git a/packages/rocketchat-i18n/i18n/ms-MY.i18n.json b/packages/rocketchat-i18n/i18n/ms-MY.i18n.json
index 5a31b0f7c332..d020f3451197 100644
--- a/packages/rocketchat-i18n/i18n/ms-MY.i18n.json
+++ b/packages/rocketchat-i18n/i18n/ms-MY.i18n.json
@@ -1713,7 +1713,6 @@
   "Mentions_default": "Menyebut (default)",
   "Mentions_only": "Mentions sahaja",
   "Merge_Channels": "Merge Channels",
-  "Message": "Mesej",
   "Message_AllowBadWordsFilter": "Benarkan Mesej perkataan buruk penapisan",
   "Message_AllowDeleting": "Benarkan Pemadaman Mesej",
   "Message_AllowDeleting_BlockDeleteInMinutes": "Block Mesej Memadam Selepas (n) Minit",
@@ -1781,9 +1780,9 @@
   "Message_VideoRecorderEnabled": "Perakam Video Dihidupkan",
   "Message_VideoRecorderEnabledDescription": "Memerlukan fail 'video / webm' menjadi jenis media yang diterima dalam tetapan 'Upload File'.",
   "Message_view_mode_info": "Ini mengubah jumlah mesej ruang mengambil pada skrin.",
+  "Message": "Mesej",
   "messages": "Mesej",
   "Messages": "Mesej",
-  "Mmessages": "mesej",
   "Messages_that_are_sent_to_the_Incoming_WebHook_will_be_posted_here": "Mesej-mesej yang dihantar ke masuk WebHook akan disiarkan di sini.",
   "Meta": "Meta",
   "Meta_custom": "Tag Meta Custom",
@@ -2512,8 +2511,6 @@
   "This_is_a_push_test_messsage": "Ini adalah mesej supaya ujian push",
   "This_room_has_been_archived_by__username_": "Bilik ini telah diarkibkan oleh __nama pengguna__",
   "This_room_has_been_unarchived_by__username_": "Bilik ini telah dinyaharkibkan oleh __nama pengguna__",
-  "Thread_slash_command_params": "mesej anda",
-  "Threading_context_menu_none": "Tidak dapat dilihat",
   "Thursday": "Khamis",
   "Time_in_seconds": "Masa dalam saat",
   "Title": "Title",
diff --git a/packages/rocketchat-i18n/i18n/nl.i18n.json b/packages/rocketchat-i18n/i18n/nl.i18n.json
index 8cad609e934d..d94e1d3ff2ff 100644
--- a/packages/rocketchat-i18n/i18n/nl.i18n.json
+++ b/packages/rocketchat-i18n/i18n/nl.i18n.json
@@ -1793,7 +1793,6 @@
   "Mentions_default": "Vermeldingen (standaard)",
   "Mentions_only": "Alleen vermeldingen",
   "Merge_Channels": "Kanalen samenvoegen",
-  "Message": "Bericht",
   "Message_AllowBadWordsFilter": "Laat bericht slechte woorden filteren",
   "Message_AllowDeleting": "Bericht verwijderen toestaan",
   "Message_AllowDeleting_BlockDeleteInMinutes": "Block Message verwijderen After (n) Notulen",
@@ -1861,9 +1860,9 @@
   "Message_VideoRecorderEnabled": "Videorecorder ingeschakeld",
   "Message_VideoRecorderEnabledDescription": "Vereist dat 'video / webm'-bestanden een geaccepteerd mediatype zijn binnen de instellingen voor' Bestand uploaden '.",
   "Message_view_mode_info": "Dit verandert de hoeveelheid ruimte boodschappen nemen op het scherm.",
+  "Message": "Bericht",
   "messages": "Berichten",
   "Messages": "Berichten",
-  "Mmessages": "berichten",
   "Messages_that_are_sent_to_the_Incoming_WebHook_will_be_posted_here": "Berichten die worden verstuurd naar de binnenkomende WebHook zullen hier gepost worden.",
   "Meta": "Meta",
   "Meta_custom": "Aangepaste metatags",
@@ -2633,8 +2632,6 @@
   "This_month": "Deze maand",
   "This_room_has_been_archived_by__username_": "Deze kamer is gearchiveerd door __username__",
   "This_room_has_been_unarchived_by__username_": "Deze kamer is uit het archief gehaald door __username__",
-  "Thread_slash_command_params": "jouw bericht",
-  "Threading_context_menu_none": "Onzichtbaar",
   "This_week": "Deze week",
   "Thursday": "Donderdag",
   "Time_in_seconds": "Tijd in seconden",
diff --git a/packages/rocketchat-i18n/i18n/no.i18n.json b/packages/rocketchat-i18n/i18n/no.i18n.json
index ba87a913cc36..5195af4c40ef 100644
--- a/packages/rocketchat-i18n/i18n/no.i18n.json
+++ b/packages/rocketchat-i18n/i18n/no.i18n.json
@@ -1714,7 +1714,6 @@
   "Mentions_default": "Mentjoner (standard)",
   "Mentions_only": "Kun mentene",
   "Merge_Channels": "Flett kanaler",
-  "Message": "Beskjed",
   "Message_AllowBadWordsFilter": "Tillat melding om dårlig ord filtrering",
   "Message_AllowDeleting": "Tillat melding å slette",
   "Message_AllowDeleting_BlockDeleteInMinutes": "Blokker melding som slettes etter (n) minutter",
@@ -1782,9 +1781,9 @@
   "Message_VideoRecorderEnabled": "Videoopptaker aktivert",
   "Message_VideoRecorderEnabledDescription": "Krever at video / webm-filer skal være en akseptert medietype i \"Filopplastings\" -innstillinger.",
   "Message_view_mode_info": "Dette endrer mengden plassmeldinger som tas opp på skjermen.",
+  "Message": "Beskjed",
   "messages": "meldinger",
   "Messages": "meldinger",
-  "Mmessages": "meldinger",
   "Messages_that_are_sent_to_the_Incoming_WebHook_will_be_posted_here": "Meldinger som sendes til Incoming WebHook vil bli lagt ut her.",
   "Meta": "Meta",
   "Meta_custom": "Egendefinerte Meta Tags",
@@ -2513,8 +2512,6 @@
   "This_is_a_push_test_messsage": "Dette er en push-testmelding",
   "This_room_has_been_archived_by__username_": "Dette rommet er arkivert av __username__",
   "This_room_has_been_unarchived_by__username_": "Dette rommet er blitt arkivert av __username__",
-  "Thread_slash_command_params": "din beskjed",
-  "Threading_context_menu_none": "Usynlig",
   "Thursday": "Torsdag",
   "Time_in_seconds": "Tid i sekunder",
   "Title": "Tittel",
diff --git a/packages/rocketchat-i18n/i18n/pl.i18n.json b/packages/rocketchat-i18n/i18n/pl.i18n.json
index 925503345351..a71ea993d2de 100644
--- a/packages/rocketchat-i18n/i18n/pl.i18n.json
+++ b/packages/rocketchat-i18n/i18n/pl.i18n.json
@@ -1906,7 +1906,6 @@
   "Mentions_default": "Wzmianki (domyślnie)",
   "Mentions_only": "Tylko wzmianki",
   "Merge_Channels": "Scal kanały",
-  "Message": "Wiadomość",
   "Message_AllowBadWordsFilter": "Włącz filtrowanie niecenzuralnych słów",
   "Message_AllowDeleting": "Pozwól usuwać wiadomości",
   "Message_AllowDeleting_BlockDeleteInMinutes": "Blokuj usuwanie wiadomości po (n) minutach",
@@ -1977,9 +1976,9 @@
   "Message_VideoRecorderEnabled": "Nagrywanie wideo włączone",
   "Message_VideoRecorderEnabledDescription": "Wymaga plików \"wideo / webm\", aby były akceptowanym typem mediów w ustawieniach \"Przesyłanie pliku\".",
   "Message_view_mode_info": "Zmienia ilość wiadomości przestrzeni zajmują na ekranie.",
+  "Message": "Wiadomość",
   "messages": "Wiadomości",
   "Messages": "Wiadomości",
-  "Mmessages": "komunikaty",
   "Messages_that_are_sent_to_the_Incoming_WebHook_will_be_posted_here": "Wiadomości, które zostaną przesłane przez WebHook będą publikowane tutaj.",
   "Meta": "Meta",
   "Meta_custom": "Niestandardowe tagi meta",
@@ -2769,8 +2768,6 @@
   "This_month": "Ten miesiąc",
   "This_room_has_been_archived_by__username_": "Pokój ten został zarchiwizowany przez użytkownika __username__",
   "This_room_has_been_unarchived_by__username_": "Pokój ten został rozpakowany przez użytkownika __username__",
-  "Thread_slash_command_params": "twoja wiadomość",
-  "Threading_context_menu_none": "Niewidoczny",
   "This_week": "W tym tygodniu",
   "Thursday": "Czwartek",
   "Time_in_seconds": "Czas w sekundach",
diff --git a/packages/rocketchat-i18n/i18n/pt-BR.i18n.json b/packages/rocketchat-i18n/i18n/pt-BR.i18n.json
index 4c93e6b4cf07..05273ac05dee 100644
--- a/packages/rocketchat-i18n/i18n/pt-BR.i18n.json
+++ b/packages/rocketchat-i18n/i18n/pt-BR.i18n.json
@@ -160,9 +160,9 @@
   "Accounts_Password_Policy_ForbidRepeatingCharacters_Description": "Garante que as senhas não contenham o mesmo caractere repetido ao lado do outro.",
   "Accounts_Password_Policy_ForbidRepeatingCharactersCount": "Máximo de caracteres repetidos",
   "Accounts_Password_Policy_ForbidRepeatingCharactersCount_Description": "A quantidade de vezes que um caractere pode se repetir antes de não ser permitido.",
-  "Accounts_Password_Policy_MaxLength": "Comprimento máximo",
+  "Accounts_Password_Policy_MaxLength": "Tamanho máximo",
   "Accounts_Password_Policy_MaxLength_Description": "Garante que as senhas não tenham mais que essa quantidade de caracteres. Use `-1 para desativar.",
-  "Accounts_Password_Policy_MinLength": "Comprimento mínimo",
+  "Accounts_Password_Policy_MinLength": "Tamanho mínimo",
   "Accounts_Password_Policy_MinLength_Description": "Garante que as senhas tenham pelo menos esta quantidade de caracteres. Use `-1 para desativar.",
   "Accounts_PasswordReset": "Redefinição de Senha",
   "Accounts_Registration_AuthenticationServices_Default_Roles": "Funções padrão para serviços de autenticação",
@@ -293,8 +293,8 @@
   "API_Enable_Rate_Limiter_Limit_Calls_Default_Description": "Número de chamadas padrão para cada endpoint da API REST, permitido dentro do intervalo de tempo definido abaixo",
   "API_Enable_Rate_Limiter_Limit_Time_Default": "Limite de tempo padrão para o limitador de taxa (em ms)",
   "API_Enable_Rate_Limiter_Limit_Time_Default_Description": "Tempo limite padrão para limitar o número de chamadas em cada endpoint da API REST (em ms)",
-  "API_Enable_Personal_Access_Tokens": "Activar códigos de acesso pessoal para a API REST",
-  "API_Enable_Personal_Access_Tokens_Description": "Activar códigos de acesso pessoal para uso com a API REST",
+  "API_Enable_Personal_Access_Tokens": "Ativar Códigos de Acesso Pessoal para a API REST",
+  "API_Enable_Personal_Access_Tokens_Description": "Ativar Códigos de Acesso Pessoal para uso com a API REST",
   "API_Enable_Shields": "Ativar protetores",
   "API_Enable_Shields_Description": "Ativar escudos disponíveis em `/ api / v1 / shield.svg`",
   "API_GitHub_Enterprise_URL": "URL do servidor",
@@ -1037,6 +1037,16 @@
   "Display_offline_form": "Exibir formulário quando offline",
   "Display_unread_counter": "Exibir número de mensagens não lidas",
   "Displays_action_text": "Exibe texto da ação",
+  "Discussion_name": "Nome da discussão",
+  "Discussions": "Conversas",
+  "Discussion_start": "Iniciar uma discussão",
+  "Discussion_target_channel_description": "Selecione um canal relacionado com o que deseja perguntar",
+  "Discussion_target_channel_prefix": "Criando uma discussão em",
+  "Discussion_target_channel": "Canal ou grupo pai",
+  "discussion-created": "__message__",
+  "Discussion_description": "Ajude a manter uma visão geral sobre o que está acontecendo! Ao criar uma discussão, um sub-canal do que selecionou é criado e ambos são ligados.",
+  "Discussion_first_message_title": "A sua mensagem",
+  "Discussion_title": "Crie uma nova discussão",
   "Dont_ask_me_again": "Não me pergunte de novo!",
   "Dont_ask_me_again_list": "Não me pergunte novamente",
   "Do_not_display_unread_counter": "Não exiba nenhum contador desse canal",
@@ -1210,8 +1220,8 @@
   "error-not-allowed": "Não permitido",
   "error-not-authorized": "Não autorizado",
   "error-password-policy-not-met": "A senha não atende a política do servidor",
-  "error-password-policy-not-met-maxLength": "A senha não está de acordo com a política de comprimento máximo do servidor  (senha muito longa)",
-  "error-password-policy-not-met-minLength": "A senha não está de acordo com a política de comprimento mínimo do servidor  (senha muito curta)",
+  "error-password-policy-not-met-maxLength": "A senha não está de acordo com a política de comprimento máximo do servidor (senha muito longa)",
+  "error-password-policy-not-met-minLength": "A senha não está de acordo com a política de comprimento mínimo do servidor (senha muito curta)",
   "error-password-policy-not-met-oneLowercase": "A senha não está de acordo com a política do servidor de pelo menos um caractere minúsculo.",
   "error-password-policy-not-met-oneNumber": "A senha não está de acordo com a política do servidor, de pelo menos um caractere numérico.",
   "error-password-policy-not-met-oneSpecial": "A senha não está de acordo com a política do servidor, de pelo menos um caractere especial.",
@@ -1253,7 +1263,6 @@
   "every_hour": "Uma vez a cada hora",
   "every_six_hours": "Uma vez a cada seis horas",
   "every_day": "Uma vez por dia",
-  "Every_Workspace": "Cada espaço de trabalho",
   "Everyone_can_access_this_channel": "Todos podem acessar este canal",
   "Example_s": "Exemplo: <code class=\"inline\">%s</code>",
   "Exclude_Botnames": "Excluir bots",
@@ -1265,6 +1274,7 @@
   "Export_My_Data": "Exportar meus dados",
   "expression": "Expressão",
   "Extended": "Estendido",
+  "External_Domains": "Domínios Externos",
   "External_Queue_Service_URL": "URL do Serviço de Fila Externa",
   "External_Service": "Serviço Externo",
   "Facebook_Page": "Página do Facebook",
@@ -1277,7 +1287,16 @@
   "FEDERATION_Enabled": "Tentativa para a  integração do suporte de federação. A alteração deste valor requer a reinicialização do Rocket.Chat.",
   "FEDERATION_Enabled_Alert": "O suporte de federação é um trabalho em curso. Não recomendamos o uso num sistema de produção.",
   "FEDERATION_Discovery_Method": "Método de Descoberta",
+  "FEDERATION_Discovery_Method_Description": "Você pode usar o hub ou uma entrada SRV e TXT em seus registros DNS.",
   "FEDERATION_Domain": "Domínio",
+  "FEDERATION_Domain_Description": "Adicione o domínio a este servidor deve estar ligado por exemplo: ",
+  "FEDERATION_Domain_Alert": "Não altere isto depois de ativar o recurso, ainda não podemos lidar com as alterações de domínio.",
+  "FEDERATION_Public_Key": "Chave Publica",
+  "FEDERATION_Public_Key_Description": "Esta é a chave que você deve compartilhar com outros peers.",
+  "FEDERATION_Hub_URL": "Hub URL",
+  "FEDERATION_Hub_URL_Description": "Configure o URL do hub, por exemplo: https://hub.rocket.chat. É aceitável o uso de portas se necessário.",
+  "FEDERATION_Unique_Id": "ID único",
+  "FEDERATION_Unique_Id_Description": "Este é o seu ID de federação exclusivo, que pode usar para identificar seu peer na rede.",
   "FEDERATION_Status": "Situação",
   "Field": "Campo",
   "Field_removed": "Campo removido",
@@ -1413,6 +1432,7 @@
   "Graphql_CORS": "GraphQL CORS",
   "Graphql_Subscription_Port": "Porta de Subscrição GraphQL",
   "Group_by_Type": "Grupo por Tipo",
+  "Group_discussions": "Discussões em grupo",
   "Group_favorites": "Grupos favoritos",
   "Group_mentions_disabled_x_members": "As menções de grupo `@all` e` @here` foram desativadas para salas com mais de __total__ membros.",
   "Group_mentions_only": "Grupo menciona apenas",
@@ -1432,7 +1452,7 @@
   "Hide_flextab": "Esconder barra da direita com clique",
   "Hide_Group_Warning": "Tem certeza de que deseja ocultar o grupo \"%s\"?",
   "Hide_Livechat_Warning": "Tem certeza de que deseja esconder o livechat com \"%s\"?",
-  "Hide_Private_Warning": "Tem certeza de que deseja ocultar a discussão com \"%s\"?",
+  "Hide_Private_Warning": "Tem certeza de que deseja ocultar a conversa com \"%s\"?",
   "Hide_roles": "Ocultar funções",
   "Hide_room": "Esconder Sala",
   "Hide_Room_Warning": "Tem certeza de que deseja ocultar a sala \"%s\"?",
@@ -1775,7 +1795,7 @@
   "Leave": "Sair",
   "Leave_Group_Warning": "Tem certeza de que quer sair do grupo \"%s\"?",
   "Leave_Livechat_Warning": "Tem certeza de que deseja deixar o Livechat com \"%s\"?",
-  "Leave_Private_Warning": "Tem certeza de que quer sair da discussão com \"%s\"?",
+  "Leave_Private_Warning": "Tem certeza de que quer sair da conversa com \"%s\"?",
   "Leave_room": "Sair da sala",
   "Leave_Room_Warning": "Tem certeza de que deseja sair da sala \"%s\"?",
   "Leave_the_current_channel": "Sai deste canal",
@@ -1824,6 +1844,7 @@
   "Loading...": "Carregando...",
   "Loading_more_from_history": "Carregando mais a partir do histórico",
   "Loading_suggestion": "Buscando sugestões...",
+  "Local_Domains": "Domínios Locais",
   "Local_Password": "Senha local",
   "Localization": "Localização",
   "Log_Exceptions_to_Channel_Description": "Um canal que irá receber todas as exceções capturadas. Deixe em branco para ignorar exceções.",
@@ -1898,7 +1919,7 @@
   "Markdown_Parser": "Markdown Parser",
   "Markdown_SupportSchemesForLink": "Protocolos Suportados para Markdown de Links",
   "Markdown_SupportSchemesForLink_Description": "Lista de protocolos separados por vírgulas",
-  "Max_length_is": "O comprimento máximo é%s",
+  "Max_length_is": "Tamanho máximo é %s",
   "Media": "meios de comunicação",
   "Medium": "Médio",
   "Members_List": "Lista de Membros",
@@ -1910,8 +1931,8 @@
   "Mentions_default": "Menções (padrão)",
   "Mentions_only": "Menções apenas",
   "Merge_Channels": "Mesclar Canais",
-  "Message": "Mensagem",
   "Message_AllowBadWordsFilter": "Permitir filtro de palavrões em mensagens",
+  "Message_AllowConvertLongMessagesToAttachment": "Permitir a conversão de mensagens longas em anexo",
   "Message_AllowDeleting": "Permitir Exclusão de Mensagem",
   "Message_AllowDeleting_BlockDeleteInMinutes": "Bloquear exclusão de mensagens após (n) minutos",
   "Message_AllowDeleting_BlockDeleteInMinutes_Description": "Digite 0 para desativar o bloqueio.",
@@ -1977,13 +1998,15 @@
   "Message_TimeFormat": "Formato de Hora",
   "Message_TimeFormat_Description": "Veja também: <a href=\"http://momentjs.com/docs/#/displaying/format/\" target=\"momemt\">Moment.js</a>",
   "Message_too_long": "Mensagem muito longa",
+  "Message_too_long_as_an_attachment_question": "Mensagem muito longa. Quer enviar como um anexo em vez disso?",
   "Message_UserId": "ID do usuário",
   "Message_VideoRecorderEnabled": "Gravação de vídeo habilitada",
   "Message_VideoRecorderEnabledDescription": "Requer arquivos 'video / webm' para ser um tipo de mídia aceito dentro das configurações 'Upload de arquivo'.",
   "Message_view_mode_info": "Isso muda o espaço que as mensagens ocupam na tela.",
+  "message": "mensagem",
+  "Message": "Mensagem",
   "messages": "Mensagens",
   "Messages": "Mensagens",
-  "Mmessages": "mensagens",
   "Messages_that_are_sent_to_the_Incoming_WebHook_will_be_posted_here": "As mensagens que são enviadas para o WebHook de Entrada serão publicadas aqui.",
   "Meta": "Meta",
   "Meta_custom": "Meta Tags Personalizadas",
@@ -1992,7 +2015,7 @@
   "Meta_language": "Idioma",
   "Meta_msvalidate01": "MSValidate.01",
   "Meta_robots": "Robots",
-  "Min_length_is": "O comprimento mínimo é%s",
+  "Min_length_is": "Tamanho mínimo é %s",
   "Minimum_balance": "Saldo mínimo",
   "minutes": "minutos",
   "Mobile": "Móvel",
@@ -2031,6 +2054,9 @@
   "New_Application": "Nova aplicação",
   "New_Custom_Field": "Novo Campo Personalizado",
   "New_Department": "Novo Departamento",
+  "New_discussion": "Nova discussão",
+  "New_discussion_name": "Um nome significativo para a sala de discussão",
+  "New_discussion_first_message": "Normalmente, uma discussão começa com uma pergunta, como \"Como faço o carregamento de uma imagem?\"",
   "New_integration": "Nova integração",
   "New_line_message_compose_input": "`%s` - Nova linha na mensagem compor a entrada",
   "New_logs": "Novos logs",
@@ -2067,6 +2093,7 @@
   "No_snippet_messages": "Sem trecho",
   "No_starred_messages": "Não há mensagens favoritas",
   "No_such_command": "Nenhum comando desse tipo: `/ __command__`",
+  "No_discussions_yet": "Ainda sem discussões",
   "No_user_with_username_%s_was_found": "Nenhum usuário com nome de usuário <strong>\"%s\"</strong> foi encontrado!",
   "Nobody_available": "Ninguém disponível",
   "Node_version": "Versão do Node",
@@ -2088,8 +2115,8 @@
   "Notifications_Always_Notify_Mobile_Description": "Escolha sempre notificar o dispositivo móvel independentemente do status de presença.",
   "Notifications_Duration": "Notificações_Duração",
   "Notifications_Max_Room_Members": "Máximo de membros na sala antes de desativar todas as notificações de mensagens",
-  "Notifications_Max_Room_Members_Description": "Número máximo de membros no quarto quando as notificações para todas as mensagens são desabilitadas. Os usuários ainda podem alterar a configuração por sala para receber todas as notificações de forma individual. (0 para desativar)",
-  "Notifications_Muted_Description": "Se você optar por muda tudo, você não verá o destaque do quarto na lista quando houver novas mensagens, exceto para menções. As notificações de muting irão substituir as configurações de notificações.",
+  "Notifications_Max_Room_Members_Description": "Número máximo de membros na sala quando as notificações para todas as mensagens são desabilitadas. Os usuários ainda podem alterar a configuração por sala para receber todas as notificações de forma individual. (0 para desativar)",
+  "Notifications_Muted_Description": "Se você optar por silenciar tudo, você não verá a sala em destaque na lista quando houver novas mensagens, apenas quando houverem menções. Silenciar notificações irão substituir as configurações de notificações.",
   "Notifications_Preferences": "Preferências de Notificações",
   "Notifications_Sound_Volume": "Volume do som de notificações",
   "Notify_active_in_this_room": "Notificar usuários ativos nesta sala",
@@ -2166,6 +2193,7 @@
   "Override_URL_to_which_files_are_uploaded_This_url_also_used_for_downloads_unless_a_CDN_is_given": "Substituir URL para a qual os arquivos são carregados. Esta url também será usada para downloads, a menos que um CDN seja fornecido",
   "Page_title": "Título da página",
   "Page_URL": "URL da página",
+  "Parent_channel_doesnt_exist": "Canal não existe.",
   "Password": "Senha",
   "Password_Change_Disabled": "O administrador do Rocket.Chat desativou a mudança de senhas",
   "Password_changed_successfully": "Senha alterada com sucesso",
@@ -2348,6 +2376,7 @@
   "Remove_someone_from_room": "Retirar alguém da sala",
   "Removed": "Removido",
   "Removed_User": "Usuário removido",
+  "Replies": "Respostas",
   "Reply": "Responder",
   "ReplyTo": "Responder para",
   "Report_Abuse": "Denunciar abuso",
@@ -2370,6 +2399,7 @@
   "Retail": "Retalho",
   "Retention_setting_changed_successfully": "A configuração da política de retenção foi alterada com sucesso",
   "RetentionPolicy": "Política de retenção",
+  "RetentionPolicy_DoNotExcludeDiscussion": "Não exclua mensagens de discussões",
   "RetentionPolicy_RoomWarning": "Mensagens mais antigas que __time__ são automaticamente removidas aqui",
   "RetentionPolicy_RoomWarning_Unpinned": "Mensagens soltas mais antigas que __time__ são automaticamente removidas aqui",
   "RetentionPolicy_RoomWarning_FilesOnly": "Arquivos mais antigos que __time__ são removidos automaticamente aqui (as mensagens permanecem intactas)",
@@ -2417,8 +2447,8 @@
   "Room_has_been_deleted": "A sala foi excluída",
   "Room_has_been_unarchived": "A sala foi desarquivada",
   "Room_Info": "Informações da Sala",
-  "room_is_blocked": "Este quarto está bloqueado",
-  "room_is_read_only": "Este quarto é apenas de leitura",
+  "room_is_blocked": "Esta sala está bloqueada",
+  "room_is_read_only": "Esta sala é somente leitura",
   "room_name": "nome da sala",
   "Room_name_changed": "Nome da Sala alterado para: <em>__room_name__</em> por <em>__user_by__</em>",
   "Room_name_changed_successfully": "Nome da sala alterado com sucesso",
@@ -2560,7 +2590,7 @@
   "Show_on_offline_page": "Mostrar na página offline",
   "Show_preregistration_form": "Mostrar formulário de pré-registro",
   "Show_queue_list_to_all_agents": "Mostrar link da roleta à todos agentes",
-  "Show_room_counter_on_sidebar": "Mostrar contador do quarto na barra lateral",
+  "Show_room_counter_on_sidebar": "Mostrar contador da sala na barra lateral",
   "Show_the_keyboard_shortcut_list": "Mostrar a lista de atalhos de teclado",
   "Showing_archived_results": "<p>Exibindo <b>%s</b> resultados arquivados</p>",
   "Showing_online_users": "Mostrando <b>__total_showing__</b> de __total__ usuários",
@@ -2687,7 +2717,7 @@
   "Tag": "Tag",
   "Take_it": "Pegue!",
   "TargetRoom": "Sala de destino",
-  "TargetRoom_Description": "A sala onde as mensagens serão enviadas, que são o resultado desse evento a ser disparado. Somente um quarto-alvo é permitido e deve existir.",
+  "TargetRoom_Description": "A sala onde as mensagens serão enviadas, que são o resultado desse evento a ser disparado. Somente uma sala alvo é permitida e deve existir.",
   "Target user not allowed to receive messages": "Utilizador de destino não autorizado a receber mensagens",
   "Team": "Equipe",
   "Technology_Provider": "Provedor de tecnologia",
@@ -2702,6 +2732,8 @@
   "The_emails_are_being_sent": "Os emails estão sendo enviados.",
   "The_field_is_required": "O campo %s é obrigatório.",
   "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "O redimensionamento da imagem não vai funcionar porque não conseguimos detectar ImageMagick ou GraphicsMagick instalado no seu servidor.",
+  "The_message_is_a_discussion_you_will_not_be_able_to_recover": "A mensagem é uma discussão, você não poderá recuperar as mensagens!",
+  "The_peer__peer__does_not_exist": "O peer <em>__peer__</em> não existe.",
   "The_redirectUri_is_required": "O redirectUri é necessário",
   "The_server_will_restart_in_s_seconds": "O servidor será reiniciado em %s segundos",
   "The_setting_s_is_configured_to_s_and_you_are_accessing_from_s": "A configuração <strong>%s</strong> está definida como <strong>%s</strong> e você está acessando a partir de <strong>%s</strong>!",
@@ -2770,11 +2802,12 @@
   "This_email_has_already_been_used_and_has_not_been_verified__Please_change_your_password": "Este e-mail já foi utilizado e não foi verificado. Por favor, altere sua senha.",
   "This_is_a_desktop_notification": "Esta é uma notificação de desktop",
   "This_is_a_push_test_messsage": "Este é uma mensagem de teste de push notification",
+  "This_message_was_rejected_by__peer__peer": "Esta mensagem foi rejeitada pelo peer <em> __peer__ </em>.",
   "This_month": "Este mês",
   "This_room_has_been_archived_by__username_": "Esta sala foi arquivada por __username__",
   "This_room_has_been_unarchived_by__username_": "Esta sala foi desarquivada por __username__",
-  "Thread_slash_command_params": "sua mensagem",
-  "Threading_context_menu_none": "Invisível",
+  "thread": "tópicos",
+  "Threads": "Tópicos",
   "This_week": "Esta semana",
   "Thursday": "Quinta-feira",
   "Time_in_seconds": "Tempo em segundos",
@@ -2924,6 +2957,7 @@
   "User_is_now_an_admin": "O usuário tornou-se um administrador",
   "User_is_unblocked": "O usuário está desbloqueado",
   "User_joined_channel": "Entrou no canal.",
+  "User_joined_conversation": "Entrou na conversa",
   "User_joined_channel_female": "Entrou no canal.",
   "User_joined_channel_male": "Entrou no canal.",
   "User_left": "Saiu da conversa.",
@@ -3040,6 +3074,7 @@
   "View_Logs": "Ver Logs",
   "View_mode": "Modo de visualização",
   "Viewing_room_administration": "Administração da sala",
+  "View_the_Logs_for": "Ver registos de: \"__name__\"",
   "Visibility": "Visibilidade",
   "Visible": "Visível",
   "Visit_Site_Url_and_try_the_best_open_source_chat_solution_available_today": "Visite __Site_URL__ e experimente a melhor solução de chat de código aberto disponível!",
@@ -3130,6 +3165,7 @@
   "your_message_optional": "sua mensagem (opcional)",
   "Your_password_is_wrong": "Sua senha está errada!",
   "Your_push_was_sent_to_s_devices": "Sua notificação foi enviada para %s dispositivos",
+  "Your_question": "A sua pergunta",
   "Your_server_link": "O link do seu servidor",
   "Your_workspace_is_ready": "O seu espaço de trabalho está pronto a usar 🎉"
 }
\ No newline at end of file
diff --git a/packages/rocketchat-i18n/i18n/pt.i18n.json b/packages/rocketchat-i18n/i18n/pt.i18n.json
index 7f14fe67281c..ecede69410b8 100644
--- a/packages/rocketchat-i18n/i18n/pt.i18n.json
+++ b/packages/rocketchat-i18n/i18n/pt.i18n.json
@@ -178,8 +178,8 @@
   "Accounts_RequireNameForSignUp": "O nome é obrigatório para registo",
   "Accounts_RequirePasswordConfirmation": "Requer Confirmação de Senha",
   "Accounts_SearchFields": "Campos a considerar na busca",
-  "Accounts_Send_Email_When_Activating": "Enviar email para o usuário quando ele for ativado",
-  "Accounts_Send_Email_When_Deactivating": "Enviar email para o usuário quando ele for desativado",
+  "Accounts_Send_Email_When_Activating": "Enviar email para o utilizador quando este for ativado",
+  "Accounts_Send_Email_When_Deactivating": "Enviar email para o utilizador quando ele for desativado",
   "Accounts_Directory_DefaultView": "Lista de directoria por defeito",
   "Accounts_SetDefaultAvatar": "Definir Avatar Padrão",
   "Accounts_SetDefaultAvatar_Description": "Tenta determinar o avatar padrão com base em OAuth Account ou Gravatar",
@@ -243,7 +243,7 @@
   "All_messages": "Todas as mensagens",
   "All_users": "Todos os utilizadores",
   "All_users_in_the_channel_can_write_new_messages": "Todos os utilizadores no canal podem escrever novas mensagens",
-  "Allow_collect_and_store_HTTP_header_informations": "Permitir colectar e armazenar informações do cabeçalho HTTP",
+  "Allow_collect_and_store_HTTP_header_informations": "Permitir recolher e armazenar informações do cabeçalho HTTP",
   "Allow_collect_and_store_HTTP_header_informations_description": "Esta configuração determina se o Livechat tem permissão para armazenar informações colectadas do cabeçalho HTTP , como endereço IP, Agente-utilizador, etc.",
   "Allow_Invalid_SelfSigned_Certs": "Permitir certificados auto-assinados inválidos",
   "Allow_Invalid_SelfSigned_Certs_Description": "Permitir certificados SSL auto-assinados inválidos para validação de link e previews.",
@@ -286,7 +286,7 @@
   "API_EmbedSafePorts_Description": "Lista de portas permitidas para pré-visualização separada por vírgulas.",
   "API_Enable_CORS": "Ativar CORS",
   "API_Enable_Direct_Message_History_EndPoint": "Habilitar o histórico do histórico de mensagens directas",
-  "API_Enable_Direct_Message_History_EndPoint_Description": "Isso permite o `/ api / v1 / im.history.others` que permite a visualização de mensagens directas enviadas por outros utilizadores, em que o chamador não faz parte.",
+  "API_Enable_Direct_Message_History_EndPoint_Description": "Isso permite o `/api/v1/im.history.others` que permite a visualização de mensagens directas enviadas por outros utilizadores, em que a origem não faz parte.",
   "API_Enable_Rate_Limiter_Dev": "Ativar limitador de taxa em desenvolvimento",
   "API_Enable_Rate_Limiter_Dev_Description": "Deve limitar a quantidade de chamadas para os endpoints no ambiente de desenvolvimento?",
   "API_Enable_Rate_Limiter_Limit_Calls_Default": "Número padrão de chamadas para o limitador de taxa",
@@ -296,12 +296,12 @@
   "API_Enable_Personal_Access_Tokens": "Activar códigos de acesso pessoal para a API REST",
   "API_Enable_Personal_Access_Tokens_Description": "Activar códigos de acesso pessoal para uso com a API REST",
   "API_Enable_Shields": "Activar protecções",
-  "API_Enable_Shields_Description": "Habilitar escudos disponíveis em `/ api / v1 / shield.svg`",
+  "API_Enable_Shields_Description": "Habilitar escudos disponíveis em `/api/v1/shield.svg`",
   "API_GitHub_Enterprise_URL": "URL do servidor",
   "API_GitHub_Enterprise_URL_Description": "Exemplo: http://dominio.com (excluindo barra final)",
   "API_Gitlab_URL": "URL do GitLab",
   "API_Personal_Access_Token_Name": "Nome do código de acesso pessoal",
-  "API_Personal_Access_Tokens_To_REST_API": "Nome do código de acesso pessoal",
+  "API_Personal_Access_Tokens_To_REST_API": "Nome do código de acesso pessoal para o REST API",
   "API_Personal_Access_Tokens_Remove_Modal": "Tem a certeza de que deseja remover este código de acesso pessoal?",
   "API_Personal_Access_Token_Generated": "Código de acesso Pessoal, criado com sucesso",
   "API_Personal_Access_Token_Generated_Text_Token_s_UserId_s": "Grave o seu código com cuidado,  pois  não poderá mais visualizá-lo depois. <br/>token: <strong>__token__ </strong><br/>O seu ID de utilizador: <strong>__userId__ </strong>",
@@ -572,14 +572,14 @@
   "Choose_the_username_that_this_integration_will_post_as": "Escolha o nome do utilizador que esta integração utilizará.",
   "clean-channel-history": "Limpar histórico do canal",
   "clean-channel-history_description": "Permissão para limpar histórico do canal",
-  "Clean_Usernames": "Limpar nomes de usuários",
+  "Clean_Usernames": "Limpar nomes de utilizadores",
   "clear": "Apagar ",
   "Clear_all_unreads_question": "Apagar todas as não lidas?",
   "clear_cache_now": "Apagar a Cache agora",
   "clear_history": "Apagar o histórico",
   "Click_here": "Clique aqui",
   "Click_here_for_more_info": "Clique aqui para mais informações",
-  "Click_here_to_enter_your_encryption_password": "Clique aqui para digitar sua senha de criptografia",
+  "Click_here_to_enter_your_encryption_password": "Clique aqui para digitar sua senha de encriptação",
   "Click_here_to_view_and_copy_your_password": "Clique aqui para ver e copiar sua senha.",
   "Click_the_messages_you_would_like_to_send_by_email": "Clique nas mensagens que gostaria de enviar por e-mail",
   "Click_to_join": "Clique para juntar-se!",
@@ -597,13 +597,13 @@
   "Closing_chat": "A encerrar chat",
   "Cloud": "Nuvem",
   "Cloud_connect": "Rocket.Chat Cloud Connect",
-  "Cloud_what_is_it": "O que é isso?",
-  "Cloud_what_is_it_description": "O Rocket.Chat Cloud Connect permite que você conecte seu espaço de trabalho Rocket.Chat auto-hospedado à nossa nuvem. Fazer isso permite que você gerencie suas licenças, Faturamento e Suporte no Rocket.Chat Cloud.",
-  "Cloud_workspace_connected_plus_account": "Seu espaço de trabalho está agora conectado ao Rocket.Chat Cloud e uma conta está associada.",
-  "Cloud_workspace_connected_without_account": "Seu workspace está agora conectado ao Rocket.Chat Cloud. ",
+  "Cloud_what_is_it": "O que é isto?",
+  "Cloud_what_is_it_description": "O Rocket.Chat Cloud Connect permite que se conecte ao seu espaço de trabalho Rocket.Chat auto-hospedado na nossa nuvem. Fazer isto permite que gerencie as suas licenças, facturação e Suporte no Rocket.Chat Cloud.",
+  "Cloud_workspace_connected_plus_account": "O seu espaço de trabalho está agora conectado ao Rocket.Chat Cloud e uma conta está associada.",
+  "Cloud_workspace_connected_without_account": "O seu espaço de trabalho está agora conectado ao Rocket.Chat Cloud. ",
   "Cloud_login_to_cloud": "Login do o Rocket.Chat Cloud",
-  "Cloud_address_to_send_registration_to": "O endereço para enviar seu e-mail de registro na Cloud.",
-  "Cloud_update_email": "Atualizar email",
+  "Cloud_address_to_send_registration_to": "O endereço do seu e-mail para envio do registo na Cloud.",
+  "Cloud_update_email": "Actualizar email",
   "Cloud_manually_input_token": "Insira manualmente o token recebido do e-mail de registro na nuvem.",
   "Cloud_registration_required": "Registro requerido",
   "Cloud_registration_required_description": "Parece que durante a configuração você não escolheu registrar seu workspace.",
@@ -1037,6 +1037,16 @@
   "Display_offline_form": "Exibir formulário quando Desligado",
   "Display_unread_counter": "Exibir número de mensagens não lidas",
   "Displays_action_text": "Exibe texto da acção",
+  "Discussion_name": "Nome da discussão",
+  "Discussions": "Conversas",
+  "Discussion_start": "Iniciar uma discussão",
+  "Discussion_target_channel_description": "Selecione um canal relacionado com o que deseja perguntar",
+  "Discussion_target_channel_prefix": "Está a criar uma discussão em",
+  "Discussion_target_channel": "Canal ou grupo pai",
+  "discussion-created": "__message__",
+  "Discussion_description": "Ajude a manter uma visão geral sobre o que está a acontecer! Ao criar uma discussão, um sub-canal do que selecionou é criado e ambos são ligados.",
+  "Discussion_first_message_title": "A sua mensagem",
+  "Discussion_title": "Crie uma nova discussão",
   "Dont_ask_me_again": "Não perguntar novamente!",
   "Dont_ask_me_again_list": "Não me pergunte novamente",
   "Do_not_display_unread_counter": "Não exiba nenhum contador desse canal",
@@ -1066,7 +1076,7 @@
   "E2E_Enable_alert": "Este recurso está atualmente em beta! Relate os erros para github.com/RocketChat/Rocket.Chat/issues e esteja ciente de: <br/>- As mensagens criptografadas de salas criptografadas não serão encontradas pelas operações de pesquisa. <br/>- Os aplicativos para dispositivos móveis talvez não ofereçam suporte às mensagens critografadas (eles estão implementando). <br/>- Os bots talvez não consigam ver as mensagens criptografadas até implementarem o suporte. <br/>- Os uploads não serão criptografados nesta versão.",
   "E2E_Enable_description": "Ative a opção para criar grupos criptografados e ser capaz de alterar grupos e mensagens privadas para serem criptografadas",
   "E2E_Encryption_Password_Explanation": "Agora você pode criar grupos privados criptografados e mensagens diretas. Você também pode alterar os grupos privados ou DMs existentes para criptografados. <br/><br/>Esta é uma criptografia de ponta a ponta, logo a chave para codificar / decodificar suas mensagens não será salva no servidor. Por esse motivo, você precisa armazenar sua senha em algum lugar seguro. Será solicitada a inserção de senha em outros dispositivos nos quais deseja usar a criptografia E2E.",
-  "E2E_password_reveal_text": "Agora pode criar grupos privados ou mensagens diretas encriptadas. Pode também alterar os grupos privados ou DMs existentes para encriptados.<br/><br/>Esta é uma encriptação de ponta a ponta, logo a chave para codificar / decodificar as suas mensagens não será salva no servidor. Por este motivo, precisa guardar a sua senha num lugar seguro. Será solicitada a inserção de senha em outros dispositivos nos quais deseja usar a encriptação E2E. <a href=\"https://rocket.chat/docs/user-guides/end-to-end-encryption/\" target=\"_blank\">Saiba mais aqui!</a><br/><br/>A sua senha és: <span style=\"font-weight: bold;\">%s</span><br/>Esta é uma senha gerada automaticamente, pode configurar uma nova senha para sua chave encriptada a qualquer momento e a partir de qualquer browser onde utilizou a senha existente. <br/>Esta senha só é guardada neste browser até fechar esta mensagem.",
+  "E2E_password_reveal_text": "Agora pode criar grupos privados ou mensagens diretas encriptadas. Pode também alterar os grupos privados ou DMs existentes para encriptados.<br/><br/>Esta é uma encriptação de ponta a ponta, logo a chave para codificar / decodificar as suas mensagens não será salva no servidor. Por este motivo, precisa guardar a sua senha num lugar seguro. Será solicitada a inserção de senha em outros dispositivos nos quais deseja usar a encriptação E2E. <a href=\"https://rocket.chat/docs/user-guides/end-to-end-encryption/\" target=\"_blank\">Saiba mais aqui!</a><br/><br/>A sua senha és: <span style=\"font-weight: bold;\">%s</span><br/><br/>Esta é uma senha gerada automaticamente, pode configurar uma nova senha para sua chave encriptada a qualquer momento e a partir de qualquer browser onde utilizou a senha existente. <br/>Esta senha só é guardada neste browser até fechar esta mensagem.",
   "E2E_password_request_text": "Para acessar seus grupos privados e mensagens diretas criptografados , insira sua senha de criptografia. <br/>Você precisa digitar essa senha para codificar / decodificar suas mensagens em todos os clientes que você usa, já que a chave não está armazenada no servidor.",
   "Edit": "Editar",
   "edit-message": "Editar mensagem",
@@ -1253,7 +1263,6 @@
   "every_hour": "Uma vez a cada hora",
   "every_six_hours": "Uma vez a cada seis horas",
   "every_day": "Uma vez por dia",
-  "Every_Workspace": "Cada espaço de trabalho",
   "Everyone_can_access_this_channel": "Todos podem aceder a este canal",
   "Example_s": "Exemplo: <code class=\"inline\">%s</code>",
   "Exclude_Botnames": "Excluir bots",
@@ -1265,6 +1274,7 @@
   "Export_My_Data": "Exportar os meus dados",
   "expression": "Expressão",
   "Extended": "Estendido",
+  "External_Domains": "Domínios Externos",
   "External_Queue_Service_URL": "URL do Serviço de Fila Externa",
   "External_Service": "Serviço Externo",
   "Facebook_Page": "Página do Facebook",
@@ -1277,7 +1287,16 @@
   "FEDERATION_Enabled": "Tentativa para a  integração do suporte de federação. A alteração deste valor requer a reinicialização do Rocket.Chat.",
   "FEDERATION_Enabled_Alert": "O suporte de federação é um trabalho em curso. Não recomendamos o uso num sistema de produção.",
   "FEDERATION_Discovery_Method": "Método de Descoberta",
+  "FEDERATION_Discovery_Method_Description": "Pode usar o hub ou um SRV e uma entrada TXT nos seus registros DNS.",
   "FEDERATION_Domain": "Domínio",
+  "FEDERATION_Domain_Description": "Adicione o domínio a este servidor deve estar ligado por exemplo: @rocket.chat.",
+  "FEDERATION_Domain_Alert": "Não altere isto depois de activar o recurso, ainda não podemos lidar com as alterações de domínio.",
+  "FEDERATION_Public_Key": "Chave Pública",
+  "FEDERATION_Public_Key_Description": "Esta é a chave que pode partilhar com outros.",
+  "FEDERATION_Hub_URL": "Hub URL",
+  "FEDERATION_Hub_URL_Description": "Configure o URL do hub, por exemplo: https://hub.rocket.chat. É aceitável o uso de portas se necessário.",
+  "FEDERATION_Unique_Id": "ID único",
+  "FEDERATION_Unique_Id_Description": "Este é o seu ID de federação exclusivo, que pode usar para identificar o seu par na rede.",
   "FEDERATION_Status": "Estado",
   "Field": "Campo",
   "Field_removed": "Campo removido",
@@ -1362,7 +1381,7 @@
   "Force_SSL_Description": "*Cuidado!* _Forçar SSL_ nunca deve ser usado com proxy reverso. Se tem um proxy reverso, deve fazer o redirecionamento LÁ. Esta opção existe para implantações como Heroku, que não permite a configuração de redirecionamento de proxy reverso.",
   "Force_visitor_to_accept_data_processing_consent": "Forçar o visitante a aceitar o consentimento de processamento de dados",
   "Force_visitor_to_accept_data_processing_consent_description": "Os visitantes não podem inicar novas conversas sem o consentimento.",
-  "Force_visitor_to_accept_data_processing_consent_enabled_alert": "O acordo com o processamento de dados deve ser baseado em um entendimento transparente do motivo do processamento. Por isso, você deve preencher a configuração abaixo, que será exibida aos usuários, a fim de fornecer as razões para coletar e processar suas informações pessoais.",
+  "Force_visitor_to_accept_data_processing_consent_enabled_alert": "O acordo com o processamento de dados deve ser baseado num entendimento transparente do motivo do processamento. Por isso, deve preencher a configuração abaixo, que será exibida aos utilizadores, a fim de fornecer as razões para recolha e processamento das suas informações pessoais.",
   "Forgot_password": "Esqueceu a sua senha ?",
   "Forgot_Password_Description": "Pode usar os seguintes espaços reservados: <br/><ul><li>[Forgot_Password_Url] para o URL de recuperação de senha.</li><li>[name], [fname], [lname] para o nome completo, primeiro nome ou sobrenome do utilizador, respectivamente.</li><li>[email] para o email do utilizador.</li><li>[Site_Name] e [Site_URL] para o Nome da aplicação e o URL, respectivamente.</li></ul>",
   "Forgot_Password_Email": "Clique em <a href=\"[Forgot_Password_Url]\">aqui</a>para redefinir a sua senha.",
@@ -1413,6 +1432,7 @@
   "Graphql_CORS": "GraphQL CORS",
   "Graphql_Subscription_Port": "Porta de Subscrição GraphQL",
   "Group_by_Type": "Grupos por tipo",
+  "Group_discussions": "Discussões em grupo",
   "Group_favorites": "Grupos favoritos",
   "Group_mentions_disabled_x_members": "As menções de grupo `@all` e` @here` foram desativadas para salas com mais de __total__ members.",
   "Group_mentions_only": "Grupo menciona apenas",
@@ -1432,11 +1452,11 @@
   "Hide_flextab": "Esconder barra da direita com clique",
   "Hide_Group_Warning": "Tem certeza de que deseja ocultar o grupo \"%s\"?",
   "Hide_Livechat_Warning": "Tem certeza de que deseja esconder o livechat com \"%s\"?",
-  "Hide_Private_Warning": "Tem certeza de que deseja ocultar a discussão com \"%s\"?",
+  "Hide_Private_Warning": "Tem certeza de que deseja ocultar a conversa com \"%s\"?",
   "Hide_roles": "Ocultar funções",
   "Hide_room": "Esconder sala",
   "Hide_Room_Warning": "Tem certeza de que deseja ocultar a sala \"%s\"?",
-  "Hide_Unread_Room_Status": "Ocultar status do quarto não lido",
+  "Hide_Unread_Room_Status": "Ocultar status de sala não lida",
   "Hide_usernames": "Esconder nomes de utilizador",
   "Highlights": "Destaques",
   "Highlights_How_To": "Para ser notificado quando alguém menciona uma palavra ou frase, adicione-as aqui. Pode separar palavras ou frases com vírgulas. Não há diferenciação de maiúsculas e minúsculas ao destacar palavras.",
@@ -1500,14 +1520,14 @@
   "Importer_Prepare_Uncheck_Deleted_Users": "Desmarque Utilizadores Apagados",
   "Importer_progress_error": "Falha ao obter o progresso da importação.",
   "Importer_setup_error": "Ocorreu um erro durante a configuração do importador.",
-  "Importer_Slack_Users_CSV_Information": "O arquivo carregado deve ser o arquivo de exportação de usuários do Slack, que é um arquivo CSV. Veja aqui para obter mais informações:",
+  "Importer_Slack_Users_CSV_Information": "O arquivo carregado deve ser o arquivo de exportação de utilizadores do Slack, que é um arquivo CSV. Veja aqui para obter mais informações:",
   "Importer_Source_File": "Selecção do arquivo Original",
   "Importer_Upload_FileSize_Message": "Suas configurações do servidor permitem o upload de arquivos de qualquer tamanho até __maxFileSize__.",
   "Importer_Upload_Unlimited_FileSize": "Suas configurações do servidor permitem o upload de arquivos de qualquer tamanho.",
   "Importer_ExternalUrl_Description": "Você também pode usar um URL para um arquivo acessível publicamente:",
   "Importing_channels": "Importando canais",
   "Importing_messages": "Importando mensagens",
-  "Importing_users": "Importando usuários",
+  "Importing_users": "Importando utilizadores",
   "Inclusive": "Inclusive",
   "Incoming_Livechats": "Livechats  de entrada",
   "Incoming_WebHook": "WebHook de entrada",
@@ -1605,7 +1625,7 @@
   "IRC_Channel_Leave": "Saída do comando PART.",
   "IRC_Channel_Users": "Saída do comando NAMES.",
   "IRC_Channel_Users_End": "Fim da saída do comando NAMES.",
-  "IRC_Description": "Internet Relay Chat (IRC) é uma ferramenta de comunicação de grupo baseada em texto. Os usuários se juntam a canais, ou salas, de forma exclusiva, para discussão aberta. O IRC também suporta mensagens privadas entre usuários individuais e recursos de partilha de arquivos. Este pacote integra essas camadas de funcionalidade com Rocket.Chat.",
+  "IRC_Description": "Internet Relay Chat (IRC) é uma ferramenta de comunicação de grupo baseada em texto. Os utilizadores juntam-se a canais, ou salas, de forma exclusiva, para discussão aberta. O IRC também suporta mensagens privadas entre utilizadores individuais e recursos de partilha de arquivos. Este pacote integra essas camadas de funcionalidade com Rocket.Chat.",
   "IRC_Enabled": "Tentativa de integração do suporte IRC. Alterar esse valor requer reiniciar Rocket.Chat.",
   "IRC_Enabled_Alert": "O suporte de IRC é um trabalho em andamento. O uso em um sistema de produção não é recomendado no momento.",
   "IRC_Federation": "Federação IRC",
@@ -1697,8 +1717,8 @@
   "LDAP_Authentication_UserDN": "DN do utilizador",
   "LDAP_Authentication_UserDN_Description": "O utilizador LDAP que realiza pesquisas de utilizador para autenticar outros utilizadores quando eles entram. <br/> Isto é tipicamente uma conta de serviço criado especificamente para integrações de terceiros. Usar um nome qualificado, como `cn = administrador, cn = utilizadores, dc = exemplo, dc = com`.",
   "LDAP_Background_Sync": "Sincronização fundo",
-  "LDAP_Background_Sync_Import_New_Users": "Sincronização de fundo importar novos usuários",
-  "LDAP_Background_Sync_Import_New_Users_Description": "Importará todos os usuários (com base em seus critérios de filtro) que existem no LDAP e não existe em Rocket.Chat",
+  "LDAP_Background_Sync_Import_New_Users": "Sincronização de fundo importar novos utilizadores",
+  "LDAP_Background_Sync_Import_New_Users_Description": "Importará todos os utilizadores (com base em seus critérios de filtro) que existem no LDAP e não existe em Rocket.Chat",
   "LDAP_Background_Sync_Interval": "Intervalo de sincronização de fundo",
   "LDAP_Background_Sync_Interval_Description": "O intervalo entre as sincronizações. Exemplo de \"todas as 24 horas\" ou \"no primeiro dia da semana\", mais exemplos em [Cron Text Parser] (http://bunkat.github.io/later/parsers.html#text)",
   "LDAP_Background_Sync_Keep_Existant_Users_Updated": "Actualização da sincronização do plano de fundo dos Utilizadores existentes",
@@ -1708,7 +1728,7 @@
   "LDAP_CA_Cert": "Certificado CA",
   "LDAP_Connect_Timeout": "Tempo limite de conexão (ms)",
   "LDAP_Default_Domain": "Domínio Padrão",
-  "LDAP_Default_Domain_Description": "Se fornecido, o Domínio Padrão será usado para criar um e-mail exclusivo para usuários onde o e-mail não foi importado do LDAP. O e-mail será montado como `username @ default_domain` ou` unique_id @ default_domain`.<br/>Exemplo: `rocket.chat`",
+  "LDAP_Default_Domain_Description": "Se fornecido, o Domínio Padrão será usado para criar um e-mail exclusivo para utilizadores onde o e-mail não foi importado do LDAP. O e-mail será montado como `username @ default_domain` ou` unique_id @ default_domain`.<br/>Exemplo: `rocket.chat`",
   "LDAP_Description": "LDAP é um banco de dados hierárquico que muitas empresas usam para fornecer single sign on - uma facilidade para compartilhar uma senha entre múltiplos sites e serviços. Para exemplos e informações de configurações avançadas, por favor consulte nosso wiki: https://rocket.chat/docs/administrator-guides/authentication/ldap/",
   "LDAP_Enable": "Habilitar",
   "LDAP_Enable_Description": "Tente utilizar LDAP para autenticação",
@@ -1716,8 +1736,8 @@
   "LDAP_Encryption_Description": "O método de criptografia usado para proteger as comunicações com o servidor LDAP. Exemplos incluem `plain` (sem criptografia),` SSL / LDAPS` (criptografados desde o início), e `StartTLS` (upgrade para comunicação criptografada uma vez conectado).",
   "LDAP_Find_User_After_Login": "Encontre o utilizador após o login",
   "LDAP_Find_User_After_Login_Description": "Realizará uma pesquisa do DN do utilizador após a ligação para garantir que a ligação seja bem-sucedida, impedindo o login com senhas vazias quando permitido pela configuração do AD.",
-  "LDAP_Group_Filter_Enable": "Habilitar filtro de grupo de usuários LDAP",
-  "LDAP_Group_Filter_Enable_Description": "Restringir o acesso aos usuários em um grupo LDAP<br/>Útil para servidores OpenLDAP sem sobreposições que não permitem o filtro * memberOf *",
+  "LDAP_Group_Filter_Enable": "Habilitar filtro de grupo de utilizadores LDAP",
+  "LDAP_Group_Filter_Enable_Description": "Restringir o acesso aos utilizadores num grupo LDAP<br/>Útil para servidores OpenLDAP sem sobreposições que não permitem o filtro * memberOf *",
   "LDAP_Group_Filter_Group_Id_Attribute": "Atributo ID de grupo",
   "LDAP_Group_Filter_Group_Id_Attribute_Description": "Por exemplo. * OpenLDAP: * cn",
   "LDAP_Group_Filter_Group_Member_Attribute": "Atributo do Membro do Grupo",
@@ -1732,11 +1752,11 @@
   "LDAP_Host_Description": "O host LDAP, por exemplo, `ldap.example.com` ou `10.0.0.30`.",
   "LDAP_Idle_Timeout": "Tempo limite de inatividade (ms)",
   "LDAP_Idle_Timeout_Description": "Quantos milissegundos esperam após a operação LDAP mais recente até fechar a conexão. (Cada operação abrirá uma nova conexão)",
-  "LDAP_Import_Users_Description": "O processo True Sync será importar todos os usuários LDAP<br/>* Cuidado! * Especifique o filtro de pesquisa para não importar usuários em excesso.",
+  "LDAP_Import_Users_Description": "O processo True Sync será importar todos os utilizadores LDAP<br/>* Cuidado! * Especifique o filtro de pesquisa para não importar utilizadores em excesso.",
   "LDAP_Internal_Log_Level": "Nível de registo interno",
   "LDAP_Login_Fallback": "Login Fallback",
   "LDAP_Login_Fallback_Description": "Se o login no LDAP não for bem-sucedido, tente fazer login no sistema de conta padrão / local. Ajuda por causa do LDAP por algum motivo.",
-  "LDAP_Merge_Existing_Users": "Juntar usuários existentes",
+  "LDAP_Merge_Existing_Users": "Unir utilizadores existentes",
   "LDAP_Merge_Existing_Users_Description": "* Cuidado! * Ao importar um utilizador do LDAP e um utilizador com o mesmo nome de utilizador já existe, as informações LDAP e a senha serão definidas no utilizador existente.",
   "LDAP_Port": "Porta",
   "LDAP_Port_Description": "Porta para acessar o LDAP. Ex.: `389` ou `636` para LDAPS",
@@ -1824,6 +1844,7 @@
   "Loading...": "A carregar...",
   "Loading_more_from_history": "Carregar mais a partir do histórico",
   "Loading_suggestion": "A obter sugestões...",
+  "Local_Domains": "Domínios Locais",
   "Local_Password": "Senha local",
   "Localization": "Localização",
   "Log_Exceptions_to_Channel_Description": "Um canal que receberá todas as excepções capturadas. Deixe vazio para ignorar excepções.",
@@ -1851,7 +1872,7 @@
   "mail-messages": "Mensagens de Correio",
   "mail-messages_description": "Permissão para usar a opção de mensagens",
   "Mail_Message_Invalid_emails": "Forneceu um ou mais e-mails inválidos: %s",
-  "Mail_Message_Missing_to": "Deve seleccionar um ou mais usuários ou fornecer um ou mais endereços de e-mail, separados por vírgulas.",
+  "Mail_Message_Missing_to": "Deve seleccionar um ou mais utilizadores ou fornecer um ou mais endereços de e-mail, separados por vírgulas.",
   "Mail_Message_No_messages_selected_select_all": "Não selecionou nenhuma mensagem",
   "Mail_Messages": "Mensagens de E-mail",
   "Mail_Messages_Instructions": "Escolher as mensagens que deseja enviar via e-mail, clicando nas mensagens",
@@ -1871,7 +1892,7 @@
   "manage-oauth-apps": "Gerir aplicações Oauth",
   "manage-oauth-apps_description": "Permissão para gerir o servidor Oauth apps",
   "manage-own-integrations": "Gerir Integrações Próprias",
-  "manage-own-integrations_description": "Permissão para permitir que os usuários criem e editem sua própria integração ou webhooks",
+  "manage-own-integrations_description": "Permissão para permitir que os utilizadores criem e editem sua própria integração ou webhooks",
   "manage-sounds": "Gerir sons",
   "manage-sounds_description": "Permissão para gerir os sons do servidor",
   "Manage_Apps": "Gerir aplicações ",
@@ -1910,8 +1931,8 @@
   "Mentions_default": "Menções (padrão)",
   "Mentions_only": "Menções apenas",
   "Merge_Channels": "Canais de fusão",
-  "Message": "Mensagem",
   "Message_AllowBadWordsFilter": "Permitir filtro de palavrões em mensagens",
+  "Message_AllowConvertLongMessagesToAttachment": "Permitir a conversão de mensagens longas no anexo",
   "Message_AllowDeleting": "Permitir Exclusão de Mensagem",
   "Message_AllowDeleting_BlockDeleteInMinutes": "Bloquear exclusão de mensagens após (n) minutos",
   "Message_AllowDeleting_BlockDeleteInMinutes_Description": "Digite 0 para desabilitar o bloqueio.",
@@ -1977,13 +1998,15 @@
   "Message_TimeFormat": "Formato de Hora",
   "Message_TimeFormat_Description": "Veja também: <a href=\"http://momentjs.com/docs/#/displaying/format/\" target=\"momemt\">Moment.js</a>",
   "Message_too_long": "Mensagem muito longa",
+  "Message_too_long_as_an_attachment_question": "Mensagem muito longa. Como alternativa, enviar como um anexo?",
   "Message_UserId": "ID do usuário",
   "Message_VideoRecorderEnabled": "Gravação de vídeo habilitada",
   "Message_VideoRecorderEnabledDescription": "Requer arquivos 'video / webm' para ser um tipo de mídia aceito dentro das configurações 'Upload de arquivo'.",
   "Message_view_mode_info": "Isto altera o espaço que as mensagens ocupam no ecrã.",
+  "message": "mensagem",
+  "Message": "Mensagem",
   "messages": "Mensagens",
   "Messages": "Mensagens",
-  "Mmessages": "mensagens",
   "Messages_that_are_sent_to_the_Incoming_WebHook_will_be_posted_here": "As mensagens que são enviadas para o WebHook de Entrada serão publicadas aqui.",
   "Meta": "Meta",
   "Meta_custom": "Custom Tags Meta",
@@ -2031,6 +2054,9 @@
   "New_Application": "Nova aplicação",
   "New_Custom_Field": "Novo Campo Personalizado",
   "New_Department": "Novo Departamento",
+  "New_discussion": "Nova discussão",
+  "New_discussion_name": "Um nome significativo para a sala de discussão",
+  "New_discussion_first_message": "Normalmente, uma discussão começa com uma pergunta, como \"Como faço o carregamento de uma imagem?\"",
   "New_integration": "Nova integração",
   "New_line_message_compose_input": "`%s` - Adicionar nova linha a mensagem",
   "New_logs": "Novos logs",
@@ -2067,6 +2093,7 @@
   "No_snippet_messages": "Sem trecho",
   "No_starred_messages": "Não há mensagens favoritas",
   "No_such_command": "Nenhum comando desse tipo: `/ __command__`",
+  "No_discussions_yet": "Ainda sem conversas",
   "No_user_with_username_%s_was_found": "Nenhum utilizador com nome de utilizador<strong>\"%s\"</strong> foi encontrado!",
   "Nobody_available": "Ninguém disponível",
   "Node_version": "Versão do Nó",
@@ -2087,12 +2114,11 @@
   "Notifications_Always_Notify_Mobile": "Sempre notificar no telemóvel",
   "Notifications_Always_Notify_Mobile_Description": "Escolha sempre notificar o dispositivo móvel independentemente do status de presença.",
   "Notifications_Duration": "Notificações_Duração",
-  "Notifications_Max_Room_Members": "Membros do quarto máximo antes de desativar todas as notificações de mensagens",
-  "Notifications_Max_Room_Members_Description": "Número máximo de membros no quarto quando as notificações para todas as mensagens são desabilitadas. Os usuários ainda podem alterar a configuração por sala para receber todas as notificações de forma individual. (0 para desactivar)",
-  "Notifications_Muted_Description": "Se optar por silenciar tudo, não verá o destaque do quarto na lista quando houver novas mensagens, exceto para menções. As notificações de muting irão substituir as configurações de notificações.",
+  "Notifications_Max_Room_Members_Description": "Número máximo de membros na sala quando as notificações para todas as mensagens são desabilitadas. Os utilizadores ainda podem alterar a configuração por sala para receber todas as notificações de forma individual. (0 para desactivar)",
+  "Notifications_Muted_Description": "Se optar por silenciar tudo, não verá a sala destacada na lista quando houver novas mensagens, exceto para menções. Silenciar as notificações irão substituir as configurações de notificações.",
   "Notifications_Preferences": "Preferências de Notificações",
   "Notifications_Sound_Volume": "Som do som das notificações",
-  "Notify_active_in_this_room": "Notificar usuários activos nesta sala",
+  "Notify_active_in_this_room": "Notificar utilizadores activos nesta sala",
   "Notify_all_in_this_room": "Notificar todos nesta sala",
   "Num_Agents": "# Agentes",
   "Number_of_messages": "Número de mensagens",
@@ -2166,6 +2192,7 @@
   "Override_URL_to_which_files_are_uploaded_This_url_also_used_for_downloads_unless_a_CDN_is_given": "Substituir URL para a qual os arquivos são carregados. Esta url também será usada para downloads, a menos que um CDN seja fornecido",
   "Page_title": "Título da página",
   "Page_URL": "URL da página",
+  "Parent_channel_doesnt_exist": "Canal não existe",
   "Password": "Senha",
   "Password_Change_Disabled": "O administrador do Rocket.Chat desativou a mudança de senhas",
   "Password_changed_successfully": "Senha alterada com sucesso",
@@ -2229,7 +2256,7 @@
   "Preparing_data_for_import_process": "Preparando dados para o processo de importação",
   "Preparing_list_of_channels": "Preparando lista de canais",
   "Preparing_list_of_messages": "Preparando lista de mensagens",
-  "Preparing_list_of_users": "Preparando lista de usuários",
+  "Preparing_list_of_users": "Preparando lista de utilizadores",
   "preview-c-room": "Pré-Visualizar Canal Público",
   "preview-c-room_description": "Permissão para visualizar o conteúdo de um canal público antes de se juntar",
   "Previous_month": "Mês anterior",
@@ -2348,6 +2375,7 @@
   "Remove_someone_from_room": "Remover alguém da sala",
   "Removed": "Removido",
   "Removed_User": "Utilizador removido",
+  "Replies": "Respostas",
   "Reply": "Resposta",
   "ReplyTo": "Responder a",
   "Report_Abuse": "Denunciar abuso",
@@ -2370,6 +2398,7 @@
   "Retail": "Retalho",
   "Retention_setting_changed_successfully": "A configuração da política de retenção foi alterada com sucesso",
   "RetentionPolicy": "Política de retenção",
+  "RetentionPolicy_DoNotExcludeDiscussion": "Não exclua mensagens de discussões",
   "RetentionPolicy_RoomWarning": "Mensagens mais antigas que __time__ são automaticamente removidas aqui",
   "RetentionPolicy_RoomWarning_Unpinned": "Mensagens soltas mais antigas que __time__ são automaticamente removidas aqui",
   "RetentionPolicy_RoomWarning_FilesOnly": "Arquivos mais antigos que __time__ são removidos automaticamente aqui (as mensagens permanecem intactas)",
@@ -2402,12 +2431,12 @@
   "Role_Editing": "Edição de função",
   "Role_removed": "Função removida",
   "Room": "Sala",
-  "Room_announcement_changed_successfully": "O anúncio do quarto mudou com sucesso",
+  "Room_announcement_changed_successfully": "Anúncio da sala alterado com sucesso",
   "Room_archivation_state": "Estado",
   "Room_archivation_state_false": "Activo",
   "Room_archivation_state_true": "Arquivado",
   "Room_archived": "Sala arquivada",
-  "room_changed_announcement": "O anúncio do quarto mudou para: <em>__room_announcement__</em>por <em>__user_by__</em>",
+  "room_changed_announcement": "O anúncio do sala mudou para: <em>__room_announcement__</em>por <em>__user_by__</em>",
   "room_changed_description": "A descrição da sala foi alterada para: <em>__room_description__</em>por <em>__user_by__</em>",
   "room_changed_privacy": "Tipo da sala mudou para: <em>__room_type__</em> por <em>__user_by__</em>",
   "room_changed_topic": "Tópico da sala mudou para: <em>__room_topic__</em> por <em>__user_by__</em>",
@@ -2415,7 +2444,7 @@
   "Room_description_changed_successfully": "A descrição da sala mudou com sucesso",
   "Room_has_been_archived": "A sala foi arquivada",
   "Room_has_been_deleted": "A sala foi removida",
-  "Room_has_been_unarchived": "O quarto não foi arquivado",
+  "Room_has_been_unarchived": "A sala foi desarquivada",
   "Room_Info": "Informações da sala",
   "room_is_blocked": "Esta sala está bloqueada",
   "room_is_read_only": "Esta sala é apenas para leitura",
@@ -2423,8 +2452,8 @@
   "Room_name_changed": "Nome da sala alterado para: <em>__room_name__</em> por <em>__user_by__</em>",
   "Room_name_changed_successfully": "Nome da sala modificado com sucesso",
   "Room_not_found": "Sala não encontrada",
-  "Room_password_changed_successfully": "A senha do quarto foi alterada com sucesso",
-  "Room_tokenpass_config_changed_successfully": "A configuração do tokenpass do quarto foi alterada com sucesso",
+  "Room_password_changed_successfully": "A senha da sala foi alterada com sucesso",
+  "Room_tokenpass_config_changed_successfully": "A configuração do tokenpass da sala foi alterada com sucesso",
   "Room_topic_changed_successfully": "Tópico da sala alterado com sucesso",
   "Room_type_changed_successfully": "Tipo de sala alterado com sucesso",
   "Room_type_of_default_rooms_cant_be_changed": "Esta é uma sala padrão e o tipo não pode ser alterado, consulte o seu administrador.",
@@ -2496,7 +2525,7 @@
   "Select_user": "Seleccione um utilizador",
   "Select_users": "Seleccione utilizadores",
   "Selected_agents": "Agentes seleccionados",
-  "Selecting_users": "Selecionando usuários",
+  "Selecting_users": "Selecionando utilizadores",
   "send-many-messages": "Enviar muitas mensagens",
   "Send": "Enviar",
   "Send_a_message": "Envie uma mensagem",
@@ -2528,9 +2557,9 @@
   "Service_account_key": "Chave de conta de serviço",
   "set-leader": "Definir como líder",
   "set-moderator": "Permissão para  Moderador",
-  "set-moderator_description": "Permissão para configurar outros usuários como moderador de um canal",
+  "set-moderator_description": "Permissão para configurar outros utilizadores como moderador de um canal",
   "set-owner": "Permissão de Proprietário.",
-  "set-owner_description": "Permissão para configurar outros usuários como proprietário de um canal",
+  "set-owner_description": "Permissão para configurar outros utilizadores como proprietário de um canal",
   "set-react-when-readonly": "Definir Reagir quando for apenas leitura",
   "set-react-when-readonly_description": "Permissão para configurar a capacidade de reagir a mensagens em um canal somente de leitura",
   "set-readonly": "Activação somente para leitura",
@@ -2574,7 +2603,7 @@
   "Site_Url_Description": "Exemplo: https://chat.dominio.com.br/",
   "Size": "Tamanho",
   "Skip": "Avançar",
-  "Slack_Users": "Usuários do Slack CSV",
+  "Slack_Users": "Utilizadores do Slack CSV",
   "SlackBridge_error": "SlackBridge obteve um erro ao importar suas mensagens em%s:%s",
   "SlackBridge_finish": "SlackBridge terminou de importar as mensagens em%s. Recarregue para ver todas as mensagens.",
   "SlackBridge_Out_All": "SlackBridge Out All",
@@ -2687,7 +2716,7 @@
   "Tag": "Tag",
   "Take_it": "Pegue!",
   "TargetRoom": "Sala de destino",
-  "TargetRoom_Description": "A sala onde as mensagens serão enviadas, que são o resultado desse evento a ser disparado. Somente um quarto-alvo é permitido e deve existir.",
+  "TargetRoom_Description": "A sala onde as mensagens serão enviadas, que são o resultado desse evento a ser disparado. Somente uma sala-alvo é permitido e deve existir.",
   "Target user not allowed to receive messages": "Utilizador de destino não autorizado a receber mensagens",
   "Team": "Equipa",
   "Technology_Provider": "Provedor de tecnologia",
@@ -2702,6 +2731,8 @@
   "The_emails_are_being_sent": "Os emails estão a ser enviados.",
   "The_field_is_required": "O campo %s é obrigatório.",
   "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "O redimensionamento da imagem não vai funcionar porque não conseguimos detectar ImageMagick ou GraphicsMagick instalado no seu servidor.",
+  "The_message_is_a_discussion_you_will_not_be_able_to_recover": "A mensagem é uma discussão, não poderá recuperar as mensagens!",
+  "The_peer__peer__does_not_exist": "O par <em>__peer__</em> não existe.",
   "The_redirectUri_is_required": "O redirectUri é necessário",
   "The_server_will_restart_in_s_seconds": "O servidor será reiniciado em %s segundos",
   "The_setting_s_is_configured_to_s_and_you_are_accessing_from_s": "A configuração <strong>%s</strong> está definida como <strong>%s</strong> e  está acessando a partir de <strong>%s</strong>!",
@@ -2770,11 +2801,12 @@
   "This_email_has_already_been_used_and_has_not_been_verified__Please_change_your_password": "Este e-mail já foi utilizado e não foi verificado. Por favor, altere sua senha.",
   "This_is_a_desktop_notification": "Esta é uma notificação de ambiente de trabalho",
   "This_is_a_push_test_messsage": "Este é uma mensagem de teste de push notification",
+  "This_message_was_rejected_by__peer__peer": "Esta mensagem foi rejeitada por <em> __ peer __ </em> par.",
   "This_month": "Este mês",
   "This_room_has_been_archived_by__username_": "Esta sala foi arquivada por __username__",
   "This_room_has_been_unarchived_by__username_": "Esta sala foi desarquivada por __username__",
-  "Thread_slash_command_params": "sua mensagem",
-  "Threading_context_menu_none": "Oculto",
+  "thread": "tópicos",
+  "Threads": "Tópicos",
   "This_week": "Esta semana",
   "Thursday": "Quinta-feira",
   "Time_in_seconds": "Tempo em segundos",
@@ -2896,7 +2928,7 @@
   "User Search": "Pesquisa de usuário",
   "User Search (Group Validation)": "Pesquisa de usuário (validação de grupo)",
   "user-generate-access-token": "Usuário gerar token de acesso",
-  "user-generate-access-token_description": "Permissão para usuários gerarem tokens de acesso",
+  "user-generate-access-token_description": "Permissão para utilizadores gerarem tokens de acesso",
   "User__username__is_now_a_leader_of__room_name_": "Utilizador __username__ é agora um líder de __room_name__",
   "User__username__is_now_a_moderator_of__room_name_": "Utilizador __username__ é agora um moderador de __room_name__",
   "User__username__is_now_a_owner_of__room_name_": "Utilizador __username__ é agora titular de  __room_name__",
@@ -2924,6 +2956,7 @@
   "User_is_now_an_admin": "O utilizador é agora um administrador",
   "User_is_unblocked": "O utilizador está desbloqueado",
   "User_joined_channel": "Entrou no canal.",
+  "User_joined_conversation": "Entrou na conversa",
   "User_joined_channel_female": "Entrou no canal.",
   "User_joined_channel_male": "Entrou no canal.",
   "User_left": "Saiu do canal.",
@@ -2981,7 +3014,7 @@
   "Users": "Utilizadores",
   "Users_added": "Os utilizadores foram adicionados",
   "Users_in_role": "Utilizadores na função",
-  "Users must use Two Factor Authentication": "Os usuários devem usar autenticação de dois fatores",
+  "Users must use Two Factor Authentication": "Os utilizadores devem usar autenticação de dois fatores",
   "UTF8_Names_Slugify": "Slugify Nomes UTF8 ",
   "UTF8_Names_Validation": "Validação de Nomes UTF8",
   "UTF8_Names_Validation_Description": "Não permitir caracteres especiais e espaços. Você pode usar - _ e. mas não no final do nome",
@@ -3024,7 +3057,7 @@
   "view-logs": "Ver registos",
   "view-logs_description": "Permissão para visualizar os registos do servidor",
   "view-other-user-channels": "Ver outros canais do utilizador",
-  "view-other-user-channels_description": "Permissão para ver canais de propriedade de outros usuários",
+  "view-other-user-channels_description": "Permissão para ver canais de propriedade de outros utilizadores",
   "view-outside-room": "Ver sala sem aderir",
   "view-p-room": "Ver sala privada",
   "view-p-room_description": "Permissão para ver canais privados",
@@ -3033,13 +3066,14 @@
   "view-room-administration": "Ver a Administração da Sala",
   "view-room-administration_description": "Permissão para visualizar estatísticas de mensagens públicas, privadas e diretas. Não inclui a capacidade de visualizar conversas ou arquivos",
   "view-statistics": "Ver estatísticas",
-  "view-statistics_description": "Permissão para visualizar as estatísticas do sistema, como número de usuários ligados, número de salas, informações do sistema operacional",
+  "view-statistics_description": "Permissão para visualizar as estatísticas do sistema, como número de utilizadores ligados, número de salas, informações do sistema operacional",
   "view-user-administration": "Ver administração do utilizador",
   "view-user-administration_description": "Permissão para exibição de lista parcial, somente leitura, de outras contas de usuário atualmente ligados no sistema. Nenhuma informação da conta do usuário é acessível com esta permissão",
   "View_All": "Ver todos os utilizadores",
   "View_Logs": "Ver Registo",
   "View_mode": "Modo de visualização",
   "Viewing_room_administration": "Administração da sala",
+  "View_the_Logs_for": "Ver registos de: \"__name__\"",
   "Visibility": "Visibilidade",
   "Visible": "Visível",
   "Visit_Site_Url_and_try_the_best_open_source_chat_solution_available_today": "Visite __Site_URL__ e experimente a melhor solução de chat de código aberto disponível!",
@@ -3130,6 +3164,7 @@
   "your_message_optional": "sua mensagem (opcional)",
   "Your_password_is_wrong": "Sua senha está errada!",
   "Your_push_was_sent_to_s_devices": "A sua notificação foi enviada para %s dispositivos",
+  "Your_question": "A sua pergunta",
   "Your_server_link": "O link do seu servidor",
   "Your_workspace_is_ready": "O seu espaço de trabalho está pronto a usar 🎉"
 }
\ No newline at end of file
diff --git a/packages/rocketchat-i18n/i18n/ro.i18n.json b/packages/rocketchat-i18n/i18n/ro.i18n.json
index 22cedcb9b82d..e23357c51059 100644
--- a/packages/rocketchat-i18n/i18n/ro.i18n.json
+++ b/packages/rocketchat-i18n/i18n/ro.i18n.json
@@ -1713,7 +1713,6 @@
   "Mentions_default": "Mențiuni (implicit",
   "Mentions_only": "Menționează numai",
   "Merge_Channels": "Mergeți canalele",
-  "Message": "Mesaj",
   "Message_AllowBadWordsFilter": "Se lasă mesaje cuvinte rele de filtrare",
   "Message_AllowDeleting": "Permiteți ștergerea mesajului",
   "Message_AllowDeleting_BlockDeleteInMinutes": "Bloc Mesaj Ștergerea După (n) procesul-verbal",
@@ -1781,9 +1780,9 @@
   "Message_VideoRecorderEnabled": "Recorder video activat",
   "Message_VideoRecorderEnabledDescription": "Necesită ca fișierele \"video / web\" să fie un tip media acceptat în setările \"Încărcare fișiere\".",
   "Message_view_mode_info": "Acest lucru se schimba cantitatea mesajelor de spațiu ocupă pe ecran.",
+  "Message": "Mesaj",
   "messages": "Mesaje",
   "Messages": "Mesaje",
-  "Mmessages": "mesaje",
   "Messages_that_are_sent_to_the_Incoming_WebHook_will_be_posted_here": "Mesajele care sunt trimise prin WebHook vor fi postate aici.",
   "Meta": "Meta",
   "Meta_custom": "Custom Meta Tags",
@@ -2512,8 +2511,6 @@
   "This_is_a_push_test_messsage": "Acesta este un test de notificare Push",
   "This_room_has_been_archived_by__username_": "Această cameră a fost arhivate de __username__",
   "This_room_has_been_unarchived_by__username_": "Această cameră a fost dezarhivată de __username__",
-  "Thread_slash_command_params": "mesajul tau",
-  "Threading_context_menu_none": "Invizibil",
   "Thursday": "Joi",
   "Time_in_seconds": "Timpul în secunde",
   "Title": "Titlu",
diff --git a/packages/rocketchat-i18n/i18n/ru.i18n.json b/packages/rocketchat-i18n/i18n/ru.i18n.json
index 6fba9d8cb99f..d955bcccd22a 100644
--- a/packages/rocketchat-i18n/i18n/ru.i18n.json
+++ b/packages/rocketchat-i18n/i18n/ru.i18n.json
@@ -1022,6 +1022,9 @@
   "Display_offline_form": "Показать оффлайн сообщение",
   "Display_unread_counter": "Показывать количество непрочитанных сообщений",
   "Displays_action_text": "Показать текст действия",
+  "Discussion_target_channel_description": "Выберите канал, который связан с тем, что вы хотите спросить",
+  "Discussion_target_channel": "Родительский канал или группа",
+  "Discussion_first_message_title": "Ваше сообщение",
   "Dont_ask_me_again": "Не спрашивай меня снова!",
   "Dont_ask_me_again_list": "Не спрашивай меня снова",
   "Do_not_display_unread_counter": "Скрыть показ непрочитанных сообщений",
@@ -1237,7 +1240,6 @@
   "every_hour": "Раз в час",
   "every_six_hours": "Раз в 6 часов",
   "every_day": "Один раз в день",
-  "Every_Workspace": "Каждое рабочее пространство",
   "Everyone_can_access_this_channel": "У всех есть доступ к этому каналу",
   "Example_s": "Пример: <code class=\"inline\">%s</code>",
   "Exclude_Botnames": "Исключить ботов",
@@ -1809,7 +1811,6 @@
   "Loading_more_from_history": "Идёт загрузка из истории",
   "Loading_suggestion": "Загрузка предпочтений",
   "Local_Password": "Локальный пароль",
-  "Local_Workspace": "Локальное рабочее пространство",
   "Localization": "Язык",
   "Log_Exceptions_to_Channel_Description": "Канал, который получит все захваченные исключения. Оставьте пустым, чтобы игнорировать исключения.",
   "Log_Exceptions_to_Channel": "Логировать исключения на канале",
@@ -1895,7 +1896,6 @@
   "Mentions_default": "Упоминания (по умолчанию)",
   "Mentions_only": "Только упоминания",
   "Merge_Channels": "Объединить каналы",
-  "Message": "Сообщение",
   "Message_AllowBadWordsFilter": "Разрешить фильтрацию плохих слов в сообщениях",
   "Message_AllowDeleting": "Разрешить удаление сообщений",
   "Message_AllowDeleting_BlockDeleteInMinutes": "Запретить удаление сообщений через (n) минут",
@@ -1966,9 +1966,9 @@
   "Message_VideoRecorderEnabled": "Запись видео включена",
   "Message_VideoRecorderEnabledDescription": "Тип файлов 'video/webm' должен быть в списке разрешенных к передаче файлов в разделе настроек \"загрузка файлов\"",
   "Message_view_mode_info": "Сколько места сообщения занимают на экране.",
+  "Message": "Сообщение",
   "messages": "Сообщения",
   "Messages": "Сообщения",
-  "Mmessages": "Сообщения",
   "Messages_that_are_sent_to_the_Incoming_WebHook_will_be_posted_here": "Сообщения, отправленные на Входящий WebHook, будут размещены здесь.",
   "Meta": "Мета",
   "Meta_custom": "Пользовательские мета-теги",
@@ -2028,7 +2028,6 @@
   "New_encryption_password": "Новый пароль для шифрования",
   "New_role": "Новая роль",
   "New_Room_Notification": "Уведомление о новой публичной комнате",
-  "New_thread": "Новый поток",
   "New_Trigger": "Новый триггер",
   "New_version_available_(s)": "Доступна новая версия (%s)",
   "New_videocall_request": "Новый запрос на видео-звонок",
@@ -2048,13 +2047,11 @@
   "No_messages_yet": "Нет сообщений",
   "No_pages_yet_Try_hitting_Reload_Pages_button": "Пока нет страниц. Попробуйте нажать кнопку «Обновить страницы».",
   "No_pinned_messages": "Нет прикрепленных сообщений",
-  "No_replies_yet": "Ответов пока нет",
   "No_results_found": "Ничего не найдено",
   "No_results_found_for": "Ничего не найдено:",
   "No_snippet_messages": "Нет сниппетов",
   "No_starred_messages": "Нет отмеченных сообщений",
   "No_such_command": "Несуществующая команда: \"__command__\"",
-  "No_threads_yet": "Нет тем еще",
   "No_user_with_username_%s_was_found": "Пользователь с логином  <strong>\"%s\"</strong> не найден!",
   "Nobody_available": "Никто не доступен",
   "Node_version": "Версия Node",
@@ -2746,20 +2743,7 @@
   "This_month": "Этот месяц",
   "This_room_has_been_archived_by__username_": "Комната была архивирована __username__",
   "This_room_has_been_unarchived_by__username_": "__username__ вернул этот чат из архива",
-  "Thread_creation_on_home": "Создать темы на главном экране",
-  "Thread_default_parent_Channel": "Канал по умолчанию для новых тем",
-  "Thread_from_context_menu": "Потоки в контекстном меню",
-  "Thread_name": "Название темы",
-  "Thread_slash_command_params": "ваше сообщение",
-  "Thread_start": "Начать тему",
-  "Thread_target_channel_description": "Выберите канал, который связан с тем, что вы хотите спросить",
-  "Thread_target_channel_prefix": "Вы создаете тему в",
-  "Thread_target_channel_suffix": "- выберите другой родительский канал",
-  "Thread_target_channel": "Родительский канал или группа",
-  "Threading_context_menu_none": "Невидимый",
-  "Threading_first_message_title": "Ваше сообщение",
   "Threads": "Потоки",
-  "Threading_title": "Создать новую тему",
   "This_week": "На этой неделе",
   "Thursday": "Четверг",
   "Time_in_seconds": "Время в секундах",
diff --git a/packages/rocketchat-i18n/i18n/sk-SK.i18n.json b/packages/rocketchat-i18n/i18n/sk-SK.i18n.json
index 1a6df0f67868..0f53e13eca66 100644
--- a/packages/rocketchat-i18n/i18n/sk-SK.i18n.json
+++ b/packages/rocketchat-i18n/i18n/sk-SK.i18n.json
@@ -1712,7 +1712,6 @@
   "Mentions_default": "Zmienky (predvolené)",
   "Mentions_only": "Zmieňuje sa iba",
   "Merge_Channels": "Zlúčiť kanály",
-  "Message": "správa",
   "Message_AllowBadWordsFilter": "Povoliť filtrovanie zlých slov",
   "Message_AllowDeleting": "Povoliť vymazanie správy",
   "Message_AllowDeleting_BlockDeleteInMinutes": "Blokovanie správy po (n) minútach",
@@ -1780,9 +1779,9 @@
   "Message_VideoRecorderEnabled": "Videorekordér je zapnutý",
   "Message_VideoRecorderEnabledDescription": "Vyžaduje, aby súbory typu \"video / web\" boli akceptovaným typom média v nastaveniach \"Nahrávanie súborov\".",
   "Message_view_mode_info": "Tým sa zmení množstvo správ na miesto na obrazovke.",
+  "Message": "správa",
   "messages": "Správy",
   "Messages": "správy",
-  "Mmessages": "správy",
   "Messages_that_are_sent_to_the_Incoming_WebHook_will_be_posted_here": "Správy, ktoré sa posielajú na adresu WebHook prichádzajú, sa sem zobrazia.",
   "Meta": "meta",
   "Meta_custom": "Vlastné značky meta",
@@ -2511,8 +2510,6 @@
   "This_is_a_push_test_messsage": "Toto je tlačová skúšobná správa",
   "This_room_has_been_archived_by__username_": "Táto miestnosť bola archivovaná __username__",
   "This_room_has_been_unarchived_by__username_": "Táto miestnosť bola zrušená archivovaním __username__",
-  "Thread_slash_command_params": "tvoja správa",
-  "Threading_context_menu_none": "neviditeľný",
   "Thursday": "štvrtok",
   "Time_in_seconds": "Čas v sekundách",
   "Title": "Nadpis",
diff --git a/packages/rocketchat-i18n/i18n/sl-SI.i18n.json b/packages/rocketchat-i18n/i18n/sl-SI.i18n.json
index ed85a95d0fab..bfb66882f5b0 100644
--- a/packages/rocketchat-i18n/i18n/sl-SI.i18n.json
+++ b/packages/rocketchat-i18n/i18n/sl-SI.i18n.json
@@ -1711,7 +1711,6 @@
   "Mentions_default": "Omembe (privzeto)",
   "Mentions_only": "Omeni samo",
   "Merge_Channels": "Združi kanale",
-  "Message": "Sporočilo",
   "Message_AllowBadWordsFilter": "Dovoli filtriranje neprimernih besed v sporočilih",
   "Message_AllowDeleting": "Dovoli brisanje sporočil",
   "Message_AllowDeleting_BlockDeleteInMinutes": "Blokiraj brisanje sporočil po (n) minutah",
@@ -1779,9 +1778,9 @@
   "Message_VideoRecorderEnabled": "Video snemalnik je omogočen",
   "Message_VideoRecorderEnabledDescription": "Zahteva, da so datoteke »video / webm« v nastavitvah »Nalaganje datotek« sprejemljiva vrsta medija.",
   "Message_view_mode_info": "S tem se spremeni količina sporočil na zaslonu.",
+  "Message": "Sporočilo",
   "messages": "Sporočila",
   "Messages": "Sporočila",
-  "Mmessages": "sporočil",
   "Messages_that_are_sent_to_the_Incoming_WebHook_will_be_posted_here": "Sporočila, ki bodo poslana na dohodni WebHook, bodo objavljena tukaj.",
   "Meta": "Meta",
   "Meta_custom": "Meta oznake po meri",
@@ -2510,8 +2509,6 @@
   "This_is_a_push_test_messsage": "To je testno potisno sporočilo",
   "This_room_has_been_archived_by__username_": "To sobo je arhiviral __username__",
   "This_room_has_been_unarchived_by__username_": "To sobo je odarhiviral __username__",
-  "Thread_slash_command_params": "vaše sporočilo",
-  "Threading_context_menu_none": "Neviden",
   "Thursday": "Četrtek",
   "Time_in_seconds": "Čas v sekundah",
   "Title": "Naslov",
diff --git a/packages/rocketchat-i18n/i18n/sq.i18n.json b/packages/rocketchat-i18n/i18n/sq.i18n.json
index 58a0ce49903b..d2664f0accb1 100644
--- a/packages/rocketchat-i18n/i18n/sq.i18n.json
+++ b/packages/rocketchat-i18n/i18n/sq.i18n.json
@@ -1713,7 +1713,6 @@
   "Mentions_default": "Përmend (default)",
   "Mentions_only": "Përmend vetëm",
   "Merge_Channels": "Bashkojë kanalet",
-  "Message": "Mesazh",
   "Message_AllowBadWordsFilter": "Lejo Mesazh fjalë të këqija filtrim",
   "Message_AllowDeleting": "Lejo fshirjen e mesazheve",
   "Message_AllowDeleting_BlockDeleteInMinutes": "Block mesazh Fshirja Pas (n) minuta",
@@ -1781,9 +1780,9 @@
   "Message_VideoRecorderEnabled": "Regjistruesi i videove është aktivizuar",
   "Message_VideoRecorderEnabledDescription": "Kërkon që 'video / webm' të jetë një lloj i pranuar i medias brenda parametrave të \"Ngarkimit të dokumentit\".",
   "Message_view_mode_info": "Kjo ndryshon sasia e mesazheve hapësirë ​​të marrë deri në ekran.",
+  "Message": "Mesazh",
   "messages": "Mesazhet",
   "Messages": "Mesazhet",
-  "Mmessages": "mesazhet",
   "Messages_that_are_sent_to_the_Incoming_WebHook_will_be_posted_here": "Mesazhet që janë dërguar tek hyrëse WebHook do të postohen këtu.",
   "Meta": "Meta",
   "Meta_custom": "Custom Meta Tags",
@@ -2512,8 +2511,6 @@
   "This_is_a_push_test_messsage": "Ky është një test i messsage shtytje",
   "This_room_has_been_archived_by__username_": "Kjo dhomë është arkivuar nga __username__",
   "This_room_has_been_unarchived_by__username_": "Kjo dhomë është paarkivuar nga __username__",
-  "Thread_slash_command_params": "Mesazhi juaj",
-  "Threading_context_menu_none": "I padukshëm",
   "Thursday": "e enjte",
   "Time_in_seconds": "Koha në sekonda",
   "Title": "titull",
diff --git a/packages/rocketchat-i18n/i18n/sr.i18n.json b/packages/rocketchat-i18n/i18n/sr.i18n.json
index 3d8491c29bc2..9d5c37f2a4aa 100644
--- a/packages/rocketchat-i18n/i18n/sr.i18n.json
+++ b/packages/rocketchat-i18n/i18n/sr.i18n.json
@@ -1713,7 +1713,6 @@
   "Mentions_default": "Помиње (стандардна)",
   "Mentions_only": "Само помисли",
   "Merge_Channels": "Споји канале",
-  "Message": "порука",
   "Message_AllowBadWordsFilter": "Дозволите порука ружне речи филтрирање",
   "Message_AllowDeleting": "Дозволи порука Брисање",
   "Message_AllowDeleting_BlockDeleteInMinutes": "Блок порука Брисање Афтер (н) Минутес",
@@ -1781,9 +1780,9 @@
   "Message_VideoRecorderEnabled": "Видео снимач је омогућен",
   "Message_VideoRecorderEnabledDescription": "Захтева да датотеке \"видео / вебм\" буду прихваћени тип медија унутар поставки \"Уплоад Филе\".",
   "Message_view_mode_info": "Ово мења износ простора порука заузимају на екрану.",
+  "Message": "порука",
   "messages": "Поруке",
   "Messages": "Поруке",
-  "Mmessages": "поруке",
   "Messages_that_are_sent_to_the_Incoming_WebHook_will_be_posted_here": "Поруке које се шаљу Инцоминг ВебХоок ће бити овде постављен.",
   "Meta": "мета",
   "Meta_custom": "Цустом Мета Тагови",
@@ -2512,8 +2511,6 @@
   "This_is_a_push_test_messsage": "Ово је гурање теста Месссаге",
   "This_room_has_been_archived_by__username_": "Ова соба је архивиран од __усернаме__",
   "This_room_has_been_unarchived_by__username_": "Ова соба је неархивирано од __усернаме__",
-  "Thread_slash_command_params": "Ваша порука",
-  "Threading_context_menu_none": "Невидљив(а)",
   "Thursday": "Четвртак",
   "Time_in_seconds": "Време у секундама",
   "Title": "наслов",
diff --git a/packages/rocketchat-i18n/i18n/sv.i18n.json b/packages/rocketchat-i18n/i18n/sv.i18n.json
index b68f9254d18a..2d70b627f9ab 100644
--- a/packages/rocketchat-i18n/i18n/sv.i18n.json
+++ b/packages/rocketchat-i18n/i18n/sv.i18n.json
@@ -1531,7 +1531,6 @@
   "Katex_Parenthesis_Syntax_Description": "Möjligt att använda \\ [katex blockera \\] och \\ (inline katex \\) syntax",
   "Keep_default_user_settings": "Håll standardinställningarna",
   "Keyboard_Shortcuts_Edit_Previous_Message": "Redigera tidigare meddelande",
-  "Keyboard_Shortcuts_Keys_1": "<kbd>Ctrl</kbd>+ <kbd>p</kbd>",
   "Keyboard_Shortcuts_Keys_2": "<kbd>Pil upp</kbd>",
   "Keyboard_Shortcuts_Keys_3": "<kbd>Kommando</kbd>(eller <kbd>Alt</kbd>) + <kbd>Vänsterpil</kbd>",
   "Keyboard_Shortcuts_Keys_4": "<kbd>Kommando</kbd>(eller <kbd>Alt</kbd>) + <kbd>Pil upp</kbd>",
@@ -1766,7 +1765,6 @@
   "Mentions_default": "Omnämningar (standard)",
   "Mentions_only": "Endast mentioner",
   "Merge_Channels": "Sammanfoga kanaler",
-  "Message": "Meddelande",
   "Message_AllowBadWordsFilter": "Tillåt filtrering av fula ord i meddelanden",
   "Message_AllowDeleting": "Tillåt radering av meddelanden",
   "Message_AllowDeleting_BlockDeleteInMinutes": "Block Message Radera Efter (n) Minuter",
@@ -1834,9 +1832,9 @@
   "Message_VideoRecorderEnabled": "Videobandspelare aktiverad",
   "Message_VideoRecorderEnabledDescription": "Kräver \"video / webm\" -filer för att vara en accepterad medietyp inom inställningarna \"Filuppladdning\".",
   "Message_view_mode_info": "Detta ändrar mängden utrymme meddelanden tar upp på skärmen.",
+  "Message": "Meddelande",
   "messages": "Meddelanden",
   "Messages": "Meddelanden",
-  "Mmessages": "meddelanden",
   "Messages_that_are_sent_to_the_Incoming_WebHook_will_be_posted_here": "Meddelanden som skickas till inkommande WebHook kommer att publiceras här.",
   "Meta": "Meta",
   "Meta_custom": "Anpassade metataggar",
@@ -2241,7 +2239,7 @@
   "Room_has_been_unarchived": "Rummet har blivit unarchived",
   "Room_Info": "Rumsinformation",
   "room_is_blocked": "Rummet är blockerat",
-  "room_is_read_only": "Detta rum är endast läst",
+  "room_is_read_only": "Detta rum går endast att läsa",
   "room_name": "Rumsnamn",
   "Room_name_changed": "Rummets namn ändrat till :  <em>__room_name__</em> av <em>__user_by__</em>",
   "Room_name_changed_successfully": "Rummets namn har ändrats ",
@@ -2570,8 +2568,6 @@
   "This_is_a_push_test_messsage": "Detta är ett testpushmeddelande",
   "This_room_has_been_archived_by__username_": "Detta rum har arkiverats av __username__",
   "This_room_has_been_unarchived_by__username_": "Detta rum har avarkiverats av __username__",
-  "Thread_slash_command_params": "ditt meddelande",
-  "Threading_context_menu_none": "Osynlig",
   "Thursday": "Torsdag",
   "Time_in_seconds": "Tid i sekunder",
   "Title": "Titel",
diff --git a/packages/rocketchat-i18n/i18n/ta-IN.i18n.json b/packages/rocketchat-i18n/i18n/ta-IN.i18n.json
index ad56e753d3d1..4638467bd8a6 100644
--- a/packages/rocketchat-i18n/i18n/ta-IN.i18n.json
+++ b/packages/rocketchat-i18n/i18n/ta-IN.i18n.json
@@ -1713,7 +1713,6 @@
   "Mentions_default": "குறிப்பிடுகிறார் (இயல்புநிலை)",
   "Mentions_only": "மட்டுமே குறிப்பிடுகிறார்",
   "Merge_Channels": "சேனல்களை இணை",
-  "Message": "செய்தி",
   "Message_AllowBadWordsFilter": "செய்தி, கெட்ட வார்த்தைகளை வடிகட்டி அனுமதி",
   "Message_AllowDeleting": "அனுமதி செய்தியை நீக்கும்போது",
   "Message_AllowDeleting_BlockDeleteInMinutes": "பிளாக் செய்தியை நீக்கும்போது (N) நிமிடங்களுக்கு பிறகு",
@@ -1781,9 +1780,9 @@
   "Message_VideoRecorderEnabled": "வீடியோ ரெக்கார்டர் இயக்கப்பட்டது",
   "Message_VideoRecorderEnabledDescription": "'கோப்பு பதிவேற்ற' அமைப்புகளுக்குள் ஏற்றுக்கொள்ளப்பட்ட மீடியா வகையாக 'வீடியோ / வெப்எம்' கோப்புகள் தேவை.",
   "Message_view_mode_info": "இந்த இடத்தை செய்திகளை அளவு திரையில் எடுத்து மாற்றுகிறது.",
+  "Message": "செய்தி",
   "messages": "செய்திகள்",
   "Messages": "செய்திகள்",
-  "Mmessages": "செய்திகளை",
   "Messages_that_are_sent_to_the_Incoming_WebHook_will_be_posted_here": "உள்வரும் WebHook அனுப்பப்படும் என்று செய்திகள் இங்கே வெளியிடப்படும்.",
   "Meta": "மெட்டா",
   "Meta_custom": "விருப்ப மெட்டா குறிச்சொற்கள்",
@@ -2512,8 +2511,6 @@
   "This_is_a_push_test_messsage": "இந்த ஒரு உந்துதல் சோதனை செய்தியையும் ஆகும்",
   "This_room_has_been_archived_by__username_": "இந்த அறையில் __username__ மூலம் கடந்தவையில்",
   "This_room_has_been_unarchived_by__username_": "இந்த அறையில் __username__ மூலம் மீட்டெடுக்கப்பட்டது வருகிறது",
-  "Thread_slash_command_params": "உங்கள் தகவல்",
-  "Threading_context_menu_none": "கண்ணுக்கு தெரியாத",
   "Thursday": "வியாழக்கிழமை",
   "Time_in_seconds": "வினாடிகளில் நேரம்",
   "Title": "தலைப்பு",
diff --git a/packages/rocketchat-i18n/i18n/th-TH.i18n.json b/packages/rocketchat-i18n/i18n/th-TH.i18n.json
index 48a5a096f5d4..a0ac351a9e81 100644
--- a/packages/rocketchat-i18n/i18n/th-TH.i18n.json
+++ b/packages/rocketchat-i18n/i18n/th-TH.i18n.json
@@ -1712,7 +1712,6 @@
   "Mentions_default": "คำแนะนำ (ค่าเริ่มต้น)",
   "Mentions_only": "คำแนะนำเท่านั้น",
   "Merge_Channels": "รวมแชแนล",
-  "Message": "ข่าวสาร",
   "Message_AllowBadWordsFilter": "อนุญาตให้มีการกรองข้อความในข้อความผิด",
   "Message_AllowDeleting": "อนุญาตให้ลบข้อความ",
   "Message_AllowDeleting_BlockDeleteInMinutes": "บล็อกข้อความที่ลบหลังจาก (n) นาที",
@@ -1780,9 +1779,9 @@
   "Message_VideoRecorderEnabled": "เปิดใช้งานเครื่องบันทึกวิดีโอแล้ว",
   "Message_VideoRecorderEnabledDescription": "ต้องใช้ไฟล์ 'video / webm' เป็นประเภทสื่อที่ยอมรับในการตั้งค่า 'อัปโหลดไฟล์'",
   "Message_view_mode_info": "การทำเช่นนี้จะเปลี่ยนจำนวนเนื้อที่ว่างบนหน้าจอ",
+  "Message": "ข่าวสาร",
   "messages": "ข้อความ",
   "Messages": "ข้อความ",
-  "Mmessages": "ข้อความ",
   "Messages_that_are_sent_to_the_Incoming_WebHook_will_be_posted_here": "ข้อความที่ถูกส่งไปยัง WebHook ขาเข้าจะถูกลงรายการบัญชีที่นี่",
   "Meta": "Meta",
   "Meta_custom": "แท็ก Meta แบบกำหนดเอง",
@@ -2511,8 +2510,6 @@
   "This_is_a_push_test_messsage": "นี่เป็นข้อความทดสอบแบบกด",
   "This_room_has_been_archived_by__username_": "ห้องนี้ได้รับการเก็บถาวรโดย __ ชื่อผู้ใช้__",
   "This_room_has_been_unarchived_by__username_": "ห้องนี้ได้ยกเลิกการเก็บถาวรโดย __ ชื่อผู้ใช้",
-  "Thread_slash_command_params": "ข้อความของคุณ",
-  "Threading_context_menu_none": "มองไม่เห็น",
   "Thursday": "วันพฤหัสบดี",
   "Time_in_seconds": "เวลาเป็นวินาที",
   "Title": "หัวข้อ",
diff --git a/packages/rocketchat-i18n/i18n/tr.i18n.json b/packages/rocketchat-i18n/i18n/tr.i18n.json
index 870b894dab8f..cd859fd41e65 100644
--- a/packages/rocketchat-i18n/i18n/tr.i18n.json
+++ b/packages/rocketchat-i18n/i18n/tr.i18n.json
@@ -1030,6 +1030,9 @@
   "Display_offline_form": "Ekran çevrimdışı formu",
   "Display_unread_counter": "Okunmamış mesaj sayısını göster",
   "Displays_action_text": "Görüntüler aksiyon metni",
+  "Discussion_target_channel_description": "Sormak istediğinizle ilgili bir kanal seçin",
+  "Discussion_target_channel": "Ana kanal veya grup",
+  "Discussion_first_message_title": "İletiniz",
   "Dont_ask_me_again": "Bana bir daha sorma!",
   "Dont_ask_me_again_list": "Bana tekrar sorma listesi",
   "Do_not_display_unread_counter": "Bu kanalın sayaçlarını gösterme",
@@ -1244,7 +1247,6 @@
   "every_hour": "Saatte bir",
   "every_six_hours": "6 saatte bir",
   "every_day": "Her gün",
-  "Every_Workspace": "Her Çalışma Alanı",
   "Everyone_can_access_this_channel": "Bu kanala herkes erişebilir",
   "Example_s": "Örnek: <code class=\"inline\">%s</code>",
   "Exclude_Botnames": "Botları Dışarıda Bırak",
@@ -1820,7 +1822,6 @@
   "Loading_more_from_history": "Geçmişten daha fazlası yükleniyor",
   "Loading_suggestion": "Öneriler yükleniyor...",
   "Local_Password": "Yerel Şifre",
-  "Local_Workspace": "Yerel Çalışma Alanı",
   "Localization": "yerelleştirme",
   "Log_Exceptions_to_Channel_Description": "Tutulan tüm istisnaları alacak bir kanal. İstisnaları görmezden gelmek için boş bırakın.",
   "Log_Exceptions_to_Channel": "Kanal için İstisnaları Günlüğe Kaydedin",
@@ -1906,7 +1907,6 @@
   "Mentions_default": "Söz (varsayılan)",
   "Mentions_only": "Sadece mansiyonlar",
   "Merge_Channels": "Kanalları Birleştirme",
-  "Message": "Mesaj",
   "Message_AllowBadWordsFilter": "Mesaj kötü sözler filtreleme izin ver",
   "Message_AllowDeleting": "Mesaj silmeye izin ver",
   "Message_AllowDeleting_BlockDeleteInMinutes": "Blok Mesaj Silme (n) dakika sonra",
@@ -1977,9 +1977,9 @@
   "Message_VideoRecorderEnabled": "Video Kaydedici Etkin",
   "Message_VideoRecorderEnabledDescription": "'Dosya Yükleme' ayarları içinde kabul edilen bir medya türü olması için 'video / webm' dosyalarının olması gerekir.",
   "Message_view_mode_info": "Bu alan mesajlarının miktarı ekranda sürebilir değiştirir.",
+  "Message": "Mesaj",
   "messages": "Mesajlar",
   "Messages": "Mesajlar",
-  "Mmessages": "mesajlar",
   "Messages_that_are_sent_to_the_Incoming_WebHook_will_be_posted_here": "Gelen WebHook gönderilen mesajları burada ilan edilecektir.",
   "Meta": "Meta",
   "Meta_custom": "Özel Meta Etiketleri",
@@ -2039,8 +2039,6 @@
   "New_encryption_password": "Yeni şifreleme parolası",
   "New_role": "yeni rolü",
   "New_Room_Notification": "Yeni Oda Bildirimi",
-  "New_thread": "Yeni konu",
-  "New_thread_name": "Konu odası için anlamlı bir ad",
   "New_Trigger": "Yeni Tetikleyici",
   "New_version_available_(s)": "Yeni sürüm mevcut (%s)",
   "New_videocall_request": "Yeni Görüntülü Arama İsteği",
@@ -2060,13 +2058,11 @@
   "No_messages_yet": "Henüz mesaj yok",
   "No_pages_yet_Try_hitting_Reload_Pages_button": "Henüz bir sayfa yok. \"Sayfaları Yenile\" düğmesine basmayı deneyin.",
   "No_pinned_messages": "Sabitlenmiş mesaj yok",
-  "No_replies_yet": "Henüz bir yanıt yok",
   "No_results_found": "Sonuç bulunamadı",
   "No_results_found_for": "Için sonuç bulunamadı:",
   "No_snippet_messages": "Snippet yok",
   "No_starred_messages": "Favori iletin yok",
   "No_such_command": "Böyle bir komut yok: `/__command__`",
-  "No_threads_yet": "Henüz bir konu yok",
   "No_user_with_username_%s_was_found": "<strong>\"%s\"</strong> adında hiçbir kullanıcı bulunamadı!",
   "Nobody_available": "Kimse yok",
   "Node_version": "düğüm versiyonu",
@@ -2371,7 +2367,6 @@
   "Retail": "Perakende",
   "Retention_setting_changed_successfully": "Saklama politikası ayarı başarıyla değiştirildi",
   "RetentionPolicy": "Alıkoyma politikası",
-  "RetentionPolicy_DoNotExcludeThreads": "Konu iletilerini dışarıda tutmayın",
   "RetentionPolicy_RoomWarning": "__time__'den eski mesajlar otomatik olarak budanır",
   "RetentionPolicy_RoomWarning_Unpinned": "__time__'den eski sabit olmayan iletiler burada otomatik olarak budanır",
   "RetentionPolicy_RoomWarning_FilesOnly": "__time__'den eski dosyalar otomatik olarak budanır (mesajlar bozulmadan kalır)",
@@ -2704,7 +2699,6 @@
   "The_emails_are_being_sent": "E-postalar gönderiliyor.",
   "The_field_is_required": "%s alanı zorunludur.",
   "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "Biz ImageMagick veya GraphicsMagick sunucunuzda yüklü algılayamaz çünkü resim boyutlandırmak çalışmaz.",
-  "The_message_is_a_thread_you_will_not_be_able_to_recover": "Bu ileti, iletileri kurtaramayacağınız bir konu.",
   "The_peer__peer__does_not_exist": "<em>__peer__</em> adında bir eş yok.",
   "The_redirectUri_is_required": "redirectUri gereklidir",
   "The_server_will_restart_in_s_seconds": "Sunucu %s saniye içinde yeniden başlayacak",
@@ -2778,27 +2772,8 @@
   "This_month": "Bu Ay",
   "This_room_has_been_archived_by__username_": "Bu oda __username__ tarafından arşivlenmiştir.",
   "This_room_has_been_unarchived_by__username_": "Bu oda __username__ tarafından arşivden kaldırıldılmıştır.",
-  "Thread_creation_on_home": "Ana ekranda konular oluştur",
-  "Thread_default_parent_Channel": "Yeni konular için varsayılan kanal",
-  "Thread_from_context_menu": "Bağlam menüsündeki konular",
-  "Thread_invitations_threshold_description": "Herkese açık bir konuya otomatik olarak davet edilecek maksimum kullanıcı sayısı",
-  "Thread_invitations_threshold": "Otomatik olarak davet edilecek maksimum kullanıcı ",
-  "Thread_name": "Konu adı",
-  "Thread_slash_command_description": "Mevcut kanal için bir konu oluşturur",
-  "Thread_slash_command_params": "iletiniz",
-  "Thread_start": "Konu başlat",
-  "Thread_target_channel_description": "Sormak istediğinizle ilgili bir kanal seçin",
-  "Thread_target_channel_prefix": "İçinde yeni bir konu oluşturuyorsunuz",
-  "Thread_target_channel_suffix": "- farklı bir ana kanal seçin",
-  "Thread_target_channel": "Ana kanal veya grup",
-  "thread-created": "Yeni bir konu başlattı: \"__message__\"",
   "thread": "konu",
-  "Threading_context_menu_button": "Özel düğme",
-  "Threading_context_menu_none": "Görünmez",
-  "Threading_first_message_title": "İletiniz",
-  "Threads_in_sidebar": "Konular kategorisini kenar çubuğunda göster",
   "Threads": "Konular",
-  "Threading_title": "Yeni konu oluştur",
   "This_week": "Bu Hafta",
   "Thursday": "Perşembe",
   "Time_in_seconds": "Zaman, saniye olarak",
diff --git a/packages/rocketchat-i18n/i18n/ug.i18n.json b/packages/rocketchat-i18n/i18n/ug.i18n.json
index 5500a3b05831..08a9f50d27c3 100644
--- a/packages/rocketchat-i18n/i18n/ug.i18n.json
+++ b/packages/rocketchat-i18n/i18n/ug.i18n.json
@@ -665,7 +665,6 @@
   "Members_List": "ئەزالار تىزىملىكى",
   "Mentions": "تىلغا ئېلىش",
   "Mentions_default": "تىلغا ئېلىش (بەلگىلەنگەن)",
-  "Message": "ئۇچۇر",
   "Message_AllowBadWordsFilter": "ئۇچۇردىكى سەت گەپنى سۈزگۈچتىن ئۆتكۈزمەسلىكنى رۇخسەت قىلىش",
   "Message_AllowDeleting": "ئۇچۇرنى يۇيۇشنى رۇخسەت قىلىش",
   "Message_AllowDeleting_BlockDeleteInMinutes": "نىڭ قىسمى（n）پارچە خەۋەرنى يۇيۇۋېتىلگەندىن كېيىن",
@@ -700,6 +699,7 @@
   "Message_TimeFormat_Description": "قاراڭ:<a href=\"http://momentjs.com/docs/#/displaying/format/\"target=\"momemt\">Moment.js</a>",
   "Message_too_long": "ئۇچۇر بەك ئۇزۇن",
   "Message_view_mode_info": "بۇ ئۇچۇرنىڭ ئېكراندا ئىگىلىگەن بوشلۇقىنى ئۆزگەرتىدۇ",
+  "Message": "ئۇچۇر",
   "messages": "ئۇچۇر",
   "Messages": "ئۇچۇر",
   "Messages_that_are_sent_to_the_Incoming_WebHook_will_be_posted_here": "ئۇچۇرلار بۇ يەردە ئېلان قىلىنىدۇ.（Incoming WebHook）ئىلغۇچقا ئەۋەتىلگەن",
@@ -1069,7 +1069,6 @@
   "This_is_a_push_test_messsage": "بۇ بىر سىناق ئۇچۇر",
   "This_room_has_been_archived_by__username_": "بۇ ياتاق پېچەتلەندى ، __username__تەرىپىدىن",
   "This_room_has_been_unarchived_by__username_": "تەرىپىدىن بۇ ياتاق پېچەتلەشتىن بىكار قىلىندى _username__",
-  "Threading_context_menu_none": "يوشۇرۇن",
   "Time_in_seconds": "ۋاقىت ()سېكۇنت",
   "Title": "ماۋزۇ",
   "Title_bar_color": "ماۋزۇ بۆلىكى رەڭگى",
diff --git a/packages/rocketchat-i18n/i18n/uk.i18n.json b/packages/rocketchat-i18n/i18n/uk.i18n.json
index d88206cd424c..33a315ee79fb 100644
--- a/packages/rocketchat-i18n/i18n/uk.i18n.json
+++ b/packages/rocketchat-i18n/i18n/uk.i18n.json
@@ -1713,7 +1713,6 @@
   "Mentions_default": "Згадки (за замовчуванням)",
   "Mentions_only": "Згадує тільки",
   "Merge_Channels": "Об'єднати канали",
-  "Message": "повідомлення",
   "Message_AllowBadWordsFilter": "Дозволити Повідомлення поганих слів фільтрації",
   "Message_AllowDeleting": "Дозволити видалення повідомлень",
   "Message_AllowDeleting_BlockDeleteInMinutes": "Блок повідомлень Видалення Після того, як (п) хвилин",
@@ -1781,9 +1780,9 @@
   "Message_VideoRecorderEnabled": "Відеозапис ввімкнено",
   "Message_VideoRecorderEnabledDescription": "Потрібно, щоб файли \"video / webm\" були прийнятими типом носіїв в \"Налаштування файлу\".",
   "Message_view_mode_info": "Це змінює кількість космічних повідомлень займають на екрані.",
+  "Message": "повідомлення",
   "messages": "повідомлення",
   "Messages": "повідомлення",
-  "Mmessages": "повідомлення",
   "Messages_that_are_sent_to_the_Incoming_WebHook_will_be_posted_here": "Повідомлення, відправлені до вхідного WebHook будуть опубліковані тут.",
   "Meta": "Мета",
   "Meta_custom": "Користувацькі метатеги",
@@ -2512,8 +2511,6 @@
   "This_is_a_push_test_messsage": "Це поштовх тест messsage",
   "This_room_has_been_archived_by__username_": "Цей номер був архівуються __username__",
   "This_room_has_been_unarchived_by__username_": "Цей номер був Розархівувати по __username__",
-  "Thread_slash_command_params": "Ваше повідомлення",
-  "Threading_context_menu_none": "Прихований",
   "Thursday": "четвер",
   "Time_in_seconds": "Час в секундах",
   "Title": "назва",
diff --git a/packages/rocketchat-i18n/i18n/vi-VN.i18n.json b/packages/rocketchat-i18n/i18n/vi-VN.i18n.json
index 8c9258852285..4fe8f9a683a0 100644
--- a/packages/rocketchat-i18n/i18n/vi-VN.i18n.json
+++ b/packages/rocketchat-i18n/i18n/vi-VN.i18n.json
@@ -1704,7 +1704,6 @@
   "Mentions_default": "Đề cập (mặc định)",
   "Mentions_only": "Chỉ nhắc đến",
   "Merge_Channels": "Hợp nhất Kênh",
-  "Message": "Thông điệp",
   "Message_AllowBadWordsFilter": "Cho phép lọc các từ xấu bằng tin nhắn",
   "Message_AllowDeleting": "Cho phép xóa tin nhắn",
   "Message_AllowDeleting_BlockDeleteInMinutes": "Chặn tin nhắn xóa sau (n) phút",
@@ -1772,9 +1771,9 @@
   "Message_VideoRecorderEnabled": "Đã bật tính năng ghi hình Video",
   "Message_VideoRecorderEnabledDescription": "Yêu cầu tệp 'video / webm' là loại phương tiện được chấp nhận trong cài đặt 'Tải lên tệp'.",
   "Message_view_mode_info": "Điều này thay đổi số lượng tin nhắn không gian chiếm trên màn hình.",
+  "Message": "Thông điệp",
   "messages": "Tin nhắn",
   "Messages": "Tin nhắn",
-  "Mmessages": "tin nhắn",
   "Messages_that_are_sent_to_the_Incoming_WebHook_will_be_posted_here": "Thông báo được gửi đến WebHook vào sẽ được đăng ở đây.",
   "Meta": "Meta",
   "Meta_custom": "Thẻ Meta tùy chỉnh",
@@ -2503,8 +2502,6 @@
   "This_is_a_push_test_messsage": "Đây là một thông báo thử nghiệm đẩy",
   "This_room_has_been_archived_by__username_": "Phòng này đã được lưu trữ bởi __username__",
   "This_room_has_been_unarchived_by__username_": "Phòng này đã được hủy lưu trữ bởi __username__",
-  "Thread_slash_command_params": "tin nhắn của bạn",
-  "Threading_context_menu_none": "Vô hình",
   "Thursday": "Thứ năm",
   "Time_in_seconds": "Thời gian tính bằng giây",
   "Title": "Tiêu đề",
diff --git a/packages/rocketchat-i18n/i18n/zh-HK.i18n.json b/packages/rocketchat-i18n/i18n/zh-HK.i18n.json
index d0a6450591c1..5a9e0fc02fc1 100644
--- a/packages/rocketchat-i18n/i18n/zh-HK.i18n.json
+++ b/packages/rocketchat-i18n/i18n/zh-HK.i18n.json
@@ -1716,7 +1716,6 @@
   "Mentions_default": "提及（默认）",
   "Mentions_only": "只提及",
   "Merge_Channels": "合并频道",
-  "Message": "消息",
   "Message_AllowBadWordsFilter": "允许消息不良词语过滤",
   "Message_AllowDeleting": "允许删除消息",
   "Message_AllowDeleting_BlockDeleteInMinutes": "（n）分钟后删除块信息",
@@ -1785,9 +1784,9 @@
   "Message_VideoRecorderEnabled": "录像机启用",
   "Message_VideoRecorderEnabledDescription": "要求'视频/ webm'文件在'文件上传'设置中成为可接受的媒体类型。",
   "Message_view_mode_info": "这改变了屏幕上占用的空间消息量。",
+  "Message": "消息",
   "messages": "消息",
   "Messages": "消息",
-  "Mmessages": "消息",
   "Messages_that_are_sent_to_the_Incoming_WebHook_will_be_posted_here": "发送到传入WebHook的消息将在此处发布。",
   "Meta": "Meta",
   "Meta_custom": "自定义元标记",
@@ -2516,8 +2515,6 @@
   "This_is_a_push_test_messsage": "这是一个推测信息",
   "This_room_has_been_archived_by__username_": "这个房间已被__username__存档",
   "This_room_has_been_unarchived_by__username_": "这个房间已被__username__存档",
-  "Thread_slash_command_params": "你的信息",
-  "Threading_context_menu_none": "隐身",
   "Thursday": "星期四",
   "Time_in_seconds": "时间以秒为单位",
   "Title": "标题",
diff --git a/packages/rocketchat-i18n/i18n/zh-TW.i18n.json b/packages/rocketchat-i18n/i18n/zh-TW.i18n.json
index 7fefeea91c04..0d496a6b3832 100644
--- a/packages/rocketchat-i18n/i18n/zh-TW.i18n.json
+++ b/packages/rocketchat-i18n/i18n/zh-TW.i18n.json
@@ -1717,7 +1717,6 @@
   "Mentions_default": "標記（預設）",
   "Mentions_only": "只提及",
   "Merge_Channels": "合併頻道",
-  "Message": "訊息",
   "Message_AllowBadWordsFilter": "允許過濾訊息中的不雅文字",
   "Message_AllowDeleting": "允許刪除訊息",
   "Message_AllowDeleting_BlockDeleteInMinutes": "(n) 分钟后禁止删除消息",
@@ -1786,9 +1785,9 @@
   "Message_VideoRecorderEnabled": "錄像機啟用",
   "Message_VideoRecorderEnabledDescription": "要求'視頻/ webm'文件在'文件上傳'設置中成為可接受的媒體類型。",
   "Message_view_mode_info": "這改變了空間信息的數量佔用在屏幕上。",
+  "Message": "訊息",
   "messages": "訊息",
   "Messages": "訊息",
-  "Mmessages": "消息",
   "Messages_that_are_sent_to_the_Incoming_WebHook_will_be_posted_here": "傳送至 Incoming WebHook 的訊息會顯示在這裡。",
   "Meta": "Meta",
   "Meta_custom": "自定義元標記",
@@ -2517,8 +2516,6 @@
   "This_is_a_push_test_messsage": "這是一則推播測試訊息",
   "This_room_has_been_archived_by__username_": "此房间已被 __username__ 归档",
   "This_room_has_been_unarchived_by__username_": "此房间已被 __username__ 取消归档",
-  "Thread_slash_command_params": "您的訊息",
-  "Threading_context_menu_none": "隱藏",
   "Thursday": "星期四",
   "Time_in_seconds": "時間（秒）",
   "Title": "標題",
diff --git a/packages/rocketchat-i18n/i18n/zh.i18n.json b/packages/rocketchat-i18n/i18n/zh.i18n.json
index 826d28e24339..0450c2a04e4f 100644
--- a/packages/rocketchat-i18n/i18n/zh.i18n.json
+++ b/packages/rocketchat-i18n/i18n/zh.i18n.json
@@ -304,7 +304,7 @@
   "API_Personal_Access_Tokens_To_REST_API": "个人访问令牌访问 REST API",
   "API_Personal_Access_Tokens_Remove_Modal": "你确定删除此个人访问令牌？",
   "API_Personal_Access_Token_Generated": "个人访问令牌生成成功",
-  "API_Personal_Access_Token_Generated_Text_Token_s_UserId_s": "请仔细保存您的令牌，因为之后您将无法再查看它。 <br/>令牌：<strong>__token__ </strong><br/>用户ID：<strong>__userId__ </strong>",
+  "API_Personal_Access_Token_Generated_Text_Token_s_UserId_s": "请仔细保存您的令牌，因为之后您将无法再查看它。 <br/>令牌：<strong>__token__ </strong><br/>您的用户ID：<strong>__userId__ </strong>",
   "API_Personal_Access_Tokens_Regenerate_Modal": "如果你丢失或忘记令牌，你能重新生成，但是谨记所有使用此令牌的应用应该更新",
   "API_Personal_Access_Tokens_Regenerate_It": "重新生成令牌",
   "API_Shield_Types": "盾牌类型",
@@ -348,7 +348,7 @@
   "Apps_WhatIsIt": "应用程序：它们是什么？",
   "Apps_WhatIsIt_paragraph1": "管理后台的新图标！这是什么意思，什么是应用程序？",
   "Apps_WhatIsIt_paragraph2": "首先，在这种情况下的应用程序不涉及移动应用程序。事实上，最好从插件或高级集成角度考虑它们。",
-  "Apps_WhatIsIt_paragraph3": "其次，它们是动态脚本或软件包，它允许您自定义 Rocket.Chat 实例而不必分叉代码库。但请记住，这是一个新的功能集，因为它可能不是 100％ 稳定。此外，我们仍在开发功能集，因此并非所有功能都可以在此时进行定制。有关开始开发应用程序的更多信息，请点击此处阅读：",
+  "Apps_WhatIsIt_paragraph3": "其次，它们是动态脚本或软件包，它允许您自定义 Rocket.Chat 实例而不必分叉代码库。但请记住，这是一个新的功能集，因为它可能不是 100％ 稳定。此外，我们仍在开发功能集，因此当前并非所有功能都可以在此进行定制。有关开发应用程序的更多信息，请点击此处阅读：",
   "Apps_WhatIsIt_paragraph4": "但是据说，如果您有兴趣启用此功能并尝试使用，请点击此按钮启用 Apps 系统。",
   "Archive": "归档",
   "archive-room": "归档聊天室",
@@ -522,7 +522,7 @@
   "Chatpal_AdminPage": "聊天管理员页面",
   "Chatpal_All_Results": "全部",
   "Chatpal_API_Key": "API密钥",
-  "Chatpal_API_Key_Description": "您还没有</strong> API密钥<strong>？<a class=\"chatpal-admin-link\" href=\"./admin/chatpal\">获取一个！</a>",
+  "Chatpal_API_Key_Description": "您还没有</strong> API 密钥<strong>？<a class=\"chatpal-admin-link\" href=\"./admin/chatpal\">获取一个！</a>",
   "Chatpal_Backend": "后端类型",
   "Chatpal_Backend_Description": "选择是否要使用 Chatpal 作为服务或现场安装",
   "Chatpal_Base_URL": "Base URL",
@@ -1037,6 +1037,16 @@
   "Display_offline_form": "显示离线表单",
   "Display_unread_counter": "显示未读消息的数量",
   "Displays_action_text": "显示动作文字",
+  "Discussion_name": "讨论名称",
+  "Discussions": "讨论",
+  "Discussion_start": "开始一个讨论",
+  "Discussion_target_channel_description": "选择你想要询问的频道",
+  "Discussion_target_channel_prefix": "您正创建讨论于",
+  "Discussion_target_channel": "父频道或者组",
+  "discussion-created": "__message__",
+  "Discussion_description": "帮助保持事态更新! 通过创建讨论，一个和所选频道双向关联的子频道将会被创建。",
+  "Discussion_first_message_title": "你的消息",
+  "Discussion_title": "创建一个新讨论",
   "Dont_ask_me_again": "不要再问我了！",
   "Dont_ask_me_again_list": "不要再问我列表",
   "Do_not_display_unread_counter": "不要显示此频道的任何计数器",
@@ -1062,6 +1072,7 @@
   "Duplicate_private_group_name": "名为 `%s` 的私有组已存在",
   "Duration": "时长",
   "E2E Encryption": "端到端加密",
+  "E2E_Enabled": "端到端已启用",
   "E2E_Enable_alert": "此功能目前处于测试阶段！请将错误报告给github.com/RocketChat/Rocket.Chat/issues并注意：<br/> - 搜索操作无法找到加密聊天室的加密消息。<br/> - 移动应用暂时不支持加密消息（他们正在开发）。<br/> - 机器人可能无法看到加密消息，直到实现对它的支持。<br/> - 此版本中不会加密上传文件。",
   "E2E_Enable_description": "启用选项以创建加密组，并能够更改组以及指示要加密的消息",
   "E2E_Encryption_Password_Explanation": "您现在可以创建加密的专用组和直接消息。您也可以将现有的私人组或直接消息更改为加密。<br/><br/>这是端到端加密，因此编码/解码邮件的密钥不会保存在服务器上。因此，您需要将密码存储在安全的地方。您需要在希望使用端到端加密的其他设备上输入。",
@@ -1252,7 +1263,6 @@
   "every_hour": "每小时一次",
   "every_six_hours": "每6小时一次",
   "every_day": "每天一次",
-  "Every_Workspace": "每个工作区",
   "Everyone_can_access_this_channel": "每个人都可以访问此频道",
   "Example_s": "例如：<code class=\"inline\">%s</code>",
   "Exclude_Botnames": "排除机器人",
@@ -1264,6 +1274,7 @@
   "Export_My_Data": "导出我的数据",
   "expression": "表达式",
   "Extended": "已扩展",
+  "External_Domains": "外部域名",
   "External_Queue_Service_URL": "外部队列服务 URL",
   "External_Service": "外部服务",
   "Facebook_Page": "Facebook页面",
@@ -1421,6 +1432,7 @@
   "Graphql_CORS": "GraphQL CORS",
   "Graphql_Subscription_Port": "GraphQL 订阅(Subscription)端口",
   "Group_by_Type": "按类型分组",
+  "Group_discussions": "组讨论",
   "Group_favorites": "组最爱",
   "Group_mentions_disabled_x_members": "在 __total__ 以上成员的房间中使用`@all`和`@here` 组提及已禁用。",
   "Group_mentions_only": "仅组提及",
@@ -1832,8 +1844,8 @@
   "Loading...": "加载中...",
   "Loading_more_from_history": "加载更多",
   "Loading_suggestion": "载入建议中...",
+  "Local_Domains": "本地域名",
   "Local_Password": "本地密码",
-  "Local_Workspace": "本地工作区",
   "Localization": "本地化",
   "Log_Exceptions_to_Channel_Description": "一个将接收所有捕获的异常的频道。留空以忽略异常。",
   "Log_Exceptions_to_Channel": "将异常记录至频道",
@@ -1919,8 +1931,8 @@
   "Mentions_default": "提及（默认）",
   "Mentions_only": "只提及",
   "Merge_Channels": "合并频道",
-  "Message": "消息",
   "Message_AllowBadWordsFilter": "允许消息脏话过滤",
+  "Message_AllowConvertLongMessagesToAttachment": "允许将长消息转换为附件",
   "Message_AllowDeleting": "允许删除消息",
   "Message_AllowDeleting_BlockDeleteInMinutes": "(n) 分钟后禁止删除消息",
   "Message_AllowDeleting_BlockDeleteInMinutes_Description": "输入 0 以禁用阻止。",
@@ -1986,13 +1998,15 @@
   "Message_TimeFormat": "时间格式",
   "Message_TimeFormat_Description": "参见：<a href=\"http://momentjs.com/docs/#/displaying/format/\" target=\"momemt\">Moment.js</a>",
   "Message_too_long": "消息过长",
+  "Message_too_long_as_an_attachment_question": "消息太长。作为附件发送?",
   "Message_UserId": "用户 ID",
   "Message_VideoRecorderEnabled": "录像机启用",
   "Message_VideoRecorderEnabledDescription": "要求 'video/webm' 文件在 '文件上传' 设置中成为可接受的媒体类型。",
   "Message_view_mode_info": "这会改变消息在屏幕上占用的空间。",
-  "messages": "信息",
+  "message": "消息",
+  "Message": "消息",
+  "messages": "消息",
   "Messages": "消息",
-  "Mmessages": "信息",
   "Messages_that_are_sent_to_the_Incoming_WebHook_will_be_posted_here": "入站 WebHook 的消息会发布到这里。",
   "Meta": "Meta",
   "Meta_custom": "自定义元标记",
@@ -2040,6 +2054,9 @@
   "New_Application": "新应用",
   "New_Custom_Field": "新的自定义字段",
   "New_Department": "新部门",
+  "New_discussion": "新讨论",
+  "New_discussion_name": "有意义的讨论房间名称",
+  "New_discussion_first_message": "通常, 一个讨论由一个问题开始, 例如 \"如何上传图片?\"",
   "New_integration": "新的集成",
   "New_line_message_compose_input": "`%s` - 消息编写中的新行",
   "New_logs": "新日志",
@@ -2052,9 +2069,6 @@
   "New_encryption_password": "新密码",
   "New_role": "新角色",
   "New_Room_Notification": "新聊天室通知",
-  "New_thread": "新讨论串",
-  "New_thread_name": "有意义的讨论串名称",
-  "New_thread_first_message": "通常, 讨论串开始于一个问题, 比如\"如何上传图片?\"",
   "New_Trigger": "新的触发器",
   "New_version_available_(s)": "有可用的新版本（％s）",
   "New_videocall_request": "新的视频通话请求",
@@ -2074,13 +2088,12 @@
   "No_messages_yet": "还没有消息",
   "No_pages_yet_Try_hitting_Reload_Pages_button": "还没有页面。尝试点击“重新加载页面”按钮。",
   "No_pinned_messages": "未固定的信息",
-  "No_replies_yet": "尚无回复",
   "No_results_found": "无结果",
   "No_results_found_for": "未找到结果：",
   "No_snippet_messages": "没有片段",
   "No_starred_messages": "没有星标消息",
   "No_such_command": "没有该命令：`/__command__`",
-  "No_threads_yet": "尚无讨论串",
+  "No_discussions_yet": "尚未有任何讨论",
   "No_user_with_username_%s_was_found": "未找到名为 <strong>\"%s\"</strong> 的用户!",
   "Nobody_available": "无人可用",
   "Node_version": "Node 版本",
@@ -2217,6 +2230,7 @@
   "Please_enter_value_for_url": "请输入头像的 URL。",
   "Please_enter_your_new_password_below": "请在下方输入新密码：",
   "Please_enter_your_password": "请输入您的密码",
+  "Please_fill_an_email": "请填写邮件地址",
   "Please_fill_a_label": "请填写一个标签",
   "Please_fill_a_name": "请填写一个名字",
   "Please_fill_a_username": "请填写用户名",
@@ -2385,7 +2399,7 @@
   "Retail": "零售",
   "Retention_setting_changed_successfully": "保留策略设置已成功更改",
   "RetentionPolicy": "保留政策",
-  "RetentionPolicy_DoNotExcludeThreads": "不排除讨论串消息",
+  "RetentionPolicy_DoNotExcludeDiscussion": "不除外讨论消息",
   "RetentionPolicy_RoomWarning": "此会话中超过 __time__ 的消息将会自动删除",
   "RetentionPolicy_RoomWarning_Unpinned": "此会话中超过 __time__ 的未固定消息将会自动删除",
   "RetentionPolicy_RoomWarning_FilesOnly": "此会话中超过 __time__ 的文件将自动删除（消息保持不变）",
@@ -2573,6 +2587,7 @@
   "show_offline_users": "显示离线用户",
   "Show_on_registration_page": "在注册页面显示",
   "Show_only_online": "只显示在线用户",
+  "Show_on_offline_page": "显示离线页面",
   "Show_preregistration_form": "显示预注册表单",
   "Show_queue_list_to_all_agents": "将队列列表显示给所有代理",
   "Show_room_counter_on_sidebar": "在侧边栏上显示房间计数器",
@@ -2717,7 +2732,7 @@
   "The_emails_are_being_sent": "邮件已发送。",
   "The_field_is_required": "字段 %s 必填",
   "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "无法调整图片尺寸，因为我们无法在服务器上找到已安装的 ImageMagick 或 GraphicsMagick 。",
-  "The_message_is_a_thread_you_will_not_be_able_to_recover": "此消息是一个讨论串, 你将不能还原此消息!",
+  "The_message_is_a_discussion_you_will_not_be_able_to_recover": "此消息是一个讨论你将无法恢复此消息!",
   "The_peer__peer__does_not_exist": "对等端 <em>__peer__</em> 不存在。",
   "The_redirectUri_is_required": "跳转 URI 必填",
   "The_server_will_restart_in_s_seconds": "服务器将在 %s 秒后重启",
@@ -2791,29 +2806,8 @@
   "This_month": "这个月",
   "This_room_has_been_archived_by__username_": "此聊天室已被 __username__ 归档",
   "This_room_has_been_unarchived_by__username_": "此聊天室已被 __username__ 取消归档",
-  "Thread_creation_on_home": "在主屏创建讨论串",
-  "Thread_default_parent_Channel": "新讨论串的默认频道",
-  "Thread_from_context_menu": "上下文菜单中的讨论串",
-  "Thread_invitations_threshold_description": "公开讨论串中的最大自动邀请用户数量",
-  "Thread_invitations_threshold": "最大自动邀请用户数量",
-  "Thread_name": "讨论串名称",
-  "Thread_slash_command_description": "在当前频道创建讨论串",
-  "Thread_slash_command_params": "你的消息",
-  "Thread_start": "创建讨论串",
-  "Thread_target_channel_description": "选择你想要询问的频道",
-  "Thread_target_channel_prefix": "你正创建讨论串于",
-  "Thread_target_channel_suffix": "- 选择其他父频道",
-  "Thread_target_channel": "父频道或者组",
-  "thread-created": "已创建新讨论串: \"__message__\"",
-  "thread-welcome": "感谢 __username__ 创建了一个新的讨论串! 我从 __parentchannel__ 邀请了一些可能会帮到你的成员。提示: 如果冷场, 你可以用 \"@all\" 戳一下他们 ;)",
   "thread": "讨论串",
-  "Threading_context_menu_button": "专用按钮",
-  "Threading_context_menu_none": "隐身",
-  "Threading_description": "辅助把握事况! 通过创建讨论串, 将为你选择的频道创建子频道并互相关联它们。",
-  "Threading_first_message_title": "你的消息",
-  "Threads_in_sidebar": "在边栏中显示讨论串分类",
   "Threads": "讨论串",
-  "Threading_title": "创建新的讨论串",
   "This_week": "这个星期",
   "Thursday": "星期四",
   "Time_in_seconds": "时间（秒）",
@@ -2826,6 +2820,7 @@
   "Today": "今天",
   "To_additional_emails": "额外的电子邮件",
   "To_install_RocketChat_Livechat_in_your_website_copy_paste_this_code_above_the_last_body_tag_on_your_site": "要在您的网站中安装 Rocket.Chat 即时聊天，请将以下代码复制粘贴到您的网页代码中最后一个 <strong>&lt;/body&gt;</strong> 标签之上。",
+  "To_install_the_new_version_of_RocketChat_Livechat_in_your_website_copy_paste_this_code_above_the_last_body_tag_on_your_site": "要安装 Rocket.Chat 实时聊天的 <strong>新版本</strong> 复制和粘贴此代码在你站点的最后一个<strong>&lt;/body&gt;</strong> 标签上方。",
   "to_see_more_details_on_how_to_integrate": "以便查看更多关于集成的细节。",
   "To_users": "给用户",
   "Toggle_original_translated": "切换地区/语言",
diff --git a/packages/rocketchat-livechat/.app/i18n/hi-IN.i18n.json b/packages/rocketchat-livechat/.app/i18n/hi-IN.i18n.json
new file mode 100644
index 000000000000..913c22d2d0cb
--- /dev/null
+++ b/packages/rocketchat-livechat/.app/i18n/hi-IN.i18n.json
@@ -0,0 +1,51 @@
+{
+  "Additional_Feedback": "अतिरिक्त प्रतिक्रिया",
+  "Appearance": "दिखावट",
+  "Are_you_sure_do_you_want_end_this_chat": "क्या आप वाकई इस चैट को समाप्त करना चाहते हैं?",
+  "Are_you_sure_do_you_want_end_this_chat_and_switch_department": "क्या आप वाकई इस चैट को समाप्त और स्विच विभाग करना चाहते हैं?",
+  "Are_you_sure_do_you_want_switch_the_department": "क्या आप वाकई विभाग को स्विच करना चाहते हैं?",
+  "Cancel": "रद्द करे ",
+  "Change": "परिवर्तन",
+  "Chat_ended": "चैट समाप्त!",
+  "Connecting_to_an_Agent": "किसी एजेंट से जुड़ना",
+  "Choose_a_new_department": "एक नया विभाग चुनें",
+  "Close_menu": "मेनू बंद करें",
+  "Conversation_finished": "बातचीत समाप्त हुई",
+  "End_chat": "चैट समाप्त करें",
+  "How_friendly_was_the_chat_agent": "चैट एजेंट कितना अनुकूल था?",
+  "How_knowledgeable_was_the_chat_agent": "चैट एजेंट कितना जानकार था?",
+  "How_responsive_was_the_chat_agent": "चैट एजेंट कितना उत्तरदायी था?",
+  "How_satisfied_were_you_with_this_chat": "आप इस चैट से कितने संतुष्ट थे?",
+  "Installation": "स्थापना",
+  "New_messages": "नए संदेश",
+  "New_livechat_in_queue": "कतार में नई चैट",
+  "No": "नहीं",
+  "Options": "विकल्प",
+  "Please_answer_survey": "कृपया इस चैट के बारे में त्वरित सर्वेक्षण का उत्तर देने के लिए एक क्षण लें",
+  "Please_choose_a_department": "कृपया एक विभाग चुनें",
+  "Please_fill_name_and_email": "कृपया नाम और ईमेल भरें",
+  "Powered_by": "द्वारा संचालित",
+  "Request_video_chat": "वीडियो चैट का अनुरोध करें",
+  "Select_a_department": "एक विभाग का चयन करें",
+  "Switch_department": "स्विच विभाग",
+  "Department_switched": "विभाग बदल गया",
+  "Send": "भेजें",
+  "Skip": "छोड़ें",
+  "Start_Chat": "बातचीत शुरू करें",
+  "Survey": "सर्वेक्षण",
+  "Survey_instructions": "प्रत्येक प्रश्न को अपनी संतुष्टि के अनुसार रेट करें, 1 मतलब कि आप पूरी तरह से असंतुष्ट हैं और 5 का अर्थ है कि आप पूरी तरह से संतुष्ट हैं।",
+  "Thank_you_for_your_feedback": "आपकी प्रतिक्रिया के लिए आपका धन्यवाद",
+  "Thanks_We_ll_get_back_to_you_soon": "धन्यवाद! हम जल्द ही आपके पास वापस आएंगे।",
+  "transcript_sent": "प्रतिलेख भेजा गया",
+  "Type_your_email": "अपना ईमेल टाइप करें",
+  "Type_your_message": "अपना संदेश टाइप करें",
+  "Type_your_name": "अपना नाम लिखें",
+  "Upload_file_question": "दस्तावेज अपलोड करें?",
+  "User_joined": "उपयोगकर्ता शामिल हो गए",
+  "User_left": "उपयोगकर्ता छोड़ दिया",
+  "We_are_not_online_right_now_please_leave_a_message": "अभी हम ऑनलाइन नहीं हैं। कृपया एक संदेश छोड़ें।",
+  "We_are_offline_Sorry_for_the_inconvenience": "हम ऑफ़लाइन हैं। असुविधा के लिए खेद है।",
+  "Yes": "हाँ",
+  "You": "आप",
+  "You_must_complete_all_fields": "आपको सभी क्षेत्रों को पूरा करना होगा"
+}
\ No newline at end of file
diff --git a/packages/rocketchat-livechat/.app/i18n/hr.i18n.json b/packages/rocketchat-livechat/.app/i18n/hr.i18n.json
index f952e93c5c52..9fd149d85475 100644
--- a/packages/rocketchat-livechat/.app/i18n/hr.i18n.json
+++ b/packages/rocketchat-livechat/.app/i18n/hr.i18n.json
@@ -2,11 +2,12 @@
   "Additional_Feedback": "Dodatne povratne informacije",
   "Appearance": "Izgled",
   "Are_you_sure_do_you_want_end_this_chat": "Jeste li sigurni da želite završiti ovaj razgovor?",
-  "Are_you_sure_do_you_want_end_this_chat_and_switch_department": "Jeste li sigurni da želite prekinuti taj chat i prebaciti se na odjel?",
-  "Are_you_sure_do_you_want_switch_the_department": "Jeste li sigurni da želite prebaciti odjel?",
+  "Are_you_sure_do_you_want_end_this_chat_and_switch_department": "Jeste li sigurni da želite prekinuti taj chat i promijeniti odjel?",
+  "Are_you_sure_do_you_want_switch_the_department": "Jeste li sigurni da želite promijeniti odjel?",
   "Cancel": "Otkaži",
   "Change": "Promijeniti",
   "Chat_ended": "Razgovor je završen!",
+  "Connecting_to_an_Agent": "Povezivanje s agentom",
   "Choose_a_new_department": "Odaberite novi odjel",
   "Close_menu": "Zatvori izbornik",
   "Conversation_finished": "Razgovor je završio",
@@ -17,6 +18,7 @@
   "How_satisfied_were_you_with_this_chat": "Koliko ste zadovoljni ovim chatom?",
   "Installation": "Instalacija",
   "New_messages": "Nove poruke",
+  "New_livechat_in_queue": "Novi razgovor u redu čekanja",
   "No": "Ne",
   "Options": "Opcije",
   "Please_answer_survey": "Odvojite trenutak kako bi odgovorili na anketu o ovom chatu",
@@ -26,12 +28,12 @@
   "Request_video_chat": "Zatraži video razgovor",
   "Select_a_department": "Odaberite odjel",
   "Switch_department": "Zamijenite odjel",
-  "Department_switched": "Odjel je prebacio",
+  "Department_switched": "Odjel je promijenjen",
   "Send": "Pošalji",
   "Skip": "Preskoči",
-  "Start_Chat": "Započni Razgovor",
+  "Start_Chat": "Započni razgovor",
   "Survey": "Anketa",
-  "Survey_instructions": "Ocijenite svako pitanje u skladu s Vaše zadovoljstvo, 1 što znači da su potpuno nezadovoljni i 5 što znači da su u potpunosti zadovoljni.",
+  "Survey_instructions": "Ocijenite svako pitanje u skladu s Vašim zadovoljstvom, 1 znači da su potpuno nezadovoljni i 5 znači da su u potpunosti zadovoljni.",
   "Thank_you_for_your_feedback": "Hvala vam na povratnim informacijama",
   "Thanks_We_ll_get_back_to_you_soon": "Hvala! Javit ćemo vam se uskoro.",
   "transcript_sent": "Prijepis poslan",
diff --git a/packages/rocketchat-livechat/.app/i18n/pt.i18n.json b/packages/rocketchat-livechat/.app/i18n/pt.i18n.json
index 75fe8a0461af..022bee189184 100644
--- a/packages/rocketchat-livechat/.app/i18n/pt.i18n.json
+++ b/packages/rocketchat-livechat/.app/i18n/pt.i18n.json
@@ -28,7 +28,7 @@
   "Request_video_chat": "Solicitar vídeo-conferência",
   "Select_a_department": "Selecione um departamento",
   "Switch_department": "Mudar departamento",
-  "Department_switched": "Departamento comutado",
+  "Department_switched": "Departamento alterado",
   "Send": "Enviar",
   "Skip": "Saltar",
   "Start_Chat": "Iniciar Chat",

From ebbb4573699881cbdcff1e1d917f04279b38c650 Mon Sep 17 00:00:00 2001
From: ulf-f <18138421+ulf-f@users.noreply.github.com>
Date: Mon, 25 Mar 2019 16:35:40 +0100
Subject: [PATCH 09/24] wrong width/height for tile_70 (mstile 70x70 (png))
 (#13851)

I assume it is a c&p error in the tile_70 file the upload from the file always shows the error "Invalid file width" with a file which is 70x70 because the width and height was copied from the file below and still 144x144 instead of 70x70.
---
 app/assets/server/assets.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/assets/server/assets.js b/app/assets/server/assets.js
index a11bef444f65..7d7a6027942e 100644
--- a/app/assets/server/assets.js
+++ b/app/assets/server/assets.js
@@ -130,8 +130,8 @@ const assets = {
 		constraints: {
 			type: 'image',
 			extensions: ['png'],
-			width: 144,
-			height: 144,
+			width: 70,
+			height: 70,
 		},
 	},
 	tile_144: {

From 6ef409591e3df0562fdfde640edabd60b99138a4 Mon Sep 17 00:00:00 2001
From: Tasso Evangelista <tasso@tassoevan.me>
Date: Tue, 26 Mar 2019 08:44:14 -0300
Subject: [PATCH 10/24] [FIX] Some Safari bugs (#13895)

* Fix input text caret size on Safari

* Prevent errors in absence of Permissions API; move microphone handling to messageBoxAudioMessage module
---
 app/theme/client/imports/forms/input.css      |  8 +++--
 app/ui-message/client/messageBox.html         |  4 +--
 app/ui-message/client/messageBox.js           | 17 ---------
 .../client/messageBoxAudioMessage.html        | 36 ++++++++++---------
 .../client/messageBoxAudioMessage.js          | 24 +++++++++++++
 5 files changed, 49 insertions(+), 40 deletions(-)

diff --git a/app/theme/client/imports/forms/input.css b/app/theme/client/imports/forms/input.css
index d530a866b789..0ac7abd71bdf 100644
--- a/app/theme/client/imports/forms/input.css
+++ b/app/theme/client/imports/forms/input.css
@@ -1,4 +1,6 @@
 textarea.rc-input__element {
+	height: auto;
+
 	font-family: inherit;
 	line-height: 0.5rem 1rem;
 }
@@ -52,6 +54,7 @@ textarea.rc-input__element {
 
 	&__element {
 		width: 100%;
+		height: 2.5rem;
 		padding: 0 1rem;
 
 		text-overflow: ellipsis;
@@ -64,11 +67,10 @@ textarea.rc-input__element {
 		background-color: transparent;
 
 		font-size: var(--input-font-size);
-
-		line-height: 2.25rem;
+		line-height: normal;
 
 		&--small {
-			line-height: 1.75rem;
+			height: 2rem;
 		}
 
 		&::placeholder {
diff --git a/app/ui-message/client/messageBox.html b/app/ui-message/client/messageBox.html
index 761c72ca5137..a08b102819e7 100644
--- a/app/ui-message/client/messageBox.html
+++ b/app/ui-message/client/messageBox.html
@@ -26,9 +26,7 @@
 						</span>
 					{{else}}
 						{{#if subscribed}}
-							{{#if isAudioMessageAllowed}}
-								{{> messageBoxAudioMessage rid=_id}}
-							{{/if}}
+							{{> messageBoxAudioMessage rid=_id}}
 							<span class="rc-message-box__action-menu" data-desktop>
 								{{#if actions}}
 									<span class="rc-message-box__icon">
diff --git a/app/ui-message/client/messageBox.js b/app/ui-message/client/messageBox.js
index ebb590cdedd9..a04ff80c3f29 100644
--- a/app/ui-message/client/messageBox.js
+++ b/app/ui-message/client/messageBox.js
@@ -9,7 +9,6 @@ import { Markdown } from '../../markdown';
 import { ChatSubscription } from '../../models';
 import { settings } from '../../settings';
 import {
-	AudioRecorder,
 	ChatMessages,
 	chatMessages,
 	fileUpload,
@@ -146,14 +145,6 @@ Template.messageBox.onCreated(function() {
 	this.isMicrophoneDenied = new ReactiveVar(true);
 	this.sendIconDisabled = new ReactiveVar(false);
 	messageBox.emit('created', this);
-
-	navigator.permissions.query({ name: 'microphone' })
-		.then((permissionStatus) => {
-			this.isMicrophoneDenied.set(permissionStatus.state === 'denied');
-			permissionStatus.onchange = () => {
-				this.isMicrophoneDenied.set(permissionStatus.state === 'denied');
-			};
-		});
 });
 
 Template.messageBox.onRendered(function() {
@@ -241,14 +232,6 @@ Template.messageBox.helpers({
 	isSendIconDisabled() {
 		return !Template.instance().sendIconDisabled.get();
 	},
-	isAudioMessageAllowed() {
-		return AudioRecorder.isSupported() &&
-			!Template.instance().isMicrophoneDenied.get() &&
-			settings.get('FileUpload_Enabled') &&
-			settings.get('Message_AudioRecorderEnabled') &&
-			(!settings.get('FileUpload_MediaTypeWhiteList') ||
-			settings.get('FileUpload_MediaTypeWhiteList').match(/audio\/mp3|audio\/\*/i));
-	},
 	actions() {
 		const actionGroups = messageBox.actions.get();
 		return Object.values(actionGroups)
diff --git a/app/ui-message/client/messageBoxAudioMessage.html b/app/ui-message/client/messageBoxAudioMessage.html
index 601907ce0e35..2fb54e27ac55 100644
--- a/app/ui-message/client/messageBoxAudioMessage.html
+++ b/app/ui-message/client/messageBoxAudioMessage.html
@@ -1,20 +1,22 @@
 <template name="messageBoxAudioMessage" args="rid">
-	<div class="rc-message-box__audio-message {{stateClass}}">
-		<div class="rc-message-box__icon rc-message-box__audio-message-cancel js-audio-message-cancel">
-			{{> icon block="rc-input__icon-svg" icon="circle-cross"}}
+	{{#if isAllowed}}
+		<div class="rc-message-box__audio-message {{stateClass}}">
+			<div class="rc-message-box__icon rc-message-box__audio-message-cancel js-audio-message-cancel">
+				{{> icon block="rc-input__icon-svg" icon="circle-cross"}}
+			</div>
+			<div class="rc-message-box__audio-message-timer">
+				<span class="rc-message-box__audio-message-timer-dot"></span>
+				<span class="rc-message-box__audio-message-timer-text">{{time}}</span>
+			</div>
+			<div class="rc-message-box__icon rc-message-box__audio-message-done js-audio-message-done">
+				{{> icon block="rc-input__icon-svg" icon="checkmark-circled"}}
+			</div>
+			<div class="rc-message-box__icon rc-message-box__audio-message-mic js-audio-message-record">
+				{{> icon block="rc-input__icon-svg" icon="mic"}}
+			</div>
+			<div class="rc-message-box__icon rc-message-box__audio-message-loading js-audio-message-loading">
+				{{> icon block="rc-input__icon-svg" icon="loading"}}
+			</div>
 		</div>
-		<div class="rc-message-box__audio-message-timer">
-			<span class="rc-message-box__audio-message-timer-dot"></span>
-			<span class="rc-message-box__audio-message-timer-text">{{time}}</span>
-		</div>
-		<div class="rc-message-box__icon rc-message-box__audio-message-done js-audio-message-done">
-			{{> icon block="rc-input__icon-svg" icon="checkmark-circled"}}
-		</div>
-		<div class="rc-message-box__icon rc-message-box__audio-message-mic js-audio-message-record">
-			{{> icon block="rc-input__icon-svg" icon="mic"}}
-		</div>
-		<div class="rc-message-box__icon rc-message-box__audio-message-loading js-audio-message-loading">
-			{{> icon block="rc-input__icon-svg" icon="loading"}}
-		</div>
-	</div>
+	{{/if}}
 </template>
diff --git a/app/ui-message/client/messageBoxAudioMessage.js b/app/ui-message/client/messageBoxAudioMessage.js
index e5a071f77096..03aed400ef41 100644
--- a/app/ui-message/client/messageBoxAudioMessage.js
+++ b/app/ui-message/client/messageBoxAudioMessage.js
@@ -3,6 +3,7 @@ import { Session } from 'meteor/session';
 import { Tracker } from 'meteor/tracker';
 import { Template } from 'meteor/templating';
 import { fileUploadHandler } from '../../file-upload';
+import { settings } from '../../settings';
 import { AudioRecorder, chatMessages } from '../../ui';
 import { call } from '../../ui-utils';
 import { t } from '../../utils';
@@ -87,9 +88,31 @@ const recordingRoomId = new ReactiveVar(null);
 Template.messageBoxAudioMessage.onCreated(function() {
 	this.state = new ReactiveVar(null);
 	this.time = new ReactiveVar('00:00');
+	this.isMicrophoneDenied = new ReactiveVar(true);
+
+	if (navigator.permissions) {
+		navigator.permissions.query({ name: 'microphone' })
+			.then((permissionStatus) => {
+				this.isMicrophoneDenied.set(permissionStatus.state === 'denied');
+				permissionStatus.onchange = () => {
+					this.isMicrophoneDenied.set(permissionStatus.state === 'denied');
+				};
+			});
+	} else {
+		this.isMicrophoneDenied.set(false);
+	}
 });
 
 Template.messageBoxAudioMessage.helpers({
+	isAllowed() {
+		return AudioRecorder.isSupported() &&
+			!Template.instance().isMicrophoneDenied.get() &&
+			settings.get('FileUpload_Enabled') &&
+			settings.get('Message_AudioRecorderEnabled') &&
+			(!settings.get('FileUpload_MediaTypeWhiteList') ||
+			settings.get('FileUpload_MediaTypeWhiteList').match(/audio\/mp3|audio\/\*/i));
+	},
+
 	stateClass() {
 		if (recordingRoomId.get() && (recordingRoomId.get() !== Template.currentData().rid)) {
 			return 'rc-message-box__audio-message--busy';
@@ -129,6 +152,7 @@ Template.messageBoxAudioMessage.events({
 			recordingRoomId.set(this.rid);
 		} catch (error) {
 			instance.state.set(null);
+			instance.isMicrophoneDenied.set(true);
 			chatMessages[this.rid].recording = false;
 		}
 	},

From cc58107a987491e87dc0a9b8f9b7fcab4d718f74 Mon Sep 17 00:00:00 2001
From: Diego Sampaio <chinello@gmail.com>
Date: Tue, 26 Mar 2019 14:50:35 -0300
Subject: [PATCH 11/24] Use CircleCI Debian Stretch images (#13906)

---
 .circleci/config.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 72097f6d8d35..2a0ba5e37f40 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -9,8 +9,8 @@ test-install-dependencies: &test-install-dependencies
   command: |
     wget -q -O - https://dl.google.com/linux/linux_signing_key.pub | sudo apt-key add -
     sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 9DA31620334BD75D9DCB49F368818C72E52529D4
-    echo "deb [ arch=amd64 ] http://dl.google.com/linux/chrome/deb/ stable main" | sudo tee /etc/apt/sources.list.d/google.list
-    echo "deb [ arch=amd64 ] http://repo.mongodb.org/apt/ubuntu trusty/mongodb-org/4.0 multiverse" | sudo tee /etc/apt/sources.list.d/mongodb-org-4.0.list
+    echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" | sudo tee /etc/apt/sources.list.d/google.list
+    echo "deb http://repo.mongodb.org/apt/debian stretch/mongodb-org/4.0 main" | sudo tee /etc/apt/sources.list.d/mongodb-org-4.0.list
     sudo apt-get update
     sudo apt-get install -y mongodb-org-shell google-chrome-stable
 
@@ -34,7 +34,7 @@ test-configure-replicaset: &test-configure-replicaset
     mongo --eval 'rs.status()'
 
 test-docker-image: &test-docker-image
-  circleci/node:8.11-browsers
+  circleci/node:8.11-stretch-browsers
 
 test: &test
   <<: *defaults
@@ -74,7 +74,7 @@ jobs:
   build:
     <<: *defaults
     docker:
-      - image: circleci/node:8.11
+      - image: circleci/node:8.11-stretch
 
     steps:
       - checkout
@@ -255,7 +255,7 @@ jobs:
   deploy:
     <<: *defaults
     docker:
-      - image: circleci/node:8.11
+      - image: circleci/node:8.11-stretch
 
     steps:
       - attach_workspace:

From 88c8c8c0b0e57e2d5d66a19d71775bc0b10f424c Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Tue, 26 Mar 2019 14:53:07 -0300
Subject: [PATCH 12/24] Remove some index.js files routing for server/client
 files (#13772)

* Wave 1: Remove some index.js files routing for server/client files

* Wave 2: Remove some index.js files routing for server/client files

* Wave 3: Remove some index.js files routing for server/client files

* Change some missing files

* Remove unused files
---
 app/2fa/index.js                              |   8 -
 app/accounts/index.js                         |   6 +-
 app/analytics/index.js                        |   8 -
 app/api/index.js                              |   6 +-
 app/apps/client/admin/appManage.js            |   2 +-
 app/apps/index.js                             |   8 -
 app/assets/index.js                           |   6 +-
 app/autolinker/index.js                       |   8 -
 app/autotranslate/index.js                    |   8 -
 app/autotranslate/server/autotranslate.js     |   2 +-
 app/bigbluebutton/index.js                    |   6 +-
 app/blockstack/client/{main.js => index.js}   |   0
 app/blockstack/index.js                       |   8 -
 app/blockstack/server/{main.js => index.js}   |   0
 app/bot-helpers/index.js                      |   6 +-
 app/cas/index.js                              |   8 -
 app/channel-settings-mail-messages/index.js   |   8 -
 app/chatpal-search/index.js                   |   8 -
 .../server/provider/provider.js               |   2 +-
 app/cloud/index.js                            |   8 -
 app/colors/index.js                           |   8 -
 app/cors/index.js                             |   8 -
 app/crowd/index.js                            |   8 -
 app/custom-sounds/index.js                    |   8 -
 app/discussion/index.js                       |   8 -
 app/dolphin/index.js                          |   8 -
 app/drupal/index.js                           |   8 -
 app/e2e/client/index.js                       |   1 +
 app/e2e/client/rocketchat.e2e.js              |   2 +-
 app/e2e/index.js                              |   8 -
 app/emoji-custom/index.js                     |   8 -
 app/emoji-emojione/index.js                   |   8 -
 app/error-handler/index.js                    |   6 +-
 app/favico/index.js                           |   6 +-
 app/federation/client/{main.js => index.js}   |   0
 app/federation/index.js                       |   8 -
 app/federation/server/{main.js => index.js}   |   2 +-
 app/federation/server/peerClient.js           |   2 +-
 .../server/peerServer/peerServer.js           |   2 +-
 .../server/peerServer/routes/events.js        |   2 +-
 app/file/index.js                             |   6 +-
 app/github-enterprise/index.js                |   8 -
 app/gitlab/index.js                           |   8 -
 app/google-vision/index.js                    |   8 -
 app/grant-facebook/index.js                   |   6 +-
 app/grant-github/index.js                     |   6 +-
 app/grant-google/index.js                     |   6 +-
 app/grant/index.js                            |   6 +-
 app/graphql/index.js                          |   6 +-
 app/highlight-words/index.js                  |   6 +-
 .../tests/{helper.test.js => helper.tests.js} |   0
 app/iframe-login/index.js                     |   8 -
 app/importer-csv/client/adder.js              |   2 +-
 app/importer-csv/index.js                     |   8 -
 app/importer-csv/lib/info.js                  |   2 +-
 app/importer-csv/server/adder.js              |   2 +-
 app/importer-csv/server/importer.js           |   2 +-
 .../client/adder.js                           |   2 +-
 app/importer-hipchat-enterprise/index.js      |   8 -
 app/importer-hipchat-enterprise/lib/info.js   |   2 +-
 .../server/adder.js                           |   2 +-
 .../server/importer.js                        |   2 +-
 app/importer-hipchat/client/adder.js          |   2 +-
 app/importer-hipchat/index.js                 |   8 -
 app/importer-hipchat/lib/info.js              |   2 +-
 app/importer-hipchat/server/adder.js          |   2 +-
 app/importer-hipchat/server/importer.js       |   2 +-
 app/importer-slack-users/client/adder.js      |   2 +-
 app/importer-slack-users/index.js             |   8 -
 app/importer-slack-users/lib/info.js          |   2 +-
 app/importer-slack-users/server/adder.js      |   2 +-
 app/importer-slack-users/server/importer.js   |   2 +-
 app/importer-slack/client/adder.js            |   2 +-
 app/importer-slack/index.js                   |   8 -
 app/importer-slack/lib/info.js                |   2 +-
 app/importer-slack/server/adder.js            |   2 +-
 app/importer-slack/server/importer.js         |   2 +-
 app/importer/client/admin/adminImport.js      |   2 +-
 .../client/admin/adminImportHistory.js        |   2 +-
 .../client/admin/adminImportPrepare.js        |   2 +-
 .../client/admin/adminImportProgress.js       |   2 +-
 app/importer/index.js                         |   8 -
 .../methods/downloadPublicImportFile.js       |   2 +-
 .../server/methods/getImportFileData.js       |   2 +-
 .../server/methods/getImportProgress.js       |   2 +-
 .../server/methods/getSelectionData.js        |   2 +-
 app/importer/server/methods/prepareImport.js  |   2 +-
 app/importer/server/methods/restartImport.js  |   2 +-
 app/importer/server/methods/setupImporter.js  |   2 +-
 app/importer/server/methods/startImport.js    |   2 +-
 .../server/methods/uploadImportFile.js        |   2 +-
 app/integrations/index.js                     |   8 -
 app/irc/index.js                              |   6 +-
 app/issuelinks/index.js                       |   8 -
 app/katex/index.js                            |   8 -
 app/lazy-load/index.js                        |   6 +-
 app/ldap/index.js                             |   8 -
 app/lib/client/methods/sendMessage.js         |   2 +-
 app/lib/server/functions/createRoom.js        |   2 +-
 app/lib/server/functions/deleteMessage.js     |   2 +-
 app/lib/server/functions/insertMessage.js     |   2 +-
 .../server/functions/notifications/mobile.js  |   2 +-
 app/lib/server/functions/sendMessage.js       |   4 +-
 app/lib/server/functions/updateMessage.js     |   2 +-
 .../server/methods/getRoomMessageMetadata.js  |  25 ---
 app/lib/server/methods/joinRoom.js            |   2 +-
 app/livechat/index.js                         |   8 -
 app/livestream/index.js                       |   8 -
 app/mail-messages/index.js                    |   8 -
 app/mailer/index.js                           |   6 +-
 app/mapview/index.js                          |   8 -
 app/markdown/index.js                         |   8 -
 app/mentions-flextab/index.js                 |   8 -
 app/mentions/index.js                         |   8 -
 app/message-action/index.js                   |   6 +-
 app/message-attachments/index.js              |   6 +-
 app/message-mark-as-unread/index.js           |   8 -
 app/message-pin/index.js                      |   8 -
 .../client/page/snippetPage.js                |   2 +-
 app/message-snippet/index.js                  |   8 -
 app/message-star/index.js                     |   8 -
 app/meteor-accounts-saml/index.js             |   8 -
 app/metrics/index.js                          |   6 +-
 app/migrations/index.js                       |   6 +-
 app/nrr/index.js                              |   6 +-
 app/oauth2-server-config/index.js             |   8 -
 app/oembed/index.js                           |   8 -
 app/otr/client/rocketchat.otr.js              |   2 +-
 app/otr/index.js                              |   8 -
 app/promises/index.js                         |   8 -
 .../client/views/pushNotificationsFlexTab.js  |   2 +-
 app/push-notifications/index.js               |   8 -
 app/reactions/index.js                        |   8 -
 app/retention-policy/index.js                 |   6 +-
 app/search/index.js                           |   8 -
 app/setup-wizard/index.js                     |   8 -
 app/slackbridge/index.js                      |   8 -
 app/slashcommand-asciiarts/index.js           |   8 -
 app/slashcommands-archiveroom/index.js        |   8 -
 app/slashcommands-create/index.js             |   8 -
 app/slashcommands-help/index.js               |   6 +-
 app/slashcommands-hide/index.js               |   8 -
 app/slashcommands-invite/index.js             |   8 -
 app/slashcommands-inviteall/index.js          |   8 -
 app/slashcommands-join/index.js               |   8 -
 app/slashcommands-kick/index.js               |   8 -
 app/slashcommands-leave/index.js              |   6 +-
 app/slashcommands-me/index.js                 |   6 +-
 app/slashcommands-msg/index.js                |   6 +-
 app/slashcommands-mute/index.js               |   6 +-
 app/slashcommands-open/index.js               |   6 +-
 app/slashcommands-topic/index.js              |   8 -
 app/slashcommands-unarchiveroom/index.js      |   8 -
 app/slider/index.js                           |   6 +-
 app/smarsh-connector/index.js                 |   6 +-
 app/sms/index.js                              |   6 +-
 app/spotify/index.js                          |   8 -
 app/statistics/client/index.js                |   1 -
 app/statistics/index.js                       |   9 +-
 app/statistics/server/functions/get.js        |   2 +-
 app/statistics/server/functions/save.js       |   2 +-
 app/statistics/server/index.js                |   2 +-
 .../server/methods/getStatistics.js           |   2 +-
 .../statisticsNamespace.js}                   |   0
 app/theme/index.js                            |   8 -
 app/token-login/index.js                      |   8 -
 app/tokenpass/index.js                        |   8 -
 app/tooltip/index.js                          |   6 +-
 app/ui-account/client/accountPreferences.js   |   2 +-
 app/ui-account/index.js                       |   6 +-
 app/ui-admin/index.js                         |   8 -
 app/ui-cached-collection/index.js             |   6 +-
 app/ui-clean-history/index.js                 |   6 +-
 app/ui-flextab/client/tabs/membersList.js     |   2 +-
 app/ui-flextab/client/tabs/userActions.js     |   2 +-
 app/ui-flextab/index.js                       |   6 +-
 app/ui-login/index.js                         |   6 +-
 app/ui-master/index.js                        |   8 -
 app/ui-message/client/message.js              |   4 +-
 app/ui-message/client/messageBox.js           |   4 +-
 .../client/startup/messageBoxActions.js       |   2 +-
 app/ui-message/index.js                       |   6 +-
 app/ui-sidenav/index.js                       |   6 +-
 app/ui-utils/client/lib/RoomManager.js        |   2 +-
 app/ui-vrecord/index.js                       |   8 -
 app/ui/client/components/header/headerRoom.js |   2 +-
 app/ui/client/lib/chatMessages.js             |   2 +-
 app/ui/client/lib/esc.js                      |  62 -------
 app/ui/client/lib/notification.js             |   4 +-
 app/ui/client/views/app/room.js               |   4 +-
 .../views/app/videoCall/videoButtons.js       |   2 +-
 .../client/views/app/videoCall/videoCall.js   |   2 +-
 app/ui/index.js                               |   6 +-
 app/user-data-download/index.js               |   6 +-
 .../client/{client.js => index.js}            |   0
 app/version-check/index.js                    |   8 -
 .../server/functions/getNewUpdates.js         |   2 +-
 .../server/{server.js => index.js}            |   0
 app/videobridge/index.js                      |   8 -
 app/webdav/index.js                           |   8 -
 app/webrtc/index.js                           |   8 -
 app/wordpress/index.js                        |   8 -
 client/importPackages.js                      | 157 +++++++++---------
 server/importPackages.js                      | 157 +++++++++---------
 server/lib/cordova.js                         |   2 +-
 server/methods/browseChannels.js              |   2 +-
 server/methods/eraseRoom.js                   |   2 +-
 server/startup/cron.js                        |   2 +-
 server/startup/migrations/v007.js             |   2 +-
 209 files changed, 280 insertions(+), 1168 deletions(-)
 delete mode 100644 app/2fa/index.js
 delete mode 100644 app/analytics/index.js
 delete mode 100644 app/apps/index.js
 delete mode 100644 app/autolinker/index.js
 delete mode 100644 app/autotranslate/index.js
 rename app/blockstack/client/{main.js => index.js} (100%)
 delete mode 100644 app/blockstack/index.js
 rename app/blockstack/server/{main.js => index.js} (100%)
 delete mode 100644 app/cas/index.js
 delete mode 100644 app/channel-settings-mail-messages/index.js
 delete mode 100644 app/chatpal-search/index.js
 delete mode 100644 app/cloud/index.js
 delete mode 100644 app/colors/index.js
 delete mode 100644 app/cors/index.js
 delete mode 100644 app/crowd/index.js
 delete mode 100644 app/custom-sounds/index.js
 delete mode 100644 app/discussion/index.js
 delete mode 100644 app/dolphin/index.js
 delete mode 100644 app/drupal/index.js
 create mode 100644 app/e2e/client/index.js
 delete mode 100644 app/e2e/index.js
 delete mode 100644 app/emoji-custom/index.js
 delete mode 100644 app/emoji-emojione/index.js
 rename app/federation/client/{main.js => index.js} (100%)
 delete mode 100644 app/federation/index.js
 rename app/federation/server/{main.js => index.js} (98%)
 delete mode 100644 app/github-enterprise/index.js
 delete mode 100644 app/gitlab/index.js
 delete mode 100644 app/google-vision/index.js
 rename app/highlight-words/tests/{helper.test.js => helper.tests.js} (100%)
 delete mode 100644 app/iframe-login/index.js
 delete mode 100644 app/importer-csv/index.js
 delete mode 100644 app/importer-hipchat-enterprise/index.js
 delete mode 100644 app/importer-hipchat/index.js
 delete mode 100644 app/importer-slack-users/index.js
 delete mode 100644 app/importer-slack/index.js
 delete mode 100644 app/importer/index.js
 delete mode 100644 app/integrations/index.js
 delete mode 100644 app/issuelinks/index.js
 delete mode 100644 app/katex/index.js
 delete mode 100644 app/ldap/index.js
 delete mode 100644 app/lib/server/methods/getRoomMessageMetadata.js
 delete mode 100644 app/livechat/index.js
 delete mode 100644 app/livestream/index.js
 delete mode 100644 app/mail-messages/index.js
 delete mode 100644 app/mapview/index.js
 delete mode 100644 app/markdown/index.js
 delete mode 100644 app/mentions-flextab/index.js
 delete mode 100644 app/mentions/index.js
 delete mode 100644 app/message-mark-as-unread/index.js
 delete mode 100644 app/message-pin/index.js
 delete mode 100644 app/message-snippet/index.js
 delete mode 100644 app/message-star/index.js
 delete mode 100644 app/meteor-accounts-saml/index.js
 delete mode 100644 app/oauth2-server-config/index.js
 delete mode 100644 app/oembed/index.js
 delete mode 100644 app/otr/index.js
 delete mode 100644 app/promises/index.js
 delete mode 100644 app/push-notifications/index.js
 delete mode 100644 app/reactions/index.js
 delete mode 100644 app/search/index.js
 delete mode 100644 app/setup-wizard/index.js
 delete mode 100644 app/slackbridge/index.js
 delete mode 100644 app/slashcommand-asciiarts/index.js
 delete mode 100644 app/slashcommands-archiveroom/index.js
 delete mode 100644 app/slashcommands-create/index.js
 delete mode 100644 app/slashcommands-hide/index.js
 delete mode 100644 app/slashcommands-invite/index.js
 delete mode 100644 app/slashcommands-inviteall/index.js
 delete mode 100644 app/slashcommands-join/index.js
 delete mode 100644 app/slashcommands-kick/index.js
 delete mode 100644 app/slashcommands-topic/index.js
 delete mode 100644 app/slashcommands-unarchiveroom/index.js
 delete mode 100644 app/spotify/index.js
 delete mode 100644 app/statistics/client/index.js
 rename app/statistics/{lib/rocketchat.js => server/statisticsNamespace.js} (100%)
 delete mode 100644 app/theme/index.js
 delete mode 100644 app/token-login/index.js
 delete mode 100644 app/tokenpass/index.js
 delete mode 100644 app/ui-admin/index.js
 delete mode 100644 app/ui-master/index.js
 delete mode 100644 app/ui-vrecord/index.js
 delete mode 100644 app/ui/client/lib/esc.js
 rename app/version-check/client/{client.js => index.js} (100%)
 delete mode 100644 app/version-check/index.js
 rename app/version-check/server/{server.js => index.js} (100%)
 delete mode 100644 app/videobridge/index.js
 delete mode 100644 app/webdav/index.js
 delete mode 100644 app/webrtc/index.js
 delete mode 100644 app/wordpress/index.js

diff --git a/app/2fa/index.js b/app/2fa/index.js
deleted file mode 100644
index a67eca871efb..000000000000
--- a/app/2fa/index.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isClient) {
-	module.exports = require('./client/index.js');
-}
-if (Meteor.isServer) {
-	module.exports = require('./server/index.js');
-}
diff --git a/app/accounts/index.js b/app/accounts/index.js
index 27b799c4d7d7..ca39cd0df4b1 100644
--- a/app/accounts/index.js
+++ b/app/accounts/index.js
@@ -1,5 +1 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isServer) {
-	module.exports = require('./server/index.js');
-}
+export * from './server/index';
diff --git a/app/analytics/index.js b/app/analytics/index.js
deleted file mode 100644
index a67eca871efb..000000000000
--- a/app/analytics/index.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isClient) {
-	module.exports = require('./client/index.js');
-}
-if (Meteor.isServer) {
-	module.exports = require('./server/index.js');
-}
diff --git a/app/api/index.js b/app/api/index.js
index 27b799c4d7d7..ca39cd0df4b1 100644
--- a/app/api/index.js
+++ b/app/api/index.js
@@ -1,5 +1 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isServer) {
-	module.exports = require('./server/index.js');
-}
+export * from './server/index';
diff --git a/app/apps/client/admin/appManage.js b/app/apps/client/admin/appManage.js
index e0493ebbb52c..0b48c9484914 100644
--- a/app/apps/client/admin/appManage.js
+++ b/app/apps/client/admin/appManage.js
@@ -6,7 +6,7 @@ import { TAPi18n } from 'meteor/tap:i18n';
 import { TAPi18next } from 'meteor/tap:i18n';
 import { isEmail, Info, APIClient } from '../../../utils';
 import { settings } from '../../../settings';
-import { Markdown } from '../../../markdown';
+import { Markdown } from '../../../markdown/client';
 import _ from 'underscore';
 import s from 'underscore.string';
 import toastr from 'toastr';
diff --git a/app/apps/index.js b/app/apps/index.js
deleted file mode 100644
index a67eca871efb..000000000000
--- a/app/apps/index.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isClient) {
-	module.exports = require('./client/index.js');
-}
-if (Meteor.isServer) {
-	module.exports = require('./server/index.js');
-}
diff --git a/app/assets/index.js b/app/assets/index.js
index 27b799c4d7d7..ca39cd0df4b1 100644
--- a/app/assets/index.js
+++ b/app/assets/index.js
@@ -1,5 +1 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isServer) {
-	module.exports = require('./server/index.js');
-}
+export * from './server/index';
diff --git a/app/autolinker/index.js b/app/autolinker/index.js
deleted file mode 100644
index a67eca871efb..000000000000
--- a/app/autolinker/index.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isClient) {
-	module.exports = require('./client/index.js');
-}
-if (Meteor.isServer) {
-	module.exports = require('./server/index.js');
-}
diff --git a/app/autotranslate/index.js b/app/autotranslate/index.js
deleted file mode 100644
index a67eca871efb..000000000000
--- a/app/autotranslate/index.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isClient) {
-	module.exports = require('./client/index.js');
-}
-if (Meteor.isServer) {
-	module.exports = require('./server/index.js');
-}
diff --git a/app/autotranslate/server/autotranslate.js b/app/autotranslate/server/autotranslate.js
index 546e70e2f748..d362c5656d2e 100644
--- a/app/autotranslate/server/autotranslate.js
+++ b/app/autotranslate/server/autotranslate.js
@@ -3,7 +3,7 @@ import { HTTP } from 'meteor/http';
 import { settings } from '../../settings';
 import { callbacks } from '../../callbacks';
 import { Subscriptions, Messages } from '../../models';
-import { Markdown } from '../../markdown';
+import { Markdown } from '../../markdown/server';
 import _ from 'underscore';
 import s from 'underscore.string';
 
diff --git a/app/bigbluebutton/index.js b/app/bigbluebutton/index.js
index b690772c77a7..a09f5ed378d9 100644
--- a/app/bigbluebutton/index.js
+++ b/app/bigbluebutton/index.js
@@ -1,5 +1 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isServer) {
-	module.exports = require('./server/bigbluebutton-api.js');
-}
+export * from './server/bigbluebutton-api';
diff --git a/app/blockstack/client/main.js b/app/blockstack/client/index.js
similarity index 100%
rename from app/blockstack/client/main.js
rename to app/blockstack/client/index.js
diff --git a/app/blockstack/index.js b/app/blockstack/index.js
deleted file mode 100644
index d55377e8a3b8..000000000000
--- a/app/blockstack/index.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isServer) {
-	module.exports = require('./server/main.js');
-}
-if (Meteor.isClient) {
-	module.exports = require('./client/main.js');
-}
diff --git a/app/blockstack/server/main.js b/app/blockstack/server/index.js
similarity index 100%
rename from app/blockstack/server/main.js
rename to app/blockstack/server/index.js
diff --git a/app/bot-helpers/index.js b/app/bot-helpers/index.js
index 27b799c4d7d7..ca39cd0df4b1 100644
--- a/app/bot-helpers/index.js
+++ b/app/bot-helpers/index.js
@@ -1,5 +1 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isServer) {
-	module.exports = require('./server/index.js');
-}
+export * from './server/index';
diff --git a/app/cas/index.js b/app/cas/index.js
deleted file mode 100644
index a67eca871efb..000000000000
--- a/app/cas/index.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isClient) {
-	module.exports = require('./client/index.js');
-}
-if (Meteor.isServer) {
-	module.exports = require('./server/index.js');
-}
diff --git a/app/channel-settings-mail-messages/index.js b/app/channel-settings-mail-messages/index.js
deleted file mode 100644
index a67eca871efb..000000000000
--- a/app/channel-settings-mail-messages/index.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isClient) {
-	module.exports = require('./client/index.js');
-}
-if (Meteor.isServer) {
-	module.exports = require('./server/index.js');
-}
diff --git a/app/chatpal-search/index.js b/app/chatpal-search/index.js
deleted file mode 100644
index a67eca871efb..000000000000
--- a/app/chatpal-search/index.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isClient) {
-	module.exports = require('./client/index.js');
-}
-if (Meteor.isServer) {
-	module.exports = require('./server/index.js');
-}
diff --git a/app/chatpal-search/server/provider/provider.js b/app/chatpal-search/server/provider/provider.js
index 99561f5dfb4d..dbf21ddff8d2 100644
--- a/app/chatpal-search/server/provider/provider.js
+++ b/app/chatpal-search/server/provider/provider.js
@@ -1,5 +1,5 @@
 import { Meteor } from 'meteor/meteor';
-import { searchProviderService, SearchProvider } from '../../../search';
+import { searchProviderService, SearchProvider } from '../../../search/server';
 import Index from './index';
 import ChatpalLogger from '../utils/logger';
 import { Subscriptions } from '../../../models';
diff --git a/app/cloud/index.js b/app/cloud/index.js
deleted file mode 100644
index a67eca871efb..000000000000
--- a/app/cloud/index.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isClient) {
-	module.exports = require('./client/index.js');
-}
-if (Meteor.isServer) {
-	module.exports = require('./server/index.js');
-}
diff --git a/app/colors/index.js b/app/colors/index.js
deleted file mode 100644
index a67eca871efb..000000000000
--- a/app/colors/index.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isClient) {
-	module.exports = require('./client/index.js');
-}
-if (Meteor.isServer) {
-	module.exports = require('./server/index.js');
-}
diff --git a/app/cors/index.js b/app/cors/index.js
deleted file mode 100644
index a67eca871efb..000000000000
--- a/app/cors/index.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isClient) {
-	module.exports = require('./client/index.js');
-}
-if (Meteor.isServer) {
-	module.exports = require('./server/index.js');
-}
diff --git a/app/crowd/index.js b/app/crowd/index.js
deleted file mode 100644
index a67eca871efb..000000000000
--- a/app/crowd/index.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isClient) {
-	module.exports = require('./client/index.js');
-}
-if (Meteor.isServer) {
-	module.exports = require('./server/index.js');
-}
diff --git a/app/custom-sounds/index.js b/app/custom-sounds/index.js
deleted file mode 100644
index a67eca871efb..000000000000
--- a/app/custom-sounds/index.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isClient) {
-	module.exports = require('./client/index.js');
-}
-if (Meteor.isServer) {
-	module.exports = require('./server/index.js');
-}
diff --git a/app/discussion/index.js b/app/discussion/index.js
deleted file mode 100644
index a67eca871efb..000000000000
--- a/app/discussion/index.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isClient) {
-	module.exports = require('./client/index.js');
-}
-if (Meteor.isServer) {
-	module.exports = require('./server/index.js');
-}
diff --git a/app/dolphin/index.js b/app/dolphin/index.js
deleted file mode 100644
index a67eca871efb..000000000000
--- a/app/dolphin/index.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isClient) {
-	module.exports = require('./client/index.js');
-}
-if (Meteor.isServer) {
-	module.exports = require('./server/index.js');
-}
diff --git a/app/drupal/index.js b/app/drupal/index.js
deleted file mode 100644
index a67eca871efb..000000000000
--- a/app/drupal/index.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isClient) {
-	module.exports = require('./client/index.js');
-}
-if (Meteor.isServer) {
-	module.exports = require('./server/index.js');
-}
diff --git a/app/e2e/client/index.js b/app/e2e/client/index.js
new file mode 100644
index 000000000000..f4e81a3237eb
--- /dev/null
+++ b/app/e2e/client/index.js
@@ -0,0 +1 @@
+export * from './rocketchat.e2e';
diff --git a/app/e2e/client/rocketchat.e2e.js b/app/e2e/client/rocketchat.e2e.js
index a7b3733bc4fc..aff7e9820cda 100644
--- a/app/e2e/client/rocketchat.e2e.js
+++ b/app/e2e/client/rocketchat.e2e.js
@@ -5,7 +5,7 @@ import { Tracker } from 'meteor/tracker';
 import { EJSON } from 'meteor/ejson';
 import { FlowRouter } from 'meteor/kadira:flow-router';
 import { Rooms, Subscriptions, Messages } from '../../models';
-import { promises } from '../../promises';
+import { promises } from '../../promises/client';
 import { settings } from '../../settings';
 import { Notifications } from '../../notifications';
 import { Layout, call, modal, alerts } from '../../ui-utils';
diff --git a/app/e2e/index.js b/app/e2e/index.js
deleted file mode 100644
index b6564b03ca00..000000000000
--- a/app/e2e/index.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isClient) {
-	module.exports = require('./client/rocketchat.e2e.js');
-}
-if (Meteor.isServer) {
-	module.exports = require('./server/index.js');
-}
diff --git a/app/emoji-custom/index.js b/app/emoji-custom/index.js
deleted file mode 100644
index a67eca871efb..000000000000
--- a/app/emoji-custom/index.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isClient) {
-	module.exports = require('./client/index.js');
-}
-if (Meteor.isServer) {
-	module.exports = require('./server/index.js');
-}
diff --git a/app/emoji-emojione/index.js b/app/emoji-emojione/index.js
deleted file mode 100644
index a67eca871efb..000000000000
--- a/app/emoji-emojione/index.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isClient) {
-	module.exports = require('./client/index.js');
-}
-if (Meteor.isServer) {
-	module.exports = require('./server/index.js');
-}
diff --git a/app/error-handler/index.js b/app/error-handler/index.js
index 27b799c4d7d7..ca39cd0df4b1 100644
--- a/app/error-handler/index.js
+++ b/app/error-handler/index.js
@@ -1,5 +1 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isServer) {
-	module.exports = require('./server/index.js');
-}
+export * from './server/index';
diff --git a/app/favico/index.js b/app/favico/index.js
index 1ade4a8691e5..40a7340d3887 100644
--- a/app/favico/index.js
+++ b/app/favico/index.js
@@ -1,5 +1 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isClient) {
-	module.exports = require('./client/index.js');
-}
+export * from './client/index';
diff --git a/app/federation/client/main.js b/app/federation/client/index.js
similarity index 100%
rename from app/federation/client/main.js
rename to app/federation/client/index.js
diff --git a/app/federation/index.js b/app/federation/index.js
deleted file mode 100644
index ec42ee22c45a..000000000000
--- a/app/federation/index.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isClient) {
-	module.exports = require('./client/main.js');
-}
-if (Meteor.isServer) {
-	module.exports = require('./server/main.js');
-}
diff --git a/app/federation/server/main.js b/app/federation/server/index.js
similarity index 98%
rename from app/federation/server/main.js
rename to app/federation/server/index.js
index 10027e636743..165b56d6b5e4 100644
--- a/app/federation/server/main.js
+++ b/app/federation/server/index.js
@@ -2,7 +2,7 @@ import { Meteor } from 'meteor/meteor';
 import { _ } from 'meteor/underscore';
 import { settings } from '../../settings';
 import { FederationKeys } from '../../models';
-import { getWorkspaceAccessToken } from '../../cloud';
+import { getWorkspaceAccessToken } from '../../cloud/server';
 
 import './federation-settings';
 import './methods';
diff --git a/app/federation/server/peerClient.js b/app/federation/server/peerClient.js
index 53b2f627190d..04815509aa36 100644
--- a/app/federation/server/peerClient.js
+++ b/app/federation/server/peerClient.js
@@ -4,7 +4,7 @@ import { callbacks } from '../../callbacks';
 import { settings } from '../../settings';
 import { FederationEvents, FederationKeys, Messages, Rooms, Subscriptions, Users } from '../../models';
 
-import { Federation } from './main';
+import { Federation } from '.';
 import peerDNS from './peerDNS';
 import peerHTTP from './peerHTTP';
 import { updateStatus } from './settingsUpdater';
diff --git a/app/federation/server/peerServer/peerServer.js b/app/federation/server/peerServer/peerServer.js
index 6cc44ac25a0c..643017b1e17c 100644
--- a/app/federation/server/peerServer/peerServer.js
+++ b/app/federation/server/peerServer/peerServer.js
@@ -1,5 +1,5 @@
 import { callbacks } from '../../../callbacks';
-import { setReaction } from '../../../reactions';
+import { setReaction } from '../../../reactions/server';
 import { addUserToRoom, removeUserFromRoom, deleteMessage } from '../../../lib';
 import { Rooms, Subscriptions } from '../../../models';
 
diff --git a/app/federation/server/peerServer/routes/events.js b/app/federation/server/peerServer/routes/events.js
index eeb2176032f9..1a75fda1d9a0 100644
--- a/app/federation/server/peerServer/routes/events.js
+++ b/app/federation/server/peerServer/routes/events.js
@@ -1,7 +1,7 @@
 import { API } from '../../../../api';
 import { FederationKeys } from '../../../../models';
 
-import { Federation } from '../../main';
+import { Federation } from '../..';
 
 import peerDNS from '../../peerDNS';
 import peerServer from '../peerServer';
diff --git a/app/file/index.js b/app/file/index.js
index 27b799c4d7d7..ca39cd0df4b1 100644
--- a/app/file/index.js
+++ b/app/file/index.js
@@ -1,5 +1 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isServer) {
-	module.exports = require('./server/index.js');
-}
+export * from './server/index';
diff --git a/app/github-enterprise/index.js b/app/github-enterprise/index.js
deleted file mode 100644
index a67eca871efb..000000000000
--- a/app/github-enterprise/index.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isClient) {
-	module.exports = require('./client/index.js');
-}
-if (Meteor.isServer) {
-	module.exports = require('./server/index.js');
-}
diff --git a/app/gitlab/index.js b/app/gitlab/index.js
deleted file mode 100644
index a67eca871efb..000000000000
--- a/app/gitlab/index.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isClient) {
-	module.exports = require('./client/index.js');
-}
-if (Meteor.isServer) {
-	module.exports = require('./server/index.js');
-}
diff --git a/app/google-vision/index.js b/app/google-vision/index.js
deleted file mode 100644
index a67eca871efb..000000000000
--- a/app/google-vision/index.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isClient) {
-	module.exports = require('./client/index.js');
-}
-if (Meteor.isServer) {
-	module.exports = require('./server/index.js');
-}
diff --git a/app/grant-facebook/index.js b/app/grant-facebook/index.js
index 27b799c4d7d7..ca39cd0df4b1 100644
--- a/app/grant-facebook/index.js
+++ b/app/grant-facebook/index.js
@@ -1,5 +1 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isServer) {
-	module.exports = require('./server/index.js');
-}
+export * from './server/index';
diff --git a/app/grant-github/index.js b/app/grant-github/index.js
index 27b799c4d7d7..ca39cd0df4b1 100644
--- a/app/grant-github/index.js
+++ b/app/grant-github/index.js
@@ -1,5 +1 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isServer) {
-	module.exports = require('./server/index.js');
-}
+export * from './server/index';
diff --git a/app/grant-google/index.js b/app/grant-google/index.js
index 27b799c4d7d7..ca39cd0df4b1 100644
--- a/app/grant-google/index.js
+++ b/app/grant-google/index.js
@@ -1,5 +1 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isServer) {
-	module.exports = require('./server/index.js');
-}
+export * from './server/index';
diff --git a/app/grant/index.js b/app/grant/index.js
index 27b799c4d7d7..ca39cd0df4b1 100644
--- a/app/grant/index.js
+++ b/app/grant/index.js
@@ -1,5 +1 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isServer) {
-	module.exports = require('./server/index.js');
-}
+export * from './server/index';
diff --git a/app/graphql/index.js b/app/graphql/index.js
index 27b799c4d7d7..ca39cd0df4b1 100644
--- a/app/graphql/index.js
+++ b/app/graphql/index.js
@@ -1,5 +1 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isServer) {
-	module.exports = require('./server/index.js');
-}
+export * from './server/index';
diff --git a/app/highlight-words/index.js b/app/highlight-words/index.js
index 1ade4a8691e5..40a7340d3887 100644
--- a/app/highlight-words/index.js
+++ b/app/highlight-words/index.js
@@ -1,5 +1 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isClient) {
-	module.exports = require('./client/index.js');
-}
+export * from './client/index';
diff --git a/app/highlight-words/tests/helper.test.js b/app/highlight-words/tests/helper.tests.js
similarity index 100%
rename from app/highlight-words/tests/helper.test.js
rename to app/highlight-words/tests/helper.tests.js
diff --git a/app/iframe-login/index.js b/app/iframe-login/index.js
deleted file mode 100644
index a67eca871efb..000000000000
--- a/app/iframe-login/index.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isClient) {
-	module.exports = require('./client/index.js');
-}
-if (Meteor.isServer) {
-	module.exports = require('./server/index.js');
-}
diff --git a/app/importer-csv/client/adder.js b/app/importer-csv/client/adder.js
index fc76e8ee2f07..929a84640be9 100644
--- a/app/importer-csv/client/adder.js
+++ b/app/importer-csv/client/adder.js
@@ -1,4 +1,4 @@
-import { Importers } from '../../importer';
+import { Importers } from '../../importer/client';
 import { CsvImporterInfo } from '../lib/info';
 
 Importers.add(new CsvImporterInfo());
diff --git a/app/importer-csv/index.js b/app/importer-csv/index.js
deleted file mode 100644
index a67eca871efb..000000000000
--- a/app/importer-csv/index.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isClient) {
-	module.exports = require('./client/index.js');
-}
-if (Meteor.isServer) {
-	module.exports = require('./server/index.js');
-}
diff --git a/app/importer-csv/lib/info.js b/app/importer-csv/lib/info.js
index 4b2db47aa717..8f75d6543257 100644
--- a/app/importer-csv/lib/info.js
+++ b/app/importer-csv/lib/info.js
@@ -1,4 +1,4 @@
-import { ImporterInfo } from '../../importer';
+import { ImporterInfo } from '../../importer/lib/ImporterInfo';
 
 export class CsvImporterInfo extends ImporterInfo {
 	constructor() {
diff --git a/app/importer-csv/server/adder.js b/app/importer-csv/server/adder.js
index b7254ecec1a1..8ab31878fb7b 100644
--- a/app/importer-csv/server/adder.js
+++ b/app/importer-csv/server/adder.js
@@ -1,4 +1,4 @@
-import { Importers } from '../../importer';
+import { Importers } from '../../importer/server';
 import { CsvImporterInfo } from '../lib/info';
 import { CsvImporter } from './importer';
 
diff --git a/app/importer-csv/server/importer.js b/app/importer-csv/server/importer.js
index 5ce60b612466..639fd5250c39 100644
--- a/app/importer-csv/server/importer.js
+++ b/app/importer-csv/server/importer.js
@@ -6,7 +6,7 @@ import {
 	Selection,
 	SelectionChannel,
 	SelectionUser,
-} from '../../importer';
+} from '../../importer/server';
 import { RocketChatFile } from '../../file';
 import { Users, Rooms } from '../../models';
 import { sendMessage } from '../../lib';
diff --git a/app/importer-hipchat-enterprise/client/adder.js b/app/importer-hipchat-enterprise/client/adder.js
index 75dc9be3f8e7..2c03c872c7eb 100644
--- a/app/importer-hipchat-enterprise/client/adder.js
+++ b/app/importer-hipchat-enterprise/client/adder.js
@@ -1,4 +1,4 @@
-import { Importers } from '../../importer';
+import { Importers } from '../../importer/client';
 import { HipChatEnterpriseImporterInfo } from '../lib/info';
 
 Importers.add(new HipChatEnterpriseImporterInfo());
diff --git a/app/importer-hipchat-enterprise/index.js b/app/importer-hipchat-enterprise/index.js
deleted file mode 100644
index a67eca871efb..000000000000
--- a/app/importer-hipchat-enterprise/index.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isClient) {
-	module.exports = require('./client/index.js');
-}
-if (Meteor.isServer) {
-	module.exports = require('./server/index.js');
-}
diff --git a/app/importer-hipchat-enterprise/lib/info.js b/app/importer-hipchat-enterprise/lib/info.js
index 48eb48b55606..71c1f17a72d7 100644
--- a/app/importer-hipchat-enterprise/lib/info.js
+++ b/app/importer-hipchat-enterprise/lib/info.js
@@ -1,4 +1,4 @@
-import { ImporterInfo } from '../../importer';
+import { ImporterInfo } from '../../importer/lib/ImporterInfo';
 
 export class HipChatEnterpriseImporterInfo extends ImporterInfo {
 	constructor() {
diff --git a/app/importer-hipchat-enterprise/server/adder.js b/app/importer-hipchat-enterprise/server/adder.js
index dae738974b6d..097a5071306d 100644
--- a/app/importer-hipchat-enterprise/server/adder.js
+++ b/app/importer-hipchat-enterprise/server/adder.js
@@ -1,4 +1,4 @@
-import { Importers } from '../../importer';
+import { Importers } from '../../importer/server';
 import { HipChatEnterpriseImporterInfo } from '../lib/info';
 import { HipChatEnterpriseImporter } from './importer';
 
diff --git a/app/importer-hipchat-enterprise/server/importer.js b/app/importer-hipchat-enterprise/server/importer.js
index eeaf94163367..fa80b15d2203 100644
--- a/app/importer-hipchat-enterprise/server/importer.js
+++ b/app/importer-hipchat-enterprise/server/importer.js
@@ -9,7 +9,7 @@ import {
 	SelectionChannel,
 	SelectionUser,
 	Imports,
-} from '../../importer';
+} from '../../importer/server';
 import { Messages, Users, Subscriptions, Rooms } from '../../models';
 import { insertMessage } from '../../lib';
 import { Readable } from 'stream';
diff --git a/app/importer-hipchat/client/adder.js b/app/importer-hipchat/client/adder.js
index e50e073e6879..813169cc932e 100644
--- a/app/importer-hipchat/client/adder.js
+++ b/app/importer-hipchat/client/adder.js
@@ -1,4 +1,4 @@
-import { Importers } from '../../importer';
+import { Importers } from '../../importer/client';
 import { HipChatImporterInfo } from '../lib/info';
 
 Importers.add(new HipChatImporterInfo());
diff --git a/app/importer-hipchat/index.js b/app/importer-hipchat/index.js
deleted file mode 100644
index a67eca871efb..000000000000
--- a/app/importer-hipchat/index.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isClient) {
-	module.exports = require('./client/index.js');
-}
-if (Meteor.isServer) {
-	module.exports = require('./server/index.js');
-}
diff --git a/app/importer-hipchat/lib/info.js b/app/importer-hipchat/lib/info.js
index 78982fc0b345..befd126868dc 100644
--- a/app/importer-hipchat/lib/info.js
+++ b/app/importer-hipchat/lib/info.js
@@ -1,4 +1,4 @@
-import { ImporterInfo } from '../../importer';
+import { ImporterInfo } from '../../importer/lib/ImporterInfo';
 
 export class HipChatImporterInfo extends ImporterInfo {
 	constructor() {
diff --git a/app/importer-hipchat/server/adder.js b/app/importer-hipchat/server/adder.js
index 4b9457fa18b9..3a5d8b473625 100644
--- a/app/importer-hipchat/server/adder.js
+++ b/app/importer-hipchat/server/adder.js
@@ -1,4 +1,4 @@
-import { Importers } from '../../importer';
+import { Importers } from '../../importer/server';
 import { HipChatImporterInfo } from '../lib/info';
 import { HipChatImporter } from './importer';
 
diff --git a/app/importer-hipchat/server/importer.js b/app/importer-hipchat/server/importer.js
index f4c260b38488..b3a8968be217 100644
--- a/app/importer-hipchat/server/importer.js
+++ b/app/importer-hipchat/server/importer.js
@@ -7,7 +7,7 @@ import {
 	Selection,
 	SelectionChannel,
 	SelectionUser,
-} from '../../importer';
+} from '../../importer/server';
 import { RocketChatFile } from '../../file';
 import { Users, Rooms } from '../../models';
 import { sendMessage } from '../../lib';
diff --git a/app/importer-slack-users/client/adder.js b/app/importer-slack-users/client/adder.js
index bac9b8d9628a..8c6b0276bfdd 100644
--- a/app/importer-slack-users/client/adder.js
+++ b/app/importer-slack-users/client/adder.js
@@ -1,4 +1,4 @@
-import { Importers } from '../../importer';
+import { Importers } from '../../importer/client';
 import { SlackUsersImporterInfo } from '../lib/info';
 
 Importers.add(new SlackUsersImporterInfo());
diff --git a/app/importer-slack-users/index.js b/app/importer-slack-users/index.js
deleted file mode 100644
index a67eca871efb..000000000000
--- a/app/importer-slack-users/index.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isClient) {
-	module.exports = require('./client/index.js');
-}
-if (Meteor.isServer) {
-	module.exports = require('./server/index.js');
-}
diff --git a/app/importer-slack-users/lib/info.js b/app/importer-slack-users/lib/info.js
index d10067bc8475..61ea2f625373 100644
--- a/app/importer-slack-users/lib/info.js
+++ b/app/importer-slack-users/lib/info.js
@@ -1,4 +1,4 @@
-import { ImporterInfo } from '../../importer';
+import { ImporterInfo } from '../../importer/lib/ImporterInfo';
 
 export class SlackUsersImporterInfo extends ImporterInfo {
 	constructor() {
diff --git a/app/importer-slack-users/server/adder.js b/app/importer-slack-users/server/adder.js
index 8381fd8c675d..6d23f6939b13 100644
--- a/app/importer-slack-users/server/adder.js
+++ b/app/importer-slack-users/server/adder.js
@@ -1,4 +1,4 @@
-import { Importers } from '../../importer';
+import { Importers } from '../../importer/server';
 import { SlackUsersImporterInfo } from '../lib/info';
 import { SlackUsersImporter } from './importer';
 
diff --git a/app/importer-slack-users/server/importer.js b/app/importer-slack-users/server/importer.js
index bb58d4cf56a9..301919a6e78f 100644
--- a/app/importer-slack-users/server/importer.js
+++ b/app/importer-slack-users/server/importer.js
@@ -6,7 +6,7 @@ import {
 	ProgressStep,
 	Selection,
 	SelectionUser,
-} from '../../importer';
+} from '../../importer/server';
 import { RocketChatFile } from '../../file';
 import { Users } from '../../models';
 
diff --git a/app/importer-slack/client/adder.js b/app/importer-slack/client/adder.js
index 12d6c3314dbf..06e1941f38df 100644
--- a/app/importer-slack/client/adder.js
+++ b/app/importer-slack/client/adder.js
@@ -1,4 +1,4 @@
-import { Importers } from '../../importer';
+import { Importers } from '../../importer/client';
 import { SlackImporterInfo } from '../lib/info';
 
 Importers.add(new SlackImporterInfo());
diff --git a/app/importer-slack/index.js b/app/importer-slack/index.js
deleted file mode 100644
index a67eca871efb..000000000000
--- a/app/importer-slack/index.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isClient) {
-	module.exports = require('./client/index.js');
-}
-if (Meteor.isServer) {
-	module.exports = require('./server/index.js');
-}
diff --git a/app/importer-slack/lib/info.js b/app/importer-slack/lib/info.js
index 9d22d96cdaa4..bf431e8f7c58 100644
--- a/app/importer-slack/lib/info.js
+++ b/app/importer-slack/lib/info.js
@@ -1,4 +1,4 @@
-import { ImporterInfo } from '../../importer';
+import { ImporterInfo } from '../../importer/lib/ImporterInfo';
 
 export class SlackImporterInfo extends ImporterInfo {
 	constructor() {
diff --git a/app/importer-slack/server/adder.js b/app/importer-slack/server/adder.js
index d01df0c06fe0..6442d31dfa42 100644
--- a/app/importer-slack/server/adder.js
+++ b/app/importer-slack/server/adder.js
@@ -1,4 +1,4 @@
-import { Importers } from '../../importer';
+import { Importers } from '../../importer/server';
 import { SlackImporterInfo } from '../lib/info';
 import { SlackImporter } from './importer';
 
diff --git a/app/importer-slack/server/importer.js b/app/importer-slack/server/importer.js
index f09a32f4dde5..190dd3089643 100644
--- a/app/importer-slack/server/importer.js
+++ b/app/importer-slack/server/importer.js
@@ -6,7 +6,7 @@ import {
 	Selection,
 	SelectionChannel,
 	SelectionUser,
-} from '../../importer';
+} from '../../importer/server';
 import { RocketChatFile } from '../../file';
 import { getAvatarUrlFromUsername } from '../../utils';
 import { Users, Rooms, Messages } from '../../models';
diff --git a/app/importer/client/admin/adminImport.js b/app/importer/client/admin/adminImport.js
index e7bdca405303..004c8e3c36d8 100644
--- a/app/importer/client/admin/adminImport.js
+++ b/app/importer/client/admin/adminImport.js
@@ -1,5 +1,5 @@
 import { Meteor } from 'meteor/meteor';
-import { Importers } from '../..';
+import { Importers } from '..';
 import { FlowRouter } from 'meteor/kadira:flow-router';
 import { Template } from 'meteor/templating';
 import { TAPi18n } from 'meteor/tap:i18n';
diff --git a/app/importer/client/admin/adminImportHistory.js b/app/importer/client/admin/adminImportHistory.js
index dc6d30ee3089..4b10e0a72253 100644
--- a/app/importer/client/admin/adminImportHistory.js
+++ b/app/importer/client/admin/adminImportHistory.js
@@ -1,5 +1,5 @@
 import { Meteor } from 'meteor/meteor';
-import { Importers } from '../..';
+import { Importers } from '..';
 import { Template } from 'meteor/templating';
 import { hasRole } from '../../../authorization';
 import { t, APIClient } from '../../../utils';
diff --git a/app/importer/client/admin/adminImportPrepare.js b/app/importer/client/admin/adminImportPrepare.js
index ebe6be7e1f85..da8a192ded02 100644
--- a/app/importer/client/admin/adminImportPrepare.js
+++ b/app/importer/client/admin/adminImportPrepare.js
@@ -1,6 +1,6 @@
 import { Meteor } from 'meteor/meteor';
 import { ReactiveVar } from 'meteor/reactive-var';
-import { Importers } from '../..';
+import { Importers } from '..';
 import { FlowRouter } from 'meteor/kadira:flow-router';
 import { Template } from 'meteor/templating';
 import { TAPi18n } from 'meteor/tap:i18n';
diff --git a/app/importer/client/admin/adminImportProgress.js b/app/importer/client/admin/adminImportProgress.js
index 6dbf8068ca41..d1d1d79e40d8 100644
--- a/app/importer/client/admin/adminImportProgress.js
+++ b/app/importer/client/admin/adminImportProgress.js
@@ -1,6 +1,6 @@
 import { Meteor } from 'meteor/meteor';
 import { ReactiveVar } from 'meteor/reactive-var';
-import { Importers, ImporterWebsocketReceiver, ProgressStep } from '../..';
+import { Importers, ImporterWebsocketReceiver, ProgressStep } from '..';
 import { FlowRouter } from 'meteor/kadira:flow-router';
 import { Template } from 'meteor/templating';
 import { t, handleError } from '../../../utils';
diff --git a/app/importer/index.js b/app/importer/index.js
deleted file mode 100644
index a67eca871efb..000000000000
--- a/app/importer/index.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isClient) {
-	module.exports = require('./client/index.js');
-}
-if (Meteor.isServer) {
-	module.exports = require('./server/index.js');
-}
diff --git a/app/importer/server/methods/downloadPublicImportFile.js b/app/importer/server/methods/downloadPublicImportFile.js
index 97717167053b..2b1c0defdd6d 100644
--- a/app/importer/server/methods/downloadPublicImportFile.js
+++ b/app/importer/server/methods/downloadPublicImportFile.js
@@ -1,5 +1,5 @@
 import { Meteor } from 'meteor/meteor';
-import { Importers } from '../..';
+import { Importers } from '..';
 import { RocketChatImportFileInstance } from '../startup/store';
 import { ProgressStep } from '../../lib/ImporterProgressStep';
 import { hasRole } from '../../../authorization';
diff --git a/app/importer/server/methods/getImportFileData.js b/app/importer/server/methods/getImportFileData.js
index d415de6c8f6b..b51b3829cd21 100644
--- a/app/importer/server/methods/getImportFileData.js
+++ b/app/importer/server/methods/getImportFileData.js
@@ -1,6 +1,6 @@
 import { RocketChatImportFileInstance } from '../startup/store';
 import { Meteor } from 'meteor/meteor';
-import { Importers } from '../..';
+import { Importers } from '..';
 import { hasRole } from '../../../authorization';
 import { ProgressStep } from '../../lib/ImporterProgressStep';
 import path from 'path';
diff --git a/app/importer/server/methods/getImportProgress.js b/app/importer/server/methods/getImportProgress.js
index 1ed256dd3036..9eb52cdb9157 100644
--- a/app/importer/server/methods/getImportProgress.js
+++ b/app/importer/server/methods/getImportProgress.js
@@ -1,5 +1,5 @@
 import { Meteor } from 'meteor/meteor';
-import { Importers } from '../..';
+import { Importers } from '..';
 import { hasPermission } from '../../../authorization';
 
 Meteor.methods({
diff --git a/app/importer/server/methods/getSelectionData.js b/app/importer/server/methods/getSelectionData.js
index d091026e4819..c17f5988aa08 100644
--- a/app/importer/server/methods/getSelectionData.js
+++ b/app/importer/server/methods/getSelectionData.js
@@ -2,7 +2,7 @@ import { Meteor } from 'meteor/meteor';
 import {
 	Importers,
 	ProgressStep,
-} from '../..';
+} from '..';
 import { hasPermission } from '../../../authorization';
 
 Meteor.methods({
diff --git a/app/importer/server/methods/prepareImport.js b/app/importer/server/methods/prepareImport.js
index b73ff46eeee9..4776e4276455 100644
--- a/app/importer/server/methods/prepareImport.js
+++ b/app/importer/server/methods/prepareImport.js
@@ -1,6 +1,6 @@
 import { Meteor } from 'meteor/meteor';
 import { check } from 'meteor/check';
-import { Importers } from '../..';
+import { Importers } from '..';
 import { hasPermission } from '../../../authorization';
 
 Meteor.methods({
diff --git a/app/importer/server/methods/restartImport.js b/app/importer/server/methods/restartImport.js
index 879d69212dfd..6d35bbf5f7e4 100644
--- a/app/importer/server/methods/restartImport.js
+++ b/app/importer/server/methods/restartImport.js
@@ -2,7 +2,7 @@ import { Meteor } from 'meteor/meteor';
 import {
 	Importers,
 	ProgressStep,
-} from '../..';
+} from '..';
 import { hasPermission } from '../../../authorization';
 
 Meteor.methods({
diff --git a/app/importer/server/methods/setupImporter.js b/app/importer/server/methods/setupImporter.js
index c9de108db6c8..1ea4baac8001 100644
--- a/app/importer/server/methods/setupImporter.js
+++ b/app/importer/server/methods/setupImporter.js
@@ -1,5 +1,5 @@
 import { Meteor } from 'meteor/meteor';
-import { Importers } from '../..';
+import { Importers } from '..';
 import { hasPermission } from '../../../authorization';
 
 Meteor.methods({
diff --git a/app/importer/server/methods/startImport.js b/app/importer/server/methods/startImport.js
index 3ce1e4d20706..82b97ced3bf2 100644
--- a/app/importer/server/methods/startImport.js
+++ b/app/importer/server/methods/startImport.js
@@ -4,7 +4,7 @@ import {
 	Selection,
 	SelectionChannel,
 	SelectionUser,
-} from '../..';
+} from '..';
 import { hasPermission } from '../../../authorization';
 
 Meteor.methods({
diff --git a/app/importer/server/methods/uploadImportFile.js b/app/importer/server/methods/uploadImportFile.js
index 07147563d761..4417acf2a5f0 100644
--- a/app/importer/server/methods/uploadImportFile.js
+++ b/app/importer/server/methods/uploadImportFile.js
@@ -1,5 +1,5 @@
 import { Meteor } from 'meteor/meteor';
-import { Importers } from '../..';
+import { Importers } from '..';
 import { RocketChatFile } from '../../../file';
 import { RocketChatImportFileInstance } from '../startup/store';
 import { hasRole } from '../../../authorization';
diff --git a/app/integrations/index.js b/app/integrations/index.js
deleted file mode 100644
index a67eca871efb..000000000000
--- a/app/integrations/index.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isClient) {
-	module.exports = require('./client/index.js');
-}
-if (Meteor.isServer) {
-	module.exports = require('./server/index.js');
-}
diff --git a/app/irc/index.js b/app/irc/index.js
index 27b799c4d7d7..ca39cd0df4b1 100644
--- a/app/irc/index.js
+++ b/app/irc/index.js
@@ -1,5 +1 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isServer) {
-	module.exports = require('./server/index.js');
-}
+export * from './server/index';
diff --git a/app/issuelinks/index.js b/app/issuelinks/index.js
deleted file mode 100644
index a67eca871efb..000000000000
--- a/app/issuelinks/index.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isClient) {
-	module.exports = require('./client/index.js');
-}
-if (Meteor.isServer) {
-	module.exports = require('./server/index.js');
-}
diff --git a/app/katex/index.js b/app/katex/index.js
deleted file mode 100644
index a67eca871efb..000000000000
--- a/app/katex/index.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isClient) {
-	module.exports = require('./client/index.js');
-}
-if (Meteor.isServer) {
-	module.exports = require('./server/index.js');
-}
diff --git a/app/lazy-load/index.js b/app/lazy-load/index.js
index 1ade4a8691e5..40a7340d3887 100644
--- a/app/lazy-load/index.js
+++ b/app/lazy-load/index.js
@@ -1,5 +1 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isClient) {
-	module.exports = require('./client/index.js');
-}
+export * from './client/index';
diff --git a/app/ldap/index.js b/app/ldap/index.js
deleted file mode 100644
index a67eca871efb..000000000000
--- a/app/ldap/index.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isClient) {
-	module.exports = require('./client/index.js');
-}
-if (Meteor.isServer) {
-	module.exports = require('./server/index.js');
-}
diff --git a/app/lib/client/methods/sendMessage.js b/app/lib/client/methods/sendMessage.js
index 2003d2490ed3..8d0cad763450 100644
--- a/app/lib/client/methods/sendMessage.js
+++ b/app/lib/client/methods/sendMessage.js
@@ -3,7 +3,7 @@ import { TimeSync } from 'meteor/mizzao:timesync';
 import { ChatMessage } from '../../../models';
 import { settings } from '../../../settings';
 import { callbacks } from '../../../callbacks';
-import { promises } from '../../../promises';
+import { promises } from '../../../promises/client';
 import s from 'underscore.string';
 
 Meteor.methods({
diff --git a/app/lib/server/functions/createRoom.js b/app/lib/server/functions/createRoom.js
index aec684123c75..ddd57dcdac99 100644
--- a/app/lib/server/functions/createRoom.js
+++ b/app/lib/server/functions/createRoom.js
@@ -3,7 +3,7 @@ import { Users, Rooms, Subscriptions } from '../../../models';
 import { callbacks } from '../../../callbacks';
 import { hasPermission, addUserRoles } from '../../../authorization';
 import { getValidRoomName } from '../../../utils';
-import { Apps } from '../../../apps';
+import { Apps } from '../../../apps/server';
 import _ from 'underscore';
 import s from 'underscore.string';
 
diff --git a/app/lib/server/functions/deleteMessage.js b/app/lib/server/functions/deleteMessage.js
index fd3582a38518..36f56f8753da 100644
--- a/app/lib/server/functions/deleteMessage.js
+++ b/app/lib/server/functions/deleteMessage.js
@@ -4,7 +4,7 @@ import { settings } from '../../../settings';
 import { Messages, Uploads, Rooms } from '../../../models';
 import { Notifications } from '../../../notifications';
 import { callbacks } from '../../../callbacks';
-import { Apps } from '../../../apps';
+import { Apps } from '../../../apps/server';
 
 export const deleteMessage = function(message, user) {
 	const keepHistory = settings.get('Message_KeepHistory');
diff --git a/app/lib/server/functions/insertMessage.js b/app/lib/server/functions/insertMessage.js
index 5c923af6c83e..0331326243a1 100644
--- a/app/lib/server/functions/insertMessage.js
+++ b/app/lib/server/functions/insertMessage.js
@@ -1,5 +1,5 @@
 import { Match, check } from 'meteor/check';
-import { Markdown } from '../../../markdown';
+import { Markdown } from '../../../markdown/server';
 import { Messages } from '../../../models';
 
 const objectMaybeIncluding = (types) => Match.Where((value) => {
diff --git a/app/lib/server/functions/notifications/mobile.js b/app/lib/server/functions/notifications/mobile.js
index d29a28519a40..c57eae48f697 100644
--- a/app/lib/server/functions/notifications/mobile.js
+++ b/app/lib/server/functions/notifications/mobile.js
@@ -2,7 +2,7 @@ import { Meteor } from 'meteor/meteor';
 import { settings } from '../../../../settings';
 import { Subscriptions } from '../../../../models';
 import { roomTypes } from '../../../../utils';
-import { PushNotification } from '../../../../push-notifications';
+import { PushNotification } from '../../../../push-notifications/server';
 
 const CATEGORY_MESSAGE = 'MESSAGE';
 const CATEGORY_MESSAGE_NOREPLY = 'MESSAGE_NOREPLY';
diff --git a/app/lib/server/functions/sendMessage.js b/app/lib/server/functions/sendMessage.js
index 403d5a233496..9ff6fa6b432b 100644
--- a/app/lib/server/functions/sendMessage.js
+++ b/app/lib/server/functions/sendMessage.js
@@ -3,8 +3,8 @@ import { Match, check } from 'meteor/check';
 import { settings } from '../../../settings';
 import { callbacks } from '../../../callbacks';
 import { Messages } from '../../../models';
-import { Apps } from '../../../apps';
-import { Markdown } from '../../../markdown';
+import { Apps } from '../../../apps/server';
+import { Markdown } from '../../../markdown/server';
 
 const objectMaybeIncluding = (types) => Match.Where((value) => {
 	Object.keys(types).forEach((field) => {
diff --git a/app/lib/server/functions/updateMessage.js b/app/lib/server/functions/updateMessage.js
index d81e3be394be..54f2f66f8e47 100644
--- a/app/lib/server/functions/updateMessage.js
+++ b/app/lib/server/functions/updateMessage.js
@@ -2,7 +2,7 @@ import { Meteor } from 'meteor/meteor';
 import { Messages, Rooms } from '../../../models';
 import { settings } from '../../../settings';
 import { callbacks } from '../../../callbacks';
-import { Apps } from '../../../apps';
+import { Apps } from '../../../apps/server';
 
 export const updateMessage = function(message, user, originalMessage) {
 	if (!originalMessage) {
diff --git a/app/lib/server/methods/getRoomMessageMetadata.js b/app/lib/server/methods/getRoomMessageMetadata.js
deleted file mode 100644
index 3bc84bbc389c..000000000000
--- a/app/lib/server/methods/getRoomMessageMetadata.js
+++ /dev/null
@@ -1,25 +0,0 @@
-import { Meteor } from 'meteor/meteor';
-import { check } from 'meteor/check';
-import { Messages } from '../../../models';
-Meteor.methods({
-	/**
-	 * Non-reactively retrieves metadata about messages of a room
-	 * @param {String} roomId
-	 * @returns {visibleMessagesCount, lastMessageTimestamp}
-	 */
-	'getRoomMessageMetadata'(roomId) {
-
-		check(roomId, String);
-		if (!Meteor.userId()) {
-			throw new Meteor.Error('error-invalid-user', 'Invalid user', { method: 'archiveRoom' });
-		}
-
-		const metadata = {};
-
-		metadata.visibleMessagesCount = Messages.findVisibleByRoomId(roomId).count();
-		const lastMessage = Messages.getLastVisibleMessageSentWithNoTypeByRoomId(roomId);
-		metadata.lastMessageTimestamp = lastMessage && lastMessage.ts;
-
-		return metadata;
-	},
-});
diff --git a/app/lib/server/methods/joinRoom.js b/app/lib/server/methods/joinRoom.js
index b6ab8274d633..3d8a72e3cab1 100644
--- a/app/lib/server/methods/joinRoom.js
+++ b/app/lib/server/methods/joinRoom.js
@@ -2,7 +2,7 @@ import { Meteor } from 'meteor/meteor';
 import { check } from 'meteor/check';
 import { hasPermission, canAccessRoom } from '../../../authorization';
 import { Rooms } from '../../../models';
-import { Tokenpass, updateUserTokenpassBalances } from '../../../tokenpass';
+import { Tokenpass, updateUserTokenpassBalances } from '../../../tokenpass/server';
 import { addUserToRoom } from '../functions';
 
 Meteor.methods({
diff --git a/app/livechat/index.js b/app/livechat/index.js
deleted file mode 100644
index a67eca871efb..000000000000
--- a/app/livechat/index.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isClient) {
-	module.exports = require('./client/index.js');
-}
-if (Meteor.isServer) {
-	module.exports = require('./server/index.js');
-}
diff --git a/app/livestream/index.js b/app/livestream/index.js
deleted file mode 100644
index a67eca871efb..000000000000
--- a/app/livestream/index.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isClient) {
-	module.exports = require('./client/index.js');
-}
-if (Meteor.isServer) {
-	module.exports = require('./server/index.js');
-}
diff --git a/app/mail-messages/index.js b/app/mail-messages/index.js
deleted file mode 100644
index a67eca871efb..000000000000
--- a/app/mail-messages/index.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isClient) {
-	module.exports = require('./client/index.js');
-}
-if (Meteor.isServer) {
-	module.exports = require('./server/index.js');
-}
diff --git a/app/mailer/index.js b/app/mailer/index.js
index 7e1f730c1d41..7c4b0096a2da 100644
--- a/app/mailer/index.js
+++ b/app/mailer/index.js
@@ -1,5 +1 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isServer) {
-	module.exports = require('./server/api.js');
-}
+export * from './server/api';
diff --git a/app/mapview/index.js b/app/mapview/index.js
deleted file mode 100644
index a67eca871efb..000000000000
--- a/app/mapview/index.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isClient) {
-	module.exports = require('./client/index.js');
-}
-if (Meteor.isServer) {
-	module.exports = require('./server/index.js');
-}
diff --git a/app/markdown/index.js b/app/markdown/index.js
deleted file mode 100644
index a67eca871efb..000000000000
--- a/app/markdown/index.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isClient) {
-	module.exports = require('./client/index.js');
-}
-if (Meteor.isServer) {
-	module.exports = require('./server/index.js');
-}
diff --git a/app/mentions-flextab/index.js b/app/mentions-flextab/index.js
deleted file mode 100644
index a67eca871efb..000000000000
--- a/app/mentions-flextab/index.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isClient) {
-	module.exports = require('./client/index.js');
-}
-if (Meteor.isServer) {
-	module.exports = require('./server/index.js');
-}
diff --git a/app/mentions/index.js b/app/mentions/index.js
deleted file mode 100644
index a67eca871efb..000000000000
--- a/app/mentions/index.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isClient) {
-	module.exports = require('./client/index.js');
-}
-if (Meteor.isServer) {
-	module.exports = require('./server/index.js');
-}
diff --git a/app/message-action/index.js b/app/message-action/index.js
index 1ade4a8691e5..40a7340d3887 100644
--- a/app/message-action/index.js
+++ b/app/message-action/index.js
@@ -1,5 +1 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isClient) {
-	module.exports = require('./client/index.js');
-}
+export * from './client/index';
diff --git a/app/message-attachments/index.js b/app/message-attachments/index.js
index 1ade4a8691e5..40a7340d3887 100644
--- a/app/message-attachments/index.js
+++ b/app/message-attachments/index.js
@@ -1,5 +1 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isClient) {
-	module.exports = require('./client/index.js');
-}
+export * from './client/index';
diff --git a/app/message-mark-as-unread/index.js b/app/message-mark-as-unread/index.js
deleted file mode 100644
index a67eca871efb..000000000000
--- a/app/message-mark-as-unread/index.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isClient) {
-	module.exports = require('./client/index.js');
-}
-if (Meteor.isServer) {
-	module.exports = require('./server/index.js');
-}
diff --git a/app/message-pin/index.js b/app/message-pin/index.js
deleted file mode 100644
index a67eca871efb..000000000000
--- a/app/message-pin/index.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isClient) {
-	module.exports = require('./client/index.js');
-}
-if (Meteor.isServer) {
-	module.exports = require('./server/index.js');
-}
diff --git a/app/message-snippet/client/page/snippetPage.js b/app/message-snippet/client/page/snippetPage.js
index 7c6e7a8ba9ab..05a5f96dffa0 100644
--- a/app/message-snippet/client/page/snippetPage.js
+++ b/app/message-snippet/client/page/snippetPage.js
@@ -3,7 +3,7 @@ import { DateFormat } from '../../../lib';
 import { FlowRouter } from 'meteor/kadira:flow-router';
 import { Template } from 'meteor/templating';
 import { settings } from '../../../settings';
-import { Markdown } from '../../../markdown';
+import { Markdown } from '../../../markdown/client';
 import { SnippetedMessages } from '../lib/collections';
 import moment from 'moment';
 
diff --git a/app/message-snippet/index.js b/app/message-snippet/index.js
deleted file mode 100644
index a67eca871efb..000000000000
--- a/app/message-snippet/index.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isClient) {
-	module.exports = require('./client/index.js');
-}
-if (Meteor.isServer) {
-	module.exports = require('./server/index.js');
-}
diff --git a/app/message-star/index.js b/app/message-star/index.js
deleted file mode 100644
index a67eca871efb..000000000000
--- a/app/message-star/index.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isClient) {
-	module.exports = require('./client/index.js');
-}
-if (Meteor.isServer) {
-	module.exports = require('./server/index.js');
-}
diff --git a/app/meteor-accounts-saml/index.js b/app/meteor-accounts-saml/index.js
deleted file mode 100644
index a67eca871efb..000000000000
--- a/app/meteor-accounts-saml/index.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isClient) {
-	module.exports = require('./client/index.js');
-}
-if (Meteor.isServer) {
-	module.exports = require('./server/index.js');
-}
diff --git a/app/metrics/index.js b/app/metrics/index.js
index 27b799c4d7d7..ca39cd0df4b1 100644
--- a/app/metrics/index.js
+++ b/app/metrics/index.js
@@ -1,5 +1 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isServer) {
-	module.exports = require('./server/index.js');
-}
+export * from './server/index';
diff --git a/app/migrations/index.js b/app/migrations/index.js
index 27b799c4d7d7..ca39cd0df4b1 100644
--- a/app/migrations/index.js
+++ b/app/migrations/index.js
@@ -1,5 +1 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isServer) {
-	module.exports = require('./server/index.js');
-}
+export * from './server/index';
diff --git a/app/nrr/index.js b/app/nrr/index.js
index 1ade4a8691e5..40a7340d3887 100644
--- a/app/nrr/index.js
+++ b/app/nrr/index.js
@@ -1,5 +1 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isClient) {
-	module.exports = require('./client/index.js');
-}
+export * from './client/index';
diff --git a/app/oauth2-server-config/index.js b/app/oauth2-server-config/index.js
deleted file mode 100644
index a67eca871efb..000000000000
--- a/app/oauth2-server-config/index.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isClient) {
-	module.exports = require('./client/index.js');
-}
-if (Meteor.isServer) {
-	module.exports = require('./server/index.js');
-}
diff --git a/app/oembed/index.js b/app/oembed/index.js
deleted file mode 100644
index a67eca871efb..000000000000
--- a/app/oembed/index.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isClient) {
-	module.exports = require('./client/index.js');
-}
-if (Meteor.isServer) {
-	module.exports = require('./server/index.js');
-}
diff --git a/app/otr/client/rocketchat.otr.js b/app/otr/client/rocketchat.otr.js
index b6f3f0efefd8..54d088259976 100644
--- a/app/otr/client/rocketchat.otr.js
+++ b/app/otr/client/rocketchat.otr.js
@@ -2,7 +2,7 @@ import { Meteor } from 'meteor/meteor';
 import { ReactiveVar } from 'meteor/reactive-var';
 import { Tracker } from 'meteor/tracker';
 import { Subscriptions } from '../../models';
-import { promises } from '../../promises';
+import { promises } from '../../promises/client';
 import { Notifications } from '../../notifications';
 import { t } from '../../utils';
 
diff --git a/app/otr/index.js b/app/otr/index.js
deleted file mode 100644
index a67eca871efb..000000000000
--- a/app/otr/index.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isClient) {
-	module.exports = require('./client/index.js');
-}
-if (Meteor.isServer) {
-	module.exports = require('./server/index.js');
-}
diff --git a/app/promises/index.js b/app/promises/index.js
deleted file mode 100644
index a67eca871efb..000000000000
--- a/app/promises/index.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isClient) {
-	module.exports = require('./client/index.js');
-}
-if (Meteor.isServer) {
-	module.exports = require('./server/index.js');
-}
diff --git a/app/push-notifications/client/views/pushNotificationsFlexTab.js b/app/push-notifications/client/views/pushNotificationsFlexTab.js
index 736bf4d96bf6..3bc146934f19 100644
--- a/app/push-notifications/client/views/pushNotificationsFlexTab.js
+++ b/app/push-notifications/client/views/pushNotificationsFlexTab.js
@@ -5,7 +5,7 @@ import { Template } from 'meteor/templating';
 import { settings } from '../../../settings';
 import { getUserPreference, handleError, t } from '../../../utils';
 import { popover } from '../../../ui-utils';
-import { CustomSounds } from '../../../custom-sounds';
+import { CustomSounds } from '../../../custom-sounds/client';
 import { ChatSubscription } from '../../../models';
 
 const notificationLabels = {
diff --git a/app/push-notifications/index.js b/app/push-notifications/index.js
deleted file mode 100644
index a67eca871efb..000000000000
--- a/app/push-notifications/index.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isClient) {
-	module.exports = require('./client/index.js');
-}
-if (Meteor.isServer) {
-	module.exports = require('./server/index.js');
-}
diff --git a/app/reactions/index.js b/app/reactions/index.js
deleted file mode 100644
index a67eca871efb..000000000000
--- a/app/reactions/index.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isClient) {
-	module.exports = require('./client/index.js');
-}
-if (Meteor.isServer) {
-	module.exports = require('./server/index.js');
-}
diff --git a/app/retention-policy/index.js b/app/retention-policy/index.js
index 27b799c4d7d7..ca39cd0df4b1 100644
--- a/app/retention-policy/index.js
+++ b/app/retention-policy/index.js
@@ -1,5 +1 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isServer) {
-	module.exports = require('./server/index.js');
-}
+export * from './server/index';
diff --git a/app/search/index.js b/app/search/index.js
deleted file mode 100644
index a67eca871efb..000000000000
--- a/app/search/index.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isClient) {
-	module.exports = require('./client/index.js');
-}
-if (Meteor.isServer) {
-	module.exports = require('./server/index.js');
-}
diff --git a/app/setup-wizard/index.js b/app/setup-wizard/index.js
deleted file mode 100644
index a67eca871efb..000000000000
--- a/app/setup-wizard/index.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isClient) {
-	module.exports = require('./client/index.js');
-}
-if (Meteor.isServer) {
-	module.exports = require('./server/index.js');
-}
diff --git a/app/slackbridge/index.js b/app/slackbridge/index.js
deleted file mode 100644
index a67eca871efb..000000000000
--- a/app/slackbridge/index.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isClient) {
-	module.exports = require('./client/index.js');
-}
-if (Meteor.isServer) {
-	module.exports = require('./server/index.js');
-}
diff --git a/app/slashcommand-asciiarts/index.js b/app/slashcommand-asciiarts/index.js
deleted file mode 100644
index a67eca871efb..000000000000
--- a/app/slashcommand-asciiarts/index.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isClient) {
-	module.exports = require('./client/index.js');
-}
-if (Meteor.isServer) {
-	module.exports = require('./server/index.js');
-}
diff --git a/app/slashcommands-archiveroom/index.js b/app/slashcommands-archiveroom/index.js
deleted file mode 100644
index a67eca871efb..000000000000
--- a/app/slashcommands-archiveroom/index.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isClient) {
-	module.exports = require('./client/index.js');
-}
-if (Meteor.isServer) {
-	module.exports = require('./server/index.js');
-}
diff --git a/app/slashcommands-create/index.js b/app/slashcommands-create/index.js
deleted file mode 100644
index a67eca871efb..000000000000
--- a/app/slashcommands-create/index.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isClient) {
-	module.exports = require('./client/index.js');
-}
-if (Meteor.isServer) {
-	module.exports = require('./server/index.js');
-}
diff --git a/app/slashcommands-help/index.js b/app/slashcommands-help/index.js
index 27b799c4d7d7..ca39cd0df4b1 100644
--- a/app/slashcommands-help/index.js
+++ b/app/slashcommands-help/index.js
@@ -1,5 +1 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isServer) {
-	module.exports = require('./server/index.js');
-}
+export * from './server/index';
diff --git a/app/slashcommands-hide/index.js b/app/slashcommands-hide/index.js
deleted file mode 100644
index a67eca871efb..000000000000
--- a/app/slashcommands-hide/index.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isClient) {
-	module.exports = require('./client/index.js');
-}
-if (Meteor.isServer) {
-	module.exports = require('./server/index.js');
-}
diff --git a/app/slashcommands-invite/index.js b/app/slashcommands-invite/index.js
deleted file mode 100644
index a67eca871efb..000000000000
--- a/app/slashcommands-invite/index.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isClient) {
-	module.exports = require('./client/index.js');
-}
-if (Meteor.isServer) {
-	module.exports = require('./server/index.js');
-}
diff --git a/app/slashcommands-inviteall/index.js b/app/slashcommands-inviteall/index.js
deleted file mode 100644
index a67eca871efb..000000000000
--- a/app/slashcommands-inviteall/index.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isClient) {
-	module.exports = require('./client/index.js');
-}
-if (Meteor.isServer) {
-	module.exports = require('./server/index.js');
-}
diff --git a/app/slashcommands-join/index.js b/app/slashcommands-join/index.js
deleted file mode 100644
index a67eca871efb..000000000000
--- a/app/slashcommands-join/index.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isClient) {
-	module.exports = require('./client/index.js');
-}
-if (Meteor.isServer) {
-	module.exports = require('./server/index.js');
-}
diff --git a/app/slashcommands-kick/index.js b/app/slashcommands-kick/index.js
deleted file mode 100644
index a67eca871efb..000000000000
--- a/app/slashcommands-kick/index.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isClient) {
-	module.exports = require('./client/index.js');
-}
-if (Meteor.isServer) {
-	module.exports = require('./server/index.js');
-}
diff --git a/app/slashcommands-leave/index.js b/app/slashcommands-leave/index.js
index 27b799c4d7d7..ca39cd0df4b1 100644
--- a/app/slashcommands-leave/index.js
+++ b/app/slashcommands-leave/index.js
@@ -1,5 +1 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isServer) {
-	module.exports = require('./server/index.js');
-}
+export * from './server/index';
diff --git a/app/slashcommands-me/index.js b/app/slashcommands-me/index.js
index 27b799c4d7d7..ca39cd0df4b1 100644
--- a/app/slashcommands-me/index.js
+++ b/app/slashcommands-me/index.js
@@ -1,5 +1 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isServer) {
-	module.exports = require('./server/index.js');
-}
+export * from './server/index';
diff --git a/app/slashcommands-msg/index.js b/app/slashcommands-msg/index.js
index 27b799c4d7d7..ca39cd0df4b1 100644
--- a/app/slashcommands-msg/index.js
+++ b/app/slashcommands-msg/index.js
@@ -1,5 +1 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isServer) {
-	module.exports = require('./server/index.js');
-}
+export * from './server/index';
diff --git a/app/slashcommands-mute/index.js b/app/slashcommands-mute/index.js
index 27b799c4d7d7..ca39cd0df4b1 100644
--- a/app/slashcommands-mute/index.js
+++ b/app/slashcommands-mute/index.js
@@ -1,5 +1 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isServer) {
-	module.exports = require('./server/index.js');
-}
+export * from './server/index';
diff --git a/app/slashcommands-open/index.js b/app/slashcommands-open/index.js
index 1ade4a8691e5..40a7340d3887 100644
--- a/app/slashcommands-open/index.js
+++ b/app/slashcommands-open/index.js
@@ -1,5 +1 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isClient) {
-	module.exports = require('./client/index.js');
-}
+export * from './client/index';
diff --git a/app/slashcommands-topic/index.js b/app/slashcommands-topic/index.js
deleted file mode 100644
index a67eca871efb..000000000000
--- a/app/slashcommands-topic/index.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isClient) {
-	module.exports = require('./client/index.js');
-}
-if (Meteor.isServer) {
-	module.exports = require('./server/index.js');
-}
diff --git a/app/slashcommands-unarchiveroom/index.js b/app/slashcommands-unarchiveroom/index.js
deleted file mode 100644
index a67eca871efb..000000000000
--- a/app/slashcommands-unarchiveroom/index.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isClient) {
-	module.exports = require('./client/index.js');
-}
-if (Meteor.isServer) {
-	module.exports = require('./server/index.js');
-}
diff --git a/app/slider/index.js b/app/slider/index.js
index 1ade4a8691e5..40a7340d3887 100644
--- a/app/slider/index.js
+++ b/app/slider/index.js
@@ -1,5 +1 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isClient) {
-	module.exports = require('./client/index.js');
-}
+export * from './client/index';
diff --git a/app/smarsh-connector/index.js b/app/smarsh-connector/index.js
index 27b799c4d7d7..ca39cd0df4b1 100644
--- a/app/smarsh-connector/index.js
+++ b/app/smarsh-connector/index.js
@@ -1,5 +1 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isServer) {
-	module.exports = require('./server/index.js');
-}
+export * from './server/index';
diff --git a/app/sms/index.js b/app/sms/index.js
index 27b799c4d7d7..ca39cd0df4b1 100644
--- a/app/sms/index.js
+++ b/app/sms/index.js
@@ -1,5 +1 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isServer) {
-	module.exports = require('./server/index.js');
-}
+export * from './server/index';
diff --git a/app/spotify/index.js b/app/spotify/index.js
deleted file mode 100644
index a67eca871efb..000000000000
--- a/app/spotify/index.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isClient) {
-	module.exports = require('./client/index.js');
-}
-if (Meteor.isServer) {
-	module.exports = require('./server/index.js');
-}
diff --git a/app/statistics/client/index.js b/app/statistics/client/index.js
deleted file mode 100644
index 4d6822b60218..000000000000
--- a/app/statistics/client/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export { statistics } from '../lib/rocketchat';
diff --git a/app/statistics/index.js b/app/statistics/index.js
index a67eca871efb..ca39cd0df4b1 100644
--- a/app/statistics/index.js
+++ b/app/statistics/index.js
@@ -1,8 +1 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isClient) {
-	module.exports = require('./client/index.js');
-}
-if (Meteor.isServer) {
-	module.exports = require('./server/index.js');
-}
+export * from './server/index';
diff --git a/app/statistics/server/functions/get.js b/app/statistics/server/functions/get.js
index 7e06f74e7fa6..d9a2f41b2a0b 100644
--- a/app/statistics/server/functions/get.js
+++ b/app/statistics/server/functions/get.js
@@ -7,7 +7,7 @@ import { Sessions, Settings, Users, Rooms, Subscriptions, Uploads, Messages, Liv
 import { settings } from '../../../settings';
 import { Info } from '../../../utils';
 import { Migrations } from '../../../migrations';
-import { statistics } from '../../lib/rocketchat';
+import { statistics } from '../statisticsNamespace';
 
 const wizardFields = [
 	'Organization_Type',
diff --git a/app/statistics/server/functions/save.js b/app/statistics/server/functions/save.js
index 9551d5f0158c..04bb113c7f09 100644
--- a/app/statistics/server/functions/save.js
+++ b/app/statistics/server/functions/save.js
@@ -1,5 +1,5 @@
 import { Statistics } from '../../../models';
-import { statistics } from '../../lib/rocketchat';
+import { statistics } from '../statisticsNamespace';
 
 statistics.save = function() {
 	const rcStatistics = statistics.get();
diff --git a/app/statistics/server/index.js b/app/statistics/server/index.js
index 3d85ca7ef891..d3ea6b2089ff 100644
--- a/app/statistics/server/index.js
+++ b/app/statistics/server/index.js
@@ -1,4 +1,4 @@
-export { statistics } from '../lib/rocketchat';
+export { statistics } from './statisticsNamespace';
 import './functions/get';
 import './functions/save';
 import './methods/getStatistics';
diff --git a/app/statistics/server/methods/getStatistics.js b/app/statistics/server/methods/getStatistics.js
index 1aaefd6702d0..58d99c7a8e6b 100644
--- a/app/statistics/server/methods/getStatistics.js
+++ b/app/statistics/server/methods/getStatistics.js
@@ -1,7 +1,7 @@
 import { Meteor } from 'meteor/meteor';
 import { hasPermission } from '../../../authorization';
 import { Statistics } from '../../../models';
-import { statistics } from '../../lib/rocketchat';
+import { statistics } from '../statisticsNamespace';
 
 Meteor.methods({
 	getStatistics(refresh) {
diff --git a/app/statistics/lib/rocketchat.js b/app/statistics/server/statisticsNamespace.js
similarity index 100%
rename from app/statistics/lib/rocketchat.js
rename to app/statistics/server/statisticsNamespace.js
diff --git a/app/theme/index.js b/app/theme/index.js
deleted file mode 100644
index a67eca871efb..000000000000
--- a/app/theme/index.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isClient) {
-	module.exports = require('./client/index.js');
-}
-if (Meteor.isServer) {
-	module.exports = require('./server/index.js');
-}
diff --git a/app/token-login/index.js b/app/token-login/index.js
deleted file mode 100644
index a67eca871efb..000000000000
--- a/app/token-login/index.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isClient) {
-	module.exports = require('./client/index.js');
-}
-if (Meteor.isServer) {
-	module.exports = require('./server/index.js');
-}
diff --git a/app/tokenpass/index.js b/app/tokenpass/index.js
deleted file mode 100644
index a67eca871efb..000000000000
--- a/app/tokenpass/index.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isClient) {
-	module.exports = require('./client/index.js');
-}
-if (Meteor.isServer) {
-	module.exports = require('./server/index.js');
-}
diff --git a/app/tooltip/index.js b/app/tooltip/index.js
index 1ade4a8691e5..40a7340d3887 100644
--- a/app/tooltip/index.js
+++ b/app/tooltip/index.js
@@ -1,5 +1 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isClient) {
-	module.exports = require('./client/index.js');
-}
+export * from './client/index';
diff --git a/app/ui-account/client/accountPreferences.js b/app/ui-account/client/accountPreferences.js
index 83faa1bbb363..835f11d19dbd 100644
--- a/app/ui-account/client/accountPreferences.js
+++ b/app/ui-account/client/accountPreferences.js
@@ -8,7 +8,7 @@ import { t, handleError, getUserPreference } from '../../utils';
 import { modal, SideNav } from '../../ui-utils';
 import { KonchatNotification } from '../../ui';
 import { settings } from '../../settings';
-import { CustomSounds } from '../../custom-sounds';
+import { CustomSounds } from '../../custom-sounds/client';
 import _ from 'underscore';
 import s from 'underscore.string';
 import toastr from 'toastr';
diff --git a/app/ui-account/index.js b/app/ui-account/index.js
index 1ade4a8691e5..40a7340d3887 100644
--- a/app/ui-account/index.js
+++ b/app/ui-account/index.js
@@ -1,5 +1 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isClient) {
-	module.exports = require('./client/index.js');
-}
+export * from './client/index';
diff --git a/app/ui-admin/index.js b/app/ui-admin/index.js
deleted file mode 100644
index a67eca871efb..000000000000
--- a/app/ui-admin/index.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isClient) {
-	module.exports = require('./client/index.js');
-}
-if (Meteor.isServer) {
-	module.exports = require('./server/index.js');
-}
diff --git a/app/ui-cached-collection/index.js b/app/ui-cached-collection/index.js
index 1ade4a8691e5..40a7340d3887 100644
--- a/app/ui-cached-collection/index.js
+++ b/app/ui-cached-collection/index.js
@@ -1,5 +1 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isClient) {
-	module.exports = require('./client/index.js');
-}
+export * from './client/index';
diff --git a/app/ui-clean-history/index.js b/app/ui-clean-history/index.js
index 1ade4a8691e5..40a7340d3887 100644
--- a/app/ui-clean-history/index.js
+++ b/app/ui-clean-history/index.js
@@ -1,5 +1 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isClient) {
-	module.exports = require('./client/index.js');
-}
+export * from './client/index';
diff --git a/app/ui-flextab/client/tabs/membersList.js b/app/ui-flextab/client/tabs/membersList.js
index 6eed72bcd7e8..82d3e7ff5993 100644
--- a/app/ui-flextab/client/tabs/membersList.js
+++ b/app/ui-flextab/client/tabs/membersList.js
@@ -7,7 +7,7 @@ import { RoomManager, popover } from '../../../ui-utils';
 import { ChatRoom, Subscriptions } from '../../../models';
 import { settings } from '../../../settings';
 import { t, isRtl, handleError, roomTypes } from '../../../utils';
-import { WebRTC } from '../../../webrtc';
+import { WebRTC } from '../../../webrtc/client';
 import _ from 'underscore';
 import { getActions } from './userActions';
 
diff --git a/app/ui-flextab/client/tabs/userActions.js b/app/ui-flextab/client/tabs/userActions.js
index a0e2bbfb37fa..8120fee597c8 100644
--- a/app/ui-flextab/client/tabs/userActions.js
+++ b/app/ui-flextab/client/tabs/userActions.js
@@ -2,7 +2,7 @@ import { Meteor } from 'meteor/meteor';
 import { FlowRouter } from 'meteor/kadira:flow-router';
 import { Session } from 'meteor/session';
 import { TAPi18n } from 'meteor/tap:i18n';
-import { WebRTC } from '../../../webrtc';
+import { WebRTC } from '../../../webrtc/client';
 import { ChatRoom, ChatSubscription, RoomRoles, Subscriptions } from '../../../models';
 import { modal } from '../../../ui-utils';
 import { t, handleError } from '../../../utils';
diff --git a/app/ui-flextab/index.js b/app/ui-flextab/index.js
index 1ade4a8691e5..40a7340d3887 100644
--- a/app/ui-flextab/index.js
+++ b/app/ui-flextab/index.js
@@ -1,5 +1 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isClient) {
-	module.exports = require('./client/index.js');
-}
+export * from './client/index';
diff --git a/app/ui-login/index.js b/app/ui-login/index.js
index 1ade4a8691e5..40a7340d3887 100644
--- a/app/ui-login/index.js
+++ b/app/ui-login/index.js
@@ -1,5 +1 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isClient) {
-	module.exports = require('./client/index.js');
-}
+export * from './client/index';
diff --git a/app/ui-master/index.js b/app/ui-master/index.js
deleted file mode 100644
index a67eca871efb..000000000000
--- a/app/ui-master/index.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isClient) {
-	module.exports = require('./client/index.js');
-}
-if (Meteor.isServer) {
-	module.exports = require('./server/index.js');
-}
diff --git a/app/ui-message/client/message.js b/app/ui-message/client/message.js
index 3b5e504f0104..d0b8e951c0f7 100644
--- a/app/ui-message/client/message.js
+++ b/app/ui-message/client/message.js
@@ -10,10 +10,10 @@ import { renderEmoji } from '../../emoji';
 import { renderMessageBody, MessageTypes, MessageAction } from '../../ui-utils';
 import { settings } from '../../settings';
 import { RoomRoles, UserRoles, Roles, Subscriptions, Rooms } from '../../models';
-import { AutoTranslate } from '../../autotranslate';
+import { AutoTranslate } from '../../autotranslate/client';
 import { hasAtLeastOnePermission } from '../../authorization';
 import { callbacks } from '../../callbacks';
-import { Markdown } from '../../markdown';
+import { Markdown } from '../../markdown/client';
 import { t, getUserPreference, roomTypes } from '../../utils';
 
 async function renderPdfToCanvas(canvasId, pdfLink) {
diff --git a/app/ui-message/client/messageBox.js b/app/ui-message/client/messageBox.js
index a04ff80c3f29..738960ab2bc8 100644
--- a/app/ui-message/client/messageBox.js
+++ b/app/ui-message/client/messageBox.js
@@ -4,8 +4,8 @@ import { Session } from 'meteor/session';
 import { Template } from 'meteor/templating';
 import { Tracker } from 'meteor/tracker';
 import { EmojiPicker } from '../../emoji';
-import { katex } from '../../katex';
-import { Markdown } from '../../markdown';
+import { katex } from '../../katex/client';
+import { Markdown } from '../../markdown/client';
 import { ChatSubscription } from '../../models';
 import { settings } from '../../settings';
 import {
diff --git a/app/ui-message/client/startup/messageBoxActions.js b/app/ui-message/client/startup/messageBoxActions.js
index 9095542642ba..019c5e829d37 100644
--- a/app/ui-message/client/startup/messageBoxActions.js
+++ b/app/ui-message/client/startup/messageBoxActions.js
@@ -3,7 +3,7 @@ import { Random } from 'meteor/random';
 import { ReactiveVar } from 'meteor/reactive-var';
 import { Tracker } from 'meteor/tracker';
 import mime from 'mime-type/with-db';
-import { VRecDialog } from '../../../ui-vrecord';
+import { VRecDialog } from '../../../ui-vrecord/client';
 import { messageBox, modal } from '../../../ui-utils';
 import { fileUpload } from '../../../ui';
 import { settings } from '../../../settings';
diff --git a/app/ui-message/index.js b/app/ui-message/index.js
index 1ade4a8691e5..40a7340d3887 100644
--- a/app/ui-message/index.js
+++ b/app/ui-message/index.js
@@ -1,5 +1 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isClient) {
-	module.exports = require('./client/index.js');
-}
+export * from './client/index';
diff --git a/app/ui-sidenav/index.js b/app/ui-sidenav/index.js
index 1ade4a8691e5..40a7340d3887 100644
--- a/app/ui-sidenav/index.js
+++ b/app/ui-sidenav/index.js
@@ -1,5 +1 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isClient) {
-	module.exports = require('./client/index.js');
-}
+export * from './client/index';
diff --git a/app/ui-utils/client/lib/RoomManager.js b/app/ui-utils/client/lib/RoomManager.js
index 61fed0fc04ac..bca2b26d7ee0 100644
--- a/app/ui-utils/client/lib/RoomManager.js
+++ b/app/ui-utils/client/lib/RoomManager.js
@@ -6,7 +6,7 @@ import { FlowRouter } from 'meteor/kadira:flow-router';
 import { Template } from 'meteor/templating';
 import { roomTypes as _roomTypes } from '../../../utils';
 import { fireGlobalEvent } from './fireGlobalEvent';
-import { promises } from '../../../promises';
+import { promises } from '../../../promises/client';
 import { callbacks } from '../../../callbacks';
 import { Notifications } from '../../../notifications';
 import { CachedChatRoom, ChatMessage, ChatSubscription, CachedChatSubscription } from '../../../models';
diff --git a/app/ui-vrecord/index.js b/app/ui-vrecord/index.js
deleted file mode 100644
index 2bd3ea7e1df1..000000000000
--- a/app/ui-vrecord/index.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isServer) {
-	module.exports = require('./server/index.js');
-}
-if (Meteor.isClient) {
-	module.exports = require('./client/index.js');
-}
diff --git a/app/ui/client/components/header/headerRoom.js b/app/ui/client/components/header/headerRoom.js
index 5b461b1d1bfc..cb4e6f1f85be 100644
--- a/app/ui/client/components/header/headerRoom.js
+++ b/app/ui/client/components/header/headerRoom.js
@@ -9,7 +9,7 @@ import { ChatSubscription, Rooms, ChatRoom } from '../../../../models';
 import { settings } from '../../../../settings';
 import { FlowRouter } from 'meteor/kadira:flow-router';
 import { emoji } from '../../../../emoji';
-import { Markdown } from '../../../../markdown';
+import { Markdown } from '../../../../markdown/client';
 import { hasAllPermission } from '../../../../authorization';
 import { call } from '../../../../ui-utils';
 
diff --git a/app/ui/client/lib/chatMessages.js b/app/ui/client/lib/chatMessages.js
index d55d377abc93..aca8e17673fe 100644
--- a/app/ui/client/lib/chatMessages.js
+++ b/app/ui/client/lib/chatMessages.js
@@ -9,7 +9,7 @@ import { t, getUserPreference, slashCommands, handleError } from '../../../utils
 import { MessageAction, messageProperties, MessageTypes, readMessage, modal, call } from '../../../ui-utils';
 import { settings } from '../../../settings';
 import { callbacks } from '../../../callbacks';
-import { promises } from '../../../promises';
+import { promises } from '../../../promises/client';
 import { hasAtLeastOnePermission } from '../../../authorization';
 import { Messages, Rooms, ChatMessage, ChatSubscription } from '../../../models';
 import { emoji } from '../../../emoji';
diff --git a/app/ui/client/lib/esc.js b/app/ui/client/lib/esc.js
deleted file mode 100644
index 07f90b33953a..000000000000
--- a/app/ui/client/lib/esc.js
+++ /dev/null
@@ -1,62 +0,0 @@
-import { SideNav } from '../../../ui-utils';
-import { VideoRecorder } from './recorderjs/videoRecorder';
-import { VRecDialog } from '../../../ui-vrecord/client/VRecDialog';
-
-const escapify = {
-	init() {
-		const that = this;
-		document.addEventListener('keyup', (event) => {
-			const keyName = event.key;
-			if (keyName === 'Escape') {
-				that.sideNavIcon();
-				that.flextTabButton();
-				that.videoDialog();
-				that.sweetAlerts();
-			}
-		}, false);
-	},
-
-	getClickEvent() {
-		return new MouseEvent('click', {
-			bubbles: true,
-			cancelable: true,
-			view: window,
-		});
-	},
-
-	flextTabButton() {
-		const flextTabButton = document.querySelector('.flex-tab-bar .tab-button.active');
-		if (flextTabButton) {
-			flextTabButton.dispatchEvent(this.getClickEvent());
-			return;
-		}
-	},
-
-	sideNavIcon() {
-		const sideNavArrow = document.querySelector('.sidebar .arrow');
-		if (sideNavArrow && (sideNavArrow.classList.contains('top') || sideNavArrow.classList.contains('close'))) {
-			SideNav.toggleCurrent();
-			return;
-		}
-	},
-
-	videoDialog() {
-		const vrecDialog = document.querySelector('.vrec-dialog');
-		if (vrecDialog && Number(window.getComputedStyle(vrecDialog).opacity) === 1) {
-			VideoRecorder.stop();
-			VRecDialog.close();
-			return;
-		}
-	},
-
-	sweetAlerts() {
-		const sweetAlert = document.querySelector('.sweet-alert');
-		if (sweetAlert) {
-			document.querySelector('.sweet-alert .sa-button-container .cancel').dispatchEvent(this.getClickEvent());
-			return;
-		}
-	},
-};
-
-this.escapify = escapify;
-this.escapify.init();
diff --git a/app/ui/client/lib/notification.js b/app/ui/client/lib/notification.js
index 14efc9410519..a827b72ccdc5 100644
--- a/app/ui/client/lib/notification.js
+++ b/app/ui/client/lib/notification.js
@@ -7,12 +7,12 @@ import { FlowRouter } from 'meteor/kadira:flow-router';
 import { Session } from 'meteor/session';
 import _ from 'underscore';
 import s from 'underscore.string';
-import { e2e } from '../../../e2e';
+import { e2e } from '../../../e2e/client';
 import { Users, ChatSubscription } from '../../../models';
 import { getUserPreference } from '../../../utils';
 import { getAvatarUrlFromUsername } from '../../../utils';
 import { getAvatarAsPng } from '../../../ui-utils';
-import { promises } from '../../../promises';
+import { promises } from '../../../promises/client';
 
 export const KonchatNotification = {
 	notificationStatus: new ReactiveVar,
diff --git a/app/ui/client/views/app/room.js b/app/ui/client/views/app/room.js
index 7eb49a118e62..b3e5da3b789d 100644
--- a/app/ui/client/views/app/room.js
+++ b/app/ui/client/views/app/room.js
@@ -7,7 +7,7 @@ import { FlowRouter } from 'meteor/kadira:flow-router';
 import { Session } from 'meteor/session';
 import { Template } from 'meteor/templating';
 import { t, roomTypes, getUserPreference, handleError } from '../../../../utils';
-import { WebRTC } from '../../../../webrtc';
+import { WebRTC } from '../../../../webrtc/client';
 import { ChatSubscription, ChatMessage, RoomRoles, Users, Subscriptions, Rooms } from '../../../../models';
 import {
 	fireGlobalEvent,
@@ -22,7 +22,7 @@ import {
 } from '../../../../ui-utils';
 import { settings } from '../../../../settings';
 import { callbacks } from '../../../../callbacks';
-import { promises } from '../../../../promises';
+import { promises } from '../../../../promises/client';
 import { hasAllPermission, hasRole } from '../../../../authorization';
 import _ from 'underscore';
 import moment from 'moment';
diff --git a/app/ui/client/views/app/videoCall/videoButtons.js b/app/ui/client/views/app/videoCall/videoButtons.js
index 5e5c15e3fa2e..1a0ea2f39d63 100644
--- a/app/ui/client/views/app/videoCall/videoButtons.js
+++ b/app/ui/client/views/app/videoCall/videoButtons.js
@@ -1,6 +1,6 @@
 import { Session } from 'meteor/session';
 import { Template } from 'meteor/templating';
-import { WebRTC } from '../../../../../webrtc';
+import { WebRTC } from '../../../../../webrtc/client';
 
 Template.videoButtons.helpers({
 	videoAvaliable() {
diff --git a/app/ui/client/views/app/videoCall/videoCall.js b/app/ui/client/views/app/videoCall/videoCall.js
index 72d920a647e3..f7674ede5870 100644
--- a/app/ui/client/views/app/videoCall/videoCall.js
+++ b/app/ui/client/views/app/videoCall/videoCall.js
@@ -3,7 +3,7 @@ import { ReactiveVar } from 'meteor/reactive-var';
 import { Session } from 'meteor/session';
 import { Template } from 'meteor/templating';
 import { t } from '../../../../../utils';
-import { WebRTC } from '../../../../../webrtc';
+import { WebRTC } from '../../../../../webrtc/client';
 
 Template.videoCall.onCreated(function() {
 	return this.mainVideo = new ReactiveVar('$auto');
diff --git a/app/ui/index.js b/app/ui/index.js
index 1ade4a8691e5..40a7340d3887 100644
--- a/app/ui/index.js
+++ b/app/ui/index.js
@@ -1,5 +1 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isClient) {
-	module.exports = require('./client/index.js');
-}
+export * from './client/index';
diff --git a/app/user-data-download/index.js b/app/user-data-download/index.js
index 27b799c4d7d7..ca39cd0df4b1 100644
--- a/app/user-data-download/index.js
+++ b/app/user-data-download/index.js
@@ -1,5 +1 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isServer) {
-	module.exports = require('./server/index.js');
-}
+export * from './server/index';
diff --git a/app/version-check/client/client.js b/app/version-check/client/index.js
similarity index 100%
rename from app/version-check/client/client.js
rename to app/version-check/client/index.js
diff --git a/app/version-check/index.js b/app/version-check/index.js
deleted file mode 100644
index f1bf5747828e..000000000000
--- a/app/version-check/index.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isClient) {
-	module.exports = require('./client/client.js');
-}
-if (Meteor.isServer) {
-	module.exports = require('./server/server.js');
-}
diff --git a/app/version-check/server/functions/getNewUpdates.js b/app/version-check/server/functions/getNewUpdates.js
index 5cb1ac49e27d..f632bbce5eb4 100644
--- a/app/version-check/server/functions/getNewUpdates.js
+++ b/app/version-check/server/functions/getNewUpdates.js
@@ -3,7 +3,7 @@ import { HTTP } from 'meteor/http';
 import { Settings } from '../../../models';
 import { settings } from '../../../settings';
 import { Info } from '../../../utils';
-import { getWorkspaceAccessToken } from '../../../cloud';
+import { getWorkspaceAccessToken } from '../../../cloud/server';
 import { MongoInternals } from 'meteor/mongo';
 
 export default () => {
diff --git a/app/version-check/server/server.js b/app/version-check/server/index.js
similarity index 100%
rename from app/version-check/server/server.js
rename to app/version-check/server/index.js
diff --git a/app/videobridge/index.js b/app/videobridge/index.js
deleted file mode 100644
index a67eca871efb..000000000000
--- a/app/videobridge/index.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isClient) {
-	module.exports = require('./client/index.js');
-}
-if (Meteor.isServer) {
-	module.exports = require('./server/index.js');
-}
diff --git a/app/webdav/index.js b/app/webdav/index.js
deleted file mode 100644
index a67eca871efb..000000000000
--- a/app/webdav/index.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isClient) {
-	module.exports = require('./client/index.js');
-}
-if (Meteor.isServer) {
-	module.exports = require('./server/index.js');
-}
diff --git a/app/webrtc/index.js b/app/webrtc/index.js
deleted file mode 100644
index a67eca871efb..000000000000
--- a/app/webrtc/index.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isClient) {
-	module.exports = require('./client/index.js');
-}
-if (Meteor.isServer) {
-	module.exports = require('./server/index.js');
-}
diff --git a/app/wordpress/index.js b/app/wordpress/index.js
deleted file mode 100644
index a67eca871efb..000000000000
--- a/app/wordpress/index.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isClient) {
-	module.exports = require('./client/index.js');
-}
-if (Meteor.isServer) {
-	module.exports = require('./server/index.js');
-}
diff --git a/client/importPackages.js b/client/importPackages.js
index 1726c6826124..6218bde36789 100644
--- a/client/importPackages.js
+++ b/client/importPackages.js
@@ -1,110 +1,109 @@
-import '../app/cors';
-import '../app/2fa';
-import '../app/analytics';
+import '../app/cors/client';
+import '../app/2fa/client';
+import '../app/analytics/client';
 import '../app/authorization';
-import '../app/autolinker';
-import '../app/autotranslate';
-import '../app/cas';
+import '../app/autolinker/client';
+import '../app/autotranslate/client';
+import '../app/cas/client';
 import '../app/channel-settings';
-import '../app/channel-settings-mail-messages';
-import '../app/cloud';
-import '../app/colors';
-import '../app/crowd';
+import '../app/channel-settings-mail-messages/client';
+import '../app/cloud/client';
+import '../app/colors/client';
+import '../app/crowd/client';
 import '../app/custom-oauth';
-import '../app/custom-sounds';
-import '../app/dolphin';
-import '../app/drupal';
+import '../app/custom-sounds/client';
+import '../app/dolphin/client';
+import '../app/drupal/client';
 import '../app/emoji';
-import '../app/emoji-custom';
-import '../app/emoji-emojione';
+import '../app/emoji-custom/client';
+import '../app/emoji-emojione/client';
 import '../app/favico';
-import '../app/federation';
+import '../app/federation/client';
 import '../app/file-upload';
-import '../app/github-enterprise';
-import '../app/gitlab';
-import '../app/google-vision';
+import '../app/github-enterprise/client';
+import '../app/gitlab/client';
+import '../app/google-vision/client';
 import '../app/highlight-words';
-import '../app/iframe-login';
-import '../app/importer';
-import '../app/importer-csv';
-import '../app/importer-hipchat';
-import '../app/importer-hipchat-enterprise';
-import '../app/importer-slack';
-import '../app/importer-slack-users';
-import '../app/integrations';
-import '../app/issuelinks';
-import '../app/katex';
-import '../app/ldap';
+import '../app/iframe-login/client';
+import '../app/importer/client';
+import '../app/importer-csv/client';
+import '../app/importer-hipchat/client';
+import '../app/importer-hipchat-enterprise/client';
+import '../app/importer-slack/client';
+import '../app/importer-slack-users/client';
+import '../app/integrations/client';
+import '../app/issuelinks/client';
+import '../app/katex/client';
+import '../app/ldap/client';
 import '../app/lib';
-import '../app/livestream';
+import '../app/livestream/client';
 import '../app/logger';
-import '../app/token-login';
-import '../app/mapview';
-import '../app/markdown';
-import '../app/mentions';
-import '../app/mentions-flextab';
+import '../app/token-login/client';
+import '../app/mapview/client';
+import '../app/markdown/client';
+import '../app/mentions/client';
+import '../app/mentions-flextab/client';
 import '../app/message-action';
 import '../app/message-attachments';
-import '../app/message-mark-as-unread';
-import '../app/message-pin';
-import '../app/message-snippet';
-import '../app/message-star';
-import '../app/oauth2-server-config';
-import '../app/oembed';
-import '../app/otr';
-import '../app/push-notifications';
-import '../app/apps';
-import '../app/setup-wizard';
-import '../app/slackbridge';
-import '../app/slashcommands-archiveroom';
-import '../app/slashcommand-asciiarts';
-import '../app/slashcommands-create';
-import '../app/slashcommands-hide';
-import '../app/slashcommands-invite';
-import '../app/slashcommands-inviteall';
-import '../app/slashcommands-join';
-import '../app/slashcommands-kick';
+import '../app/message-mark-as-unread/client';
+import '../app/message-pin/client';
+import '../app/message-snippet/client';
+import '../app/message-star/client';
+import '../app/oauth2-server-config/client';
+import '../app/oembed/client';
+import '../app/otr/client';
+import '../app/push-notifications/client';
+import '../app/apps/client';
+import '../app/setup-wizard/client';
+import '../app/slackbridge/client';
+import '../app/slashcommands-archiveroom/client';
+import '../app/slashcommand-asciiarts/client';
+import '../app/slashcommands-create/client';
+import '../app/slashcommands-hide/client';
+import '../app/slashcommands-invite/client';
+import '../app/slashcommands-inviteall/client';
+import '../app/slashcommands-join/client';
+import '../app/slashcommands-kick/client';
 import '../app/slashcommands-open';
-import '../app/slashcommands-topic';
-import '../app/slashcommands-unarchiveroom';
+import '../app/slashcommands-topic/client';
+import '../app/slashcommands-unarchiveroom/client';
 import '../app/slider';
-import '../app/spotify';
-import '../app/statistics';
-import '../app/theme';
-import '../app/tokenpass';
+import '../app/spotify/client';
+import '../app/theme/client';
+import '../app/tokenpass/client';
 import '../app/tooltip';
 import '../app/ui';
 import '../app/ui-account';
-import '../app/ui-admin';
+import '../app/ui-admin/client';
 import '../app/ui-clean-history';
 import '../app/ui-flextab';
 import '../app/ui-login';
-import '../app/ui-master';
+import '../app/ui-master/client';
 import '../app/ui-message';
 import '../app/ui-sidenav';
-import '../app/ui-vrecord';
-import '../app/videobridge';
-import '../app/webdav';
-import '../app/webrtc';
-import '../app/wordpress';
+import '../app/ui-vrecord/client';
+import '../app/videobridge/client';
+import '../app/webdav/client';
+import '../app/webrtc/client';
+import '../app/wordpress/client';
 import '../app/nrr';
-import '../app/meteor-accounts-saml';
-import '../app/e2e';
-import '../app/blockstack';
-import '../app/version-check';
-import '../app/search';
-import '../app/chatpal-search';
+import '../app/meteor-accounts-saml/client';
+import '../app/e2e/client';
+import '../app/blockstack/client';
+import '../app/version-check/client';
+import '../app/search/client';
+import '../app/chatpal-search/client';
 import '../app/lazy-load';
-import '../app/discussion';
-import '../app/mail-messages';
+import '../app/discussion/client';
+import '../app/mail-messages/client';
 import '../app/utils';
 import '../app/settings';
 import '../app/models';
 import '../app/callbacks';
 import '../app/notifications';
-import '../app/promises';
+import '../app/promises/client';
 import '../app/ui-utils';
 import '../app/ui-cached-collection';
 import '../app/action-links';
-import '../app/reactions';
-import '../app/livechat';
+import '../app/reactions/client';
+import '../app/livechat/client';
diff --git a/server/importPackages.js b/server/importPackages.js
index 8f29cef9eb0b..c95d56077667 100644
--- a/server/importPackages.js
+++ b/server/importPackages.js
@@ -1,118 +1,117 @@
-import '../app/cors';
+import '../app/cors/server';
 import '../app/sms';
-import '../app/2fa';
+import '../app/2fa/server';
 import '../app/accounts';
-import '../app/analytics';
+import '../app/analytics/server';
 import '../app/api';
 import '../app/assets';
 import '../app/authorization';
-import '../app/autolinker';
-import '../app/autotranslate';
+import '../app/autolinker/server';
+import '../app/autotranslate/server';
 import '../app/bot-helpers';
-import '../app/cas';
+import '../app/cas/server';
 import '../app/channel-settings';
-import '../app/channel-settings-mail-messages';
-import '../app/cloud';
-import '../app/colors';
-import '../app/crowd';
+import '../app/channel-settings-mail-messages/server';
+import '../app/cloud/server';
+import '../app/colors/server';
+import '../app/crowd/server';
 import '../app/custom-oauth';
-import '../app/custom-sounds';
-import '../app/dolphin';
-import '../app/drupal';
+import '../app/custom-sounds/server';
+import '../app/dolphin/server';
+import '../app/drupal/server';
 import '../app/emoji';
-import '../app/emoji-custom';
-import '../app/emoji-emojione';
+import '../app/emoji-custom/server';
+import '../app/emoji-emojione/server';
 import '../app/error-handler';
-import '../app/federation';
+import '../app/federation/server';
 import '../app/file';
 import '../app/file-upload';
-import '../app/github-enterprise';
-import '../app/gitlab';
-import '../app/google-vision';
+import '../app/github-enterprise/server';
+import '../app/gitlab/server';
+import '../app/google-vision/server';
 import '../app/grant';
 import '../app/grant-facebook';
 import '../app/grant-github';
 import '../app/grant-google';
 import '../app/graphql';
-import '../app/iframe-login';
-import '../app/importer';
-import '../app/importer-csv';
-import '../app/importer-hipchat';
-import '../app/importer-hipchat-enterprise';
-import '../app/importer-slack';
-import '../app/importer-slack-users';
-import '../app/integrations';
+import '../app/iframe-login/server';
+import '../app/importer/server';
+import '../app/importer-csv/server';
+import '../app/importer-hipchat/server';
+import '../app/importer-hipchat-enterprise/server';
+import '../app/importer-slack/server';
+import '../app/importer-slack-users/server';
+import '../app/integrations/server';
 import '../app/irc';
-import '../app/issuelinks';
-import '../app/katex';
-import '../app/ldap';
+import '../app/issuelinks/server';
+import '../app/katex/server';
+import '../app/ldap/server';
 import '../app/lib';
-import '../app/livestream';
+import '../app/livestream/server';
 import '../app/logger';
-import '../app/token-login';
+import '../app/token-login/server';
 import '../app/mailer';
-import '../app/mapview';
-import '../app/markdown';
-import '../app/mentions';
-import '../app/mentions-flextab';
-import '../app/message-mark-as-unread';
-import '../app/message-pin';
-import '../app/message-snippet';
-import '../app/message-star';
+import '../app/mapview/server';
+import '../app/markdown/server';
+import '../app/mentions/server';
+import '../app/mentions-flextab/server';
+import '../app/message-mark-as-unread/server';
+import '../app/message-pin/server';
+import '../app/message-snippet/server';
+import '../app/message-star/server';
 import '../app/migrations';
-import '../app/oauth2-server-config';
-import '../app/oembed';
-import '../app/otr';
-import '../app/push-notifications';
+import '../app/oauth2-server-config/server';
+import '../app/oembed/server';
+import '../app/otr/server';
+import '../app/push-notifications/server';
 import '../app/retention-policy';
-import '../app/apps';
-import '../app/setup-wizard';
-import '../app/slackbridge';
-import '../app/slashcommands-archiveroom';
-import '../app/slashcommand-asciiarts';
-import '../app/slashcommands-create';
+import '../app/apps/server';
+import '../app/setup-wizard/server';
+import '../app/slackbridge/server';
+import '../app/slashcommands-archiveroom/server';
+import '../app/slashcommand-asciiarts/server';
+import '../app/slashcommands-create/server';
 import '../app/slashcommands-help';
-import '../app/slashcommands-hide';
-import '../app/slashcommands-invite';
-import '../app/slashcommands-inviteall';
-import '../app/slashcommands-join';
-import '../app/slashcommands-kick';
+import '../app/slashcommands-hide/server';
+import '../app/slashcommands-invite/server';
+import '../app/slashcommands-inviteall/server';
+import '../app/slashcommands-join/server';
+import '../app/slashcommands-kick/server';
 import '../app/slashcommands-leave';
 import '../app/slashcommands-me';
 import '../app/slashcommands-msg';
 import '../app/slashcommands-mute';
-import '../app/slashcommands-topic';
-import '../app/slashcommands-unarchiveroom';
+import '../app/slashcommands-topic/server';
+import '../app/slashcommands-unarchiveroom/server';
 import '../app/smarsh-connector';
-import '../app/spotify';
-import '../app/statistics';
-import '../app/theme';
-import '../app/tokenpass';
-import '../app/ui-admin';
-import '../app/ui-master';
-import '../app/ui-vrecord';
+import '../app/spotify/server';
+import '../app/theme/server';
+import '../app/tokenpass/server';
+import '../app/ui-admin/server';
+import '../app/ui-master/server';
+import '../app/ui-vrecord/server';
 import '../app/user-data-download';
-import '../app/videobridge';
-import '../app/webdav';
-import '../app/webrtc';
-import '../app/wordpress';
-import '../app/meteor-accounts-saml';
-import '../app/e2e';
-import '../app/blockstack';
-import '../app/version-check';
-import '../app/search';
-import '../app/chatpal-search';
-import '../app/discussion';
+import '../app/videobridge/server';
+import '../app/webdav/server';
+import '../app/webrtc/server';
+import '../app/wordpress/server';
+import '../app/meteor-accounts-saml/server';
+import '../app/e2e/server';
+import '../app/blockstack/server';
+import '../app/version-check/server';
+import '../app/search/server';
+import '../app/chatpal-search/server';
+import '../app/discussion/server';
 import '../app/bigbluebutton';
-import '../app/mail-messages';
+import '../app/mail-messages/server';
 import '../app/utils';
 import '../app/settings';
 import '../app/models';
 import '../app/metrics';
 import '../app/callbacks';
 import '../app/notifications';
-import '../app/promises';
+import '../app/promises/server';
 import '../app/ui-utils';
 import '../app/action-links';
-import '../app/reactions';
-import '../app/livechat';
+import '../app/reactions/server';
+import '../app/livechat/server';
diff --git a/server/lib/cordova.js b/server/lib/cordova.js
index 982e7afed5fc..57a27a0e4fae 100644
--- a/server/lib/cordova.js
+++ b/server/lib/cordova.js
@@ -2,7 +2,7 @@ import { Meteor } from 'meteor/meteor';
 import { HTTP } from 'meteor/http';
 import { TAPi18n } from 'meteor/tap:i18n';
 import { SystemLogger } from '../../app/logger';
-import { getWorkspaceAccessToken } from '../../app/cloud';
+import { getWorkspaceAccessToken } from '../../app/cloud/server';
 import { Push } from 'meteor/rocketchat:push';
 import { hasRole } from '../../app/authorization';
 import { settings } from '../../app/settings';
diff --git a/server/methods/browseChannels.js b/server/methods/browseChannels.js
index d636987aca74..12952f92be9d 100644
--- a/server/methods/browseChannels.js
+++ b/server/methods/browseChannels.js
@@ -4,7 +4,7 @@ import { hasPermission } from '../../app/authorization';
 import { Rooms, Users } from '../../app/models';
 import s from 'underscore.string';
 
-import { Federation } from '../../app/federation';
+import { Federation } from '../../app/federation/server';
 
 const sortChannels = function(field, direction) {
 	switch (field) {
diff --git a/server/methods/eraseRoom.js b/server/methods/eraseRoom.js
index 672d7d37c857..ffea46ee5137 100644
--- a/server/methods/eraseRoom.js
+++ b/server/methods/eraseRoom.js
@@ -3,7 +3,7 @@ import { check } from 'meteor/check';
 import { deleteRoom } from '../../app/lib';
 import { hasPermission } from '../../app/authorization';
 import { Rooms } from '../../app/models';
-import { Apps } from '../../app/apps';
+import { Apps } from '../../app/apps/server';
 import { roomTypes } from '../../app/utils';
 
 Meteor.methods({
diff --git a/server/startup/cron.js b/server/startup/cron.js
index 68eb4362b1ef..7149871300e5 100644
--- a/server/startup/cron.js
+++ b/server/startup/cron.js
@@ -1,7 +1,7 @@
 import { Meteor } from 'meteor/meteor';
 import { HTTP } from 'meteor/http';
 import { Logger } from '../../app/logger';
-import { getWorkspaceAccessToken } from '../../app/cloud';
+import { getWorkspaceAccessToken } from '../../app/cloud/server';
 import { SyncedCron } from 'meteor/littledata:synced-cron';
 import { statistics } from '../../app/statistics';
 import { settings } from '../../app/settings';
diff --git a/server/startup/migrations/v007.js b/server/startup/migrations/v007.js
index 9da470927265..c15edc158653 100644
--- a/server/startup/migrations/v007.js
+++ b/server/startup/migrations/v007.js
@@ -1,4 +1,4 @@
-import { OEmbed } from '../../../app/oembed';
+import { OEmbed } from '../../../app/oembed/server';
 import { Migrations } from '../../../app/migrations';
 import { Messages } from '../../../app/models';
 import _ from 'underscore';

From 26c3bb25bdfd64856deb2934d3dff1deb44b0e97 Mon Sep 17 00:00:00 2001
From: Guilherme Gazzo <guilhermegazzo@gmail.com>
Date: Tue, 26 Mar 2019 16:54:01 -0300
Subject: [PATCH 13/24] [FIX] VIDEO CALL/JITSI multiple calls before video call
 (#13855)

---
 app/videobridge/client/views/videoFlexTab.js  | 151 +++++++++---------
 app/videobridge/constants.js                  |   3 +
 .../server/methods/jitsiSetTimeout.js         |  22 ++-
 3 files changed, 97 insertions(+), 79 deletions(-)
 create mode 100644 app/videobridge/constants.js

diff --git a/app/videobridge/client/views/videoFlexTab.js b/app/videobridge/client/views/videoFlexTab.js
index d1c1dc097f56..8abfa4d9db36 100644
--- a/app/videobridge/client/views/videoFlexTab.js
+++ b/app/videobridge/client/views/videoFlexTab.js
@@ -4,6 +4,8 @@ import { Template } from 'meteor/templating';
 import { settings } from '../../../settings';
 import { modal, TabBar } from '../../../ui-utils';
 import { t } from '../../../utils';
+import { Users, Rooms } from '../../../models';
+import * as CONSTANTS from '../../constants';
 
 Template.videoFlexTab.helpers({
 	openInNewWindow() {
@@ -14,11 +16,14 @@ Template.videoFlexTab.helpers({
 Template.videoFlexTab.onCreated(function() {
 	this.tabBar = Template.currentData().tabBar;
 });
+Template.videoFlexTab.onDestroyed(function() {
+	return this.stop && this.stop();
+});
 
 Template.videoFlexTab.onRendered(function() {
 	this.api = null;
 
-	let timeOut = null;
+	const rid = Session.get('openedRoom');
 
 	const width = 'auto';
 	const height = 500;
@@ -40,6 +45,29 @@ Template.videoFlexTab.onRendered(function() {
 		TabBar.updateButton('video', { class: '' });
 	};
 
+	const stop = () => {
+		if (this.intervalHandler) {
+			Meteor.defer(() => this.api && this.api.dispose());
+			clearInterval(this.intervalHandler);
+		}
+	};
+
+	this.stop = stop;
+
+	const start = () => {
+		const update = () => {
+			const { jitsiTimeout } = Rooms.findOne({ _id: rid }, { fields: { jitsiTimeout: 1 }, reactive: false });
+
+			if (jitsiTimeout && (new Date() - new Date(jitsiTimeout) + CONSTANTS.TIMEOUT < CONSTANTS.DEBOUNCE)) {
+				return;
+			}
+			return Meteor.status().connected && Meteor.call('jitsi:updateTimeout', rid);
+		};
+		update();
+		this.intervalHandler = Meteor.setInterval(update, CONSTANTS.HEARTBEAT);
+		TabBar.updateButton('video', { class: 'red' });
+	};
+
 	modal.open({
 		title: t('Video_Conference'),
 		text: t('Start_video_call'),
@@ -52,86 +80,65 @@ Template.videoFlexTab.onRendered(function() {
 		if (!dismiss) {
 			return closePanel();
 		}
-		this.timeout = null;
+		this.intervalHandler = null;
 		this.autorun(() => {
-			if (settings.get('Jitsi_Enabled')) {
-				if (this.tabBar.getState() === 'opened') {
-					const roomId = Session.get('openedRoom');
+			if (!settings.get('Jitsi_Enabled')) {
+				return closePanel();
+			}
 
-					const domain = settings.get('Jitsi_Domain');
-					const jitsiRoom = settings.get('Jitsi_URL_Room_Prefix') + settings.get('uniqueID') + roomId;
-					const noSsl = !settings.get('Jitsi_SSL');
+			if (this.tabBar.getState() !== 'opened') {
+				TabBar.updateButton('video', { class: '' });
+				return stop();
+			}
 
-					if (jitsiRoomActive !== null && jitsiRoomActive !== jitsiRoom) {
-						jitsiRoomActive = null;
+			const domain = settings.get('Jitsi_Domain');
+			const jitsiRoom = settings.get('Jitsi_URL_Room_Prefix') + settings.get('uniqueID') + rid;
+			const noSsl = !settings.get('Jitsi_SSL');
 
-						closePanel();
+			if (jitsiRoomActive !== null && jitsiRoomActive !== jitsiRoom) {
+				jitsiRoomActive = null;
 
-						// Clean up and stop updating timeout.
-						Meteor.defer(() => this.api && this.api.dispose());
-						if (timeOut) {
-							clearInterval(timeOut);
-						}
-					} else {
-						jitsiRoomActive = jitsiRoom;
-
-						TabBar.updateButton('video', { class: 'red' });
-
-						if (settings.get('Jitsi_Open_New_Window')) {
-							Meteor.call('jitsi:updateTimeout', roomId);
-
-							timeOut = Meteor.setInterval(() => Meteor.call('jitsi:updateTimeout', roomId), 10 * 1000);
-							const newWindow = window.open(`${ (noSsl ? 'http://' : 'https://') + domain }/${ jitsiRoom }`, jitsiRoom);
-							const closeInterval = setInterval(() => {
-								if (newWindow.closed !== false) {
-									closePanel();
-									clearInterval(closeInterval);
-									clearInterval(timeOut);
-								}
-							}, 300);
-							if (newWindow) {
-								newWindow.focus();
-							}
-
-
-						// Lets make sure its loaded before we try to show it.
-						} else if (typeof JitsiMeetExternalAPI !== 'undefined') {
-
-							// Keep it from showing duplicates when re-evaluated on variable change.
-							if (!$('[id^=jitsiConference]').length) {
-								this.api = new JitsiMeetExternalAPI(domain, jitsiRoom, width, height, this.$('.video-container').get(0), configOverwrite, interfaceConfigOverwrite, noSsl);
-
-								/*
-								* Hack to send after frame is loaded.
-								* postMessage converts to events in the jitsi meet iframe.
-								* For some reason those aren't working right.
-								*/
-								Meteor.setTimeout(() => {
-									this.api.executeCommand('displayName', [Meteor.user().name]);
-								}, 5000);
-
-								Meteor.call('jitsi:updateTimeout', roomId);
-
-								timeOut = Meteor.setInterval(() => Meteor.call('jitsi:updateTimeout', roomId), 10 * 1000);
-							}
-
-							// Execute any commands that might be reactive.  Like name changing.
-							this.api && this.api.executeCommand('displayName', [Meteor.user().name]);
+				closePanel();
+
+				return stop();
+			}
+
+			jitsiRoomActive = jitsiRoom;
+
+			if (settings.get('Jitsi_Open_New_Window')) {
+				start();
+				const newWindow = window.open(`${ (noSsl ? 'http://' : 'https://') + domain }/${ jitsiRoom }`, jitsiRoom);
+				if (newWindow) {
+					const closeInterval = setInterval(() => {
+						if (newWindow.closed === false) {
+							return;
 						}
-					}
-				} else {
-					TabBar.updateButton('video', { class: '' });
-
-					// Clean up and stop updating timeout.
-					if (timeOut) {
-						Meteor.defer(() => this.api && this.api.dispose());
-						clearInterval(timeOut);
-					}
+						closePanel();
+						stop();
+						clearInterval(closeInterval);
+					}, 300);
+					return newWindow.focus();
 				}
-
 			}
 
+			if (typeof JitsiMeetExternalAPI !== 'undefined') {
+				// Keep it from showing duplicates when re-evaluated on variable change.
+				const name = Users.findOne(Meteor.userId(), { fields: { name: 1 } });
+				if (!$('[id^=jitsiConference]').length) {
+					this.api = new JitsiMeetExternalAPI(domain, jitsiRoom, width, height, this.$('.video-container').get(0), configOverwrite, interfaceConfigOverwrite, noSsl);
+
+					/*
+					* Hack to send after frame is loaded.
+					* postMessage converts to events in the jitsi meet iframe.
+					* For some reason those aren't working right.
+					*/
+					Meteor.setTimeout(() => this.api.executeCommand('displayName', [name]), 5000);
+					return start();
+				}
+
+				// Execute any commands that might be reactive.  Like name changing.
+				this.api && this.api.executeCommand('displayName', [name]);
+			}
 		});
 	});
 });
-
diff --git a/app/videobridge/constants.js b/app/videobridge/constants.js
new file mode 100644
index 000000000000..14cec201fbcb
--- /dev/null
+++ b/app/videobridge/constants.js
@@ -0,0 +1,3 @@
+export const TIMEOUT = 30 * 1000;
+export const HEARTBEAT = TIMEOUT / 3;
+export const DEBOUNCE = HEARTBEAT / 2;
diff --git a/app/videobridge/server/methods/jitsiSetTimeout.js b/app/videobridge/server/methods/jitsiSetTimeout.js
index 4b1c4c22017c..763940e55c45 100644
--- a/app/videobridge/server/methods/jitsiSetTimeout.js
+++ b/app/videobridge/server/methods/jitsiSetTimeout.js
@@ -1,7 +1,10 @@
 import { Meteor } from 'meteor/meteor';
 import { TAPi18n } from 'meteor/tap:i18n';
+
 import { Rooms, Messages } from '../../../models';
 import { callbacks } from '../../../callbacks';
+import * as CONSTANTS from '../../constants';
+import { canAccessRoom } from '../../../authorization/server';
 
 Meteor.methods({
 	'jitsi:updateTimeout': (rid) => {
@@ -11,18 +14,25 @@ Meteor.methods({
 		}
 
 		const room = Rooms.findOneById(rid);
+
+		if (!canAccessRoom(room, Meteor.user())) {
+			throw new Meteor.Error('error-not-allowerd', 'not allowed', { method: 'jitsi:updateTimeout' });
+		}
+
 		const currentTime = new Date().getTime();
 
-		const jitsiTimeout = new Date((room && room.jitsiTimeout) || currentTime).getTime();
+		const jitsiTimeout = room.jitsiTimeout && new Date(room.jitsiTimeout).getTime();
+
+		if (!jitsiTimeout || currentTime > jitsiTimeout - CONSTANTS.TIMEOUT / 2) {
+			Rooms.setJitsiTimeout(rid, new Date(currentTime + CONSTANTS.TIMEOUT));
+		}
 
-		if (jitsiTimeout <= currentTime) {
-			Rooms.setJitsiTimeout(rid, new Date(currentTime + 35 * 1000));
+		if (!jitsiTimeout || currentTime > jitsiTimeout) {
 			const message = Messages.createWithTypeRoomIdMessageAndUser('jitsi_call_started', rid, '', Meteor.user(), {
 				actionLinks : [
 					{ icon: 'icon-videocam', label: TAPi18n.__('Click_to_join'), method_id: 'joinJitsiCall', params: '' },
 				],
 			});
-			const room = Rooms.findOneById(rid);
 			message.msg = TAPi18n.__('Started_a_video_call');
 			message.mentions = [
 				{
@@ -30,9 +40,7 @@ Meteor.methods({
 					username:'here',
 				},
 			];
-			callbacks.run('afterSaveMessage', message, room);
-		} else if ((jitsiTimeout - currentTime) / 1000 <= 15) {
-			Rooms.setJitsiTimeout(rid, new Date(jitsiTimeout + 25 * 1000));
+			callbacks.run('afterSaveMessage', message, { ...room, jitsiTimeout: currentTime + CONSTANTS.TIMEOUT });
 		}
 	},
 });

From 607729b4fbf14537f1a9e14f62b8bbbc69504cf3 Mon Sep 17 00:00:00 2001
From: Diego Sampaio <chinello@gmail.com>
Date: Tue, 26 Mar 2019 17:43:04 -0300
Subject: [PATCH 14/24] Fix missing dependencies on stretch CI image (#13910)

---
 .circleci/config.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 2a0ba5e37f40..47e624963832 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -269,9 +269,9 @@ jobs:
             if [[ $CIRCLE_PULL_REQUESTS ]]; then exit 0; fi;
 
             sudo apt-get -y -qq update
-            sudo apt-get -y -qq install python3.4-dev
+            sudo apt-get -y -qq install python3.5-dev
             curl -O https://bootstrap.pypa.io/get-pip.py
-            python3.4 get-pip.py --user
+            python3.5 get-pip.py --user
             export PATH=~/.local/bin:$PATH
             pip install awscli --upgrade --user
 

From c98fd21026f2763894499b8e37d3604c2a9f6c9d Mon Sep 17 00:00:00 2001
From: Diego Sampaio <chinello@gmail.com>
Date: Tue, 26 Mar 2019 19:00:12 -0300
Subject: [PATCH 15/24] [FIX] Avatar image being shrinked on autocomplete
 (#13914)

---
 app/theme/client/imports/forms/popup-list.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/theme/client/imports/forms/popup-list.css b/app/theme/client/imports/forms/popup-list.css
index 1a6a8138c55e..1abcc9ca6fa0 100644
--- a/app/theme/client/imports/forms/popup-list.css
+++ b/app/theme/client/imports/forms/popup-list.css
@@ -42,6 +42,7 @@
 			width: 32px;
 			height: 32px;
 			margin-right: 1rem;
+			flex-shrink: 0;
 		}
 
 		&-name {

From 7c2d680b3273c6c996a6e633f63b7de2de4d46e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oliver=20J=C3=A4gle?= <mrsimpson@users.noreply.github.com>
Date: Wed, 27 Mar 2019 21:11:59 +0100
Subject: [PATCH 16/24] [NEW] Add message action to copy message to input as
 reply (#12626)

---
 app/message-action/client/messageAction.html |  4 ++--
 app/message-action/client/messageAction.js   |  3 +++
 app/ui/client/views/app/room.js              | 10 ++++++++++
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/app/message-action/client/messageAction.html b/app/message-action/client/messageAction.html
index 872c52d58bb3..8d6c73566772 100644
--- a/app/message-action/client/messageAction.html
+++ b/app/message-action/client/messageAction.html
@@ -9,7 +9,7 @@
 				{{/if}}
 
 				{{#if msg_in_chat_window}}
-					<button class="js-actionButton-sendMessage" value="{{msg}}">
+					<button class="{{jsActionButtonClassname msg_processing_type}}" value="{{msg}}">
 						<img class="image-button" src="{{image_url}}" />
 					</button>
 				{{/if}}
@@ -21,7 +21,7 @@
 					</a>
 				{{/if}}
 				{{#if msg_in_chat_window}}
-					<button class="text-button js-actionButton-sendMessage" value="{{msg}}">
+					<button class="text-button {{jsActionButtonClassname msg_processing_type}}" value="{{msg}}">
 						<span class="overflow-ellipsis">{{text}}</span>
 					</button>
 				{{/if}}
diff --git a/app/message-action/client/messageAction.js b/app/message-action/client/messageAction.js
index 8ec8fcee03c3..025c06db224a 100644
--- a/app/message-action/client/messageAction.js
+++ b/app/message-action/client/messageAction.js
@@ -7,4 +7,7 @@ Template.messageAction.helpers({
 	areButtonsHorizontal() {
 		return Template.parentData(1).button_alignment === 'horizontal';
 	},
+	jsActionButtonClassname(processingType) {
+		return `js-actionButton-${ processingType || 'sendMessage' }`;
+	},
 });
diff --git a/app/ui/client/views/app/room.js b/app/ui/client/views/app/room.js
index b3e5da3b789d..69f739323705 100644
--- a/app/ui/client/views/app/room.js
+++ b/app/ui/client/views/app/room.js
@@ -856,6 +856,16 @@ Template.room.events({
 			Meteor.call('sendMessage', msgObject);
 		});
 	},
+	'click .js-actionButton-respondWithMessage'(event) {
+		const msg = event.currentTarget.value;
+		if (!msg) {
+			return;
+		}
+
+		const { input } = chatMessages[RoomManager.openedRoom];
+		input.value = msg;
+		input.focus();
+	},
 	'click .js-navigate-to-discussion'(event) {
 		event.preventDefault();
 		const [, { drid }] = this._arguments;

From fd817b2b14d65fcdc5280ed9dd6c6da64680a69c Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Wed, 27 Mar 2019 22:40:56 -0300
Subject: [PATCH 17/24] [NEW] Marketplace integration with Rocket.Chat Cloud
 (#13809)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Add the cloud token to the marketplace calls

* Switch the app downloading to the server

* Implement some of the buying an app iframe

* Show when apps are purchased in the list

* Revert the committed change in the marketplace base url

* More work on enabling purchasing

* Install Apps from marketplace

* Missing fixes on rebase

* Improve marketplace design

* Improve view of app’s logs

* Move buttons of app details to header

* Fix mispeling

* Fix purchase/download flow

* Enable checking for updates for an app based upon the version of the engine

* Disable a possible issue with installation of apps

* Perform app downloads with a special short lived token for app download only

* Fix imports

* Fix layout of app details on old chrome and safari

* Re enable upload button adding a setting for development mode

* Change download encoding to binary

* Add iframe loading

* Fix some UI problems
---
 app/apps/assets/stylesheets/apps.css          |  77 ++++++-
 app/apps/client/admin/appLogs.html            |  51 ++---
 app/apps/client/admin/appLogs.js              |  55 +++--
 app/apps/client/admin/appManage.html          |  23 +-
 app/apps/client/admin/appManage.js            | 197 +++++++++++-------
 app/apps/client/admin/apps.html               |  74 ++++---
 app/apps/client/admin/apps.js                 | 128 ++++++++----
 .../admin/modalTemplates/iframeModal.html     |   7 +
 .../admin/modalTemplates/iframeModal.js       |  48 +++++
 app/apps/client/index.js                      |   3 +
 app/apps/server/bridges/api.js                |   6 +-
 app/apps/server/bridges/commands.js           |  12 +-
 app/apps/server/bridges/environmental.js      |   6 +-
 app/apps/server/bridges/http.js               |   2 +-
 app/apps/server/bridges/listeners.js          |   8 +-
 app/apps/server/bridges/messages.js           |  14 +-
 app/apps/server/bridges/persistence.js        |  18 +-
 app/apps/server/bridges/rooms.js              |  16 +-
 app/apps/server/bridges/settings.js           |  12 +-
 app/apps/server/bridges/users.js              |   4 +-
 app/apps/server/communication/rest.js         | 172 +++++++++++++--
 app/apps/server/orchestrator.js               |  28 +++
 .../functions/getWorkspaceAccessToken.js      |  16 +-
 .../imports/components/modal/directory.css    |   5 -
 app/ui/client/components/header/header.html   |   6 +-
 packages/rocketchat-i18n/i18n/en.i18n.json    |  10 +-
 26 files changed, 716 insertions(+), 282 deletions(-)
 create mode 100644 app/apps/client/admin/modalTemplates/iframeModal.html
 create mode 100644 app/apps/client/admin/modalTemplates/iframeModal.js

diff --git a/app/apps/assets/stylesheets/apps.css b/app/apps/assets/stylesheets/apps.css
index eac6f67a75db..aa14c5e74545 100644
--- a/app/apps/assets/stylesheets/apps.css
+++ b/app/apps/assets/stylesheets/apps.css
@@ -83,6 +83,7 @@
 	}
 
 	.rc-apps-container {
+		margin-top: 0;
 		padding-bottom: 15px;
 	}
 
@@ -97,9 +98,20 @@
 		margin-top: 6px;
 	} */
 
-	.rc-header .rc-button {
-		min-height: 0;
-		margin: 0;
+	.content {
+		/* display: block !important; */
+		padding: 0 !important;
+
+		> .rc-apps-container {
+			display: block;
+			overflow-y: scroll;
+
+			padding: 0 !important;
+		}
+
+		> .rc-apps-details {
+			display: block;
+		}
 	}
 
 	.rc-apps-category {
@@ -143,19 +155,56 @@
 	}
 
 	.rc-table-info {
+		height: 40px;
 		margin: 0 7px;
 	}
 
+	.rc-app-price {
+		position: relative;
+		top: -3px;
+	}
+
+	.rc-table-td--medium {
+		width: 300px;
+	}
+
+	.rc-table td {
+		padding: 0.5rem 0;
+
+		padding-right: 10px;
+	}
+
+	td.rc-apps-marketplace-price {
+		text-align: right;
+
+		button {
+			font-weight: 600;
+		}
+
+		.rc-icon {
+			color: #3582f3;
+		}
+	}
+
+	th.rc-apps-marketplace-price {
+		width: 120px;
+	}
+
 	&__wrap-actions {
-		& > .rc-icon--loading {
+		& > .loading {
 			display: none;
 		}
 
 		&.loading {
-			& > .rc-icon--loading {
+			& > .loading {
 				display: block;
 
-				animation: spin 1s linear infinite;
+				font-size: 11px;
+				font-weight: 600;
+
+				& > .rc-icon--loading {
+					animation: spin 1s linear infinite;
+				}
 			}
 
 			& > .apps-installer {
@@ -163,6 +212,22 @@
 			}
 		}
 	}
+
+	.arrow-up {
+		transform: rotate(180deg);
+	}
+
+	&.page-settings {
+		.section {
+			padding: 0 !important;
+
+			border-bottom: none !important;
+
+			&:hover {
+				background-color: var(--rc-color-primary-lightest);
+			}
+		}
+	}
 }
 
 @keyframes play90 {
diff --git a/app/apps/client/admin/appLogs.html b/app/apps/client/admin/appLogs.html
index 68361e7e694d..47e901331c89 100644
--- a/app/apps/client/admin/appLogs.html
+++ b/app/apps/client/admin/appLogs.html
@@ -1,24 +1,21 @@
 <template name="appLogs">
 	{{#with app}}
-		<section class="page-container page-list page-settings flex-tab-main-content">
-			<header class="fixed-title">
-				{{> burger}}
-				<a href="{{pathFor "app-manage" appId=id}}" title="{{_ "Back_to_Manage_Apps"}}">
-					<i class="icon-left-open"></i>
-				</a> &nbsp;
+		<section class="page-container page-list page-settings flex-tab-main-content rc-apps-marketplace">
+			{{# header rawSectionName=title fixedHeight=true hideHelp=true fullpage=true}}
+				<div class="rc-header__block rc-header__block-action">
+					<button class="rc-button rc-button--primary js-refresh">
+						{{> icon icon="reload" block="rc-icon--default-size"}} {{_ "Refresh"}}
+					</button>
+					<button class="rc-button rc-button--nude js-cancel">{{> icon icon="cross"}}</button>
 
-				{{#if isReady}}
-					<h2>
-						<span class="room-title">{{_ "View_the_Logs_for" name=name}}</span>
-					</h2>
-				{{/if}}
+				</div>
+			{{/header}}
+			<div class="content">
 				{{#if hasError}}
 					<h2>
 						<span class="room-title">{{ theError }}</span>
 					</h2>
 				{{/if}}
-			</header>
-			<div class="content">
 				{{#if isReady}}
 					<div class="rocket-form">
 						{{#each log in logs}}
@@ -28,30 +25,18 @@ <h2>
 										{{formatDate log._createdAt}}: "{{log.method}}" ({{log.totalTime}}ms)
 									</div>
 									<div class="section-title-right">
-										<button class="button primary expand">
-											<span>{{_ "Expand"}}</span>
+										<button class="rc-button rc-button--nude button-down">
+											{{> icon icon="arrow-down" block="rc-icon--default-size"}}
 										</button>
 									</div>
 								</div>
 								<div class="section-content">
-									<h4>General Information</h4>
-									<ul>
-										<li>Method: {{ log.method }}</li>
-										<li>Start Time: {{ log.startTime }}</li>
-										<li>End Time: {{ log.endTime }}</li>
-										<li>Total Time: {{ log.totalTime }}ms</li>
-										<li>Log Entries: {{ log.entries.length }}</li>
-									</ul>
-
-									<h4>Log Entries</h4>
-									<ul>
-										{{#each entry in log.entries}}
-											<li>Timestamp: {{ entry.timestamp }}</li>
-											<li>Severity: {{ entry.severity }}</li>
-											<li>Caller: {{ entry.caller }}</li>
-											<li>Arguments: <pre><code class="code-colors hljs json">{{{ jsonStringify entry.args }}}</code></pre></li>
-										{{/each}}
-									</ul>
+									{{#each entry in log.entries}}
+										<div>{{ entry.severity }}: {{ entry.timestamp }} (Caller: {{ entry.caller }})</div>
+										<div>
+											<pre><code class="code-colors hljs json">{{{ jsonStringify entry.args }}}</code></pre>
+										</div>
+									{{/each}}
 								</div>
 							</div>
 						{{/each}}
diff --git a/app/apps/client/admin/appLogs.js b/app/apps/client/admin/appLogs.js
index be5803fc7158..898360767aab 100644
--- a/app/apps/client/admin/appLogs.js
+++ b/app/apps/client/admin/appLogs.js
@@ -6,30 +6,32 @@ import { APIClient } from '../../../utils';
 import moment from 'moment';
 import hljs from 'highlight.js';
 
-Template.appLogs.onCreated(function() {
-	const instance = this;
-	this.id = new ReactiveVar(FlowRouter.getParam('appId'));
-	this.ready = new ReactiveVar(false);
-	this.hasError = new ReactiveVar(false);
-	this.theError = new ReactiveVar('');
-	this.app = new ReactiveVar({});
-	this.logs = new ReactiveVar([]);
-
-	const id = this.id.get();
-
+const loadData = (instance) => {
 	Promise.all([
-		APIClient.get(`apps/${ id }`),
-		APIClient.get(`apps/${ id }/logs`),
+		APIClient.get(`apps/${ instance.id.get() }`),
+		APIClient.get(`apps/${ instance.id.get() }/logs`),
 	]).then((results) => {
 
 		instance.app.set(results[0].app);
 		instance.logs.set(results[1].logs);
 
-		this.ready.set(true);
+		instance.ready.set(true);
 	}).catch((e) => {
 		instance.hasError.set(true);
 		instance.theError.set(e.message);
 	});
+};
+
+Template.appLogs.onCreated(function() {
+	const instance = this;
+	this.id = new ReactiveVar(FlowRouter.getParam('appId'));
+	this.ready = new ReactiveVar(false);
+	this.hasError = new ReactiveVar(false);
+	this.theError = new ReactiveVar('');
+	this.app = new ReactiveVar({});
+	this.logs = new ReactiveVar([]);
+
+	loadData(instance);
 });
 
 Template.appLogs.helpers({
@@ -76,16 +78,29 @@ Template.appLogs.helpers({
 
 		return value.replace(/\\\\n/g, '<br>');
 	},
+	title() {
+		return TAPi18n.__('View_the_Logs_for', { name: Template.instance().app.get().name });
+	},
 });
 
 Template.appLogs.events({
-	'click .expand': (e) => {
-		$(e.currentTarget).closest('.section').removeClass('section-collapsed');
-		$(e.currentTarget).closest('button').removeClass('expand').addClass('collapse').find('span').text(TAPi18n.__('Collapse'));
+	'click .section-collapsed .section-title': (e) => {
+		$(e.currentTarget).closest('.section').removeClass('section-collapsed').addClass('section-expanded');
+		$(e.currentTarget).find('.button-down').addClass('arrow-up');
+	},
+
+	'click .section-expanded .section-title': (e) => {
+		$(e.currentTarget).closest('.section').removeClass('section-expanded').addClass('section-collapsed');
+		$(e.currentTarget).find('.button-down').removeClass('arrow-up');
+	},
+
+	'click .js-cancel': (e, t) => {
+		FlowRouter.go('app-manage', { appId: t.app.get().id }, { version: FlowRouter.getQueryParam('version') });
 	},
 
-	'click .collapse': (e) => {
-		$(e.currentTarget).closest('.section').addClass('section-collapsed');
-		$(e.currentTarget).closest('button').addClass('expand').removeClass('collapse').find('span').text(TAPi18n.__('Expand'));
+	'click .js-refresh': (e, t) => {
+		t.ready.set(false);
+		t.logs.set([]);
+		loadData(t);
 	},
 });
diff --git a/app/apps/client/admin/appManage.html b/app/apps/client/admin/appManage.html
index 0b08aff6667b..a1f8aa659769 100644
--- a/app/apps/client/admin/appManage.html
+++ b/app/apps/client/admin/appManage.html
@@ -3,6 +3,13 @@
 	{{#with app}}
 		<section class="page-container page-home page-static page-settings rc-apps-marketplace">
 			{{# header sectionName='App_Details' fixedHeight=true hideHelp=true fullpage=true}}
+				<div class="rc-header__section-button">
+					{{#unless disabled}}
+						<button class="rc-button rc-button--cancel js-cancel-editing">{{_ "Cancel" }}</button>
+					{{/unless}}
+					<button class="rc-button rc-button--primary js-save {{#if saving}} loading{{/if}}" disabled='{{disabled}}'>{{_ "Save_changes" }}</button>
+				</div>
+
 				<div class="rc-header__block rc-header__block-action">
 					<button class="rc-button rc-button--nude js-cancel">{{> icon icon="cross"}}</button>
 				</div>
@@ -18,7 +25,7 @@
 						<div class="rc-apps-details">
 							<div class="rc-apps-container rc-apps-container__header">
 								{{#if iconFileData}}
-								<div class="rc-apps-details__photo" style="background-image:url(data:image/png;base64,{{iconFileData}})"></div>
+									<div class="rc-apps-details__photo" style="background-image:url(data:image/png;base64,{{iconFileData}})"></div>
 								{{else}}
 									<div class="rc-apps-details__photo" style="background-image:url({{iconFileContent}})"></div>
 								{{/if}}
@@ -44,7 +51,15 @@ <h1>{{name}}</h1>
 											{{/if}}
 											<button class="rc-button rc-button--nude js-view-logs">{{> icon icon="list-alt"}} {{_ "View_Logs" }}</button>
 										{{else}}
-											<button class="rc-button rc-button--primary js-install">{{> icon icon="circled-arrow-down"}} {{_ "Install"}}</button>
+											{{#if hasPurchased}}
+												<button class="rc-button rc-button--primary js-install">{{> icon icon="download"}} {{_ "Purchased"}}</button>
+											{{else}}
+												{{#if $eq price 0}}
+													<button class="rc-button rc-button--primary js-purchase">{{> icon icon="circled-arrow-down"}} {{_ "Free"}}</button>
+												{{else}}
+													<button class="rc-button rc-button--primary js-purchase">{{> icon icon="circled-arrow-down"}} {{displayPrice}}</button>
+												{{/if}}
+											{{/if}}
 										{{/if}}
 									</div>
 								</div>
@@ -454,10 +469,6 @@ <h2> {{_ "Settings"}} </h2>
 
 											</div>
 										{{/each}}
-										<div class="rc-button-group">
-											<button class="rc-button rc-button--outline js-cancel-editing" disabled='{{disabled}}'>{{_ "Cancel" }}</button>
-											<button class="rc-button rc-button--primary js-save {{#if saving}} loading{{/if}}" disabled='{{disabled}}'>{{_ "Save" }}</button>
-										</div>
 									</div>
 								{{/if}}
 							</div>
diff --git a/app/apps/client/admin/appManage.js b/app/apps/client/admin/appManage.js
index 0b48c9484914..5373f8c25fb0 100644
--- a/app/apps/client/admin/appManage.js
+++ b/app/apps/client/admin/appManage.js
@@ -4,9 +4,10 @@ import { FlowRouter } from 'meteor/kadira:flow-router';
 import { Template } from 'meteor/templating';
 import { TAPi18n } from 'meteor/tap:i18n';
 import { TAPi18next } from 'meteor/tap:i18n';
-import { isEmail, Info, APIClient } from '../../../utils';
+import { isEmail, APIClient } from '../../../utils';
 import { settings } from '../../../settings';
 import { Markdown } from '../../../markdown/client';
+import { modal } from '../../../ui-utils';
 import _ from 'underscore';
 import s from 'underscore.string';
 import toastr from 'toastr';
@@ -16,55 +17,111 @@ import { Utilities } from '../../lib/misc/Utilities';
 import { Apps } from '../orchestrator';
 import semver from 'semver';
 
-const HOST = 'https://marketplace.rocket.chat'; // TODO move this to inside RocketChat.API
-
-async function getApps(instance) {
+function getApps(instance) {
 	const id = instance.id.get();
-	let remoteApps;
-	let localApp;
-	try {
-		localApp = (await APIClient.get('apps/')).apps.filter((app) => app.id === id)[0];
-		remoteApps = await fetch(`${ HOST }/v1/apps/${ id }?version=${ Info.marketplaceApiVersion }`).then((data) => data.json());
-	} catch (error) {
-		if (!localApp) {
+
+	const appInfo = { remote: undefined, local: undefined };
+	return APIClient.get(`apps/${ id }?marketplace=true&version=${ FlowRouter.getQueryParam('version') }`)
+		.catch((e) => {
+			console.log(e);
+			return Promise.resolve({ app: undefined });
+		})
+		.then((remote) => {
+			appInfo.remote = remote.app;
+			return APIClient.get(`apps/${ id }`);
+		})
+		.then((local) => {
+			appInfo.local = local.app;
+			return Apps.getAppApis(id);
+		})
+		.then((apis) => instance.apis.set(apis))
+		.catch((e) => {
+			if (appInfo.remote || appInfo.local) {
+				return Promise.resolve(true);
+			}
+
 			instance.hasError.set(true);
-			instance.theError.set(error.message);
-		}
-	}
-	let remoteApp;
-	if (remoteApps && remoteApps.length) {
-		remoteApps = remoteApps.sort((a, b) => {
-			if (semver.gt(a.version, b.version)) {
-				return -1;
+			instance.theError.set(e.message);
+		}).then((goOn) => {
+			if (typeof goOn !== 'undefined' && !goOn) {
+				return;
 			}
-			if (semver.lt(a.version, b.version)) {
-				return 1;
+
+			if (appInfo.remote) {
+				appInfo.remote.displayPrice = parseFloat(appInfo.remote.price).toFixed(2);
 			}
-			return 0;
-		});
-		remoteApp = remoteApps[0];
-	}
 
-	if (localApp) {
-		localApp.installed = true;
-		if (remoteApp) {
-			localApp.categories = remoteApp.categories;
-			if (semver.gt(remoteApp.version, localApp.version)) {
-				localApp.newVersion = remoteApp.version;
+			if (appInfo.local) {
+				appInfo.local.installed = true;
+
+				if (appInfo.remote) {
+					appInfo.local.categories = appInfo.remote.categories;
+					appInfo.local.isPurchased = appInfo.remote.isPurchased;
+					appInfo.local.price = appInfo.remote.price;
+					appInfo.local.displayPrice = appInfo.remote.displayPrice;
+
+					if (semver.gt(appInfo.remote.version, appInfo.local.version) && (appInfo.remote.isPurchased || appInfo.remote.price <= 0)) {
+						appInfo.local.newVersion = appInfo.remote.version;
+					}
+				}
+
+				instance.onSettingUpdated({ appId: id });
+
+				Apps.getWsListener().unregisterListener(AppEvents.APP_STATUS_CHANGE, instance.onStatusChanged);
+				Apps.getWsListener().unregisterListener(AppEvents.APP_SETTING_UPDATED, instance.onSettingUpdated);
+				Apps.getWsListener().registerListener(AppEvents.APP_STATUS_CHANGE, instance.onStatusChanged);
+				Apps.getWsListener().registerListener(AppEvents.APP_SETTING_UPDATED, instance.onSettingUpdated);
 			}
-		}
 
-		instance.onSettingUpdated({ appId: id });
+			instance.app.set(appInfo.local || appInfo.remote);
+			instance.ready.set(true);
 
-		Apps.getWsListener().unregisterListener(AppEvents.APP_STATUS_CHANGE, instance.onStatusChanged);
-		Apps.getWsListener().unregisterListener(AppEvents.APP_SETTING_UPDATED, instance.onSettingUpdated);
-		Apps.getWsListener().registerListener(AppEvents.APP_STATUS_CHANGE, instance.onStatusChanged);
-		Apps.getWsListener().registerListener(AppEvents.APP_SETTING_UPDATED, instance.onSettingUpdated);
-	}
+			if (appInfo.remote && appInfo.local) {
+				return APIClient.get(`apps/${ id }?marketplace=true&update=true&appVersion=${ FlowRouter.getQueryParam('version') }`);
+			}
+
+			return Promise.resolve(false);
+		}).then((updateInfo) => {
+			if (!updateInfo) {
+				return;
+			}
+
+			const update = updateInfo.app;
 
-	instance.app.set(localApp || remoteApp);
+			if (semver.gt(update.version, appInfo.local.version) && (update.isPurchased || update.price <= 0)) {
+				appInfo.local.newVersion = update.version;
 
-	instance.ready.set(true);
+				instance.app.set(appInfo.local);
+			}
+		});
+}
+
+function installAppFromEvent(e, t) {
+	const el = $(e.currentTarget);
+	el.prop('disabled', true);
+	el.addClass('loading');
+
+	const app = t.app.get();
+
+	const api = app.newVersion ? `apps/${ t.id.get() }` : 'apps/';
+
+	APIClient.post(api, {
+		appId: app.id,
+		marketplace: true,
+		version: app.version,
+	}).then(() => getApps(t)).then(() => {
+		el.prop('disabled', false);
+		el.removeClass('loading');
+	}).catch((e) => {
+		el.prop('disabled', false);
+		el.removeClass('loading');
+		t.hasError.set(true);
+		t.theError.set((e.xhr.responseJSON && e.xhr.responseJSON.error) || e.message);
+	});
+
+	// play animation
+	// TODO this icon and animation are not working
+	$(e.currentTarget).find('.rc-icon').addClass('play');
 }
 
 Template.appManage.onCreated(function() {
@@ -81,12 +138,7 @@ Template.appManage.onCreated(function() {
 	this.loading = new ReactiveVar(false);
 
 	const id = this.id.get();
-
-	this.getApis = async() => {
-		this.apis.set(await Apps.getAppApis(id));
-	};
-
-	this.getApis();
+	getApps(instance);
 
 	this.__ = (key, options, lang_tag) => {
 		const appKey = Utilities.getI18nKeyForApp(key, id);
@@ -104,8 +156,6 @@ Template.appManage.onCreated(function() {
 		instance.settings.set(settings);
 	}
 
-	getApps(instance);
-
 	instance.onStatusChanged = function _onStatusChanged({ appId, status }) {
 		if (appId !== id) {
 			return;
@@ -223,6 +273,11 @@ Template.appManage.helpers({
 
 		return instance.app.get().installed === true;
 	},
+	hasPurchased() {
+		const instance = Template.instance();
+
+		return instance.app.get().isPurchased === true;
+	},
 	app() {
 		return Template.instance().app.get();
 	},
@@ -318,31 +373,27 @@ Template.appManage.events({
 	},
 
 	'click .js-install': async(e, t) => {
-		const el = $(e.currentTarget);
-		el.prop('disabled', true);
-		el.addClass('loading');
-
-		const app = t.app.get();
-
-		const url = `${ HOST }/v1/apps/${ t.id.get() }/download/${ app.version }`;
-
-		const api = app.newVersion ? `apps/${ t.id.get() }` : 'apps/';
-
-		APIClient.post(api, { url }).then(() => {
-			getApps(t).then(() => {
-				el.prop('disabled', false);
-				el.removeClass('loading');
+		installAppFromEvent(e, t);
+	},
+
+	'click .js-purchase': (e, t) => {
+		const rl = t.app.get();
+
+		APIClient.get(`apps?buildBuyUrl=true&appId=${ rl.id }`)
+			.then((data) => {
+				data.successCallback = async() => {
+					installAppFromEvent(e, t);
+				};
+
+				modal.open({
+					allowOutsideClick: false,
+					data,
+					template: 'iframeModal',
+				});
+			})
+			.catch((e) => {
+				toastr.error((e.xhr.responseJSON && e.xhr.responseJSON.error) || e.message);
 			});
-		}).catch((e) => {
-			el.prop('disabled', false);
-			el.removeClass('loading');
-			t.hasError.set(true);
-			t.theError.set((e.xhr.responseJSON && e.xhr.responseJSON.error) || e.message);
-		});
-
-		// play animation
-		// TODO this icon and animation are not working
-		$(e.currentTarget).find('.rc-icon').addClass('play');
 	},
 
 	'click .js-update': (e, t) => {
@@ -350,7 +401,7 @@ Template.appManage.events({
 	},
 
 	'click .js-view-logs': (e, t) => {
-		FlowRouter.go(`/admin/apps/${ t.id.get() }/logs`);
+		FlowRouter.go(`/admin/apps/${ t.id.get() }/logs`, {}, { version: FlowRouter.getQueryParam('version') });
 	},
 
 	'click .js-cancel-editing': async(e, t) => {
diff --git a/app/apps/client/admin/apps.html b/app/apps/client/admin/apps.html
index 888c2a9c5c4c..8513bf7f5189 100644
--- a/app/apps/client/admin/apps.html
+++ b/app/apps/client/admin/apps.html
@@ -1,7 +1,9 @@
 <template name="apps">
 	<section class="rc-directory rc-apps-marketplace">
 		{{#header sectionName="Apps" hideHelp=true fixedHeight=true fullpage=true}}
-			<button class="rc-button rc-button--small rc-button--primary rc-directory-plus" data-button="install">{{> icon icon="plus"}}</button>
+			{{#if appsDevelopmentMode}}
+				<button class="rc-button rc-button--small rc-button--primary rc-button--outline rc-directory-plus" data-button="install">{{> icon icon="upload" block="rc-icon--default-size"}} {{_ "Upload app"}}</button>
+			{{/if}}
 		{{/header}}
 		<div class="rc-table-content">
 			{{>tabs tabs=tabsData}}
@@ -20,13 +22,10 @@
 							<th class="js-sort rc-table-td--medium {{#if searchSortBy 'name'}}is-sorting{{/if}}" data-sort="name">
 								<div class="table-fake-th">{{_ "Name"}} {{> icon icon=(sortIcon 'name')}}</div>
 							</th>
-							<th class="js-sort rc-table-td--medium {{#if searchSortBy 'category'}}is-sorting{{/if}}" data-sort="category">>
-								<div class="table-fake-th">{{_ "Category"}} {{> icon icon=(sortIcon 'category') }}</div>
-							</th>
 							<th class="rc-table-td">
 								<div class="table-fake-th">{{_ "Details"}} </div>
 							</th>
-							<th class="rc-table-td--small">
+							<th class="rc-table-td--small rc-apps-marketplace-price">
 							</th>
 						</tr>
 					</thead>
@@ -50,32 +49,57 @@
 										</div>
 									</div>
 								</td>
-								<td>{{latest.categories}}</td>
 								<td>
-									<p class="rc-table-title">
-										{{#if latest.summary}}
-											{{latest.summary}}
-										{{else}}
-											{{latest.description}}
-										{{/if}}
-									</p>
-									{{#if latest.summary}}
-										<p>
-											{{latest.description}}
-										</p>
-									{{/if}}
+									<div class="rc-table-wrapper">
+										<div class="rc-table-info">
+											<span class="rc-table-title">
+												{{#if latest.summary}}
+													{{latest.summary}}
+												{{else}}
+													{{latest.description}}
+												{{/if}}
+											</span>
+											{{#if latest.summary}}
+												<span class="rc-table-subtitle">
+													{{latest.description}}
+												</span>
+											{{/if}}
+											<span class="rc-table-subtitle">
+												{{formatCategories latest.categories}}
+											</span>
+										</div>
+									</div>
 								</td>
-								<td>
-
+								<td class="rc-apps-marketplace-price">
 									{{#if $eq latest._installed true}}
-										{{> icon icon="checkmark-circled" block="rc-icon--default-size"}}
+										<button class="apps-installer" data-app="{{appId}}">
+											{{_ "Installed"}}
+											{{> icon icon="menu" block="rc-icon--default-size"}}
+										</button>
 									{{/if}}
 									{{#if renderDownloadButton latest}}
 										<div class="rc-apps-marketplace__wrap-actions">
-											{{> icon block="rc-icon--default-size rc-icon" icon="loading"}}
-											<button class="js-install apps-installer" data-app="{{appId}}">
-												{{> icon block="installer rc-icon--default-size" icon="circled-arrow-down"}}
-											</button>
+											{{#if $eq isPurchased true}}
+												<button class="js-install apps-installer" data-app="{{appId}}">
+													{{_ "Purchased"}}
+													{{> icon block="installer rc-icon--default-size" icon="download"}}
+												</button>
+											{{else}}
+												<button class="js-purchase apps-installer" data-app="{{appId}}">
+													<span class="rc-app-price">
+														{{#if $eq price 0}}
+															{{_ "Free"}}
+														{{else}}
+															{{ formatPrice price }}
+														{{/if}}
+													</span>
+													{{> icon block="installer rc-icon--default-size" icon="circled-arrow-down"}}
+												</button>
+											{{/if}}
+											<span class="loading">
+												Downloading
+												{{> icon block="rc-icon--default-size rc-icon" icon="loading"}}
+											</span>
 										</div>
 									{{/if}}
 								</td>
diff --git a/app/apps/client/admin/apps.js b/app/apps/client/admin/apps.js
index 27ee486ec070..41d9ae1f9585 100644
--- a/app/apps/client/admin/apps.js
+++ b/app/apps/client/admin/apps.js
@@ -2,12 +2,13 @@ import toastr from 'toastr';
 import { ReactiveVar } from 'meteor/reactive-var';
 import { FlowRouter } from 'meteor/kadira:flow-router';
 import { Template } from 'meteor/templating';
-import { t, Info, APIClient } from '../../../utils';
+import { settings } from '../../../settings';
+import { t, APIClient } from '../../../utils';
+import { modal } from '../../../ui-utils';
 import { AppEvents } from '../communication';
 import { Apps } from '../orchestrator';
 
 const ENABLED_STATUS = ['auto_enabled', 'manually_enabled'];
-const HOST = 'https://marketplace.rocket.chat';
 const enabled = ({ status }) => ENABLED_STATUS.includes(status);
 
 const sortByColumn = (array, column, inverted) =>
@@ -23,6 +24,8 @@ const tagAlreadyInstalledApps = (installedApps, apps) => {
 
 	const tagged = apps.map((app) =>
 		({
+			price: app.price,
+			isPurchased: app.isPurchased,
 			latest: {
 				...app.latest,
 				_installed: installedIds.includes(app.latest.id),
@@ -33,31 +36,29 @@ const tagAlreadyInstalledApps = (installedApps, apps) => {
 	return tagged;
 };
 
-const getApps = (instance) => {
-	fetch(`${ HOST }/v1/apps?version=${ Info.marketplaceApiVersion }`)
-		.then((response) => response.json())
-		.then((data) => {
-			const tagged = tagAlreadyInstalledApps(instance.installedApps.get(), data);
+const getApps = async(instance) => {
+	instance.isLoading.set(true);
 
-			if (instance.searchType.get() === 'marketplace') {
-				instance.apps.set(tagged);
-				instance.isLoading.set(false);
-				instance.ready.set(true);
-			}
-		});
+	const data = await APIClient.get('apps?marketplace=true');
+	const tagged = tagAlreadyInstalledApps(instance.installedApps.get(), data);
+
+	if (instance.searchType.get() === 'marketplace') {
+		instance.apps.set(tagged);
+		instance.isLoading.set(false);
+		instance.ready.set(true);
+	}
 };
 
-const getInstalledApps = (instance) => {
-	APIClient.get('apps').then((data) => {
-		const apps = data.apps.map((app) => ({ latest: app }));
-		instance.installedApps.set(apps);
+const getInstalledApps = async(instance) => {
+	const data = await APIClient.get('apps');
+	const apps = data.apps.map((app) => ({ latest: app }));
+	instance.installedApps.set(apps);
 
-		if (instance.searchType.get() === 'installed') {
-			instance.apps.set(apps);
-			instance.isLoading.set(false);
-			instance.ready.set(true);
-		}
-	});
+	if (instance.searchType.get() === 'installed') {
+		instance.apps.set(apps);
+		instance.isLoading.set(false);
+		instance.ready.set(true);
+	}
 };
 
 Template.apps.onCreated(function() {
@@ -82,14 +83,10 @@ Template.apps.onCreated(function() {
 		}
 	}
 
-	getApps(instance);
 	getInstalledApps(instance);
+	getApps(instance);
 
-	fetch(`${ HOST }/v1/categories`)
-		.then((response) => response.json())
-		.then((data) => {
-			instance.categories.set(data);
-		});
+	APIClient.get('apps?categories=true').then((data) => instance.categories.set(data));
 
 	instance.onAppAdded = function _appOnAppAdded() {
 		// ToDo: fix this formatting data to add an app to installedApps array without to fetch all
@@ -149,6 +146,9 @@ Template.apps.helpers({
 	categories() {
 		return Template.instance().categories.get();
 	},
+	appsDevelopmentMode() {
+		return settings.get('Apps_Framework_Development_Mode') === true;
+	},
 	parseStatus(status) {
 		return t(`App_status_${ status }`);
 	},
@@ -211,6 +211,12 @@ Template.apps.helpers({
 
 		return isMarketplace && isDownloaded;
 	},
+	formatPrice(price) {
+		return `$${ Number.parseFloat(price).toFixed(2) }`;
+	},
+	formatCategories(categories = []) {
+		return categories.join(', ');
+	},
 	tabsData() {
 		const instance = Template.instance();
 
@@ -256,7 +262,7 @@ Template.apps.events({
 		const rl = this;
 
 		if (rl && rl.latest && rl.latest.id) {
-			FlowRouter.go(`/admin/apps/${ rl.latest.id }`);
+			FlowRouter.go(`/admin/apps/${ rl.latest.id }?version=${ rl.latest.version }`);
 		}
 	},
 	'click [data-button="install"]'() {
@@ -264,18 +270,64 @@ Template.apps.events({
 	},
 	'click .js-install'(e, template) {
 		e.stopPropagation();
+		const elm = e.currentTarget.parentElement;
 
-		const url = `${ HOST }/v1/apps/${ this.latest.id }/download/${ this.latest.version }`;
+		elm.classList.add('loading');
 
-		// play animation
-		e.currentTarget.parentElement.classList.add('loading');
+		APIClient.post('apps/', {
+			appId: this.latest.id,
+			marketplace: true,
+			version: this.latest.version,
+		})
+			.then(async() => {
+				await Promise.all([
+					getInstalledApps(template),
+					getApps(template),
+				]);
+				elm.classList.remove('loading');
+			})
+			.catch((e) => {
+				toastr.error((e.xhr.responseJSON && e.xhr.responseJSON.error) || e.message);
+				elm.classList.remove('loading');
+			});
+	},
+	'click .js-purchase'(e, template) {
+		e.stopPropagation();
 
-		APIClient.post('apps/', { url })
-			.then(() => {
-				getApps(template);
-				getInstalledApps(template);
+		const rl = this;
+
+		// play animation
+		const elm = e.currentTarget.parentElement;
+
+		APIClient.get(`apps?buildBuyUrl=true&appId=${ rl.latest.id }`)
+			.then((data) => {
+				modal.open({
+					allowOutsideClick: false,
+					data,
+					template: 'iframeModal',
+				}, () => {
+					elm.classList.add('loading');
+					APIClient.post('apps/', {
+						appId: this.latest.id,
+						marketplace: true,
+						version: this.latest.version,
+					})
+						.then(async() => {
+							await Promise.all([
+								getInstalledApps(template),
+								getApps(template),
+							]);
+							elm.classList.remove('loading');
+						})
+						.catch((e) => {
+							toastr.error((e.xhr.responseJSON && e.xhr.responseJSON.error) || e.message);
+							elm.classList.remove('loading');
+						});
+				});
 			})
-			.catch((e) => toastr.error((e.xhr.responseJSON && e.xhr.responseJSON.error) || e.message));
+			.catch((e) => {
+				toastr.error((e.xhr.responseJSON && e.xhr.responseJSON.error) || e.message);
+			});
 	},
 	'keyup .js-search'(e, t) {
 		t.searchText.set(e.currentTarget.value);
diff --git a/app/apps/client/admin/modalTemplates/iframeModal.html b/app/apps/client/admin/modalTemplates/iframeModal.html
new file mode 100644
index 000000000000..aecd160b0099
--- /dev/null
+++ b/app/apps/client/admin/modalTemplates/iframeModal.html
@@ -0,0 +1,7 @@
+<template name="iframeModal">
+	<main class="rc-modal__content" style="height: 300px; width: 450px;">
+		<iframe src="{{ data.url }}" style="border: none; display: none; height: 100%; width: 100%;"></iframe>
+
+		<div class="loading">{{> loading class="loading-animation--primary"}}</div>
+	</main>
+</template>
diff --git a/app/apps/client/admin/modalTemplates/iframeModal.js b/app/apps/client/admin/modalTemplates/iframeModal.js
new file mode 100644
index 000000000000..be84a750ebe1
--- /dev/null
+++ b/app/apps/client/admin/modalTemplates/iframeModal.js
@@ -0,0 +1,48 @@
+import { Template } from 'meteor/templating';
+import { modal } from '../../../../ui-utils';
+
+Template.iframeModal.onCreated(function() {
+	const instance = this;
+
+	instance.iframeMsgListener = function _iframeMsgListener(e) {
+		let data;
+		try {
+			data = JSON.parse(e.data);
+		} catch (e) {
+			return;
+		}
+
+		if (data.result) {
+			if (typeof instance.data.successCallback === 'function') {
+				instance.data.successCallback().then(() => modal.confirm(data));
+			} else {
+				modal.confirm(data);
+			}
+		} else {
+			modal.cancel();
+		}
+	};
+
+	window.addEventListener('message', instance.iframeMsgListener);
+});
+
+Template.iframeModal.onRendered(function() {
+	const iframe = this.firstNode.querySelector('iframe');
+	const loading = this.firstNode.querySelector('.loading');
+	iframe.addEventListener('load', () => {
+		iframe.style.display = 'block';
+		loading.style.display = 'none';
+	});
+});
+
+Template.iframeModal.onDestroyed(function() {
+	const instance = this;
+
+	window.removeEventListener('message', instance.iframeMsgListener);
+});
+
+Template.iframeModal.helpers({
+	data() {
+		return Template.instance().data;
+	},
+});
diff --git a/app/apps/client/index.js b/app/apps/client/index.js
index d6b092029f5c..aedee8d034a7 100644
--- a/app/apps/client/index.js
+++ b/app/apps/client/index.js
@@ -1,4 +1,7 @@
 export { Apps } from './orchestrator';
+
+import './admin/modalTemplates/iframeModal.html';
+import './admin/modalTemplates/iframeModal';
 import './admin/apps.html';
 import './admin/apps';
 import './admin/appInstall.html';
diff --git a/app/apps/server/bridges/api.js b/app/apps/server/bridges/api.js
index 94e69f259838..47801c7d644a 100644
--- a/app/apps/server/bridges/api.js
+++ b/app/apps/server/bridges/api.js
@@ -14,7 +14,7 @@ export class AppApisBridge {
 		this.appRouters = new Map();
 
 		// apiServer.use('/api/apps', (req, res, next) => {
-		// 	console.log({
+		// 	this.orch.debugLog({
 		// 		method: req.method.toLowerCase(),
 		// 		url: req.url,
 		// 		query: req.query,
@@ -50,7 +50,7 @@ export class AppApisBridge {
 	}
 
 	registerApi({ api, computedPath, endpoint }, appId) {
-		console.log(`The App ${ appId } is registering the api: "${ endpoint.path }" (${ computedPath })`);
+		this.orch.debugLog(`The App ${ appId } is registering the api: "${ endpoint.path }" (${ computedPath })`);
 
 		this._verifyApi(api, endpoint);
 
@@ -71,7 +71,7 @@ export class AppApisBridge {
 	}
 
 	unregisterApis(appId) {
-		console.log(`The App ${ appId } is unregistering all apis`);
+		this.orch.debugLog(`The App ${ appId } is unregistering all apis`);
 
 		if (this.appRouters.get(appId)) {
 			this.appRouters.delete(appId);
diff --git a/app/apps/server/bridges/commands.js b/app/apps/server/bridges/commands.js
index 81254753ea8c..a4895106dfd8 100644
--- a/app/apps/server/bridges/commands.js
+++ b/app/apps/server/bridges/commands.js
@@ -10,7 +10,7 @@ export class AppCommandsBridge {
 	}
 
 	doesCommandExist(command, appId) {
-		console.log(`The App ${ appId } is checking if "${ command }" command exists.`);
+		this.orch.debugLog(`The App ${ appId } is checking if "${ command }" command exists.`);
 
 		if (typeof command !== 'string' || command.length === 0) {
 			return false;
@@ -21,7 +21,7 @@ export class AppCommandsBridge {
 	}
 
 	enableCommand(command, appId) {
-		console.log(`The App ${ appId } is attempting to enable the command: "${ command }"`);
+		this.orch.debugLog(`The App ${ appId } is attempting to enable the command: "${ command }"`);
 
 		if (typeof command !== 'string' || command.trim().length === 0) {
 			throw new Error('Invalid command parameter provided, must be a string.');
@@ -39,7 +39,7 @@ export class AppCommandsBridge {
 	}
 
 	disableCommand(command, appId) {
-		console.log(`The App ${ appId } is attempting to disable the command: "${ command }"`);
+		this.orch.debugLog(`The App ${ appId } is attempting to disable the command: "${ command }"`);
 
 		if (typeof command !== 'string' || command.trim().length === 0) {
 			throw new Error('Invalid command parameter provided, must be a string.');
@@ -63,7 +63,7 @@ export class AppCommandsBridge {
 
 	// command: { command, paramsExample, i18nDescription, executor: function }
 	modifyCommand(command, appId) {
-		console.log(`The App ${ appId } is attempting to modify the command: "${ command }"`);
+		this.orch.debugLog(`The App ${ appId } is attempting to modify the command: "${ command }"`);
 
 		this._verifyCommand(command);
 
@@ -85,7 +85,7 @@ export class AppCommandsBridge {
 	}
 
 	registerCommand(command, appId) {
-		console.log(`The App ${ appId } is registering the command: "${ command.command }"`);
+		this.orch.debugLog(`The App ${ appId } is registering the command: "${ command.command }"`);
 
 		this._verifyCommand(command);
 
@@ -104,7 +104,7 @@ export class AppCommandsBridge {
 	}
 
 	unregisterCommand(command, appId) {
-		console.log(`The App ${ appId } is unregistering the command: "${ command }"`);
+		this.orch.debugLog(`The App ${ appId } is unregistering the command: "${ command }"`);
 
 		if (typeof command !== 'string' || command.trim().length === 0) {
 			throw new Error('Invalid command parameter provided, must be a string.');
diff --git a/app/apps/server/bridges/environmental.js b/app/apps/server/bridges/environmental.js
index 57b28437c532..ae8879a36bbf 100644
--- a/app/apps/server/bridges/environmental.js
+++ b/app/apps/server/bridges/environmental.js
@@ -5,7 +5,7 @@ export class AppEnvironmentalVariableBridge {
 	}
 
 	async getValueByName(envVarName, appId) {
-		console.log(`The App ${ appId } is getting the environmental variable value ${ envVarName }.`);
+		this.orch.debugLog(`The App ${ appId } is getting the environmental variable value ${ envVarName }.`);
 
 		if (!(await this.isReadable(envVarName, appId))) {
 			throw new Error(`The environmental variable "${ envVarName }" is not readable.`);
@@ -15,13 +15,13 @@ export class AppEnvironmentalVariableBridge {
 	}
 
 	async isReadable(envVarName, appId) {
-		console.log(`The App ${ appId } is checking if the environmental variable is readable ${ envVarName }.`);
+		this.orch.debugLog(`The App ${ appId } is checking if the environmental variable is readable ${ envVarName }.`);
 
 		return this.allowed.includes(envVarName.toUpperCase());
 	}
 
 	async isSet(envVarName, appId) {
-		console.log(`The App ${ appId } is checking if the environmental variable is set ${ envVarName }.`);
+		this.orch.debugLog(`The App ${ appId } is checking if the environmental variable is set ${ envVarName }.`);
 
 		if (!(await this.isReadable(envVarName, appId))) {
 			throw new Error(`The environmental variable "${ envVarName }" is not readable.`);
diff --git a/app/apps/server/bridges/http.js b/app/apps/server/bridges/http.js
index dcb51ec6ce9c..99cf4d555c76 100644
--- a/app/apps/server/bridges/http.js
+++ b/app/apps/server/bridges/http.js
@@ -6,7 +6,7 @@ export class AppHttpBridge {
 			info.request.content = JSON.stringify(info.request.data);
 		}
 
-		console.log(`The App ${ info.appId } is requesting from the outter webs:`, info);
+		this.orch.debugLog(`The App ${ info.appId } is requesting from the outter webs:`, info);
 
 		try {
 			return HTTP.call(info.method, info.url, info.request);
diff --git a/app/apps/server/bridges/listeners.js b/app/apps/server/bridges/listeners.js
index d62edfcf0f07..d8a08d0a9444 100644
--- a/app/apps/server/bridges/listeners.js
+++ b/app/apps/server/bridges/listeners.js
@@ -15,8 +15,8 @@ export class AppListenerBridge {
 		// try {
 
 		// } catch (e) {
-		// 	console.log(`${ e.name }: ${ e.message }`);
-		// 	console.log(e.stack);
+		// 	this.orch.debugLog(`${ e.name }: ${ e.message }`);
+		// 	this.orch.debugLog(e.stack);
 		// }
 	}
 
@@ -32,8 +32,8 @@ export class AppListenerBridge {
 		// try {
 
 		// } catch (e) {
-		// 	console.log(`${ e.name }: ${ e.message }`);
-		// 	console.log(e.stack);
+		// 	this.orch.debugLog(`${ e.name }: ${ e.message }`);
+		// 	this.orch.debugLog(e.stack);
 		// }
 	}
 }
diff --git a/app/apps/server/bridges/messages.js b/app/apps/server/bridges/messages.js
index b909a6ab46ad..11cf9f54b517 100644
--- a/app/apps/server/bridges/messages.js
+++ b/app/apps/server/bridges/messages.js
@@ -10,7 +10,7 @@ export class AppMessageBridge {
 	}
 
 	async create(message, appId) {
-		console.log(`The App ${ appId } is creating a new message.`);
+		this.orch.debugLog(`The App ${ appId } is creating a new message.`);
 
 		let msg = this.orch.getConverters().get('messages').convertAppMessage(message);
 
@@ -22,13 +22,17 @@ export class AppMessageBridge {
 	}
 
 	async getById(messageId, appId) {
-		console.log(`The App ${ appId } is getting the message: "${ messageId }"`);
+		this.orch.debugLog(`The App ${ appId } is getting the message: "${ messageId }"`);
 
 		return this.orch.getConverters().get('messages').convertById(messageId);
 	}
 
 	async update(message, appId) {
-		console.log(`The App ${ appId } is updating a message.`);
+		this.orch.debugLog(`The App ${ appId } is updating a message.`);
+		if (!this.updateMessage) {
+			const { updateMessage } = await import('meteor/rocketchat:lib');
+			this.updateMessage = updateMessage;
+		}
 
 		if (!message.editor) {
 			throw new Error('Invalid editor assigned to the message for the update.');
@@ -45,7 +49,7 @@ export class AppMessageBridge {
 	}
 
 	async notifyUser(user, message, appId) {
-		console.log(`The App ${ appId } is notifying a user.`);
+		this.orch.debugLog(`The App ${ appId } is notifying a user.`);
 
 		const msg = this.orch.getConverters().get('messages').convertAppMessage(message);
 
@@ -58,7 +62,7 @@ export class AppMessageBridge {
 	}
 
 	async notifyRoom(room, message, appId) {
-		console.log(`The App ${ appId } is notifying a room's users.`);
+		this.orch.debugLog(`The App ${ appId } is notifying a room's users.`);
 
 		if (room) {
 			const msg = this.orch.getConverters().get('messages').convertAppMessage(message);
diff --git a/app/apps/server/bridges/persistence.js b/app/apps/server/bridges/persistence.js
index cd49a937d1d0..47a6f2639e23 100644
--- a/app/apps/server/bridges/persistence.js
+++ b/app/apps/server/bridges/persistence.js
@@ -4,13 +4,13 @@ export class AppPersistenceBridge {
 	}
 
 	async purge(appId) {
-		console.log(`The App's persistent storage is being purged: ${ appId }`);
+		this.orch.debugLog(`The App's persistent storage is being purged: ${ appId }`);
 
 		this.orch.getPersistenceModel().remove({ appId });
 	}
 
 	async create(data, appId) {
-		console.log(`The App ${ appId } is storing a new object in their persistence.`, data);
+		this.orch.debugLog(`The App ${ appId } is storing a new object in their persistence.`, data);
 
 		if (typeof data !== 'object') {
 			throw new Error('Attempted to store an invalid data type, it must be an object.');
@@ -20,7 +20,7 @@ export class AppPersistenceBridge {
 	}
 
 	async createWithAssociations(data, associations, appId) {
-		console.log(`The App ${ appId } is storing a new object in their persistence that is associated with some models.`, data, associations);
+		this.orch.debugLog(`The App ${ appId } is storing a new object in their persistence that is associated with some models.`, data, associations);
 
 		if (typeof data !== 'object') {
 			throw new Error('Attempted to store an invalid data type, it must be an object.');
@@ -30,7 +30,7 @@ export class AppPersistenceBridge {
 	}
 
 	async readById(id, appId) {
-		console.log(`The App ${ appId } is reading their data in their persistence with the id: "${ id }"`);
+		this.orch.debugLog(`The App ${ appId } is reading their data in their persistence with the id: "${ id }"`);
 
 		const record = this.orch.getPersistenceModel().findOneById(id);
 
@@ -38,7 +38,7 @@ export class AppPersistenceBridge {
 	}
 
 	async readByAssociations(associations, appId) {
-		console.log(`The App ${ appId } is searching for records that are associated with the following:`, associations);
+		this.orch.debugLog(`The App ${ appId } is searching for records that are associated with the following:`, associations);
 
 		const records = this.orch.getPersistenceModel().find({
 			appId,
@@ -49,7 +49,7 @@ export class AppPersistenceBridge {
 	}
 
 	async remove(id, appId) {
-		console.log(`The App ${ appId } is removing one of their records by the id: "${ id }"`);
+		this.orch.debugLog(`The App ${ appId } is removing one of their records by the id: "${ id }"`);
 
 		const record = this.orch.getPersistenceModel().findOne({ _id: id, appId });
 
@@ -63,7 +63,7 @@ export class AppPersistenceBridge {
 	}
 
 	async removeByAssociations(associations, appId) {
-		console.log(`The App ${ appId } is removing records with the following associations:`, associations);
+		this.orch.debugLog(`The App ${ appId } is removing records with the following associations:`, associations);
 
 		const query = {
 			appId,
@@ -84,7 +84,7 @@ export class AppPersistenceBridge {
 	}
 
 	async update(id, data, upsert, appId) {
-		console.log(`The App ${ appId } is updating the record "${ id }" to:`, data);
+		this.orch.debugLog(`The App ${ appId } is updating the record "${ id }" to:`, data);
 
 		if (typeof data !== 'object') {
 			throw new Error('Attempted to store an invalid data type, it must be an object.');
@@ -94,7 +94,7 @@ export class AppPersistenceBridge {
 	}
 
 	async updateByAssociations(associations, data, upsert, appId) {
-		console.log(`The App ${ appId } is updating the record with association to data as follows:`, associations, data);
+		this.orch.debugLog(`The App ${ appId } is updating the record with association to data as follows:`, associations, data);
 
 		if (typeof data !== 'object') {
 			throw new Error('Attempted to store an invalid data type, it must be an object.');
diff --git a/app/apps/server/bridges/rooms.js b/app/apps/server/bridges/rooms.js
index 480cc946be71..4d9f4e0d163c 100644
--- a/app/apps/server/bridges/rooms.js
+++ b/app/apps/server/bridges/rooms.js
@@ -9,7 +9,7 @@ export class AppRoomBridge {
 	}
 
 	async create(room, members, appId) {
-		console.log(`The App ${ appId } is creating a new room.`, room);
+		this.orch.debugLog(`The App ${ appId } is creating a new room.`, room);
 
 		const rcRoom = this.orch.getConverters().get('rooms').convertAppRoom(room);
 		let method;
@@ -49,19 +49,19 @@ export class AppRoomBridge {
 	}
 
 	async getById(roomId, appId) {
-		console.log(`The App ${ appId } is getting the roomById: "${ roomId }"`);
+		this.orch.debugLog(`The App ${ appId } is getting the roomById: "${ roomId }"`);
 
 		return this.orch.getConverters().get('rooms').convertById(roomId);
 	}
 
 	async getByName(roomName, appId) {
-		console.log(`The App ${ appId } is getting the roomByName: "${ roomName }"`);
+		this.orch.debugLog(`The App ${ appId } is getting the roomByName: "${ roomName }"`);
 
 		return this.orch.getConverters().get('rooms').convertByName(roomName);
 	}
 
 	async getCreatorById(roomId, appId) {
-		console.log(`The App ${ appId } is getting the room's creator by id: "${ roomId }"`);
+		this.orch.debugLog(`The App ${ appId } is getting the room's creator by id: "${ roomId }"`);
 
 		const room = Rooms.findOneById(roomId);
 
@@ -73,7 +73,7 @@ export class AppRoomBridge {
 	}
 
 	async getCreatorByName(roomName, appId) {
-		console.log(`The App ${ appId } is getting the room's creator by name: "${ roomName }"`);
+		this.orch.debugLog(`The App ${ appId } is getting the room's creator by name: "${ roomName }"`);
 
 		const room = Rooms.findOneByName(roomName);
 
@@ -85,13 +85,13 @@ export class AppRoomBridge {
 	}
 
 	async getMembers(roomId, appId) {
-		console.log(`The App ${ appId } is getting the room's members by room id: "${ roomId }"`);
+		this.orch.debugLog(`The App ${ appId } is getting the room's members by room id: "${ roomId }"`);
 		const subscriptions = await Subscriptions.findByRoomId(roomId);
 		return subscriptions.map((sub) => this.orch.getConverters().get('users').convertById(sub.u && sub.u._id));
 	}
 
 	async getDirectByUsernames(usernames, appId) {
-		console.log(`The App ${ appId } is getting direct room by usernames: "${ usernames }"`);
+		this.orch.debugLog(`The App ${ appId } is getting direct room by usernames: "${ usernames }"`);
 		const room = await Rooms.findDirectRoomContainingAllUsernames(usernames);
 		if (!room) {
 			return undefined;
@@ -100,7 +100,7 @@ export class AppRoomBridge {
 	}
 
 	async update(room, members = [], appId) {
-		console.log(`The App ${ appId } is updating a room.`);
+		this.orch.debugLog(`The App ${ appId } is updating a room.`);
 
 		if (!room.id || !Rooms.findOneById(room.id)) {
 			throw new Error('A room must exist to update.');
diff --git a/app/apps/server/bridges/settings.js b/app/apps/server/bridges/settings.js
index 6e0f2fcc583f..0ba12fc4a314 100644
--- a/app/apps/server/bridges/settings.js
+++ b/app/apps/server/bridges/settings.js
@@ -22,7 +22,7 @@ export class AppSettingBridge {
 	}
 
 	async getAll(appId) {
-		console.log(`The App ${ appId } is getting all the settings.`);
+		this.orch.debugLog(`The App ${ appId } is getting all the settings.`);
 
 		return Settings.find({ _id: { $nin: this.disallowedSettings } })
 			.fetch()
@@ -30,7 +30,7 @@ export class AppSettingBridge {
 	}
 
 	async getOneById(id, appId) {
-		console.log(`The App ${ appId } is getting the setting by id ${ id }.`);
+		this.orch.debugLog(`The App ${ appId } is getting the setting by id ${ id }.`);
 
 		if (!this.isReadableById(id, appId)) {
 			throw new Error(`The setting "${ id }" is not readable.`);
@@ -40,13 +40,13 @@ export class AppSettingBridge {
 	}
 
 	async hideGroup(name, appId) {
-		console.log(`The App ${ appId } is hidding the group ${ name }.`);
+		this.orch.debugLog(`The App ${ appId } is hidding the group ${ name }.`);
 
 		throw new Error('Method not implemented.');
 	}
 
 	async hideSetting(id, appId) {
-		console.log(`The App ${ appId } is hidding the setting ${ id }.`);
+		this.orch.debugLog(`The App ${ appId } is hidding the setting ${ id }.`);
 
 		if (!this.isReadableById(id, appId)) {
 			throw new Error(`The setting "${ id }" is not readable.`);
@@ -56,13 +56,13 @@ export class AppSettingBridge {
 	}
 
 	async isReadableById(id, appId) {
-		console.log(`The App ${ appId } is checking if they can read the setting ${ id }.`);
+		this.orch.debugLog(`The App ${ appId } is checking if they can read the setting ${ id }.`);
 
 		return !this.disallowedSettings.includes(id);
 	}
 
 	async updateOne(setting, appId) {
-		console.log(`The App ${ appId } is updating the setting ${ setting.id } .`);
+		this.orch.debugLog(`The App ${ appId } is updating the setting ${ setting.id } .`);
 
 		if (!this.isReadableById(setting.id, appId)) {
 			throw new Error(`The setting "${ setting.id }" is not readable.`);
diff --git a/app/apps/server/bridges/users.js b/app/apps/server/bridges/users.js
index 94f4f6833c83..dae08b2d02d9 100644
--- a/app/apps/server/bridges/users.js
+++ b/app/apps/server/bridges/users.js
@@ -4,13 +4,13 @@ export class AppUserBridge {
 	}
 
 	async getById(userId, appId) {
-		console.log(`The App ${ appId } is getting the userId: "${ userId }"`);
+		this.orch.debugLog(`The App ${ appId } is getting the userId: "${ userId }"`);
 
 		return this.orch.getConverters().get('users').convertById(userId);
 	}
 
 	async getByUsername(username, appId) {
-		console.log(`The App ${ appId } is getting the username: "${ username }"`);
+		this.orch.debugLog(`The App ${ appId } is getting the username: "${ username }"`);
 
 		return this.orch.getConverters().get('users').convertByUsername(username);
 	}
diff --git a/app/apps/server/communication/rest.js b/app/apps/server/communication/rest.js
index b397c701a0e8..0bbf95ecb472 100644
--- a/app/apps/server/communication/rest.js
+++ b/app/apps/server/communication/rest.js
@@ -1,8 +1,12 @@
 import { Meteor } from 'meteor/meteor';
 import { HTTP } from 'meteor/http';
-import { API } from '../../../api/server/api';
+import { API } from '../../../api/server';
 import Busboy from 'busboy';
 
+import { getWorkspaceAccessToken } from '../../../cloud/server';
+import { settings } from '../../../settings';
+import { Info } from '../../../utils';
+
 export class AppsRestApi {
 	constructor(orch, manager) {
 		this._orch = orch;
@@ -49,6 +53,50 @@ export class AppsRestApi {
 
 		this.api.addRoute('', { authRequired: true, permissionsRequired: ['manage-apps'] }, {
 			get() {
+				const baseUrl = settings.get('Apps_Framework_Marketplace_Url');
+
+				// Gets the Apps from the marketplace
+				if (this.queryParams.marketplace) {
+					const headers = {};
+					const token = getWorkspaceAccessToken();
+					if (token) {
+						headers.Authorization = `Bearer ${ token }`;
+					}
+
+					const result = HTTP.get(`${ baseUrl }/v1/apps?version=${ Info.marketplaceApiVersion }`, {
+						headers,
+					});
+
+					if (result.statusCode !== 200) {
+						return API.v1.failure();
+					}
+
+					return API.v1.success(result.data);
+				}
+
+				if (this.queryParams.categories) {
+					const headers = {};
+					const token = getWorkspaceAccessToken();
+					if (token) {
+						headers.Authorization = `Bearer ${ token }`;
+					}
+
+					const result = HTTP.get(`${ baseUrl }/v1/categories`, {
+						headers,
+					});
+
+					if (result.statusCode !== 200) {
+						return API.v1.failure();
+					}
+
+					return API.v1.success(result.data);
+				}
+
+				if (this.queryParams.buildBuyUrl && this.queryParams.appId) {
+					const workspaceId = settings.get('Cloud_Workspace_Id');
+					return API.v1.success({ url: `${ baseUrl }/apps/${ this.queryParams.appId }/buy?workspaceId=${ workspaceId }` });
+				}
+
 				const apps = manager.get().map((prl) => {
 					const info = prl.getInfo();
 					info.languages = prl.getStorageItem().languageContent;
@@ -63,14 +111,42 @@ export class AppsRestApi {
 				let buff;
 
 				if (this.bodyParams.url) {
-					const result = HTTP.call('GET', this.bodyParams.url, { npmRequestOptions: { encoding: 'base64' } });
+					if (settings.get('Apps_Framework_Development_Mode') !== true) {
+						return API.v1.failure({ error: 'Installation from url is disabled.' });
+					}
+
+					const result = HTTP.call('GET', this.bodyParams.url, { npmRequestOptions: { encoding: 'binary' } });
 
 					if (result.statusCode !== 200 || !result.headers['content-type'] || result.headers['content-type'] !== 'application/zip') {
 						return API.v1.failure({ error: 'Invalid url. It doesn\'t exist or is not "application/zip".' });
 					}
 
-					buff = Buffer.from(result.content, 'base64');
+					buff = Buffer.from(result.content, 'binary');
+				} else if (this.bodyParams.appId && this.bodyParams.marketplace && this.bodyParams.version) {
+					const baseUrl = settings.get('Apps_Framework_Marketplace_Url');
+
+					const headers = {};
+					const token = getWorkspaceAccessToken(true, 'marketplace:download', false);
+
+					const result = HTTP.get(`${ baseUrl }/v1/apps/${ this.bodyParams.appId }/download/${ this.bodyParams.version }?token=${ token }`, {
+						headers,
+						npmRequestOptions: { encoding: 'binary' },
+					});
+
+					if (result.statusCode !== 200) {
+						return API.v1.failure();
+					}
+
+					if (!result.headers['content-type'] || result.headers['content-type'] !== 'application/zip') {
+						return API.v1.failure({ error: 'Invalid url. It doesn\'t exist or is not "application/zip".' });
+					}
+
+					buff = Buffer.from(result.content, 'binary');
 				} else {
+					if (settings.get('Apps_Framework_Development_Mode') !== true) {
+						return API.v1.failure({ error: 'Direct installation of an App is disabled.' });
+					}
+
 					buff = fileHandler(this.request, 'app');
 				}
 
@@ -109,7 +185,46 @@ export class AppsRestApi {
 
 		this.api.addRoute(':id', { authRequired: true, permissionsRequired: ['manage-apps'] }, {
 			get() {
-				console.log('Getting:', this.urlParams.id);
+				if (this.queryParams.marketplace && this.queryParams.version) {
+					const baseUrl = settings.get('Apps_Framework_Marketplace_Url');
+
+					const headers = {};
+					const token = getWorkspaceAccessToken();
+					if (token) {
+						headers.Authorization = `Bearer ${ token }`;
+					}
+
+					const result = HTTP.get(`${ baseUrl }/v1/apps/${ this.urlParams.id }?appVersion=${ this.queryParams.version }`, {
+						headers,
+					});
+
+					if (result.statusCode !== 200 || result.data.length === 0) {
+						return API.v1.failure();
+					}
+
+					return API.v1.success({ app: result.data[0] });
+				}
+
+				if (this.queryParams.marketplace && this.queryParams.update && this.queryParams.appVersion) {
+					const baseUrl = settings.get('Apps_Framework_Marketplace_Url');
+
+					const headers = {};
+					const token = getWorkspaceAccessToken();
+					if (token) {
+						headers.Authorization = `Bearer ${ token }`;
+					}
+
+					const result = HTTP.get(`${ baseUrl }/v1/apps/${ this.urlParams.id }/latest?frameworkVersion=${ Info.marketplaceApiVersion }`, {
+						headers,
+					});
+
+					if (result.statusCode !== 200 || result.data.length === 0) {
+						return API.v1.failure();
+					}
+
+					return API.v1.success({ app: result.data });
+				}
+
 				const prl = manager.getOneById(this.urlParams.id);
 
 				if (prl) {
@@ -122,20 +237,50 @@ export class AppsRestApi {
 				}
 			},
 			post() {
-				console.log('Updating:', this.urlParams.id);
 				// TODO: Verify permissions
 
 				let buff;
 
 				if (this.bodyParams.url) {
-					const result = HTTP.call('GET', this.bodyParams.url, { npmRequestOptions: { encoding: 'base64' } });
+					if (settings.get('Apps_Framework_Development_Mode') !== true) {
+						return API.v1.failure({ error: 'Updating an App from a url is disabled.' });
+					}
+
+					const result = HTTP.call('GET', this.bodyParams.url, { npmRequestOptions: { encoding: 'binary' } });
 
 					if (result.statusCode !== 200 || !result.headers['content-type'] || result.headers['content-type'] !== 'application/zip') {
 						return API.v1.failure({ error: 'Invalid url. It doesn\'t exist or is not "application/zip".' });
 					}
 
-					buff = Buffer.from(result.content, 'base64');
+					buff = Buffer.from(result.content, 'binary');
+				} else if (this.bodyParams.appId && this.bodyParams.marketplace && this.bodyParams.version) {
+					const baseUrl = settings.get('Apps_Framework_Marketplace_Url');
+
+					const headers = {};
+					const token = getWorkspaceAccessToken();
+					if (token) {
+						headers.Authorization = `Bearer ${ token }`;
+					}
+
+					const result = HTTP.get(`${ baseUrl }/v1/apps/${ this.bodyParams.appId }/download/${ this.bodyParams.version }`, {
+						headers,
+						npmRequestOptions: { encoding: 'binary' },
+					});
+
+					if (result.statusCode !== 200) {
+						return API.v1.failure();
+					}
+
+					if (!result.headers['content-type'] || result.headers['content-type'] !== 'application/zip') {
+						return API.v1.failure({ error: 'Invalid url. It doesn\'t exist or is not "application/zip".' });
+					}
+
+					buff = Buffer.from(result.content, 'binary');
 				} else {
+					if (settings.get('Apps_Framework_Development_Mode') !== true) {
+						return API.v1.failure({ error: 'Direct updating of an App is disabled.' });
+					}
+
 					buff = fileHandler(this.request, 'app');
 				}
 
@@ -160,7 +305,6 @@ export class AppsRestApi {
 				});
 			},
 			delete() {
-				console.log('Uninstalling:', this.urlParams.id);
 				const prl = manager.getOneById(this.urlParams.id);
 
 				if (prl) {
@@ -178,7 +322,6 @@ export class AppsRestApi {
 
 		this.api.addRoute(':id/icon', { authRequired: true, permissionsRequired: ['manage-apps'] }, {
 			get() {
-				console.log('Getting the App\'s Icon:', this.urlParams.id);
 				const prl = manager.getOneById(this.urlParams.id);
 
 				if (prl) {
@@ -193,7 +336,6 @@ export class AppsRestApi {
 
 		this.api.addRoute(':id/languages', { authRequired: false }, {
 			get() {
-				console.log(`Getting ${ this.urlParams.id }'s languages..`);
 				const prl = manager.getOneById(this.urlParams.id);
 
 				if (prl) {
@@ -208,7 +350,6 @@ export class AppsRestApi {
 
 		this.api.addRoute(':id/logs', { authRequired: true, permissionsRequired: ['manage-apps'] }, {
 			get() {
-				console.log(`Getting ${ this.urlParams.id }'s logs..`);
 				const prl = manager.getOneById(this.urlParams.id);
 
 				if (prl) {
@@ -234,7 +375,6 @@ export class AppsRestApi {
 
 		this.api.addRoute(':id/settings', { authRequired: true, permissionsRequired: ['manage-apps'] }, {
 			get() {
-				console.log(`Getting ${ this.urlParams.id }'s settings..`);
 				const prl = manager.getOneById(this.urlParams.id);
 
 				if (prl) {
@@ -252,7 +392,6 @@ export class AppsRestApi {
 				}
 			},
 			post() {
-				console.log(`Updating ${ this.urlParams.id }'s settings..`);
 				if (!this.bodyParams || !this.bodyParams.settings) {
 					return API.v1.failure('The settings to update must be present.');
 				}
@@ -280,8 +419,6 @@ export class AppsRestApi {
 
 		this.api.addRoute(':id/settings/:settingId', { authRequired: true, permissionsRequired: ['manage-apps'] }, {
 			get() {
-				console.log(`Getting the App ${ this.urlParams.id }'s setting ${ this.urlParams.settingId }`);
-
 				try {
 					const setting = manager.getSettingsManager().getAppSetting(this.urlParams.id, this.urlParams.settingId);
 
@@ -297,8 +434,6 @@ export class AppsRestApi {
 				}
 			},
 			post() {
-				console.log(`Updating the App ${ this.urlParams.id }'s setting ${ this.urlParams.settingId }`);
-
 				if (!this.bodyParams.setting) {
 					return API.v1.failure('Setting to update to must be present on the posted body.');
 				}
@@ -321,7 +456,6 @@ export class AppsRestApi {
 
 		this.api.addRoute(':id/apis', { authRequired: true, permissionsRequired: ['manage-apps'] }, {
 			get() {
-				console.log(`Getting ${ this.urlParams.id }'s apis..`);
 				const prl = manager.getOneById(this.urlParams.id);
 
 				if (prl) {
@@ -336,7 +470,6 @@ export class AppsRestApi {
 
 		this.api.addRoute(':id/status', { authRequired: true, permissionsRequired: ['manage-apps'] }, {
 			get() {
-				console.log(`Getting ${ this.urlParams.id }'s status..`);
 				const prl = manager.getOneById(this.urlParams.id);
 
 				if (prl) {
@@ -350,7 +483,6 @@ export class AppsRestApi {
 					return API.v1.failure('Invalid status provided, it must be "status" field and a string.');
 				}
 
-				console.log(`Updating ${ this.urlParams.id }'s status...`, this.bodyParams.status);
 				const prl = manager.getOneById(this.urlParams.id);
 
 				if (prl) {
diff --git a/app/apps/server/orchestrator.js b/app/apps/server/orchestrator.js
index 2bc117891c27..589a6a1dc9f7 100644
--- a/app/apps/server/orchestrator.js
+++ b/app/apps/server/orchestrator.js
@@ -15,6 +15,8 @@ class AppServerOrchestrator {
 			Permissions.createOrUpdate('manage-apps', ['admin']);
 		}
 
+		this._inDebug = process.env.NODE_ENV !== 'production';
+
 		this._model = new AppsModel();
 		this._logModel = new AppsLogsModel();
 		this._persistModel = new AppsPersistenceModel();
@@ -77,6 +79,17 @@ class AppServerOrchestrator {
 		return this.getManager().areAppsLoaded();
 	}
 
+	isDebugging() {
+		return this._inDebug;
+	}
+
+	debugLog() {
+		if (this._inDebug) {
+			// eslint-disable-next-line
+			console.log(...arguments);
+		}
+	}
+
 	load() {
 		// Don't try to load it again if it has
 		// already been loaded
@@ -108,6 +121,21 @@ settings.addGroup('General', function() {
 			type: 'boolean',
 			hidden: false,
 		});
+
+		this.add('Apps_Framework_Development_Mode', false, {
+			type: 'boolean',
+			enableQuery: {
+				_id: 'Apps_Framework_enabled',
+				value: true,
+			},
+			public: true,
+			hidden: false,
+		});
+
+		this.add('Apps_Framework_Marketplace_Url', 'https://marketplace.rocket.chat', {
+			type: 'string',
+			hidden: true,
+		});
 	});
 });
 
diff --git a/app/cloud/server/functions/getWorkspaceAccessToken.js b/app/cloud/server/functions/getWorkspaceAccessToken.js
index 10e8af35f72b..e9b174c4e9bd 100644
--- a/app/cloud/server/functions/getWorkspaceAccessToken.js
+++ b/app/cloud/server/functions/getWorkspaceAccessToken.js
@@ -6,7 +6,7 @@ import { Settings } from '../../../models';
 
 import { getRedirectUri } from './getRedirectUri';
 
-export function getWorkspaceAccessToken() {
+export function getWorkspaceAccessToken(forceNew = false, scope = '', save = true) {
 	if (!settings.get('Register_Server')) {
 		return '';
 	}
@@ -19,7 +19,7 @@ export function getWorkspaceAccessToken() {
 	const expires = Settings.findOneById('Cloud_Workspace_Access_Token_Expires_At');
 	const now = new Date();
 
-	if (now < expires.value) {
+	if (now < expires.value && !forceNew) {
 		return settings.get('Cloud_Workspace_Access_Token');
 	}
 
@@ -34,6 +34,7 @@ export function getWorkspaceAccessToken() {
 			query: querystring.stringify({
 				client_id,
 				client_secret,
+				scope,
 				grant_type: 'client_credentials',
 				redirect_uri: redirectUri,
 			}),
@@ -42,12 +43,13 @@ export function getWorkspaceAccessToken() {
 		return '';
 	}
 
-	const expiresAt = new Date();
-	expiresAt.setSeconds(expiresAt.getSeconds() + authTokenResult.data.expires_in);
-
-	Settings.updateValueById('Cloud_Workspace_Access_Token', authTokenResult.data.access_token);
-	Settings.updateValueById('Cloud_Workspace_Access_Token_Expires_At', expiresAt);
+	if (save) {
+		const expiresAt = new Date();
+		expiresAt.setSeconds(expiresAt.getSeconds() + authTokenResult.data.expires_in);
 
+		Settings.updateValueById('Cloud_Workspace_Access_Token', authTokenResult.data.access_token);
+		Settings.updateValueById('Cloud_Workspace_Access_Token_Expires_At', expiresAt);
+	}
 
 	return authTokenResult.data.access_token;
 }
diff --git a/app/theme/client/imports/components/modal/directory.css b/app/theme/client/imports/components/modal/directory.css
index 45926620481a..24cf4a45d5e5 100644
--- a/app/theme/client/imports/components/modal/directory.css
+++ b/app/theme/client/imports/components/modal/directory.css
@@ -23,11 +23,6 @@
 	}
 
 	&-search {
-		height: 48px;
-
-		margin-right: 5px;
-		margin-left: 5px;
-
 		& .rc-icon {
 			width: 0.875rem;
 		}
diff --git a/app/ui/client/components/header/header.html b/app/ui/client/components/header/header.html
index 43c696aa9885..086722c69aeb 100644
--- a/app/ui/client/components/header/header.html
+++ b/app/ui/client/components/header/header.html
@@ -6,7 +6,11 @@
 				{{> burger}}
 			</div>
 
-			<span class="rc-header__block">{{_ sectionName}}</span>
+			{{#if rawSectionName}}
+				<span class="rc-header__block">{{rawSectionName}}</span>
+			{{else}}
+				<span class="rc-header__block">{{_ sectionName}}</span>
+			{{/if}}
 
 			{{#if Template.contentBlock}}
 				{{> Template.contentBlock}}
diff --git a/packages/rocketchat-i18n/i18n/en.i18n.json b/packages/rocketchat-i18n/i18n/en.i18n.json
index cbe4c283c1e4..b45933969682 100644
--- a/packages/rocketchat-i18n/i18n/en.i18n.json
+++ b/packages/rocketchat-i18n/i18n/en.i18n.json
@@ -343,6 +343,8 @@
   "Apply_and_refresh_all_clients": "Apply and refresh all clients",
   "Apps": "Apps",
   "Apps_Engine_Version": "Apps Engine Version",
+  "Apps_Framework_Development_Mode": "Eneble development mode",
+  "Apps_Framework_Development_Mode_Description": "Development mode allows the installation of Apps that are not from the Rocket.Chat's Marketplace.",
   "Apps_Framework_enabled": "Enable the App Framework",
   "Apps_Settings": "App's Settings",
   "Apps_WhatIsIt": "Apps: What Are They?",
@@ -449,6 +451,7 @@
   "Broadcasting_client_secret": "Broadcasting Client Secret",
   "Broadcasting_enabled": "Broadcasting Enabled",
   "Broadcasting_media_server_url": "Broadcasting Media Server URL",
+  "Browse_Files": "Browse Files",
   "Bugsnag_api_key": "Bugsnag API Key",
   "Build_Environment": "Build Environment",
   "bulk-create-c": "Bulk Create Channels",
@@ -1391,6 +1394,7 @@
   "Forward_chat": "Forward chat",
   "Forward_to_department": "Forward to department",
   "Forward_to_user": "Forward to user",
+  "Free": "Free",
   "Frequently_Used": "Frequently Used",
   "Friday": "Friday",
   "From": "From",
@@ -1543,6 +1547,7 @@
   "Install_FxOs_follow_instructions": "Please confirm the app installation on your device (press \"Install\" when prompted).",
   "Install_package": "Install package",
   "Installation": "Installation",
+  "Installed": "Installed",
   "Installed_at": "Installed at",
   "Invitation_HTML": "Invitation HTML",
   "Instance_Record": "Instance Record",
@@ -2292,6 +2297,7 @@
   "Public_Channel": "Public Channel",
   "Public_Community": "Public Community",
   "Public_Relations": "Public Relations",
+  "Purchased": "Purchased",
   "Push": "Push",
   "Push_Setting_Requires_Restart_Alert": "Changing this value requires restarting Rocket.Chat.",
   "Push_apn_cert": "APN Cert",
@@ -2310,6 +2316,8 @@
   "Push_show_message": "Show Message in Notification",
   "Push_show_username_room": "Show Channel/Group/Username in Notification",
   "Push_test_push": "Test",
+  "Purchase_for_free": "Purchase for FREE",
+  "Purchase_for_price": "Purchase for $%s",
   "Query": "Query",
   "Query_description": "Additional conditions for determining which users to send the email to. Unsubscribed users are automatically removed from the query. It must be a valid JSON. Example: \"{\"createdAt\":{\"$gt\":{\"$date\": \"2015-01-01T00:00:00.000Z\"}}}\"",
   "Queue": "Queue",
@@ -3169,4 +3177,4 @@
   "Your_question": "Your question",
   "Your_server_link": "Your server link",
   "Your_workspace_is_ready": "Your workspace is ready to use 🎉"
-}
\ No newline at end of file
+}

From c13708a3e4eaed3ed1aaf74995497a6d56af861b Mon Sep 17 00:00:00 2001
From: Kautilya Tripathi <tripathi.kautilya@gmail.com>
Date: Thu, 28 Mar 2019 20:17:28 +0530
Subject: [PATCH 18/24] [FIX] Read Receipt for Livechat Messages fixed (#13832)

* Fixed error

* removing redundnt code

* New implementation

* Finally working, fixed issue

* room type getting by room
---
 app/livechat/server/roomType.js                     |  5 +++++
 app/utils/lib/RoomTypeConfig.js                     |  4 ++++
 imports/message-read-receipt/client/readReceipts.js |  1 +
 .../message-read-receipt/server/lib/ReadReceipt.js  | 13 +++++++++----
 4 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/app/livechat/server/roomType.js b/app/livechat/server/roomType.js
index be22a6cc694e..068a3da2adbb 100644
--- a/app/livechat/server/roomType.js
+++ b/app/livechat/server/roomType.js
@@ -26,6 +26,11 @@ class LivechatRoomTypeServer extends LivechatRoomType {
 	canAccessUploadedFile({ rc_token, rc_rid } = {}) {
 		return rc_token && rc_rid && Rooms.findOneOpenByRoomIdAndVisitorToken(rc_rid, rc_token);
 	}
+
+	getReadReceiptsExtraData(message) {
+		const { token } = message;
+		return { token };
+	}
 }
 
 roomTypes.add(new LivechatRoomTypeServer());
diff --git a/app/utils/lib/RoomTypeConfig.js b/app/utils/lib/RoomTypeConfig.js
index 001467dfe73b..f315a2a1941d 100644
--- a/app/utils/lib/RoomTypeConfig.js
+++ b/app/utils/lib/RoomTypeConfig.js
@@ -264,4 +264,8 @@ export class RoomTypeConfig {
 		return false;
 	}
 
+	getReadReceiptsExtraData(/* message */) {
+		return {};
+	}
+
 }
diff --git a/imports/message-read-receipt/client/readReceipts.js b/imports/message-read-receipt/client/readReceipts.js
index bc59874f85a4..df05373d3d7a 100644
--- a/imports/message-read-receipt/client/readReceipts.js
+++ b/imports/message-read-receipt/client/readReceipts.js
@@ -33,6 +33,7 @@ Template.readReceipts.onRendered(function readReceiptsOnRendered() {
 		if (!error) {
 			this.readReceipts.set(result);
 		}
+
 		this.loading.set(false);
 	});
 });
diff --git a/imports/message-read-receipt/server/lib/ReadReceipt.js b/imports/message-read-receipt/server/lib/ReadReceipt.js
index aa278884e0cd..c826a9a44447 100644
--- a/imports/message-read-receipt/server/lib/ReadReceipt.js
+++ b/imports/message-read-receipt/server/lib/ReadReceipt.js
@@ -1,7 +1,8 @@
 import { Meteor } from 'meteor/meteor';
 import { Random } from 'meteor/random';
-import { ReadReceipts, Subscriptions, Messages, Rooms, Users } from '../../../../app/models';
+import { ReadReceipts, Subscriptions, Messages, Rooms, Users, LivechatVisitors } from '../../../../app/models';
 import { settings } from '../../../../app/settings';
+import { roomTypes } from '../../../../app/utils';
 
 const rawReadReceipts = ReadReceipts.model.rawCollection();
 
@@ -51,10 +52,13 @@ export const ReadReceipt = {
 			Messages.setAsReadById(message._id, firstSubscription.ls);
 		}
 
-		this.storeReadReceipts([{ _id: message._id }], roomId, userId);
+		const room = Rooms.findOneById(roomId, { fields: { t: 1 } });
+		const extraData = roomTypes.getConfig(room.t).getReadReceiptsExtraData(message);
+
+		this.storeReadReceipts([{ _id: message._id }], roomId, userId, extraData);
 	},
 
-	storeReadReceipts(messages, roomId, userId) {
+	storeReadReceipts(messages, roomId, userId, extraData = {}) {
 		if (settings.get('Message_Read_Receipt_Store_Users')) {
 			const ts = new Date();
 			const receipts = messages.map((message) => ({
@@ -63,6 +67,7 @@ export const ReadReceipt = {
 				userId,
 				messageId: message._id,
 				ts,
+				...extraData,
 			}));
 
 			if (receipts.length === 0) {
@@ -80,7 +85,7 @@ export const ReadReceipt = {
 	getReceipts(message) {
 		return ReadReceipts.findByMessageId(message._id).map((receipt) => ({
 			...receipt,
-			user: Users.findOneById(receipt.userId, { fields: { username: 1, name: 1 } }),
+			user: receipt.token ? LivechatVisitors.getVisitorByToken(receipt.token, { fields: { username: 1, name: 1 } }) : Users.findOneById(receipt.userId, { fields: { username: 1, name: 1 } }),
 		}));
 	},
 };

From be8ae64209fd847e4b650e231490f87ca65674ae Mon Sep 17 00:00:00 2001
From: Ashwani Yadav <ashyadavash@gmail.com>
Date: Thu, 28 Mar 2019 22:20:13 +0530
Subject: [PATCH 19/24] Remove bitcoin link in Readme.md since the link is
 broken (#13935)

---
 README.md | 2 --
 1 file changed, 2 deletions(-)

diff --git a/README.md b/README.md
index 30c64f57389a..6e96e657e2f6 100644
--- a/README.md
+++ b/README.md
@@ -466,7 +466,5 @@ Rocket.Chat will be free forever, but you can help us speed up the development!
 
 [![Donate](https://www.paypalobjects.com/en_US/i/btn/btn_donateCC_LG.gif)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=ZL94ZE6LGVUSN)
 
-[![Bitcoins](https://github.com/RocketChat/Rocket.Chat.Docs/blob/master/1.%20Contributing/Donating/coinbase.png?raw=true)](https://www.coinbase.com/checkouts/ac2fa967efca7f6fc1201d46bdccb875)
-
 
 [BountySource](https://www.bountysource.com/teams/rocketchat)

From 65b5be3a830a5b8508e3cc5d8542d96f202945cb Mon Sep 17 00:00:00 2001
From: Alan Sikora <alansikora@gmail.com>
Date: Thu, 28 Mar 2019 19:24:20 -0300
Subject: [PATCH 20/24] Improve: Support search and adding federated users
 through regular endpoints (#13936)

---
 .../server/{peerClient.js => PeerClient.js}   |  28 ++--
 .../server/{peerDNS.js => PeerDNS.js}         |  10 +-
 app/federation/server/PeerHTTP/PeerHTTP.js    | 100 ++++++++++++++
 app/federation/server/PeerHTTP/index.js       |   1 +
 app/federation/server/PeerHTTP/utils.js       |  19 +++
 .../PeerServer.js}                            |  28 ++--
 .../{peerServer => PeerServer}/index.js       |   4 +-
 .../routes/events.js                          |  41 +++---
 .../routes/uploads.js                         |   4 +-
 .../routes/users.js                           |  14 +-
 .../federatedResources/FederatedMessage.js    |  15 +--
 .../federatedResources/FederatedResource.js   |   4 +-
 .../federatedResources/FederatedRoom.js       |  14 +-
 .../federatedResources/FederatedUser.js       |   6 +-
 .../server/federatedResources/index.js        |   8 +-
 app/federation/server/index.js                |  28 +++-
 app/federation/server/methods/addUser.js      |  45 +++++++
 .../server/methods/federationAddUser.js       |  48 -------
 .../server/methods/federationSearchUsers.js   |  24 ----
 app/federation/server/methods/index.js        |   2 -
 app/federation/server/methods/searchUsers.js  |  21 +++
 app/federation/server/peerHTTP.js             | 126 ------------------
 app/ui/client/views/app/directory.js          |  57 +-------
 server/methods/browseChannels.js              |  29 +++-
 server/methods/createDirectMessage.js         |  11 +-
 25 files changed, 330 insertions(+), 357 deletions(-)
 rename app/federation/server/{peerClient.js => PeerClient.js} (95%)
 rename app/federation/server/{peerDNS.js => PeerDNS.js} (90%)
 create mode 100644 app/federation/server/PeerHTTP/PeerHTTP.js
 create mode 100644 app/federation/server/PeerHTTP/index.js
 create mode 100644 app/federation/server/PeerHTTP/utils.js
 rename app/federation/server/{peerServer/peerServer.js => PeerServer/PeerServer.js} (91%)
 rename app/federation/server/{peerServer => PeerServer}/index.js (58%)
 rename app/federation/server/{peerServer => PeerServer}/routes/events.js (61%)
 rename app/federation/server/{peerServer => PeerServer}/routes/uploads.js (89%)
 rename app/federation/server/{peerServer => PeerServer}/routes/users.js (67%)
 create mode 100644 app/federation/server/methods/addUser.js
 delete mode 100644 app/federation/server/methods/federationAddUser.js
 delete mode 100644 app/federation/server/methods/federationSearchUsers.js
 delete mode 100644 app/federation/server/methods/index.js
 create mode 100644 app/federation/server/methods/searchUsers.js
 delete mode 100644 app/federation/server/peerHTTP.js

diff --git a/app/federation/server/peerClient.js b/app/federation/server/PeerClient.js
similarity index 95%
rename from app/federation/server/peerClient.js
rename to app/federation/server/PeerClient.js
index 04815509aa36..6639d2d3a3b7 100644
--- a/app/federation/server/peerClient.js
+++ b/app/federation/server/PeerClient.js
@@ -4,14 +4,12 @@ import { callbacks } from '../../callbacks';
 import { settings } from '../../settings';
 import { FederationEvents, FederationKeys, Messages, Rooms, Subscriptions, Users } from '../../models';
 
-import { Federation } from '.';
-import peerDNS from './peerDNS';
-import peerHTTP from './peerHTTP';
 import { updateStatus } from './settingsUpdater';
 import { logger } from './logger';
 import { FederatedMessage, FederatedRoom, FederatedUser } from './federatedResources';
+import { Federation } from './';
 
-class PeerClient {
+export class PeerClient {
 	constructor() {
 		this.config = {};
 
@@ -69,7 +67,7 @@ class PeerClient {
 		if (this.config.hub.active) {
 			updateStatus('Registering with Hub...');
 
-			return peerDNS.register(this.peer);
+			return Federation.peerDNS.register(this.peer);
 		}
 
 		return true;
@@ -143,7 +141,7 @@ class PeerClient {
 
 		const { peer: domain } = e;
 
-		const peer = peerDNS.searchPeer(domain);
+		const peer = Federation.peerDNS.searchPeer(domain);
 
 		if (!peer || !peer.public_key) {
 			this.log(`Could not find valid peer:${ domain }`);
@@ -159,7 +157,7 @@ class PeerClient {
 				// Encrypt with the local private key
 				payload = Federation.privateKey.encryptPrivate(payload);
 
-				peerHTTP.request(peer, 'POST', '/api/v1/federation.events', { payload }, { total: 5, stepSize: 500, stepMultiplier: 10 });
+				Federation.peerHTTP.request(peer, 'POST', '/api/v1/federation.events', { payload }, { total: 5, stepSize: 500, stepMultiplier: 10 });
 
 				FederationEvents.setEventAsFullfilled(e);
 			} catch (err) {
@@ -242,22 +240,22 @@ class PeerClient {
 	// Users
 	//
 	// #####
-	findUsers(email, options = {}) {
-		const [username, domain] = email.split('@');
+	findUsers(identifier, options = {}) {
+		const [username, domain] = identifier.split('@');
 
 		const { peer: { domain: localPeerDomain } } = this;
 
 		let peer = null;
 
 		try {
-			peer = peerDNS.searchPeer(options.domainOverride || domain);
+			peer = Federation.peerDNS.searchPeer(options.domainOverride || domain);
 		} catch (err) {
 			this.log(`Could not find peer using domain:${ domain }`);
 			throw new Meteor.Error('federation-peer-does-not-exist', `Could not find peer using domain:${ domain }`);
 		}
 
 		try {
-			const { data: { federatedUsers: remoteFederatedUsers } } = peerHTTP.request(peer, 'GET', `/api/v1/federation.users?${ qs.stringify({ username, domain, emailOnly: options.emailOnly }) }`);
+			const { data: { federatedUsers: remoteFederatedUsers } } = Federation.peerHTTP.request(peer, 'GET', `/api/v1/federation.users?${ qs.stringify({ username, domain, usernameOnly: options.usernameOnly }) }`);
 
 			const federatedUsers = [];
 
@@ -268,7 +266,7 @@ class PeerClient {
 			return federatedUsers;
 		} catch (err) {
 			this.log(`Could not find user:${ username } at ${ peer.domain }`);
-			throw new Meteor.Error('federation-user-does-not-exist', `Could not find user:${ email } at ${ peer.domain }`);
+			throw new Meteor.Error('federation-user-does-not-exist', `Could not find user:${ identifier } at ${ peer.domain }`);
 		}
 	}
 
@@ -283,13 +281,13 @@ class PeerClient {
 		let peer = null;
 
 		try {
-			peer = peerDNS.searchPeer(domain);
+			peer = Federation.peerDNS.searchPeer(domain);
 		} catch (err) {
 			this.log(`Could not find peer using domain:${ domain }`);
 			throw new Meteor.Error('federation-peer-does-not-exist', `Could not find peer using domain:${ domain }`);
 		}
 
-		const { data: { upload, buffer } } = peerHTTP.request(peer, 'GET', `/api/v1/federation.uploads?${ qs.stringify({ upload_id: fileId }) }`);
+		const { data: { upload, buffer } } = Federation.peerHTTP.request(peer, 'GET', `/api/v1/federation.uploads?${ qs.stringify({ upload_id: fileId }) }`);
 
 		return { upload, buffer: Buffer.from(buffer) };
 	}
@@ -611,5 +609,3 @@ class PeerClient {
 		FederationEvents.userUnmuted(federatedRoom, federatedUnmutedUser, federatedUserWhoUnmuted, { skipPeers: [localPeerDomain] });
 	}
 }
-
-export default new PeerClient();
diff --git a/app/federation/server/peerDNS.js b/app/federation/server/PeerDNS.js
similarity index 90%
rename from app/federation/server/peerDNS.js
rename to app/federation/server/PeerDNS.js
index 75e999703bee..1959cfa6ab11 100644
--- a/app/federation/server/peerDNS.js
+++ b/app/federation/server/PeerDNS.js
@@ -3,13 +3,13 @@ import { Meteor } from 'meteor/meteor';
 import { FederationDNSCache } from '../../models';
 
 import { logger } from './logger';
-import peerHTTP from './peerHTTP';
 import { updateStatus } from './settingsUpdater';
+import { Federation } from './';
 
 const dnsResolveSRV = Meteor.wrapAsync(dns.resolveSrv);
 const dnsResolveTXT = Meteor.wrapAsync(dns.resolveTxt);
 
-class PeerDNS {
+export class PeerDNS {
 	constructor() {
 		this.config = {};
 	}
@@ -44,7 +44,7 @@ class PeerDNS {
 
 		// Attempt to register peer
 		try {
-			peerHTTP.request(this.HubPeer, 'POST', '/api/v1/peers', { uniqueId, domain, url, public_key }, { total: 5, stepSize: 1000, tryToUpdateDNS: false }, headers);
+			Federation.peerHTTP.request(this.HubPeer, 'POST', '/api/v1/peers', { uniqueId, domain, url, public_key }, { total: 5, stepSize: 1000, tryToUpdateDNS: false }, headers);
 
 			this.log('Peer registered!');
 
@@ -114,7 +114,7 @@ class PeerDNS {
 		this.log(`getPeerUsingHub: ${ domain }`);
 
 		// If there is no DNS entry for that, get from the Hub
-		const { data: { peer } } = peerHTTP.simpleRequest(this.HubPeer, 'GET', `/api/v1/peers?search=${ domain }`);
+		const { data: { peer } } = Federation.peerHTTP.simpleRequest(this.HubPeer, 'GET', `/api/v1/peers?search=${ domain }`);
 
 		return peer;
 	}
@@ -169,5 +169,3 @@ class PeerDNS {
 		}
 	}
 }
-
-export default new PeerDNS();
diff --git a/app/federation/server/PeerHTTP/PeerHTTP.js b/app/federation/server/PeerHTTP/PeerHTTP.js
new file mode 100644
index 000000000000..f45e59eb0706
--- /dev/null
+++ b/app/federation/server/PeerHTTP/PeerHTTP.js
@@ -0,0 +1,100 @@
+import { Meteor } from 'meteor/meteor';
+import { HTTP } from 'meteor/http';
+
+import { logger } from '../logger';
+import { Federation } from '../';
+
+import { skipRetryOnSpecificError, delay } from './utils';
+
+export class PeerHTTP {
+	constructor() {
+		this.config = {};
+	}
+
+	setConfig(config) {
+		// General
+		this.config = config;
+	}
+
+	log(message) {
+		logger.http.info(message);
+	}
+
+	//
+	// Direct request
+	simpleRequest(peer, method, uri, body, headers) {
+		this.log(`Request: ${ method } ${ uri }`);
+
+		const { url: serverBaseURL } = peer;
+
+		const url = `${ serverBaseURL }${ uri }`;
+
+		let data = null;
+
+		if (method === 'POST' || method === 'PUT') {
+			data = body;
+		}
+
+		this.log(`Sending request: ${ method } - ${ uri }`);
+
+		return HTTP.call(method, url, { data, timeout: 2000, headers: { ...headers, 'x-federation-domain': this.config.peer.domain } });
+	}
+
+	//
+	// Request trying to find DNS entries
+	request(peer, method, uri, body, retryInfo = {}, headers = {}) {
+		// Normalize retry info
+		retryInfo = {
+			total: retryInfo.total || 1,
+			stepSize: retryInfo.stepSize || 100,
+			stepMultiplier: retryInfo.stepMultiplier || 1,
+			tryToUpdateDNS: retryInfo.tryToUpdateDNS === undefined ? true : retryInfo.tryToUpdateDNS,
+			DNSUpdated: false,
+		};
+
+		for (let i = 0; i <= retryInfo.total; i++) {
+			try {
+				return this.simpleRequest(peer, method, uri, body, headers);
+			} catch (err) {
+				try {
+					if (retryInfo.tryToUpdateDNS && !retryInfo.DNSUpdated) {
+						i--;
+
+						retryInfo.DNSUpdated = true;
+
+						this.log(`Trying to update local DNS cache for peer:${ peer.domain }`);
+
+						peer = Federation.peerDNS.updatePeerDNS(peer.domain);
+
+						continue;
+					}
+				} catch (err) {
+					if (err.response && err.response.statusCode === 404) {
+						throw new Meteor.Error('federation-peer-does-not-exist', 'Peer does not exist');
+					}
+				}
+
+				// Check if we need to skip due to specific error
+				if (skipRetryOnSpecificError(err)) {
+					this.log('Retry: skipping due to specific error');
+
+					throw err;
+				}
+
+				if (i === retryInfo.total - 1) {
+				// Throw the error, as we could not fulfill the request
+					this.log('Retry: could not fulfill the request');
+
+					throw err;
+				}
+
+				const timeToRetry = retryInfo.stepSize * (i + 1) * retryInfo.stepMultiplier;
+
+				this.log(`Trying again in ${ timeToRetry / 1000 }s: ${ method } - ${ uri }`);
+
+				// Otherwise, wait and try again
+				delay(timeToRetry);
+			}
+		}
+	}
+}
diff --git a/app/federation/server/PeerHTTP/index.js b/app/federation/server/PeerHTTP/index.js
new file mode 100644
index 000000000000..3c9e957f1cc9
--- /dev/null
+++ b/app/federation/server/PeerHTTP/index.js
@@ -0,0 +1 @@
+export { PeerHTTP } from './PeerHTTP';
diff --git a/app/federation/server/PeerHTTP/utils.js b/app/federation/server/PeerHTTP/utils.js
new file mode 100644
index 000000000000..a3d5d153d612
--- /dev/null
+++ b/app/federation/server/PeerHTTP/utils.js
@@ -0,0 +1,19 @@
+import { Meteor } from 'meteor/meteor';
+
+// Should skip the retry if the error is one of the below?
+const errorsToSkipRetrying = [
+	'error-app-prevented-sending',
+];
+
+export function skipRetryOnSpecificError(err) {
+	err = err && err.response && err.response.data;
+	return errorsToSkipRetrying.includes(err && err.errorType);
+}
+
+// Delay method to wait a little bit before retrying
+export const delay = Meteor.wrapAsync(function(ms, callback) {
+	Meteor.setTimeout(function() {
+		callback(null);
+	}, ms);
+});
+
diff --git a/app/federation/server/peerServer/peerServer.js b/app/federation/server/PeerServer/PeerServer.js
similarity index 91%
rename from app/federation/server/peerServer/peerServer.js
rename to app/federation/server/PeerServer/PeerServer.js
index 643017b1e17c..6f7e8f84f1ba 100644
--- a/app/federation/server/peerServer/peerServer.js
+++ b/app/federation/server/PeerServer/PeerServer.js
@@ -5,9 +5,9 @@ import { Rooms, Subscriptions } from '../../../models';
 
 import { FederatedMessage, FederatedRoom, FederatedUser } from '../federatedResources';
 import { logger } from '../logger.js';
-import peerClient from '../peerClient';
+import { Federation } from '../';
 
-class PeerServer {
+export class PeerServer {
 	constructor() {
 		this.config = {};
 		this.enabled = false;
@@ -75,7 +75,7 @@ class PeerServer {
 		federatedRoom.createUsers();
 
 		// Then, create the room, if needed
-		federatedRoom.create();
+		federatedRoom.create(true);
 	}
 
 	handleUserJoinedEvent(e) {
@@ -93,7 +93,7 @@ class PeerServer {
 		const localUser = federatedUser.create();
 
 		// Callback management
-		peerClient.addCallbackToSkip('afterAddedToRoom', federatedUser.getFederationId());
+		Federation.peerClient.addCallbackToSkip('afterAddedToRoom', federatedUser.getFederationId());
 
 		// Add the user to the room
 		addUserToRoom(federatedRoom.room._id, localUser, null, false);
@@ -129,7 +129,7 @@ class PeerServer {
 		const localUser = federatedUser.create();
 
 		// Callback management
-		peerClient.addCallbackToSkip('afterAddedToRoom', federatedUser.getFederationId());
+		Federation.peerClient.addCallbackToSkip('afterAddedToRoom', federatedUser.getFederationId());
 
 		// Add the user to the room
 		addUserToRoom(federatedRoom.room._id, localUser, localInviter, false);
@@ -156,7 +156,7 @@ class PeerServer {
 		const localUser = federatedUser.getLocalUser();
 
 		// Callback management
-		peerClient.addCallbackToSkip('beforeLeaveRoom', federatedUser.getFederationId());
+		Federation.peerClient.addCallbackToSkip('beforeLeaveRoom', federatedUser.getFederationId());
 
 		// Remove the user from the room
 		removeUserFromRoom(federatedRoom.room._id, localUser);
@@ -187,7 +187,7 @@ class PeerServer {
 		const localUserWhoRemoved = federatedUserWhoRemoved.getLocalUser();
 
 		// Callback management
-		peerClient.addCallbackToSkip('beforeRemoveFromRoom', federatedUser.getFederationId());
+		Federation.peerClient.addCallbackToSkip('beforeRemoveFromRoom', federatedUser.getFederationId());
 
 		// Remove the user from the room
 		removeUserFromRoom(federatedRoom.room._id, localUser, { byUser: localUserWhoRemoved });
@@ -260,7 +260,7 @@ class PeerServer {
 		const federatedMessage = new FederatedMessage(localPeerDomain, message);
 
 		// Callback management
-		peerClient.addCallbackToSkip('afterSaveMessage', federatedMessage.getFederationId());
+		Federation.peerClient.addCallbackToSkip('afterSaveMessage', federatedMessage.getFederationId());
 
 		// Create the federated message
 		federatedMessage.create();
@@ -280,7 +280,7 @@ class PeerServer {
 		const federatedUser = FederatedUser.loadByFederationId(localPeerDomain, federated_user_id);
 
 		// Callback management
-		peerClient.addCallbackToSkip('afterSaveMessage', federatedMessage.getFederationId());
+		Federation.peerClient.addCallbackToSkip('afterSaveMessage', federatedMessage.getFederationId());
 
 		// Update the federated message
 		federatedMessage.update(federatedUser);
@@ -302,7 +302,7 @@ class PeerServer {
 		const localAuthor = federatedMessage.federatedAuthor.getLocalUser();
 
 		// Callback management
-		peerClient.addCallbackToSkip('afterDeleteMessage', federatedMessage.getFederationId());
+		Federation.peerClient.addCallbackToSkip('afterDeleteMessage', federatedMessage.getFederationId());
 
 		// Create the federated message
 		deleteMessage(localMessage, localAuthor);
@@ -318,7 +318,7 @@ class PeerServer {
 		// Load the federated room
 		const federatedRoom = FederatedRoom.loadByFederationId(localPeerDomain, federated_room_id);
 
-		peerClient.addCallbackToSkip('afterReadMessages', federatedRoom.getFederationId());
+		Federation.peerClient.addCallbackToSkip('afterReadMessages', federatedRoom.getFederationId());
 
 		// Load the user who left
 		const federatedUser = FederatedUser.loadByFederationId(localPeerDomain, federated_user_id);
@@ -352,7 +352,7 @@ class PeerServer {
 		const localMessage = federatedMessage.getLocalMessage();
 
 		// Callback management
-		peerClient.addCallbackToSkip('afterSetReaction', federatedMessage.getFederationId());
+		Federation.peerClient.addCallbackToSkip('afterSetReaction', federatedMessage.getFederationId());
 
 		// Set message reaction
 		setReaction(localRoom, localUser, localMessage, reaction, shouldReact);
@@ -378,11 +378,9 @@ class PeerServer {
 		const localMessage = federatedMessage.getLocalMessage();
 
 		// Callback management
-		peerClient.addCallbackToSkip('afterUnsetReaction', federatedMessage.getFederationId());
+		Federation.peerClient.addCallbackToSkip('afterUnsetReaction', federatedMessage.getFederationId());
 
 		// Unset message reaction
 		setReaction(localRoom, localUser, localMessage, reaction, shouldReact);
 	}
 }
-
-export default new PeerServer();
diff --git a/app/federation/server/peerServer/index.js b/app/federation/server/PeerServer/index.js
similarity index 58%
rename from app/federation/server/peerServer/index.js
rename to app/federation/server/PeerServer/index.js
index d8144d71ed15..e1da97c3327a 100644
--- a/app/federation/server/peerServer/index.js
+++ b/app/federation/server/PeerServer/index.js
@@ -1,8 +1,6 @@
-import peerServer from './peerServer';
-
 // Setup routes
 import './routes/events';
 import './routes/uploads';
 import './routes/users';
 
-export default peerServer;
+export { PeerServer } from './PeerServer';
diff --git a/app/federation/server/peerServer/routes/events.js b/app/federation/server/PeerServer/routes/events.js
similarity index 61%
rename from app/federation/server/peerServer/routes/events.js
rename to app/federation/server/PeerServer/routes/events.js
index 1a75fda1d9a0..f8703a6d0dec 100644
--- a/app/federation/server/peerServer/routes/events.js
+++ b/app/federation/server/PeerServer/routes/events.js
@@ -3,12 +3,9 @@ import { FederationKeys } from '../../../../models';
 
 import { Federation } from '../..';
 
-import peerDNS from '../../peerDNS';
-import peerServer from '../peerServer';
-
 API.v1.addRoute('federation.events', { authRequired: false }, {
 	post() {
-		if (!peerServer.enabled) {
+		if (!Federation.peerServer.enabled) {
 			return API.v1.failure('Not found');
 		}
 
@@ -22,7 +19,7 @@ API.v1.addRoute('federation.events', { authRequired: false }, {
 
 		const remotePeerDomain = this.request.headers['x-federation-domain'];
 
-		const peer = peerDNS.searchPeer(remotePeerDomain);
+		const peer = Federation.peerDNS.searchPeer(remotePeerDomain);
 
 		if (!peer) {
 			return API.v1.failure('Could not find valid peer');
@@ -43,62 +40,62 @@ API.v1.addRoute('federation.events', { authRequired: false }, {
 			return API.v1.failure('Event was not sent');
 		}
 
-		peerServer.log(`Received event:${ e.t }`);
+		Federation.peerServer.log(`Received event:${ e.t }`);
 
 		try {
 			switch (e.t) {
 				case 'drc':
-					peerServer.handleDirectRoomCreatedEvent(e);
+					Federation.peerServer.handleDirectRoomCreatedEvent(e);
 					break;
 				case 'roc':
-					peerServer.handleRoomCreatedEvent(e);
+					Federation.peerServer.handleRoomCreatedEvent(e);
 					break;
 				case 'usj':
-					peerServer.handleUserJoinedEvent(e);
+					Federation.peerServer.handleUserJoinedEvent(e);
 					break;
 				case 'usa':
-					peerServer.handleUserAddedEvent(e);
+					Federation.peerServer.handleUserAddedEvent(e);
 					break;
 				case 'usl':
-					peerServer.handleUserLeftEvent(e);
+					Federation.peerServer.handleUserLeftEvent(e);
 					break;
 				case 'usr':
-					peerServer.handleUserRemovedEvent(e);
+					Federation.peerServer.handleUserRemovedEvent(e);
 					break;
 				case 'usm':
-					peerServer.handleUserMutedEvent(e);
+					Federation.peerServer.handleUserMutedEvent(e);
 					break;
 				case 'usu':
-					peerServer.handleUserUnmutedEvent(e);
+					Federation.peerServer.handleUserUnmutedEvent(e);
 					break;
 				case 'msc':
-					peerServer.handleMessageCreatedEvent(e);
+					Federation.peerServer.handleMessageCreatedEvent(e);
 					break;
 				case 'msu':
-					peerServer.handleMessageUpdatedEvent(e);
+					Federation.peerServer.handleMessageUpdatedEvent(e);
 					break;
 				case 'msd':
-					peerServer.handleMessageDeletedEvent(e);
+					Federation.peerServer.handleMessageDeletedEvent(e);
 					break;
 				case 'msr':
-					peerServer.handleMessagesReadEvent(e);
+					Federation.peerServer.handleMessagesReadEvent(e);
 					break;
 				case 'mrs':
-					peerServer.handleMessagesSetReactionEvent(e);
+					Federation.peerServer.handleMessagesSetReactionEvent(e);
 					break;
 				case 'mru':
-					peerServer.handleMessagesUnsetReactionEvent(e);
+					Federation.peerServer.handleMessagesUnsetReactionEvent(e);
 					break;
 				default:
 					throw new Error(`Invalid event:${ e.t }`);
 			}
 
-			peerServer.log('Success, responding...');
+			Federation.peerServer.log('Success, responding...');
 
 			// Respond
 			return API.v1.success();
 		} catch (err) {
-			peerServer.log(`Error handling event:${ e.t } - ${ err.toString() }`);
+			Federation.peerServer.log(`Error handling event:${ e.t } - ${ err.toString() }`);
 
 			return API.v1.failure(`Error handling event:${ e.t } - ${ err.toString() }`, err.error || 'unknown-error');
 		}
diff --git a/app/federation/server/peerServer/routes/uploads.js b/app/federation/server/PeerServer/routes/uploads.js
similarity index 89%
rename from app/federation/server/peerServer/routes/uploads.js
rename to app/federation/server/PeerServer/routes/uploads.js
index 5efd8e2c368a..696a10096529 100644
--- a/app/federation/server/peerServer/routes/uploads.js
+++ b/app/federation/server/PeerServer/routes/uploads.js
@@ -3,11 +3,11 @@ import { API } from '../../../../api';
 import { Uploads } from '../../../../models';
 import { FileUpload } from '../../../../file-upload';
 
-import peerServer from '../peerServer';
+import { Federation } from '../../';
 
 API.v1.addRoute('federation.uploads', { authRequired: false }, {
 	get() {
-		if (!peerServer.enabled) {
+		if (!Federation.peerServer.enabled) {
 			return API.v1.failure('Not found');
 		}
 
diff --git a/app/federation/server/peerServer/routes/users.js b/app/federation/server/PeerServer/routes/users.js
similarity index 67%
rename from app/federation/server/peerServer/routes/users.js
rename to app/federation/server/PeerServer/routes/users.js
index d20cee692d03..4e95e5fd5f33 100644
--- a/app/federation/server/peerServer/routes/users.js
+++ b/app/federation/server/PeerServer/routes/users.js
@@ -2,28 +2,28 @@ import { API } from '../../../../api';
 import { Users } from '../../../../models';
 
 import { FederatedUser } from '../../federatedResources';
-import peerServer from '../peerServer';
+import { Federation } from '../../';
 
 API.v1.addRoute('federation.users', { authRequired: false }, {
 	get() {
-		if (!peerServer.enabled) {
+		if (!Federation.peerServer.enabled) {
 			return API.v1.failure('Not found');
 		}
 
-		const { peer: { domain: localPeerDomain } } = peerServer.config;
+		const { peer: { domain: localPeerDomain } } = Federation.peerServer.config;
 
-		const { username, domain, emailOnly } = this.requestParams();
+		const { username, domain, usernameOnly } = this.requestParams();
 
 		const email = `${ username }@${ domain }`;
 
-		peerServer.log(`[users] Trying to find user by username:${ username } and email:${ email }`);
+		Federation.peerServer.log(`[users] Trying to find user by username:${ username } and email:${ email }`);
 
 		const query = {
 			type: 'user',
 		};
 
-		if (emailOnly === 'true') {
-			query['emails.address'] = email;
+		if (usernameOnly === 'true') {
+			query.username = username;
 		} else {
 			query.$or = [
 				{ name: username },
diff --git a/app/federation/server/federatedResources/FederatedMessage.js b/app/federation/server/federatedResources/FederatedMessage.js
index dfd9bb860559..97cb4c273c19 100644
--- a/app/federation/server/federatedResources/FederatedMessage.js
+++ b/app/federation/server/federatedResources/FederatedMessage.js
@@ -3,12 +3,12 @@ import { sendMessage, updateMessage } from '../../../lib';
 import { Messages, Rooms, Users } from '../../../models';
 import { FileUpload } from '../../../file-upload';
 
-import FederatedResource from './FederatedResource';
-import FederatedRoom from './FederatedRoom';
-import FederatedUser from './FederatedUser';
-import peerClient from '../peerClient';
+import { FederatedResource } from './FederatedResource';
+import { FederatedRoom } from './FederatedRoom';
+import { FederatedUser } from './FederatedUser';
+import { Federation } from '../';
 
-class FederatedMessage extends FederatedResource {
+export class FederatedMessage extends FederatedResource {
 	constructor(localPeerIdentifier, message) {
 		super('message');
 
@@ -16,6 +16,7 @@ class FederatedMessage extends FederatedResource {
 			throw new Error('message param cannot be empty');
 		}
 
+		// Set local peer identifier to local object
 		this.localPeerIdentifier = localPeerIdentifier;
 
 		// Make sure room dates are correct
@@ -178,7 +179,7 @@ class FederatedMessage extends FederatedResource {
 
 				const { federation: { peer: identifier } } = localMessage;
 
-				const { upload, buffer } = peerClient.getUpload({ identifier, localMessage });
+				const { upload, buffer } = Federation.peerClient.getUpload({ identifier, localMessage });
 
 				const oldUploadId = upload._id;
 
@@ -260,5 +261,3 @@ FederatedMessage.loadOrCreate = function loadOrCreate(localPeerIdentifier, messa
 
 	return new FederatedMessage(localPeerIdentifier, message);
 };
-
-export default FederatedMessage;
diff --git a/app/federation/server/federatedResources/FederatedResource.js b/app/federation/server/federatedResources/FederatedResource.js
index 772dc30348b0..7ecdb9ec1cd3 100644
--- a/app/federation/server/federatedResources/FederatedResource.js
+++ b/app/federation/server/federatedResources/FederatedResource.js
@@ -1,6 +1,6 @@
 import { logger } from '../logger';
 
-class FederatedResource {
+export class FederatedResource {
 	constructor(name) {
 		this.resourceName = `federated-${ name }`;
 
@@ -15,5 +15,3 @@ class FederatedResource {
 FederatedResource.log = function log(name, message) {
 	logger.resource.info(`[${ name }] ${ message }`);
 };
-
-export default FederatedResource;
diff --git a/app/federation/server/federatedResources/FederatedRoom.js b/app/federation/server/federatedResources/FederatedRoom.js
index ac1e7b47a1d8..06e5a0a3a855 100644
--- a/app/federation/server/federatedResources/FederatedRoom.js
+++ b/app/federation/server/federatedResources/FederatedRoom.js
@@ -1,10 +1,10 @@
 import { createRoom } from '../../../lib';
 import { Rooms, Subscriptions, Users } from '../../../models';
 
-import FederatedResource from './FederatedResource';
-import FederatedUser from './FederatedUser';
+import { FederatedResource } from './FederatedResource';
+import { FederatedUser } from './FederatedUser';
 
-class FederatedRoom extends FederatedResource {
+export class FederatedRoom extends FederatedResource {
 	constructor(localPeerIdentifier, room, extras = {}) {
 		super('room');
 
@@ -144,7 +144,7 @@ class FederatedRoom extends FederatedResource {
 		}
 	}
 
-	create() {
+	create(alertAndOpen = false) {
 		this.log('create');
 
 		// Get the local room object (with or without suffixes)
@@ -195,8 +195,8 @@ class FederatedRoom extends FederatedResource {
 
 			let createRoomOptions = {
 				subscriptionExtra: {
-					alert: true,
-					open: true,
+					alert: alertAndOpen,
+					open: alertAndOpen,
 				},
 			};
 
@@ -266,5 +266,3 @@ FederatedRoom.isFederated = function isFederated(localPeerIdentifier, room, opti
 
 	return isFederated;
 };
-
-export default FederatedRoom;
diff --git a/app/federation/server/federatedResources/FederatedUser.js b/app/federation/server/federatedResources/FederatedUser.js
index 41d431ddab83..74f40bbf3168 100644
--- a/app/federation/server/federatedResources/FederatedUser.js
+++ b/app/federation/server/federatedResources/FederatedUser.js
@@ -1,8 +1,8 @@
 import { Users } from '../../../models';
 
-import FederatedResource from './FederatedResource';
+import { FederatedResource } from './FederatedResource';
 
-class FederatedUser extends FederatedResource {
+export class FederatedUser extends FederatedResource {
 	constructor(localPeerIdentifier, user) {
 		super('user');
 
@@ -120,5 +120,3 @@ FederatedUser.loadOrCreate = function loadOrCreate(localPeerIdentifier, user) {
 
 	return new FederatedUser(localPeerIdentifier, user);
 };
-
-export default FederatedUser;
diff --git a/app/federation/server/federatedResources/index.js b/app/federation/server/federatedResources/index.js
index 0bd6fdd4cbb4..90d98b351cab 100644
--- a/app/federation/server/federatedResources/index.js
+++ b/app/federation/server/federatedResources/index.js
@@ -1,4 +1,4 @@
-export { default as FederatedMessage } from './FederatedMessage';
-export { default as FederatedResource } from './FederatedResource';
-export { default as FederatedRoom } from './FederatedRoom';
-export { default as FederatedUser } from './FederatedUser';
+export { FederatedMessage } from './FederatedMessage';
+export { FederatedResource } from './FederatedResource';
+export { FederatedRoom } from './FederatedRoom';
+export { FederatedUser } from './FederatedUser';
diff --git a/app/federation/server/index.js b/app/federation/server/index.js
index 165b56d6b5e4..870d70ca20f2 100644
--- a/app/federation/server/index.js
+++ b/app/federation/server/index.js
@@ -5,15 +5,22 @@ import { FederationKeys } from '../../models';
 import { getWorkspaceAccessToken } from '../../cloud/server';
 
 import './federation-settings';
-import './methods';
 
 import { logger } from './logger';
-import peerClient from './peerClient';
-import peerServer from './peerServer';
-import peerDNS from './peerDNS';
-import peerHTTP from './peerHTTP';
+import { PeerClient } from './PeerClient';
+import { PeerDNS } from './PeerDNS';
+import { PeerHTTP } from './PeerHTTP';
+import { PeerServer } from './PeerServer';
 import * as SettingsUpdater from './settingsUpdater';
 
+import { addUser } from './methods/addUser';
+import { searchUsers } from './methods/searchUsers';
+
+const peerClient = new PeerClient();
+const peerDNS = new PeerDNS();
+const peerHTTP = new PeerHTTP();
+const peerServer = new PeerServer();
+
 export const Federation = {
 	enabled: false,
 	privateKey: null,
@@ -21,6 +28,17 @@ export const Federation = {
 	usingHub: null,
 	uniqueId: null,
 	localIdentifier: null,
+
+	peerClient,
+	peerDNS,
+	peerHTTP,
+	peerServer,
+};
+
+// Add Federation methods with bound context
+Federation.methods = {
+	addUser,
+	searchUsers,
 };
 
 // Generate keys
diff --git a/app/federation/server/methods/addUser.js b/app/federation/server/methods/addUser.js
new file mode 100644
index 000000000000..45f83096d67b
--- /dev/null
+++ b/app/federation/server/methods/addUser.js
@@ -0,0 +1,45 @@
+import { Meteor } from 'meteor/meteor';
+import { Users } from '../../../models';
+
+import { Federation } from '../';
+import { logger } from '../logger';
+
+export function addUser(identifier) {
+	if (!Meteor.userId()) {
+		throw new Meteor.Error('error-invalid-user', 'Invalid user', { method: 'Federation.addUser' });
+	}
+
+	if (!Federation.peerServer.enabled) {
+		throw new Meteor.Error('error-federation-disabled', 'Federation disabled', { method: 'Federation.addUser' });
+	}
+
+	// Make sure the federated user still exists, and get the unique one, by email address
+	const [federatedUser] = Federation.peerClient.findUsers(identifier, { usernameOnly: true });
+
+	if (!federatedUser) {
+		throw new Meteor.Error('federation-invalid-user', 'There is no user to add.');
+	}
+
+	let user = null;
+
+	const localUser = federatedUser.getLocalUser();
+
+	localUser.name += `@${ federatedUser.user.federation.peer }`;
+
+	// Delete the _id
+	delete localUser._id;
+
+	try {
+		// Create the local user
+		user = Users.create(localUser);
+	} catch (err) {
+		// If the user already exists, return the existing user
+		if (err.code === 11000) {
+			user = Users.findOne({ 'federation._id': localUser.federation._id });
+		}
+
+		logger.error(err);
+	}
+
+	return user;
+}
diff --git a/app/federation/server/methods/federationAddUser.js b/app/federation/server/methods/federationAddUser.js
deleted file mode 100644
index c4c5b6012828..000000000000
--- a/app/federation/server/methods/federationAddUser.js
+++ /dev/null
@@ -1,48 +0,0 @@
-import { Meteor } from 'meteor/meteor';
-import { Users } from '../../../models';
-
-import { logger } from '../logger';
-import peerClient from '../peerClient';
-import peerServer from '../peerClient';
-
-Meteor.methods({
-	federationAddUser(emailAddress, domainOverride) {
-		if (!Meteor.userId()) {
-			throw new Meteor.Error('error-invalid-user', 'Invalid user', { method: 'federationAddUser' });
-		}
-
-		if (!peerServer.enabled) {
-			throw new Meteor.Error('error-federation-disabled', 'Federation disabled', { method: 'federationAddUser' });
-		}
-
-		// Make sure the federated user still exists, and get the unique one, by email address
-		const [federatedUser] = peerClient.findUsers(emailAddress, { domainOverride, emailOnly: true });
-
-		if (!federatedUser) {
-			throw new Meteor.Error('federation-invalid-user', 'There is no user to add.');
-		}
-
-		let user = null;
-
-		const localUser = federatedUser.getLocalUser();
-
-		localUser.name += `@${ federatedUser.user.federation.peer }`;
-
-		// Delete the _id
-		delete localUser._id;
-
-		try {
-			// Create the local user
-			user = Users.create(localUser);
-		} catch (err) {
-			// If the user already exists, return the existing user
-			if (err.code === 11000) {
-				user = Users.findOne({ 'federation._id': localUser.federation._id });
-			}
-
-			logger.error(err);
-		}
-
-		return user;
-	},
-});
diff --git a/app/federation/server/methods/federationSearchUsers.js b/app/federation/server/methods/federationSearchUsers.js
deleted file mode 100644
index cad994083e34..000000000000
--- a/app/federation/server/methods/federationSearchUsers.js
+++ /dev/null
@@ -1,24 +0,0 @@
-import { Meteor } from 'meteor/meteor';
-
-import peerClient from '../peerClient';
-import peerServer from '../peerServer';
-
-Meteor.methods({
-	federationSearchUsers(email) {
-		if (!Meteor.userId()) {
-			throw new Meteor.Error('error-invalid-user', 'Invalid user', { method: 'federationSearchUsers' });
-		}
-
-		if (!peerServer.enabled) {
-			throw new Meteor.Error('error-federation-disabled', 'Federation disabled', { method: 'federationAddUser' });
-		}
-
-		const federatedUsers = peerClient.findUsers(email);
-
-		if (!federatedUsers.length) {
-			throw new Meteor.Error('federation-user-not-found', `Could not find federated users using "${ email }"`);
-		}
-
-		return federatedUsers;
-	},
-});
diff --git a/app/federation/server/methods/index.js b/app/federation/server/methods/index.js
deleted file mode 100644
index ce95109beb42..000000000000
--- a/app/federation/server/methods/index.js
+++ /dev/null
@@ -1,2 +0,0 @@
-import './federationSearchUsers';
-import './federationAddUser';
diff --git a/app/federation/server/methods/searchUsers.js b/app/federation/server/methods/searchUsers.js
new file mode 100644
index 000000000000..7fe711f45b23
--- /dev/null
+++ b/app/federation/server/methods/searchUsers.js
@@ -0,0 +1,21 @@
+import { Meteor } from 'meteor/meteor';
+
+import { Federation } from '../';
+
+export function searchUsers(identifier) {
+	if (!Meteor.userId()) {
+		throw new Meteor.Error('error-invalid-user', 'Invalid user', { method: 'federationSearchUsers' });
+	}
+
+	if (!Federation.peerClient.enabled) {
+		throw new Meteor.Error('error-federation-disabled', 'Federation disabled', { method: 'federationSearchUsers' });
+	}
+
+	const federatedUsers = Federation.peerClient.findUsers(identifier);
+
+	if (!federatedUsers.length) {
+		throw new Meteor.Error('federation-user-not-found', `Could not find federated users using "${ identifier }"`);
+	}
+
+	return federatedUsers;
+}
diff --git a/app/federation/server/peerHTTP.js b/app/federation/server/peerHTTP.js
deleted file mode 100644
index f96967ea4890..000000000000
--- a/app/federation/server/peerHTTP.js
+++ /dev/null
@@ -1,126 +0,0 @@
-import { Meteor } from 'meteor/meteor';
-import { HTTP } from 'meteor/http';
-
-import { logger } from './logger';
-import peerDNS from './peerDNS';
-
-// Should skip the retry if the error is one of the below?
-const errorsToSkipRetrying = [
-	'error-app-prevented-sending',
-];
-
-function skipRetryOnSpecificError(err) {
-	return errorsToSkipRetrying.includes(err && err.errorType);
-}
-
-// Delay method to wait a little bit before retrying
-const delay = Meteor.wrapAsync(function(ms, callback) {
-	Meteor.setTimeout(function() {
-		callback(null);
-	}, ms);
-});
-
-function doSimpleRequest(peer, method, uri, body, headers = {}) {
-	this.log(`Request: ${ method } ${ uri }`);
-
-	const { url: serverBaseURL } = peer;
-
-	const url = `${ serverBaseURL }${ uri }`;
-
-	let data = null;
-
-	if (method === 'POST' || method === 'PUT') {
-		data = body;
-	}
-
-	this.log(`Sending request: ${ method } - ${ uri }`);
-
-	return HTTP.call(method, url, { data, timeout: 2000, headers: { ...headers, 'x-federation-domain': this.config.peer.domain } });
-}
-
-//
-// Actually does the request, handling retries and everything
-function doRequest(peer, method, uri, body, retryInfo = {}, headers = {}) {
-	// Normalize retry info
-	retryInfo = {
-		total: retryInfo.total || 1,
-		stepSize: retryInfo.stepSize || 100,
-		stepMultiplier: retryInfo.stepMultiplier || 1,
-		tryToUpdateDNS: retryInfo.tryToUpdateDNS === undefined ? true : retryInfo.tryToUpdateDNS,
-		DNSUpdated: false,
-	};
-
-	for (let i = 0; i <= retryInfo.total; i++) {
-		try {
-			return doSimpleRequest.call(this, peer, method, uri, body, headers);
-		} catch (err) {
-			try {
-				if (retryInfo.tryToUpdateDNS && !retryInfo.DNSUpdated) {
-					i--;
-
-					retryInfo.DNSUpdated = true;
-
-					this.log(`Trying to update local DNS cache for peer:${ peer.domain }`);
-
-					peer = peerDNS.updatePeerDNS(peer.domain);
-
-					continue;
-				}
-			} catch (err) {
-				if (err.response && err.response.statusCode === 404) {
-					throw new Meteor.Error('federation-peer-does-not-exist', 'Peer does not exist');
-				}
-			}
-
-			// Check if we need to skip due to specific error
-			if (skipRetryOnSpecificError(err && err.response && err.response.data)) {
-				this.log('Retry: skipping due to specific error');
-
-				throw err;
-			}
-
-			if (i === retryInfo.total - 1) {
-				// Throw the error, as we could not fulfill the request
-				this.log('Retry: could not fulfill the request');
-
-				throw err;
-			}
-
-			const timeToRetry = retryInfo.stepSize * (i + 1) * retryInfo.stepMultiplier;
-
-			this.log(`Trying again in ${ timeToRetry / 1000 }s: ${ method } - ${ uri }`);
-
-			// Otherwise, wait and try again
-			delay(timeToRetry);
-		}
-	}
-}
-
-class PeerHTTP {
-	constructor() {
-		this.config = {};
-	}
-
-	setConfig(config) {
-		// General
-		this.config = config;
-	}
-
-	log(message) {
-		logger.http.info(message);
-	}
-
-	//
-	// Direct request
-	simpleRequest(peer, method, uri, body, headers) {
-		return doSimpleRequest.call(this, peer, method, uri, body, headers);
-	}
-
-	//
-	// Request trying to find DNS entries
-	request(peer, method, uri, body, retryInfo = {}, headers = {}) {
-		return doRequest.call(this, peer, method, uri, body, retryInfo, headers);
-	}
-}
-
-export default new PeerHTTP();
diff --git a/app/ui/client/views/app/directory.js b/app/ui/client/views/app/directory.js
index d2dd074c3d98..9494cc0e5308 100644
--- a/app/ui/client/views/app/directory.js
+++ b/app/ui/client/views/app/directory.js
@@ -124,27 +124,14 @@ Template.directory.helpers({
 		let routeConfig;
 
 		return function(item) {
-			// This means we need to add this user locally first
-			if (item.remoteOnly) {
-				Meteor.call('federationAddUser', item.email, item.domain, (error, federatedUser) => {
-					if (!federatedUser) { return; }
-
-					// Reload
-					instance.end.set(false);
-					// directorySearch.call(instance);
-
-					roomTypes.openRouteLink('d', { name: item.username });
-				});
+			if (searchType.get() === 'channels') {
+				type = 'c';
+				routeConfig = { name: item.name };
 			} else {
-				if (searchType.get() === 'channels') {
-					type = 'c';
-					routeConfig = { name: item.name };
-				} else {
-					type = 'd';
-					routeConfig = { name: item.username };
-				}
-				roomTypes.openRouteLink(type, routeConfig);
+				type = 'd';
+				routeConfig = { name: item.username };
 			}
+			roomTypes.openRouteLink(type, routeConfig);
 		};
 	},
 	isLoading() {
@@ -245,38 +232,6 @@ Template.directory.onRendered(function() {
 			this.isLoading.set(false);
 			this.end.set(!result);
 
-			// If there is no result, searching every workspace and
-			// the search text is an email address, try to find a federated user
-			if (this.searchWorkspace.get() === 'external' && this.searchText.get().indexOf('@') !== -1) {
-				const email = this.searchText.get();
-
-				Meteor.call('federationSearchUsers', email, (error, federatedUsers) => {
-					if (!federatedUsers) { return; }
-
-					result = result || [];
-
-					for (const federatedUser of federatedUsers) {
-						const { user } = federatedUser;
-
-						const exists = result.findIndex((e) => e.domain === user.federation.peer && e.username === user.username) !== -1;
-
-						if (exists) { continue; }
-
-						// Add the federated user to the results
-						result.unshift({
-							remoteOnly: true,
-							name: user.name,
-							username: user.username,
-							email: user.emails && user.emails[0] && user.emails[0].address,
-							createdAt: timeAgo(user.createdAt, t),
-							domain: user.federation.peer,
-						});
-					}
-
-					setResults.call(this, result);
-				});
-			}
-
 			setResults.call(this, result);
 		});
 	});
diff --git a/server/methods/browseChannels.js b/server/methods/browseChannels.js
index 12952f92be9d..e23f7ed2d11b 100644
--- a/server/methods/browseChannels.js
+++ b/server/methods/browseChannels.js
@@ -115,9 +115,34 @@ Meteor.methods({
 			result = Users.findByActiveLocalUsersExcept(text, exceptions, options, forcedSearchFields, Federation.localIdentifier);
 		}
 
+		const total = result.count(); // count ignores the `skip` and `limit` options
+		const results = result.fetch();
+
+		// Try to find federated users, when appliable
+		if (Federation.enabled && type === 'users' && workspace === 'external' && text.indexOf('@') !== -1) {
+			const federatedUsers = Federation.methods.searchUsers(text);
+
+			for (const federatedUser of federatedUsers) {
+				const { user } = federatedUser;
+
+				const exists = results.findIndex((e) => e.domain === user.federation.peer && e.username === user.username) !== -1;
+
+				if (exists) { continue; }
+
+				// Add the federated user to the results
+				results.unshift({
+					username: user.username,
+					name: user.name,
+					createdAt: user.createdAt,
+					emails: user.emails,
+					federation: user.federation,
+				});
+			}
+		}
+
 		return {
-			total: result.count(), // count ignores the `skip` and `limit` options
-			results: result.fetch(),
+			total,
+			results,
 		};
 	},
 });
diff --git a/server/methods/createDirectMessage.js b/server/methods/createDirectMessage.js
index 396e15590f9f..b3f1e637bdbd 100644
--- a/server/methods/createDirectMessage.js
+++ b/server/methods/createDirectMessage.js
@@ -7,6 +7,8 @@ import { getDefaultSubscriptionPref } from '../../app/utils';
 import { RateLimiter } from '../../app/lib';
 import { callbacks } from '../../app/callbacks';
 
+import { Federation } from '../../app/federation/server';
+
 Meteor.methods({
 	createDirectMessage(username) {
 		check(username, String);
@@ -37,7 +39,14 @@ Meteor.methods({
 			});
 		}
 
-		const to = Users.findOneByUsername(username);
+		let to = Users.findOneByUsername(username);
+
+		if (!to && username.indexOf('@') !== -1) {
+			// If the username does have an `@`, but does not exist locally, we create it first
+			const toId = Federation.methods.addUser(username);
+
+			to = Users.findOneById(toId);
+		}
 
 		if (!to) {
 			throw new Meteor.Error('error-invalid-user', 'Invalid user', {

From c4706737e69fcc71533b0a5aafc755fafdf675bf Mon Sep 17 00:00:00 2001
From: Diego Sampaio <chinello@gmail.com>
Date: Fri, 29 Mar 2019 12:34:24 -0300
Subject: [PATCH 21/24] Small improvements to federation callbacks/hooks
 (#13946)

* Improve federation hooks

* Verify if user joined is federated
---
 app/federation/server/PeerClient.js           | 37 ++++++++++++++++---
 .../federatedResources/FederatedRoom.js       |  6 +--
 2 files changed, 35 insertions(+), 8 deletions(-)

diff --git a/app/federation/server/PeerClient.js b/app/federation/server/PeerClient.js
index 6639d2d3a3b7..7e479aa90a09 100644
--- a/app/federation/server/PeerClient.js
+++ b/app/federation/server/PeerClient.js
@@ -115,11 +115,11 @@ export class PeerClient {
 		FederationEvents.on('createEvent', this.wrapEnabled(this.onCreateEvent.bind(this)));
 
 		callbacks.add('afterCreateDirectRoom', this.wrapEnabled(this.afterCreateDirectRoom.bind(this)), callbacks.priority.LOW, 'federation-create-direct-room');
-		callbacks.add('afterCreateRoom', this.wrapEnabled(this.afterCreateRoom.bind(this)), callbacks.priority.LOW, 'federation-join-room');
+		callbacks.add('afterCreateRoom', this.wrapEnabled(this.afterCreateRoom.bind(this)), callbacks.priority.LOW, 'federation-create-room');
 		callbacks.add('afterSaveRoomSettings', this.wrapEnabled(this.afterSaveRoomSettings.bind(this)), callbacks.priority.LOW, 'federation-after-save-room-settings');
-		callbacks.add('afterAddedToRoom', this.wrapEnabled(this.afterAddedToRoom.bind(this)), callbacks.priority.LOW, 'federation-join-room');
+		callbacks.add('afterAddedToRoom', this.wrapEnabled(this.afterAddedToRoom.bind(this)), callbacks.priority.LOW, 'federation-added-to-room');
 		callbacks.add('beforeLeaveRoom', this.wrapEnabled(this.beforeLeaveRoom.bind(this)), callbacks.priority.LOW, 'federation-leave-room');
-		callbacks.add('beforeRemoveFromRoom', this.wrapEnabled(this.beforeRemoveFromRoom.bind(this)), callbacks.priority.LOW, 'federation-leave-room');
+		callbacks.add('beforeRemoveFromRoom', this.wrapEnabled(this.beforeRemoveFromRoom.bind(this)), callbacks.priority.LOW, 'federation-remove-from-room');
 		callbacks.add('afterSaveMessage', this.wrapEnabled(this.afterSaveMessage.bind(this)), callbacks.priority.LOW, 'federation-save-message');
 		callbacks.add('afterDeleteMessage', this.wrapEnabled(this.afterDeleteMessage.bind(this)), callbacks.priority.LOW, 'federation-delete-message');
 		callbacks.add('afterReadMessages', this.wrapEnabled(this.afterReadMessages.bind(this)), callbacks.priority.LOW, 'federation-read-messages');
@@ -317,6 +317,8 @@ export class PeerClient {
 		federatedRoom.refreshFederation();
 
 		FederationEvents.directRoomCreated(federatedRoom, { skipPeers: [localPeerDomain] });
+
+		return room;
 	}
 
 	afterCreateRoom(roomOwner, room) {
@@ -343,6 +345,8 @@ export class PeerClient {
 		federatedRoom.refreshFederation();
 
 		FederationEvents.roomCreated(federatedRoom, { skipPeers: [localPeerDomain] });
+
+		return roomOwner;
 	}
 
 	afterSaveRoomSettings(/* room */) {
@@ -359,8 +363,11 @@ export class PeerClient {
 
 		const { peer: { domain: localPeerDomain } } = this;
 
-		// Check if room is federated
-		if (!FederatedRoom.isFederated(localPeerDomain, room, { checkUsingUsers: true })) { return users; }
+		// Check if room or user who joined are federated
+		if ((!userWhoJoined.federation || userWhoJoined.federation.peer === localPeerDomain) &&
+			!FederatedRoom.isFederated(localPeerDomain, room)) {
+			return users;
+		}
 
 		const extras = {};
 
@@ -408,6 +415,8 @@ export class PeerClient {
 		} else {
 			FederationEvents.userJoined(federatedRoom, federatedUserWhoJoined, { skipPeers: [localPeerDomain] });
 		}
+
+		return users;
 	}
 
 	beforeLeaveRoom(userWhoLeft, room) {
@@ -433,6 +442,8 @@ export class PeerClient {
 
 		// Refresh room's federation
 		federatedRoom.refreshFederation();
+
+		return userWhoLeft;
 	}
 
 	beforeRemoveFromRoom(users, room) {
@@ -461,6 +472,8 @@ export class PeerClient {
 
 		// Refresh room's federation
 		federatedRoom.refreshFederation();
+
+		return users;
 	}
 
 	afterSaveMessage(message, room) {
@@ -488,6 +501,8 @@ export class PeerClient {
 		} else {
 			FederationEvents.messageCreated(federatedRoom, federatedMessage, { skipPeers: [localPeerDomain] });
 		}
+
+		return message;
 	}
 
 	afterDeleteMessage(message) {
@@ -508,6 +523,8 @@ export class PeerClient {
 		const federatedMessage = new FederatedMessage(localPeerDomain, message);
 
 		FederationEvents.messageDeleted(federatedRoom, federatedMessage, { skipPeers: [localPeerDomain] });
+
+		return message;
 	}
 
 	afterReadMessages(roomId, { userId }) {
@@ -531,6 +548,8 @@ export class PeerClient {
 		const federatedUser = FederatedUser.loadByFederationId(localPeerDomain, user.federation._id);
 
 		FederationEvents.messagesRead(federatedRoom, federatedUser, { skipPeers: [localPeerDomain] });
+
+		return roomId;
 	}
 
 	afterSetReaction(message, { user, reaction, shouldReact }) {
@@ -550,6 +569,8 @@ export class PeerClient {
 		const federatedRoom = FederatedRoom.loadByFederationId(localPeerDomain, room.federation._id);
 
 		FederationEvents.messagesSetReaction(federatedRoom, federatedMessage, federatedUser, reaction, shouldReact, { skipPeers: [localPeerDomain] });
+
+		return message;
 	}
 
 	afterUnsetReaction(message, { user, reaction, shouldReact }) {
@@ -569,6 +590,8 @@ export class PeerClient {
 		const federatedRoom = FederatedRoom.loadByFederationId(localPeerDomain, room.federation._id);
 
 		FederationEvents.messagesUnsetReaction(federatedRoom, federatedMessage, federatedUser, reaction, shouldReact, { skipPeers: [localPeerDomain] });
+
+		return message;
 	}
 
 	afterMuteUser(users, room) {
@@ -588,6 +611,8 @@ export class PeerClient {
 		const federatedUserWhoMuted = FederatedUser.loadByFederationId(localPeerDomain, fromUser.federation._id);
 
 		FederationEvents.userMuted(federatedRoom, federatedMutedUser, federatedUserWhoMuted, { skipPeers: [localPeerDomain] });
+
+		return users;
 	}
 
 	afterUnmuteUser(users, room) {
@@ -607,5 +632,7 @@ export class PeerClient {
 		const federatedUserWhoUnmuted = FederatedUser.loadByFederationId(localPeerDomain, fromUser.federation._id);
 
 		FederationEvents.userUnmuted(federatedRoom, federatedUnmutedUser, federatedUserWhoUnmuted, { skipPeers: [localPeerDomain] });
+
+		return users;
 	}
 }
diff --git a/app/federation/server/federatedResources/FederatedRoom.js b/app/federation/server/federatedResources/FederatedRoom.js
index 06e5a0a3a855..e329ffe2f052 100644
--- a/app/federation/server/federatedResources/FederatedRoom.js
+++ b/app/federation/server/federatedResources/FederatedRoom.js
@@ -228,7 +228,7 @@ export class FederatedRoom extends FederatedResource {
 	}
 }
 
-FederatedRoom.loadByFederationId = function loadByFederationId(localPeerIdentifier, federationId) {
+FederatedRoom.loadByFederationId = function _loadByFederationId(localPeerIdentifier, federationId) {
 	const localRoom = Rooms.findOne({ 'federation._id': federationId });
 
 	if (!localRoom) { return; }
@@ -236,13 +236,13 @@ FederatedRoom.loadByFederationId = function loadByFederationId(localPeerIdentifi
 	return new FederatedRoom(localPeerIdentifier, localRoom);
 };
 
-FederatedRoom.loadRoomUsers = function loadRoomUsers(room) {
+FederatedRoom.loadRoomUsers = function _loadRoomUsers(room) {
 	const subscriptions = Subscriptions.findByRoomIdWhenUsernameExists(room._id, { fields: { 'u._id': 1 } }).fetch();
 	const userIds = subscriptions.map((s) => s.u._id);
 	return Users.findUsersWithUsernameByIds(userIds).fetch();
 };
 
-FederatedRoom.isFederated = function isFederated(localPeerIdentifier, room, options = {}) {
+FederatedRoom.isFederated = function _isFederated(localPeerIdentifier, room, options = {}) {
 	this.log('federated-room', `${ room._id } - isFederated?`);
 
 	let isFederated = false;

From 92a48f2465c2cbae9d8f48ac3e27710fe9c60953 Mon Sep 17 00:00:00 2001
From: Diego Sampaio <chinello@gmail.com>
Date: Fri, 29 Mar 2019 13:57:59 -0300
Subject: [PATCH 22/24] Update preview Dockerfile to use Stretch dependencies
 (#13947)

And MongoDB to 4.0
---
 .docker-mongo/Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.docker-mongo/Dockerfile b/.docker-mongo/Dockerfile
index 8a5faf28da37..bc250d596713 100644
--- a/.docker-mongo/Dockerfile
+++ b/.docker-mongo/Dockerfile
@@ -6,8 +6,8 @@ ADD entrypoint.sh /app/bundle/
 MAINTAINER buildmaster@rocket.chat
 
 RUN set -x \
- && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 2930ADAE8CAF5059EE73BB4B58712A2291FA4AD5 \
- && echo "deb http://repo.mongodb.org/apt/debian jessie/mongodb-org/3.6 main" | tee /etc/apt/sources.list.d/mongodb-org-3.6.list \
+ && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 9DA31620334BD75D9DCB49F368818C72E52529D4 \
+ && echo "deb http://repo.mongodb.org/apt/debian stretch/mongodb-org/4.0 main" | tee /etc/apt/sources.list.d/mongodb-org-4.0.list \
  && apt-get update \
  && apt-get install -y --force-yes pwgen mongodb-org \
  && echo "mongodb-org hold" | dpkg --set-selections \

From 849c9d114446448b1dda79c1d4e28d50cd35dd1f Mon Sep 17 00:00:00 2001
From: Diego Sampaio <chinello@gmail.com>
Date: Fri, 29 Mar 2019 17:00:02 -0300
Subject: [PATCH 23/24] Show rooms with mentions on unread category (#13948)

---
 app/ui-sidenav/client/chatRoomItem.js  |  2 --
 app/ui-sidenav/client/roomList.js      | 14 +++++++++++---
 app/ui-sidenav/client/sidebarItem.html |  2 +-
 app/ui-sidenav/client/sidebarItem.js   |  7 +++----
 4 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/app/ui-sidenav/client/chatRoomItem.js b/app/ui-sidenav/client/chatRoomItem.js
index 9c34389ca154..ff3b40a37a32 100644
--- a/app/ui-sidenav/client/chatRoomItem.js
+++ b/app/ui-sidenav/client/chatRoomItem.js
@@ -19,8 +19,6 @@ Template.chatRoomItem.helpers({
 
 		const archivedClass = this.archived ? 'archived' : false;
 
-		this.alert = !this.hideUnreadStatus && this.alert; // && (!hasFocus || FlowRouter.getParam('_id') !== this.rid);
-
 		const icon = this.t !== 'd' && roomTypes.getIcon(this);
 		const avatar = !icon;
 
diff --git a/app/ui-sidenav/client/roomList.js b/app/ui-sidenav/client/roomList.js
index d7ca891becbc..6f11993abe2c 100644
--- a/app/ui-sidenav/client/roomList.js
+++ b/app/ui-sidenav/client/roomList.js
@@ -43,7 +43,10 @@ Template.roomList.helpers({
 
 		if (this.identifier === 'unread') {
 			query.alert = true;
-			query.hideUnreadStatus = { $ne: true };
+			query.$or = [
+				{ hideUnreadStatus: { $ne: true } },
+				{ unread: { $gt: 0 } },
+			];
 
 			return ChatSubscription.find(query, { sort });
 		}
@@ -64,7 +67,7 @@ Template.roomList.helpers({
 				query.prid = { $exists: true };
 			}
 
-			if (this.identifier === 'unread' || this.identifier === 'tokens') {
+			if (this.identifier === 'tokens') {
 				types = ['c', 'p'];
 			}
 
@@ -82,7 +85,12 @@ Template.roomList.helpers({
 			if (getUserPreference(user, 'sidebarShowUnread')) {
 				query.$or = [
 					{ alert: { $ne: true } },
-					{ hideUnreadStatus: true },
+					{
+						$and: [
+							{ hideUnreadStatus: true },
+							{ unread: 0 },
+						],
+					},
 				];
 			}
 			query.t = { $in: types };
diff --git a/app/ui-sidenav/client/sidebarItem.html b/app/ui-sidenav/client/sidebarItem.html
index 5a4e841fad4b..c36ac3016c12 100644
--- a/app/ui-sidenav/client/sidebarItem.html
+++ b/app/ui-sidenav/client/sidebarItem.html
@@ -9,7 +9,7 @@
 </template>
 
 <template name="sidebarItem">
-	<li class="sidebar-item{{#if or unread alert }} sidebar-item--unread{{/if}}{{#if active}} sidebar-item--active{{/if}}{{#if toolbar}} popup-item{{/if}}" data-id="{{_id}}">
+	<li class="sidebar-item{{#if showUnread }} sidebar-item--unread{{/if}}{{#if active}} sidebar-item--active{{/if}}{{#if toolbar}} popup-item{{/if}}" data-id="{{_id}}">
 		<a class="sidebar-item__link" href="{{#if route}}{{route}}{{else}}{{pathFor pathSection group=pathGroup}}{{/if}}" aria-label="{{name}}">
 			{{#unless isLivechatQueue}}
 
diff --git a/app/ui-sidenav/client/sidebarItem.js b/app/ui-sidenav/client/sidebarItem.js
index a9d623eb1c49..0ff8026d01e2 100644
--- a/app/ui-sidenav/client/sidebarItem.js
+++ b/app/ui-sidenav/client/sidebarItem.js
@@ -11,10 +11,6 @@ import { hasAtLeastOnePermission } from '../../authorization';
 import { menu } from '../../ui-utils';
 
 Template.sidebarItem.helpers({
-	or(...args) {
-		args.pop();
-		return args.some((arg) => arg);
-	},
 	streaming() {
 		return this.streamingOptions && Object.keys(this.streamingOptions).length;
 	},
@@ -36,6 +32,9 @@ Template.sidebarItem.helpers({
 	isLivechatQueue() {
 		return this.pathSection === 'livechat-queue';
 	},
+	showUnread() {
+		return this.unread > 0 || (!this.hideUnreadStatus && this.alert);
+	},
 });
 
 function timeAgo(time) {

From 4d158683bde6a3452b721718d97756d776268f76 Mon Sep 17 00:00:00 2001
From: Gabriel Engel <gabriel.engel@gmail.com>
Date: Mon, 1 Apr 2019 10:55:02 -0300
Subject: [PATCH 24/24] LingoHub based on develop (#13964)

* LingoHub Update :rocket:

Manual push by LingoHub User: Diego Sampaio.
Project: Rocket.Chat

Made with :heart: by https://lingohub.com

* Update en.i18n.json
---
 packages/rocketchat-i18n/i18n/ja.i18n.json    |  19 +-
 packages/rocketchat-i18n/i18n/km.i18n.json    |   9 +
 packages/rocketchat-i18n/i18n/pt-BR.i18n.json |   2 +-
 packages/rocketchat-i18n/i18n/tr.i18n.json    | 274 +++++++++---------
 packages/rocketchat-i18n/i18n/zh.i18n.json    |   1 +
 5 files changed, 167 insertions(+), 138 deletions(-)

diff --git a/packages/rocketchat-i18n/i18n/ja.i18n.json b/packages/rocketchat-i18n/i18n/ja.i18n.json
index 2a7a6e5b92fc..9acc01c74555 100644
--- a/packages/rocketchat-i18n/i18n/ja.i18n.json
+++ b/packages/rocketchat-i18n/i18n/ja.i18n.json
@@ -193,7 +193,7 @@
   "Accounts_UserAddedEmailSubject_Default": "あなたは[Site_Name]に追加されました",
   "Accounts_UserAddedEmail_Description": "次のプレースホルダを使用できます。 <br/><ul><li> [name]、[fname]、[lname]はそれぞれユーザーのフルネーム、ファーストネーム、ラストネームです。 </li><li>[email]はユーザーの電子メールです。 </li><li>[password]はユーザーのパスワードです。 </li><li> [Site_Name]と[Site_URL]はアプリケーション名とURLです。 </li></ul>",
   "Activate": "有効化",
-  "Activity": "アクティビティ",
+  "Activity": "アクティビティ順",
   "Add": "追加",
   "add-oauth-service": "OAuthサービスを追加する",
   "add-oauth-service_description": "新しいOAuthサービスを追加する権限",
@@ -343,6 +343,8 @@
   "Apply_and_refresh_all_clients": "すべてのクライアントに適用し更新する",
   "Apps": "アプリ",
   "Apps_Engine_Version": "Apps Engine バージョン",
+  "Apps_Framework_Development_Mode": "開発モードを有効",
+  "Apps_Framework_Development_Mode_Description": "開発モードでは、Rocket.Chatのマーケットプレイス以外のアプリをインストールできます。",
   "Apps_Framework_enabled": "Appフレームワークを有効にする",
   "Apps_Settings": "アプリの設定",
   "Apps_WhatIsIt": "アプリ: これらは何ですか?",
@@ -449,6 +451,7 @@
   "Broadcasting_client_secret": "ブロードキャストクライアントシークレットキー",
   "Broadcasting_enabled": "ブロードキャストを有効にする",
   "Broadcasting_media_server_url": "ブロードキャストメディアサーバーURL",
+  "Browse_Files": "ファイルをブラウズ",
   "Bugsnag_api_key": "Bugsnag APIキー",
   "Build_Environment": "ビルド環境",
   "bulk-create-c": "チャンネル一括作成",
@@ -1043,7 +1046,7 @@
   "Discussion_target_channel_description": "聞きたいことに関連するチャンネルを選択してください",
   "Discussion_target_channel_prefix": "ディスカッションを作成しています：",
   "Discussion_target_channel": "親チャンネルまたはグループ",
-  "discussion-created": "新しいディスカッション \\\"__message__\\\" を始めました。",
+  "discussion-created": "新しいディスカッション \"__message__\" を始めました。",
   "Discussion_description": "何が起こっているのかについての概要を把握するのを手伝ってください！ディスカッションを作成することで、選択したもののサブチャンネルが作成され、両方がリンクされます。",
   "Discussion_first_message_title": "あなたのメッセージ",
   "Discussion_title": "新しいディスカッションを作成する",
@@ -1391,6 +1394,7 @@
   "Forward_chat": "フォワードチャット",
   "Forward_to_department": "部門に転送する",
   "Forward_to_user": "ユーザーに転送",
+  "Free": "無料",
   "Frequently_Used": "よく使うもの",
   "Friday": "金曜日",
   "From": "送信元",
@@ -1431,9 +1435,9 @@
   "Graphql_Enabled": "GraphQLを有効にする",
   "Graphql_CORS": "GraphQL CORS",
   "Graphql_Subscription_Port": "GraphQLサブスクリプションポート",
-  "Group_by_Type": "グループ別",
-  "Group_discussions": "グループディスカッション",
-  "Group_favorites": "グループのお気に入り",
+  "Group_by_Type": "タイプ別にグループ化",
+  "Group_discussions": "ディスカッションをグループ化",
+  "Group_favorites": "お気に入りをグループ化",
   "Group_mentions_disabled_x_members": "__total__人以上のメンバーがいるルームでは、グループへの`@all`と`@here`は無効になっています。",
   "Group_mentions_only": "グループメンションのみ",
   "Guest_Pool": "ゲストプール",
@@ -1543,6 +1547,7 @@
   "Install_FxOs_follow_instructions": "デバイスにアプリがインストールされることを確認してください ( \"インストール\" を押すと表示されます) 。",
   "Install_package": "パッケージをインストールする",
   "Installation": "インストール方法",
+  "Installed": "インストール済み",
   "Installed_at": "インストール日時",
   "Invitation_HTML": "招待メールのHTML本文",
   "Instance_Record": "インスタンスレコード",
@@ -2292,6 +2297,7 @@
   "Public_Channel": "パブリックチャンネル",
   "Public_Community": "公共のコミュニティ",
   "Public_Relations": "広報",
+  "Purchased": "購入済み",
   "Push": "プッシュ通知",
   "Push_Setting_Requires_Restart_Alert": "この値を変更するには、Rocket.Chatを再起動する必要があります。",
   "Push_apn_cert": "APN 証明書",
@@ -2310,6 +2316,8 @@
   "Push_show_message": "通知でメッセージを表示する",
   "Push_show_username_room": "通知でチャンネル/グループ/ユーザー名を表示する",
   "Push_test_push": "テスト",
+  "Purchase_for_free": "無料で購入",
+  "Purchase_for_price": "$%sで購入",
   "Query": "条件クエリー",
   "Query_description": "メール送信先のユーザーを決める追加条件。購読解除されたユーザーは、自動的に条件から除外されます。条件は、有効なJSON形式でなければなりません。例:  \"{\"createdAt\":{\"$gt\":{\"$date\": \"2015-01-01T00:00:00.000Z\"}}}\"",
   "Queue": "キュー",
@@ -2738,6 +2746,7 @@
   "The_server_will_restart_in_s_seconds": "%s 秒後にサーバーを再起動します",
   "The_setting_s_is_configured_to_s_and_you_are_accessing_from_s": "<strong>%s</strong> 設定は、 <strong>%s</strong> に設定されていて、 <strong>%s</strong> からアクセスしています!",
   "The_user_will_be_removed_from_s": "そのユーザーは、 %s から削除されます",
+  "The_user_s_will_be_removed_from_role_s": "ユーザー %s はロール %s から削除されます",
   "The_user_wont_be_able_to_type_in_s": "そのユーザーは、 %s で入力できなくなります",
   "Theme": "テーマ",
   "theme-color-attention-color": "注意の色",
diff --git a/packages/rocketchat-i18n/i18n/km.i18n.json b/packages/rocketchat-i18n/i18n/km.i18n.json
index 98126677723d..60c1182eac20 100644
--- a/packages/rocketchat-i18n/i18n/km.i18n.json
+++ b/packages/rocketchat-i18n/i18n/km.i18n.json
@@ -326,6 +326,8 @@
   "App_status_manually_enabled": "បានបើក",
   "App_status_unknown": "មិនស្គាល់",
   "App_support_url": "គាំទ្រ url",
+  "App_Url_to_Install_From": "ដំឡើងពី URL",
+  "App_Url_to_Install_From_File": "ដំឡើងពីឯកសារ",
   "Appearance": "រូបរាង",
   "Application_added": "ពាក្យស្នើសុំបន្ថែមទៀត",
   "Application_Name": "ឈ្មោះកម្មវិធី",
@@ -437,7 +439,9 @@
   "Broadcast_Connected_Instances": "បណ្តាញដែលបានតភ្ជាប់",
   "Broadcasting_api_key": "ចាក់ផ្សាយសោរ API",
   "Broadcasting_client_id": "ចាក់ផ្សាយលេខសម្គាល់អតិថិជន",
+  "Broadcasting_client_secret": "ផ្សព្វផ្សាយម៉ាស៊ីនភ្ញៀវសម្ងាត់",
   "Broadcasting_enabled": "ការចាក់ផ្សាយបានបើក",
+  "Broadcasting_media_server_url": "ផ្សាយម៉ាស៊ីនមេមេឌៀ URL",
   "Bugsnag_api_key": "កំហុស API Key",
   "Build_Environment": "ស្ថាបនាបរិស្ថាន",
   "bulk-create-c": "បង្កើតឆានែលច្រើន",
@@ -588,8 +592,11 @@
   "Cloud_connect": "ការតភ្ជាប់ពពក Rocket.Chat ",
   "Cloud_what_is_it": "តើ​នេះ​ជា​អ្វី?",
   "Cloud_login_to_cloud": "ចូលទៅពពក Rocket.Chat",
+  "Cloud_address_to_send_registration_to": "អាសយដ្ឋានដែលត្រូវផ្ញើអ៊ីម៉ែលចុះឈ្មោះតាមពពករបស់អ្នកទៅ។",
   "Cloud_update_email": "ធ្វើបច្ចុប្បន្នភាពអ៊ីមែល",
+  "Cloud_manually_input_token": "បញ្ចូលលេខសម្ងាត់ដែលបានទទួលដោយផ្ទាល់ពីអ៊ីម៉ែលចុះឈ្មោះពពក។",
   "Cloud_registration_required": "ត្រូវការ​ការ​ចុះឈ្មោះ",
+  "Cloud_registration_required_description": "មើលទៅដូចក្នុងអំឡុងពេលរៀបចំដែលអ្នកមិនបានជ្រើសដើម្បីចុះឈ្មោះកន្លែងធ្វើការរបស់អ្នក។",
   "Cloud_registration_requried_link_text": "សូមចុចត្រង់នេះដើម្បីចុះឈ្មោះកន្លែងធ្វើការរបស់អ្នក។",
   "Cloud_error_in_authenticating": "កំហុសបានទទួលខណៈពេលផ្ទៀងផ្ទាត់",
   "Cloud_error_code": "លេខកូដ:",
@@ -1248,6 +1255,7 @@
   "Export_My_Data": "នាំចេញទិន្នន័យរបស់ខ្ញុំ",
   "expression": "ការបញ្ចេញមតិ",
   "Extended": "បានពង្រីក",
+  "External_Domains": "ដែនខាងក្រៅ",
   "External_Queue_Service_URL": "URL សេវាជួរខាងក្រៅ",
   "External_Service": "សេវាខាងក្រៅ",
   "Facebook_Page": "ទំព័រហ្វេសប៊ុក",
@@ -1257,6 +1265,7 @@
   "Favorites": "ពេញ​ចិត្ត",
   "Feature_Depends_on_Livechat_Visitor_navigation_as_a_message_to_be_enabled": "លក្ខណៈពិសេសនេះអាស្រ័យលើការបើកដំណើរការ \"ផ្ញើប្រវត្តិរុករកអ្នកទស្សនាជាសារ\" ។",
   "Features_Enabled": "លក្ខណៈពិសេសអនុញ្ញាត",
+  "FEDERATION_Discovery_Method": "វិធីសាស្រ្តរកឃើញ",
   "FEDERATION_Domain": "ដែន",
   "FEDERATION_Status": "ស្ថានភាព",
   "Field": "វាល",
diff --git a/packages/rocketchat-i18n/i18n/pt-BR.i18n.json b/packages/rocketchat-i18n/i18n/pt-BR.i18n.json
index 05273ac05dee..658efd6567ba 100644
--- a/packages/rocketchat-i18n/i18n/pt-BR.i18n.json
+++ b/packages/rocketchat-i18n/i18n/pt-BR.i18n.json
@@ -2512,7 +2512,7 @@
   "Search_Page_Size": "Tamanho da página",
   "Search_Private_Groups": "Pesquisar Grupos Privados",
   "Search_Provider": "Provedor de pesquisa",
-  "Search_Users": "Pesquisar Utilizadores",
+  "Search_Users": "Pesquisar Usuários",
   "seconds": "segundos",
   "Secret_token": "Token secreto",
   "Security": "Segurança",
diff --git a/packages/rocketchat-i18n/i18n/tr.i18n.json b/packages/rocketchat-i18n/i18n/tr.i18n.json
index cd859fd41e65..58dcc48b8a16 100644
--- a/packages/rocketchat-i18n/i18n/tr.i18n.json
+++ b/packages/rocketchat-i18n/i18n/tr.i18n.json
@@ -238,7 +238,7 @@
   "Aliases": "Takma adlar",
   "All": "Tümü",
   "All_added_tokens_will_be_required_by_the_user": "Eklenen tüm işaretçiler kullanıcı tarafından gerekli olacaktır",
-  "All_channels": "Daha fazla",
+  "All_channels": "Tüm kanallar",
   "All_logs": "Tüm Kayıtlar",
   "All_messages": "Tüm mesajlar",
   "All_users": "Tüm kullanıcılar",
@@ -423,7 +423,7 @@
   "ban-user_description": "Kanaldan bir kullanıcıyı engelleme izni",
   "Beta_feature_Depends_on_Video_Conference_to_be_enabled": "Beta özellik. Görüntülü konferans görüşmesinin aktif olmasını gerektirir.",
   "Best_first_response_time": "En iyi ilk yanıt süresi",
-  "Block_User": "Kullanıcıyı engelle",
+  "Block_User": "Kullanıcıyı Engelle",
   "Blockchain": "Blockchain",
   "Blockstack_Auth_Description": "Kimlik açıklaması",
   "Blockstack_ButtonLabelText": "Buton etiket metni",
@@ -464,7 +464,7 @@
   "Canceled": "İptal",
   "Cancel_message_input": "Vazgeç",
   "Cannot_invite_users_to_direct_rooms": "Odalar doğrudan kullanıcıları davet edemezsiniz",
-  "Cannot_open_conversation_with_yourself": "Doğrudan Mesaj Can not",
+  "Cannot_open_conversation_with_yourself": "Kendinize doğrudan ileti gönderemezsiniz",
   "CAS_autoclose": "Giriş baloncuğunu otomatik kapat",
   "CAS_base_url": "SSO Temel URL",
   "CAS_base_url_Description": "Kullandığınız SSO servisinin temel URL'i. Ör: https://sso.example.undef/sso/",
@@ -498,7 +498,7 @@
   "Channel_Archived": "adı `#%s` ile Kanal başarıyla arşivlenen olmuştur",
   "Channel_created": "Kanal `#%s` oluşturuldu.",
   "Channel_doesnt_exist": "`#%s` isminde bir kanal bulunmamaktadır.",
-  "Channel_name": "Channel İsmi",
+  "Channel_name": "Kanal Adı",
   "Channel_Name_Placeholder": "Lütfen kanal ismini giriniz...",
   "Channel_to_listen_on": "Dinlenecek kanal",
   "Channel_Unarchived": "adı `#%s` ile Kanal başarıyla Arşivlenmedi olmuştur",
@@ -883,11 +883,11 @@
   "Country_Zambia": "Zambiya",
   "Country_Zimbabwe": "Zimbabve",
   "Cozy": "Rahat",
-  "Create": "oluşturmak",
+  "Create": "Oluştur",
   "create-c": "Herkese Açık Kanallar Oluştur",
   "create-c_description": "Herkese açık kanalları oluşturma yetkisi",
   "create-d": "Doğrudan Mesajlar Oluştur",
-  "create-d_description": "Doğrudan mesaj başlatma izni",
+  "create-d_description": "Doğrudan ileti başlatma izni",
   "create-p": "Özel Kanallar Yarat",
   "create-p_description": "Özel kanallar oluşturma izni",
   "create-personal-access-tokens": "Kişisel Erişim Belirteçleri yaratın",
@@ -971,8 +971,8 @@
   "delete-c_description": "Herkese açık kanalları silmek için izin",
   "delete-d": "Doğrudan Mesajları Sil",
   "delete-d_description": "Doğrudan mesajları silmek için izin",
-  "delete-message": "Mesaj Silme",
-  "delete-message_description": "Bir odada bir mesaj silmek için izin",
+  "delete-message": "İletiyi Sil",
+  "delete-message_description": "Odadaki bir iletiyi silme izni",
   "delete-p": "Özel Kanalları Sil",
   "delete-p_description": "Özel kanalları silmek için izin",
   "delete-user": "Kullanıcıyı sil",
@@ -1001,8 +1001,8 @@
   "Desktop_Notifications_Not_Enabled": "Masaüstü Bildirimleri Devre Dışı",
   "Details": "Ayrıntılar",
   "Different_Style_For_User_Mentions": "Kullanıcılar için farklı stil",
-  "Direct_message_someone": "Doğrudan mesaj birisi",
-  "Direct_Messages": "Direkt Mesajlar",
+  "Direct_message_someone": "Birine doğrudan ileti gönder",
+  "Direct_Messages": "Doğrudan İletiler",
   "Direct_Reply": "Doğrudan Yanıt",
   "Direct_Reply_Advice": "Bu e-postayı doğrudan yanıtlayabilirsiniz. Dizgedeki önceki e-postaları değiştirmeyin.",
   "Direct_Reply_Debug": "Doğrudan Yanıtlamayı Hata Ayıkla",
@@ -1028,11 +1028,15 @@
   "Disallow_reacting": "Tepki Vermeye İzin Verme",
   "Disallow_reacting_Description": "İzin verilmeyen izinler",
   "Display_offline_form": "Ekran çevrimdışı formu",
-  "Display_unread_counter": "Okunmamış mesaj sayısını göster",
+  "Display_unread_counter": "Okunmamış ileti sayısını görüntüle",
   "Displays_action_text": "Görüntüler aksiyon metni",
+  "Discussion_name": "Tartışma adı",
+  "Discussion_start": "Tartışma başlat",
   "Discussion_target_channel_description": "Sormak istediğinizle ilgili bir kanal seçin",
+  "Discussion_target_channel_prefix": "Burada bir tartışma oluşturuyorsunuz",
   "Discussion_target_channel": "Ana kanal veya grup",
   "Discussion_first_message_title": "İletiniz",
+  "Discussion_title": "Yeni tartışma oluştur",
   "Dont_ask_me_again": "Bana bir daha sorma!",
   "Dont_ask_me_again_list": "Bana tekrar sorma listesi",
   "Do_not_display_unread_counter": "Bu kanalın sayaçlarını gösterme",
@@ -1052,10 +1056,10 @@
   "Dry_run_description": "Sadece itibaren aynı adrese bir e-posta göndereceğiz. E-posta geçerli bir kullanıcı ait olmalıdır.",
   "duplicated-account": "Yinelenen hesap",
   "Duplicate_archived_channel_name": "Arşivlenmiş Kanal adıyla ' %s' var",
-  "Duplicate_archived_private_group_name": "adı ' %s' var olan bir arşivlenmiş Özel Grup",
+  "Duplicate_archived_private_group_name": "'%s' adında arşivlenmiş bir Özel Grup mevcut",
   "Duplicate_channel_name": "A Kanal adıyla '%s' var",
   "Duplicated_Email_address_will_be_ignored": "İkinci defa girilen e-posta adresi dikkate alınmayacak.",
-  "Duplicate_private_group_name": "' %s' isminde bir Özel Grup mevcut",
+  "Duplicate_private_group_name": "'%s' adında bir Özel Grup mevcut",
   "Duration": "Süre",
   "E2E Encryption": "Uçtan Uca Şifreleme",
   "E2E_Enabled": "Uçtan Uca Şifreleme Etkin",
@@ -1086,7 +1090,7 @@
   "Editing_user": "düzenleme kullanıcı",
   "Education": "Eğitim",
   "Email": "E-posta",
-  "Email_address_to_send_offline_messages": "E-posta adresi çevrimdışı mesaj gönderme",
+  "Email_address_to_send_offline_messages": "Çevrimdışı İletilerin Gönderileceği E-Posta Adresi",
   "Email_already_exists": "Bu e-posta zaten var",
   "Email_body": "E-posta gövdesi",
   "Email_Change_Disabled": "Sizin Rocket.Chat yönetici e-posta değişen engellenmiştir",
@@ -1114,12 +1118,12 @@
   "Enabled": "Etkin",
   "Encrypted": "Şifreli",
   "Encrypted_channel_Description": "Uçtan uca şifrelenmiş kanal. Arama şifrelenmiş kanallarda çalışmayacak ve bildirimlerde ileti içeriği gözükmeyecektir.",
-  "Encrypted_message": "Şifreli mesaj",
+  "Encrypted_message": "Şifreli ileti",
   "Encrypted_setting_changed_successfully": "Şifrelenmiş ayar başarılı bir şekilde değiştirildi",
   "EncryptionKey_Change_Disabled": "Şifreleme anahtarınız için bir parola ayarlayamazsınız, çünkü özel anahtarınız bu istemcide mevcut değil. Yeni bir parola ayarlamak için mevcut parolanızı kullanarak özel anahtarınızı yüklemeniz veya anahtarın halihazırda yüklü olduğu bir istemciyi kullanmanız gerekir.",
   "Encryption_key_saved_successfully": "Şifreleme anahtarınız başarılı bir şekilde kaydedildi.",
   "End_OTR": "OTR'yi sonlandır",
-  "Enter_a_name": "Bir isim girin",
+  "Enter_a_name": "Ad girin",
   "Enter_a_regex": "Bir regex girin",
   "Enter_a_room_name": "Bir oda ismi girin",
   "Enter_a_username": "Bir kullanıcı adı girin",
@@ -1178,9 +1182,9 @@
   "error-invalid-file-width": "Geçersiz dosya genişliği",
   "error-invalid-from-address": "Geçersiz bir gönderen adresi bildirdiniz.",
   "error-invalid-integration": "geçersiz entegrasyon",
-  "error-invalid-message": "geçersiz mesaj",
+  "error-invalid-message": "Geçersiz ileti",
   "error-invalid-method": "geçersiz yöntem",
-  "error-invalid-name": "Geçersiz isim",
+  "error-invalid-name": "Geçersiz ad",
   "error-invalid-password": "Geçersiz şifre",
   "error-invalid-permission": "Geçersiz izin",
   "error-invalid-redirectUri": "geçersiz redirectUri",
@@ -1196,7 +1200,7 @@
   "error-invalid-user": "Geçersiz kullanıcı",
   "error-invalid-username": "Geçersiz kullanıcı adı",
   "error-invalid-webhook-response": "webhook URL 200 dışında bir statü ile cevap verdi",
-  "error-message-deleting-blocked": "Mesaj silme engellendi",
+  "error-message-deleting-blocked": "İleti silme engellendi",
   "error-message-editing-blocked": "İleti düzenleme engellendi",
   "error-message-size-exceeded": "İleti boyutu Message_MaxAllowedSize aşıyor",
   "error-missing-unsubscribe-link": "[unsubscribe] bağlantısını sağlamalısınız.",
@@ -1234,7 +1238,7 @@
   "Error_changing_password": "Şifre değiştirmede hata",
   "Error_loading_pages": "Sayfalar yüklenirken hata oluştu",
   "Error_sending_livechat_transcript": "Livechat dökümü gönderilirken hata oluştu",
-  "Error_sending_livechat_offline_message": "Livechat çevrimdışı mesaj gönderilirken hata oluştu",
+  "Error_sending_livechat_offline_message": "Livechat çevrimdışı iletisi gönderilirken hata oluştu",
   "Errors_and_Warnings": "Hatalar ve Uyarılar",
   "Esc_to": "Esc için",
   "Event_Trigger": "Olay Tetikleyici",
@@ -1251,7 +1255,7 @@
   "Example_s": "Örnek: <code class=\"inline\">%s</code>",
   "Exclude_Botnames": "Botları Dışarıda Bırak",
   "Exclude_Botnames_Description": "Adı, yukarıdaki normal ifadeyle eşleşen bot'tan iletemezsiniz. Eğer boş bırakılırsa, botlardan gelen tüm mesajlar iletilir.",
-  "Exclude_pinned": "Sabitlenmiş iletileri hariç tut",
+  "Exclude_pinned": "Sabitlenmiş iletileri dışında tut",
   "except_pinned": "(tutturulmuş olanlar hariç)",
   "Execute_Synchronization_Now": "Şimdi senkronizasyonu çalıştır",
   "Exit_Full_Screen": "Tam Ekrandan Çık",
@@ -1262,8 +1266,8 @@
   "External_Service": "Dış Hizmet",
   "Facebook_Page": "Facebook Sayfası",
   "False": "Yanlış",
-  "Favorite_Rooms": "Favori Odaları etkinleştirme",
-  "Favorite": "Favori",
+  "Favorite_Rooms": "Favori Odalar etkin",
+  "Favorite": "Favorilere ekle",
   "Favorites": "Favoriler",
   "Feature_Depends_on_Livechat_Visitor_navigation_as_a_message_to_be_enabled": "Bu özellik, \"Ziyaretçi Gezinme Geçmişini İleti Olarak Gönder\" seçeneğinin etkinleştirilmesine bağlıdır.",
   "Features_Enabled": "Özellikler Etkin",
@@ -1409,8 +1413,9 @@
   "Graphql_Enabled": "GraphQL Etkin",
   "Graphql_CORS": "GraphQL CORS",
   "Graphql_Subscription_Port": "GraphQL Abone Portu",
-  "Group_by_Type": "Türe göre gruplama",
-  "Group_favorites": "Grup favorileri",
+  "Group_by_Type": "Türe göre grupla",
+  "Group_discussions": "Tartışmaları grupla",
+  "Group_favorites": "Favorileri grupla",
   "Group_mentions_disabled_x_members": "Grup, '@' ve '@' kelimelerinden daha fazla __total__ üyesi olan odalar için devre dışı bırakıldı.",
   "Group_mentions_only": "Grup yalnızca bahsediyor",
   "Guest_Pool": "Misafir Havuzu",
@@ -1429,7 +1434,7 @@
   "Hide_flextab": "Tıklayarak Sağ Taraftaki Barı Gizle",
   "Hide_Group_Warning": "Eğer grup \"%s\" gizlemek istediğinizden emin misiniz?",
   "Hide_Livechat_Warning": "\"%s\" ile canlı çekimi gizlemek istediğinize emin misiniz?",
-  "Hide_Private_Warning": "Eğer \"%s\" ile tartışma gizlemek istediğiniz emin misiniz?",
+  "Hide_Private_Warning": "\"%s\" ile tartışmayı gizlemek istediğinize emin misiniz?",
   "Hide_roles": "Rolleri Gizle",
   "Hide_room": "Odayı gizle",
   "Hide_Room_Warning": "Eğer oda \"%s\" gizlemek istediğinizden emin misiniz?",
@@ -1467,7 +1472,7 @@
   "Iframe_Integration_send_enable_Description": "Olayları Ata Pencere'ye Gönder",
   "Iframe_Integration_send_target_origin": "Hedef Orjini Gönder",
   "Iframe_Integration_send_target_origin_Description": "Protokol ön ekiyle kaynaklanan komutlar, örneğin komutlar gönderilir. 'https: // localhost' veya * herhangi bir yere göndermeye izin vermek için *.",
-  "Ignore": "Ignore",
+  "Ignore": "Yoksay",
   "Ignored": "Yok Sayılan",
   "IMAP_intercepter_already_running": "IMAP el telsizi zaten çalışıyor",
   "IMAP_intercepter_Not_running": "IMAP alıcısı Çalışmıyor",
@@ -1564,7 +1569,7 @@
   "Integrations_Outgoing_Type_RoomCreated": "Oda oluşturuldu (kamu ve özel)",
   "Integrations_Outgoing_Type_RoomJoined": "Kullanıcı Katılmış Oda",
   "Integrations_Outgoing_Type_RoomLeft": "Kullanıcı Sol Oda",
-  "Integrations_Outgoing_Type_SendMessage": "Mesaj gönderildi",
+  "Integrations_Outgoing_Type_SendMessage": "İleti Gönderildi",
   "Integrations_Outgoing_Type_UserCreated": "Kullanıcı Oluşturuldu",
   "InternalHubot": "İç Hubot",
   "InternalHubot_EnableForChannels": "Herkese Açık Kanallar için Etkinleştir",
@@ -1580,7 +1585,7 @@
   "Invalid_username": "Girilen kullanıcı adı geçersiz",
   "Invalid_Export_File": "Yüklenen dosya geçerli bir %s ihracat dosyası değil.",
   "Invalid_Import_File_Type": "Geçersiz İthalat dosya türü.",
-  "Invalid_name": "İsim boş bırakılamaz",
+  "Invalid_name": "Ad boş bırakılamaz",
   "Invalid_notification_setting_s": "Geçersiz bildirim ayarı: %s",
   "Invalid_pass": "Parola boş bırakılamaz",
   "Invalid_reason": "Katılma nedeni boş olmamalı",
@@ -1602,7 +1607,7 @@
   "IRC_Channel_Leave": "PART komutunun çıktısı.",
   "IRC_Channel_Users": "NAMES komutunun çıktısı.",
   "IRC_Channel_Users_End": "NAMES komutunun çıktısı bitti.",
-  "IRC_Description": "Internet Relay Chat (IRC), metin tabanlı bir grup iletişim aracıdır. Kullanıcılar, açık tartışmalar için benzersiz olarak adlandırılmış kanallara veya odalara katılırlar. IRC ayrıca bireysel kullanıcılar arasındaki özel iletileri ve dosya paylaşım yeteneklerini desteklemektedir. Bu paket bu işlev katmanlarını Rocket.Chat ile bütünleştirir.",
+  "IRC_Description": "Internet Relay Chat (IRC), metin tabanlı bir grup iletişim aracıdır. Kullanıcılar, açık tartışmalar için benzersiz olarak adlandırılmış kanallara veya odalara katılırlar. IRC ayrıca her bir kullanıcı arasındaki özel iletileri ve dosya paylaşım yeteneklerini desteklemektedir. Bu paket bu işlev katmanlarını Rocket.Chat ile bütünleştirir.",
   "IRC_Enabled": "IRC desteğini bütünleştirmeye çalışın. Bu değeri değiştirmek Rocket.Chat'i yeniden başlatmayı gerektirir.",
   "IRC_Enabled_Alert": "IRC Desteği devam eden bir çalışmadır. Şu anda bir üretim sistemi kullanımı önerilmez.",
   "IRC_Federation": "IRC Federasyonu",
@@ -1641,7 +1646,7 @@
   "Join_video_call": "video görüşmesine katılın",
   "Joined": "Katılım",
   "Jump": "Atlama",
-  "Jump_to_first_unread": "İlk okunmamış atla",
+  "Jump_to_first_unread": "Okunmamış ilk iletiye git",
   "Jump_to_message": "mesajı atlamak",
   "Jump_to_recent_messages": "son mesajlara atla",
   "Just_invited_people_can_access_this_channel": "Davet edilenler bu kanala erişebilir.",
@@ -1664,7 +1669,7 @@
   "Keyboard_Shortcuts_Mark_all_as_read": "Tüm iletileri (tüm kanallardaki) okundu olarak işaretle",
   "Keyboard_Shortcuts_Move_To_Beginning_Of_Message": "Mesajın başına git",
   "Keyboard_Shortcuts_Move_To_End_Of_Message": "Mesajın sonuna git",
-  "Keyboard_Shortcuts_New_Line_In_Message": "İletide yeni satır girişi oluştur",
+  "Keyboard_Shortcuts_New_Line_In_Message": "İleti girdisinde yeni satır",
   "Keyboard_Shortcuts_Open_Channel_Slash_User_Search": "Açık Kanal / Kullanıcı araması",
   "Keyboard_Shortcuts_Title": "Klavye Kısayolları",
   "Knowledge_Base": "Bilgi tabanı",
@@ -1673,10 +1678,10 @@
   "Language_Not_set": "Özel değil",
   "Language_Version": "İngilizce Versiyon",
   "Last_login": "Son giriş",
-  "Last_Message_At": "Sonunda Mesaj",
+  "Last_Message_At": "Son İleti",
   "Last_seen": "Son görülme",
   "Last_token_part": "Son belirteç parçası",
-  "Last_Message": "Son Mesaj",
+  "Last_Message": "Son İleti",
   "Last_Updated": "Son Güncellenen",
   "Launched_successfully": "Başarıyla başarıyla başlatıldı",
   "Layout": "Düzen",
@@ -1772,8 +1777,8 @@
   "Leave": "Ayrıl",
   "Leave_Group_Warning": "Eğer grup \"%s\" ayrılmak istediğinize emin misiniz?",
   "Leave_Livechat_Warning": "Livechat'ı \"%s\" ile terk etmek istediğinize emin misiniz?",
-  "Leave_Private_Warning": "Eğer \"%s\" ile tartışma ayrılmak istiyorum emin misiniz?",
-  "Leave_room": "Odayı terket",
+  "Leave_Private_Warning": "\"%s\" ile tartışmadan ayrılmak istediğinize emin misiniz?",
+  "Leave_room": "Odadan ayrıl",
   "Leave_Room_Warning": "Eğer oda \"%s\" ayrılmak istediğinize emin misiniz?",
   "Leave_the_current_channel": "Geçerli kanalı bırak",
   "Lets_get_you_new_one": "Size yeni bir tane verelim!",
@@ -1795,7 +1800,7 @@
   "Livechat_managers": "Canlı yöneticileri",
   "Livechat_offline": "Canlı çevrimdışı",
   "Livechat_online": "Canlı çevrimiçi",
-  "Livechat_offline_message_sent": "Livechat çevrimdışı mesaj gönderildi",
+  "Livechat_offline_message_sent": "Livechat çevrimdışı iletisi gönderildi",
   "Livechat_open_inquiery_show_connecting": "Misafir Acenteye Henüz Bağlanmadığında Giriş yerine Mesaj Bağlamayı Göster",
   "Livechat_Queue": "Livechat Kuyruğu",
   "Livechat_registration_form": "Kayıt formu",
@@ -1808,22 +1813,22 @@
   "Livechat_transcript_sent": "Livechat transkripti gönderildi",
   "Livechat_Users": "Canlı Kullanıcılar",
   "LiveStream & Broadcasting": "Canlı Yayın ve Yayıncılık",
-  "Livestream_close": "Canlı akışı kapat",
+  "Livestream_close": "Canlı yayını kapat",
   "Livestream_enabled": "Canlı Yayın Etkin",
   "Livestream_enable_audio_only": "Yalnızca ses modunu etkinleştir",
-  "Livestream_not_found": "Canlı akışı mevcut değil",
+  "Livestream_not_found": "Canlı yayın mevcut değil",
   "Livestream_popout": "Canlı yayını aç",
-  "Livestream_source_changed_succesfully": "Canlı akış kaynağı başarıyla değiştirildi",
-  "Livestream_switch_to_room": "Geçerli odanın canlı akışı arasında geçiş yap",
+  "Livestream_source_changed_succesfully": "Canlı yayın kaynağı başarıyla değiştirildi",
+  "Livestream_switch_to_room": "Mevcut odanın canlı yayınına geç",
   "Livestream_url": "Canlı yayın kaynağı url'si",
-  "Livestream_url_incorrect": "Canlı yayın url'si yanlış",
+  "Livestream_url_incorrect": "Canlı yayın url'si hatalı",
   "Load_more": "Daha fazla",
   "Loading...": "Yükleniyor...",
   "Loading_more_from_history": "Geçmişten daha fazlası yükleniyor",
   "Loading_suggestion": "Öneriler yükleniyor...",
   "Local_Password": "Yerel Şifre",
   "Localization": "yerelleştirme",
-  "Log_Exceptions_to_Channel_Description": "Tutulan tüm istisnaları alacak bir kanal. İstisnaları görmezden gelmek için boş bırakın.",
+  "Log_Exceptions_to_Channel_Description": "Yakalan tüm istisnaları alacak olan kanal. İstisnaları yok saymak için boş bırakın.",
   "Log_Exceptions_to_Channel": "Kanal için İstisnaları Günlüğe Kaydedin",
   "Log_File": "Dosya ve Hattı göster",
   "Log_Level": "Giriş Seviyesi",
@@ -1849,7 +1854,7 @@
   "mail-messages_description": "Posta iletilerini kullanma izni",
   "Mail_Message_Invalid_emails": "Bir veya daha fazla geçersiz e-posta sağladı: %s",
   "Mail_Message_Missing_to": "Bir veya daha fazla kullanıcı seçmeniz ya da virgülle ayrılmış olarak bir veya daha fazla e-posta adresi girmeniz gerekiyor.",
-  "Mail_Message_No_messages_selected_select_all": "Herhangi bir mesaj seçmediniz.",
+  "Mail_Message_No_messages_selected_select_all": "Herhangi bir ileti seçmediniz",
   "Mail_Messages": "posta iletileri",
   "Mail_Messages_Instructions": "mesajlar tıklayarak e-posta yoluyla göndermek istediğiniz iletileri seçin",
   "Mail_Messages_Subject": "İşte %s mesajların seçilen bir kısım var",
@@ -1898,44 +1903,44 @@
   "Max_length_is": "Maksimum uzunluk%s",
   "Media": "medya",
   "Medium": "Orta",
-  "Members_List": "Üye Listesi",
+  "Members_List": "Üyeler Listesi",
   "mention-all": "Herkes Mansiyon",
   "mention-all_description": "@all sözünü kullanma izni",
   "mention-here": "Buradan Mansiyon",
   "mention-here_description": "@here sözünü kullanmak için izin",
-  "Mentions": "söz",
-  "Mentions_default": "Söz (varsayılan)",
+  "Mentions": "Bahsetmeler",
+  "Mentions_default": "Bahsetmeler (varsayılan)",
   "Mentions_only": "Sadece mansiyonlar",
   "Merge_Channels": "Kanalları Birleştirme",
-  "Message_AllowBadWordsFilter": "Mesaj kötü sözler filtreleme izin ver",
-  "Message_AllowDeleting": "Mesaj silmeye izin ver",
-  "Message_AllowDeleting_BlockDeleteInMinutes": "Blok Mesaj Silme (n) dakika sonra",
+  "Message_AllowBadWordsFilter": "İleti kötü sözcük filtrelemesine izin ver",
+  "Message_AllowDeleting": "İleti Silmeye İzin Verilsin",
+  "Message_AllowDeleting_BlockDeleteInMinutes": "(n) Dakika Sonra İleti Silme Engellensin",
   "Message_AllowDeleting_BlockDeleteInMinutes_Description": "engelleme devre dışı bırakmak için 0 girin.",
   "Message_AllowDirectMessagesToYourself": "Kullanıcıya doğrudan mesajlar verin kendinize",
-  "Message_AllowEditing": "Mesaj düzenlemeye izin ver",
+  "Message_AllowEditing": "İleti Düzenlemeye İzin Verilsin",
   "Message_AllowEditing_BlockEditInMinutes": "(n) dakika sonra iletiyi düzenlemeyi engelle",
   "Message_AllowEditing_BlockEditInMinutesDescription": "Engellemeyi devre dışı bırakmak için 0 girin.",
-  "Message_AllowPinning": "Mesaj tutturmaya izin ver.",
+  "Message_AllowPinning": "İleti Sabitlemeye İzin Verilsin",
   "Message_AllowPinning_Description": "İzin mesajları kanallardan herhangi tutturulmuş olması.",
   "Message_AllowSnippeting": "İleti Parçalamaya İzin Ver",
   "Message_AllowStarring": "İletilere yıldız verilmesine izin ver",
   "Message_AllowUnrecognizedSlashCommand": "Tanınmayan Kesme Komutlarına İzin Ver",
   "Message_AlwaysSearchRegExp": "Her zaman RegExp kullanarak arama",
   "Message_AlwaysSearchRegExp_Description": "Dil desteklenen değilse Biz `TRUE ayarlamak için tavsiye <a target=\"_blank\" href=\"https://docs.mongodb.org/manual/reference/text-search-languages/#text-search-languages\">MongoDB metin arama</a> .",
-  "Message_Attachments": "Mesaj Ekleri",
+  "Message_Attachments": "İleti Ekleri",
   "Message_Attachments_GroupAttach": "Grup Ek Düğmeleri",
   "Message_Attachments_GroupAttachDescription": "Bu, simgeleri genişletilebilir bir menü altında gruplar. Daha az ekran alanı alıyor.",
-  "Message_Audio": "Sesli Mesaj",
-  "Message_Audio_bitRate": "Sesli Mesaj Bit Hızı",
+  "Message_Audio": "Sesli İleti",
+  "Message_Audio_bitRate": "Sesli İleti Bit Hızı",
   "Message_AudioRecorderEnabled": "Ses Kaydedici Etkin",
   "Message_AudioRecorderEnabled_Description": "'Dosya Yükleme' ayarlarında kabul edilen bir medya türü olması için 'ses / mp3' dosyalarını gerektirir.",
   "Message_BadWordsFilterList": "kara listeye kötü kelime ekleme",
   "Message_BadWordsFilterListDescription": "filtrelemek için kötü kelimelerin virgülle ayrılmış liste listesi ekle",
   "Message_DateFormat": "Tarih formatı",
   "Message_DateFormat_Description": "Ayrıca bkz: <a href=\"http://momentjs.com/docs/#/displaying/format/\" target=\"momemt\">Moment.js</a>",
-  "Message_deleting_blocked": "Bu mesaj artık silinemez",
+  "Message_deleting_blocked": "Bu ileti artık silinemez",
   "Message_editing": "İleti düzenleme",
-  "Message_ErasureType": "Mesaj Silme Türü",
+  "Message_ErasureType": "İleti Silme Türü",
   "Message_ErasureType_Delete": "Tüm Mesajları Sil",
   "Message_ErasureType_Description": "Hesaplarını kaldıran kullanıcıların mesajlarıyla ne yapacağınızı belirleyin.",
   "Message_ErasureType_Keep": "Mesajları ve Kullanıcı Adlarını Tut",
@@ -1949,24 +1954,24 @@
   "Message_HideType_uj": "\"Kullanıcı Katıl\" iletilerini gizle",
   "Message_HideType_ul": "\"Kullanıcı İzin\" mesajları gizle",
   "Message_Id": "İleti ID'si",
-  "Message_Ignored": "Bu mesaj göz ardı edildi",
+  "Message_Ignored": "Bu ileti yok sayıldı",
   "Message_info": "Ileti bilgisi",
-  "Message_KeepHistory": "Mesaj geçmişini sakla",
-  "Message_MaxAll": "TÜM mesaj için maksimum kanal boyutu",
-  "Message_MaxAllowedSize": "İzin Verilen Maksimum Mesaj Boyutu",
-  "Message_pinning": "Mesaj iğneleme",
+  "Message_KeepHistory": "İleti Başına Düzenleme Geçmişi Saklansın",
+  "Message_MaxAll": "TÜM İletiler için Maksimum Kanal Boyutu",
+  "Message_MaxAllowedSize": "İleti Başına Maksimum İzin Verilen Karakter",
+  "Message_pinning": "İleti sabitleniyor",
   "Message_QuoteChainLimit": "Zincirli Tırnakları Maksimum Sayısı",
   "Message_Read_Receipt_Enabled": "Okundu Makbuzlarını Göster",
   "Message_Read_Receipt_Store_Users": "Ayrıntılı Okundu Makbuzları",
   "Message_Read_Receipt_Store_Users_Description": "Her kullanıcının okundu bilgisi bilgilerini gösterir",
-  "Message_removed": "Mesaj kaldırıldı",
-  "Message_sent_by_email": "E-posta ile gönderilen mesaj",
+  "Message_removed": "İleti silindi",
+  "Message_sent_by_email": "İleti e-posta aracılığıyla gönderildi",
   "Message_SetNameToAliasEnabled": "Mesajda Diğer Adları Diğerine Ayarlayın",
-  "Message_SetNameToAliasEnabled_Description": "Yalnızca zaten takma ad ayarlamadıysa. Kullanıcı adı değiştirdiğinde eski mesaj takma adı değiştirilmez.",
+  "Message_SetNameToAliasEnabled_Description": "Yalnızca zaten takma ad ayarlamadıysa. Kullanıcı, adını değiştirirse eski iletilerdeki takma ad değişmez.",
   "Message_ShowDeletedStatus": "Silinen Durumu Göster",
   "Message_ShowEditedStatus": "Düzenlenen Durumu Göster",
   "Message_ShowFormattingTips": "Biçimlendirme İpuçlarını göster",
-  "Message_starring": "oynadığı Mesaj",
+  "Message_starring": "İleti favorilere ekleniyor",
   "Message_Time": "İleti Zamanı",
   "Message_TimeAndDateFormat": "Saat ve tarih biçimi",
   "Message_TimeAndDateFormat_Description": "Ayrıca bkz .: <a href=\"http://momentjs.com/docs/#/displaying/format/\" target=\"momemt\" >Moment.js</a>",
@@ -1977,7 +1982,7 @@
   "Message_VideoRecorderEnabled": "Video Kaydedici Etkin",
   "Message_VideoRecorderEnabledDescription": "'Dosya Yükleme' ayarları içinde kabul edilen bir medya türü olması için 'video / webm' dosyalarının olması gerekir.",
   "Message_view_mode_info": "Bu alan mesajlarının miktarı ekranda sürebilir değiştirir.",
-  "Message": "Mesaj",
+  "Message": "İleti",
   "messages": "Mesajlar",
   "Messages": "Mesajlar",
   "Messages_that_are_sent_to_the_Incoming_WebHook_will_be_posted_here": "Gelen WebHook gönderilen mesajları burada ilan edilecektir.",
@@ -1997,7 +2002,7 @@
   "Monitor_history_for_changes_on": "Değişiklikler için Tarihi Geçmişi açık",
   "More": "Daha",
   "More_channels": "Daha fazla",
-  "More_direct_messages": "Daha direkt mesajlar",
+  "More_direct_messages": "Daha fazla doğrudan ileti",
   "More_groups": "Daha fazla özel grup",
   "More_unreads": "Daha fazla okunmayan",
   "Move_beginning_message": "`%s '- Mesajın başına git",
@@ -2005,7 +2010,7 @@
   "Msgs": "Msj",
   "multi": "çoklu",
   "multi_line": "çok hatlı",
-  "mute-user": "Kullanıcıyı Yoksay",
+  "mute-user": "Kullanıcıyı Sessize Al",
   "mute-user_description": "Aynı kanaldaki diğer kullanıcıların sesini kapatma izni",
   "Mute_all_notifications": "Tüm bildirimleri kapat",
   "Mute_Focused_Conversations": "Odaklanmış Konuşmaları Sustur",
@@ -2016,21 +2021,24 @@
   "My_Account": "Hesabım",
   "My Data": "Verim",
   "My_location": "Benim konumum",
-  "n_messages": "%s mesaj",
+  "n_messages": "%s ileti",
   "N_new_messages": "%s yeni mesajlar",
-  "Name": "İsim",
+  "Name": "Ad",
   "Name_cant_be_empty": "Ad boş olamaz",
   "Name_of_agent": "maddenin adı",
-  "Name_optional": "İsim (isteğe bağlı)",
+  "Name_optional": "Ad (isteğe bağlı)",
   "Name_Placeholder": "Lütfen adınızı giriniz...",
   "Navigation_History": "navigasyon Tarihi",
   "New_Application": "Yeni uygulama",
   "New_Custom_Field": "Yeni Özel Alan",
   "New_Department": "yeni Bölümü",
+  "New_discussion": "Yeni tartışma",
+  "New_discussion_name": "Tartışma odası için anlamlı bir ad",
+  "New_discussion_first_message": "Genellikle, tartışmalar bir soru ile başlar; örneğin, \"Nasıl görsel yüklerim?\"",
   "New_integration": "yeni entegrasyon",
-  "New_line_message_compose_input": "`%s '- İletide yeni satır girişi oluştur",
+  "New_line_message_compose_input": "`%s` - İleti girdisine yeni satır",
   "New_logs": "yeni günlükleri",
-  "New_Message_Notification": "Yeni Mesaj Bildirimi",
+  "New_Message_Notification": "Yeni İleti Bildirimi",
   "New_messages": "Yeni mesajlar",
   "New_password": "Yeni şifre",
   "New_Password_Placeholder": "Lütfen yeni şifre girin ...",
@@ -2048,20 +2056,20 @@
   "No_available_agents_to_transfer": "Aktarılacak ajanlar yok",
   "No_channel_with_name_%s_was_found": "Adı <strong>\"%s\"</strong> olan hiçbir kanal bulunamadı!",
   "No_channels_yet": "Henüz hiç bir kanala bağlı değilsiniz.",
-  "No_direct_messages_yet": "Maalesef henüz direkt mesajın bulunmuyor.",
+  "No_direct_messages_yet": "Doğrudan İleti Yok.",
   "No_Encryption": "Şifreleme yok",
   "No_group_with_name_%s_was_found": "Adı <strong>\"%s\"</strong> olan hiçbir özel grup bulunamadı!",
   "No_groups_yet": "Henüz hiç bir özel gruba dahil değilsin.",
   "No_integration_found": "Sağlanan kimlik tarafından entegrasyon bulunamadı.",
   "No_livechats": "Hiç CanlıSohbet'iniz yok.",
-  "No_mentions_found": "Bulunamadı bahseder",
-  "No_messages_yet": "Henüz mesaj yok",
+  "No_mentions_found": "Bahsetme bulunamadı",
+  "No_messages_yet": "Henüz ileti yok",
   "No_pages_yet_Try_hitting_Reload_Pages_button": "Henüz bir sayfa yok. \"Sayfaları Yenile\" düğmesine basmayı deneyin.",
-  "No_pinned_messages": "Sabitlenmiş mesaj yok",
+  "No_pinned_messages": "Sabitlenmiş ileti yok",
   "No_results_found": "Sonuç bulunamadı",
   "No_results_found_for": "Için sonuç bulunamadı:",
   "No_snippet_messages": "Snippet yok",
-  "No_starred_messages": "Favori iletin yok",
+  "No_starred_messages": "Favori ileti yok",
   "No_such_command": "Böyle bir komut yok: `/__command__`",
   "No_user_with_username_%s_was_found": "<strong>\"%s\"</strong> adında hiçbir kullanıcı bulunamadı!",
   "Nobody_available": "Kimse yok",
@@ -2091,7 +2099,7 @@
   "Notify_active_in_this_room": "Bu odada aktif kullanıcılara haber ver",
   "Notify_all_in_this_room": "Bu odadaki tüm bildirimleri göster",
   "Num_Agents": "# Ajanlar",
-  "Number_of_messages": "Mesaj sayısı",
+  "Number_of_messages": "İleti sayısı",
   "OAuth Apps": "OAuth Uygulamaları",
   "OAuth_Application": "OAuth Uygulaması",
   "OAuth_Applications": "OAuth Uygulamaları",
@@ -2103,14 +2111,14 @@
   "Office_hours_enabled": "Çalışma Saatleri Etkin",
   "Office_hours_updated": "Ofis saatleri güncellendi",
   "Offline": "Çevrimdışı",
-  "Offline_DM_Email": "Direkt __user__ tarafından mesajla edilmiştir",
+  "Offline_DM_Email": "Doğrudan İleti E-Posta Konusu",
   "Offline_Email_Subject_Description": "Aşağıdaki yer tutucuları kulanabilirsiniz:<br/><ul><li>Uygulama adı, URL, kullanıcı adı ve oda adı için, sırasıyla [Site_Name], [Site_URL], [User] ve [Room].<li/></ul>",
   "Offline_form": "Çevrimdışı formu",
   "Offline_form_unavailable_message": "Çevrimdışı formu kullanılamıyor mesajı",
   "Offline_Link_Message": "MESAJA GİT",
   "Offline_Mention_All_Email": "Tüm E-postaları Konuyla İlgili Anlat",
-  "Offline_Mention_Email": "Sen #__room__ içinde __user__ tarafından söz edilmiştir",
-  "Offline_message": "Çevrimdışı mesaj",
+  "Offline_Mention_Email": "#__room__ içinde __user__ sizden bahsetti",
+  "Offline_message": "Çevrimdışı ileti",
   "Offline_success_message": "Çevrimdışı başarı mesajı",
   "Offline_unavailable": "Çevrimdışı kullanılamıyor",
   "Old Colors": "Eski Renkler",
@@ -2118,7 +2126,7 @@
   "Older_than": "Daha yaşlı",
   "On": "Açık",
   "Online": "Çevrimiçi",
-  "online": "Online",
+  "online": "çevrimiçi",
   "Only_authorized_users_can_write_new_messages": "Yalnızca yetkili kullanıcılar yeni mesajlar yazabilir",
   "Only_from_users": "Sadece bu kullanıcılardan içerik aldırın (herkesin içeriğini yarıda bırakmak için boş bırakın)",
   "Only_On_Desktop": "Masaüstü modu (yalnızca masaüstünde enter ile gönderir)",
@@ -2133,7 +2141,7 @@
   "Open_your_authentication_app_and_enter_the_code": "Kimlik doğrulama uygulamasını açın ve kodu girin. Yedek kodlarınızdan birini de kullanabilirsiniz.",
   "Opened": "Açıldı",
   "Opened_in_a_new_window": "Yeni bir pencerede açıldı.",
-  "Opens_a_channel_group_or_direct_message": "Bir kanal, grup veya doğrudan mesaj açar",
+  "Opens_a_channel_group_or_direct_message": "Bir kanal, grup veya doğrudan ileti açar",
   "optional": "isteğe bağlı",
   "Options": "Seçenekler",
   "or": "veya",
@@ -2176,10 +2184,10 @@
   "Personal_Access_Tokens": "Kişisel Erişim Belirteçi",
   "Phone_number": "Telefon ",
   "pin-message": "Dürbün Mesajı",
-  "pin-message_description": "Bir kanala mesaj yerleştirme izni",
+  "pin-message_description": "Kanaldaki bir iletiyi sabitleme izni",
   "Pin_Message": "Mesajı Sabitle",
-  "Pinned_a_message": "Bir mesaj tutturulmuş:",
-  "Pinned_Messages": "Sabitlenmiş Mesajlar",
+  "Pinned_a_message": "Sabitlenen ileti:",
+  "Pinned_Messages": "Sabitlenmiş İletiler",
   "PiwikAdditionalTrackers": "Ek Piwik Siteleri",
   "PiwikAdditionalTrackers_Description": "Aynı veriyi farklı web sitelerine izlemek istiyorsanız: [{\"trackerURL\": \"https: //my.piwik.domain2/\", \"siteId\": 42}, eklenti Piwik web sitesi URL'lerini ve SiteID'lerini aşağıdaki biçimde girin: {\"trackerURL\": \"https: //my.piwik.domain3/\", \"siteId\": 15}]",
   "PiwikAnalytics_cookieDomain": "Tüm Alt Alanlar",
@@ -2201,10 +2209,10 @@
   "Please_enter_your_password": "lütfen şifrenizi tekrar girin",
   "Please_fill_an_email": "Lütfen bir e-posta girin",
   "Please_fill_a_label": "Bir etiket doldurunuz",
-  "Please_fill_a_name": "Bir isim doldurunuz",
+  "Please_fill_a_name": "Lütfen bir ad girin",
   "Please_fill_a_username": "Bir kullanıcı adı doldurunuz",
   "Please_fill_all_the_information": "Lütfen tüm bilgileri doldurun",
-  "Please_fill_name_and_email": "isim ve e-posta doldurunuz",
+  "Please_fill_name_and_email": "Lütfen ad ve e-posta girin",
   "Please_fill_a_token_name": "Lütfen geçerli bir belirteç adı doldurun",
   "Please_go_to_the_Administration_page_then_Livechat_Facebook": "Lütfen Yönetim sayfasına gidin ve ardından Livechat> Facebook",
   "Please_select_an_user": "Lütfen bir kullanıcı seçin",
@@ -2217,8 +2225,8 @@
   "Pool": "Havuz",
   "Port": "Liman",
   "post-readonly": "OkunmuşOrtamı gönder",
-  "post-readonly_description": "Salt okunur bir kanala mesaj gönderme izni",
-  "Post_as": "Mesaj olarak",
+  "post-readonly_description": "Salt okunur bir kanala ileti gönderme izni",
+  "Post_as": "İleti olarak",
   "Post_to_Channel": "Kanal yayın",
   "Post_to_s_as_s": "<strong>%s</strong>'a <strong>%s</strong> olarak gönderildi",
   "Preferences": "Tercihler",
@@ -2282,7 +2290,7 @@
   "Query_description": "e-posta göndermek için hangi kullanıcıların belirlemek için ek şartlar. Abone olmayan kullanıcılar otomatik sorgudan kaldırılır. Bu geçerli bir JSON olmalıdır. Örnek: \"{\" createdAt \": {\" $ gt \": {\" $ tarihi \":\" 2015-01-01T00: 00: 00.000Z \"}}}\"",
   "Queue": "Kuyruk",
   "quote": "alıntı",
-  "Quote": "Alıntı",
+  "Quote": "Alıntı yap",
   "Random": "rasgele",
   "RD Station": "RD İstasyonu",
   "RDStation_Token": "RD İstasyonu Token",
@@ -2293,7 +2301,7 @@
   "Read_by": "Okuyun",
   "Read_only": "Sadece oku",
   "Read_only_changed_successfully": "Salt okunur sadece başarıyla değiştirildi",
-  "Read_only_channel": "Salt Okunur Kanal",
+  "Read_only_channel": "Salt Okunur",
   "Read_only_group": "Salt Okunur Grup",
   "Real_Estate": "Emlak",
   "RealName_Change_Disabled": "Rocket.Chat yöneticiniz isimleri değiştirmeyi devre dışı bıraktı",
@@ -2367,6 +2375,7 @@
   "Retail": "Perakende",
   "Retention_setting_changed_successfully": "Saklama politikası ayarı başarıyla değiştirildi",
   "RetentionPolicy": "Alıkoyma politikası",
+  "RetentionPolicy_DoNotExcludeDiscussion": "Tartışma iletileri dışarıda tutulmasın",
   "RetentionPolicy_RoomWarning": "__time__'den eski mesajlar otomatik olarak budanır",
   "RetentionPolicy_RoomWarning_Unpinned": "__time__'den eski sabit olmayan iletiler burada otomatik olarak budanır",
   "RetentionPolicy_RoomWarning_FilesOnly": "__time__'den eski dosyalar otomatik olarak budanır (mesajlar bozulmadan kalır)",
@@ -2376,20 +2385,20 @@
   "RetentionPolicy_AppliesToChannels": "Kanallara uygulanır",
   "RetentionPolicy_AppliesToGroups": "Özel gruplara uygulanır",
   "RetentionPolicy_AppliesToDMs": "Doğrudan mesajlara uygulanır",
-  "RetentionPolicy_ExcludePinned": "Sabitlenmiş iletileri hariç tut",
+  "RetentionPolicy_ExcludePinned": "Sabitlenmiş iletileri dışında tut",
   "RetentionPolicy_FilesOnly": "Sadece dosyaları sil",
   "RetentionPolicy_FilesOnly_Description": "Sadece dosyalar silinecek, mesajların kendisi yerinde kalacaktır.",
-  "RetentionPolicy_MaxAge": "Maksimum mesaj yaşı",
-  "RetentionPolicy_MaxAge_Channels": "Kanallarda maksimum mesaj yaşı",
-  "RetentionPolicy_MaxAge_Groups": "Özel gruplarda maksimum mesaj yaşı",
-  "RetentionPolicy_MaxAge_DMs": "Doğrudan mesajlarda maksimum mesaj yaşı",
+  "RetentionPolicy_MaxAge": "Maksimum ileti yaşı",
+  "RetentionPolicy_MaxAge_Channels": "Kanallarda maksimum ileti yaşı",
+  "RetentionPolicy_MaxAge_Groups": "Özel gruplarda maksimum ileti yaşı",
+  "RetentionPolicy_MaxAge_DMs": "Doğrudan mesajlarda maksimum ileti yaşı",
   "RetentionPolicy_MaxAge_Description": "Bu değerden daha eski olan tüm iletileri gün cinsinden belirle",
   "RetentionPolicy_Precision": "Zamanlayıcı Hassasiyeti",
   "RetentionPolicy_Precision_Description": "Kuru erik zamanlayıcı kaç kez çalıştırılmalıdır. Bunu daha hassas bir değere ayarlamak, hızlı saklama zamanlayıcılarına sahip kanalların daha iyi çalışmasını sağlar, ancak büyük topluluklarda ekstra işlem gücüne mal olabilir.",
   "RetentionPolicyRoom_Enabled": "Eski iletileri otomatik olarak belirle",
-  "RetentionPolicyRoom_ExcludePinned": "Sabitlenmiş iletileri hariç tut",
+  "RetentionPolicyRoom_ExcludePinned": "Sabitlenmiş iletileri dışında tut",
   "RetentionPolicyRoom_FilesOnly": "Yalnızca kuru çiçekler",
-  "RetentionPolicyRoom_MaxAge": "Maksimum mesaj yaşı gün olarak (varsayılan: __max__)",
+  "RetentionPolicyRoom_MaxAge": "Maksimum ileti yaşı gün olarak (varsayılan: __max__)",
   "RetentionPolicyRoom_OverrideGlobal": "Küresel saklama politikasını geçersiz kıl",
   "RetentionPolicyRoom_ReadTheDocs": "Dikkat! Azami özen göstermeden bu ayarları yapmak tüm ileti geçmişini yok edebilir. Lütfen <a href=\"https://rocket.chat/docs/administrator-guides/retention-policies/\">buradan</a> özelliği açmadan önce belgelemeyi okuyun.",
   "Retry_Count": "Yeniden Dene Sayımı",
@@ -2407,7 +2416,7 @@
   "room_changed_announcement": "Oda duyurusu şu şekilde değişti: <em>__room_announcement__</em>tarafından: <em>__user_by__</em>",
   "room_changed_description": "Oda açıklaması değiştirildi: <em>__room_description__</em>tarafından: <em>__user_by__</em>",
   "room_changed_privacy": "<em>__user_by__</em> Tarafından <em>__room_type__:</em> Oda tipi değiştirildi",
-  "room_changed_topic": "<em>__user_by__</em> Tarafından <em>__room_topic__:</em> Oda konu olarak değiştirildi",
+  "room_changed_topic": "Oda konusu <em>__room_topic__</em> olarak <em>__user_by__</em> tarafından değiştirildi",
   "Room_default_change_to_private_will_be_default_no_more": "Bu varsayılan bir kanaldır ve özel bir grup olarak değiştirmek, artık varsayılan kanal olmamasına neden olacaktır. Devam etmek istiyor musunuz?",
   "Room_description_changed_successfully": "Oda açıklaması başarıyla değiştirildi",
   "Room_has_been_archived": "Oda arşivlendi",
@@ -2422,11 +2431,11 @@
   "Room_not_found": "Oda bulunamadı",
   "Room_password_changed_successfully": "Oda şifresi başarıyla değiştirildi",
   "Room_tokenpass_config_changed_successfully": "Oda simge düzeninin yapılandırması başarıyla değişti.",
-  "Room_topic_changed_successfully": "Oda konu başarıyla değiştirildi",
+  "Room_topic_changed_successfully": "Oda konusu başarıyla değiştirildi",
   "Room_type_changed_successfully": "Oda tipi başarıyla değiştirildi",
   "Room_type_of_default_rooms_cant_be_changed": "Bu varsayılan oda ve tür değiştirilemez, lütfen yöneticinize danışın.",
   "Room_unarchived": "arşivden oda",
-  "Room_uploaded_file_list": "Dosya listesi",
+  "Room_uploaded_file_list": "Dosyalar Listesi",
   "Room_uploaded_file_list_empty": "Hiçbir dosya mevcut değil.",
   "Rooms": "Odalar",
   "Routing": "Yönlendirme",
@@ -2437,7 +2446,7 @@
   "run-migration_description": "Taşıma işlemlerini çalıştırma izni",
   "Running_Instances": "Örneklerini Çalıştırma",
   "Runtime_Environment": "Çalışma Zamanı Ortamı",
-  "S_new_messages_since_s": "%s beri %s yeni mesaj",
+  "S_new_messages_since_s": "%s yeni ileti (%s itibaren)",
   "Same_As_Token_Sent_Via": "\"Token Sent Via\" ile aynı",
   "Same_Style_For_Mentions": "Bahisler için aynı tarz",
   "SAML": "SAML",
@@ -2475,7 +2484,7 @@
   "Search_Channels": "Kanal Arama",
   "Search_current_provider_not_active": "Mevcut Arama Sağlayıcısı etkin değil",
   "Search_message_search_failed": "Arama isteği başarısız oldu",
-  "Search_Messages": "Mesajlarda ara",
+  "Search_Messages": "İletilerde Ara",
   "Search_Page_Size": "Sayfa boyutu",
   "Search_Private_Groups": "Özel Gruplar Arama",
   "Search_Provider": "Arama Sağlayıcısı",
@@ -2496,7 +2505,7 @@
   "Selecting_users": "Kullanıcılar seçiliyor",
   "send-many-messages": "Çok sayıda ileti gönder",
   "Send": "Gönder",
-  "Send_a_message": "Bir mesaj göndermek",
+  "Send_a_message": "Bir ileti gönder",
   "Send_a_test_mail_to_my_user": "benim kullanıcı için bir sınama posta göndermek",
   "Send_a_test_push_to_my_user": "Benim kullanıcıya bir test itme gönder",
   "Send_confirmation_email": "Doğrulama e-postası gönder",
@@ -2512,7 +2521,7 @@
   "Send_request_on_offline_messages": "çevrimdışı iletilerde isteği gönderin",
   "Send_request_on_visitor_message": "Ziyaretçi Mesajlarına İstek Gönder",
   "Send_Test": "Testi gönder",
-  "Send_Visitor_navigation_history_as_a_message": "Ziyaretçi Gezinme Geçmişini Mesaj Olarak Gönder",
+  "Send_Visitor_navigation_history_as_a_message": "Ziyaretçi Gezinme Geçmişini İleti Olarak Gönder",
   "Send_visitor_navigation_history_on_request": "İstek üzerine Ziyaretçi Gezinme Geçmişi Gönder",
   "Send_welcome_email": "hoşgeldin e-posta gönder",
   "Send_your_JSON_payloads_to_this_URL": "Bu URL'ye JSON yüklerini gönderin.",
@@ -2554,13 +2563,13 @@
   "show_offline_users": "çevrimdışı kullanıcıları göster",
   "Show_on_registration_page": "Kayıt sayfasında göster",
   "Show_only_online": "yalnızca çevrimiçi göster",
-  "Show_on_offline_page": "Çevr",
+  "Show_on_offline_page": "Çevrimdışı sayfada göster",
   "Show_preregistration_form": "ön kayıt formunu göster",
   "Show_queue_list_to_all_agents": "Kuyruk listesini tüm temsilcilere göster",
   "Show_room_counter_on_sidebar": "Oda sayacını kenar çubuğunda gösterin",
   "Show_the_keyboard_shortcut_list": "Klavye kısayol listesini göster",
   "Showing_archived_results": "<p> <b>%s</b> arşivlenmiş sonuçlar gösteriliyor </p>",
-  "Showing_online_users": "__total__ kullanıcıdan <b>__total_showing__</b>  gösteriliyor",
+  "Showing_online_users": "__total__ kullanıcıdan <b>__total_showing__</b>  tanesi gösteriliyor",
   "Showing_results": "<p> <b>%s</b> kayıt bulundu</p>",
   "Sidebar": "Kenar çubuğu",
   "Sidebar_list_mode": "Kenar Çubuğu Kanal Listesi Modu",
@@ -2581,13 +2590,13 @@
   "SlackBridge_Out_Enabled": "SlackBridge Çıkışı Etkin",
   "SlackBridge_Out_Enabled_Description": "SlackBridge'in mesajlarınızı Gevşek duruma geri döndürüp göndermeyeceğini seçin",
   "SlackBridge_start": "@%s, `#%s 'adresinden bir SlackBridge içe aktarma işlemi başlattı. Bitirince size haber vereceğiz.",
-  "Slash_Gimme_Description": "Ekranlar  (つ ◕_◕) つ  önce mesaj",
-  "Slash_LennyFace_Description": "Ekranlar  (͡ ° ͜ʖ ͡ °)  sonra mesaj",
+  "Slash_Gimme_Description": "İletilerinizden önce ༼ つ ◕_◕ ༽つ gösterir",
+  "Slash_LennyFace_Description": "İletilerinizden sonra  ( ͡° ͜ʖ ͡°) gösterir",
   "Slash_Shrug_Description": "Ekranlar ¯ \\ _ (ツ) _ / ¯ senin mesajından sonra",
   "Slash_Tableflip_Description": "Ekranlar  (╯ ° □ °) ╯( ┻━┻",
   "Slash_TableUnflip_Description": "Ekranlar ┬─┬ ノ (゜ - ゜ ノ)",
-  "Slash_Topic_Description": "Set konu",
-  "Slash_Topic_Params": "Konu mesajı",
+  "Slash_Topic_Description": "Konu ayarla",
+  "Slash_Topic_Params": "Konu iletisi",
   "Smarsh_Email": "Smarh Email",
   "Smarsh_Email_Description": ".eml dosyasını göndermek için Smarsh Email Address.",
   "Smarsh_Enabled": "Smarsh Etkinleştirildi",
@@ -2606,20 +2615,20 @@
   "SMTP_Test_Button": "Test SMTP Ayarları",
   "SMTP_Username": "SMTP Kullanıcı Adı",
   "snippet-message": "Snippet Mesajı",
-  "snippet-message_description": "Snippet mesajı oluşturmak için izin",
+  "snippet-message_description": "Snippet iletisi oluşturmak için izin",
   "Snippet_Added": "%s üzerinde oluşturuldu",
   "Snippet_Messages": "Snippet Mesajları",
   "Snippet_name": "Snippet adı",
   "Snippeted_a_message": "Bir snippet oluşturdu __snippetLink__",
   "Social_Network": "Sosyal ağ",
   "Sorry_page_you_requested_does_not_exists_or_was_deleted": "Üzgünüz, talep ettiğiniz sayfa mevcut değil veya silinmiş!",
-  "Sort": "Çeşit",
-  "Sort_by_activity": "Aktiviteye göre sırala",
+  "Sort": "Sırala",
+  "Sort_by_activity": "Etkinliğe göre sırala",
   "Sound": "Ses",
   "Sound_File_mp3": "Ses Dosyası (mp3)",
   "SSL": "SSL",
   "Star_Message": "Favorilere ekle",
-  "Starred_Messages": "Favori İletilerim",
+  "Starred_Messages": "Favori İletiler",
   "Start": "Başlat",
   "Start_audio_call": "Ses aramayı başlatmak",
   "Start_Chat": "Sohbete Başla",
@@ -2643,7 +2652,7 @@
   "Stats_Offline_Users": "Çevrimdışı Kullanıcılar",
   "Stats_Online_Users": "Çevrimiçi Kullanıcılar",
   "Stats_Total_Channels": "Toplam Kanal Sayısı",
-  "Stats_Total_Direct_Messages": "Direkt Mesajlar Odaları Toplamı",
+  "Stats_Total_Direct_Messages": "Toplam Doğrudan İleti Odaları",
   "Stats_Total_Livechat_Rooms": "Toplam Canlı Chat Odası",
   "Stats_Total_Messages": "Toplam İleti Sayısı",
   "Stats_Total_Messages_Channel": "Kanallarda Toplam İleti",
@@ -2658,7 +2667,7 @@
   "Status": "Durum",
   "Step": "Adım",
   "Stop_Recording": "Kaydı Durdur",
-  "Store_Last_Message": "Son Mesaj Mağazası",
+  "Store_Last_Message": "Son İletiyi Sakla",
   "Store_Last_Message_Sent_per_Room": "Her odaya gönderilen son mesajı sakla.",
   "Stream_Cast": "Akarsu Oyuncular",
   "Stream_Cast_Address": "Akış Oyuncular Adresi",
@@ -2685,7 +2694,7 @@
   "Take_it": "Bunu al!",
   "TargetRoom": "Hedef Oda",
   "TargetRoom_Description": "Bu olayın tetiklenmesinin sonucu olan mesajların gönderileceği oda. Tek bir hedef odaya izin verilir ve var olması gerekir.",
-  "Target user not allowed to receive messages": "Hedef kullanıcının mesaj almasına izin verilmiyor",
+  "Target user not allowed to receive messages": "Hedef kullanıcının ileti almasına izin verilmiyor",
   "Team": "Takım",
   "Technology_Provider": "Teknoloji Sağlayıcısı",
   "Technology_Services": "Teknoloji Hizmetleri",
@@ -2699,6 +2708,7 @@
   "The_emails_are_being_sent": "E-postalar gönderiliyor.",
   "The_field_is_required": "%s alanı zorunludur.",
   "The_image_resize_will_not_work_because_we_can_not_detect_ImageMagick_or_GraphicsMagick_installed_in_your_server": "Biz ImageMagick veya GraphicsMagick sunucunuzda yüklü algılayamaz çünkü resim boyutlandırmak çalışmaz.",
+  "The_message_is_a_discussion_you_will_not_be_able_to_recover": "Bu ileti bir tartışma olduğu için iletileri geri getiremeyeceksiniz!",
   "The_peer__peer__does_not_exist": "<em>__peer__</em> adında bir eş yok.",
   "The_redirectUri_is_required": "redirectUri gereklidir",
   "The_server_will_restart_in_s_seconds": "Sunucu %s saniye içinde yeniden başlayacak",
@@ -2803,7 +2813,7 @@
   "Tokens_Required_Input_Description": "Virgülle ayırarak bir veya daha fazla belirteç varlık adını yazın.",
   "Tokens_Required_Input_Error": "Geçersiz yazılmış simgeler",
   "Tokens_Required_Input_Placeholder": "Varlık adlarını iptal eder",
-  "Topic": "konu",
+  "Topic": "Konu",
   "Total": "Toplam",
   "Total_conversations": "Toplam Konuşma",
   "Total_messages": "Toplam İleti Sayısı",
@@ -2837,30 +2847,30 @@
   "Type_your_password": "Şifrenizi giriniz",
   "Type_your_username": "Kullanıcı adınızı yazın",
   "UI_Allow_room_names_with_special_chars": "Oda Adlarında Özel Karakterlere İzin Verme",
-  "UI_Click_Direct_Message": "Doğrudan Mesaj Oluşturmak İçin Tıklayın",
+  "UI_Click_Direct_Message": "Doğrudan İleti Oluşturmak İçin Tıklayın",
   "UI_Click_Direct_Message_Description": "Açılış profili sekmesini atla, bunun yerine konuşmaya devam et",
   "UI_DisplayRoles": "Rolleri Göster",
-  "UI_Group_Channels_By_Type": "Grup kanallarını türe göre",
+  "UI_Group_Channels_By_Type": "Kanalları türe göre grupla",
   "UI_Merge_Channels_Groups": "kanallı özel gruplar birleştir",
   "UI_Unread_Counter_Style": "Okunmamış Karşı Stil",
-  "UI_Use_Name_Avatar": "Varsayılan Avatar Oluşturmak İçin Tam Ad Başlangıçlarını Kullan",
+  "UI_Use_Name_Avatar": "Varsayılan Avatar Oluşturmak İçin Ad Soyadın İlk Harfleri Kullanılsın",
   "UI_Use_Real_Name": "Gerçek Adı Kullan",
   "Unarchive": "Arşivden Çıkar",
   "unarchive-room": "Unarchive Oda",
   "unarchive-room_description": "Kanalları arşivden çıkarma izni",
   "Unblock_User": "Kullanıcının engelini kaldır",
   "Unfavorite": "Favorilerden çıkar",
-  "Unignore": "yoksayılanlardan çıkar",
+  "Unignore": "Yoksayılandan çıkar",
   "Uninstall": "Kaldırma",
   "Unmute_someone_in_room": "Odada Sesi aç birisi",
   "Unmute_user": "Sesi aç kullanıcı",
   "Unnamed": "Adsız",
-  "Unpin_Message": "Mesaj Kaldır",
+  "Unpin_Message": "İletiyi Ayır",
   "Unread": "Okunmamış",
   "Unread_Count": "Okunmamış Sayım",
   "Unread_Count_DM": "Doğru Mesajlar İçin Okunmamış Sayım",
   "Unread_Messages": "Okunmamış Mesajlar",
-  "Unread_on_top": "Üstte okunmadı",
+  "Unread_on_top": "Okunmamışlar üstte",
   "Unread_Rooms": "Okunmamış Odalar",
   "Unread_Rooms_Mode": "Okunmamış Odalar Modu",
   "Unread_Tray_Icon_Alert": "Okunmamış Kaset Simgesi Uyarısı",
@@ -2916,7 +2926,7 @@
   "User_has_been_muted_in_s": "Kullanıcı %s sesi kapatıldı",
   "User_has_been_removed_from_s": "Kullanıcı %s kaldırıldı",
   "User_has_been_unignored": "Kullanıcı artık göz ardı edilmiyor",
-  "User_Info": "Kullanıcı bilgisi",
+  "User_Info": "Kullanıcı Bilgileri",
   "User_Interface": "Kullanıcı Arayüzü",
   "User_is_blocked": "Kullanıcı engellendi",
   "User_is_no_longer_an_admin": "Kullanıcı artık bir yönetici değil",
@@ -2954,7 +2964,7 @@
   "UserData_EnableDownload": "Kullanıcı Verilerini İndirmeyi Etkinleştir",
   "UserData_FileSystemPath": "Sistem Yolu (Dışa Aktarılan Dosyalar)",
   "UserData_FileSystemZipPath": "Sistem Yolu (Sıkıştırılmış Dosya)",
-  "UserData_MessageLimitPerRequest": "İstek Başına Mesaj Limiti",
+  "UserData_MessageLimitPerRequest": "İstek Başına İleti Sınırı",
   "UserData_ProcessingFrequency": "İşleme Sıklığı (Dakika)",
   "UserDataDownload": "Kullanıcı Verisi İndirme",
   "UserDataDownload_CompletedRequestExisted_Text": "Veri dosyanız zaten oluşturuldu. İndirme bağlantısı için e-posta hesabınızı kontrol edin.",
@@ -2969,7 +2979,7 @@
   "Username_cant_be_empty": "Kullanıcı adı boş bırakılamaz",
   "Username_Change_Disabled": "Kullanıcı adı değişimini yönetim tarafından devre dışı bırakılmıştır",
   "Username_denied_the_OTR_session": "__username__ adlı OTR oturumu reddedildi",
-  "Username_description": "Kullanıcı adı, diğerlerinin iletilerde sizden söz edebilmeleri için kullanılır.",
+  "Username_description": "Kullanıcı adı, diğerlerinin iletilerde sizden bahsetmeleri için kullanılır.",
   "Username_doesnt_exist": "`%s` şeklinde bir kullanıcı adı mevcut değil.",
   "Username_ended_the_OTR_session": "__username__ OTR oturumunu sona erdirdi",
   "Username_invalid": "<strong>%s</strong> geçerli bir kullanıcı adı değil,<br/> Kullanıcı adınızı seçerken yalnızca harfler, sayılar, noktalar, tireler ve alt çizgiler kullanın",
@@ -3031,7 +3041,7 @@
   "view-privileged-setting": "Ayrıcalıklı Ayarı Görüntüle",
   "view-privileged-setting_description": "Ayarları görüntüleme izni",
   "view-room-administration": "Oda İdaresi'ni gör",
-  "view-room-administration_description": "Kamu, özel ve doğrudan mesaj istatistiklerini görüntüleme izni. Sohbetleri veya arşivleri görüntüleme olanağını içermez",
+  "view-room-administration_description": "Herkese açık, özel ve doğrudan ileti istatistiklerini görüntüleme izni. Sohbetleri veya arşivleri görüntüleme yeteneğini içermez",
   "view-statistics": "İstatistikleri Görüntüle",
   "view-statistics_description": "Oturum açan kullanıcı sayısı, oda sayısı, işletim sistemi bilgisi gibi sistem istatistiklerini görüntüleme izni",
   "view-user-administration": "Kullanıcı Yönetimini Görüntüle",
diff --git a/packages/rocketchat-i18n/i18n/zh.i18n.json b/packages/rocketchat-i18n/i18n/zh.i18n.json
index 0450c2a04e4f..cf64dcb7c9aa 100644
--- a/packages/rocketchat-i18n/i18n/zh.i18n.json
+++ b/packages/rocketchat-i18n/i18n/zh.i18n.json
@@ -2738,6 +2738,7 @@
   "The_server_will_restart_in_s_seconds": "服务器将在 %s 秒后重启",
   "The_setting_s_is_configured_to_s_and_you_are_accessing_from_s": "<strong>%s</strong>已被设置为<strong>%s</strong>但你是从<strong>%s</strong>访问的！",
   "The_user_will_be_removed_from_s": "该用户将从 %s 中被删除",
+  "The_user_s_will_be_removed_from_role_s": "用户 %s 将被移除 %s 角色",
   "The_user_wont_be_able_to_type_in_s": "该用户将被禁止在 %s 房间中发言",
   "Theme": "主题",
   "theme-color-attention-color": "关注颜色",