diff --git a/composer/ChangeLog b/composer/ChangeLog
index 1f4c44f112..4756cc06f6 100644
--- a/composer/ChangeLog
+++ b/composer/ChangeLog
@@ -1,3 +1,8 @@
+2004-12-07  Not Zed  <NotZed@Ximian.com>
+
+	* e-msg-composer.c: include camel-cipher-context.h so we build if
+	nss isn't available.
+
 2004-11-26  JP Rosevear  <jpr@novell.com>
 
 	* e-msg-composer.c (create_composer): get image from icon factory
diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c
index 9d0c6e7fa6..6284280373 100644
--- a/composer/e-msg-composer.c
+++ b/composer/e-msg-composer.c
@@ -105,6 +105,7 @@
 #include <camel/camel-multipart-signed.h>
 #include <camel/camel-multipart-encrypted.h>
 #include <camel/camel-string-utils.h>
+#include <camel/camel-cipher-context.h>
 #if defined (HAVE_NSS) && defined (SMIME_SUPPORTED)
 #include <camel/camel-smime-context.h>
 #endif