diff --git a/layouts/v7/modules/Vtiger/AddCommentForm.tpl b/layouts/v7/modules/Vtiger/AddCommentForm.tpl
index 6c4117f168df6febd453880142cb5ae5dc7f1be3..e436d980a250800e1a7a2dd5d9588d6db78a7936 100644
--- a/layouts/v7/modules/Vtiger/AddCommentForm.tpl
+++ b/layouts/v7/modules/Vtiger/AddCommentForm.tpl
@@ -29,7 +29,7 @@
             <div class="modal-body">
                 <div class="container-fluid">
                     <div class="row commentTextArea" id="mass_action_add_comment">
-                        <textarea class="col-lg-12 mention_listener" name="commentcontent" id="commentcontent" rows="{$COMMENT_TEXTAREA_DEFAULT_ROWS}" placeholder="{vtranslate('LBL_WRITE_YOUR_COMMENT_HERE', $MODULE)}..." data-rule-required="true"></textarea>
+                        <textarea class="col-lg-12" name="commentcontent" id="commentcontent" rows="{$COMMENT_TEXTAREA_DEFAULT_ROWS}" placeholder="{vtranslate('LBL_WRITE_YOUR_COMMENT_HERE', $MODULE)}..." data-rule-required="true"></textarea>
                     </div>
                 </div>
             </div>
diff --git a/layouts/v7/modules/Vtiger/ShowAllComments.tpl b/layouts/v7/modules/Vtiger/ShowAllComments.tpl
index 48e85cf0b03b9fa58e041577d4d87cf86a06a4da..ec07af50a88fa12b4b4f7a303fddf8712559c2b7 100644
--- a/layouts/v7/modules/Vtiger/ShowAllComments.tpl
+++ b/layouts/v7/modules/Vtiger/ShowAllComments.tpl
@@ -18,7 +18,7 @@
 			<div class="commentTitle row">
 				<div class="addCommentBlock">
 					<div class="commentTextArea">
-						<textarea name="commentcontent" class="commentcontent form-control mention_listener"  placeholder="{vtranslate('LBL_POST_YOUR_COMMENT_HERE', $MODULE_NAME)}" rows="{$COMMENT_TEXTAREA_DEFAULT_ROWS}"></textarea>
+						<textarea name="commentcontent" class="commentcontent form-control"  placeholder="{vtranslate('LBL_POST_YOUR_COMMENT_HERE', $MODULE_NAME)}" rows="{$COMMENT_TEXTAREA_DEFAULT_ROWS}"></textarea>
 					</div>
 					<div class="row">
 						<div class="col-xs-4 pull-right">
diff --git a/layouts/v7/modules/Vtiger/resources/Detail.js b/layouts/v7/modules/Vtiger/resources/Detail.js
index f9659017aedcb4ab11b74d828f203bfd17ef69b8..8ca9532e75299469259aa7040897bb5a471ae34e 100644
--- a/layouts/v7/modules/Vtiger/resources/Detail.js
+++ b/layouts/v7/modules/Vtiger/resources/Detail.js
@@ -2006,7 +2006,6 @@ Vtiger.Class("Vtiger_Detail_Js",{
 		var detailContentsHolder = this.getContentHolder();
 		var clonedCommentBlock = jQuery('.basicEditCommentBlock',detailContentsHolder).clone(true,true).removeClass('basicEditCommentBlock hide').addClass('addCommentBlock');
 		clonedCommentBlock.find('.commentcontenthidden').removeClass('commentcontenthidden').addClass('commentcontent');
-		clonedCommentBlock.find('.commentcontent').addClass('mention_listener');
 		return clonedCommentBlock;
 	},
 
@@ -2018,7 +2017,6 @@ Vtiger.Class("Vtiger_Detail_Js",{
 		var detailContentsHolder = this.getContentHolder();
 		var clonedCommentBlock = jQuery('.basicAddCommentBlock',detailContentsHolder).clone(true,true).removeClass('basicAddCommentBlock hide').addClass('addCommentBlock');
 		clonedCommentBlock.find('.commentcontenthidden').removeClass('commentcontenthidden').addClass('commentcontent');
-		clonedCommentBlock.find('.commentcontent').addClass('mention_listener');
 		return clonedCommentBlock;
 	},
 
diff --git a/layouts/v7/modules/Vtiger/resources/Vtiger.js b/layouts/v7/modules/Vtiger/resources/Vtiger.js
index 8c61f1c603c98654c2bfcffc29cf122c9721e60c..be49cd56b87bd248b6a9dcd0eaa1a0f8a3a193e8 100644
--- a/layouts/v7/modules/Vtiger/resources/Vtiger.js
+++ b/layouts/v7/modules/Vtiger/resources/Vtiger.js
@@ -372,7 +372,6 @@ Vtiger.Class('Vtiger_Index_Js', {
 		this.registerMultiUpload();
 		this.registerHoverEventOnAttachment();
 		//this.addBodyScroll();
-		this.mentionerCallBack();
 		this.modulesMenuScrollbar();
 		Vtiger_Index_Js.registerActivityReminder();
 		//reference preview event registeration
@@ -1291,18 +1290,6 @@ Vtiger.Class('Vtiger_Index_Js', {
 		app.helper.showVerticalScroll(jQuery("#modnavigator #modules-menu"),{autoHideScrollbar:true});
 	},
 
-	mentionerCallBack: function() {
-		jQuery(document).on('textComplete:select', '.mention_listener', function(e, word, strategy) {
-			//First charecter is " " if user mentioned in the begining
-			//Removing it here
-			var value = $(e.currentTarget).val();
-			value = app.getDecodedValue(value);
-			if(value.charAt(0) === ' ') value = value.substr(1);
-			$(e.currentTarget).val(value);
-			Vtiger_Index_Js.hideNC = false;
-		});
-	},
-
 	registerChangeTemplateEvent: function (container, recordId) {
 		var sourceModule = container.find('#sourceModuleName').val();
 		var thisInstance = this;