From 08d76cc8ade041dbbc0d8fad7bda26b3d77e29f2 Mon Sep 17 00:00:00 2001
From: joe-mcgee <thulsmans.2994@me.com>
Date: Thu, 22 Feb 2018 23:53:07 -0700
Subject: [PATCH 01/20] fixed popovers no scroll if they overflow the window

---
 .../rocketchat-theme/client/imports/components/popover.css | 7 +++++++
 packages/rocketchat-ui/client/views/app/popover.js         | 7 +++++++
 2 files changed, 14 insertions(+)

diff --git a/packages/rocketchat-theme/client/imports/components/popover.css b/packages/rocketchat-theme/client/imports/components/popover.css
index 3353ee43fb13..b78946354302 100644
--- a/packages/rocketchat-theme/client/imports/components/popover.css
+++ b/packages/rocketchat-theme/client/imports/components/popover.css
@@ -65,6 +65,13 @@
 		}
 	}
 
+		&__content-scroll {
+
+			.rc-popover__item {
+				display:block;
+			}
+	}
+
 	&__title {
 		flex: 1;
 
diff --git a/packages/rocketchat-ui/client/views/app/popover.js b/packages/rocketchat-ui/client/views/app/popover.js
index f53f2452ca56..1a04ec3171cb 100644
--- a/packages/rocketchat-ui/client/views/app/popover.js
+++ b/packages/rocketchat-ui/client/views/app/popover.js
@@ -84,6 +84,13 @@ Template.popover.onRendered(function() {
 			});
 		}
 
+		const realTop = Number(popoverContent.style.top.replace('px', ''));
+		if (realTop + popoverContent.offsetHeight > window.innerHeight) {
+			popoverContent.style.overflow = 'scroll';
+			popoverContent.style.bottom = 0;
+			popoverContent.className = 'rc-popover__content rc-popover__content-scroll';
+		}
+
 		if (activeElement) {
 			$(activeElement).addClass('active');
 		}

From 2b231cd9a6c7a8e14a6d28642c101c78a1d66369 Mon Sep 17 00:00:00 2001
From: Sumedh Nimkarde <blesssumedh@gmail.com>
Date: Fri, 23 Feb 2018 19:19:13 +0530
Subject: [PATCH 02/20] feat: Show the user status in the userInfo tab

---
 packages/rocketchat-ui-flextab/client/tabs/userInfo.html | 4 ++++
 packages/rocketchat-ui-flextab/client/tabs/userInfo.js   | 6 ++++++
 2 files changed, 10 insertions(+)

