diff --git a/seahub/group/templates/group/add_member_email.html b/seahub/group/templates/group/add_member_email.html
index f5890e7db8..812c7dbb89 100644
--- a/seahub/group/templates/group/add_member_email.html
+++ b/seahub/group/templates/group/add_member_email.html
@@ -8,7 +8,7 @@
 <p style="color:#121214;font-size:14px;">{% trans "Hi, " %}</p>
 
 <p style="font-size:14px;color:#434144;">
-{% blocktrans with grp_name=group.group_name %}{{ email|email2nickname|escape }} invited you to join group {{ grp_name }} on {{ site_name }}: {% endblocktrans %}<br />
+{% blocktrans with grp_name=group.group_name escaped_nickname=email|email2nickname|escape %}{{ escaped_nickname }} invited you to join group {{ grp_name }} on {{ site_name }}: {% endblocktrans %}<br />
 {{ url_base }}{% url 'registration_register' %}?src={{ to_email }}
 </p>
 
diff --git a/seahub/templates/shared_link_email.html b/seahub/templates/shared_link_email.html
index bad01a1ccb..f0e5c99293 100644
--- a/seahub/templates/shared_link_email.html
+++ b/seahub/templates/shared_link_email.html
@@ -1,6 +1,6 @@
 {% extends 'email_base.html' %}
 
-{% load i18n %}
+{% load i18n seahub_tags %}
 
 {% block email_con %}
 
@@ -9,7 +9,7 @@
 <p style="color:#121214;font-size:14px;">{% trans "Hi," %}</p>
 
 <p style="font-size:14px;color:#434144;">
-{% blocktrans %}{{ email|email2nickname|escape }} shared a {{ file_shared_type }} <span style="font-weight:bold;">{{ file_shared_name}}</span> to you on {{ site_name }}:{% endblocktrans%} <br />
+{% blocktrans with escaped_nickname=email|email2nickname|escape %}{{ escaped_nickname }} shared a {{ file_shared_type }} <span style="font-weight:bold;">{{ file_shared_name}}</span> to you on {{ site_name }}:{% endblocktrans%} <br />
 <a href="{{ file_shared_link }}">{{ file_shared_link }}</a>
 </p>
 
diff --git a/seahub/templates/shared_upload_link_email.html b/seahub/templates/shared_upload_link_email.html
index da74b26d6c..75a816ce18 100644
--- a/seahub/templates/shared_upload_link_email.html
+++ b/seahub/templates/shared_upload_link_email.html
@@ -1,6 +1,6 @@
 {% extends 'email_base.html' %}
 
-{% load i18n %}
+{% load i18n seahub_tags %}
 
 {% block email_con %}
 {% autoescape off %}
@@ -8,7 +8,7 @@
 <p style="color:#121214;font-size:14px;">{% trans "Hi," %}</p>
 
 <p style="font-size:14px;color:#434144;">
-{% blocktrans %}{{ email|email2nickname|escape }} shared an upload link to you on {{ site_name }}.{% endblocktrans%}
+{% blocktrans with escaped_nickname=email|email2nickname|escape %}{{ escaped_nickname }} shared an upload link to you on {{ site_name }}.{% endblocktrans%}
 </p>
 
 <p style="font-size:14px;color:#434144;">
diff --git a/seahub/templates/sysadmin/user_add_email.html b/seahub/templates/sysadmin/user_add_email.html
index f6b85ad0ea..a0b97c1796 100644
--- a/seahub/templates/sysadmin/user_add_email.html
+++ b/seahub/templates/sysadmin/user_add_email.html
@@ -1,6 +1,6 @@
 {% extends 'email_base.html' %}
 
-{% load i18n %}
+{% load i18n seahub_tags %}
 
 {% block email_con %}
 
@@ -10,9 +10,9 @@
 
 <p style="font-size:14px;color:#434144;">
 {% if org %}
-{% blocktrans with org_name=org.org_name %}{{ user|email2nickname|escape }} invited you to join organization "{{ org_name }}" on {{ site_name }}.{% endblocktrans%}
+{% blocktrans with org_name=org.org_name escaped_nickname=user|email2nickname|escape %}{{ escaped_nickname }} invited you to join organization "{{ org_name }}" on {{ site_name }}.{% endblocktrans%}
 {% else %}
-{% blocktrans %}{{ user|email2nickname|escape }} invited you to join {{ site_name }}.{% endblocktrans%}
+{% blocktrans with escaped_nickname=user|email2nickname|escape %}{{ escaped_nickname }} invited you to join {{ site_name }}.{% endblocktrans%}
 {% endif %}
 </p>
 
diff --git a/seahub/templates/sysadmin/user_batch_add_email.html b/seahub/templates/sysadmin/user_batch_add_email.html
index fa55ec1816..6c06c5749d 100644
--- a/seahub/templates/sysadmin/user_batch_add_email.html
+++ b/seahub/templates/sysadmin/user_batch_add_email.html
@@ -1,6 +1,6 @@
 {% extends 'email_base.html' %}
 
-{% load i18n %}
+{% load i18n seahub_tags %}
 
 {% block email_con %}
 
@@ -9,7 +9,7 @@
 <p style="color:#121214;font-size:14px;">{% trans "Hi," %}</p>
 
 <p style="font-size:14px;color:#434144;">
-{% blocktrans %}{{ user|email2nickname|escape }} invited you to join {{ site_name }}.{% endblocktrans%}
+{% blocktrans with escaped_nickname=user|email2nickname|escape %}{{ escaped_nickname }} invited you to join {{ site_name }}.{% endblocktrans%}
 </p>
 
 <p style="font-size:14px;color:#434144;">