diff --git a/config/config.mk b/config/config.mk
index fa5419ebd48..16972a55795 100644
--- a/config/config.mk
+++ b/config/config.mk
@@ -276,8 +276,15 @@ endif
 _ALL_META_COMPONENTS=mail crypto
 
 MOZ_META_COMPONENTS_mail = nsMsgBaseModule IMAP_factory nsVCardModule mime_services nsMimeEmitterModule nsMsgNewsModule  nsMsgComposeModule local_mail_services nsAbSyncModule nsImportServiceModule nsTextImportModule nsAbModule nsMsgDBModule
-MOZ_META_COMPONENTS_mail_comps = mailnews msgimap mime mimeemitter msgnews msgcompose localmail absyncsvc import addrbook impText vcard msgdb #smime
-MOZ_META_COMPONENTS_mail_libs = msgbaseutil
+MOZ_META_COMPONENTS_mail_comps = mailnews msgimap mime mimeemitter msgnews msgcompose localmail absyncsvc import addrbook impText vcard msgdb
+MOZ_META_COMPONENTS_mail_libs = msgbaseutil mimecthglue_s
+ifdef MOZ_PSM
+MOZ_META_COMPONENTS_mail += nsMsgSMIMEModule
+MOZ_META_COMPONENTS_mail_comps += msgsmime
+else
+MOZ_META_COMPONENTS_mail +=  nsSMIMEModule
+MOZ_META_COMPONENTS_mail_comps += smimestb
+endif
 
 MOZ_META_COMPONENTS_crypto = PKI NSS
 MOZ_META_COMPONENTS_crypto_comps = pippki pipnss