3 files changed, 7 insertions, 3 deletions
diff --git a/template/en/default/attachment/create.html.tmpl b/template/en/default/attachment/create.html.tmpl
index f7cfe21f9..a298df5a9 100644
--- a/template/en/default/attachment/create.html.tmpl
+++ b/template/en/default/attachment/create.html.tmpl
@@ -21,7 +21,8 @@
 
 [%# Define strings that will serve as the title and header of this page %]
 [% title = BLOCK %]Create New Attachment for Bug #[% bugid %][% END %]
-[% h1 = BLOCK %]Create New Attachment for <a href="show_bug.cgi?id=[% bugid %]">Bug #[% bugid %]</a>[% END %]
+[% h1 = BLOCK %]Create New Attachment for
+  [%+ GetBugLink(bugid, "Bug $bugid") %][% END %]
 [% h2 = BLOCK %][% bugsummary FILTER html %][% END %]
 
 [% PROCESS global/header.html.tmpl 
diff --git a/template/en/default/attachment/edit.html.tmpl b/template/en/default/attachment/edit.html.tmpl
index 8cd92774b..57d99f766 100644
--- a/template/en/default/attachment/edit.html.tmpl
+++ b/template/en/default/attachment/edit.html.tmpl
@@ -21,7 +21,8 @@
 
 [%# Define strings that will serve as the title and header of this page %]
 [% title = BLOCK %]Edit Attachment #[% attachid %] for Bug #[% bugid %][% END %]
-[% h1 = BLOCK %]Edit Attachment #[% attachid %] for <a href="show_bug.cgi?id=[% bugid %]">Bug #[% bugid %]</a>[% END %]
+[% h1 = BLOCK %]Edit Attachment #[% attachid %] for
+  [%+ GetBugLink(bugid, "Bug $bugid") %][% END %]
 [% h2 = BLOCK %][% bugsummary FILTER html %][% END %]
 
 [% PROCESS global/header.html.tmpl 
diff --git a/template/en/default/attachment/show-multiple.html.tmpl b/template/en/default/attachment/show-multiple.html.tmpl
index 53149085a..b137504e5 100644
--- a/template/en/default/attachment/show-multiple.html.tmpl
+++ b/template/en/default/attachment/show-multiple.html.tmpl
@@ -20,9 +20,11 @@
   #%]
 
 [% filtered_summary = bugsummary FILTER html %]
+[% h1 = BLOCK %]View All Attachments for
+  [%+ GetBugLink(bugid, "Bug $bugid") %][% END %]
 [% PROCESS global/header.html.tmpl 
   title = "View All Attachments for Bug #$bugid"
-  h1 = "View All Attachments for <a href=\"show_bug.cgi?id=$bugid\">Bug #$bugid</a>"
+  h1 = h1
   h2 = filtered_summary
   style = "
     table.attachment_info th { text-align: right; vertical-align: top; }