diff --git a/WebKit/scripts/helper/Core.js b/WebKit/scripts/helper/Core.js
index 01617d2..980c3d5 100644
--- a/WebKit/scripts/helper/Core.js
+++ b/WebKit/scripts/helper/Core.js
@@ -644,8 +644,7 @@ function(jQuery, Paths, URI, HostApp, Cache) {
 
         var text = node.innerHTML;
         var mentions_in_text = [];
-        var res = text.match(/(\^[\w:/.]+)/ig);
-
+        var res = text.match(/(\^[\w:/]+\.[\w:/.]+(?:[\w]))/ig);
         if (res) {
             for (var i = 0; i < res.length; i++) {
                 var name = res[i];
@@ -731,8 +730,8 @@ function(jQuery, Paths, URI, HostApp, Cache) {
             })
         }
         
-        var res = text.match(/(\^[\w:/]+\.[\w:/.]+)/ig);
-
+        var res = text.match(/(\^[\w:/]+\.[\w:/.]+(?:[\w]))/ig);
+       
         if (res) {
             for (var i = 0; i < res.length; i++) {
                 var e = res[i].substring(1);