diff --git a/packages/rocketchat-ui-flextab/client/tabs/userInfo.html b/packages/rocketchat-ui-flextab/client/tabs/userInfo.html
index 538d89b12a6e..4a8691bc2090 100644
--- a/packages/rocketchat-ui-flextab/client/tabs/userInfo.html
+++ b/packages/rocketchat-ui-flextab/client/tabs/userInfo.html
@@ -25,6 +25,10 @@ <h1 class="contextual-bar__header-title">{{_ "User_Info"}}</h1>
 						</div>
 						<h3 title="{{name}}" class="rc-user-info__name"><i class="status-{{status}}"></i> {{name}}</h3>
 						{{#if username}}<p class="rc-user-info__username">@{{username}}</p>{{/if}}
+						<span class="rc-header__status">
+							<div class="rc-header__status-bullet rc-header__status-bullet--{{userStatus}}" title="{{userStatus}}"></div>
+							<div class="rc-header__visual-status">{{userStatus}}</div>
+						</span>
 					</div>
 
 					<div class="rc-user-info-action">
diff --git a/packages/rocketchat-ui-flextab/client/tabs/userInfo.js b/packages/rocketchat-ui-flextab/client/tabs/userInfo.js
index 895f0a984a96..25fa6d560315 100644
--- a/packages/rocketchat-ui-flextab/client/tabs/userInfo.js
+++ b/packages/rocketchat-ui-flextab/client/tabs/userInfo.js
@@ -62,6 +62,12 @@ Template.userInfo.helpers({
 		return user && user.username;
 	},
 
+	userStatus() {
+		const user = Template.instance().user.get();
+		const userStatus = Session.get(`user_${ user.username }_status`);
+		return userStatus;
+	},
+
 	email() {
 		const user = Template.instance().user.get();
 		return user && user.emails && user.emails[0] && user.emails[0].address;

From ca54240e945fba92478cb86e156fb0cb9e5e8eb6 Mon Sep 17 00:00:00 2001
From: Ramrami <ramrami.mohamed@gmail.com>
Date: Fri, 23 Feb 2018 17:16:26 +0000
Subject: [PATCH 03/20] Fix video call accept dialog

---
 packages/rocketchat-i18n/i18n/en.i18n.json       |  8 +++++++-
 .../rocketchat-ui/client/views/app/modal.html    |  8 +++++++-
 packages/rocketchat-webrtc/client/WebRTCClass.js | 16 ++++++++--------
 3 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/packages/rocketchat-i18n/i18n/en.i18n.json b/packages/rocketchat-i18n/i18n/en.i18n.json
index 743ec575c97e..c5dd00a7f0e0 100644
--- a/packages/rocketchat-i18n/i18n/en.i18n.json
+++ b/packages/rocketchat-i18n/i18n/en.i18n.json
@@ -550,6 +550,7 @@
   "Display_offline_form": "Display Offline Form",
   "Displays_action_text": "Displays action text",
   "Do_not_display_unread_counter": "Do not display any counter of this channel",
+  "Do_you_want_to_accept": "Do you want to accept?",
   "Do_you_want_to_change_to_s_question": "Do you want to change to <strong>%s</strong>?",
   "Domain": "Domain",
   "Domain_added": "domain Added",
@@ -2159,6 +2160,11 @@
   "We_have_sent_registration_email": "We have sent you an email to confirm your registration. If you do not receive an email shortly, please come back and try again.",
   "Webhook_URL": "Webhook URL",
   "Webhooks": "Webhooks",
+  "WebRTC_direct_audio_call_from_%s": "Direct audio call from %s",
+  "WebRTC_direct_video_call_from_%s": "Direct video call from %s",
+  "WebRTC_group_audio_call_from_%s": "Group audio call from %s",
+  "WebRTC_group_video_call_from_%s": "Group video call from %s",
+  "WebRTC_monitor_call_from_%s": "Monitor call from %s",
   "WebRTC_Enable_Channel": "Enable for Public Channels",
   "WebRTC_Enable_Direct": "Enable for Direct Messages",
   "WebRTC_Enable_Private": "Enable for Private Channels",
@@ -2216,4 +2222,4 @@
   "your_message_optional": "your message (optional)",
   "Your_password_is_wrong": "Your password is wrong!",
   "Your_push_was_sent_to_s_devices": "Your push was sent to %s devices"
-}
\ No newline at end of file
+}
diff --git a/packages/rocketchat-ui/client/views/app/modal.html b/packages/rocketchat-ui/client/views/app/modal.html
index 98ba88a958cd..f0bb4fd61564 100644
--- a/packages/rocketchat-ui/client/views/app/modal.html
+++ b/packages/rocketchat-ui/client/views/app/modal.html
@@ -5,7 +5,13 @@
 				{{> Template.dynamic template=template data=data}}
 			{{else}}
 				<header class="rc-modal__header">
-					<h1 class="rc-modal__title">{{title}}</h1>
+					<h1 class="rc-modal__title">
+						{{#if html}}
+							{{{title}}}
+						{{else}}
+							{{title}}
+						{{/if}}
+					</h1>
 					<button class="contextual-bar__close js-close">
 						{{> icon classes="rc-modal__close" icon="plus"}}
 					</button>
diff --git a/packages/rocketchat-webrtc/client/WebRTCClass.js b/packages/rocketchat-webrtc/client/WebRTCClass.js
index 94e851de7daa..db44ed029323 100644
--- a/packages/rocketchat-webrtc/client/WebRTCClass.js
+++ b/packages/rocketchat-webrtc/client/WebRTCClass.js
@@ -722,29 +722,29 @@ class WebRTCClass {
 		let title;
 		if (data.monitor === true) {
 			icon = 'eye';
-			title = `Monitor call from ${ fromUsername }`;
+			title = t('WebRTC_monitor_call_from_%s', fromUsername);
 		} else if (subscription && subscription.t === 'd') {
 			if (data.media && data.media.video) {
 				icon = 'videocam';
-				title = `Direct video call from ${ fromUsername }`;
+				title = t('WebRTC_direct_video_call_from_%s', fromUsername);
 			} else {
 				icon = 'phone';
-				title = `Direct audio call from ${ fromUsername }`;
+				title = t('WebRTC_direct_audio_call_from_%s', fromUsername);
 			}
 		} else if (data.media && data.media.video) {
 			icon = 'videocam';
-			title = `Group video call from ${ subscription.name }`;
+			title = t('WebRTC_group_video_call_from_%s', subscription.name);
 		} else {
 			icon = 'phone';
-			title = `Group audio call from ${ subscription.name }`;
+			title = t('WebRTC_group_audio_call_from_%s', subscription.name);
 		}
 		modal.open({
 			title: `<i class='icon-${ icon } alert-icon success-color'></i>${ title }`,
-			text: 'Do you want to accept?',
+			text: t('Do_you_want_to_accept'),
 			html: true,
 			showCancelButton: true,
-			confirmButtonText: 'Yes',
-			cancelButtonText: 'No'
+			confirmButtonText: t('Yes'),
+			cancelButtonText: t('No')
 		}, (isConfirm) => {
 			if (isConfirm) {
 				FlowRouter.goToRoomById(data.room);

From 970362e3c5bfbd01268c155865fcd5c86cc710d2 Mon Sep 17 00:00:00 2001
From: Sumedh Nimkarde <blesssumedh@gmail.com>
Date: Fri, 16 Feb 2018 13:35:54 +0530
Subject: [PATCH 04/20] [BUG]: Fix the url detection issue

---
 packages/rocketchat-autolinker/client/client.js | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/packages/rocketchat-autolinker/client/client.js b/packages/rocketchat-autolinker/client/client.js
index 60c18123d007..4846ff16e25d 100644
--- a/packages/rocketchat-autolinker/client/client.js
+++ b/packages/rocketchat-autolinker/client/client.js
@@ -7,7 +7,14 @@ import s from 'underscore.string';
 
 import Autolinker from 'autolinker';
 
+function htmlDecode(input) {
+	const e = document.createElement('div');
+	e.innerHTML = input;
+	return e.childNodes.length === 0 ? '' : e.childNodes[0].nodeValue;
+}
+
 function AutoLinker(message) {
+	message.html = htmlDecode(message.html);
 	if (RocketChat.settings.get('AutoLinker') !== true) {
 		return message;
 	}

From 1da8194265c33692c6006fe25df86a0c8434bc3f Mon Sep 17 00:00:00 2001
From: Sumedh Nimkarde <blesssumedh@gmail.com>
Date: Sat, 10 Feb 2018 17:52:58 +0530
Subject: [PATCH 05/20] Make the file names look good in the file upload list

---
 .../rocketchat-theme/client/imports/components/file-list.css   | 3 +++
 packages/rocketchat-theme/client/main.css                      | 1 +
 2 files changed, 4 insertions(+)
 create mode 100644 packages/rocketchat-theme/client/imports/components/file-list.css

diff --git a/packages/rocketchat-theme/client/imports/components/file-list.css b/packages/rocketchat-theme/client/imports/components/file-list.css
new file mode 100644
index 000000000000..b2a7178a7d7f
--- /dev/null
+++ b/packages/rocketchat-theme/client/imports/components/file-list.css
@@ -0,0 +1,3 @@
+.attachments__content .attachments__name {
+  overflow: unset;
+}
diff --git a/packages/rocketchat-theme/client/main.css b/packages/rocketchat-theme/client/main.css
index ad0867b2a50d..95577ddd1e4b 100644
--- a/packages/rocketchat-theme/client/main.css
+++ b/packages/rocketchat-theme/client/main.css
@@ -42,6 +42,7 @@
 @import 'imports/components/contextual-bar.css';
 @import 'imports/components/emojiPicker.css';
 @import 'imports/components/table.css';
+@import 'imports/components/file-list.css';
 
 /* Modal */
 @import 'imports/components/modal/full-modal.css';

From 390c538fab9f5af2c20530e346fffdf6a800ed68 Mon Sep 17 00:00:00 2001
From: Sumedh Nimkarde <blesssumedh@gmail.com>
Date: Tue, 20 Feb 2018 16:34:46 +0530
Subject: [PATCH 06/20] feat: Make the user statuses lowercase throughout the
 app

---
 packages/rocketchat-i18n/i18n/en.i18n.json                | 3 ++-
 packages/rocketchat-ui-sidenav/client/sidebarHeader.js    | 8 ++++----
 packages/rocketchat-ui-sidenav/client/userStatus.html     | 8 ++++----
 packages/rocketchat-ui/client/components/header/header.js | 2 +-
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/packages/rocketchat-i18n/i18n/en.i18n.json b/packages/rocketchat-i18n/i18n/en.i18n.json
index 743ec575c97e..517e66318868 100644
--- a/packages/rocketchat-i18n/i18n/en.i18n.json
+++ b/packages/rocketchat-i18n/i18n/en.i18n.json
@@ -1424,6 +1424,7 @@
   "Offline_unavailable": "Offline unavailable",
   "On": "On",
   "Online": "Online",
+  "online": "online",
   "Only_authorized_users_can_write_new_messages": "Only authorized users can write new messages",
   "Only_On_Desktop": "Desktop mode (only sends with enter on desktop)",
   "Only_you_can_see_this_message": "Only you can see this message",
@@ -2216,4 +2217,4 @@
   "your_message_optional": "your message (optional)",
   "Your_password_is_wrong": "Your password is wrong!",
   "Your_push_was_sent_to_s_devices": "Your push was sent to %s devices"
-}
\ No newline at end of file
+}
diff --git a/packages/rocketchat-ui-sidenav/client/sidebarHeader.js b/packages/rocketchat-ui-sidenav/client/sidebarHeader.js
index a200a38b5a29..3b6900c2932c 100644
--- a/packages/rocketchat-ui-sidenav/client/sidebarHeader.js
+++ b/packages/rocketchat-ui-sidenav/client/sidebarHeader.js
@@ -266,25 +266,25 @@ Template.sidebarHeader.events({
 								items: [
 									{
 										icon: 'circle',
-										name: t('Online'),
+										name: t('online'),
 										modifier: 'online',
 										action: () => setStatus('online')
 									},
 									{
 										icon: 'circle',
-										name: t('Away'),
+										name: t('away'),
 										modifier: 'away',
 										action: () => setStatus('away')
 									},
 									{
 										icon: 'circle',
-										name: t('Busy'),
+										name: t('busy'),
 										modifier: 'busy',
 										action: () => setStatus('busy')
 									},
 									{
 										icon: 'circle',
-										name: t('Invisible'),
+										name: t('invisible'),
 										modifier: 'offline',
 										action: () => setStatus('offline')
 									}
diff --git a/packages/rocketchat-ui-sidenav/client/userStatus.html b/packages/rocketchat-ui-sidenav/client/userStatus.html
index b92728ef1379..073d183bc2bc 100644
--- a/packages/rocketchat-ui-sidenav/client/userStatus.html
+++ b/packages/rocketchat-ui-sidenav/client/userStatus.html
@@ -13,10 +13,10 @@ <h4>{{username}}</h4>
 			</div>
 			<nav class="options primary-background-color animated-hidden">
 				<div class="wrapper">
-					<button data-status="online" class="status online"><span>{{_ "Online"}}</span></button>
-					<button data-status="away" class="status away"><span>{{_ "Away" context="male"}}</span></button>
-					<button data-status="busy" class="status busy"><span>{{_ "Busy" context="male"}}</span></button>
-					<button data-status="offline" class="status offline"><span>{{_ "Invisible"}}</span></button>
+					<button data-status="online" class="status online"><span>{{_ "online"}}</span></button>
+					<button data-status="away" class="status away"><span>{{_ "away" context="male"}}</span></button>
+					<button data-status="busy" class="status busy"><span>{{_ "busy" context="male"}}</span></button>
+					<button data-status="offline" class="status offline"><span>{{_ "invisible"}}</span></button>
 					<button id="account" class='account-link'><i class="icon-sliders"></i><span>{{_ "My_Account"}}</span></button>
 					{{#if showAdminOption }}
 						<button id="admin" class='account-link'><i class="icon-wrench"></i><span>{{_ "Administration"}}</span></button>
diff --git a/packages/rocketchat-ui/client/components/header/header.js b/packages/rocketchat-ui/client/components/header/header.js
index 5eece208faab..8f3a42d6dbd6 100644
--- a/packages/rocketchat-ui/client/components/header/header.js
+++ b/packages/rocketchat-ui/client/components/header/header.js
@@ -80,7 +80,7 @@ Template.header.helpers({
 
 	userStatus() {
 		const roomData = Session.get(`roomData${ this._id }`);
-		return RocketChat.roomTypes.getUserStatus(roomData.t, this._id) || 'offline';
+		return RocketChat.roomTypes.getUserStatus(roomData.t, this._id) || t('offline');
 	},
 
 	showToggleFavorite() {

From 1f9a9833f46318d6dc70416ae484a7d243083f7b Mon Sep 17 00:00:00 2001
From: kb0304 <karanbedi0304@gmail.com>
Date: Fri, 9 Mar 2018 21:42:59 +0530
Subject: [PATCH 07/20] [FIX] Switch button border-color configurable

---
 packages/rocketchat-theme/client/imports/forms/switch.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/rocketchat-theme/client/imports/forms/switch.css b/packages/rocketchat-theme/client/imports/forms/switch.css
index bbed3cf53909..503f7cceb0c7 100644
--- a/packages/rocketchat-theme/client/imports/forms/switch.css
+++ b/packages/rocketchat-theme/client/imports/forms/switch.css
@@ -18,7 +18,7 @@
 		& .rc-switch__input {
 			&:checked {
 				& + .rc-switch__button {
-				 border-color: #1757B7;
+				 border-color: var(--button-primary-background);
 				 background-color: var(--button-primary-background);
 			 }
 			}

From d0297230ec70788c357dd21dc3eb194cf6dc27e6 Mon Sep 17 00:00:00 2001
From: Utkarsh Barsaiyan <ubarsaiyan@gmail.com>
Date: Sat, 10 Mar 2018 01:23:17 +0530
Subject: [PATCH 08/20] [NEW] Reply Preview

---
 .../rocketchat-lib/client/MessageAction.js    |  4 +++-
 .../client/messageBox.html                    |  7 +++++++
 .../client/messageBox.js                      | 20 +++++++++++++++++++
 3 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/packages/rocketchat-lib/client/MessageAction.js b/packages/rocketchat-lib/client/MessageAction.js
index c473d2de4383..3ad655c1b517 100644
--- a/packages/rocketchat-lib/client/MessageAction.js
+++ b/packages/rocketchat-lib/client/MessageAction.js
@@ -107,7 +107,9 @@ Meteor.startup(function() {
 			const roomInfo = RocketChat.models.Rooms.findOne(message.rid, { fields: { t: 1 } });
 			let text = `[ ](${ url }) `;
 			let inputValue = '';
-
+			$('.rc-message-box__textarea')
+				.data('reply', message)
+				.trigger('dataChange');
 			if (roomInfo.t !== 'd' && message.u.username !== Meteor.user().username) {
 				text += `@${ message.u.username } `;
 			}
diff --git a/packages/rocketchat-ui-message/client/messageBox.html b/packages/rocketchat-ui-message/client/messageBox.html
index 4f4a0039c063..7f16fa9c4f8c 100644
--- a/packages/rocketchat-ui-message/client/messageBox.html
+++ b/packages/rocketchat-ui-message/client/messageBox.html
@@ -21,6 +21,13 @@
 			{{/with}}
 			{{#if allowedToSend}}
 				{{> messagePopupConfig getPopupConfig}}
+				{{#if dataReply}}
+					{{#with dataReply}}
+						<div style="border-top: solid 1px lightgray;">
+							{{> messageAttachment text=msg author_name=u.username}}
+						</div>
+					{{/with}}
+				{{/if}}
 				<label class="rc-message-box__container">
 					<div class="rc-message-box__icon emoji-picker-icon {{#unless isEmojiEnable}}emoji-picker-icon--disabled{{/unless}}">
 						{{> icon block="rc-input__icon-svg" icon="emoji"}}
diff --git a/packages/rocketchat-ui-message/client/messageBox.js b/packages/rocketchat-ui-message/client/messageBox.js
index 27dad816708c..baabea4c8ca1 100644
--- a/packages/rocketchat-ui-message/client/messageBox.js
+++ b/packages/rocketchat-ui-message/client/messageBox.js
@@ -269,6 +269,12 @@ Template.messageBox.helpers({
 	},
 	isEmojiEnable() {
 		return RocketChat.getUserPreference(Meteor.user(), 'useEmojis');
+	},
+	isMessageFieldEmpty() {
+		return Template.instance().isMessageFieldEmpty.get();
+	},
+	dataReply() {
+		return Template.instance().dataReply.get();
 	}
 });
 
@@ -469,6 +475,19 @@ Template.messageBox.events({
 });
 
 Template.messageBox.onRendered(function() {
+	const input = $('.rc-message-box__textarea'); //mssg box
+	const self = this;
+	input.on('dataChange', () => {
+		const reply = input.data('reply');
+		self.dataReply.set(reply);
+	});
+
+	this.autorun(() => {
+		if (self.isMessageFieldEmpty.get()) {
+			self.dataReply.set(undefined);
+		}
+	});
+
 	chatMessages[RocketChat.openedRoom] = chatMessages[RocketChat.openedRoom] || new ChatMessages;
 	chatMessages[RocketChat.openedRoom].input = this.$('.js-input-message').autogrow({
 		animate: true,
@@ -481,6 +500,7 @@ Template.messageBox.onRendered(function() {
 });
 
 Template.messageBox.onCreated(function() {
+	this.dataReply = new ReactiveVar(''); //if user is replying to a mssg, this will contain data of the mssg being replied to
 	this.isMessageFieldEmpty = new ReactiveVar(true);
 	this.sendIcon = new ReactiveVar(false);
 });

From 29c05a6814a7477d834daaed8f5ffc7876974f85 Mon Sep 17 00:00:00 2001
From: Utkarsh Barsaiyan <ubarsaiyan@gmail.com>
Date: Sat, 10 Mar 2018 18:08:00 +0530
Subject: [PATCH 09/20] Improved the ui of the message preview by using @
 mention template's css

---
 .../rocketchat-theme/client/imports/general/base_old.css    | 6 ++++++
 packages/rocketchat-ui-message/client/messageBox.html       | 6 +++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/packages/rocketchat-theme/client/imports/general/base_old.css b/packages/rocketchat-theme/client/imports/general/base_old.css
index 50df7449b4c6..18eeb43c23d5 100644
--- a/packages/rocketchat-theme/client/imports/general/base_old.css
+++ b/packages/rocketchat-theme/client/imports/general/base_old.css
@@ -2608,6 +2608,12 @@
 	position: relative;
 }
 
+.rc-old .rc-message-box .reply-preview {
+	position: relative;
+	background-color:#fff;
+	padding-left: 15px;
+}
+
 .rc-old .message-popup {
 	position: absolute;
 	z-index: 101;
diff --git a/packages/rocketchat-ui-message/client/messageBox.html b/packages/rocketchat-ui-message/client/messageBox.html
index 7f16fa9c4f8c..bb99a1afdaff 100644
--- a/packages/rocketchat-ui-message/client/messageBox.html
+++ b/packages/rocketchat-ui-message/client/messageBox.html
@@ -23,9 +23,9 @@
 				{{> messagePopupConfig getPopupConfig}}
 				{{#if dataReply}}
 					{{#with dataReply}}
-						<div style="border-top: solid 1px lightgray;">
-							{{> messageAttachment text=msg author_name=u.username}}
-						</div>
+							<div class="reply-preview message-popup">
+								{{> messageAttachment text=msg author_name=u.username}}
+							</div>
 					{{/with}}
 				{{/if}}
 				<label class="rc-message-box__container">

From 08f0a639f7ce1bd8290661118a6bbd338f209a67 Mon Sep 17 00:00:00 2001
From: Utkarsh Barsaiyan <ubarsaiyan@gmail.com>
Date: Sun, 11 Mar 2018 02:51:29 +0530
Subject: [PATCH 10/20] Implemented a cancel reply option and removed the url
 from the input box while replying

---
 .../rocketchat-lib/client/MessageAction.js    | 20 ++-----------------
 .../client/imports/general/base_old.css       |  9 +++++++++
 .../client/messageBox.html                    |  3 +++
 .../client/messageBox.js                      | 17 +++++++---------
 .../rocketchat-ui/client/lib/chatMessages.js  | 16 ++++++++++++++-
 5 files changed, 36 insertions(+), 29 deletions(-)

diff --git a/packages/rocketchat-lib/client/MessageAction.js b/packages/rocketchat-lib/client/MessageAction.js
index 3ad655c1b517..56fef6f4da9f 100644
--- a/packages/rocketchat-lib/client/MessageAction.js
+++ b/packages/rocketchat-lib/client/MessageAction.js
@@ -103,27 +103,11 @@ Meteor.startup(function() {
 		action() {
 			const message = this._arguments[1];
 			const {input} = chatMessages[message.rid];
-			const url = RocketChat.MessageAction.getPermaLink(message._id);
-			const roomInfo = RocketChat.models.Rooms.findOne(message.rid, { fields: { t: 1 } });
-			let text = `[ ](${ url }) `;
-			let inputValue = '';
-			$('.rc-message-box__textarea')
+			$(input)
 				.data('reply', message)
 				.trigger('dataChange');
-			if (roomInfo.t !== 'd' && message.u.username !== Meteor.user().username) {
-				text += `@${ message.u.username } `;
-			}
-
-			if (input.value && !input.value.endsWith(' ')) {
-				inputValue += ' ';
-			}
-			inputValue += text;
-
 			$(input)
-				.focus()
-				.val(inputValue)
-				.trigger('change')
-				.trigger('input');
+				.focus();
 		},
 		condition(message) {
 			if (RocketChat.models.Subscriptions.findOne({rid: message.rid}) == null) {
diff --git a/packages/rocketchat-theme/client/imports/general/base_old.css b/packages/rocketchat-theme/client/imports/general/base_old.css
index 18eeb43c23d5..91d7b45b32d2 100644
--- a/packages/rocketchat-theme/client/imports/general/base_old.css
+++ b/packages/rocketchat-theme/client/imports/general/base_old.css
@@ -2609,9 +2609,18 @@
 }
 
 .rc-old .rc-message-box .reply-preview {
+	display: flex;
 	position: relative;
 	background-color:#fff;
 	padding-left: 15px;
+    padding-top: 0.5rem;
+    padding-bottom: 0.5rem;
+    align-items: center;
+    justify-content: space-between;
+}
+
+.rc-old .reply-preview .cancel-reply {
+	padding: 10px;
 }
 
 .rc-old .message-popup {
diff --git a/packages/rocketchat-ui-message/client/messageBox.html b/packages/rocketchat-ui-message/client/messageBox.html
index bb99a1afdaff..c6885fe8ede0 100644
--- a/packages/rocketchat-ui-message/client/messageBox.html
+++ b/packages/rocketchat-ui-message/client/messageBox.html
@@ -25,6 +25,9 @@
 					{{#with dataReply}}
 							<div class="reply-preview message-popup">
 								{{> messageAttachment text=msg author_name=u.username}}
+								<div class="rc-message-box__icon cancel-reply">
+									{{> icon block="rc-input__icon-svg" icon="cross"}}
+								</div>
 							</div>
 					{{/with}}
 				{{/if}}
diff --git a/packages/rocketchat-ui-message/client/messageBox.js b/packages/rocketchat-ui-message/client/messageBox.js
index baabea4c8ca1..29213f225427 100644
--- a/packages/rocketchat-ui-message/client/messageBox.js
+++ b/packages/rocketchat-ui-message/client/messageBox.js
@@ -270,9 +270,6 @@ Template.messageBox.helpers({
 	isEmojiEnable() {
 		return RocketChat.getUserPreference(Meteor.user(), 'useEmojis');
 	},
-	isMessageFieldEmpty() {
-		return Template.instance().isMessageFieldEmpty.get();
-	},
 	dataReply() {
 		return Template.instance().dataReply.get();
 	}
@@ -377,6 +374,13 @@ Template.messageBox.events({
 			return input.focus();
 		});
 	},
+	'click .cancel-reply'(event, instance) {
+		const input = instance.find('.js-input-message');
+		$(input)
+			.focus()
+			.removeData('reply')
+			.trigger('dataChange');
+	},
 	'keyup .js-input-message'(event, instance) {
 		chatMessages[this._id].keyup(this._id, event, instance);
 		return instance.isMessageFieldEmpty.set(chatMessages[this._id].isEmpty());
@@ -481,13 +485,6 @@ Template.messageBox.onRendered(function() {
 		const reply = input.data('reply');
 		self.dataReply.set(reply);
 	});
-
-	this.autorun(() => {
-		if (self.isMessageFieldEmpty.get()) {
-			self.dataReply.set(undefined);
-		}
-	});
-
 	chatMessages[RocketChat.openedRoom] = chatMessages[RocketChat.openedRoom] || new ChatMessages;
 	chatMessages[RocketChat.openedRoom].input = this.$('.js-input-message').autogrow({
 		animate: true,
diff --git a/packages/rocketchat-ui/client/lib/chatMessages.js b/packages/rocketchat-ui/client/lib/chatMessages.js
index c9bbdecb2355..a153a2e31c50 100644
--- a/packages/rocketchat-ui/client/lib/chatMessages.js
+++ b/packages/rocketchat-ui/client/lib/chatMessages.js
@@ -182,7 +182,21 @@ this.ChatMessages = class ChatMessages {
 			readMessage.readNow();
 			$('.message.first-unread').removeClass('first-unread');
 
-			const msg = input.value;
+			let msg = '';
+			const reply = $(input).data('reply');
+			if (reply!==undefined) {
+				const url = RocketChat.MessageAction.getPermaLink(reply._id);
+				msg = `[ ](${ url }) `;
+				const roomInfo = RocketChat.models.Rooms.findOne(reply.rid, { fields: { t: 1 } });
+				if (roomInfo.t !== 'd' && reply.u.username !== Meteor.user().username) {
+					msg += `@${ reply.u.username } `;
+				}
+			}
+			msg += input.value;
+			$(input)
+				.removeData('reply')
+				.trigger('dataChange');
+
 			const msgObject = { _id: Random.id(), rid, msg};
 
 			if (msg.slice(0, 2) === '+:') {

From 373b0a25f908d25d77705dfe7265511f447c9267 Mon Sep 17 00:00:00 2001
From: Utkarsh Barsaiyan <ubarsaiyan@gmail.com>
Date: Sun, 11 Mar 2018 03:04:19 +0530
Subject: [PATCH 11/20] Small changes

---
 packages/rocketchat-lib/client/MessageAction.js     | 3 +--
 packages/rocketchat-ui-message/client/messageBox.js | 6 +++---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/packages/rocketchat-lib/client/MessageAction.js b/packages/rocketchat-lib/client/MessageAction.js
index 56fef6f4da9f..79747da1631d 100644
--- a/packages/rocketchat-lib/client/MessageAction.js
+++ b/packages/rocketchat-lib/client/MessageAction.js
@@ -104,10 +104,9 @@ Meteor.startup(function() {
 			const message = this._arguments[1];
 			const {input} = chatMessages[message.rid];
 			$(input)
+				.focus()
 				.data('reply', message)
 				.trigger('dataChange');
-			$(input)
-				.focus();
 		},
 		condition(message) {
 			if (RocketChat.models.Subscriptions.findOne({rid: message.rid}) == null) {
diff --git a/packages/rocketchat-ui-message/client/messageBox.js b/packages/rocketchat-ui-message/client/messageBox.js
index 29213f225427..72db6db68c2e 100644
--- a/packages/rocketchat-ui-message/client/messageBox.js
+++ b/packages/rocketchat-ui-message/client/messageBox.js
@@ -479,10 +479,10 @@ Template.messageBox.events({
 });
 
 Template.messageBox.onRendered(function() {
-	const input = $('.rc-message-box__textarea'); //mssg box
+	const input = this.find('.js-input-message'); //mssg box
 	const self = this;
-	input.on('dataChange', () => {
-		const reply = input.data('reply');
+	$(input).on('dataChange', () => {
+		const reply = $(input).data('reply');
 		self.dataReply.set(reply);
 	});
 	chatMessages[RocketChat.openedRoom] = chatMessages[RocketChat.openedRoom] || new ChatMessages;

From 846c4bebe05c6ca812d30d50936035c091e6b770 Mon Sep 17 00:00:00 2001
From: Hudell <brian@hudell.com>
Date: Mon, 12 Mar 2018 11:13:36 -0300
Subject: [PATCH 12/20] Removed Private History

---
 client/routes/router.js                       | 13 ---
 .../rocketchat-ui-sidenav/client/sideNav.html |  6 --
 .../client/views/app/privateHistory.html      | 59 -----------
 .../client/views/app/privateHistory.js        | 97 -------------------
 packages/rocketchat-ui/package.js             |  2 -
 server/publications/privateHistory.js         | 16 ---
 6 files changed, 193 deletions(-)
 delete mode 100644 packages/rocketchat-ui/client/views/app/privateHistory.html
 delete mode 100644 packages/rocketchat-ui/client/views/app/privateHistory.js
 delete mode 100644 server/publications/privateHistory.js

diff --git a/client/routes/router.js b/client/routes/router.js
index d75f07595f0b..67d0f4870e5e 100644
--- a/client/routes/router.js
+++ b/client/routes/router.js
@@ -95,19 +95,6 @@ FlowRouter.route('/account/:group?', {
 	}]
 });
 
-FlowRouter.route('/history/private', {
-	name: 'privateHistory',
-
-	subscriptions(/*params, queryParams*/) {
-		this.register('privateHistory', Meteor.subscribe('privateHistory'));
-	},
-
-	action() {
-		Session.setDefault('historyFilter', '');
-		BlazeLayout.render('main', {center: 'privateHistory'});
-	}
-});
-
 FlowRouter.route('/terms-of-service', {
 	name: 'terms-of-service',
 
diff --git a/packages/rocketchat-ui-sidenav/client/sideNav.html b/packages/rocketchat-ui-sidenav/client/sideNav.html
index 3474a37c18f9..f668cbebb462 100644
--- a/packages/rocketchat-ui-sidenav/client/sideNav.html
+++ b/packages/rocketchat-ui-sidenav/client/sideNav.html
@@ -9,12 +9,6 @@
 					{{#each roomType}}
 						{{> Template.dynamic template=template data=data }}
 					{{/each}}
-
-					{{#if canViewHistory}}
-						<h3 class="history-div">
-							<a href="{{pathFor 'privateHistory'}}">{{_ "History"}}</a>
-						</h3>
-					{{/if}}
 				</div>
 				<div class="unread-rooms background-primary-action-color color-primary-action-contrast bottom-unread-rooms hidden">
 					{{_ "More_unreads"}} <i class="icon-down-big"></i>
diff --git a/packages/rocketchat-ui/client/views/app/privateHistory.html b/packages/rocketchat-ui/client/views/app/privateHistory.html
deleted file mode 100644
index c432346dc6a6..000000000000
--- a/packages/rocketchat-ui/client/views/app/privateHistory.html
+++ /dev/null
@@ -1,59 +0,0 @@
-<template name="privateHistory">
-	<section class="page-container page-list content-background-color">
-		{{> header sectionName="History"}}
-		<div class="content">
-			<form class="search-form" role="form">
-				<div class="input-line search">
-					<input type="text" id="history-filter" placeholder="{{_ "Search"}}" dir="auto">
-					<i class="icon-search secondary-font-color"></i>
-				</div>
-			</form>
-			<div class="results">
-				{{{_ "Showing_results" history.length}}}
-			</div>
-			<div class="list">
-				{{#each history.items}}
-					<a href="{{path}}">
-						<div class="info">
-							<h3><i class="{{type}}"></i><span class="enter-room">{{name}}</span></h3>
-							<ul>
-								{{#with roomOf rid}}
-									<li>{{_ "n_messages" msgs}}</li>
-									<li>{{_ "since_creation" creation}}</li>
-								{{/with}}
-							</ul>
-						</div>
-						<div class="title">
-							{{#with roomOf rid}}
-								<strong>{{lastMessage}}</strong>
-							{{/with}}
-						</div>
-					</a>
-				{{/each}}
-			</div>
-			<div class="results">
-				{{{_ "Showing_archived_results" archivedHistory.length}}}
-			</div>
-			<div class="list">
-				{{#each archivedHistory.items}}
-					<a href="{{path}}">
-						<div class="info">
-							<h3><i class="{{type}}"></i><span class="enter-room">{{name}}</span></h3>
-							<ul>
-								{{#with roomOf rid}}
-									<li>{{_ "n_messages" msgs}}</li>
-									<li>{{_ "since_creation" creation}}</li>
-								{{/with}}
-							</ul>
-						</div>
-						<div class="title">
-							{{#with roomOf rid}}
-								<strong>{{lastMessage}}</strong>
-							{{/with}}
-						</div>
-					</a>
-				{{/each}}
-			</div>
-		</div>
-	</section>
-</template>
diff --git a/packages/rocketchat-ui/client/views/app/privateHistory.js b/packages/rocketchat-ui/client/views/app/privateHistory.js
deleted file mode 100644
index 7c22c1c6254b..000000000000
--- a/packages/rocketchat-ui/client/views/app/privateHistory.js
+++ /dev/null
@@ -1,97 +0,0 @@
-import moment from 'moment';
-
-Template.privateHistory.helpers({
-	history() {
-		const items = ChatSubscription.find({
-			name: {
-				$regex: Session.get('historyFilter'),
-				$options: 'i'
-			},
-			t: {
-				$in: ['d', 'c', 'p']
-			},
-			archived: {
-				$ne: true
-			}
-		}, {
-			'sort': {
-				'ts': -1
-			}
-		});
-		return {
-			items,
-			length: items.count()
-		};
-	},
-	archivedHistory() {
-		const items = ChatSubscription.find({
-			name: {
-				$regex: Session.get('historyFilter'),
-				$options: 'i'
-			},
-			t: {
-				$in: ['d', 'c', 'p']
-			},
-			archived: true
-		}, {
-			'sort': {
-				'ts': -1
-			}
-		});
-		return {
-			items,
-			length: items.count()
-		};
-	},
-	roomOf(rid) {
-		return ChatRoom.findOne(rid);
-	},
-	type() {
-		switch (this.t) {
-			case 'd':
-				return 'icon-at';
-			case 'c':
-				return 'icon-hash';
-			case 'p':
-				return 'icon-lock';
-		}
-	},
-	creation() {
-		return moment(this.ts).format('LLL');
-	},
-	lastMessage() {
-		if (this.lm) {
-			return moment(this.lm).format('LLL');
-		}
-	},
-	path() {
-		switch (this.t) {
-			case 'c':
-				return FlowRouter.path('channel', {
-					name: this.name
-				});
-			case 'p':
-				return FlowRouter.path('group', {
-					name: this.name
-				});
-			case 'd':
-				return FlowRouter.path('direct', {
-					username: this.name
-				});
-		}
-	}
-});
-
-Template.privateHistory.events({
-	'keydown #history-filter'(event) {
-		if (event.which === 13) {
-			event.stopPropagation();
-			return event.preventDefault();
-		}
-	},
-	'keyup #history-filter'(event) {
-		event.stopPropagation();
-		event.preventDefault();
-		return Session.set('historyFilter', event.currentTarget.value);
-	}
-});
diff --git a/packages/rocketchat-ui/package.js b/packages/rocketchat-ui/package.js
index 6eaee63c0ff7..68782079277d 100644
--- a/packages/rocketchat-ui/package.js
+++ b/packages/rocketchat-ui/package.js
@@ -90,7 +90,6 @@ Package.onUse(function(api) {
 	api.addFiles('client/views/app/popout.html', 'client');
 	api.addFiles('client/views/app/alerts.html', 'client');
 
-	api.addFiles('client/views/app/privateHistory.html', 'client');
 	api.addFiles('client/views/app/room.html', 'client');
 	api.addFiles('client/views/app/roomSearch.html', 'client');
 	api.addFiles('client/views/app/secretURL.html', 'client');
@@ -110,7 +109,6 @@ Package.onUse(function(api) {
 	api.addFiles('client/views/app/fullModal.js', 'client');
 	api.addFiles('client/views/app/home.js', 'client');
 	api.addFiles('client/views/app/directory.js', 'client');
-	api.addFiles('client/views/app/privateHistory.js', 'client');
 	api.addFiles('client/views/app/room.js', 'client');
 	api.addFiles('client/views/app/roomSearch.js', 'client');
 	api.addFiles('client/views/app/secretURL.js', 'client');
diff --git a/server/publications/privateHistory.js b/server/publications/privateHistory.js
deleted file mode 100644
index 47aca4ae7c25..000000000000
--- a/server/publications/privateHistory.js
+++ /dev/null
@@ -1,16 +0,0 @@
-Meteor.publish('privateHistory', function() {
-	if (!this.userId) {
-		return this.ready();
-	}
-
-	return RocketChat.models.Rooms.findByContainingUsername(RocketChat.models.Users.findOneById(this.userId).username, {
-		fields: {
-			t: 1,
-			name: 1,
-			msgs: 1,
-			ts: 1,
-			lm: 1,
-			cl: 1
-		}
-	});
-});

From 4d5e6d2fe367ccb6d22d7296f015cad3d48d5d94 Mon Sep 17 00:00:00 2001
From: Guilherme Gazzo <guilhermegazzo@gmail.com>
Date: Mon, 12 Mar 2018 12:10:06 -0300
Subject: [PATCH 13/20] Update init.js

---
 packages/rocketchat-reactions/client/init.js | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/packages/rocketchat-reactions/client/init.js b/packages/rocketchat-reactions/client/init.js
index 040caa413e9a..115cb80b8266 100644
--- a/packages/rocketchat-reactions/client/init.js
+++ b/packages/rocketchat-reactions/client/init.js
@@ -45,13 +45,8 @@ Meteor.startup(function() {
 			'message-mobile'
 		],
 		action(event) {
-			const data = Blaze.getData(event.currentTarget);
-
 			event.stopPropagation();
-
-			RocketChat.EmojiPicker.open(event.currentTarget, (emoji) => {
-				Meteor.call('setReaction', `:${ emoji }:`, data._arguments[1]._id);
-			});
+			RocketChat.EmojiPicker.open(event.currentTarget, emoji => Meteor.call('setReaction', `:${ emoji }:`, this._arguments[1]._id));
 		},
 		condition(message) {
 			const room = RocketChat.models.Rooms.findOne({ _id: message.rid });

From 06931ecd5d6c4755bcdc94b82234c48035414f77 Mon Sep 17 00:00:00 2001
From: Renato Becker <renato.augusto.becker@gmail.com>
Date: Tue, 13 Mar 2018 10:29:27 -0300
Subject: [PATCH 14/20] Support for agent's phone field has been added.

---
 packages/rocketchat-livechat/.app/client/views/messages.js | 4 +++-
 packages/rocketchat-livechat/server/models/Users.js        | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/rocketchat-livechat/.app/client/views/messages.js b/packages/rocketchat-livechat/.app/client/views/messages.js
index 9d298fa207cf..f27e7d00f2d3 100644
--- a/packages/rocketchat-livechat/.app/client/views/messages.js
+++ b/packages/rocketchat-livechat/.app/client/views/messages.js
@@ -79,7 +79,9 @@ Template.messages.helpers({
 			agentData.email = agent.emails[0].address;
 		}
 
-		if (agent.customFields && agent.customFields.phone) {
+		if (agent.phone && agent.phone.length > 0) {
+			agentData.phone = agent.phone[0].phoneNumber;
+		} else if (agent.customFields && agent.customFields.phone) {
 			agentData.phone = agent.customFields.phone;
 		}
 
diff --git a/packages/rocketchat-livechat/server/models/Users.js b/packages/rocketchat-livechat/server/models/Users.js
index 65a8142a1b75..55f7c8799c07 100644
--- a/packages/rocketchat-livechat/server/models/Users.js
+++ b/packages/rocketchat-livechat/server/models/Users.js
@@ -167,6 +167,7 @@ RocketChat.models.Users.getAgentInfo = function(agentId) {
 		fields: {
 			name: 1,
 			username: 1,
+			phone: 1,
 			customFields: 1
 		}
 	};

From 9137b80fd6ef01f3b0053591c149eba35ad9d711 Mon Sep 17 00:00:00 2001
From: Marcos Defendi <marcos.defendi@ulbra.inf.br>
Date: Tue, 13 Mar 2018 17:53:01 -0300
Subject: [PATCH 15/20] Added GET/POST channels.notifications

---
 packages/rocketchat-api/server/v1/channels.js | 41 ++++++++
 .../methods/saveNotificationSettings.js       | 68 ++++++++------
 tests/end-to-end/api/02-channels.js           | 94 ++++++++++++++-----
 3 files changed, 152 insertions(+), 51 deletions(-)

diff --git a/packages/rocketchat-api/server/v1/channels.js b/packages/rocketchat-api/server/v1/channels.js
index d7bdac522d12..c288f096af6f 100644
--- a/packages/rocketchat-api/server/v1/channels.js
+++ b/packages/rocketchat-api/server/v1/channels.js
@@ -795,3 +795,44 @@ RocketChat.API.v1.addRoute('channels.unarchive', { authRequired: true }, {
 		return RocketChat.API.v1.success();
 	}
 });
+
+RocketChat.API.v1.addRoute('channels.notifications', { authRequired: true }, {
+	get() {
+		const removeUnusedProperties = (subscription) => {
+			delete subscription._user;
+			delete subscription.$loki;
+			delete subscription._room;
+
+			return subscription;
+		};
+		const { roomId } = this.requestParams();
+
+		if (!roomId) {
+			return RocketChat.API.v1.failure('The \'roomId\' param is required');
+		}
+
+		const subscription = RocketChat.models.Subscriptions.findOneByRoomIdAndUserId(roomId, this.userId);
+
+		return RocketChat.API.v1.success({
+			subscription: removeUnusedProperties(Object.assign({}, subscription))
+		});
+	},
+	post() {
+		const saveNotifications = (notifications, roomId) => {
+			Object.keys(notifications).map((notificationKey) => {
+				Meteor.runAsUser(this.userId, () => Meteor.call('saveNotificationSettings', roomId, notificationKey, notifications[notificationKey]));
+			});
+		};
+		const { roomId, notifications } = this.bodyParams;
+
+		if (!roomId) {
+			return RocketChat.API.v1.failure('The \'roomId\' param is required');
+		}
+
+		if (!notifications || Object.keys(notifications).length === 0) {
+			return RocketChat.API.v1.failure('The \'notifications\' param is required');
+		}
+
+		saveNotifications(notifications, roomId);
+	}
+});
diff --git a/packages/rocketchat-push-notifications/server/methods/saveNotificationSettings.js b/packages/rocketchat-push-notifications/server/methods/saveNotificationSettings.js
index 365d0b3f6c52..4ecbc573dbe8 100644
--- a/packages/rocketchat-push-notifications/server/methods/saveNotificationSettings.js
+++ b/packages/rocketchat-push-notifications/server/methods/saveNotificationSettings.js
@@ -1,49 +1,59 @@
 Meteor.methods({
-	saveNotificationSettings(rid, field, value) {
+	saveNotificationSettings(roomId, field, value) {
 		if (!Meteor.userId()) {
 			throw new Meteor.Error('error-invalid-user', 'Invalid user', { method: 'saveNotificationSettings' });
 		}
-
-		check(rid, String);
+		check(roomId, String);
 		check(field, String);
 		check(value, String);
 
-		if (['audioNotifications', 'desktopNotifications', 'mobilePushNotifications', 'emailNotifications', 'unreadAlert', 'disableNotifications', 'hideUnreadStatus'].indexOf(field) === -1) {
+		const notifications = {
+			'audioNotifications': {
+				updateMethod: (subscription, value) => RocketChat.models.Subscriptions.updateAudioNotificationsById(subscription._id, value)
+			},
+			'desktopNotifications': {
+				updateMethod: (subscription, value) => RocketChat.models.Subscriptions.updateDesktopNotificationsById(subscription._id, value)
+			},
+			'mobilePushNotifications': {
+				updateMethod: (subscription, value) => RocketChat.models.Subscriptions.updateMobilePushNotificationsById(subscription._id, value)
+			},
+			'emailNotifications': {
+				updateMethod: (subscription, value) => RocketChat.models.Subscriptions.updateEmailNotificationsById(subscription._id, value)
+			},
+			'unreadAlert': {
+				updateMethod: (subscription, value) => RocketChat.models.Subscriptions.updateUnreadAlertById(subscription._id, value)
+			},
+			'disableNotifications': {
+				updateMethod: (subscription, value) => RocketChat.models.Subscriptions.updateDisableNotificationsById(subscription._id, value === '1')
+			},
+			'hideUnreadStatus': {
+				updateMethod: (subscription, value) => RocketChat.models.Subscriptions.updateHideUnreadStatusById(subscription._id, value === '1')
+			},
+			'desktopNotificationDuration': {
+				updateMethod: (subscription, value) => RocketChat.models.Subscriptions.updateDesktopNotificationDurationById(subscription._id, value)
+			},
+			'audioNotificationValue': {
+				updateMethod: (subscription, value) => RocketChat.models.Subscriptions.updateAudioNotificationValueById(subscription._id, value)
+			}
+		};
+		const isInvalidNotification = !Object.keys(notifications).includes(field);
+		const basicValuesForNotifications = ['all', 'mentions', 'nothing', 'default'];
+		const fieldsMustHaveBasicValues = ['emailNotifications', 'audioNotifications', 'mobilePushNotifications'];
+
+		if (isInvalidNotification) {
 			throw new Meteor.Error('error-invalid-settings', 'Invalid settings field', { method: 'saveNotificationSettings' });
 		}
 
-		if (field !== 'hideUnreadStatus' && field !== 'disableNotifications' && ['all', 'mentions', 'nothing', 'default'].indexOf(value) === -1) {
+		if (fieldsMustHaveBasicValues.includes(field) && !basicValuesForNotifications.includes(value)) {
 			throw new Meteor.Error('error-invalid-settings', 'Invalid settings value', { method: 'saveNotificationSettings' });
 		}
 
-		const subscription = RocketChat.models.Subscriptions.findOneByRoomIdAndUserId(rid, Meteor.userId());
+		const subscription = RocketChat.models.Subscriptions.findOneByRoomIdAndUserId(roomId, Meteor.userId());
 		if (!subscription) {
 			throw new Meteor.Error('error-invalid-subscription', 'Invalid subscription', { method: 'saveNotificationSettings' });
 		}
 
-		switch (field) {
-			case 'audioNotifications':
-				RocketChat.models.Subscriptions.updateAudioNotificationsById(subscription._id, value);
-				break;
-			case 'desktopNotifications':
-				RocketChat.models.Subscriptions.updateDesktopNotificationsById(subscription._id, value);
-				break;
-			case 'mobilePushNotifications':
-				RocketChat.models.Subscriptions.updateMobilePushNotificationsById(subscription._id, value);
-				break;
-			case 'emailNotifications':
-				RocketChat.models.Subscriptions.updateEmailNotificationsById(subscription._id, value);
-				break;
-			case 'unreadAlert':
-				RocketChat.models.Subscriptions.updateUnreadAlertById(subscription._id, value);
-				break;
-			case 'disableNotifications':
-				RocketChat.models.Subscriptions.updateDisableNotificationsById(subscription._id, value === '1' ? true : false);
-				break;
-			case 'hideUnreadStatus':
-				RocketChat.models.Subscriptions.updateHideUnreadStatusById(subscription._id, value === '1' ? true : false);
-				break;
-		}
+		notifications[field].updateMethod(subscription, value);
 
 		return true;
 	},
diff --git a/tests/end-to-end/api/02-channels.js b/tests/end-to-end/api/02-channels.js
index 784263e7b8ce..e54cb844fffe 100644
--- a/tests/end-to-end/api/02-channels.js
+++ b/tests/end-to-end/api/02-channels.js
@@ -2,8 +2,20 @@
 /* globals expect */
 /* eslint no-unused-vars: 0 */
 
-import {getCredentials, api, login, request, credentials, apiEmail, apiUsername, targetUser, log, apiPublicChannelName, channel } from '../../data/api-data.js';
-import {adminEmail, password} from '../../data/user.js';
+import {
+	getCredentials,
+	api,
+	login,
+	request,
+	credentials,
+	apiEmail,
+	apiUsername,
+	targetUser,
+	log,
+	apiPublicChannelName,
+	channel
+} from '../../data/api-data.js';
+import { adminEmail, password } from '../../data/user.js';
 import supertest from 'supertest';
 
 function getRoomInfo(roomId) {
@@ -477,26 +489,6 @@ describe('[Channels]', function() {
 			.end(done);
 	});
 
-	it('/channels.leave', async(done) => {
-		const roomInfo = await getRoomInfo(channel._id);
-
-		request.post(api('channels.leave'))
-			.set(credentials)
-			.send({
-				roomId: channel._id
-			})
-			.expect('Content-Type', 'application/json')
-			.expect(200)
-			.expect((res) => {
-				expect(res.body).to.have.property('success', true);
-				expect(res.body).to.have.nested.property('channel._id');
-				expect(res.body).to.have.nested.property('channel.name', `EDITED${ apiPublicChannelName }`);
-				expect(res.body).to.have.nested.property('channel.t', 'c');
-				expect(res.body).to.have.nested.property('channel.msgs', roomInfo.channel.msgs + 1);
-			})
-			.end(done);
-	});
-
 	it('/channels.setType', async(done) => {
 		const roomInfo = await getRoomInfo(channel._id);
 
@@ -559,4 +551,62 @@ describe('[Channels]', function() {
 				.end(done);
 		});
 	});
+
+	it('GET /channels.notifications', (done) => {
+		request.get(api('channels.notifications'))
+			.set(credentials)
+			.query({
+				roomId: channel._id
+			})
+			.expect('Content-Type', 'application/json')
+			.expect(200)
+			.expect((res) => {
+				expect(res.body).to.have.property('success', true);
+				expect(res.body).to.have.property('subscription').and.to.be.an('object');
+			})
+			.end(done);
+	});
+
+	it('POST /channels.notifications', (done) => {
+		request.post(api('channels.notifications'))
+			.set(credentials)
+			.send({
+				roomId: channel._id,
+				notifications: {
+					disableNotifications: '0',
+					emailNotifications: 'nothing',
+					audioNotificationValue: 'beep',
+					desktopNotificationDuration: '2',
+					audioNotifications: 'all',
+					mobilePushNotifications: 'mentions'
+				}
+			})
+			.expect('Content-Type', 'application/json')
+			.expect(200)
+			.expect((res) => {
+				expect(res.body).to.have.property('success', true);
+			})
+			.end(done);
+
+		it('/channels.leave', async(done) => {
+			const roomInfo = await getRoomInfo(channel._id);
+
+			request.post(api('channels.leave'))
+				.set(credentials)
+				.send({
+					roomId: channel._id
+				})
+				.expect('Content-Type', 'application/json')
+				.expect(200)
+				.expect((res) => {
+					expect(res.body).to.have.property('success', true);
+					expect(res.body).to.have.nested.property('channel._id');
+					expect(res.body).to.have.nested.property('channel.name', `EDITED${ apiPublicChannelName }`);
+					expect(res.body).to.have.nested.property('channel.t', 'c');
+					expect(res.body).to.have.nested.property('channel.msgs', roomInfo.channel.msgs + 1);
+				})
+				.end(done);
+		});
+
+	});
 });

From cc36d54cfd53bc0992a6578a0d215f90d176af58 Mon Sep 17 00:00:00 2001
From: Utkarsh Barsaiyan <ubarsaiyan@gmail.com>
Date: Wed, 14 Mar 2018 03:35:34 +0530
Subject: [PATCH 16/20] Changes to ui when displaying reply preview with @
 mention popup

---
 .../client/imports/general/base_old.css       | 23 +++++++++++++++++++
 .../client/popup/messagePopup.html            |  2 +-
 .../client/popup/messagePopup.js              | 16 +++++++++++++
 3 files changed, 40 insertions(+), 1 deletion(-)

diff --git a/packages/rocketchat-theme/client/imports/general/base_old.css b/packages/rocketchat-theme/client/imports/general/base_old.css
index 91d7b45b32d2..6ec7acebce0b 100644
--- a/packages/rocketchat-theme/client/imports/general/base_old.css
+++ b/packages/rocketchat-theme/client/imports/general/base_old.css
@@ -2619,10 +2619,33 @@
     justify-content: space-between;
 }
 
+.rc-old .rc-message-box .reply-preview-with-popup {
+	border-top-left-radius: 0;
+	border-top-right-radius: 0;
+	border-bottom-left-radius: 5px;
+	border-bottom-left-radius: 5px;
+	box-shadow: 0 1px 5px 0 rgba(0, 0, 0, 0.2), 0 1px 1px rgba(0, 0, 0, 0.16);;
+}
+
 .rc-old .reply-preview .cancel-reply {
 	padding: 10px;
 }
 
+.rc-old .reply-preview .mention-link.mention-link-all {
+    color: #fff;
+}
+
+.rc-old .reply-preview .mention-link.mention-link-me {
+    color: #fff;
+}
+
+.rc-old .message-popup.popup-with-reply-preview {
+	border-top-left-radius: 5px;
+	border-top-right-radius: 5px;
+	border-bottom-left-radius: 0;
+	border-bottom-right-radius: 0;
+}
+
 .rc-old .message-popup {
 	position: absolute;
 	z-index: 101;
diff --git a/packages/rocketchat-ui-message/client/popup/messagePopup.html b/packages/rocketchat-ui-message/client/popup/messagePopup.html
index c250924a697a..daaf06982451 100644
--- a/packages/rocketchat-ui-message/client/popup/messagePopup.html
+++ b/packages/rocketchat-ui-message/client/popup/messagePopup.html
@@ -8,7 +8,7 @@
 			</ul>
 		{{else}}
 			<div class="message-popup-position">
-				<div class="message-popup content-background-color {{cls}}">
+				<div class="message-popup content-background-color {{cls}}" id="popup">
 					{{#if title}}
 						<div class="message-popup-title secondary-background-color border-component-color">
 							{{title}}
diff --git a/packages/rocketchat-ui-message/client/popup/messagePopup.js b/packages/rocketchat-ui-message/client/popup/messagePopup.js
index 2fd46a327a4a..31a6467455db 100644
--- a/packages/rocketchat-ui-message/client/popup/messagePopup.js
+++ b/packages/rocketchat-ui-message/client/popup/messagePopup.js
@@ -238,6 +238,22 @@ Template.messagePopup.onRendered(function() {
 	if (this.input == null) {
 		console.error('Input not found for popup');
 	}
+	const self = this;
+	self.autorun(() => {
+		const open = self.open.get();
+		if ($('.reply-preview').length) {
+			if (open === true) {
+				$('.reply-preview').addClass('reply-preview-with-popup');
+				setTimeout(() => {
+					$('#popup').addClass('popup-with-reply-preview');
+				}, 50);
+			}
+		}
+		if (open === false) {
+			$('.reply-preview').removeClass('reply-preview-with-popup');
+			$('#popup').removeClass('popup-with-reply-preview');
+		}
+	});
 	$(this.input).on('keyup', this.onInputKeyup.bind(this));
 	$(this.input).on('keydown', this.onInputKeydown.bind(this));
 	$(this.input).on('focus', this.onFocus.bind(this));

From 9832e406f05205ef4000b62d85f488138d1e005b Mon Sep 17 00:00:00 2001
From: Utkarsh Barsaiyan <ubarsaiyan@gmail.com>
Date: Fri, 16 Mar 2018 01:18:35 +0530
Subject: [PATCH 17/20] Indentation fix

---
 packages/rocketchat-ui-message/client/messageBox.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/rocketchat-ui-message/client/messageBox.js b/packages/rocketchat-ui-message/client/messageBox.js
index ded349712606..855e743c9f94 100644
--- a/packages/rocketchat-ui-message/client/messageBox.js
+++ b/packages/rocketchat-ui-message/client/messageBox.js
@@ -275,8 +275,8 @@ Template.messageBox.helpers({
 	},
 	dataReply() {
 		return Template.instance().dataReply.get();
-  },
-  isAudioMessageAllowed() {
+  	},
+  	isAudioMessageAllowed() {
 		return RocketChat.settings.get('FileUpload_Enabled') && RocketChat.settings.get('Message_AudioRecorderEnabled') && (!RocketChat.settings.get('FileUpload_MediaTypeWhiteList'));
 	}
 });

From 406719605f424868c02197c8f62c4cffc79955a6 Mon Sep 17 00:00:00 2001
From: Marcos Defendi <marcos.defendi@ulbra.inf.br>
Date: Thu, 15 Mar 2018 16:58:06 -0300
Subject: [PATCH 18/20] fix tests, changed the find way to retrieve
 subscription and fix validation to channels.notifications

---
 packages/rocketchat-api/server/v1/channels.js |  11 +-
 .../methods/saveNotificationSettings.js       |   2 +-
 tests/end-to-end/api/02-channels.js           | 116 +++++++++---------
 3 files changed, 61 insertions(+), 68 deletions(-)

diff --git a/packages/rocketchat-api/server/v1/channels.js b/packages/rocketchat-api/server/v1/channels.js
index c288f096af6f..479f4723d278 100644
--- a/packages/rocketchat-api/server/v1/channels.js
+++ b/packages/rocketchat-api/server/v1/channels.js
@@ -798,23 +798,16 @@ RocketChat.API.v1.addRoute('channels.unarchive', { authRequired: true }, {
 
 RocketChat.API.v1.addRoute('channels.notifications', { authRequired: true }, {
 	get() {
-		const removeUnusedProperties = (subscription) => {
-			delete subscription._user;
-			delete subscription.$loki;
-			delete subscription._room;
-
-			return subscription;
-		};
 		const { roomId } = this.requestParams();
 
 		if (!roomId) {
 			return RocketChat.API.v1.failure('The \'roomId\' param is required');
 		}
 
-		const subscription = RocketChat.models.Subscriptions.findOneByRoomIdAndUserId(roomId, this.userId);
+		const subscription = RocketChat.models.Subscriptions.findOne({}, {fields: {_room: 0, _user: 0, $loki: 0}});
 
 		return RocketChat.API.v1.success({
-			subscription: removeUnusedProperties(Object.assign({}, subscription))
+			subscription
 		});
 	},
 	post() {
diff --git a/packages/rocketchat-push-notifications/server/methods/saveNotificationSettings.js b/packages/rocketchat-push-notifications/server/methods/saveNotificationSettings.js
index 4ecbc573dbe8..1bf4ec2ac844 100644
--- a/packages/rocketchat-push-notifications/server/methods/saveNotificationSettings.js
+++ b/packages/rocketchat-push-notifications/server/methods/saveNotificationSettings.js
@@ -38,7 +38,7 @@ Meteor.methods({
 		};
 		const isInvalidNotification = !Object.keys(notifications).includes(field);
 		const basicValuesForNotifications = ['all', 'mentions', 'nothing', 'default'];
-		const fieldsMustHaveBasicValues = ['emailNotifications', 'audioNotifications', 'mobilePushNotifications'];
+		const fieldsMustHaveBasicValues = ['emailNotifications', 'audioNotifications', 'mobilePushNotifications', 'desktopNotifications'];
 
 		if (isInvalidNotification) {
 			throw new Meteor.Error('error-invalid-settings', 'Invalid settings field', { method: 'saveNotificationSettings' });
diff --git a/tests/end-to-end/api/02-channels.js b/tests/end-to-end/api/02-channels.js
index e54cb844fffe..a0196e8cfd33 100644
--- a/tests/end-to-end/api/02-channels.js
+++ b/tests/end-to-end/api/02-channels.js
@@ -489,6 +489,64 @@ describe('[Channels]', function() {
 			.end(done);
 	});
 
+	it('GET /channels.notifications', (done) => {
+		request.get(api('channels.notifications'))
+			.set(credentials)
+			.query({
+				roomId: channel._id
+			})
+			.expect('Content-Type', 'application/json')
+			.expect(200)
+			.expect((res) => {
+				expect(res.body).to.have.property('success', true);
+				expect(res.body).to.have.property('subscription').and.to.be.an('object');
+			})
+			.end(done);
+	});
+
+	it('POST /channels.notifications', (done) => {
+		request.post(api('channels.notifications'))
+			.set(credentials)
+			.send({
+				roomId: channel._id,
+				notifications: {
+					disableNotifications: '0',
+					emailNotifications: 'nothing',
+					audioNotificationValue: 'beep',
+					desktopNotifications: 'nothing',
+					desktopNotificationDuration: '2',
+					audioNotifications: 'all',
+					mobilePushNotifications: 'mentions'
+				}
+			})
+			.expect('Content-Type', 'application/json')
+			.expect(200)
+			.expect((res) => {
+				expect(res.body).to.have.property('success', true);
+			})
+			.end(done);
+	});
+
+	it('/channels.leave', async(done) => {
+		const roomInfo = await getRoomInfo(channel._id);
+
+		request.post(api('channels.leave'))
+			.set(credentials)
+			.send({
+				roomId: channel._id
+			})
+			.expect('Content-Type', 'application/json')
+			.expect(200)
+			.expect((res) => {
+				expect(res.body).to.have.property('success', true);
+				expect(res.body).to.have.nested.property('channel._id');
+				expect(res.body).to.have.nested.property('channel.name', `EDITED${ apiPublicChannelName }`);
+				expect(res.body).to.have.nested.property('channel.t', 'c');
+				expect(res.body).to.have.nested.property('channel.msgs', roomInfo.channel.msgs + 1);
+			})
+			.end(done);
+	});
+
 	it('/channels.setType', async(done) => {
 		const roomInfo = await getRoomInfo(channel._id);
 
@@ -551,62 +609,4 @@ describe('[Channels]', function() {
 				.end(done);
 		});
 	});
-
-	it('GET /channels.notifications', (done) => {
-		request.get(api('channels.notifications'))
-			.set(credentials)
-			.query({
-				roomId: channel._id
-			})
-			.expect('Content-Type', 'application/json')
-			.expect(200)
-			.expect((res) => {
-				expect(res.body).to.have.property('success', true);
-				expect(res.body).to.have.property('subscription').and.to.be.an('object');
-			})
-			.end(done);
-	});
-
-	it('POST /channels.notifications', (done) => {
-		request.post(api('channels.notifications'))
-			.set(credentials)
-			.send({
-				roomId: channel._id,
-				notifications: {
-					disableNotifications: '0',
-					emailNotifications: 'nothing',
-					audioNotificationValue: 'beep',
-					desktopNotificationDuration: '2',
-					audioNotifications: 'all',
-					mobilePushNotifications: 'mentions'
-				}
-			})
-			.expect('Content-Type', 'application/json')
-			.expect(200)
-			.expect((res) => {
-				expect(res.body).to.have.property('success', true);
-			})
-			.end(done);
-
-		it('/channels.leave', async(done) => {
-			const roomInfo = await getRoomInfo(channel._id);
-
-			request.post(api('channels.leave'))
-				.set(credentials)
-				.send({
-					roomId: channel._id
-				})
-				.expect('Content-Type', 'application/json')
-				.expect(200)
-				.expect((res) => {
-					expect(res.body).to.have.property('success', true);
-					expect(res.body).to.have.nested.property('channel._id');
-					expect(res.body).to.have.nested.property('channel.name', `EDITED${ apiPublicChannelName }`);
-					expect(res.body).to.have.nested.property('channel.t', 'c');
-					expect(res.body).to.have.nested.property('channel.msgs', roomInfo.channel.msgs + 1);
-				})
-				.end(done);
-		});
-
-	});
 });

From 25b125ec385d22ee6c74a92bdcea0a8350e1bbfa Mon Sep 17 00:00:00 2001
From: Utkarsh Barsaiyan <ubarsaiyan@gmail.com>
Date: Fri, 16 Mar 2018 01:40:43 +0530
Subject: [PATCH 19/20] Indentation fix

---
 packages/rocketchat-ui-message/client/messageBox.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/rocketchat-ui-message/client/messageBox.js b/packages/rocketchat-ui-message/client/messageBox.js
index 855e743c9f94..176ca033a624 100644
--- a/packages/rocketchat-ui-message/client/messageBox.js
+++ b/packages/rocketchat-ui-message/client/messageBox.js
@@ -275,8 +275,8 @@ Template.messageBox.helpers({
 	},
 	dataReply() {
 		return Template.instance().dataReply.get();
-  	},
-  	isAudioMessageAllowed() {
+	},
+	isAudioMessageAllowed() {
 		return RocketChat.settings.get('FileUpload_Enabled') && RocketChat.settings.get('Message_AudioRecorderEnabled') && (!RocketChat.settings.get('FileUpload_MediaTypeWhiteList'));
 	}
 });

From 81394e90fedd46f718da07bfe8f243f32fe5adae Mon Sep 17 00:00:00 2001
From: Marcos Defendi <marcos.defendi@ulbra.inf.br>
Date: Wed, 21 Mar 2018 11:14:16 -0300
Subject: [PATCH 20/20] fix find subscription method

---
 packages/rocketchat-api/server/v1/channels.js |  8 +++-
 .../server/models/Subscriptions.js            | 43 +++++++++++--------
 2 files changed, 32 insertions(+), 19 deletions(-)

diff --git a/packages/rocketchat-api/server/v1/channels.js b/packages/rocketchat-api/server/v1/channels.js
index 479f4723d278..35af717021da 100644
--- a/packages/rocketchat-api/server/v1/channels.js
+++ b/packages/rocketchat-api/server/v1/channels.js
@@ -804,7 +804,13 @@ RocketChat.API.v1.addRoute('channels.notifications', { authRequired: true }, {
 			return RocketChat.API.v1.failure('The \'roomId\' param is required');
 		}
 
-		const subscription = RocketChat.models.Subscriptions.findOne({}, {fields: {_room: 0, _user: 0, $loki: 0}});
+		const subscription = RocketChat.models.Subscriptions.findOneByRoomIdAndUserId(roomId, this.userId, {
+			fields: {
+				_room: 0,
+				_user: 0,
+				$loki: 0
+			}
+		});
 
 		return RocketChat.API.v1.success({
 			subscription
diff --git a/packages/rocketchat-lib/server/models/Subscriptions.js b/packages/rocketchat-lib/server/models/Subscriptions.js
index 726a0b4299c2..9e585150bf01 100644
--- a/packages/rocketchat-lib/server/models/Subscriptions.js
+++ b/packages/rocketchat-lib/server/models/Subscriptions.js
@@ -30,16 +30,16 @@ class ModelSubscriptions extends RocketChat.models._Base {
 
 
 	// FIND ONE
-	findOneByRoomIdAndUserId(roomId, userId) {
+	findOneByRoomIdAndUserId(roomId, userId, options) {
 		if (this.useCache) {
-			return this.cache.findByIndex('rid,u._id', [roomId, userId]).fetch();
+			return this.cache.findByIndex('rid,u._id', [roomId, userId], options).fetch();
 		}
 		const query = {
 			rid: roomId,
 			'u._id': userId
 		};
 
-		return this.findOne(query);
+		return this.findOne(query, options);
 	}
 
 	findOneByRoomNameAndUserId(roomName, userId) {
@@ -61,7 +61,7 @@ class ModelSubscriptions extends RocketChat.models._Base {
 		}
 
 		const query =
-			{'u._id': userId};
+			{ 'u._id': userId };
 
 		return this.find(query, options);
 	}
@@ -123,7 +123,7 @@ class ModelSubscriptions extends RocketChat.models._Base {
 		}
 
 		const query =
-			{rid: roomId};
+			{ rid: roomId };
 
 		return this.find(query, options);
 	}
@@ -140,7 +140,9 @@ class ModelSubscriptions extends RocketChat.models._Base {
 	}
 
 	getLastSeen(options) {
-		if (options == null) { options = {}; }
+		if (options == null) {
+			options = {};
+		}
 		const query = { ls: { $exists: 1 } };
 		options.sort = { ls: -1 };
 		options.limit = 1;
@@ -198,7 +200,7 @@ class ModelSubscriptions extends RocketChat.models._Base {
 	// UPDATE
 	archiveByRoomId(roomId) {
 		const query =
-			{rid: roomId};
+			{ rid: roomId };
 
 		const update = {
 			$set: {
@@ -213,7 +215,7 @@ class ModelSubscriptions extends RocketChat.models._Base {
 
 	unarchiveByRoomId(roomId) {
 		const query =
-			{rid: roomId};
+			{ rid: roomId };
 
 		const update = {
 			$set: {
@@ -311,7 +313,9 @@ class ModelSubscriptions extends RocketChat.models._Base {
 	}
 
 	setFavoriteByRoomIdAndUserId(roomId, userId, favorite) {
-		if (favorite == null) { favorite = true; }
+		if (favorite == null) {
+			favorite = true;
+		}
 		const query = {
 			rid: roomId,
 			'u._id': userId
@@ -328,7 +332,7 @@ class ModelSubscriptions extends RocketChat.models._Base {
 
 	updateNameAndAlertByRoomId(roomId, name, fname) {
 		const query =
-			{rid: roomId};
+			{ rid: roomId };
 
 		const update = {
 			$set: {
@@ -343,7 +347,7 @@ class ModelSubscriptions extends RocketChat.models._Base {
 
 	updateNameByRoomId(roomId, name) {
 		const query =
-			{rid: roomId};
+			{ rid: roomId };
 
 		const update = {
 			$set: {
@@ -356,7 +360,7 @@ class ModelSubscriptions extends RocketChat.models._Base {
 
 	setUserUsernameByUserId(userId, username) {
 		const query =
-			{'u._id': userId};
+			{ 'u._id': userId };
 
 		const update = {
 			$set: {
@@ -383,7 +387,9 @@ class ModelSubscriptions extends RocketChat.models._Base {
 	}
 
 	incUnreadForRoomIdExcludingUserId(roomId, userId, inc) {
-		if (inc == null) { inc = 1; }
+		if (inc == null) {
+			inc = 1;
+		}
 		const query = {
 			rid: roomId,
 			'u._id': {
@@ -447,6 +453,7 @@ class ModelSubscriptions extends RocketChat.models._Base {
 
 		return this.update(query, update, { multi: true });
 	}
+
 	setAlertForRoomIdExcludingUserId(roomId, userId) {
 		const query = {
 			rid: roomId,
@@ -522,7 +529,7 @@ class ModelSubscriptions extends RocketChat.models._Base {
 
 	updateTypeByRoomId(roomId, type) {
 		const query =
-			{rid: roomId};
+			{ rid: roomId };
 
 		const update = {
 			$set: {
@@ -535,7 +542,7 @@ class ModelSubscriptions extends RocketChat.models._Base {
 
 	addRoleById(_id, role) {
 		const query =
-			{_id};
+			{ _id };
 
 		const update = {
 			$addToSet: {
@@ -548,7 +555,7 @@ class ModelSubscriptions extends RocketChat.models._Base {
 
 	removeRoleById(_id, role) {
 		const query =
-			{_id};
+			{ _id };
 
 		const update = {
 			$pull: {
@@ -604,14 +611,14 @@ class ModelSubscriptions extends RocketChat.models._Base {
 	// REMOVE
 	removeByUserId(userId) {
 		const query =
-			{'u._id': userId};
+			{ 'u._id': userId };
 
 		return this.remove(query);
 	}
 
 	removeByRoomId(roomId) {
 		const query =
-			{rid: roomId};
+			{ rid: roomId };
 
 		return this.remove(query);
 	}