diff --git a/security/manager/pki/resources/content/OthersOverlay.xul b/security/manager/pki/resources/content/OthersOverlay.xul
index 3285400d09f1..de89ac4f5175 100644
--- a/security/manager/pki/resources/content/OthersOverlay.xul
+++ b/security/manager/pki/resources/content/OthersOverlay.xul
@@ -66,9 +66,11 @@
       <button id="email_viewButton"
               label="&certmgr.view.label;"
               disabled="true" oncommand="viewCerts();"/>
+<!-- Not yet implemented
       <button id="email_editButton"
               label="&certmgr.edit.label;"
               disabled="true" oncommand="editCerts();"/>
+-->
 <!-- future - import a DER cert?
       <button id="email_addButton"
               label="&certmgr.add.label;"
diff --git a/security/manager/pki/resources/content/certManager.js b/security/manager/pki/resources/content/certManager.js
index 8f66650fd31b..6b64fc458f2b 100644
--- a/security/manager/pki/resources/content/certManager.js
+++ b/security/manager/pki/resources/content/certManager.js
@@ -244,8 +244,6 @@ function email_enableButtons()
   }
   var enableViewButton=document.getElementById('email_viewButton');
   enableViewButton.setAttribute("disabled",toggle);
-  var enableEditButton=document.getElementById('email_editButton');
-  enableEditButton.setAttribute("disabled",toggle);
   var enableDeleteButton=document.getElementById('email_deleteButton');
   enableDeleteButton.setAttribute("disabled",toggle);
 }