diff --git a/webtools/bugzilla/template/default/attachment/created.atml b/webtools/bugzilla/template/default/attachment/created.atml
index f58884fdd666..49db040fecae 100644
--- a/webtools/bugzilla/template/default/attachment/created.atml
+++ b/webtools/bugzilla/template/default/attachment/created.atml
@@ -1,3 +1,23 @@
+[%# The contents of this file are subject to the Mozilla Public
+  # License Version 1.1 (the "License"); you may not use this file
+  # except in compliance with the License. You may obtain a copy of
+  # the License at http://www.mozilla.org/MPL/
+  #
+  # Software distributed under the License is distributed on an "AS
+  # IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+  # implied. See the License for the specific language governing
+  # rights and limitations under the License.
+  #
+  # The Original Code is the Bugzilla Bug Tracking System.
+  #
+  # The Initial Developer of the Original Code is Netscape Communications
+  # Corporation. Portions created by Netscape are
+  # Copyright (C) 1998 Netscape Communications Corporation. All
+  # Rights Reserved.
+  #
+  # Contributor(s): Myk Melez <myk@mozilla.org>
+  #%]
+
 [% INCLUDE global/header 
   title = "Changes Submitted"
   style = "th { text-align: left; }"
diff --git a/webtools/bugzilla/template/default/attachment/edit.atml b/webtools/bugzilla/template/default/attachment/edit.atml
index ee6d005e7a3e..e57d24aae40f 100755
--- a/webtools/bugzilla/template/default/attachment/edit.atml
+++ b/webtools/bugzilla/template/default/attachment/edit.atml
@@ -1,3 +1,23 @@
+[%# The contents of this file are subject to the Mozilla Public
+  # License Version 1.1 (the "License"); you may not use this file
+  # except in compliance with the License. You may obtain a copy of
+  # the License at http://www.mozilla.org/MPL/
+  #
+  # Software distributed under the License is distributed on an "AS
+  # IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+  # implied. See the License for the specific language governing
+  # rights and limitations under the License.
+  #
+  # The Original Code is the Bugzilla Bug Tracking System.
+  #
+  # The Initial Developer of the Original Code is Netscape Communications
+  # Corporation. Portions created by Netscape are
+  # Copyright (C) 1998 Netscape Communications Corporation. All
+  # Rights Reserved.
+  #
+  # Contributor(s): Myk Melez <myk@mozilla.org>
+  #%]
+
 [%# 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 %]
diff --git a/webtools/bugzilla/template/default/attachment/enter.atml b/webtools/bugzilla/template/default/attachment/enter.atml
index 8bbdd3a3a3aa..7d83e77bcab3 100644
--- a/webtools/bugzilla/template/default/attachment/enter.atml
+++ b/webtools/bugzilla/template/default/attachment/enter.atml
@@ -1,3 +1,23 @@
+[%# The contents of this file are subject to the Mozilla Public
+  # License Version 1.1 (the "License"); you may not use this file
+  # except in compliance with the License. You may obtain a copy of
+  # the License at http://www.mozilla.org/MPL/
+  #
+  # Software distributed under the License is distributed on an "AS
+  # IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+  # implied. See the License for the specific language governing
+  # rights and limitations under the License.
+  #
+  # The Original Code is the Bugzilla Bug Tracking System.
+  #
+  # The Initial Developer of the Original Code is Netscape Communications
+  # Corporation. Portions created by Netscape are
+  # Copyright (C) 1998 Netscape Communications Corporation. All
+  # Rights Reserved.
+  #
+  # Contributor(s): Myk Melez <myk@mozilla.org>
+  #%]
+
 [%# 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 %]
diff --git a/webtools/bugzilla/template/default/attachment/list.atml b/webtools/bugzilla/template/default/attachment/list.atml
index 9dd3931d0821..90306a65b557 100755
--- a/webtools/bugzilla/template/default/attachment/list.atml
+++ b/webtools/bugzilla/template/default/attachment/list.atml
@@ -1,3 +1,23 @@
+[%# The contents of this file are subject to the Mozilla Public
+  # License Version 1.1 (the "License"); you may not use this file
+  # except in compliance with the License. You may obtain a copy of
+  # the License at http://www.mozilla.org/MPL/
+  #
+  # Software distributed under the License is distributed on an "AS
+  # IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+  # implied. See the License for the specific language governing
+  # rights and limitations under the License.
+  #
+  # The Original Code is the Bugzilla Bug Tracking System.
+  #
+  # The Initial Developer of the Original Code is Netscape Communications
+  # Corporation. Portions created by Netscape are
+  # Copyright (C) 1998 Netscape Communications Corporation. All
+  # Rights Reserved.
+  #
+  # Contributor(s): Myk Melez <myk@mozilla.org>
+  #%]
+
 <br>
 <table cellspacing="0" cellpadding="4" border="1">
   <tr>
diff --git a/webtools/bugzilla/template/default/attachment/updated.atml b/webtools/bugzilla/template/default/attachment/updated.atml
index 7b52deebc573..9e511e13383e 100755
--- a/webtools/bugzilla/template/default/attachment/updated.atml
+++ b/webtools/bugzilla/template/default/attachment/updated.atml
@@ -1,16 +1,45 @@
+[%# The contents of this file are subject to the Mozilla Public
+  # License Version 1.1 (the "License"); you may not use this file
+  # except in compliance with the License. You may obtain a copy of
+  # the License at http://www.mozilla.org/MPL/
+  #
+  # Software distributed under the License is distributed on an "AS
+  # IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+  # implied. See the License for the specific language governing
+  # rights and limitations under the License.
+  #
+  # The Original Code is the Bugzilla Bug Tracking System.
+  #
+  # The Initial Developer of the Original Code is Netscape Communications
+  # Corporation. Portions created by Netscape are
+  # Copyright (C) 1998 Netscape Communications Corporation. All
+  # Rights Reserved.
+  #
+  # Contributor(s): Myk Melez <myk@mozilla.org>
+  #                 Gervase Markham <gerv@gerv.net>
+  #%]
+
 [% INCLUDE global/header 
   title = "Changes Submitted"
   style = "th { text-align: left; }"
 %]
 
-<p>
-  Your changes have been submitted for 
-  <a href="attachment.cgi?id=[% attachid %]&action=edit">attachment #[% attachid %]</a>
-  of <a href="show_bug.cgi?id=[% bugid %]">bug #[% bugid %]</a>.
-</p>
+<hr>
 
-[% mailresults %]
+<table border="1">
+  <tr>
+    <td>
+      <h2>Changes to 
+        <a href="attachment.cgi?id=[% attachid %]&action=edit">attachment [% attachid %]</a>
+        of bug [% bugid %] submitted
+      </h2>
+      [% mailresults %]
+    </td>
 
-<br>
+    <td>
+      <a href="show_bug.cgi?id=[% bugid %]">Back to Bug #[% bugid %]</a>
+    </td>
+  </tr>
+</table>
 
 [% INCLUDE global/footer %]
diff --git a/webtools/bugzilla/template/default/attachment/viewall.atml b/webtools/bugzilla/template/default/attachment/viewall.atml
index f7284b431d73..43aca60192fa 100755
--- a/webtools/bugzilla/template/default/attachment/viewall.atml
+++ b/webtools/bugzilla/template/default/attachment/viewall.atml
@@ -1,3 +1,23 @@
+[%# The contents of this file are subject to the Mozilla Public
+  # License Version 1.1 (the "License"); you may not use this file
+  # except in compliance with the License. You may obtain a copy of
+  # the License at http://www.mozilla.org/MPL/
+  #
+  # Software distributed under the License is distributed on an "AS
+  # IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+  # implied. See the License for the specific language governing
+  # rights and limitations under the License.
+  #
+  # The Original Code is the Bugzilla Bug Tracking System.
+  #
+  # The Initial Developer of the Original Code is Netscape Communications
+  # Corporation. Portions created by Netscape are
+  # Copyright (C) 1998 Netscape Communications Corporation. All
+  # Rights Reserved.
+  #
+  # Contributor(s): Myk Melez <myk@mozilla.org>
+  #%]
+
 [% INCLUDE global/header 
   title = "View All Attachments for Bug #$bugid"
   h1 = "View All Attachments for <a href=\"show_bug.cgi?id=$bugid\">Bug #$bugid</a>"
diff --git a/webtools/bugzilla/template/default/attachstatus/create.atml b/webtools/bugzilla/template/default/attachstatus/create.atml
index 602dab92e6ca..7387d82ade35 100755
--- a/webtools/bugzilla/template/default/attachstatus/create.atml
+++ b/webtools/bugzilla/template/default/attachstatus/create.atml
@@ -1,3 +1,23 @@
+[%# The contents of this file are subject to the Mozilla Public
+  # License Version 1.1 (the "License"); you may not use this file
+  # except in compliance with the License. You may obtain a copy of
+  # the License at http://www.mozilla.org/MPL/
+  #
+  # Software distributed under the License is distributed on an "AS
+  # IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+  # implied. See the License for the specific language governing
+  # rights and limitations under the License.
+  #
+  # The Original Code is the Bugzilla Bug Tracking System.
+  #
+  # The Initial Developer of the Original Code is Netscape Communications
+  # Corporation. Portions created by Netscape are
+  # Copyright (C) 1998 Netscape Communications Corporation. All
+  # Rights Reserved.
+  #
+  # Contributor(s): Myk Melez <myk@mozilla.org>
+  #%]
+
 [% INCLUDE global/header 
   title = "Create Attachment Status"
   style = "
diff --git a/webtools/bugzilla/template/default/attachstatus/edit.atml b/webtools/bugzilla/template/default/attachstatus/edit.atml
index 646e0f0bf3d9..a2200528ac05 100755
--- a/webtools/bugzilla/template/default/attachstatus/edit.atml
+++ b/webtools/bugzilla/template/default/attachstatus/edit.atml
@@ -1,3 +1,23 @@
+[%# The contents of this file are subject to the Mozilla Public
+  # License Version 1.1 (the "License"); you may not use this file
+  # except in compliance with the License. You may obtain a copy of
+  # the License at http://www.mozilla.org/MPL/
+  #
+  # Software distributed under the License is distributed on an "AS
+  # IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+  # implied. See the License for the specific language governing
+  # rights and limitations under the License.
+  #
+  # The Original Code is the Bugzilla Bug Tracking System.
+  #
+  # The Initial Developer of the Original Code is Netscape Communications
+  # Corporation. Portions created by Netscape are
+  # Copyright (C) 1998 Netscape Communications Corporation. All
+  # Rights Reserved.
+  #
+  # Contributor(s): Myk Melez <myk@mozilla.org>
+  #%]
+
 [% INCLUDE global/header 
   title = "Edit Attachment Status"
   style = "
diff --git a/webtools/bugzilla/template/default/attachstatus/list.atml b/webtools/bugzilla/template/default/attachstatus/list.atml
index acae5cd8d5c6..6828ea40c877 100755
--- a/webtools/bugzilla/template/default/attachstatus/list.atml
+++ b/webtools/bugzilla/template/default/attachstatus/list.atml
@@ -1,3 +1,23 @@
+[%# The contents of this file are subject to the Mozilla Public
+  # License Version 1.1 (the "License"); you may not use this file
+  # except in compliance with the License. You may obtain a copy of
+  # the License at http://www.mozilla.org/MPL/
+  #
+  # Software distributed under the License is distributed on an "AS
+  # IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+  # implied. See the License for the specific language governing
+  # rights and limitations under the License.
+  #
+  # The Original Code is the Bugzilla Bug Tracking System.
+  #
+  # The Initial Developer of the Original Code is Netscape Communications
+  # Corporation. Portions created by Netscape are
+  # Copyright (C) 1998 Netscape Communications Corporation. All
+  # Rights Reserved.
+  #
+  # Contributor(s): Myk Melez <myk@mozilla.org>
+  #%]
+
 [% INCLUDE global/header 
   title = 'Administer Attachment Statuses'
   message = message