diff --git a/kallithea/templates/email_templates/pull_request.html b/kallithea/templates/email_templates/pull_request.html
--- a/kallithea/templates/email_templates/pull_request.html
+++ b/kallithea/templates/email_templates/pull_request.html
@@ -12,12 +12,12 @@
                 ${_('Pull request from')}
                 <a style="${link_text_style}"
                    href="${pr_source_repo}">${pr_source_repo}</a>
-                ${_('at')}
+                ${_('branch')}
                 <span style="${data_style}">${pr_source_branch}</span>
                 ${_('to')}
                 <a style="${link_text_style}"
                    href="${pr_target_repo}">${pr_target_repo}</a>
-                ${_('at')}
+                ${_('branch')}
                 <span style="${data_style}">${pr_target_branch}</span>
             </div>
             <div>
diff --git a/kallithea/templates/email_templates/pull_request.txt b/kallithea/templates/email_templates/pull_request.txt
--- a/kallithea/templates/email_templates/pull_request.txt
+++ b/kallithea/templates/email_templates/pull_request.txt
@@ -5,11 +5,11 @@
 
 ${_('Pull request from')|n,unicode} \
 ${pr_source_repo|n,unicode} \
-${_('at')|n,unicode} \
+${_('branch')|n,unicode} \
 ${pr_source_branch|n,unicode} \
 ${_('to')|n,unicode} \
 ${pr_target_repo|n,unicode} \
-${_('at')|n,unicode} \
+${_('branch')|n,unicode} \
 ${pr_target_branch|n,unicode}:
 ${pr_nice_id|n,unicode} \
 "${pr_title|n,unicode}" \
diff --git a/kallithea/templates/email_templates/pull_request_comment.txt b/kallithea/templates/email_templates/pull_request_comment.txt
--- a/kallithea/templates/email_templates/pull_request_comment.txt
+++ b/kallithea/templates/email_templates/pull_request_comment.txt
@@ -7,11 +7,11 @@
 
 ${_('Pull request from')|n,unicode} \
 ${pr_source_repo|n,unicode} \
-${_('at')|n,unicode} \
+${_('branch')|n,unicode} \
 ${pr_source_branch|n,unicode} \
 ${_('to')|n,unicode} \
 ${pr_target_repo|n,unicode} \
-${_('at')|n,unicode} \
+${_('branch')|n,unicode} \
 ${pr_target_branch|n,unicode}:
 ${pr_nice_id|n,unicode} \
 "${pr_title|n,unicode}" \
diff --git a/kallithea/tests/models/test_dump_html_mails.ref.html b/kallithea/tests/models/test_dump_html_mails.ref.html
--- a/kallithea/tests/models/test_dump_html_mails.ref.html
+++ b/kallithea/tests/models/test_dump_html_mails.ref.html
@@ -891,7 +891,7 @@ Subject: [Review] repo/name PR #7 "The T
 Added as Reviewer of Pull Request #7 "The Title" by Requesting User (root)
 
 
-Pull request from https://dev.org/repo at devbranch to http://mainline.com/repo at trunk:
+Pull request from https://dev.org/repo branch devbranch to http://mainline.com/repo branch trunk:
 #7 "The Title" by u2 u3 (u2).
 
 
@@ -959,12 +959,12 @@ View Pull Request: http://pr.org/7
                 Pull request from
                 <a style="color:#202020;text-decoration:none;border:#ddd 1px solid;background:#f9f9f9"
                    href="https://dev.org/repo">https://dev.org/repo</a>
-                at
+                branch
                 <span style="border:#ddd 1px solid;background:#f9f9f9">devbranch</span>
                 to
                 <a style="color:#202020;text-decoration:none;border:#ddd 1px solid;background:#f9f9f9"
                    href="http://mainline.com/repo">http://mainline.com/repo</a>
-                at
+                branch
                 <span style="border:#ddd 1px solid;background:#f9f9f9">trunk</span>
             </div>
             <div>
