diff --git a/mail/ChangeLog b/mail/ChangeLog
index fbae8149de..4d874a4210 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,9 @@
+2000-10-20  Dan Winship  <danw@helixcode.com>
+
+	* evolution-mail.oafinfo: Declare composer factory.
+
+	* main.c (main): Initialize it
+
 2000-10-19  Chris Toshok  <toshok@helixcode.com>
 
 	* message-list.c (nuke_uids): e-tree-model is now opaque.  use the
diff --git a/mail/GNOME_Evolution_Mail.oaf.in b/mail/GNOME_Evolution_Mail.oaf.in
index fda8e0ed6a..81edb07292 100644
--- a/mail/GNOME_Evolution_Mail.oaf.in
+++ b/mail/GNOME_Evolution_Mail.oaf.in
@@ -38,18 +38,6 @@
 
 </oaf_server>
 
-<oaf_server iid="OAFIID:evolution-executive-summary-component-factory:evolution-mail:be210cba-0eee-4def-84fa-643d50321217"
-	    type="exe"
-	    location="evolution-mail">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME:GenericFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-		       value="Factory for the Mail Summary component."/>
-</oaf_server>
-
 <oaf_server iid="OAFIID:evolution-shell-component:evolution-mail:d3cb3ed6-a654-4337-8aa0-f443751d6d1b"
             type="factory"
             location="OAFIID:evolution-shell-component-factory:evolution-mail:0ea887d5-622b-4b8c-b525-18aa1cbe18a6">
@@ -65,6 +53,18 @@
 		       value="evolution-inbox.png"/>
 </oaf_server>
 
+<oaf_server iid="OAFIID:evolution-executive-summary-component-factory:evolution-mail:be210cba-0eee-4def-84fa-643d50321217"
+	    type="exe"
+	    location="evolution-mail">
+
+	<oaf_attribute name="repo_ids" type="stringv">
+		<item value="IDL:GNOME:GenericFactory:1.0"/>
+	</oaf_attribute>
+
+	<oaf_attribute name="description" type="string"
+		       value="Factory for the Mail Summary component."/>
+</oaf_server>
+
 <oaf_server iid="OAFIID:evolution-executive-summary-component:evolution-mail:157f86b4-ff6a-4618-86b8-4789024c4043"
 	    type="factory"
 	    location="OAFIID:evolution-executive-summary-component-factory:evolution-mail:be210cba-0eee-4def-84fa-643d50321217">
@@ -77,4 +77,29 @@
 		       value="Evolution mail executive summary component."/>
 </oaf_server>
 
+<oaf_server iid="OAFIID:evolution-composer-factory:evolution-mail:fcfda393-60ee-485f-b782-e9323434bff3"
+	    type="exe"
+	    location="evolution-mail">
+
+	<oaf_attribute name="repo_ids" type="stringv">
+		<item value="IDL:GNOME:GenericFactory:1.0"/>
+	</oaf_attribute>
+
+	<oaf_attribute name="description" type="string"
+		       value="Factory for the Evolution composer."/>
+</oaf_server>
+
+<oaf_server iid="OAFIID:evolution-composer:evolution-mail:cd8618ea-53e1-4b9e-88cf-ec578bdb903b"
+	    type="factory"
+	    location="OAFIID:evolution-composer-factory:evolution-mail:fcfda393-60ee-485f-b782-e9323434bff3">
+
+	<oaf_attribute name="repo_ids" type="stringv">
+		<item value="IDL:Evolution:Composer:1.0"/>
+	</oaf_attribute>
+
+	<oaf_attribute name="description" type="string"
+		       value="Evolution mail composer."/>
+</oaf_server>
+
+
 </oaf_info>
diff --git a/mail/GNOME_Evolution_Mail.oafinfo b/mail/GNOME_Evolution_Mail.oafinfo
index fda8e0ed6a..81edb07292 100644
--- a/mail/GNOME_Evolution_Mail.oafinfo
+++ b/mail/GNOME_Evolution_Mail.oafinfo
@@ -38,18 +38,6 @@
 
 </oaf_server>
 
-<oaf_server iid="OAFIID:evolution-executive-summary-component-factory:evolution-mail:be210cba-0eee-4def-84fa-643d50321217"
-	    type="exe"
-	    location="evolution-mail">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME:GenericFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-		       value="Factory for the Mail Summary component."/>
-</oaf_server>
-
 <oaf_server iid="OAFIID:evolution-shell-component:evolution-mail:d3cb3ed6-a654-4337-8aa0-f443751d6d1b"
             type="factory"
             location="OAFIID:evolution-shell-component-factory:evolution-mail:0ea887d5-622b-4b8c-b525-18aa1cbe18a6">
@@ -65,6 +53,18 @@
 		       value="evolution-inbox.png"/>
 </oaf_server>
 
+<oaf_server iid="OAFIID:evolution-executive-summary-component-factory:evolution-mail:be210cba-0eee-4def-84fa-643d50321217"
+	    type="exe"
+	    location="evolution-mail">
+
+	<oaf_attribute name="repo_ids" type="stringv">
+		<item value="IDL:GNOME:GenericFactory:1.0"/>
+	</oaf_attribute>
+
+	<oaf_attribute name="description" type="string"
+		       value="Factory for the Mail Summary component."/>
+</oaf_server>
+
 <oaf_server iid="OAFIID:evolution-executive-summary-component:evolution-mail:157f86b4-ff6a-4618-86b8-4789024c4043"
 	    type="factory"
 	    location="OAFIID:evolution-executive-summary-component-factory:evolution-mail:be210cba-0eee-4def-84fa-643d50321217">
