Index: mail/em-account-editor.c
===================================================================
--- mail/em-account-editor.c	(revision 34613)
+++ mail/em-account-editor.c	(working copy)
@@ -1900,12 +1900,11 @@
 	GtkWidget *w;
 
 	/* FIXME: how do we get the default value ever? */
-	w = g_object_new(gtk_check_button_get_type(),
-			 "label", text,
-			 "use_underline", TRUE,
-			 "active", camel_url_get_param(url, name) != NULL,
-			 NULL);
-	g_object_set_data((GObject *)w, "option-name", (void *)name);
+	
+	w = gtk_check_button_new_with_mnemonic (text);
+	gtk_toggle_button_set_active(w,camel_url_get_param(url,name)!=NULL);
+
+
 	g_signal_connect(w, "toggled", G_CALLBACK(emae_option_toggle_changed), service);
 	gtk_widget_show(w);
 