@@ -1079,7 +1079,7 @@ Subject: [Review] repo/name PR #7 "The T
 Mention on Pull Request #7 "The Title" by Requesting User (root)
 
 
-Pull request from https://dev.org/repo at devbranch to http://mainline.com/repo at trunk:
+Pull request from https://dev.org/repo branch devbranch to http://mainline.com/repo branch trunk:
 #7 "The Title" by u2 u3 (u2).
 
 
@@ -1147,12 +1147,12 @@ View Pull Request: http://pr.org/7
                 Pull request from
                 <a style="color:#202020;text-decoration:none;border:#ddd 1px solid;background:#f9f9f9"
                    href="https://dev.org/repo">https://dev.org/repo</a>
-                at
+                branch
                 <span style="border:#ddd 1px solid;background:#f9f9f9">devbranch</span>
                 to
                 <a style="color:#202020;text-decoration:none;border:#ddd 1px solid;background:#f9f9f9"
                    href="http://mainline.com/repo">http://mainline.com/repo</a>
-                at
+                branch
                 <span style="border:#ddd 1px solid;background:#f9f9f9">trunk</span>
             </div>
             <div>
@@ -1274,7 +1274,7 @@ Me too!
  - and indented on second line
 
 
-Pull request from https://dev.org/repo at devbranch to http://mainline.com/repo at trunk:
+Pull request from https://dev.org/repo branch devbranch to http://mainline.com/repo branch trunk:
 #7 "The Title" by u2 u3 (u2).
 
 
@@ -1438,7 +1438,7 @@ Me too!
  - and indented on second line
 
 
-Pull request from https://dev.org/repo at devbranch to http://mainline.com/repo at trunk:
+Pull request from https://dev.org/repo branch devbranch to http://mainline.com/repo branch trunk:
 #7 "The Title" by u2 u3 (u2).
 
 
@@ -1604,7 +1604,7 @@ Me too!
  - and indented on second line
 
 
-Pull request from https://dev.org/repo at devbranch to http://mainline.com/repo at trunk:
+Pull request from https://dev.org/repo branch devbranch to http://mainline.com/repo branch trunk:
 #7 "The Title" by u2 u3 (u2).
 
 
@@ -1786,7 +1786,7 @@ Me too!
  - and indented on second line
 
 
-Pull request from https://dev.org/repo at devbranch to http://mainline.com/repo at trunk:
+Pull request from https://dev.org/repo branch devbranch to http://mainline.com/repo branch trunk:
 #7 "The Title" by u2 u3 (u2).
 
 
@@ -1968,7 +1968,7 @@ Me too!
  - and indented on second line
 
 
-Pull request from https://dev.org/repo at devbranch to http://mainline.com/repo at trunk:
+Pull request from https://dev.org/repo branch devbranch to http://mainline.com/repo branch trunk:
 #7 "The Title" by u2 u3 (u2).
 
 
@@ -2149,7 +2149,7 @@ Me too!
  - and indented on second line
 
 
-Pull request from https://dev.org/repo at devbranch to http://mainline.com/repo at trunk:
+Pull request from https://dev.org/repo branch devbranch to http://mainline.com/repo branch trunk:
 #7 "The Title" by u2 u3 (u2).
 
 
@@ -2332,7 +2332,7 @@ Me too!
  - and indented on second line
 
 
-Pull request from https://dev.org/repo at devbranch to http://mainline.com/repo at trunk:
+Pull request from https://dev.org/repo branch devbranch to http://mainline.com/repo branch trunk:
 #7 "The Title" by u2 u3 (u2).
 
 
@@ -2519,7 +2519,7 @@ Me too!
  - and indented on second line
 
 
-Pull request from https://dev.org/repo at devbranch to http://mainline.com/repo at trunk:
+Pull request from https://dev.org/repo branch devbranch to http://mainline.com/repo branch trunk:
 #7 "The Title" by u2 u3 (u2).