Index: ChangeLog
===================================================================
--- ChangeLog	(revision 1552)
+++ ChangeLog	(working copy)
@@ -1,3 +1,10 @@
+2008-02-05  Milan Crha  <mcrha@redhat.com>
+
+	** Fix for bug #436628
+
+	* storage/exchange-component.c: (exchange_component_init):
+	Do not start in offline by default, but read from gconf user's choice.
+
 2008-01-29  Srinivasa Ragavan  <sragavan@novell.com>
 
 	* configure.in: Version bump for 2.21.91
Index: storage/exchange-component.c
===================================================================
--- storage/exchange-component.c	(revision 1552)
+++ storage/exchange-component.c	(working copy)
@@ -466,6 +466,8 @@
 exchange_component_init (ExchangeComponent *component)
 {
 	ExchangeComponentPrivate *priv;
+	GConfClient *client;
+	GConfValue *value;
 
 	priv = component->priv = g_new0 (ExchangeComponentPrivate, 1);
 
@@ -478,6 +480,14 @@
 	g_signal_connect (priv->config_listener, "exchange_account_removed",
 			  G_CALLBACK (config_listener_account_removed),
 			  component);
+
+	client = gconf_client_get_default ();
+	value = gconf_client_get (client, "/apps/evolution/shell/start_offline", NULL);
+
+	priv->linestatus = !(value && gconf_value_get_bool (value));
+
+	gconf_value_free (value);
+	g_object_unref (client);
 }
 
 BONOBO_TYPE_FUNC_FULL (ExchangeComponent, GNOME_Evolution_Component, PARENT_TYPE, exchange_component)
