diff --git a/course/templates/course/grade-notify.txt b/course/templates/course/grade-notify.txt
index a71faecd567fff459646645db779e4bbf9b71b94..bfb9b97a46caf33732b02fa7f304d45643949e67 100644
--- a/course/templates/course/grade-notify.txt
+++ b/course/templates/course/grade-notify.txt
@@ -1,8 +1,6 @@
-{% load i18n %}{% blocktrans trimmed with username=user.get_email_appellation %}Dear {{username}},{% endblocktrans %}
+{% load i18n %}{% blocktrans trimmed with username=participation.user.get_email_appellation %}Dear {{username}},{% endblocktrans %}
 {% blocktrans with flow_id=flow_session.flow_id flow_id=flow_session.flow_id course_identifier=course.identifier feedback_text=feedback_text|safe %}
-You have a new notification regarding your work on the page with title
-'{{ page_title }}' in '{{ flow_id }}' of '{{ course_identifier }}'. The
-full text of the feedback follows.
+You have a new notification regarding your work on the page with title '{{ page_title }}' in '{{ flow_id }}' of '{{ course_identifier }}'. The full text of the feedback follows.
 -------------------------------------------------------------------
 {{ feedback_text }}
 -------------------------------------------------------------------
diff --git a/locale/zh_CN/LC_MESSAGES/django.po b/locale/zh_CN/LC_MESSAGES/django.po
index 0d8f4e193a49da5dfd8e1356fa747dfdca030437..cd8c82dbfd4fb229e27607c8a89b860523c16175 100644
--- a/locale/zh_CN/LC_MESSAGES/django.po
+++ b/locale/zh_CN/LC_MESSAGES/django.po
@@ -4025,8 +4025,8 @@ msgstr "提交并转到下一个session"
 #, python-format
 msgid ""
 "\n"
-"You have a new notification regarding your work on the page with title\n"
-"'%(page_title)s' in '%(flow_id)s' of '%(course_identifier)s'. The\n"
+"You have a new notification regarding your work on the page with title '%"
+"(page_title)s' in '%(flow_id)s' of '%(course_identifier)s'. The "
 "full text of the feedback follows.\n"
 "-------------------------------------------------------------------\n"
 "%(feedback_text)s\n"
@@ -4036,7 +4036,7 @@ msgid ""
 "\n"
 msgstr ""
 "\n"
-"    您有一个新的通知, 是关于您在标题为%(page_title)s的页面的回答(%"
+"    您有一个新的通知，是关于您在标题为%(page_title)s的页面的回答(%"
 "(course_identifier)s课程的%(flow_id)s). 反馈信息的全文如下：\n"
 "-------------------------------------------------------------------\n"
 "%(feedback_text)s\n"