diff --git a/mail/em-account-editor.c b/mail/em-account-editor.c
index 5e691c7..6837362 100644
--- a/mail/em-account-editor.c
+++ b/mail/em-account-editor.c
@@ -77,6 +77,8 @@
 
 #define d(x)
 
+int evo_light = FALSE;
+
 /* econfig item for the extra config hings */
 struct _receive_options_item {
 	EMConfigItem item;
@@ -196,6 +198,9 @@ static void
 emae_init(GObject *o)
 {
 	EMAccountEditor *emae = (EMAccountEditor *)o;
+	GConfClient *gconf = mail_config_get_gconf_client();
+
+	evo_light = g_getenv("DRUID_SCROLL") ? TRUE : FALSE;
 
 	emae->priv = g_malloc0(sizeof(*emae->priv));
 
@@ -1842,7 +1847,8 @@ emae_receive_page(EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, str
 	if (((EConfig *)gui->config)->type == E_CONFIG_DRUID) {
 		GladeXML *druidxml;
 		GtkWidget *page;
-
+		GtkWidget *scroll;
+		
 		gladefile = g_build_filename (EVOLUTION_GLADEDIR,
 					      "mail-config.glade",
 					      NULL);
@@ -1850,8 +1856,14 @@ emae_receive_page(EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, str
 		g_free (gladefile);
 
 		page = glade_xml_get_widget(druidxml, "source_page");
-
-		gtk_box_pack_start((GtkBox*)((GnomeDruidPageStandard *)page)->vbox, w, TRUE, TRUE, 0);
+		if (evo_light) {
+			scroll = gtk_scrolled_window_new (NULL, NULL);
+			gtk_scrolled_window_set_policy (scroll, GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+			gtk_scrolled_window_add_with_viewport (scroll, w);
+			gtk_widget_show (scroll);
+		} else
+			scroll = w;
+		gtk_box_pack_start((GtkBox*)((GnomeDruidPageStandard *)page)->vbox, scroll, TRUE, TRUE, 0);
 		w = page;
 		g_object_unref(druidxml);
 		gnome_druid_append_page((GnomeDruid *)parent, (GnomeDruidPage *)page);
@@ -2309,7 +2321,7 @@ emae_send_page(EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, struct
 	w = glade_xml_get_widget(xml, item->label);
 	if (((EConfig *)gui->config)->type == E_CONFIG_DRUID) {
 		GladeXML *druidxml;
-		GtkWidget *page;
+		GtkWidget *page, *scroll;
 
 		gladefile = g_build_filename (EVOLUTION_GLADEDIR,
 					      "mail-config.glade",
@@ -2318,8 +2330,14 @@ emae_send_page(EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, struct
 		g_free (gladefile);
 
 		page = glade_xml_get_widget(druidxml, "transport_page");
-
-		gtk_box_pack_start((GtkBox*)((GnomeDruidPageStandard *)page)->vbox, w, TRUE, TRUE, 0);
+		if (evo_light) {
+			scroll = gtk_scrolled_window_new (NULL, NULL);
+			gtk_scrolled_window_set_policy (scroll, GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+			gtk_scrolled_window_add_with_viewport (scroll, w);
+			gtk_widget_show (scroll);
+		} else
+			scroll = w;
+		gtk_box_pack_start((GtkBox*)((GnomeDruidPageStandard *)page)->vbox, scroll, TRUE, TRUE, 0);	
 		w = page;
 		g_object_unref(druidxml);
 		gnome_druid_append_page((GnomeDruid *)parent, (GnomeDruidPage *)page);
@@ -2699,7 +2717,8 @@ emae_check_complete(EConfig *ec, const char *pageid, void *data)
 			if (emae->priv->source.provider
 			    && emae->priv->extra_provider != emae->priv->source.provider) {
 				emae->priv->extra_provider = emae->priv->source.provider;
-				emae_auto_detect(emae);
+				if (!evo_light)
+					emae_auto_detect(emae);
 			}
 		} else if (!strcmp(pageid, "40.management")) {
 			if (!emae->priv->management_set) {
@@ -2878,14 +2897,15 @@ em_account_editor_construct(EMAccountEditor *emae, EAccount *account, em_account
 	emae->config = gui->config = ec;
 	l = NULL;
 	for (i=0;items[i].path;i++)
-		l = g_slist_prepend(l, &items[i]);
+		if (type ==  EMAE_NOTEBOOK || !evo_light || strncmp(items[i].path, "20.", 3) != 0)
+			l = g_slist_prepend(l, &items[i]);
 	e_config_add_items((EConfig *)ec, l, emae_commit, NULL, emae_free, emae);
 
 	/* This is kinda yuck, we're dynamically mapping from the 'old style' extensibility api to the new one */
 	l = NULL;
 	have = g_hash_table_new(g_str_hash, g_str_equal);
 	index = 20;
-	for (prov=gui->providers;prov;prov=g_list_next(prov)) {
+	for (prov=gui->providers;prov && (type == EMAE_NOTEBOOK || !evo_light);prov=g_list_next(prov)) {
 		CamelProviderConfEntry *entries = ((CamelProvider *)prov->data)->extra_conf;
 
 		for (i=0;entries && entries[i].type != CAMEL_PROVIDER_CONF_END;i++) {
diff --git a/plugins/startup-wizard/startup-wizard.c b/plugins/startup-wizard/startup-wizard.c
index 32cf21a..511f104 100644
--- a/plugins/startup-wizard/startup-wizard.c
+++ b/plugins/startup-wizard/startup-wizard.c
@@ -46,7 +46,7 @@ static EImportTargetHome *import_target;
 static EImportImporter *import_importer;
 static GtkWidget *import_dialog, *import_progress, *import_label;
 static GSList *import_iterator, *import_importers;
-
+extern int evo_light;
 static void
 startup_wizard_delete (void) {
 	gtk_main_quit ();
@@ -101,14 +101,24 @@ GtkWidget *
 startup_wizard_timezone_page (EPlugin *ep, EConfigHookItemFactoryData *hook_data)
 {
 	ETimezoneDialog *etd;
-	GtkWidget *page;
+	GtkWidget *page, *scroll;
 	icaltimezone *zone;
 	
 	etd = e_timezone_dialog_new ();
 	g_object_set_data (G_OBJECT (hook_data->config), IMPORT_TIMEZONE_DIALOG, etd);
 	
 	page = gnome_druid_page_standard_new_with_vals ("Timezone", NULL, NULL);
-	e_timezone_dialog_reparent (etd, GNOME_DRUID_PAGE_STANDARD (page)->vbox);
+ 	if (evo_light) {
+ 		scroll = gtk_scrolled_window_new (NULL, NULL);
+ 
+ 		gtk_scrolled_window_set_policy (scroll, GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+ 		gtk_box_pack_start((GtkBox*)((GnomeDruidPageStandard *)page)->vbox, scroll, TRUE, TRUE, 0);
+ 		gtk_scrolled_window_add_with_viewport (scroll, etd);
+ 		gtk_widget_show (scroll);		
+ 	} else
+ 		scroll = etd;
+ 
+ 	e_timezone_dialog_reparent (etd, scroll);
 
 	zone = calendar_config_get_icaltimezone	();
 	if (zone)
