Coding style cleanups.

5 files changed, 215 insertions, 215 deletions

diff --git a/capplet/settings/anjal-mail-view.c b/capplet/settings/anjal-mail-view.c
index 6779e2e444..21a8f0a437 100644
--- a/capplet/settings/anjal-mail-view.c
+++ b/capplet/settings/anjal-mail-view.c
@@ -48,7 +48,7 @@ anjal_mail_view_init (AnjalMailView  *shell)
 static void
 anjal_mail_view_finalize (GObject *object)
 {
-	AnjalMailView *shell = (AnjalMailView *)object;
+	AnjalMailView *shell = (AnjalMailView *) object;
 	AnjalMailViewPrivate *priv = shell->priv;
 
 	g_free (priv);
diff --git a/capplet/settings/mail-account-view.c b/capplet/settings/mail-account-view.c
index cb5ded6b17..128e541f91 100644
--- a/capplet/settings/mail-account-view.c
+++ b/capplet/settings/mail-account-view.c
@@ -94,7 +94,7 @@ mail_account_view_init (MailAccountView  *shell)
 static void
 mail_account_view_finalize (GObject *object)
 {
-	MailAccountView *shell = (MailAccountView *)object;
+	MailAccountView *shell = (MailAccountView *) object;
 
 	g_free (shell->priv->username);
 
@@ -160,10 +160,10 @@ save_identity (MailAccountView *view)
 static gint
 validate_identity (MailAccountView *view)
 {
-	gchar *user = (gchar *)e_account_get_string (em_account_editor_get_modified_account (view->edit), E_ACCOUNT_ID_NAME);
-	gchar *email = (gchar *)e_account_get_string (em_account_editor_get_modified_account (view->edit), E_ACCOUNT_ID_ADDRESS);
+	gchar *user = (gchar *) e_account_get_string (em_account_editor_get_modified_account (view->edit), E_ACCOUNT_ID_NAME);
+	gchar *email = (gchar *) e_account_get_string (em_account_editor_get_modified_account (view->edit), E_ACCOUNT_ID_ADDRESS);
 	gchar *tmp;
-	const gchar *pwd = gtk_entry_get_text ((GtkEntry *)view->password);
+	const gchar *pwd = gtk_entry_get_text ((GtkEntry *) view->password);
 
 	if (!user || !*user)
 		return ERROR_NO_FULLNAME;
@@ -242,8 +242,8 @@ setup_yahoo_account (MailAccountView *mav)
 {
 	GConfClient *gconf = gconf_client_get_default ();
 
-	mav->priv->do_gcontacts = gtk_toggle_button_get_active ((GtkToggleButton *)mav->priv->gcontacts);
-	mav->priv->do_calendar = gtk_toggle_button_get_active ((GtkToggleButton *)mav->priv->calendar);
+	mav->priv->do_gcontacts = gtk_toggle_button_get_active ((GtkToggleButton *) mav->priv->gcontacts);
+	mav->priv->do_calendar = gtk_toggle_button_get_active ((GtkToggleButton *) mav->priv->calendar);
 
 	if (mav->priv->do_calendar) {
 		ESourceList *slist;
@@ -277,10 +277,10 @@ setup_yahoo_account (MailAccountView *mav)
 		sanitize_uname = sanitize_user_mail (email);
 
 		abs_uri = g_strdup_printf ("caldav://%s@caldav.calendar.yahoo.com/dav/%s/Calendar/%s/", sanitize_uname, email,  gtk_entry_get_text((GtkEntry *)mav->priv->yahoo_cal_entry));
-		e_passwords_add_password (abs_uri, gtk_entry_get_text ((GtkEntry *)mav->password));
+		e_passwords_add_password (abs_uri, gtk_entry_get_text ((GtkEntry *) mav->password));
 		e_passwords_remember_password ("Calendar", abs_uri);
 
-		rel_uri = g_strdup_printf (YAHOO_CALENDAR_LOCATION, sanitize_uname, email, gtk_entry_get_text ((GtkEntry *)mav->priv->yahoo_cal_entry));
+		rel_uri = g_strdup_printf (YAHOO_CALENDAR_LOCATION, sanitize_uname, email, gtk_entry_get_text ((GtkEntry *) mav->priv->yahoo_cal_entry));
 		e_source_set_relative_uri (calendar, rel_uri);
 
 		e_source_group_add_source (sgrp, calendar, -1);
@@ -327,7 +327,7 @@ setup_yahoo_account (MailAccountView *mav)
 		e_source_set_relative_uri (abook, mav->priv->username);
 
 		rel_uri = g_strdup_printf("google://%s/", mav->priv->username);
-		e_passwords_add_password (rel_uri, gtk_entry_get_text ((GtkEntry *)mav->password));
+		e_passwords_add_password (rel_uri, gtk_entry_get_text ((GtkEntry *) mav->password));
 		e_passwords_remember_password ("Addressbook", rel_uri);
 		e_source_group_add_source (sgrp, abook, -1);
 		e_source_list_sync (slist, NULL);
@@ -347,8 +347,8 @@ setup_google_accounts (MailAccountView *mav)
 {
 	GConfClient *gconf = gconf_client_get_default ();
 
-	mav->priv->do_gcontacts = gtk_toggle_button_get_active ((GtkToggleButton *)mav->priv->gcontacts);
-	mav->priv->do_calendar = gtk_toggle_button_get_active ((GtkToggleButton *)mav->priv->calendar);
+	mav->priv->do_gcontacts = gtk_toggle_button_get_active ((GtkToggleButton *) mav->priv->gcontacts);
+	mav->priv->do_calendar = gtk_toggle_button_get_active ((GtkToggleButton *) mav->priv->calendar);
 
 	if (mav->priv->do_calendar) {
 		ESourceList *slist;
@@ -378,7 +378,7 @@ setup_google_accounts (MailAccountView *mav)
 		abs_uri = g_strdup_printf (CALENDAR_CALDAV_URI, sanitize_uname, mav->priv->username);
 		e_source_set_absolute_uri (calendar, abs_uri);
 
-		e_passwords_add_password (abs_uri, gtk_entry_get_text ((GtkEntry *)mav->password));
+		e_passwords_add_password (abs_uri, gtk_entry_get_text ((GtkEntry *) mav->password));
 		e_passwords_remember_password ("Calendar", abs_uri);
 		rel_uri = g_strconcat ("https", GMAIL_CALENDAR_LOCATION, sanitize_uname, CALENDAR_DEFAULT_PATH, NULL);
 		e_source_set_relative_uri (calendar, rel_uri);
@@ -428,7 +428,7 @@ setup_google_accounts (MailAccountView *mav)
 		e_source_set_relative_uri (abook, mav->priv->username);
 
 		rel_uri = g_strdup_printf("google://%s/", mav->priv->username);
-		e_passwords_add_password (rel_uri, gtk_entry_get_text ((GtkEntry *)mav->password));
+		e_passwords_add_password (rel_uri, gtk_entry_get_text ((GtkEntry *) mav->password));
 		e_passwords_remember_password ("Addressbook", rel_uri);
 		e_source_list_sync (slist, NULL);
 
@@ -452,91 +452,91 @@ create_review (MailAccountView *view)
 	CamelURL *url;
 	gchar *buff;
 
-	uri = (gchar *)e_account_get_string (em_account_editor_get_modified_account (view->edit), E_ACCOUNT_SOURCE_URL);
+	uri = (gchar *) e_account_get_string (em_account_editor_get_modified_account (view->edit), E_ACCOUNT_SOURCE_URL);
 	if (!uri  || (url = camel_url_new (uri, NULL)) == NULL)
 		return NULL;
 
 	table = gtk_table_new (4,2, FALSE);
-	gtk_table_set_row_spacings ((GtkTable *)table, 4);
+	gtk_table_set_row_spacings ((GtkTable *) table, 4);
 
 	label = gtk_label_new (NULL);
 	buff = g_markup_printf_escaped ("<span size=\"large\" weight=\"bold\">%s</span>", _("Personal details:"));
-	gtk_label_set_markup ((GtkLabel *)label, buff);
+	gtk_label_set_markup ((GtkLabel *) label, buff);
 	g_free (buff);
 	gtk_widget_show (label);
 	PACK_BOXF (label)
-	gtk_table_attach ((GtkTable *)table, box, 0, 1, 0, 1, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0);
+	gtk_table_attach ((GtkTable *) table, box, 0, 1, 0, 1, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0);
 
 	label = gtk_label_new (_("Name:"));
 	gtk_widget_show (label);
 	PACK_BOX (label);
-	gtk_table_attach ((GtkTable *)table, box, 0, 1, 1, 2, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0);
+	gtk_table_attach ((GtkTable *) table, box, 0, 1, 1, 2, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0);
 	entry = gtk_label_new (e_account_get_string (em_account_editor_get_modified_account (view->edit), E_ACCOUNT_ID_NAME));
 	gtk_widget_show (entry);
 	PACK_BOX (entry)
-	gtk_table_attach ((GtkTable *)table, box, 1, 2, 1, 2, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0);
+	gtk_table_attach ((GtkTable *) table, box, 1, 2, 1, 2, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0);
 
 	label = gtk_label_new (_("Email address:"));
 	gtk_widget_show (label);
 	PACK_BOX (label)
-	gtk_table_attach ((GtkTable *)table, box, 0, 1, 2, 3, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0);
+	gtk_table_attach ((GtkTable *) table, box, 0, 1, 2, 3, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0);
 	entry = gtk_label_new (e_account_get_string (em_account_editor_get_modified_account (view->edit), E_ACCOUNT_ID_ADDRESS));
 	gtk_widget_show (entry);
 	PACK_BOX (entry)
-	gtk_table_attach ((GtkTable *)table, box, 1, 2, 2, 3, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0);
+	gtk_table_attach ((GtkTable *) table, box, 1, 2, 2, 3, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0);
 
 	label = gtk_label_new (NULL);
 	buff = g_markup_printf_escaped ("<span size=\"large\" weight=\"bold\">%s</span>", _("Details:"));
-	gtk_label_set_markup ((GtkLabel *)label, buff);
+	gtk_label_set_markup ((GtkLabel *) label, buff);
 	g_free (buff);
 	gtk_widget_show (label);
 	PACK_BOXF (label);
-	gtk_table_attach ((GtkTable *)table, box, 0, 1, 3, 4, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0);
+	gtk_table_attach ((GtkTable *) table, box, 0, 1, 3, 4, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0);
 
 	label = gtk_label_new (NULL);
 	buff = g_markup_printf_escaped ("<span size=\"large\" weight=\"bold\">%s</span>", _("Receiving"));
-	gtk_label_set_markup ((GtkLabel *)label, buff);
+	gtk_label_set_markup ((GtkLabel *) label, buff);
 	g_free (buff);
 	gtk_widget_show (label);
 	PACK_BOXF (label);
-	gtk_table_attach ((GtkTable *)table, box, 1, 2, 3, 4, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0);
+	gtk_table_attach ((GtkTable *) table, box, 1, 2, 3, 4, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0);
 
 	label = gtk_label_new (_("Server type:"));
 	gtk_widget_show (label);
 	PACK_BOX (label);
-	gtk_table_attach ((GtkTable *)table, box, 0, 1, 4, 5, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0);
+	gtk_table_attach ((GtkTable *) table, box, 0, 1, 4, 5, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0);
 	entry = gtk_label_new (url->protocol);
 	gtk_widget_show (entry);
 	PACK_BOX (entry)
-	gtk_table_attach ((GtkTable *)table, box, 1, 2, 4, 5, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0);
+	gtk_table_attach ((GtkTable *) table, box, 1, 2, 4, 5, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0);
 
 	label = gtk_label_new (_("Server address:"));
 	gtk_widget_show (label);
 	PACK_BOX (label);
-	gtk_table_attach ((GtkTable *)table, box, 0, 1, 5, 6, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0);
+	gtk_table_attach ((GtkTable *) table, box, 0, 1, 5, 6, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0);
 	entry = gtk_label_new (url->host);
 	gtk_widget_show (entry);
 	PACK_BOX (entry);
-	gtk_table_attach ((GtkTable *)table, box, 1, 2, 5, 6, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0);
+	gtk_table_attach ((GtkTable *) table, box, 1, 2, 5, 6, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0);
 
 	label = gtk_label_new (_("Username:"));
 	gtk_widget_show (label);
 	PACK_BOX (label);
-	gtk_table_attach ((GtkTable *)table, box, 0, 1, 6, 7, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0);
+	gtk_table_attach ((GtkTable *) table, box, 0, 1, 6, 7, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0);
 	entry = gtk_label_new (url->user);
 	gtk_widget_show (entry);
 	PACK_BOX (entry);
-	gtk_table_attach ((GtkTable *)table, box, 1, 2, 6, 7, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0);
+	gtk_table_attach ((GtkTable *) table, box, 1, 2, 6, 7, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0);
 
 	label = gtk_label_new (_("Use encryption:"));
 	gtk_widget_show (label);
 	PACK_BOX (label);
-	gtk_table_attach ((GtkTable *)table, box, 0, 1, 7, 8, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0);
+	gtk_table_attach ((GtkTable *) table, box, 0, 1, 7, 8, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0);
 	enc = (gchar *)camel_url_get_param(url, "use_ssl");
 	entry = gtk_label_new (enc ? enc : _("never"));
 	gtk_widget_show (entry);
 	PACK_BOX (entry);
-	gtk_table_attach ((GtkTable *)table, box, 1, 2, 7, 8, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0);
+	gtk_table_attach ((GtkTable *) table, box, 1, 2, 7, 8, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0);
 
 	view->priv->username = g_strdup (url->user);
 	camel_url_free (url);
@@ -546,32 +546,32 @@ create_review (MailAccountView *view)
 
 	label = gtk_label_new (NULL);
 	buff = g_markup_printf_escaped ("<span size=\"large\" weight=\"bold\">%s</span>", _("Sending"));
-	gtk_label_set_markup ((GtkLabel *)label, buff);
+	gtk_label_set_markup ((GtkLabel *) label, buff);
 	g_free (buff);
 	gtk_widget_show (label);
 	PACK_BOXF (label);
-	gtk_table_attach ((GtkTable *)table, box, 2, 3, 3, 4, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0);
+	gtk_table_attach ((GtkTable *) table, box, 2, 3, 3, 4, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0);
 
 	entry = gtk_label_new (url->protocol);
 	gtk_widget_show (entry);
 	PACK_BOX (entry)
-	gtk_table_attach ((GtkTable *)table, box, 2, 3, 4, 5, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0);
+	gtk_table_attach ((GtkTable *) table, box, 2, 3, 4, 5, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0);
 
 	entry = gtk_label_new (url->host);
 	gtk_widget_show (entry);
 	PACK_BOX (entry);
-	gtk_table_attach ((GtkTable *)table, box, 2, 3, 5, 6, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0);
+	gtk_table_attach ((GtkTable *) table, box, 2, 3, 5, 6, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0);
 
 	entry = gtk_label_new (url->user);
 	gtk_widget_show (entry);
 	PACK_BOX (entry);
-	gtk_table_attach ((GtkTable *)table, box, 2, 3, 6, 7, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0);
+	gtk_table_attach ((GtkTable *) table, box, 2, 3, 6, 7, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0);
 
 	enc = (gchar *)camel_url_get_param(url, "use_ssl");
 	entry = gtk_label_new (enc ? enc : _("never"));
 	gtk_widget_show (entry);
 	PACK_BOX (entry);
-	gtk_table_attach ((GtkTable *)table, box, 2, 3, 7, 8, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0);
+	gtk_table_attach ((GtkTable *) table, box, 2, 3, 7, 8, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0);
 
 /*
 	label = gtk_label_new (_("Organization:"));
@@ -627,7 +627,7 @@ mav_next_pressed (GtkButton *button, MailAccountView *mav)
 		gint ret = (*mail_account_pages[mav->current_page].validate_page) (mav);
 		MAVPage *page = mav->pages[mav->current_page];
 		if (ret) {
-			gtk_label_set_text ((GtkLabel *)page->error_label, _(dialog_errors[ret-1].detail));
+			gtk_label_set_text ((GtkLabel *) page->error_label, _(dialog_errors[ret-1].detail));
 			gtk_widget_show  (page->error);
 			return;
 		}
@@ -639,7 +639,7 @@ mav_next_pressed (GtkButton *button, MailAccountView *mav)
 	}
 
 	if (mav->current_page == MAV_LAST - 1) {
-		gchar *uri = (gchar *)e_account_get_string (em_account_editor_get_modified_account (mav->edit), E_ACCOUNT_SOURCE_URL);
+		gchar *uri = (gchar *) e_account_get_string (em_account_editor_get_modified_account (mav->edit), E_ACCOUNT_SOURCE_URL);
 		CamelURL *url;
 
 		e_account_set_string (em_account_editor_get_modified_account (mav->edit), E_ACCOUNT_NAME, e_account_get_string (em_account_editor_get_modified_account (mav->edit), E_ACCOUNT_ID_ADDRESS));
@@ -667,7 +667,7 @@ mav_next_pressed (GtkButton *button, MailAccountView *mav)
 			/* Save the password ahead of time */
 			aurl = camel_url_new (account->source->url, NULL);
 			surl = camel_url_to_string (aurl, CAMEL_URL_HIDE_ALL);
-			e_passwords_add_password (surl, gtk_entry_get_text ((GtkEntry *)mav->password));
+			e_passwords_add_password (surl, gtk_entry_get_text ((GtkEntry *) mav->password));
 			e_passwords_remember_password ("Mail", surl);
 			camel_url_free (aurl);
 			g_free (surl);
@@ -701,9 +701,9 @@ mav_next_pressed (GtkButton *button, MailAccountView *mav)
 		tmp = mail_account_pages[mav->current_page].create_page (mav);
 		page->main = gtk_hbox_new (FALSE, 0);
 		gtk_widget_show (page->main);
-		gtk_box_pack_start ((GtkBox *)page->main, tmp, FALSE, FALSE, 0);
+		gtk_box_pack_start ((GtkBox *) page->main, tmp, FALSE, FALSE, 0);
 		gtk_widget_show (tmp);
-		gtk_box_pack_start ((GtkBox *)page->box, page->main, FALSE, FALSE, 3);
+		gtk_box_pack_start ((GtkBox *) page->box, page->main, FALSE, FALSE, 3);
 
 		if (mav->priv->is_gmail) {
 			gtk_widget_destroy (mav->priv->gcontacts);
@@ -740,11 +740,11 @@ mav_next_pressed (GtkButton *button, MailAccountView *mav)
 			mav->priv->gcontacts = gtk_check_button_new_with_label (_("Setup Google contacts with Evolution"));
 			mav->priv->calendar = gtk_check_button_new_with_label (_("Setup Google calendar with Evolution"));
 
-			gtk_toggle_button_set_active ((GtkToggleButton *)mav->priv->gcontacts, TRUE);
-			gtk_toggle_button_set_active ((GtkToggleButton *)mav->priv->calendar, TRUE);
+			gtk_toggle_button_set_active ((GtkToggleButton *) mav->priv->gcontacts, TRUE);
+			gtk_toggle_button_set_active ((GtkToggleButton *) mav->priv->calendar, TRUE);
 
 			mav->priv->gmail_info_label = gtk_label_new (_("You may need to enable IMAP access."));
-			gtk_label_set_selectable ((GtkLabel *)mav->priv->gmail_info_label, TRUE);
+			gtk_label_set_selectable ((GtkLabel *) mav->priv->gmail_info_label, TRUE);
 
 			gtk_widget_show (mav->priv->gcontacts);
 			gtk_widget_show (mav->priv->calendar);
@@ -752,7 +752,7 @@ mav_next_pressed (GtkButton *button, MailAccountView *mav)
 
 			mav->priv->account_label = gtk_label_new (NULL);
 			buff = g_markup_printf_escaped ("<span size=\"large\" weight=\"bold\">%s</span>", _("Google account settings:"));
-			gtk_label_set_markup ((GtkLabel *)mav->priv->account_label, buff);
+			gtk_label_set_markup ((GtkLabel *) mav->priv->account_label, buff);
 			g_free (buff);
 			gtk_widget_show (mav->priv->account_label);
 
@@ -779,19 +779,19 @@ mav_next_pressed (GtkButton *button, MailAccountView *mav)
 			printf("Google account: %s\n", account->source->url);
 			mav->priv->calendar = gtk_check_button_new_with_label (_("Setup Yahoo calendar with Evolution"));
 
-			gtk_toggle_button_set_active ((GtkToggleButton *)mav->priv->calendar, TRUE);
+			gtk_toggle_button_set_active ((GtkToggleButton *) mav->priv->calendar, TRUE);
 
 			mav->priv->gmail_info_label = gtk_label_new (_("Yahoo calendars are named as firstname_lastname. We have tried to form the calendar name. So please confirm and re-enter the calendar name if it is not correct."));
-			gtk_label_set_line_wrap ((GtkLabel *)mav->priv->gmail_info_label, TRUE);
-			gtk_label_set_line_wrap_mode ((GtkLabel *)mav->priv->gmail_info_label, PANGO_WRAP_WORD);
-			gtk_label_set_selectable ((GtkLabel *)mav->priv->gmail_info_label, TRUE);
+			gtk_label_set_line_wrap ((GtkLabel *) mav->priv->gmail_info_label, TRUE);
+			gtk_label_set_line_wrap_mode ((GtkLabel *) mav->priv->gmail_info_label, PANGO_WRAP_WORD);
+			gtk_label_set_selectable ((GtkLabel *) mav->priv->gmail_info_label, TRUE);
 
 			gtk_widget_show (mav->priv->calendar);
 			gtk_widget_show (mav->priv->gmail_info_label);
 
 			mav->priv->account_label = gtk_label_new (NULL);
 			buff = g_markup_printf_escaped ("<span size=\"large\" weight=\"bold\">%s</span>", _("Yahoo account settings:"));
-			gtk_label_set_markup ((GtkLabel *)mav->priv->account_label, buff);
+			gtk_label_set_markup ((GtkLabel *) mav->priv->account_label, buff);
 			g_free (buff);
 			gtk_widget_show (mav->priv->account_label);
 
@@ -808,7 +808,7 @@ mav_next_pressed (GtkButton *button, MailAccountView *mav)
 			PACK_IN_BOX (page->box, mav->priv->yahoo_cal_box, 24);
 			cal_name = g_strdup (e_account_get_string (em_account_editor_get_modified_account (mav->edit), E_ACCOUNT_ID_NAME));
 			cal_name = g_strdelimit(cal_name, " ", '_');
-			gtk_entry_set_text ((GtkEntry *)mav->priv->yahoo_cal_entry, cal_name);
+			gtk_entry_set_text ((GtkEntry *) mav->priv->yahoo_cal_entry, cal_name);
 			g_free (cal_name);
 #undef PACK_IN_BOX
 		} else {
@@ -859,8 +859,8 @@ mav_construct_page (MailAccountView *view, MAVPageType type)
 	error_box = gtk_hbox_new (FALSE, 2);
 	page->error_label = gtk_label_new ("");
 	tmp = gtk_image_new_from_stock (GTK_STOCK_DIALOG_WARNING, GTK_ICON_SIZE_MENU);
-	gtk_box_pack_start ((GtkBox *)error_box, tmp, FALSE, FALSE, 2);
-	gtk_box_pack_start ((GtkBox *)error_box, page->error_label, FALSE, FALSE, 2);
+	gtk_box_pack_start ((GtkBox *) error_box, tmp, FALSE, FALSE, 2);
+	gtk_box_pack_start ((GtkBox *) error_box, page->error_label, FALSE, FALSE, 2);
 	gtk_widget_hide (tmp);
 	gtk_widget_show (page->error_label);
 	page->error = tmp;
@@ -868,31 +868,31 @@ mav_construct_page (MailAccountView *view, MAVPageType type)
 
 	box = gtk_hbox_new (FALSE, 12);
 	gtk_widget_show (box);
-	gtk_box_pack_start ((GtkBox *)page->box, box, FALSE, FALSE, 12);
+	gtk_box_pack_start ((GtkBox *) page->box, box, FALSE, FALSE, 12);
 	tmp = gtk_label_new (NULL);
 	str = g_strdup_printf("<span  size=\"xx-large\" weight=\"heavy\">%s</span>", _(mail_account_pages[type].head));
-	gtk_label_set_markup ((GtkLabel *)tmp, str);
+	gtk_label_set_markup ((GtkLabel *) tmp, str);
 	g_free (str);
 	gtk_widget_show (tmp);
-	gtk_box_pack_start ((GtkBox *)box, tmp, FALSE, FALSE, 12);
+	gtk_box_pack_start ((GtkBox *) box, tmp, FALSE, FALSE, 12);
 
 	box = gtk_hbox_new (FALSE, 12);
 	gtk_widget_show (box);
-	gtk_box_pack_start ((GtkBox *)page->box, box, FALSE, FALSE, 12);
+	gtk_box_pack_start ((GtkBox *) page->box, box, FALSE, FALSE, 12);
 	tmp = gtk_label_new (_(mail_account_pages[type].detail));
 	gtk_widget_set_size_request (tmp, 600, -1);
-	gtk_label_set_line_wrap ((GtkLabel *)tmp, TRUE);
-	gtk_label_set_line_wrap_mode ((GtkLabel *)tmp, PANGO_WRAP_WORD);
+	gtk_label_set_line_wrap ((GtkLabel *) tmp, TRUE);
+	gtk_label_set_line_wrap_mode ((GtkLabel *) tmp, PANGO_WRAP_WORD);
 	gtk_widget_show (tmp);
-	gtk_box_pack_start ((GtkBox *)box, tmp, FALSE, FALSE, 12);
+	gtk_box_pack_start ((GtkBox *) box, tmp, FALSE, FALSE, 12);
 
 	page->main = NULL;
 	if (mail_account_pages[type].create_page && mail_account_pages[type].path) {
 		tmp = (*mail_account_pages[type].create_page) (view);
-		gtk_box_pack_start ((GtkBox *)page->box, tmp, FALSE, FALSE, 3);
+		gtk_box_pack_start ((GtkBox *) page->box, tmp, FALSE, FALSE, 3);
 		page->main = gtk_hbox_new (FALSE, 0);
 		gtk_widget_show (page->main);
-		gtk_box_pack_start ((GtkBox *)page->main, tmp, FALSE, FALSE, 0);
+		gtk_box_pack_start ((GtkBox *) page->main, tmp, FALSE, FALSE, 0);
 	}
 
 	if (mail_account_pages[type].fill_page) {
@@ -903,12 +903,12 @@ mav_construct_page (MailAccountView *view, MAVPageType type)
 		box = gtk_hbox_new (FALSE, 0);
 		if (FALSE) {
 			tmp = gtk_image_new_from_icon_name ("go-previous", GTK_ICON_SIZE_BUTTON);
-			gtk_box_pack_start ((GtkBox *)box, tmp, FALSE, FALSE, 0);
+			gtk_box_pack_start ((GtkBox *) box, tmp, FALSE, FALSE, 0);
 		}
 		tmp = gtk_label_new (_(view->original ? mail_account_pages[type].prev_edit : mail_account_pages[type].prev));
-		gtk_box_pack_start ((GtkBox *)box, tmp, FALSE, FALSE, 3);
+		gtk_box_pack_start ((GtkBox *) box, tmp, FALSE, FALSE, 3);
 		page->prev = gtk_button_new ();
-		gtk_container_add ((GtkContainer *)page->prev, box);
+		gtk_container_add ((GtkContainer *) page->prev, box);
 		gtk_widget_show_all (page->prev);
 		g_signal_connect(page->prev, "clicked", G_CALLBACK(mav_prev_pressed), view);
 	}
@@ -916,30 +916,30 @@ mav_construct_page (MailAccountView *view, MAVPageType type)
 	if ((view->original && mail_account_pages[type].next_edit) || mail_account_pages[type].next) {
 		box = gtk_hbox_new (FALSE, 0);
 		tmp = gtk_label_new (_(view->original ? mail_account_pages[type].next_edit : mail_account_pages[type].next));
-		gtk_box_pack_start ((GtkBox *)box, tmp, FALSE, FALSE, 3);
+		gtk_box_pack_start ((GtkBox *) box, tmp, FALSE, FALSE, 3);
 		if (FALSE) {
 			tmp = gtk_image_new_from_icon_name ("go-next", GTK_ICON_SIZE_BUTTON);
-			gtk_box_pack_start ((GtkBox *)box, tmp, FALSE, FALSE, 0);
+			gtk_box_pack_start ((GtkBox *) box, tmp, FALSE, FALSE, 0);
 		}
 		page->next = gtk_button_new ();
 		gtk_widget_set_can_default (page->next, TRUE);
 		g_signal_connect (page->next, "hierarchy-changed",
 				  G_CALLBACK (gtk_widget_grab_default), NULL);
-		gtk_container_add ((GtkContainer *)page->next, box);
+		gtk_container_add ((GtkContainer *) page->next, box);
 		gtk_widget_show_all (page->next);
 		g_signal_connect(page->next, "clicked", G_CALLBACK(mav_next_pressed), view);
 	}
 
 	box = gtk_hbox_new (FALSE, 0);
 	if (page->prev)
-		gtk_box_pack_start ((GtkBox *)box, page->prev, FALSE, FALSE, 12);
+		gtk_box_pack_start ((GtkBox *) box, page->prev, FALSE, FALSE, 12);
 	if (page->next)
-		gtk_box_pack_end ((GtkBox *)box, page->next, FALSE, FALSE, 12);
+		gtk_box_pack_end ((GtkBox *) box, page->next, FALSE, FALSE, 12);
 	gtk_widget_show (box);
-	gtk_box_pack_end ((GtkBox *)page->box, box, FALSE, FALSE, 6);
+	gtk_box_pack_end ((GtkBox *) page->box, box, FALSE, FALSE, 6);
 	gtk_widget_show (page->box);
-	gtk_box_pack_end ((GtkBox *)page->box, error_box, FALSE, FALSE, 2);
-	return (GtkWidget *)page;
+	gtk_box_pack_end ((GtkBox *) page->box, error_box, FALSE, FALSE, 2);
+	return (GtkWidget *) page;
 }
 
 static ServerData *
@@ -951,13 +951,13 @@ emae_check_servers (const gchar *email)
 	gchar *tmp;
 
 	/* FIXME: Find a way to free the provider once given to account settings. */
-	provider->email = (gchar *)email;
+	provider->email = (gchar *) email;
 	tmp = strchr (email, '@');
 	tmp++;
 	provider->domain = tmp;
 	tmp = strchr (dupe, '@');
 	*tmp = 0;
-	provider->username = (gchar *)g_quark_to_string (g_quark_from_string (dupe));
+	provider->username = (gchar *) g_quark_to_string (g_quark_from_string (dupe));
 	g_free (dupe);
 
 	if (!mail_guess_servers (provider)) {
@@ -1041,22 +1041,22 @@ mail_account_view_construct (MailAccountView *view,
 	EShell *shell;
 
 	view->scroll = gtk_scrolled_window_new (NULL, NULL);
-	gtk_scrolled_window_set_policy ((GtkScrolledWindow *)view->scroll, GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
-	gtk_scrolled_window_set_shadow_type ((GtkScrolledWindow *)view->scroll, GTK_SHADOW_NONE);
+	gtk_scrolled_window_set_policy ((GtkScrolledWindow *) view->scroll, GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+	gtk_scrolled_window_set_shadow_type ((GtkScrolledWindow *) view->scroll, GTK_SHADOW_NONE);
 	view->page_widget = gtk_vbox_new (FALSE, 3);
-	gtk_scrolled_window_add_with_viewport ((GtkScrolledWindow *)view->scroll, view->page_widget);
+	gtk_scrolled_window_add_with_viewport ((GtkScrolledWindow *) view->scroll, view->page_widget);
 	gtk_widget_show_all (view->scroll);
-	gtk_widget_set_size_request ((GtkWidget *)view, -1, 300);
+	gtk_widget_set_size_request ((GtkWidget *) view, -1, 300);
 	for (i=0; i<MAV_LAST; i++) {
-		view->pages[i] = (MAVPage *)mav_construct_page (view, i);
+		view->pages[i] = (MAVPage *) mav_construct_page (view, i);
 		view->pages[i]->done = FALSE;
 		view->wpages[i] = view->pages[i]->box;
-		gtk_box_pack_start ((GtkBox *)view->page_widget, view->pages[i]->box, TRUE, TRUE, 0);
+		gtk_box_pack_start ((GtkBox *) view->page_widget, view->pages[i]->box, TRUE, TRUE, 0);
 		gtk_widget_hide (view->pages[i]->box);
 	}
 	gtk_widget_show (view->pages[0]->box);
 	view->current_page = 0;
-	gtk_box_pack_start ((GtkBox *)view, view->scroll, TRUE, TRUE, 0);
+	gtk_box_pack_start ((GtkBox *) view, view->scroll, TRUE, TRUE, 0);
 	view->edit = em_account_editor_new_for_pages (
 		view->original, EMAE_PAGES, session,
 		"org.gnome.evolution.mail.config.accountWizard", view->wpages);
@@ -1078,13 +1078,13 @@ mail_account_view_construct (MailAccountView *view,
 		if (!view->original) {
 			label = gtk_label_new (_("Password:"));
 			pwd = gtk_entry_new ();
-			gtk_entry_set_visibility ((GtkEntry *)pwd, FALSE);
+			gtk_entry_set_visibility ((GtkEntry *) pwd, FALSE);
 /*			gtk_entry_set_activates_default ((GtkEntry *)pwd, TRUE); */
 			g_signal_connect (pwd, "activate", G_CALLBACK (next_page), view);
 			gtk_widget_show (label);
 			gtk_widget_show (pwd);
-			gtk_table_attach ((GtkTable *)table, label, 0, 1, 2, 3, GTK_FILL, 0, 0, 0);
-			gtk_table_attach ((GtkTable *)table, pwd, 1, 2, 2, 3, GTK_FILL|GTK_EXPAND, 0, 0, 0);
+			gtk_table_attach ((GtkTable *) table, label, 0, 1, 2, 3, GTK_FILL, 0, 0, 0);
+			gtk_table_attach ((GtkTable *) table, pwd, 1, 2, 2, 3, GTK_FILL|GTK_EXPAND, 0, 0, 0);
 
 			view->password = pwd;
 		}
@@ -1122,25 +1122,25 @@ mail_account_view_get_tab_widget (MailAccountView *mcv)
 	gint w=-1, h=-1;
 	GtkWidget *tab_label;
 
-	img = (GtkWidget *)gtk_image_new_from_pixbuf (pbuf);
+	img = (GtkWidget *) gtk_image_new_from_pixbuf (pbuf);
 
 	tool = gtk_button_new ();
-	gtk_button_set_relief ((GtkButton *)tool, GTK_RELIEF_NONE);
-	gtk_button_set_focus_on_click ((GtkButton *)tool, FALSE);
+	gtk_button_set_relief ((GtkButton *) tool, GTK_RELIEF_NONE);
+	gtk_button_set_focus_on_click ((GtkButton *) tool, FALSE);
 	gtk_widget_set_tooltip_text (tool, _("Close Tab"));
 	g_signal_connect (tool, "clicked", G_CALLBACK(mav_close), mcv);
 
 	box = gtk_hbox_new (FALSE, 0);
-	gtk_box_pack_start ((GtkBox *)box, img, FALSE, FALSE, 0);
-	gtk_container_add ((GtkContainer *)tool, box);
+	gtk_box_pack_start ((GtkBox *) box, img, FALSE, FALSE, 0);
+	gtk_container_add ((GtkContainer *) tool, box);
 	gtk_widget_show_all (tool);
 	gtk_icon_size_lookup_for_settings (gtk_widget_get_settings (tool) , GTK_ICON_SIZE_MENU, &w, &h);
 	gtk_widget_set_size_request (tool, w+2, h+2);
 
 	box = gtk_label_new (_("Account Wizard"));
 	tab_label = gtk_hbox_new (FALSE, 0);
-	gtk_box_pack_start ((GtkBox *)tab_label, box, FALSE, FALSE, 2);
-	gtk_box_pack_start ((GtkBox *)tab_label, tool, FALSE, FALSE, 0);
+	gtk_box_pack_start ((GtkBox *) tab_label, box, FALSE, FALSE, 2);
+	gtk_box_pack_start ((GtkBox *) tab_label, tool, FALSE, FALSE, 0);
 	gtk_widget_show_all (tab_label);
 
 	return tab_label;
diff --git a/capplet/settings/mail-capplet-shell.c b/capplet/settings/mail-capplet-shell.c
index cb5c7ec0e4..fecc0a67ad 100644
--- a/capplet/settings/mail-capplet-shell.c
+++ b/capplet/settings/mail-capplet-shell.c
@@ -104,7 +104,7 @@ mail_capplet_shell_finalize (GObject *object)
 static void
 ms_ctrl_w_pressed (MailCappletShell *shell)
 {
-	mail_view_close_view ((MailView *)shell->view);
+	mail_view_close_view ((MailView *) shell->view);
 }
 
 static void
@@ -177,7 +177,7 @@ mail_capplet_shell_quit (MailCappletShell *shell)
 	if (priv->main_loop)
 		gtk_main_quit ();
 	else
-		gtk_widget_hide ((GtkWidget *)shell);
+		gtk_widget_hide ((GtkWidget *) shell);
 }
 
 static void
@@ -208,28 +208,28 @@ mail_capplet_shell_construct (MailCappletShell *shell, gint socket_id, gboolean
 	gtk_window_set_title ((GtkWindow *)shell, _("Evolution account assistant"));
 	ms_init_style (style);
 	g_signal_connect ((GObject *)shell, "delete-event", G_CALLBACK (ms_delete_event), NULL);
-	gtk_window_set_type_hint ((GtkWindow *)shell, GDK_WINDOW_TYPE_HINT_NORMAL);
+	gtk_window_set_type_hint ((GtkWindow *) shell, GDK_WINDOW_TYPE_HINT_NORMAL);
 	if (g_getenv("ANJAL_NO_MAX") == NULL && FALSE) {
-		 GdkScreen *scr = gtk_widget_get_screen ((GtkWidget *)shell);
-		 gtk_window_set_default_size ((GtkWindow *)shell, gdk_screen_get_width (scr), gdk_screen_get_height (scr));
-		 gtk_window_set_decorated ((GtkWindow *)shell, FALSE);
+		 GdkScreen *scr = gtk_widget_get_screen ((GtkWidget *) shell);
+		 gtk_window_set_default_size ((GtkWindow *) shell, gdk_screen_get_width (scr), gdk_screen_get_height (scr));
+		 gtk_window_set_decorated ((GtkWindow *) shell, FALSE);
 	} else  {
-		gtk_window_set_default_size ((GtkWindow *)shell, 1024, 500);
+		gtk_window_set_default_size ((GtkWindow *) shell, 1024, 500);
 	}
 
 	priv->main_loop = main_loop;
 	priv->box = (GtkWidget *) gtk_vbox_new (FALSE, 0);
-	gtk_widget_show ((GtkWidget *)priv->box);
+	gtk_widget_show ((GtkWidget *) priv->box);
 
 	if (!socket_id) {
-		gtk_container_add ((GtkContainer *)shell, priv->box);
+		gtk_container_add ((GtkContainer *) shell, priv->box);
 	} else {
 		GtkWidget *plug = gtk_plug_new (socket_id);
 
-		gtk_container_add ((GtkContainer *)plug, priv->box);
+		gtk_container_add ((GtkContainer *) plug, priv->box);
 		g_signal_connect (plug, "destroy", G_CALLBACK (gtk_main_quit), NULL);
 		gtk_widget_show (plug);
-		gtk_widget_hide ((GtkWidget *)shell);
+		gtk_widget_hide ((GtkWidget *) shell);
 
 	}
 
@@ -242,8 +242,8 @@ mail_capplet_shell_construct (MailCappletShell *shell, gint socket_id, gboolean
 
 	shell->view = mail_view_new ();
 	shell->view->session = shell->priv->session;
-	gtk_widget_show ((GtkWidget *)shell->view);
-	gtk_box_pack_end ((GtkBox *)priv->box, (GtkWidget *)shell->view, TRUE, TRUE, 2);
+	gtk_widget_show ((GtkWidget *) shell->view);
+	gtk_box_pack_end ((GtkBox *) priv->box, (GtkWidget *) shell->view, TRUE, TRUE, 2);
 
 	mail_config_init (shell->priv->session);
 	mail_msg_init ();
@@ -254,12 +254,12 @@ mail_capplet_shell_construct (MailCappletShell *shell, gint socket_id, gboolean
 	if (just_druid) {
 		MailViewChild *mc;
 
-		gtk_notebook_set_show_tabs ((GtkNotebook *)shell->view, FALSE);
-		mc = mail_view_add_page ((MailView *)shell->view, MAIL_VIEW_ACCOUNT, NULL);
+		gtk_notebook_set_show_tabs ((GtkNotebook *) shell->view, FALSE);
+		mc = mail_view_add_page ((MailView *) shell->view, MAIL_VIEW_ACCOUNT, NULL);
 		g_signal_connect (mc, "view-close", G_CALLBACK(ms_show_post_druid), shell);
 		setup_abooks ();
 	} else
-		shell->priv->settings_view = mail_view_add_page ((MailView *)shell->view, MAIL_VIEW_SETTINGS, NULL);
+		shell->priv->settings_view = mail_view_add_page ((MailView *) shell->view, MAIL_VIEW_SETTINGS, NULL);
 
 }
 
diff --git a/capplet/settings/mail-settings-view.c b/capplet/settings/mail-settings-view.c
index 596e7222a1..01a984d4ba 100644
--- a/capplet/settings/mail-settings-view.c
+++ b/capplet/settings/mail-settings-view.c
@@ -138,7 +138,7 @@ build_account_button (MailSettingsView *acview, EAccount *account)
 	if (FALSE) {
 		tlabel = (GtkWidget *)gtk_image_new_from_stock (account ? "gtk-edit" : "gtk-new", GTK_ICON_SIZE_BUTTON);
 		gtk_widget_show (tlabel);
-		gtk_box_pack_start ((GtkBox *)tbox, tlabel, FALSE, FALSE, 6);
+		gtk_box_pack_start ((GtkBox *) tbox, tlabel, FALSE, FALSE, 6);
 	}
 
 	if (account)
@@ -149,17 +149,17 @@ build_account_button (MailSettingsView *acview, EAccount *account)
 	if (account)
 		g_free (tmp);
 	gtk_widget_show (tlabel);
-	gtk_box_pack_start ((GtkBox *)tbox, tlabel, FALSE, FALSE, 0);
+	gtk_box_pack_start ((GtkBox *) tbox, tlabel, FALSE, FALSE, 0);
 	gtk_widget_show (tbox);
-	gtk_container_add ((GtkContainer *)label, tbox);
+	gtk_container_add ((GtkContainer *) label, tbox);
 	g_object_set_data ((GObject *)label, "account", account);
 	g_signal_connect(label, "clicked", G_CALLBACK(msv_edit_account), acview);
-	gtk_box_pack_start ((GtkBox *)box1, label, FALSE, FALSE, 0);
+	gtk_box_pack_start ((GtkBox *) box1, label, FALSE, FALSE, 0);
 	gtk_widget_show (label);
 
 	if (account) {
 		tlabel = gtk_button_new_from_stock ("gtk-delete");
-		gtk_box_pack_start ((GtkBox *)box1, tlabel, FALSE, FALSE, 12);
+		gtk_box_pack_start ((GtkBox *) box1, tlabel, FALSE, FALSE, 12);
 		gtk_widget_show (tlabel);
 		g_object_set_data ((GObject *)tlabel, "account", account);
 		g_signal_connect (tlabel, "clicked", G_CALLBACK(msv_delete_account), acview);
@@ -177,11 +177,11 @@ msv_regen_view (MailSettingsView *acview)
 	GtkWidget *box, *label;
 	gchar *buff;
 
-	gtk_container_foreach ((GtkContainer *)acview->priv->box, (GtkCallback)gtk_widget_destroy, NULL);
+	gtk_container_foreach ((GtkContainer *) acview->priv->box, (GtkCallback) gtk_widget_destroy, NULL);
 
 	label = gtk_label_new (NULL);
 	buff = g_markup_printf_escaped ("<span size=\"large\" weight=\"bold\">%s</span>", _("Account management"));
-	gtk_label_set_markup ((GtkLabel *)label, buff);
+	gtk_label_set_markup ((GtkLabel *) label, buff);
 	g_free (buff);
 	PACK_BOX (label,12);
 
@@ -200,16 +200,16 @@ mail_settings_view_construct (MailSettingsView *acview)
 {
 	acview->priv->scroll = gtk_scrolled_window_new (NULL, NULL);
 	gtk_widget_show (acview->priv->scroll);
-	gtk_container_add ((GtkContainer *)acview, acview->priv->scroll);
-	gtk_scrolled_window_set_policy ((GtkScrolledWindow *)acview->priv->scroll, GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+	gtk_container_add ((GtkContainer *) acview, acview->priv->scroll);
+	gtk_scrolled_window_set_policy ((GtkScrolledWindow *) acview->priv->scroll, GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
 	acview->priv->box = gtk_vbox_new (FALSE, 0);
 	gtk_widget_show (acview->priv->box);
-	gtk_scrolled_window_add_with_viewport ((GtkScrolledWindow *)acview->priv->scroll, acview->priv->box);
+	gtk_scrolled_window_add_with_viewport ((GtkScrolledWindow *) acview->priv->scroll, acview->priv->box);
 
 	acview->priv->accounts = e_get_account_list ();
 	g_signal_connect (acview->priv->accounts, "account-added", G_CALLBACK(msv_account_added), acview);
 	msv_regen_view (acview);
-	gtk_widget_show ((GtkWidget *)acview);
+	gtk_widget_show ((GtkWidget *) acview);
 
 }
 
@@ -243,23 +243,23 @@ mail_settings_view_get_tab_widget (MailSettingsView *mcv)
 	img = gtk_image_new_from_pixbuf (pbuf);
 
 	tool = gtk_button_new ();
-	gtk_button_set_relief ((GtkButton *)tool, GTK_RELIEF_NONE);
-	gtk_button_set_focus_on_click ((GtkButton *)tool, FALSE);
+	gtk_button_set_relief ((GtkButton *) tool, GTK_RELIEF_NONE);
+	gtk_button_set_focus_on_click ((GtkButton *) tool, FALSE);
 	gtk_widget_set_tooltip_text (tool, _("Close Tab"));
 	g_signal_connect (tool, "clicked", G_CALLBACK(msv_close), mcv);
 
 	box = gtk_hbox_new (FALSE, 0);
-	gtk_box_pack_start ((GtkBox *)box, img, FALSE, FALSE, 0);
-	gtk_container_add ((GtkContainer *)tool, box);
+	gtk_box_pack_start ((GtkBox *) box, img, FALSE, FALSE, 0);
+	gtk_container_add ((GtkContainer *) tool, box);
 	gtk_widget_show_all (tool);
 	gtk_icon_size_lookup_for_settings (gtk_widget_get_settings (tool) , GTK_ICON_SIZE_MENU, &w, &h);
 	gtk_widget_set_size_request (tool, w+2, h+2);
 
 	box = gtk_label_new (_("Settings"));
 	tab_label = gtk_hbox_new (FALSE, 0);
-	gtk_box_pack_start ((GtkBox *)tab_label, box, FALSE, FALSE, 2);
+	gtk_box_pack_start ((GtkBox *) tab_label, box, FALSE, FALSE, 2);
 #ifndef ANJAL_SETTINGS
-	gtk_box_pack_start ((GtkBox *)tab_label, tool, FALSE, FALSE, 0);
+	gtk_box_pack_start ((GtkBox *) tab_label, tool, FALSE, FALSE, 0);
 #endif
 	gtk_widget_show_all (tab_label);
 
diff --git a/capplet/settings/mail-view.c b/capplet/settings/mail-view.c
index 4c7c9ddd05..71fdf07dc3 100644
--- a/capplet/settings/mail-view.c
+++ b/capplet/settings/mail-view.c
@@ -84,7 +84,7 @@ mail_view_init (MailView  *shell)
 static void
 mail_view_finalize (GObject *object)
 {
-	MailView *shell = (MailView *)object;
+	MailView *shell = (MailView *) object;
 	MailViewPrivate *priv = shell->priv;
 
 	g_list_free (priv->children);
@@ -97,20 +97,20 @@ static void
 mv_set_folder_uri (AnjalMailView *mv, const gchar *uri)
 {
 #ifndef ANJAL_SETTINGS
-	mail_view_set_folder_uri ((MailView *)mv, uri);
+	mail_view_set_folder_uri ((MailView *) mv, uri);
 #endif
 }
 
 static void set_folder_tree (AnjalMailView *mv, EMFolderTree *tree)
 {
-	mail_view_set_folder_tree ((MailView *)mv, (GtkWidget *)tree);
+	mail_view_set_folder_tree ((MailView *) mv, (GtkWidget *) tree);
 }
 
 static void
 set_search (AnjalMailView *mv, const gchar *search)
 {
 #ifndef ANJAL_SETTINGS
-	mail_view_set_search ((MailView *)mv, search);
+	mail_view_set_search ((MailView *) mv, search);
 #endif
 }
 
@@ -128,9 +128,9 @@ mail_view_class_init (MailViewClass *klass)
 			      G_TYPE_NONE, 0);
 
 	mail_view_parent_class = g_type_class_peek_parent (klass);
-	((AnjalMailViewClass *)klass)->set_folder_uri = mv_set_folder_uri;
-	((AnjalMailViewClass *)klass)->set_folder_tree = set_folder_tree;
-	((AnjalMailViewClass *)klass)->set_search = set_search;
+	((AnjalMailViewClass *) klass)->set_folder_uri = mv_set_folder_uri;
+	((AnjalMailViewClass *) klass)->set_folder_tree = set_folder_tree;
+	((AnjalMailViewClass *) klass)->set_search = set_search;
 
 	object_class->finalize = mail_view_finalize;
 
@@ -139,7 +139,7 @@ mail_view_class_init (MailViewClass *klass)
 static void
 mv_switch (GtkNotebook *notebook, GtkWidget *page, guint page_num, gpointer user_data)
 {
-	MailView *shell = (MailView *)notebook;
+	MailView *shell = (MailView *) notebook;
 	MailViewPrivate *priv = shell->priv;
 	MailViewChild *curr = priv->current_view;
 	MailViewChild *child;
@@ -147,37 +147,37 @@ mv_switch (GtkNotebook *notebook, GtkWidget *page, guint page_num, gpointer user
 
 	curr->flags &= ~MAIL_VIEW_HOLD_FOCUS;
 
-	child = (MailViewChild *)gtk_notebook_get_nth_page (notebook, current_child);
+	child = (MailViewChild *) gtk_notebook_get_nth_page (notebook, current_child);
 
 	priv->current_view = child;
 	REALIGN_NODES (shell->priv->children,child);
 
 #ifndef ANJAL_SETTINGS
 	if (child->type == MAIL_VIEW_COMPOSER)
-		 mail_composer_view_activate ((MailComposerView *)child, shell->folder_tree, shell->check_mail, shell->sort_by, TRUE);
+		 mail_composer_view_activate ((MailComposerView *) child, shell->folder_tree, shell->check_mail, shell->sort_by, TRUE);
 	else if (child->type == MAIL_VIEW_MESSAGE)
-		 mail_conv_view_activate ((MailConvView *)child, shell->tree, shell->folder_tree, shell->check_mail, shell->sort_by, FALSE);
+		 mail_conv_view_activate ((MailConvView *) child, shell->tree, shell->folder_tree, shell->check_mail, shell->sort_by, FALSE);
 	else if (child->type == MAIL_VIEW_FOLDER)  {
-		 mail_folder_view_activate ((MailFolderView *)child, shell->tree, shell->folder_tree, shell->check_mail, shell->sort_by, shell->slider, TRUE);
+		 mail_folder_view_activate ((MailFolderView *) child, shell->tree, shell->folder_tree, shell->check_mail, shell->sort_by, shell->slider, TRUE);
 		 anjal_shell_view_restore_state (shell->shell_view, child->uri);
 	} else if (child->type == MAIL_VIEW_ACCOUNT)
-		mail_account_view_activate ((MailAccountView *)child, shell->tree, shell->folder_tree, shell->check_mail, shell->sort_by, FALSE);
+		mail_account_view_activate ((MailAccountView *) child, shell->tree, shell->folder_tree, shell->check_mail, shell->sort_by, FALSE);
 	else if (child->type == MAIL_VIEW_SETTINGS)
-		mail_settings_view_activate ((MailSettingsView *)child, shell->tree, shell->folder_tree, shell->check_mail, shell->sort_by, shell->slider, FALSE);
+		mail_settings_view_activate ((MailSettingsView *) child, shell->tree, shell->folder_tree, shell->check_mail, shell->sort_by, shell->slider, FALSE);
 #else
 	if (child->type == MAIL_VIEW_ACCOUNT)
-		mail_account_view_activate ((MailAccountView *)child, shell->tree, shell->folder_tree, shell->check_mail, shell->sort_by, FALSE);
+		mail_account_view_activate ((MailAccountView *) child, shell->tree, shell->folder_tree, shell->check_mail, shell->sort_by, FALSE);
 	else if (child->type == MAIL_VIEW_SETTINGS)
-		mail_settings_view_activate ((MailSettingsView *)child, shell->tree, shell->folder_tree, shell->check_mail, shell->sort_by, shell->slider, FALSE);
+		mail_settings_view_activate ((MailSettingsView *) child, shell->tree, shell->folder_tree, shell->check_mail, shell->sort_by, shell->slider, FALSE);
 #endif
 }
 
 static void
 mail_view_construct (MailView *shell)
 {
-	gtk_notebook_set_show_tabs ((GtkNotebook *)shell, TRUE);
-	gtk_notebook_set_scrollable ((GtkNotebook *)shell, TRUE);
-	gtk_notebook_popup_disable ((GtkNotebook *)shell);
+	gtk_notebook_set_show_tabs ((GtkNotebook *) shell, TRUE);
+	gtk_notebook_set_scrollable ((GtkNotebook *) shell, TRUE);
+	gtk_notebook_popup_disable ((GtkNotebook *) shell);
 	g_signal_connect_after (shell, "switch-page", G_CALLBACK(mv_switch), shell);
 }
 
@@ -207,8 +207,8 @@ mv_get_page_number (GtkNotebook *note, GtkWidget *widget)
 static void
 mv_close_mcv (MailViewChild *mfv, MailView *mv)
 {
-	gint n = mv_get_page_number ((GtkNotebook *)mv, (GtkWidget *)mfv);
-	gint pos = gtk_notebook_get_current_page ((GtkNotebook *)mv);
+	gint n = mv_get_page_number ((GtkNotebook *) mv, (GtkWidget *) mfv);
+	gint pos = gtk_notebook_get_current_page ((GtkNotebook *) mv);
 	MailViewChild *child;
 	gboolean removing_viewed = FALSE;
 
@@ -222,7 +222,7 @@ mv_close_mcv (MailViewChild *mfv, MailView *mv)
 		gboolean found = FALSE;
 
 		while (!found && tmp) {
-			MailViewChild *tchild = (MailViewChild *)tmp->data;
+			MailViewChild *tchild = (MailViewChild *) tmp->data;
 
 			if (tchild && tchild != mfv && tchild->type == MAIL_VIEW_FOLDER)
 				found = true;
@@ -234,13 +234,13 @@ mv_close_mcv (MailViewChild *mfv, MailView *mv)
 	}
 
 	if (mfv->type == MAIL_VIEW_COMPOSER) {
-		if (!mail_composer_view_can_quit ((MailComposerView *)mfv))
+		if (!mail_composer_view_can_quit ((MailComposerView *) mfv))
 			return;
 	}
 #endif
 
 	g_signal_handlers_block_by_func (mv, mv_switch, mv);
-	gtk_notebook_remove_page ((GtkNotebook *)mv, n);
+	gtk_notebook_remove_page ((GtkNotebook *) mv, n);
 	g_signal_handlers_unblock_by_func (mv, mv_switch, mv);
 
 	if (mfv == mv->priv->children->data)
@@ -250,28 +250,28 @@ mv_close_mcv (MailViewChild *mfv, MailView *mv)
 	if (!removing_viewed)
 		return;
 
-	child = (MailViewChild *)mv->priv->children->data;
+	child = (MailViewChild *) mv->priv->children->data;
 	mv->priv->current_view = child;
-	pos = mv_get_page_number ((GtkNotebook *)mv, (GtkWidget *)child);
-	gtk_notebook_set_current_page ((GtkNotebook *)mv, pos);
+	pos = mv_get_page_number ((GtkNotebook *) mv, (GtkWidget *) child);
+	gtk_notebook_set_current_page ((GtkNotebook *) mv, pos);
 
 #ifndef ANJAL_SETTINGS
 	if (child->type == MAIL_VIEW_COMPOSER)
-		 mail_composer_view_activate ((MailComposerView *)child, mv->folder_tree, mv->check_mail, mv->sort_by, TRUE);
+		 mail_composer_view_activate ((MailComposerView *) child, mv->folder_tree, mv->check_mail, mv->sort_by, TRUE);
 	else if (child->type == MAIL_VIEW_MESSAGE)
-		 mail_conv_view_activate ((MailConvView *)child, mv->tree, mv->folder_tree, mv->check_mail, mv->sort_by, FALSE);
+		 mail_conv_view_activate ((MailConvView *) child, mv->tree, mv->folder_tree, mv->check_mail, mv->sort_by, FALSE);
 	else if (child->type == MAIL_VIEW_FOLDER) {
-		 mail_folder_view_activate ((MailFolderView *)child, mv->tree, mv->folder_tree, mv->check_mail, mv->sort_by, mv->slider, TRUE);
-		 anjal_shell_view_restore_state ((EShellView *)mv->shell_view, child->uri);
+		 mail_folder_view_activate ((MailFolderView *) child, mv->tree, mv->folder_tree, mv->check_mail, mv->sort_by, mv->slider, TRUE);
+		 anjal_shell_view_restore_state ((EShellView *) mv->shell_view, child->uri);
 	} else if (child->type == MAIL_VIEW_ACCOUNT)
-		mail_account_view_activate ((MailAccountView *)child, mv->tree, mv->folder_tree, mv->check_mail, mv->sort_by, FALSE);
+		mail_account_view_activate ((MailAccountView *) child, mv->tree, mv->folder_tree, mv->check_mail, mv->sort_by, FALSE);
 	else if (child->type == MAIL_VIEW_SETTINGS)
-		mail_settings_view_activate ((MailSettingsView *)child, mv->tree, mv->folder_tree, mv->check_mail, mv->sort_by, mv->slider, FALSE);
+		mail_settings_view_activate ((MailSettingsView *) child, mv->tree, mv->folder_tree, mv->check_mail, mv->sort_by, mv->slider, FALSE);
 #else
 	if (child->type == MAIL_VIEW_ACCOUNT)
-		mail_account_view_activate ((MailAccountView *)child, mv->tree, mv->folder_tree, mv->check_mail, mv->sort_by, FALSE);
+		mail_account_view_activate ((MailAccountView *) child, mv->tree, mv->folder_tree, mv->check_mail, mv->sort_by, FALSE);
 	else if (child->type == MAIL_VIEW_SETTINGS)
-		mail_settings_view_activate ((MailSettingsView *)child, mv->tree, mv->folder_tree, mv->check_mail, mv->sort_by, mv->slider, FALSE);
+		mail_settings_view_activate ((MailSettingsView *) child, mv->tree, mv->folder_tree, mv->check_mail, mv->sort_by, mv->slider, FALSE);
 
 #endif
 }
@@ -280,7 +280,7 @@ mv_close_mcv (MailViewChild *mfv, MailView *mv)
 static void
 mv_message_new (MailFolderView *mfv, gpointer data, gchar *umid, MailView *mv)
 {
-	MailConvView *conv = (MailConvView *)mv_switch_message_view (mv, umid);
+	MailConvView *conv = (MailConvView *) mv_switch_message_view (mv, umid);
 	*(MailConvView **)data = conv;
 
 	if (conv)
@@ -292,7 +292,7 @@ mv_message_new (MailFolderView *mfv, gpointer data, gchar *umid, MailView *mv)
 static void
 mv_search_set (MailFolderView *mfv, MailView *mv)
 {
-	anjal_shell_view_restore_state (mv->shell_view, ((MailViewChild *)mfv)->uri);
+	anjal_shell_view_restore_state (mv->shell_view, ((MailViewChild *) mfv)->uri);
 }
 
 static void
@@ -309,15 +309,15 @@ mail_view_add_folder (MailView *mv, gpointer data, gboolean block)
 	gint position = 0;
 	mail_folder_view_set_folder_pane (mfv, mv->folder_tree);
 	if (!block)
-		mv->priv->current_view = (MailViewChild *)mfv;
+		mv->priv->current_view = (MailViewChild *) mfv;
 	mv->priv->children = block ? g_list_append (mv->priv->children,  mfv) :  g_list_prepend (mv->priv->children,  mfv);
-	position = gtk_notebook_append_page ((GtkNotebook *)mv, (GtkWidget *)mfv, mfv->tab_label);
-	gtk_notebook_set_tab_reorderable (GTK_NOTEBOOK (mv), (GtkWidget *)mfv, TRUE);
-	gtk_notebook_set_tab_detachable (GTK_NOTEBOOK (mv), (GtkWidget *)mfv, FALSE);
+	position = gtk_notebook_append_page ((GtkNotebook *) mv, (GtkWidget *) mfv, mfv->tab_label);
+	gtk_notebook_set_tab_reorderable (GTK_NOTEBOOK (mv), (GtkWidget *) mfv, TRUE);
+	gtk_notebook_set_tab_detachable (GTK_NOTEBOOK (mv), (GtkWidget *) mfv, FALSE);
 
 	g_signal_connect (mfv, "view-close", G_CALLBACK(mv_close_mcv), mv);
 	if (!block)
-		 gtk_notebook_set_current_page ((GtkNotebook *)mv, position);
+		 gtk_notebook_set_current_page ((GtkNotebook *) mv, position);
 	g_signal_connect (mfv, "message-shown", G_CALLBACK(mv_message_shown), mv);
 	g_signal_connect (mfv, "message-new", G_CALLBACK(mv_message_new), mv);
 	g_signal_connect (mfv, "search-set", G_CALLBACK(mv_search_set), mv);
@@ -325,7 +325,7 @@ mail_view_add_folder (MailView *mv, gpointer data, gboolean block)
 	if (!block)
 		 mail_folder_view_activate (mfv, mv->tree, mv->folder_tree, mv->check_mail, mv->sort_by, mv->slider, TRUE);
 
-	return (MailViewChild *)mfv;
+	return (MailViewChild *) mfv;
 }
 
 static MailViewChild *
@@ -341,29 +341,29 @@ mail_view_add_composer (MailView *mv, gpointer data, gboolean block)
 		special = TRUE;
 		data = NULL;
 	} else
-		mcv = mail_composer_view_new_with_composer ((GtkWidget *)data);
+		mcv = mail_composer_view_new_with_composer ((GtkWidget *) data);
 	if (!block)
-		mv->priv->current_view = (MailViewChild *)mcv;
+		mv->priv->current_view = (MailViewChild *) mcv;
 	mv->priv->children = block ? g_list_append (mv->priv->children,  mcv) :  g_list_prepend (mv->priv->children,  mcv);
 
 	if (!special)
-		position = gtk_notebook_append_page ((GtkNotebook *)mv, (GtkWidget *)mcv, mcv->tab_label);
+		position = gtk_notebook_append_page ((GtkNotebook *) mv, (GtkWidget *) mcv, mcv->tab_label);
 	else {
-		gint position = gtk_notebook_get_current_page ((GtkNotebook *)mv);
-		gtk_notebook_insert_page ((GtkNotebook *)mv, (GtkWidget *)mcv, mcv->tab_label, position+1);
+		gint position = gtk_notebook_get_current_page ((GtkNotebook *) mv);
+		gtk_notebook_insert_page ((GtkNotebook *) mv, (GtkWidget *) mcv, mcv->tab_label, position+1);
 	}
 
-	gtk_notebook_set_tab_reorderable (GTK_NOTEBOOK (mv), (GtkWidget *)mcv, TRUE);
-	gtk_notebook_set_tab_detachable (GTK_NOTEBOOK (mv), (GtkWidget *)mcv, FALSE);
+	gtk_notebook_set_tab_reorderable (GTK_NOTEBOOK (mv), (GtkWidget *) mcv, TRUE);
+	gtk_notebook_set_tab_detachable (GTK_NOTEBOOK (mv), (GtkWidget *) mcv, FALSE);
 	if (!block)
-		 gtk_notebook_set_current_page ((GtkNotebook *)mv, position);
+		 gtk_notebook_set_current_page ((GtkNotebook *) mv, position);
 	if (!block)
 		 mail_composer_view_activate (mcv, mv->folder_tree, mv->check_mail, mv->sort_by, FALSE);
 
 	g_signal_connect (mcv, "view-close", G_CALLBACK(mv_close_mcv), mv);
 	g_signal_connect (mcv, "message-shown", G_CALLBACK(mv_message_shown), mv);
 
-	return (MailViewChild *)mcv;
+	return (MailViewChild *) mcv;
 }
 
 static MailViewChild *
@@ -372,25 +372,25 @@ mail_view_add_message (MailView *mv, gpointer data, gboolean block)
 	MailConvView *mcv = mail_conv_view_new ();
 	gint position = 0;
 
-	gtk_widget_show ((GtkWidget *)mcv);
+	gtk_widget_show ((GtkWidget *) mcv);
 	mcv->type = MAIL_VIEW_MESSAGE;
 	if (!block)
-		mv->priv->current_view = (MailViewChild *)mcv;
+		mv->priv->current_view = (MailViewChild *) mcv;
 	mv->priv->children = block ? g_list_append (mv->priv->children,  mcv) :  g_list_prepend (mv->priv->children,  mcv);
 
-	position = gtk_notebook_get_current_page ((GtkNotebook *)mv);
-	gtk_notebook_insert_page ((GtkNotebook *)mv, (GtkWidget *)mcv, mail_conv_view_get_tab_widget (mcv), position+1);
-	gtk_notebook_set_tab_reorderable (GTK_NOTEBOOK (mv), (GtkWidget *)mcv, TRUE);
-	gtk_notebook_set_tab_detachable (GTK_NOTEBOOK (mv), (GtkWidget *)mcv, FALSE);
+	position = gtk_notebook_get_current_page ((GtkNotebook *) mv);
+	gtk_notebook_insert_page ((GtkNotebook *) mv, (GtkWidget *) mcv, mail_conv_view_get_tab_widget (mcv), position+1);
+	gtk_notebook_set_tab_reorderable (GTK_NOTEBOOK (mv), (GtkWidget *) mcv, TRUE);
+	gtk_notebook_set_tab_detachable (GTK_NOTEBOOK (mv), (GtkWidget *) mcv, FALSE);
 	if (!block)
-		gtk_notebook_set_current_page ((GtkNotebook *)mv, position+1);
+		gtk_notebook_set_current_page ((GtkNotebook *) mv, position+1);
 	if (!block)
 		 mail_conv_view_activate (mcv, mv->tree, mv->folder_tree, mv->check_mail, mv->sort_by, FALSE);
 
 	g_signal_connect (mcv, "view-close", G_CALLBACK(mv_close_mcv), mv);
 	g_signal_connect (mcv, "message-shown", G_CALLBACK(mv_message_shown), mv);
 
-	return (MailViewChild *)mcv;
+	return (MailViewChild *) mcv;
 }
 
 #endif
@@ -407,22 +407,22 @@ mail_view_add_settings (MailView *mv, gpointer data, gboolean block)
 	MailSettingsView *msv  = mail_settings_view_new ();
 	gint position = 0;
 
-	gtk_widget_show ((GtkWidget *)msv);
+	gtk_widget_show ((GtkWidget *) msv);
 	if (!block)
-		mv->priv->current_view = (MailViewChild *)msv;
+		mv->priv->current_view = (MailViewChild *) msv;
 	mv->priv->children = block ? g_list_append (mv->priv->children,  msv) :  g_list_prepend (mv->priv->children,  msv);
 
-	position = gtk_notebook_append_page ((GtkNotebook *)mv, (GtkWidget *)msv, mail_settings_view_get_tab_widget (msv));
+	position = gtk_notebook_append_page ((GtkNotebook *) mv, (GtkWidget *) msv, mail_settings_view_get_tab_widget (msv));
 	g_signal_connect (msv, "view-close", G_CALLBACK(mv_close_mcv), mv);
 	g_signal_connect (msv, "show-account", G_CALLBACK(mv_show_acc_mcv), mv);
-	gtk_notebook_set_tab_reorderable (GTK_NOTEBOOK (mv), (GtkWidget *)msv, TRUE);
-	gtk_notebook_set_tab_detachable (GTK_NOTEBOOK (mv), (GtkWidget *)msv, FALSE);
+	gtk_notebook_set_tab_reorderable (GTK_NOTEBOOK (mv), (GtkWidget *) msv, TRUE);
+	gtk_notebook_set_tab_detachable (GTK_NOTEBOOK (mv), (GtkWidget *) msv, FALSE);
 	if (!block)
-		gtk_notebook_set_current_page ((GtkNotebook *)mv, position);
+		gtk_notebook_set_current_page ((GtkNotebook *) mv, position);
 	if (!block)
 		 mail_settings_view_activate (msv, mv->tree, mv->folder_tree, mv->check_mail, mv->sort_by, mv->slider, FALSE);
 
-	return (MailViewChild *)msv;
+	return (MailViewChild *) msv;
 }
 
 static MailViewChild *
@@ -434,20 +434,20 @@ mail_view_add_account (MailView *mv,
 	gint position = 0;
 
 	msv = mail_account_view_new (data, mv->session);
-	gtk_widget_show ((GtkWidget *)msv);
+	gtk_widget_show ((GtkWidget *) msv);
 	if (!block)
-		mv->priv->current_view = (MailViewChild *)msv;
+		mv->priv->current_view = (MailViewChild *) msv;
 	mv->priv->children = block ? g_list_append (mv->priv->children,  msv) :  g_list_prepend (mv->priv->children,  msv);
-	position = gtk_notebook_append_page ((GtkNotebook *)mv, (GtkWidget *)msv, mail_account_view_get_tab_widget (msv));
+	position = gtk_notebook_append_page ((GtkNotebook *) mv, (GtkWidget *) msv, mail_account_view_get_tab_widget (msv));
 	g_signal_connect_after (msv, "view-close", G_CALLBACK(mv_close_mcv), mv);
-	gtk_notebook_set_tab_reorderable (GTK_NOTEBOOK (mv), (GtkWidget *)msv, TRUE);
-	gtk_notebook_set_tab_detachable (GTK_NOTEBOOK (mv), (GtkWidget *)msv, FALSE);
+	gtk_notebook_set_tab_reorderable (GTK_NOTEBOOK (mv), (GtkWidget *) msv, TRUE);
+	gtk_notebook_set_tab_detachable (GTK_NOTEBOOK (mv), (GtkWidget *) msv, FALSE);
 	if (!block)
-		gtk_notebook_set_current_page ((GtkNotebook *)mv, position);
+		gtk_notebook_set_current_page ((GtkNotebook *) mv, position);
 	if (!block)
 		 mail_account_view_activate (msv, mv->tree, mv->folder_tree, mv->check_mail, mv->sort_by, FALSE);
 
-	return (MailViewChild *)msv;
+	return (MailViewChild *) msv;
 }
 
 MailViewChild *
@@ -481,7 +481,7 @@ mail_view_add_page (MailView *mv, guint16 type, gpointer data)
 		 child = mail_view_add_account (mv, data, block);
 		break;
 	}
-	gtk_widget_grab_focus ((GtkWidget *)child);
+	gtk_widget_grab_focus ((GtkWidget *) child);
 	child->type = type;
 	g_signal_handlers_unblock_by_func (mv, mv_switch, mv);
 
@@ -497,11 +497,11 @@ mv_switch_folder_view (MailView *mv, const gchar *uri)
 	 gint i=0, len = g_list_length (mv->priv->children);
 	 GList *tmp = mv->priv->children;
 	 while (i<len) {
-		  MailViewChild *child = (MailViewChild *)gtk_notebook_get_nth_page ((GtkNotebook *)mv, i);
+		  MailViewChild *child = (MailViewChild *) gtk_notebook_get_nth_page ((GtkNotebook *) mv, i);
 
 		  if (child->type == MAIL_VIEW_FOLDER && !strcmp (uri, child->uri)) {
 			if (child != mv->priv->current_view) {
-				gtk_notebook_set_current_page ((GtkNotebook *)mv, i);
+				gtk_notebook_set_current_page ((GtkNotebook *) mv, i);
 			}
 			return;
 		  }
@@ -510,7 +510,7 @@ mv_switch_folder_view (MailView *mv, const gchar *uri)
 	 }
 
 	 mail_view_add_page (mv, MAIL_VIEW_FOLDER, NULL);
-	 mail_folder_view_set_folder_uri ((MailFolderView *)mv->priv->current_view, uri);
+	 mail_folder_view_set_folder_uri ((MailFolderView *) mv->priv->current_view, uri);
 }
 
 static MailConvView *
@@ -521,8 +521,8 @@ mv_switch_message_view (MailView *mv, const gchar *uri)
 	 while (tmp) {
 		  MailViewChild *child = tmp->data;
 		  if (child->type == MAIL_VIEW_MESSAGE && !strcmp (uri, child->uri)) {
-			   gtk_notebook_set_current_page ((GtkNotebook *)mv, i);
-			   mail_conv_view_activate ((MailConvView *)child, mv->tree, mv->folder_tree, mv->check_mail, mv->sort_by, FALSE);
+			   gtk_notebook_set_current_page ((GtkNotebook *) mv, i);
+			   mail_conv_view_activate ((MailConvView *) child, mv->tree, mv->folder_tree, mv->check_mail, mv->sort_by, FALSE);
 			   REALIGN_NODES (mv->priv->children,child);
 			   return NULL;
 		  }
@@ -530,7 +530,7 @@ mv_switch_message_view (MailView *mv, const gchar *uri)
 		  tmp = tmp->next;
 	 }
 
-	 return (MailConvView *)mail_view_add_page (mv, MAIL_VIEW_MESSAGE, NULL);
+	 return (MailConvView *) mail_view_add_page (mv, MAIL_VIEW_MESSAGE, NULL);
 }
 
 void
@@ -544,7 +544,7 @@ mail_view_set_folder_uri (MailView *mv, const gchar *uri)
 void
 mail_view_close_view (MailView *mv)
 {
-	 MailViewChild *child = (MailViewChild *)mv->priv->current_view;
+	 MailViewChild *child = (MailViewChild *) mv->priv->current_view;
 
 	 mv_close_mcv (child, mv);
 }
@@ -559,19 +559,19 @@ mail_view_set_folder_tree (MailView *mv, GtkWidget *tree)
 static void
 mv_spinner_done (CamelFolder *f, gpointer data)
 {
-	MailView *mv = (MailView *)data;
+	MailView *mv = (MailView *) data;
 	 mv_spinner_show (mv, FALSE);
 }
 
 void
 mail_view_set_search (MailView *mv, const gchar *search)
 {
-	MailViewChild *child = (MailViewChild *)mv->priv->current_view;
+	MailViewChild *child = (MailViewChild *) mv->priv->current_view;
 
 	if (child && child->type == MAIL_VIEW_FOLDER) {
-		MailFolderView *mfv = (MailFolderView *)child;
+		MailFolderView *mfv = (MailFolderView *) child;
 
-		mail_folder_view_set_search (mfv, search, e_shell_searchbar_get_search_text ((EShellSearchbar *)mv->priv->search_entry));
+		mail_folder_view_set_search (mfv, search, e_shell_searchbar_get_search_text ((EShellSearchbar *) mv->priv->search_entry));
 	}
 }
 #endif