Index: camel/camel.c
===================================================================
--- camel/camel.c	(revision 10220)
+++ camel/camel.c	(working copy)
@@ -99,6 +99,15 @@
 		SSL_OptionSetDefault (SSL_ENABLE_TLS, PR_TRUE);
 		SSL_OptionSetDefault (SSL_V2_COMPATIBLE_HELLO, PR_TRUE /* maybe? */);
 
+		/* Rather than hardcoding the PKCS#11 provider list, we REALLY should
+		 * provide UI in Evolution to allow loading of custom PKCS#11 modules. */
+		SECMODModule * mod = SECMOD_LoadUserModule("library=/usr/lib/gnome-keyring/gnome-keyring-pkcs11.so name=GnomeKeyring", NULL, 0);
+		if (!mod) {
+			g_warning("Could not load PKCS#11 module for gnome-keyring");
+		} else {
+			g_warning("Loaded PKCS#11 provider for gnome-keyring: %p", mod);
+		}
+
 		g_free (nss_configdir);
 	}
 #endif /* HAVE_NSS */
