From 3daf5207c8ca58f192381453bb61e5259d42780f Mon Sep 17 00:00:00 2001
From: Aaron Ogle <aaron@geekgonecrazy.com>
Date: Mon, 26 Jun 2017 16:31:58 -0500
Subject: [PATCH] [Fix] Don't @ mention when doing reply in DM

---
 packages/rocketchat-lib/client/MessageAction.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/rocketchat-lib/client/MessageAction.js b/packages/rocketchat-lib/client/MessageAction.js
index 5dd9021a8b6..bbab7c18590 100644
--- a/packages/rocketchat-lib/client/MessageAction.js
+++ b/packages/rocketchat-lib/client/MessageAction.js
@@ -103,7 +103,12 @@ Meteor.startup(function() {
 			const message = this._arguments[1];
 			const input = instance.find('.input-message');
 			const url = RocketChat.MessageAction.getPermaLink(message._id);
-			const text = `[ ](${ url }) @${ message.u.username } `;
+			let text = `[ ](${ url }) `;
+
+			if (Session.get('openedRoom').indexOf(Meteor.userId()) === -1) {
+				text += `@${ message.u.username }`
+			}
+
 			if (input.value) {
 				input.value += input.value.endsWith(' ') ? '' : ' ';
 			}