diff --git a/mozilla/webtools/bugzilla/template/en/default/attachment/diff-footer.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/attachment/diff-footer.html.tmpl
index d263d9b8a65..49c662a9890 100644
--- a/mozilla/webtools/bugzilla/template/en/default/attachment/diff-footer.html.tmpl
+++ b/mozilla/webtools/bugzilla/template/en/default/attachment/diff-footer.html.tmpl
@@ -24,6 +24,9 @@
 
   <br>
 
+  [% PROCESS global/variables.none.tmpl %]
+  <span>Return to [% "$terms.bug $bugid" FILTER bug_link(bugid) FILTER none %]</span>
+
   [% PROCESS global/footer.html.tmpl %]
  
 [% ELSE %]
diff --git a/mozilla/webtools/bugzilla/template/en/default/attachment/diff-header.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/attachment/diff-header.html.tmpl
index 8dcd073f11c..663d9b76679 100644
--- a/mozilla/webtools/bugzilla/template/en/default/attachment/diff-header.html.tmpl
+++ b/mozilla/webtools/bugzilla/template/en/default/attachment/diff-header.html.tmpl
@@ -70,6 +70,7 @@ Interdiff of #[% oldid %] and #[% newid %] for [% terms.bug %] #[% bugid %]
     <a href="[% PROCESS viewurl id=attachid %]">View</a>
     | <a href="[% PROCESS editurl id=attachid %]">Details</a>
     | <a href="[% PROCESS diffurl id=attachid %]&amp;context=[% context FILTER url_quote %]&amp;collapsed=[% collapsed FILTER url_quote %]&amp;headers=[% headers FILTER url_quote %]&amp;format=raw">Raw&nbsp;Unified</a>
+    | Return to [% "$terms.bug $bugid" FILTER bug_link(bugid) FILTER none %]
   [% END %]
   [% IF other_patches.size > 0 %]
     [% IF headers %] |[%END%]
@@ -93,6 +94,7 @@ Interdiff of #[% oldid %] and #[% newid %] for [% terms.bug %] #[% bugid %]
 [% ELSE %]
   [% IF headers %]
     <a href="attachment.cgi?oldid=[% oldid %]&amp;newid=[% newid %]&amp;action=interdiff&amp;format=raw">Raw Unified</a>
+    | Return to [% "$terms.bug $bugid" FILTER bug_link(bugid) FILTER none %]
     |
   [% END %]
 [% END %]
diff --git a/mozilla/webtools/bugzilla/template/en/default/attachment/edit.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/attachment/edit.html.tmpl
index 1c6d22c8707..fadf3e3086e 100644
--- a/mozilla/webtools/bugzilla/template/en/default/attachment/edit.html.tmpl
+++ b/mozilla/webtools/bugzilla/template/en/default/attachment/edit.html.tmpl
@@ -215,7 +215,7 @@
 
   </table>
 
-  Attachments on this [% terms.Bug %]:
+  Attachments on [% "$terms.bug ${attachment.bug_id}" FILTER bug_link(attachment.bug_id) FILTER none %]:
   [% FOREACH a = attachments %]
     [% IF a == attachment.id %]
       [%+ a %]