diff --git a/mozilla/webtools/bugzilla/.bzrrev b/mozilla/webtools/bugzilla/.bzrrev
index e8ea9e2a926..a909e20c8b4 100644
--- a/mozilla/webtools/bugzilla/.bzrrev
+++ b/mozilla/webtools/bugzilla/.bzrrev
@@ -1 +1 @@
-7546
\ No newline at end of file
+7547
\ No newline at end of file
diff --git a/mozilla/webtools/bugzilla/template/en/default/attachment/content-types.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/attachment/content-types.html.tmpl
deleted file mode 100644
index 471222ac45e..00000000000
--- a/mozilla/webtools/bugzilla/template/en/default/attachment/content-types.html.tmpl
+++ /dev/null
@@ -1,27 +0,0 @@
-[%# 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>
-  #%]
-
-          <option value="text/plain">plain text (text/plain)</option>
-          <option value="text/html">HTML source (text/html)</option>
-          <option value="application/xml">XML source (application/xml)</option>
-          <option value="image/gif">GIF image (image/gif)</option>
-          <option value="image/jpeg">JPEG image (image/jpeg)</option>
-          <option value="image/png">PNG image (image/png)</option>
-          <option value="application/octet-stream">binary file (application/octet-stream)</option>
diff --git a/mozilla/webtools/bugzilla/template/en/default/attachment/createformcontents.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/attachment/createformcontents.html.tmpl
index 9d2fa9f4894..42169796e91 100644
--- a/mozilla/webtools/bugzilla/template/en/default/attachment/createformcontents.html.tmpl
+++ b/mozilla/webtools/bugzilla/template/en/default/attachment/createformcontents.html.tmpl
@@ -72,7 +72,7 @@
       <label for="list">select from list</label>:
       <select name="contenttypeselection" id="contenttypeselection"
               onchange="this.form.contenttypemethod[1].checked = true;">
-        [% PROCESS "attachment/content-types.html.tmpl" %]
+        [% PROCESS content_types %]
       </select><br>
     <input type="radio" id="manual"
                  name="contenttypemethod" value="manual">
@@ -90,3 +90,19 @@
     [% END %]
   </td>
 </tr>
+
+[% BLOCK content_types %]
+  [% mimetypes = [{type => "text/plain", desc => "plain text"},
+                  {type => "text/html",  desc => "HTML source"},
+                  {type => "application/xml", desc => "XML source"},
+                  {type => "image/gif",  desc => "GIF image"},
+                  {type => "image/jpeg", desc => "JPEG image"},
+                  {type => "image/png",  desc => "PNG image"},
+                  {type => "application/octet-stream", desc => "binary file"}]
+  %]
+  [% Hook.process("mimetypes", "attachment/createformcontents.html.tmpl") %]
+
+  [% FOREACH m = mimetypes %]
+    <option value="[% m.type FILTER html %]">[% m.desc FILTER html %] ([% m.type FILTER html %])</option>
+  [% END %]
+[% END %]