diff --git a/lib/redmine/acts/mentionable.rb b/lib/redmine/acts/mentionable.rb
index 35659661f..24adf04b3 100644
--- a/lib/redmine/acts/mentionable.rb
+++ b/lib/redmine/acts/mentionable.rb
@@ -98,11 +98,7 @@ module Redmine
           @([A-Za-z0-9_\-@\.]*?)
           (?=
             (?=[[:punct:]][^A-Za-z0-9_\/])|
-            ,|
-            \.+$|
             \s|
-            \]|
-            <|
             [[:punct:]]?
             $
           )