--- a/mailnews/mime/src/nsCMSSecureMessage.cpp
+++ b/mailnews/mime/src/nsCMSSecureMessage.cpp
@@ -162,20 +162,16 @@ SendMessage(const char *msg, const char 
 
   cert = CERT_DecodeCertFromPackage((char *)certDER, derLen);
   if (!cert) {
     PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("nsCMSSecureMessage::SendMessage - can't decode cert from package\n"));
     rv = NS_ERROR_FAILURE;
     goto done;
   }
 
-#if 0
-  cert->dbhandle = CERT_GetDefaultCertDB();  /* work-around */
-#endif
-
   /* Step 2.  Get a signature cert */
 
   /* Step 3. Build inner (signature) content */
 
   /* Step 4. Build outer (enveloped) content */
   env = NSS_CMSEnvelopedData_Create(cmsMsg, SEC_OID_DES_EDE3_CBC, 0);
   if (!env) {
     PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("nsCMSSecureMessage::SendMessage - can't create envelope data\n"));