diff --git a/base/templatetags/seahub_tags.py b/base/templatetags/seahub_tags.py
index ac80022023..96cdc260e2 100644
--- a/base/templatetags/seahub_tags.py
+++ b/base/templatetags/seahub_tags.py
@@ -4,11 +4,13 @@ import re
 from datetime import datetime
 
 from django import template
+from django.utils.safestring import mark_safe
 
 from seahub.settings import FILEEXT_ICON_MAP
 from seahub.po import TRANSLATION_MAP
 from seahub.profile.models import Profile
 
+
 register = template.Library()
 
 @register.filter(name='tsstr_sec')
@@ -123,11 +125,11 @@ def url_target_blank(text):
     return text.replace('<a ', '<a target="_blank" ')
 url_target_blank.is_safe=True
 
-at_pattern = re.compile('(@\w+)', flags=re.U)
+at_pattern = re.compile(r'(\s|^)(@\w+)', flags=re.U)
 
 @register.filter(name='find_at')
 def find_at(text):
-    return at_pattern.sub(r'<span class="at-in-msg">\1</span>', text)
+    return at_pattern.sub(r'\1<span class="at-in-msg">\2</span>', text)
 find_at.is_safe=True
 
 @register.filter(name='short_email')
@@ -140,3 +142,11 @@ def short_email(email):
         return email
     else:
         return email[:idx]
+
+@register.filter(name='seahub_urlize')
+def seahub_urlize(value, autoescape=None):
+    """Converts URLs in plain text into clickable links."""
+    from seahub.base.utils import urlize
+    return mark_safe(urlize(value, nofollow=True, autoescape=autoescape))
+seahub_urlize.is_safe=True
+seahub_urlize.needs_autoescape = True
diff --git a/group/templates/group/group_info.html b/group/templates/group/group_info.html
index 9803b68813..f1e4186762 100644
--- a/group/templates/group/group_info.html
+++ b/group/templates/group/group_info.html
@@ -102,7 +102,7 @@
                 <a href="{{ SITE_ROOT }}profile/{{ msg.from_email }}/">{{ msg.from_email|email2nickname }}</a>
             </div>
             <div class="msg-bd">
-                <p>{{ msg.message|linebreaksbr|urlize|url_target_blank|find_at }}</p>
+                <p>{{ msg.message|linebreaksbr|seahub_urlize|find_at }}</p>
                 {% if msg.reply_cnt == 0 %}
                 <a class="reply op" href="#" data="{{ msg.id }}">回复</a>
                 {% else %}