diff --git a/mail/ChangeLog b/mail/ChangeLog
index 117309a71f..2d58b13ab2 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,5 +1,8 @@
 2000-07-06  Dan Winship  <danw@helixcode.com>
 
+	* main.c (main): gtkhtmllib_init is no more. Call gconf_init
+	directly instead.
+
 	* message-list.c (message_list_select_next): New function to
 	select the first message on or after the given row that meets
 	certain flag criteria.
diff --git a/mail/main.c b/mail/main.c
index 5457f8133d..abfd5f9f27 100644
--- a/mail/main.c
+++ b/mail/main.c
@@ -12,6 +12,7 @@
 #include <bonobo/bonobo-main.h>
 #include <bonobo/bonobo-object-directory.h>
 #include <glade/glade.h>
+#include <gconf/gconf.h>
 
 #include "e-util/e-gui-utils.h"
 #include "e-util/e-cursors.h"
@@ -74,7 +75,7 @@ main (int argc, char *argv [])
 #endif
 	init_corba (&argc, argv);
 	init_bonobo ();
-	gtkhtmllib_init (argc, argv);
+	gconf_init (argc, argv, NULL);
 
 	glade_gnome_init ();