diff --git a/app/js/lib/ng_utils.js b/app/js/lib/ng_utils.js
index c1e2f61a..b60ba817 100644
--- a/app/js/lib/ng_utils.js
+++ b/app/js/lib/ng_utils.js
@@ -1391,7 +1391,7 @@ angular.module('izhukov.utils', [])
     }
 
     function parseMarkdown (text, entities) {
-      if (text.indexOf('`') == -1) {
+      if (text.indexOf('`') == -1 && text.indexOf('@') == -1) {
         return text.trim()
       }
       var raw = text
@@ -1433,6 +1433,7 @@ angular.module('izhukov.utils', [])
           })
           rawOffset -= 2
         } else if (match[10]) { // custom mention
+          console.log(match);
           newText.push(text)
           entities.push({
             _: 'messageEntityMentionName',
@@ -1455,6 +1456,8 @@ angular.module('izhukov.utils', [])
       if (!entities.length) {
         newText = newText.trim()
       }
+      console.warn(dT(), newText, entities);
+      // throw new Error(11);
       return newText
     }
 
diff --git a/app/js/messages_manager.js b/app/js/messages_manager.js
index a8c25c80..6c35ca11 100644
--- a/app/js/messages_manager.js
+++ b/app/js/messages_manager.js
@@ -1258,12 +1258,16 @@ angular.module('myApp.services')
       if (!options.viaBotID) {
         text = RichTextProcessor.parseMarkdown(text, entities)
       }
-      angular.forEach(entities, function (entity) {
-        if (entity._ == 'messageEntityMentionName') {
-          entity._ = 'inputMessageEntityMentionName'
-          entity.user_id = AppUsersManager.getUserInput(entity.user_id)
-        }
-      })
+      var sendEntites = entities
+      if (entities.length) {
+        sendEntites = angular.copy(entities)
+        angular.forEach(sendEntites, function (entity) {
+          if (entity._ == 'messageEntityMentionName') {
+            entity._ = 'inputMessageEntityMentionName'
+            entity.user_id = AppUsersManager.getUserInput(entity.user_id)
+          }
+        })
+      }
 
       if (!text.length) {
         return
@@ -1315,7 +1319,7 @@ angular.module('myApp.services')
         reply_to_msg_id: replyToMsgID,
         via_bot_id: options.viaBotID,
         reply_markup: options.reply_markup,
-        entities: entities,
+        entities: sendEntites,
         views: asChannel && 1,
         pending: true
       }