@@ -77,4 +77,29 @@
 		       value="Evolution mail executive summary component."/>
 </oaf_server>
 
+<oaf_server iid="OAFIID:evolution-composer-factory:evolution-mail:fcfda393-60ee-485f-b782-e9323434bff3"
+	    type="exe"
+	    location="evolution-mail">
+
+	<oaf_attribute name="repo_ids" type="stringv">
+		<item value="IDL:GNOME:GenericFactory:1.0"/>
+	</oaf_attribute>
+
+	<oaf_attribute name="description" type="string"
+		       value="Factory for the Evolution composer."/>
+</oaf_server>
+
+<oaf_server iid="OAFIID:evolution-composer:evolution-mail:cd8618ea-53e1-4b9e-88cf-ec578bdb903b"
+	    type="factory"
+	    location="OAFIID:evolution-composer-factory:evolution-mail:fcfda393-60ee-485f-b782-e9323434bff3">
+
+	<oaf_attribute name="repo_ids" type="stringv">
+		<item value="IDL:Evolution:Composer:1.0"/>
+	</oaf_attribute>
+
+	<oaf_attribute name="description" type="string"
+		       value="Evolution mail composer."/>
+</oaf_server>
+
+
 </oaf_info>
diff --git a/mail/evolution-mail.oafinfo b/mail/evolution-mail.oafinfo
index fda8e0ed6a..81edb07292 100644
--- a/mail/evolution-mail.oafinfo
+++ b/mail/evolution-mail.oafinfo
@@ -38,18 +38,6 @@
 
 </oaf_server>
 
-<oaf_server iid="OAFIID:evolution-executive-summary-component-factory:evolution-mail:be210cba-0eee-4def-84fa-643d50321217"
-	    type="exe"
-	    location="evolution-mail">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME:GenericFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-		       value="Factory for the Mail Summary component."/>
-</oaf_server>
-
 <oaf_server iid="OAFIID:evolution-shell-component:evolution-mail:d3cb3ed6-a654-4337-8aa0-f443751d6d1b"
             type="factory"
             location="OAFIID:evolution-shell-component-factory:evolution-mail:0ea887d5-622b-4b8c-b525-18aa1cbe18a6">
@@ -65,6 +53,18 @@
 		       value="evolution-inbox.png"/>
 </oaf_server>
 
+<oaf_server iid="OAFIID:evolution-executive-summary-component-factory:evolution-mail:be210cba-0eee-4def-84fa-643d50321217"
+	    type="exe"
+	    location="evolution-mail">
+
+	<oaf_attribute name="repo_ids" type="stringv">
+		<item value="IDL:GNOME:GenericFactory:1.0"/>
+	</oaf_attribute>
+
+	<oaf_attribute name="description" type="string"
+		       value="Factory for the Mail Summary component."/>
+</oaf_server>
+
 <oaf_server iid="OAFIID:evolution-executive-summary-component:evolution-mail:157f86b4-ff6a-4618-86b8-4789024c4043"
 	    type="factory"
 	    location="OAFIID:evolution-executive-summary-component-factory:evolution-mail:be210cba-0eee-4def-84fa-643d50321217">
@@ -77,4 +77,29 @@
 		       value="Evolution mail executive summary component."/>
 </oaf_server>
 
+<oaf_server iid="OAFIID:evolution-composer-factory:evolution-mail:fcfda393-60ee-485f-b782-e9323434bff3"
+	    type="exe"
+	    location="evolution-mail">
+
+	<oaf_attribute name="repo_ids" type="stringv">
+		<item value="IDL:GNOME:GenericFactory:1.0"/>
+	</oaf_attribute>
+
+	<oaf_attribute name="description" type="string"
+		       value="Factory for the Evolution composer."/>
+</oaf_server>
+
+<oaf_server iid="OAFIID:evolution-composer:evolution-mail:cd8618ea-53e1-4b9e-88cf-ec578bdb903b"
+	    type="factory"
+	    location="OAFIID:evolution-composer-factory:evolution-mail:fcfda393-60ee-485f-b782-e9323434bff3">
+
+	<oaf_attribute name="repo_ids" type="stringv">
+		<item value="IDL:Evolution:Composer:1.0"/>
+	</oaf_attribute>
+
+	<oaf_attribute name="description" type="string"
+		       value="Evolution mail composer."/>
+</oaf_server>
+
+
 </oaf_info>
diff --git a/mail/main.c b/mail/main.c
index e21982f465..88eab84fe4 100644
--- a/mail/main.c
+++ b/mail/main.c
@@ -27,6 +27,7 @@
 #include <gal/widgets/e-unicode.h>
 
 #include "component-factory.h"
+#include "composer/evolution-composer.h"
 #include "mail.h"
 
 static int blowup(int status)
@@ -79,6 +80,7 @@ main (int argc, char *argv [])
 	e_cursors_init ();
 
 	component_factory_init ();
+	evolution_composer_factory_init ();
 
 	signal (SIGSEGV, SIG_DFL);
 	signal (SIGBUS, SIG_DFL);