diff --git a/rhodecode/apps/repository/tests/test_repo_commit_comments.py b/rhodecode/apps/repository/tests/test_repo_commit_comments.py
--- a/rhodecode/apps/repository/tests/test_repo_commit_comments.py
+++ b/rhodecode/apps/repository/tests/test_repo_commit_comments.py
@@ -97,9 +97,10 @@ class TestRepoCommitCommentsView(TestCon
         comment_id = ChangesetComment.query().first().comment_id
         assert notification.type_ == Notification.TYPE_CHANGESET_COMMENT
 
-        sbj = 'left {0} on commit `{1}` in the {2} repository'.format(
-            comment_type, h.show_id(commit), backend.repo_name)
-        assert sbj in notification.subject
+        author = notification.created_by_user.username_and_name
+        sbj = '{0} left a {1} on commit `{2}` in the {3} repository'.format(
+            author, comment_type, h.show_id(commit), backend.repo_name)
+        assert sbj == notification.subject
 
         lnk = (u'/{0}/changeset/{1}#comment-{2}'.format(
             backend.repo_name, commit_id, comment_id))
@@ -150,12 +151,12 @@ class TestRepoCommitCommentsView(TestCon
         assert notification.type_ == Notification.TYPE_CHANGESET_COMMENT
 
         assert comment.revision == commit_id
-        sbj = 'left {comment_type} on commit `{commit}` ' \
-              '(file: `{f_path}`) in the {repo} repository'.format(
-            commit=h.show_id(commit),
-            f_path=f_path, line=line, repo=backend.repo_name,
-            comment_type=comment_type)
-        assert sbj in notification.subject
+
+        author = notification.created_by_user.username_and_name
+        sbj = '{0} left a {1} on file `{2}` in commit `{3}` in the {4} repository'.format(
+            author, comment_type, f_path, h.show_id(commit), backend.repo_name)
+
+        assert sbj == notification.subject
 
         lnk = (u'/{0}/changeset/{1}#comment-{2}'.format(
             backend.repo_name, commit_id, comment.comment_id))
@@ -222,10 +223,10 @@ class TestRepoCommitCommentsView(TestCon
         comment_id = ChangesetComment.query().first().comment_id
         assert notification.type_ == Notification.TYPE_CHANGESET_COMMENT
 
-        sbj = 'left note on commit `{0}` (status: Approved) ' \
-              'in the {1} repository'.format(
-            h.show_id(commit), backend.repo_name)
-        assert sbj in notification.subject
+        author = notification.created_by_user.username_and_name
+        sbj = '[status: Approved] {0} left a note on commit `{1}` in the {2} repository'.format(
+            author, h.show_id(commit), backend.repo_name)
+        assert sbj == notification.subject
 
         lnk = (u'/{0}/changeset/{1}#comment-{2}'.format(
             backend.repo_name, commit_id, comment_id))
@@ -283,7 +284,7 @@ class TestRepoCommitCommentsView(TestCon
         commit_id = '0' * 16  # fake this for tests
         response = self.app.post(
             route_path('repo_commit_comment_preview',
-                        repo_name=backend.repo_name, commit_id=commit_id,),
+                       repo_name=backend.repo_name, commit_id=commit_id,),
             params=params,
             extra_environ=xhr_header)
 
diff --git a/rhodecode/templates/email_templates/commit_comment.mako b/rhodecode/templates/email_templates/commit_comment.mako
--- a/rhodecode/templates/email_templates/commit_comment.mako
+++ b/rhodecode/templates/email_templates/commit_comment.mako
@@ -18,12 +18,12 @@ data = {
 ${_('[mention]') if mention else ''} \
 
 % if comment_file:
-    ${_('%(user)s left %(comment_type)s on commit `%(commit_id)s` (file: `%(comment_file)s`)') % data} ${_('in the %(repo_name)s repository') % data |n}
+    ${_('{user} left a {comment_type} on file `{comment_file}` in commit `{commit_id}`').format(**data)} ${_('in the {repo_name} repository').format(**data) |n}
 % else:
     % if status_change:
-    ${_('%(user)s left %(comment_type)s on commit `%(commit_id)s` (status: %(status)s)') % data |n} ${_('in the %(repo_name)s repository') % data |n}
+    ${_('[status: {status}] {user} left a {comment_type} on commit `{commit_id}`').format(**data) |n} ${_('in the {repo_name} repository').format(**data) |n}
     % else:
-    ${_('%(user)s left %(comment_type)s on commit `%(commit_id)s`') % data |n} ${_('in the %(repo_name)s repository') % data |n}
+    ${_('{user} left a {comment_type} on commit `{commit_id}`').format(**data) |n} ${_('in the {repo_name} repository').format(**data) |n}
     % endif
 % endif
 
@@ -49,7 +49,7 @@ data = {
 * ${_('Commit')}: ${h.show_id(commit)}
 
 %if comment_file:
-* ${_('File: %(comment_file)s on line %(comment_line)s') % data}
+* ${_('File: {comment_file} on line {comment_line}').format(**data)}
 %endif
 
 ---
@@ -79,9 +79,9 @@ data = {
     <tr><td colspan="2" style="width:100%;padding-bottom:15px;border-bottom:1px solid #dbd9da;">
 
     % if comment_file:
-        <h4><a href="${commit_comment_url}" style="color:#427cc9;text-decoration:none;cursor:pointer">${_('%(user)s commented on commit `%(commit_id)s` (file:`%(comment_file)s`)') % data}</a> ${_('in the %(repo)s repository') % data |n}</h4>
+        <h4><a href="${commit_comment_url}" style="color:#427cc9;text-decoration:none;cursor:pointer">${_('{user} left a {comment_type} on file `{comment_file}` in commit `{commit_id}`').format(**data)}</a> ${_('in the {repo} repository').format(**data) |n}</h4>
     % else:
-        <h4><a href="${commit_comment_url}" style="color:#427cc9;text-decoration:none;cursor:pointer">${_('%(user)s commented on commit `%(commit_id)s`') % data |n}</a> ${_('in the %(repo)s repository') % data |n}</h4>
+        <h4><a href="${commit_comment_url}" style="color:#427cc9;text-decoration:none;cursor:pointer">${_('{user} left a {comment_type} on commit `{commit_id}`').format(**data) |n}</a> ${_('in the {repo} repository').format(**data) |n}</h4>
     % endif
     </td></tr>
 
@@ -89,16 +89,19 @@ data = {
     <tr><td style="padding-right:20px;">${_('Description')}</td><td style="white-space:pre-wrap">${h.urlify_commit_message(commit.message, repo_name)}</td></tr>
 
     % if status_change:
-        <tr><td style="padding-right:20px;">${_('Status')}</td>
-            <td>${_('The commit status was changed to')}: ${base.status_text(status_change, tag_type=status_change_type)}</td>
+        <tr>
+            <td style="padding-right:20px;">${_('Status')}</td>
+            <td>
+                ${_('The commit status was changed to')}: ${base.status_text(status_change, tag_type=status_change_type)}
+            </td>
         </tr>
     % endif
     <tr>
         <td style="padding-right:20px;">
             % if comment_type == 'todo':
-                ${(_('TODO comment on line: %(comment_line)s') if comment_file else _('TODO comment')) % data}
+                ${(_('TODO comment on line: {comment_line}') if comment_file else _('TODO comment')).format(**data)}
             % else:
-                ${(_('Note comment on line: %(comment_line)s') if comment_file else _('Note comment')) % data}
+                ${(_('Note comment on line: {comment_line}') if comment_file else _('Note comment')).format(**data)}
             % endif
         </td>
         <td style="line-height:1.2em;white-space:pre-wrap">${h.render(comment_body, renderer=renderer_type, mentions=True)}</td></tr>
diff --git a/rhodecode/templates/email_templates/pull_request_comment.mako b/rhodecode/templates/email_templates/pull_request_comment.mako
--- a/rhodecode/templates/email_templates/pull_request_comment.mako
+++ b/rhodecode/templates/email_templates/pull_request_comment.mako
@@ -16,15 +16,15 @@ data = {
 }
 %>
 
-${_('[mention]') if mention else ''} \
+${(_('[mention]') if mention else '')} \
 
 % if comment_file:
-    ${_('%(user)s left %(comment_type)s on pull request #%(pr_id)s "%(pr_title)s" (file: `%(comment_file)s`)') % data |n}
+    ${_('{user} left a {comment_type} on file `{comment_file}` in pull request #{pr_id} "{pr_title}"').format(**data) |n}
 % else:
     % if status_change:
-    ${_('%(user)s left %(comment_type)s on pull request #%(pr_id)s "%(pr_title)s" (status: %(status)s)') % data |n}
+    ${_('[status: {status}] {user} left a {comment_type} on pull request #{pr_id} "{pr_title}"').format(**data) |n}
     % else:
-    ${_('%(user)s left %(comment_type)s on pull request #%(pr_id)s "%(pr_title)s"') % data |n}
+    ${_('{user} left a {comment_type} on pull request #{pr_id} "{pr_title}"').format(**data) |n}
     % endif
 % endif
 </%def>
@@ -49,18 +49,18 @@ data = {
 * ${_('Source repository')}: ${pr_source_repo_url}
 
 %if comment_file:
-* ${_('File: %(comment_file)s on line %(comment_line)s') % {'comment_file': comment_file, 'comment_line': comment_line}}
+* ${_('File: {comment_file} on line {comment_line}').format(comment_file=comment_file, comment_line=comment_line)}
 %endif
 
 ---
 
 %if status_change and not closing_pr:
-   ${_('%(user)s submitted pull request #%(pr_id)s status: *%(status)s*') % data}
+   ${_('{user} submitted pull request #{pr_id} status: *{status}*').format(**data)}
 %elif status_change and closing_pr:
-   ${_('%(user)s submitted pull request #%(pr_id)s status: *%(status)s and closed*') % data}
+   ${_('{user} submitted pull request #{pr_id} status: *{status} and closed*').format(**data)}
 %endif
 
-${comment_body|n}
+${comment_body |n}
 
 ${self.plaintext_footer()}
 </%def>
@@ -81,9 +81,9 @@ data = {
     <tr><td colspan="2" style="width:100%;padding-bottom:15px;border-bottom:1px solid #dbd9da;">
 
     % if comment_file:
-        <h4><a href="${pr_comment_url}" style="color:#427cc9;text-decoration:none;cursor:pointer">${_('%(user)s commented on pull request #%(pr_id)s "%(pr_title)s" (file:`%(comment_file)s`)') % data |n}</a></h4>
+        <h4><a href="${pr_comment_url}" style="color:#427cc9;text-decoration:none;cursor:pointer">${_('{user} left a {comment_type} on file `{comment_file}` in pull request #{pr_id} "{pr_title}"').format(**data) |n}</a></h4>
     % else:
-        <h4><a href="${pr_comment_url}" style="color:#427cc9;text-decoration:none;cursor:pointer">${_('%(user)s commented on pull request #%(pr_id)s "%(pr_title)s"') % data |n}</a></h4>
+        <h4><a href="${pr_comment_url}" style="color:#427cc9;text-decoration:none;cursor:pointer">${_('{user} left a {comment_type} on pull request #{pr_id} "{pr_title}"').format(**data) |n}</a></h4>
     % endif
 
     </td></tr>
@@ -104,9 +104,9 @@ data = {
     <tr>
         <td style="padding-right:20px;">
             % if comment_type == 'todo':
-                ${(_('TODO comment on line: %(comment_line)s') if comment_file else _('TODO comment')) % data}
+                ${(_('TODO comment on line: {comment_line}') if comment_file else _('TODO comment')).format(**data)}
             % else:
-                ${(_('Note comment on line: %(comment_line)s') if comment_file else _('Note comment')) % data}
+                ${(_('Note comment on line: {comment_line}') if comment_file else _('Note comment')).format(**data)}
             % endif
         </td>
         <td style="line-height:1.2em;white-space:pre-wrap">${h.render(comment_body, renderer=renderer_type, mentions=True)}</td>