** Remove trailing whitespace from source code.

2007-11-14  Matthew Barnes  <mbarnes@redhat.com>

	** Remove trailing whitespace from source code.


svn path=/trunk/; revision=34537

108 files changed, 2274 insertions, 2274 deletions

diff --git a/plugins/addressbook-file/addressbook-file.c b/plugins/addressbook-file/addressbook-file.c
index 4c2000ed46..6e251b3572 100644
--- a/plugins/addressbook-file/addressbook-file.c
+++ b/plugins/addressbook-file/addressbook-file.c
@@ -37,18 +37,18 @@ e_book_file_dummy (EPlugin *epl, EConfigHookItemFactoryData *data)
         uri_text = e_source_get_uri (source);
 	if (strncmp (uri_text, "file", 4)) {
 		g_free (uri_text);
-		
+
 		return NULL;
 	}
-	
+
 	relative_uri = e_source_peek_relative_uri (source);
 	g_free (uri_text);
-	
-	
-	if (relative_uri && *relative_uri) {	  		
+
+
+	if (relative_uri && *relative_uri) {
 		return NULL;
 	}
-		
+
 	e_source_set_relative_uri (source, e_source_peek_uid (source));
 
 	return NULL;
diff --git a/plugins/attachment-reminder/attachment-reminder.c b/plugins/attachment-reminder/attachment-reminder.c
index 8cec986cd5..a25dfb3b73 100644
--- a/plugins/attachment-reminder/attachment-reminder.c
+++ b/plugins/attachment-reminder/attachment-reminder.c
@@ -226,7 +226,7 @@ clue_check_isempty (GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, U
 	GtkTreeSelection *selection;
 	char *keyword;
 	gboolean valid;
-	
+
 	selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (ui->treeview));
 	/* move to the previous node */
 	valid = gtk_tree_path_prev(path);
@@ -308,7 +308,7 @@ clue_add_clicked (GtkButton *button, UIData *ui)
 	gtk_list_store_set (GTK_LIST_STORE (model), &iter,
 				    CLUE_KEYWORD_COLUMN, new_clue, -1);
 
-	focus_col = gtk_tree_view_get_column (GTK_TREE_VIEW (ui->treeview), CLUE_KEYWORD_COLUMN);	
+	focus_col = gtk_tree_view_get_column (GTK_TREE_VIEW (ui->treeview), CLUE_KEYWORD_COLUMN);
 	path = gtk_tree_model_get_path (model, &iter);
 
 	if (path) {
@@ -340,7 +340,7 @@ clue_remove_clicked (GtkButton *button, UIData *ui)
 	path = gtk_tree_model_get_path (model, &iter);
 	if (path)
 		valid = gtk_tree_path_prev(path);
-	
+
 	gtk_list_store_remove (GTK_LIST_STORE (model), &iter);
 
 	len = gtk_tree_model_iter_n_children (model, NULL);
@@ -377,7 +377,7 @@ clue_edit_clicked (GtkButton *button, UIData *ui)
 	if (!gtk_tree_selection_get_selected (selection, &model, &iter))
 		return;
 
-	focus_col = gtk_tree_view_get_column (GTK_TREE_VIEW (ui->treeview), CLUE_KEYWORD_COLUMN);	
+	focus_col = gtk_tree_view_get_column (GTK_TREE_VIEW (ui->treeview), CLUE_KEYWORD_COLUMN);
 	path = gtk_tree_model_get_path (model, &iter);
 
 	if (path) {
@@ -413,7 +413,7 @@ selection_changed (GtkTreeSelection *selection, UIData *ui)
 	}
 }
 
-void 
+void
 e_plugin_lib_configure (EPlugin *epl)
 {
 	GtkWidget *dialog;
@@ -444,7 +444,7 @@ e_plugin_lib_configure (EPlugin *epl)
 
 	if (store == NULL)
 		store = gtk_list_store_new (CLUE_N_COLUMNS, G_TYPE_STRING);
-	else 
+	else
 		gtk_list_store_clear (store);
 
 	gtk_tree_view_set_model (GTK_TREE_VIEW (ui->treeview), GTK_TREE_MODEL (store));
diff --git a/plugins/audio-inline/audio-inline.c b/plugins/audio-inline/audio-inline.c
index 87d40d381d..6394eb986a 100644
--- a/plugins/audio-inline/audio-inline.c
+++ b/plugins/audio-inline/audio-inline.c
@@ -1,4 +1,4 @@
-/* 
+/*
    Copyright (C) 2004 Novell, Inc.
    Author: Radek Doulik
 
@@ -26,7 +26,7 @@
 #include "gtkhtml/gtkhtml-embedded.h"
 #include "gst/gst.h"
 
-#define d(x) 
+#define d(x)
 
 void org_gnome_audio_inline_format (void *ep, EMFormatHookTarget *t);
 
@@ -159,11 +159,11 @@ org_gnome_audio_inline_gst_callback (GstBus * bus, GstMessage * message, gpointe
 			      if (old_state == new_state)
 				      break;
 
-			      if (po->play_button) 
+			      if (po->play_button)
 					gtk_widget_set_sensitive (po->play_button, new_state <= GST_STATE_PAUSED);
-			      if (po->pause_button) 
+			      if (po->pause_button)
 					gtk_widget_set_sensitive (po->pause_button, new_state > GST_STATE_PAUSED);
-			      if (po->stop_button) 
+			      if (po->stop_button)
 				      	gtk_widget_set_sensitive (po->stop_button, new_state >= GST_STATE_PAUSED);
 			}
 
@@ -270,7 +270,7 @@ org_gnome_audio_inline_button_panel (EMFormatHTML *efh, GtkHTMLEmbedded *eb, EMF
 	po->play_button = g_object_ref (org_gnome_audio_inline_add_button (box, GTK_STOCK_MEDIA_PLAY, G_CALLBACK (org_gnome_audio_inline_play_clicked), po, TRUE));
 	po->pause_button = g_object_ref (org_gnome_audio_inline_add_button (box, GTK_STOCK_MEDIA_PAUSE, G_CALLBACK (org_gnome_audio_inline_pause_clicked), po, FALSE));
 	po->stop_button = g_object_ref (org_gnome_audio_inline_add_button (box, GTK_STOCK_MEDIA_STOP, G_CALLBACK (org_gnome_audio_inline_stop_clicked), po, FALSE));
-		
+
 	gtk_widget_show (box);
 	gtk_container_add ((GtkContainer *) eb, box);
 
diff --git a/plugins/backup-restore/backup-restore.c b/plugins/backup-restore/backup-restore.c
index d2d4f3aae4..f5b608bb7a 100644
--- a/plugins/backup-restore/backup-restore.c
+++ b/plugins/backup-restore/backup-restore.c
@@ -51,7 +51,7 @@ sanity_check (const char *filename)
 	g_free (command);
 
 	g_message ("Sanity check result %d:%d %d", WIFEXITED (result), WEXITSTATUS (result), result);
-	
+
 	return WIFEXITED (result) && (WEXITSTATUS (result) == 0);
 }
 
@@ -73,7 +73,7 @@ dialog_prompt_user(GtkWindow *parent, const char *string, const char *tag, const
 	gtk_container_set_border_width((GtkContainer *)check, 12);
 	gtk_box_pack_start ((GtkBox *)((GtkDialog *) mbox)->vbox, check, TRUE, TRUE, 0);
 	gtk_widget_show (check);
-	
+
 	button = gtk_dialog_run ((GtkDialog *) mbox);
 
 	if (button == GTK_RESPONSE_YES)
@@ -82,7 +82,7 @@ dialog_prompt_user(GtkWindow *parent, const char *string, const char *tag, const
 		mask |= BR_START;
 
 	gtk_widget_destroy(mbox);
-	
+
 	return mask;
 }
 
@@ -94,17 +94,17 @@ org_gnome_backup_restore_backup (EPlugin *ep, ESMenuTargetShell *target)
 	int response;
 
 	dlg = e_file_get_save_filesel(target->target.widget, _("Select name of the Evolution backup file"), NULL, GTK_FILE_CHOOSER_ACTION_SAVE);
-								  
+
 /* 	dlg = gtk_file_chooser_dialog_new (_("Select name of the Evolution backup file"), GTK_WINDOW (target->target.widget),  */
 /* 					   GTK_FILE_CHOOSER_ACTION_SAVE,  */
 /* 					   GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,  */
 /* 					   GTK_STOCK_SAVE, GTK_RESPONSE_OK, NULL); */
 
 	gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (dlg), "evolution-backup.tar.gz");
-	
+
 	vbox = gtk_vbox_new (FALSE, 6);
 	gtk_widget_show (vbox);
-	
+
 	response = gtk_dialog_run (GTK_DIALOG (dlg));
 	if (response == GTK_RESPONSE_OK) {
 		char *filename;
@@ -113,19 +113,19 @@ org_gnome_backup_restore_backup (EPlugin *ep, ESMenuTargetShell *target)
 
 		uri = gtk_file_chooser_get_current_folder_uri(GTK_FILE_CHOOSER (dlg));
 		e_file_update_save_path(uri, TRUE);
-		
+
 		filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dlg));
 		gtk_widget_destroy (dlg);
-	
+
 		mask = dialog_prompt_user (GTK_WINDOW (target->target.widget), _("_Restart Evolution after backup"), "org.gnome.backup-restore:backup-confirm", NULL);
-		if (mask & BR_OK) 
+		if (mask & BR_OK)
 			backup (filename, (mask & BR_START) ? TRUE: FALSE);
 
 		g_free (filename);
 
 		return;
 	}
-	
+
 	gtk_widget_destroy (dlg);
 }
 
@@ -137,15 +137,15 @@ org_gnome_backup_restore_restore (EPlugin *ep, ESMenuTargetShell *target)
 	int response;
 
 	dlg = e_file_get_save_filesel(target->target.widget, _("Select name of the Evolution backup file to restore"), NULL, GTK_FILE_CHOOSER_ACTION_OPEN);
-								  
+
 /* 	dlg = gtk_file_chooser_dialog_new (_("Select Evolution backup file to restore"), GTK_WINDOW (target->target.widget),  */
 /* 					   GTK_FILE_CHOOSER_ACTION_OPEN,  */
 /* 					   GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,  */
 /* 					   GTK_STOCK_OPEN, GTK_RESPONSE_OK, NULL); */
-	
+
 	vbox = gtk_vbox_new (FALSE, 6);
 	gtk_widget_show (vbox);
-	
+
 	response = gtk_dialog_run (GTK_DIALOG (dlg));
 	if (response == GTK_RESPONSE_OK) {
 		char *filename;
@@ -153,30 +153,30 @@ org_gnome_backup_restore_restore (EPlugin *ep, ESMenuTargetShell *target)
 
 		uri = gtk_file_chooser_get_current_folder_uri(GTK_FILE_CHOOSER (dlg));
 		e_file_update_save_path(uri, TRUE);
-		
+
 		filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dlg));
 		gtk_widget_destroy (dlg);
-		
+
 		if (sanity_check (filename)) {
 			guint32 mask;
-		
+
 			mask = dialog_prompt_user (GTK_WINDOW (target->target.widget), _("_Restart Evolution after restore"), "org.gnome.backup-restore:restore-confirm", NULL);
-			if (mask & BR_OK) 
+			if (mask & BR_OK)
 				restore (filename, mask & BR_START);
 		} else {
 			e_error_run (GTK_WINDOW (target->target.widget), "org.gnome.backup-restore:invalid-backup", NULL);
 		}
-		
+
 		g_free (filename);
 
 		return;
 	}
-	
+
 	gtk_widget_destroy (dlg);
 }
 
 static void
-check_toggled (GtkToggleButton *button, GnomeDruid *druid) 
+check_toggled (GtkToggleButton *button, GnomeDruid *druid)
 {
 	 GtkWidget *box = g_object_get_data ((GObject *)button, "box");
 	gboolean state =  gtk_toggle_button_get_active ((GtkToggleButton *)button);
@@ -184,17 +184,17 @@ check_toggled (GtkToggleButton *button, GnomeDruid *druid)
 
 	gtk_widget_set_sensitive (box, state);
 	gnome_druid_set_show_finish (druid, state);
-	if (state && !prevfile) 
+	if (state && !prevfile)
 		gnome_druid_set_buttons_sensitive (druid, TRUE, FALSE, TRUE, TRUE);
 	else
 		gnome_druid_set_buttons_sensitive (druid, TRUE, TRUE, TRUE, TRUE);
 
 	g_object_set_data ((GObject *)druid, "restore", GINT_TO_POINTER (state?1:0));
-	
+
 }
 
 static void
-restore_wizard (GnomeDruidPage *druidpage, GnomeDruid *druid, gpointer user_data) 
+restore_wizard (GnomeDruidPage *druidpage, GnomeDruid *druid, gpointer user_data)
 {
 	gboolean state = GPOINTER_TO_INT(g_object_get_data((GObject *)druid, "restore")) ? TRUE:FALSE;
 	char *file = g_object_get_data ((GObject *)druid, "restore-file");
@@ -204,7 +204,7 @@ restore_wizard (GnomeDruidPage *druidpage, GnomeDruid *druid, gpointer user_data
 			 e_error_run ((GtkWindow *)druid, "org.gnome.backup-restore:invalid-backup", NULL);
 		} else
 			restore (file, TRUE);
-		
+
 	}
 }
 
@@ -216,14 +216,14 @@ file_changed (GtkFileChooser *chooser, GnomeDruid *druid)
 
 	uri = gtk_file_chooser_get_current_folder_uri(GTK_FILE_CHOOSER (chooser));
 	e_file_update_save_path(uri, TRUE);
-	
+
 	file = gtk_file_chooser_get_filename (chooser);
 	prevfile = g_object_get_data ((GObject *)druid, "restore-file");
 	g_object_set_data ((GObject *)druid, "restore-file", file);
 	g_free (prevfile);
 	if (file) {
 		gnome_druid_set_buttons_sensitive (druid, TRUE, TRUE, TRUE, TRUE);
-	} else 
+	} else
 		gnome_druid_set_buttons_sensitive (druid, TRUE, FALSE, TRUE, TRUE);
 
 }
@@ -232,14 +232,14 @@ backup_restore_page (EPlugin *ep, EConfigHookItemFactoryData *hook_data)
 {
 	GtkWidget *page;
 	GtkWidget *box, *hbox, *label, *cbox, *button;
-	
+
 	page = gnome_druid_page_standard_new_with_vals (_("Restore from backup"), NULL, NULL);
 	hbox = gtk_hbox_new (FALSE, 6);
 	label = gtk_label_new (_("You can restore Evolution from your backup. It can restore all the Mails, Calendars, Tasks, Memos, Contacts. \nIt also restores all your personal settings, mail filters etc."));
 	gtk_box_pack_start ((GtkBox *)hbox, label, FALSE, FALSE, 6);
 	box = gtk_vbox_new (FALSE, 6);
 	gtk_box_pack_start ((GtkBox *)box, hbox, FALSE, FALSE, 0);
-	
+
 	hbox = gtk_hbox_new (FALSE, 6);
 	cbox = gtk_check_button_new_with_mnemonic (_("_Restore Evolution from the backup file"));
 	g_signal_connect (cbox, "toggled", G_CALLBACK (check_toggled), hook_data->parent);
diff --git a/plugins/backup-restore/backup.c b/plugins/backup-restore/backup.c
index 90d389e239..ec3e0b16be 100644
--- a/plugins/backup-restore/backup.c
+++ b/plugins/backup-restore/backup.c
@@ -59,7 +59,7 @@ static const GOptionEntry options[] = {
 #define CANCEL(x) if (x) return;
 
 static void
-backup (const char *filename) 
+backup (const char *filename)
 {
 	char *command;
 
@@ -91,17 +91,17 @@ backup (const char *filename)
 		CANCEL (complete);
 		txt = _("Restarting Evolution");
 		complete=TRUE;
-		
+
 		s (EVOLUTION);
 	}
 
 }
 
 static void
-restore (const char *filename) 
+restore (const char *filename)
 {
 	char *command;
-	
+
 	/* FIXME Will the versioned setting always work? */
 	CANCEL (complete);
 	txt = _("Shutting down Evolution");
@@ -127,7 +127,7 @@ restore (const char *filename)
 	s ("rm -rf " GCONF_DUMP_PATH);
 	s ("rm -rf " EVOLUTION_DIR_BACKUP);
 	s ("rm -rf ~/.camel_certs_old");
-	
+
 	if (restart_arg) {
 		CANCEL (complete);
 		txt = _("Restarting Evolution");
@@ -138,14 +138,14 @@ restore (const char *filename)
 }
 
 static void
-check (const char *filename) 
+check (const char *filename)
 {
 	char *command;
 
 	command = g_strdup_printf ("tar ztf %s | grep -e \"^\\.evolution/$\"", filename);
 	result = system (command);
 	g_free (command);
-	
+
 	g_message ("First result %d", result);
 	if (result)
 		exit (result);
@@ -158,7 +158,7 @@ check (const char *filename)
 
 }
 
-static gboolean 
+static gboolean
 pbar_update()
 {
 	if (!complete) {
@@ -171,7 +171,7 @@ pbar_update()
 	return FALSE;
 }
 
-static gpointer 
+static gpointer
 thread_start (gpointer data)
 {
 	if (backup_op)
@@ -182,11 +182,11 @@ thread_start (gpointer data)
 		check (chk_file);
 
 	complete = TRUE;
-	
+
 	return GINT_TO_POINTER(result);
 }
 
-static gboolean 
+static gboolean
 idle_cb(gpointer data)
 {
 	GThread *t;
@@ -207,11 +207,11 @@ dlg_response (GtkWidget *dlg, gint response, gpointer data)
 {
 	/* We will cancel only backup/restore operations and not the check operation */
 	complete = TRUE;
-	
+
 	/* If the response is not of delete_event then destroy the event */
 	if (response != GTK_RESPONSE_NONE)
 		gtk_widget_destroy (dlg);
-	
+
 	/* We will kill just the tar operation. Rest of the them will be just a second of microseconds.*/
 	s ("pkill tar");
 
@@ -233,7 +233,7 @@ main (int argc, char **argv)
 
 	context = g_option_context_new (NULL);
 	g_option_context_add_main_entries (context, options, GETTEXT_PACKAGE);
-	program = gnome_program_init (PACKAGE, VERSION, LIBGNOME_MODULE, argc, argv, 
+	program = gnome_program_init (PACKAGE, VERSION, LIBGNOME_MODULE, argc, argv,
 				      GNOME_PROGRAM_STANDARD_PROPERTIES,
 				      GNOME_PARAM_GOPTION_CONTEXT, context,
 				      GNOME_PARAM_NONE);
@@ -267,9 +267,9 @@ main (int argc, char **argv)
                         	                          GTK_STOCK_CANCEL,
                                 	                  GTK_RESPONSE_REJECT,
                                         	          NULL);
-		if (oper && file) 
+		if (oper && file)
 			str = g_strdup_printf(oper, file);
-	
+
 		vbox = gtk_vbox_new (FALSE, 6);
 		if (str) {
 			hbox = gtk_hbox_new (FALSE, 12);
@@ -285,7 +285,7 @@ main (int argc, char **argv)
 
 
 		gtk_box_pack_start ((GtkBox *)vbox, hbox, FALSE, FALSE, 0);
-		
+
 		gtk_container_add (GTK_CONTAINER (GTK_DIALOG(progress_dialog)->vbox), vbox);
 		gtk_window_set_default_size ((GtkWindow *) progress_dialog,450, 120);
 		g_signal_connect (progress_dialog, "response", G_CALLBACK(dlg_response), NULL);
@@ -298,6 +298,6 @@ main (int argc, char **argv)
 
 	g_idle_add (idle_cb, NULL);
 	gtk_main ();
-	
+
 	return result;
 }
diff --git a/plugins/bbdb/bbdb.c b/plugins/bbdb/bbdb.c
index dfbced826e..9155bcb93b 100644
--- a/plugins/bbdb/bbdb.c
+++ b/plugins/bbdb/bbdb.c
@@ -17,10 +17,10 @@
  *  modify, merge, publish, distribute, sublicense, and/or sell copies
  *  of the Software, and to permit persons to whom the Software is
  *  furnished to do so, subject to the following conditions:
- *  
+ *
  *  The above copyright notice and this permission notice shall be
  *  included in all copies or substantial portions of the Software.
- *  
+ *
  *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
  *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
  *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
@@ -231,7 +231,7 @@ bbdb_do_it (EBook *book, const char *name, const char *email)
 			g_object_unref ((GObject *)l->data);
 		g_list_free (contacts);
 		g_free (temp_name);
-		
+
 		return;
 	}
 
@@ -246,7 +246,7 @@ bbdb_do_it (EBook *book, const char *name, const char *email)
 		temp_name = g_string_free (tmp, FALSE);
 		name = temp_name;
 	}
-	
+
 	/* If a contact exists with this name, add the email address to it. */
 	query_string = g_strdup_printf ("(is \"full_name\" \"%s\")", name);
 	query = e_book_query_from_string (query_string);
@@ -267,21 +267,21 @@ bbdb_do_it (EBook *book, const char *name, const char *email)
 			g_free (temp_name);
 			return;
 		}
-		
+
 		contact = (EContact *) contacts->data;
 		add_email_to_contact (contact, email);
 		if (! e_book_commit_contact (book, contact, &error)) {
 			g_warning ("bbdb: Could not modify contact: %s\n", error->message);
 			g_error_free (error);
 		}
-		
+
 		for (l = contacts; l != NULL; l = l->next)
 			g_object_unref ((GObject *)l->data);
 		g_list_free (contacts);
 
 		g_free (temp_name);
 		return;
-	} 
+	}
 
 	/* Otherwise, create a new contact. */
 	contact = e_contact_new ();
@@ -307,7 +307,7 @@ bbdb_open_addressbook (int type)
 
 	gboolean     status;
 	GError      *error = NULL;
-	
+
 	gconf = gconf_client_get_default ();
 
 	/* Open the appropriate addresbook. */
@@ -379,7 +379,7 @@ enable_toggled_cb (GtkWidget *widget, gpointer data)
 
 	/* Save the new setting to gconf */
 	gconf_client_set_bool (stuff->target->gconf, GCONF_KEY_ENABLE, active, NULL);
-	
+
 	gtk_widget_set_sensitive (stuff->option_menu, active);
 	if (active && !gconf_client_get_string (stuff->target->gconf, GCONF_KEY_WHICH_ADDRESSBOOK, NULL)) {
 		const gchar *uri = NULL;
@@ -413,7 +413,7 @@ enable_gaim_toggled_cb (GtkWidget *widget, gpointer data)
 
 	/* Save the new setting to gconf */
 	gconf_client_set_bool (stuff->target->gconf, GCONF_KEY_ENABLE_GAIM, active, NULL);
-	
+
 	gtk_widget_set_sensitive (stuff->gaim_option_menu, active);
 	if (active && !gconf_client_get_string (stuff->target->gconf, GCONF_KEY_WHICH_ADDRESSBOOK_GAIM, NULL)) {
 		selected_source = e_source_combo_box_get_active (
@@ -544,7 +544,7 @@ bbdb_page_factory (EPlugin *ep, EConfigHookItemFactoryData *hook_data)
 	g_free (str);
 	GTK_MISC (frame_label)->xalign = 0.0;
 	gtk_box_pack_start (GTK_BOX (frame), frame_label, FALSE, FALSE, 0);
-	
+
 	/* Indent/padding */
 	hbox = gtk_hbox_new (FALSE, 12);
 	gtk_box_pack_start (GTK_BOX (frame), hbox, FALSE, TRUE, 0);
@@ -552,7 +552,7 @@ bbdb_page_factory (EPlugin *ep, EConfigHookItemFactoryData *hook_data)
 	gtk_box_pack_start (GTK_BOX (hbox), padding_label, FALSE, FALSE, 0);
 	inner_vbox = gtk_vbox_new (FALSE, 6);
 	gtk_box_pack_start (GTK_BOX (hbox), inner_vbox, FALSE, FALSE, 0);
-	
+
 	/* Enable BBDB checkbox */
 	check = gtk_check_button_new_with_mnemonic (_("_Automatically create entries in the addressbook when responding to messages"));
 	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), gconf_client_get_bool (target->gconf, GCONF_KEY_ENABLE, NULL));
@@ -595,7 +595,7 @@ bbdb_page_factory (EPlugin *ep, EConfigHookItemFactoryData *hook_data)
 	g_signal_connect (GTK_TOGGLE_BUTTON (check_gaim), "toggled", G_CALLBACK (enable_gaim_toggled_cb), stuff);
 	gtk_box_pack_start (GTK_BOX (inner_vbox), check_gaim, FALSE, FALSE, 0);
 	stuff->check_gaim = check_gaim;
-	
+
 	gaim_label = gtk_label_new (_("Select Address book for Pidgin buddy list"));
 	gtk_box_pack_start (GTK_BOX (inner_vbox), gaim_label, FALSE, FALSE, 0);
 
@@ -610,7 +610,7 @@ bbdb_page_factory (EPlugin *ep, EConfigHookItemFactoryData *hook_data)
 	button = gtk_button_new_with_mnemonic (_("Synchronize with _buddy list now"));
 	g_signal_connect (GTK_BUTTON (button), "clicked", G_CALLBACK (synchronize_button_clicked_cb), stuff);
 	gtk_box_pack_start (GTK_BOX (inner_vbox), button, FALSE, FALSE, 0);
-	
+
 	/* Clean up */
 	g_signal_connect (page, "destroy", G_CALLBACK (cleanup_cb), stuff);
 
diff --git a/plugins/bbdb/bbdb.h b/plugins/bbdb/bbdb.h
index d1318b7d03..f4a3bc51ff 100644
--- a/plugins/bbdb/bbdb.h
+++ b/plugins/bbdb/bbdb.h
@@ -13,7 +13,7 @@
 
 
 /* How often to poll the buddy list for changes (every two minutes) */
-#define BBDB_BLIST_CHECK_INTERVAL (2 * 60 * 1000) 
+#define BBDB_BLIST_CHECK_INTERVAL (2 * 60 * 1000)
 
 /* bbdb.c */
 EBook *bbdb_open_addressbook (int type);
diff --git a/plugins/bbdb/gaimbuddies.c b/plugins/bbdb/gaimbuddies.c
index 6c91b06be4..e9d69a5cbe 100644
--- a/plugins/bbdb/gaimbuddies.c
+++ b/plugins/bbdb/gaimbuddies.c
@@ -19,10 +19,10 @@
  *  modify, merge, publish, distribute, sublicense, and/or sell copies
  *  of the Software, and to permit persons to whom the Software is
  *  furnished to do so, subject to the following conditions:
- *  
+ *
  *  The above copyright notice and this permission notice shall be
  *  included in all copies or substantial portions of the Software.
- *  
+ *
  *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
  *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
  *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
@@ -32,7 +32,7 @@
  *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  *  DEALINGS IN THE SOFTWARE.
  */
- 
+
 #include <glib.h>
 #include <libxml/tree.h>
 #include <libxml/parser.h>
@@ -84,7 +84,7 @@ bbdb_sync_buddy_list_check (void)
 	char *last_sync_str;
 
 	gconf = gconf_client_get_default ();
-	
+
 	blist_path = g_build_path ("/", getenv ("HOME"), ".purple/blist.xml", NULL);
 	if (stat (blist_path, &statbuf) < 0) {
 		g_free (blist_path);
@@ -173,14 +173,14 @@ bbdb_sync_buddy_list (void)
 			g_object_unref (G_OBJECT (c));
 			continue;
 		}
-		
+
 		if (! e_book_add_contact (book, c, &error)) {
 			g_warning ("bbdb: Failed to add new contact: %s\n", error->message);
 			g_error_free (error);
 			return;
 		}
 		g_object_unref (G_OBJECT (c));
-		
+
 	}
 
 
@@ -422,7 +422,7 @@ parse_contact (xmlNodePtr contact, GList **buddies)
 			gb->account_name = get_node_text (child);
 		else if (! strcmp ((const char *)child->name, "alias"))
 			gb->alias = get_node_text (child);
-			
+
 	}
 
 	*buddies = g_list_prepend (*buddies, gb);
diff --git a/plugins/bogo-junk-plugin/bf-junk-filter.c b/plugins/bogo-junk-plugin/bf-junk-filter.c
index 7d7be8ee0a..3e0758e14c 100644
--- a/plugins/bogo-junk-plugin/bf-junk-filter.c
+++ b/plugins/bogo-junk-plugin/bf-junk-filter.c
@@ -296,10 +296,10 @@ org_gnome_bogo_convert_unicode (struct _EPlugin *epl, struct _EConfigHookItemFac
 {
    	GtkWidget *check;
 	guint i = ((GtkTable *)data->parent)->nrows;
-    
+
 	if (data->old)
                 return data->old;
-		
+
 	check = gtk_check_button_new_with_mnemonic (_("Convert message text to _Unicode"));
 
 	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), em_junk_bf_unicode);
diff --git a/plugins/caldav/caldav-source.c b/plugins/caldav/caldav-source.c
index 5e43b7ea1e..c846ccde12 100644
--- a/plugins/caldav/caldav-source.c
+++ b/plugins/caldav/caldav-source.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * Author: Christian Kellner <gicmo@gnome.org> 
+ * Author: Christian Kellner <gicmo@gnome.org>
  */
 
 #ifdef HAVE_CONFIG_H
@@ -43,7 +43,7 @@
 int              e_plugin_lib_enable      (EPluginLib                 *ep,
 					   int                         enable);
 
-GtkWidget *      oge_caldav               (EPlugin                    *epl, 
+GtkWidget *      oge_caldav               (EPlugin                    *epl,
 					   EConfigHookItemFactoryData *data);
 
 /*****************************************************************************/
@@ -55,7 +55,7 @@ ensure_caldav_source_group (void)
 	ESourceList  *slist;
 	ESourceGroup *group;
 
-	
+
 	if (!e_cal_get_sources (&slist, E_CAL_SOURCE_TYPE_EVENT, NULL)) {
 		g_warning ("Could not get calendar source list from GConf!");
 		return;
@@ -67,13 +67,13 @@ ensure_caldav_source_group (void)
 		gboolean res;
 		group = e_source_group_new (_("CalDAV"), "caldav://");
 		res = e_source_list_add_group (slist, group, -1);
-		
+
 		if (res == FALSE) {
-			g_warning ("Could not add CalDAV source group!");	
+			g_warning ("Could not add CalDAV source group!");
 		} else {
 			e_source_list_sync (slist, NULL);
 		}
-		
+
 		g_object_unref (group);
 		g_object_unref (slist);
 	}
@@ -139,7 +139,7 @@ location_changed (GtkEntry *editable, ESource *source)
 	const char *uri;
 
 	uri = gtk_entry_get_text (GTK_ENTRY (editable));
-	
+
 	euri = e_uri_new (uri);
 	ruri = print_uri_noproto (euri);
 	e_source_set_relative_uri (source, ruri);
@@ -150,8 +150,8 @@ location_changed (GtkEntry *editable, ESource *source)
 static void
 ssl_changed (GtkToggleButton *button, ESource *source)
 {
-	e_source_set_property(source, "ssl", 
-			      gtk_toggle_button_get_active(button) ? "1" : "0");	
+	e_source_set_property(source, "ssl",
+			      gtk_toggle_button_get_active(button) ? "1" : "0");
 }
 
 static void
@@ -162,14 +162,14 @@ user_changed (GtkEntry *editable, ESource *source)
 	char       *ruri;
 	const char *user;
 
-	uri = e_source_get_uri (source); 
+	uri = e_source_get_uri (source);
 	user = gtk_entry_get_text (GTK_ENTRY (editable));
-	
+
 	if (uri == NULL) {
 		g_free (uri);
 		return;
 	}
-	
+
 	euri = e_uri_new (uri);
 	g_free (euri->user);
 
@@ -180,7 +180,7 @@ user_changed (GtkEntry *editable, ESource *source)
 		e_source_set_property (source, "auth", NULL);
 	}
 
-	e_source_set_property (source, "username", euri->user);	
+	e_source_set_property (source, "username", euri->user);
 	ruri = print_uri_noproto (euri);
 	e_source_set_relative_uri (source, ruri);
 	g_free (ruri);
@@ -188,7 +188,7 @@ user_changed (GtkEntry *editable, ESource *source)
 }
 
 GtkWidget *
-oge_caldav  (EPlugin                    *epl, 
+oge_caldav  (EPlugin                    *epl,
 	     EConfigHookItemFactoryData *data)
 {
 	ECalConfigTargetSource *t = (ECalConfigTargetSource *) data->target;
@@ -207,17 +207,17 @@ oge_caldav  (EPlugin                    *epl,
 	const char   *ssl_prop;
 	gboolean      ssl_enabled;
 	int           row;
-	
+
 	source = t->source;
 	group = e_source_peek_group (source);
-	
+
 	widget = NULL;
-	
-	if (!g_str_has_prefix (e_source_group_peek_base_uri (group), 
+
+	if (!g_str_has_prefix (e_source_group_peek_base_uri (group),
 			       "caldav")) {
 		return NULL;
 	}
-	
+
 	/* Extract the username from the uri so we can prefill the
 	 * dialog right, remove the username from the url then */
 	uri = e_source_get_uri (source);
@@ -227,12 +227,12 @@ oge_caldav  (EPlugin                    *epl,
 	if (euri == NULL) {
 		return NULL;
 	}
-	
+
 	username = euri->user;
 	euri->user = NULL;
 	uri = e_uri_to_string (euri, FALSE);
 
-	ssl_prop = e_source_get_property (source, "ssl");	
+	ssl_prop = e_source_get_property (source, "ssl");
 	if (ssl_prop && ssl_prop[0] == '1') {
 		ssl_enabled = TRUE;
 	} else {
@@ -241,15 +241,15 @@ oge_caldav  (EPlugin                    *epl,
 
 	/* Build up the UI */
 	parent = data->parent;
-	
+
 	row = GTK_TABLE (parent)->nrows;
 
 	lurl = gtk_label_new_with_mnemonic (_("_URL:"));
 	gtk_widget_show (lurl);
 	gtk_misc_set_alignment (GTK_MISC (lurl), 0.0, 0.5);
-	gtk_table_attach (GTK_TABLE (parent), 
-			  lurl, 0, 1, 
-			  row, row+1, 
+	gtk_table_attach (GTK_TABLE (parent),
+			  lurl, 0, 1,
+			  row, row+1,
 			  GTK_FILL, 0, 0, 0);
 
 	location = gtk_entry_new ();
@@ -260,31 +260,31 @@ oge_caldav  (EPlugin                    *epl,
 			  GTK_EXPAND | GTK_FILL, 0, 0, 0);
 
 	gtk_label_set_mnemonic_widget (GTK_LABEL (lurl), location);
-	
-	g_signal_connect (G_OBJECT (location), 
-			  "changed", 
+
+	g_signal_connect (G_OBJECT (location),
+			  "changed",
 			  G_CALLBACK (location_changed),
 			  source);
 
 	cssl = gtk_check_button_new_with_mnemonic (_("Use _SSL"));
 	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(cssl), ssl_enabled);
 	gtk_widget_show (cssl);
-	gtk_table_attach (GTK_TABLE (parent), 
-			  cssl, 1, 2, 
-			  row + 1, row + 2, 
+	gtk_table_attach (GTK_TABLE (parent),
+			  cssl, 1, 2,
+			  row + 1, row + 2,
 			  GTK_FILL, 0, 0, 0);
 
-	g_signal_connect (G_OBJECT (cssl), 
-			  "toggled", 
+	g_signal_connect (G_OBJECT (cssl),
+			  "toggled",
 			  G_CALLBACK (ssl_changed),
 			  source);
 
 	luser = gtk_label_new_with_mnemonic (_("User_name:"));
 	gtk_widget_show (luser);
 	gtk_misc_set_alignment (GTK_MISC (luser), 0.0, 0.5);
-	gtk_table_attach (GTK_TABLE (parent), 
-			  luser, 0, 1, 
-			  row + 2, row + 3, 
+	gtk_table_attach (GTK_TABLE (parent),
+			  luser, 0, 1,
+			  row + 2, row + 3,
 			  GTK_FILL, 0, 0, 0);
 
 	user = gtk_entry_new ();
@@ -295,17 +295,17 @@ oge_caldav  (EPlugin                    *epl,
 			  GTK_EXPAND | GTK_FILL, 0, 0, 0);
 
 	gtk_label_set_mnemonic_widget (GTK_LABEL (luser), user);
-	
-	g_signal_connect (G_OBJECT (user), 
-			  "changed", 
+
+	g_signal_connect (G_OBJECT (user),
+			  "changed",
 			  G_CALLBACK (user_changed),
 			  source);
-	
-	
+
+
         g_free (uri);
 	g_free (username);
-	
-	return widget;	
+
+	return widget;
 }
 
 
diff --git a/plugins/calendar-file/calendar-file.c b/plugins/calendar-file/calendar-file.c
index 75a45aa1aa..38add141c0 100644
--- a/plugins/calendar-file/calendar-file.c
+++ b/plugins/calendar-file/calendar-file.c
@@ -47,14 +47,14 @@ e_calendar_file_dummy (EPlugin *epl, EConfigHookItemFactoryData *data)
         uri_text = e_source_get_uri (source);
 	if (strncmp (uri_text, "file", 4)) {
 		g_free (uri_text);
-		
+
 		return NULL;
 	}
 
 	relative_uri = e_source_peek_relative_uri (source);
 	g_free (uri_text);
 
-	if (relative_uri && *relative_uri) {  		
+	if (relative_uri && *relative_uri) {
 		return NULL;
 	}
 
diff --git a/plugins/calendar-http/calendar-http.c b/plugins/calendar-http/calendar-http.c
index cad85d972d..9934a8b76f 100644
--- a/plugins/calendar-http/calendar-http.c
+++ b/plugins/calendar-http/calendar-http.c
@@ -90,7 +90,7 @@ url_changed (GtkEntry *entry, ESource *source)
 
 		secure_checkbox = g_object_get_data (G_OBJECT (gtk_widget_get_parent (GTK_WIDGET (entry))),
 		                                     "secure_checkbox");
-                 
+
 		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (secure_checkbox), TRUE);
 	}
 
@@ -227,12 +227,12 @@ option_changed (GtkOptionMenu *option, ECalConfigTargetSource *t)
 	g_free (refresh_str);
 }
 
-static void 
+static void
 secure_setting_changed (GtkWidget *widget, ESource *source)
 {
 	if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget)))
 		e_source_set_property (source, "use_ssl", "1");
-	else 
+	else
 		e_source_set_property (source, "use_ssl", "0");
 }
 
@@ -342,7 +342,7 @@ e_calendar_http_secure (EPlugin *epl, EConfigHookItemFactoryData *data)
 
 	secure_prop = e_source_get_property (t->source, "use_ssl");
 	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (secure_setting), (secure_prop && g_str_equal (secure_prop, "1"))  ? TRUE : FALSE);
-  
+
 	g_signal_connect (secure_setting, "toggled", G_CALLBACK (secure_setting_changed), t->source);
 
 	gtk_widget_show (secure_setting);
@@ -350,7 +350,7 @@ e_calendar_http_secure (EPlugin *epl, EConfigHookItemFactoryData *data)
 
 	/* Store pointer to secure checkbox so we can retrieve it in url_changed() */
 	g_object_set_data (G_OBJECT (parent), "secure_checkbox", (gpointer)secure_setting);
-	
+
 	return secure_setting;
 }
 
diff --git a/plugins/copy-tool/copy-tool.c b/plugins/copy-tool/copy-tool.c
index 7b066f186e..d241f6c5ae 100644
--- a/plugins/copy-tool/copy-tool.c
+++ b/plugins/copy-tool/copy-tool.c
@@ -49,5 +49,5 @@ org_gnome_copy_tool_copy_address(void *ep, EMPopupTargetURI *t)
 		g_free(addr);
 		camel_url_free(curl);
 		camel_object_unref(cia);
-	}	
+	}
 }
diff --git a/plugins/default-mailer/default-mailer.c b/plugins/default-mailer/default-mailer.c
index 3b66ee5403..47cddb9db5 100644
--- a/plugins/default-mailer/default-mailer.c
+++ b/plugins/default-mailer/default-mailer.c
@@ -73,16 +73,16 @@ org_gnome_default_mailer_check_default (EPlugin *ep, ESEventTargetUpgrade *targe
 	GConfValue  *is_key;
 
 	client = gconf_client_get_default ();
-	
+
 	/* See whether the check default mailer key has already been set */
 	is_key = gconf_client_get(client, GCONF_KEY_CHECKDEFAULT, NULL);
 	if(!is_key) {
 		gconf_client_set_bool(client, GCONF_KEY_CHECKDEFAULT, TRUE, NULL);
 		gconf_value_free (is_key);
 	}
-	
+
 	/* Check whether we're supposed to check whether or not we are the default mailer */
-	if(gconf_client_get_bool(client, GCONF_KEY_CHECKDEFAULT, NULL)) { 
+	if(gconf_client_get_bool(client, GCONF_KEY_CHECKDEFAULT, NULL)) {
 		mailer  = gconf_client_get_string(client, GCONF_KEY_MAILTO_COMMAND, NULL);
 
 		/* Check whether we are the default mailer */
@@ -93,7 +93,7 @@ org_gnome_default_mailer_check_default (EPlugin *ep, ESEventTargetUpgrade *targe
 				gconf_client_set_string(client, GCONF_KEY_MAILTO_COMMAND, EVOLUTION_MAILTO_COMMAND, NULL);
 			}
 		}
-		
+
 		g_free(mailer);
 	}
 
diff --git a/plugins/default-source/default-source.c b/plugins/default-source/default-source.c
index f6a670bdf6..129c89a4d2 100644
--- a/plugins/default-source/default-source.c
+++ b/plugins/default-source/default-source.c
@@ -32,7 +32,7 @@
 GtkWidget* org_gnome_default_book (EPlugin *epl, EConfigHookItemFactoryData *data);
 void commit_default_calendar (EPlugin *epl, EConfigTarget *target);
 void commit_default_book (EPlugin *epl, EConfigTarget *target);
-void 
+void
 commit_default_calendar (EPlugin *epl, EConfigTarget *target)
 {
 	ECalConfigTargetSource *cal_target;
@@ -40,7 +40,7 @@ commit_default_calendar (EPlugin *epl, EConfigTarget *target)
 
 	cal_target = (ECalConfigTargetSource *) target;
 	source = cal_target->source;
-	if (e_source_get_property (source, "default")) 
+	if (e_source_get_property (source, "default"))
 		e_cal_set_default_source (source, cal_target->source_type, NULL);
 }
 
@@ -54,17 +54,17 @@ commit_default_book (EPlugin *epl, EConfigTarget *target)
 	source = book_target->source;
 	if (e_source_get_property (source, "default"))
 		e_book_set_default_source (source, NULL);
-  
-    
+
+
 }
 
 static void
 default_source_changed (GtkWidget *check_box,  ESource *source)
 {
-    
-	if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (check_box))) 
+
+	if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (check_box)))
 		e_source_set_property (source, "default", "true");
-	else 
+	else
 		e_source_set_property (source, "default", NULL);
 }
 
@@ -75,16 +75,16 @@ org_gnome_default_book (EPlugin *epl, EConfigHookItemFactoryData *data)
 	GtkWidget *widget;
 	ESource *source;
 	EABConfigTargetSource *book_target;
- 
+
 	if (data->old)
 		return data->old;
 	widget = gtk_check_button_new_with_mnemonic (_("Mark as _default folder"));
 	book_target = (EABConfigTargetSource *) data->target;
 	source = book_target->source;
-    
+
 	if (e_source_get_property (source, "default"))
 		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), TRUE);
-	else 
+	else
 		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), FALSE);
 	gtk_container_add (GTK_CONTAINER (data->parent), widget);
 
@@ -108,12 +108,12 @@ org_gnome_default_cal (EPlugin *epl, EConfigHookItemFactoryData *data)
 	widget = gtk_check_button_new_with_mnemonic (_("Mark as _default folder"));
 	cal_target = (ECalConfigTargetSource *) data->target;
 	source = cal_target->source;
-    
+
 	if (e_source_get_property (source, "default"))
 		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), TRUE);
-	else 
+	else
 		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), FALSE);
-	
+
 	i = ((GtkTable *)data->parent)->nrows;
 	gtk_table_attach((GtkTable *)data->parent, widget, 1, 2, i, i+1, GTK_EXPAND | GTK_FILL, 0, 0, 0);
 
diff --git a/plugins/exchange-operations/exchange-account-setup.c b/plugins/exchange-operations/exchange-account-setup.c
index 24aa1935be..9707006f4b 100644
--- a/plugins/exchange-operations/exchange-account-setup.c
+++ b/plugins/exchange-operations/exchange-account-setup.c
@@ -56,7 +56,7 @@ GtkWidget *org_gnome_exchange_owa_url(EPlugin *epl, EConfigHookItemFactoryData *
 gboolean org_gnome_exchange_check_options(EPlugin *epl, EConfigHookPageCheckData *data);
 GtkWidget *org_gnome_exchange_auth_section (EPlugin *epl, EConfigHookItemFactoryData *data);
 void org_gnome_exchange_commit (EPlugin *epl, EConfigHookItemFactoryData *data);
-GtkWidget* org_gnome_exchange_show_folder_size_factory (EPlugin *epl, EConfigHookItemFactoryData *data); 
+GtkWidget* org_gnome_exchange_show_folder_size_factory (EPlugin *epl, EConfigHookItemFactoryData *data);
 
 CamelServiceAuthType camel_exchange_ntlm_authtype = {
         /* i18n: "Secure Password Authentication" is an Outlookism */
@@ -103,13 +103,13 @@ update_state (GtkTextBuffer *buffer, gpointer data)
 	}
 }
 
-static void 
+static void
 toggled_state (GtkToggleButton *button, gpointer data)
 {
 	gboolean current_oof_state = gtk_toggle_button_get_active (button);
 
 	if (current_oof_state == oof_data->state)
-		return; 
+		return;
 	oof_data->state = current_oof_state;
 	gtk_widget_set_sensitive (oof_data->text_view, current_oof_state);
 }
@@ -123,7 +123,7 @@ btn_chpass_clicked (GtkButton *button, gpointer data)
  	ExchangeAccountResult result;
 
 	account = exchange_operations_get_exchange_account ();
-					
+
 	old_password = exchange_account_get_password (account);
 	if (!old_password) {
 		g_print ("Could not fetch old password\n");
@@ -138,9 +138,9 @@ btn_chpass_clicked (GtkButton *button, gpointer data)
  	result = exchange_account_set_password (account, old_password, new_password);
 	if (result != EXCHANGE_ACCOUNT_CONNECT_SUCCESS)
 		exchange_operations_report_error (account, result);
-	
+
 	g_free (old_password);
-	g_free (new_password);	
+	g_free (new_password);
 }
 #endif
 
@@ -198,7 +198,7 @@ org_gnome_exchange_settings(EPlugin *epl, EConfigHookItemFactoryData *data)
 #endif
 	GtkLabel *lbl_dass;
 	GtkButton *btn_dass;
-	
+
 	/* Miscelleneous setting */
 	GtkFrame *frm_misc;
 	GtkVBox *vbox_misc;
@@ -235,14 +235,14 @@ org_gnome_exchange_settings(EPlugin *epl, EConfigHookItemFactoryData *data)
 	oof_data->text_view = NULL;
 
 	/* See if oof info found already */
-	
+
 	if (account && !exchange_oof_get (account, &oof_state, &message)) {
 
 		e_error_run (NULL, ERROR_DOMAIN ":state-read-error", NULL);
 
                 return NULL;
         }
-	
+
 	if (message && *message)
 		oof_data->message = g_strdup (message);
 	else
@@ -256,22 +256,22 @@ org_gnome_exchange_settings(EPlugin *epl, EConfigHookItemFactoryData *data)
 
 	frm_oof = (GtkFrame*) gtk_object_new (GTK_TYPE_FRAME, "label", _("Out Of Office"), NULL);
 	gtk_box_pack_start (GTK_BOX (vbox_settings), GTK_WIDGET (frm_oof), FALSE, FALSE, 0);
-	
+
 	vbox_oof = (GtkVBox*) gtk_object_new (GTK_TYPE_VBOX, NULL, "homogeneous", FALSE, "spacing", 12, NULL);
 	gtk_container_set_border_width (GTK_CONTAINER (vbox_oof), 6);
 	gtk_container_add (GTK_CONTAINER (frm_oof), GTK_WIDGET (vbox_oof));
-	
-	lbl_oof_desc = (GtkLabel*) gtk_object_new (GTK_TYPE_LABEL, "label", _("The message specified below will be automatically sent to \neach person who sends mail to you while you are out of the office."), "justify", GTK_JUSTIFY_LEFT, NULL); 
+
+	lbl_oof_desc = (GtkLabel*) gtk_object_new (GTK_TYPE_LABEL, "label", _("The message specified below will be automatically sent to \neach person who sends mail to you while you are out of the office."), "justify", GTK_JUSTIFY_LEFT, NULL);
 	gtk_misc_set_alignment (GTK_MISC (lbl_oof_desc), 0, 0.5);
 	gtk_box_pack_start (GTK_BOX (vbox_oof), GTK_WIDGET (lbl_oof_desc), FALSE, FALSE, 0);
-	
+
 	tbl_oof_status = (GtkTable*) gtk_object_new (GTK_TYPE_TABLE, "n-rows", 2, "n-columns", 2, "homogeneous", FALSE, "row-spacing", 6, "column-spacing", 6, NULL);
 	txt = g_strdup_printf ("<b>%s</b>", _("Status:"));
 	lbl_status = (GtkLabel*) gtk_object_new (GTK_TYPE_LABEL, "label", txt, "use-markup", TRUE, NULL);
 	g_free (txt);
 	gtk_misc_set_alignment (GTK_MISC (lbl_status), 0, 0.5);
 	gtk_misc_set_padding (GTK_MISC (lbl_status), 0, 0);
-			
+
 	if (oof_data->state) {
 		radio_oof = (GtkRadioButton*) gtk_object_new (GTK_TYPE_RADIO_BUTTON, "label", _("I am out of the office"), NULL);
 		radio_iof = (GtkRadioButton*) gtk_object_new (GTK_TYPE_RADIO_BUTTON, "label", _("I am in the office"), "group", radio_oof, NULL);
@@ -281,15 +281,15 @@ org_gnome_exchange_settings(EPlugin *epl, EConfigHookItemFactoryData *data)
 		radio_oof = (GtkRadioButton*) gtk_object_new (GTK_TYPE_RADIO_BUTTON, "label", _("I am out of the office"), "group", radio_iof, NULL);
 	}
 	g_signal_connect (radio_oof, "toggled", G_CALLBACK (toggled_state), NULL);
-	
+
 
 	gtk_table_attach (tbl_oof_status, GTK_WIDGET (lbl_status), 0, 1, 0, 1, GTK_FILL, GTK_FILL, 0, 0);
 	gtk_table_attach (tbl_oof_status, GTK_WIDGET (radio_iof), 1, 2, 0, 1, GTK_FILL, GTK_FILL, 0, 0);
 	gtk_table_attach (tbl_oof_status, GTK_WIDGET (radio_oof), 1, 2, 1, 2, GTK_FILL, GTK_FILL, 0, 0);
 
 	gtk_box_pack_start (GTK_BOX (vbox_oof), GTK_WIDGET (tbl_oof_status), FALSE, FALSE, 0);
-	
-	
+
+
 	scrwnd_oof = (GtkScrolledWindow*) gtk_object_new (GTK_TYPE_SCROLLED_WINDOW, "hscrollbar-policy", GTK_POLICY_AUTOMATIC, "vscrollbar-policy", GTK_POLICY_AUTOMATIC, "shadow-type", GTK_SHADOW_IN, NULL);
 	gtk_box_pack_start (GTK_BOX (vbox_oof), GTK_WIDGET (scrwnd_oof), FALSE, FALSE, 0);
 	txtview_oof = (GtkTextView*) gtk_object_new (GTK_TYPE_TEXT_VIEW, "justification", GTK_JUSTIFY_LEFT, "wrap-mode", GTK_WRAP_WORD, "editable", TRUE, NULL);
@@ -304,7 +304,7 @@ org_gnome_exchange_settings(EPlugin *epl, EConfigHookItemFactoryData *data)
 		/* previuosly set message */
 		gtk_text_buffer_set_text (buffer, oof_data->message, -1);
 		gtk_text_view_set_buffer (txtview_oof, buffer);
-		
+
 	}
 	gtk_text_buffer_set_modified (buffer, FALSE);
 	if (!oof_data->state)
@@ -316,7 +316,7 @@ org_gnome_exchange_settings(EPlugin *epl, EConfigHookItemFactoryData *data)
 	/* Security settings */
 	frm_auth = (GtkFrame*) gtk_object_new (GTK_TYPE_FRAME, "label", _("Security"), NULL);
 	gtk_box_pack_start (GTK_BOX (vbox_settings), GTK_WIDGET (frm_auth), FALSE, FALSE, 0);
-	
+
 	vbox_auth = (GtkVBox*) gtk_object_new (GTK_TYPE_VBOX, "homogeneous", FALSE, "spacing", 6, NULL);
 	gtk_container_set_border_width (GTK_CONTAINER (vbox_auth), 6);
 	gtk_container_add (GTK_CONTAINER (frm_auth), GTK_WIDGET (vbox_auth));
@@ -348,7 +348,7 @@ org_gnome_exchange_settings(EPlugin *epl, EConfigHookItemFactoryData *data)
 	/* Miscelleneous settings */
 	frm_misc = (GtkFrame*) gtk_object_new (GTK_TYPE_FRAME, "label", _("Miscelleneous"), NULL);
 	gtk_box_pack_start (GTK_BOX (vbox_settings), GTK_WIDGET (frm_misc), FALSE, FALSE, 0);
-	
+
 	vbox_misc = (GtkVBox*) gtk_object_new (GTK_TYPE_VBOX, "homogeneous", FALSE, "spacing", 6, NULL);
 	gtk_container_set_border_width (GTK_CONTAINER (vbox_misc), 6);
 	gtk_container_add (GTK_CONTAINER (frm_misc), GTK_WIDGET (vbox_misc));
@@ -399,7 +399,7 @@ print_error (const char *owa_url, E2kAutoconfigResult result)
 			break;
 
 		case E2K_AUTOCONFIG_CANT_BPROPFIND:
-			e_error_run (NULL, ERROR_DOMAIN ":connect-exchange-error", 
+			e_error_run (NULL, ERROR_DOMAIN ":connect-exchange-error",
 				     "http://support.novell.com/cgi-bin/search/searchtid.cgi?/ximian/ximian328.html",
 				     NULL);
 			break;
@@ -422,7 +422,7 @@ owa_authenticate_user(GtkWidget *button, EConfig *config)
 	E2kAutoconfigResult result;
 	CamelURL *url=NULL;
 	gboolean remember_password;
-	char *url_string, *key; 
+	char *url_string, *key;
 	const char *source_url, *id_name, *owa_url;
 	char *at, *user;
 	gboolean valid = FALSE;
@@ -444,7 +444,7 @@ owa_authenticate_user(GtkWidget *button, EConfig *config)
 			at = strchr(id_name, '@');
 			user = g_alloca(at-id_name+1);
 			memcpy(user, id_name, at-id_name);
-			user[at-id_name] = 0; 
+			user[at-id_name] = 0;
 			camel_url_set_user (url, user);
 		}
 	}
@@ -466,21 +466,21 @@ owa_authenticate_user(GtkWidget *button, EConfig *config)
 	key = camel_url_to_string (url, CAMEL_URL_HIDE_PASSWORD | CAMEL_URL_HIDE_PARAMS);
 	/* Supress the trailing slash */
 	key [strlen(key) -1] = 0;
-	
-	valid =  e2k_validate_user (owa_url, key, &url->user, exchange_params, 
+
+	valid =  e2k_validate_user (owa_url, key, &url->user, exchange_params,
 						&remember_password, &result,
 						GTK_WINDOW (gtk_widget_get_toplevel (button)));
 	g_free (key);
-	
+
 	if (!valid && result != E2K_AUTOCONFIG_CANCELLED)
 		print_error (owa_url, result);
 
 	camel_url_set_host (url, valid ? exchange_params->host : "");
-	
+
 
 	if (valid)
 		camel_url_set_param (url, "save-passwd", remember_password? "true" : "false");
-	
+
 	camel_url_set_param (url, "ad_server", valid ? exchange_params->ad_server: NULL);
 	camel_url_set_param (url, "mailbox", valid ? exchange_params->mailbox : NULL);
 	camel_url_set_param (url, "owa_path", valid ? exchange_params->owa_path : NULL);
@@ -491,7 +491,7 @@ owa_authenticate_user(GtkWidget *button, EConfig *config)
 	g_free (exchange_params->ad_server);
 	g_free (exchange_params);
 
-	if (valid) {	
+	if (valid) {
 		url_string = camel_url_to_string (url, 0);
 		e_account_set_string (target_account->account, E_ACCOUNT_SOURCE_URL, url_string);
 		e_account_set_string (target_account->account, E_ACCOUNT_TRANSPORT_URL, url_string);
@@ -540,7 +540,7 @@ owa_editor_entry_changed(GtkWidget *entry, EConfig *config)
 }
 
 static char *
-construct_owa_url (CamelURL *url) 
+construct_owa_url (CamelURL *url)
 {
 	const char *owa_path, *use_ssl = NULL;
 	const char *protocol = "http", *mailbox_name;
@@ -558,9 +558,9 @@ construct_owa_url (CamelURL *url)
 	mailbox_name = camel_url_get_param (url, "mailbox");
 
 	if (mailbox_name)
-		owa_url = g_strdup_printf("%s://%s%s/%s", protocol, url->host, owa_path, mailbox_name); 
+		owa_url = g_strdup_printf("%s://%s%s/%s", protocol, url->host, owa_path, mailbox_name);
 	else
-		owa_url = g_strdup_printf("%s://%s%s", protocol, url->host, owa_path ); 
+		owa_url = g_strdup_printf("%s://%s%s", protocol, url->host, owa_path );
 
 	return owa_url;
 }
@@ -624,7 +624,7 @@ org_gnome_exchange_owa_url(EPlugin *epl, EConfigHookItemFactoryData *data)
 		if (url->host[0] != 0) {
 			char *uri;
 
-			/* url has hostname but not owa_url. 
+			/* url has hostname but not owa_url.
 			 * Account has been created using x-c-s or evo is upgraded to 2.2
 		 	 * When invoked from druid, hostname will get set after validation,
 		 	 * so this condition will never be true during account creation.
@@ -636,9 +636,9 @@ org_gnome_exchange_owa_url(EPlugin *epl, EConfigHookItemFactoryData *data)
 			g_free(uri);
 		}
 	}
-	camel_url_free (url);	
+	camel_url_free (url);
 	if (owa_url)
-		gtk_entry_set_text(GTK_ENTRY (owa_entry), owa_url); 
+		gtk_entry_set_text(GTK_ENTRY (owa_entry), owa_url);
 	gtk_label_set_mnemonic_widget((GtkLabel *)label, owa_entry);
 
 	button = gtk_button_new_with_mnemonic (_("A_uthenticate"));
@@ -648,8 +648,8 @@ org_gnome_exchange_owa_url(EPlugin *epl, EConfigHookItemFactoryData *data)
 	gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0);
 	gtk_widget_show_all(hbox);
 
-	gtk_table_attach (GTK_TABLE (data->parent), label, 0, 1, row, row+1, 0, 0, 0, 0); 
-	gtk_table_attach (GTK_TABLE (data->parent), hbox, 1, 2, row, row+1, GTK_FILL|GTK_EXPAND, GTK_FILL, 0, 0); 
+	gtk_table_attach (GTK_TABLE (data->parent), label, 0, 1, row, row+1, 0, 0, 0, 0);
+	gtk_table_attach (GTK_TABLE (data->parent), hbox, 1, 2, row, row+1, GTK_FILL|GTK_EXPAND, GTK_FILL, 0, 0);
 
 	g_signal_connect (owa_entry, "changed", G_CALLBACK(owa_editor_entry_changed), data->config);
 	g_object_set_data((GObject *)owa_entry, "authenticate-button", button);
@@ -693,7 +693,7 @@ org_gnome_exchange_check_options(EPlugin *epl, EConfigHookPageCheckData *data)
 	return status;
 }
 
-static void 
+static void
 set_oof_info (void)
 {
 	ExchangeAccount *account;
@@ -711,7 +711,7 @@ destroy_oof_data (void)
 {
 	if (oof_data->message)
 		g_free (oof_data->message);
-	g_free (oof_data);	
+	g_free (oof_data);
 }
 
 void
@@ -720,7 +720,7 @@ org_gnome_exchange_commit (EPlugin *epl, EConfigHookItemFactoryData *data)
 	EMConfigTargetAccount *target_account;
 	const char *source_url;
 	CamelURL *url;
-	
+
 	target_account = (EMConfigTargetAccount *)data->config->target;
 	source_url = e_account_get_string (target_account->account,  E_ACCOUNT_SOURCE_URL);
 	url = camel_url_new (source_url, NULL);
@@ -749,7 +749,7 @@ exchange_check_authtype (GtkWidget *w, EConfig *config)
 	return;
 }
 
-static void 
+static void
 exchange_authtype_changed (GtkComboBox *dropdown, EConfig *config)
 {
 	EMConfigTargetAccount *target = (EMConfigTargetAccount *)config->target;
@@ -771,7 +771,7 @@ exchange_authtype_changed (GtkComboBox *dropdown, EConfig *config)
 	transport_url = e_account_get_string (target->account,
 					      E_ACCOUNT_TRANSPORT_URL);
 	url_transport = camel_url_new (transport_url, NULL);
-	
+
 	model = gtk_combo_box_get_model(dropdown);
 	if (gtk_tree_model_iter_nth_child(model, &iter, NULL, id)) {
 		gtk_tree_model_get(model, &iter, 1, &authtype, -1);
@@ -783,7 +783,7 @@ exchange_authtype_changed (GtkComboBox *dropdown, EConfig *config)
 			camel_url_set_authmech(url_source, NULL);
 			camel_url_set_authmech(url_transport, NULL);
 		}
-	
+
 		source_url_string = camel_url_to_string(url_source, 0);
 		transport_url_string = camel_url_to_string(url_transport, 0);
 		e_account_set_string(target->account, E_ACCOUNT_SOURCE_URL, source_url_string);
@@ -800,7 +800,7 @@ GtkWidget *
 org_gnome_exchange_auth_section (EPlugin *epl, EConfigHookItemFactoryData *data)
 {
 	EMConfigTargetAccount *target_account;
-	const char *source_url; 
+	const char *source_url;
 	char *label_text, *exchange_account_authtype = NULL;
 	CamelURL *url;
 	GtkWidget *hbox, *button, *auth_label, *vbox, *label_hide;
@@ -812,7 +812,7 @@ org_gnome_exchange_auth_section (EPlugin *epl, EConfigHookItemFactoryData *data)
 	ExchangeAccount *account;
 
 	target_account = (EMConfigTargetAccount *)data->config->target;
-	source_url = e_account_get_string (target_account->account, 
+	source_url = e_account_get_string (target_account->account,
 					   E_ACCOUNT_SOURCE_URL);
 	url = camel_url_new (source_url, NULL);
 	if (url == NULL
@@ -839,7 +839,7 @@ org_gnome_exchange_auth_section (EPlugin *epl, EConfigHookItemFactoryData *data)
 	g_free (label_text);
 	gtk_label_set_justify (GTK_LABEL (auth_label), GTK_JUSTIFY_LEFT);
 	gtk_misc_set_alignment (GTK_MISC (auth_label), 0, 0.5);
-	gtk_misc_set_padding (GTK_MISC (auth_label), 0, 0); 
+	gtk_misc_set_padding (GTK_MISC (auth_label), 0, 0);
 	gtk_label_set_use_markup (GTK_LABEL (auth_label), TRUE);
 
 	label_hide = gtk_label_new("\n");
@@ -860,23 +860,23 @@ org_gnome_exchange_auth_section (EPlugin *epl, EConfigHookItemFactoryData *data)
 
 		if (authtypes) {
 			for (ll = authtypes; ll; ll = g_list_next(ll))
-				if (!strcmp(authtype->authproto, 
+				if (!strcmp(authtype->authproto,
 					((CamelServiceAuthType *)ll->data)->authproto))
 					break;
 			avail = ll != NULL;
 		}
 		gtk_list_store_append (store, &iter);
-		gtk_list_store_set (store, &iter, 0, authtype->name, 1, 
+		gtk_list_store_set (store, &iter, 0, authtype->name, 1,
 				    authtype, 2, !avail, -1);
 
 		if (url && url->authmech && !strcmp(url->authmech, authtype->authproto)) {
 			active = i;
 		}
-		else if (url && exchange_account_authtype && 
+		else if (url && exchange_account_authtype &&
 			 !strcmp (exchange_account_authtype, authtype->authproto)) {
-			/* if the url doesn't contain authmech, read the value from 
-			 * exchange account and set the tab selection and 
-			 * also set the authmech back to url 
+			/* if the url doesn't contain authmech, read the value from
+			 * exchange account and set the tab selection and
+			 * also set the authmech back to url
 			 */
 			camel_url_set_authmech (url, exchange_account_authtype);
 			active = i;
@@ -890,16 +890,16 @@ org_gnome_exchange_auth_section (EPlugin *epl, EConfigHookItemFactoryData *data)
 		GtkCellRenderer *cell = gtk_cell_renderer_text_new();
 
 		gtk_cell_layout_pack_start ((GtkCellLayout *)dropdown, cell, TRUE);
-		gtk_cell_layout_set_attributes ((GtkCellLayout *)dropdown, cell, 
+		gtk_cell_layout_set_attributes ((GtkCellLayout *)dropdown, cell,
 						"text", 0, "strikethrough", 2, NULL);
 
-		auth_changed_id = g_signal_connect (dropdown, 
-						    "changed", 
-						    G_CALLBACK (exchange_authtype_changed), 
+		auth_changed_id = g_signal_connect (dropdown,
+						    "changed",
+						    G_CALLBACK (exchange_authtype_changed),
 						    data->config);
-		g_signal_connect (button, 
-				  "clicked", 
-				  G_CALLBACK(exchange_check_authtype), 
+		g_signal_connect (button,
+				  "clicked",
+				  G_CALLBACK(exchange_check_authtype),
 				  data->config);
 	}
 
@@ -913,7 +913,7 @@ org_gnome_exchange_auth_section (EPlugin *epl, EConfigHookItemFactoryData *data)
 	gtk_box_pack_start (GTK_BOX (vbox), label_hide, TRUE, TRUE, 0);
 	gtk_widget_show_all (vbox);
 
-	gtk_box_pack_start (GTK_BOX (data->parent), vbox, TRUE, TRUE, 0);	
+	gtk_box_pack_start (GTK_BOX (data->parent), vbox, TRUE, TRUE, 0);
 
 	if (url)
 		camel_url_free(url);
@@ -947,7 +947,7 @@ org_gnome_exchange_show_folder_size_factory (EPlugin *epl, EConfigHookItemFactor
 
 	if (g_ascii_strcasecmp (provider->protocol, "exchange"))
 		return NULL;
-	
+
 	folder_name = (char*) camel_folder_get_name (cml_folder);
 	if (!folder_name)
 		folder_name = g_strdup ("name");
diff --git a/plugins/exchange-operations/exchange-calendar.c b/plugins/exchange-operations/exchange-calendar.c
index 774ec21dfe..0783770361 100644
--- a/plugins/exchange-operations/exchange-calendar.c
+++ b/plugins/exchange-operations/exchange-calendar.c
@@ -55,7 +55,7 @@ void e_exchange_calendar_commit (EPlugin *epl, EConfigTarget *target);
 
 /* FIXME: Reconsider the prototype of this function */
 static GPtrArray *
-e_exchange_calendar_get_calendars (ECalSourceType ftype) 
+e_exchange_calendar_get_calendars (ECalSourceType ftype)
 {
 	ExchangeAccount *account;
 	GPtrArray *folder_array;
@@ -74,7 +74,7 @@ e_exchange_calendar_get_calendars (ECalSourceType ftype)
 	else if (ftype == E_CAL_SOURCE_TYPE_TODO) { /* Tasks */
 		tstring = g_strdup ("tasks");
 	}
-	else { 
+	else {
 		/* FIXME: Would this ever happen? If so, handle it wisely */
 		tstring = NULL;
 	}
@@ -93,7 +93,7 @@ e_exchange_calendar_get_calendars (ECalSourceType ftype)
 	for (i=0; i<folder_array->len; ++i) {
 		folder = g_ptr_array_index (folder_array, i);
 		type = (gchar *)e_folder_get_type_string (folder);
-		
+
 		if (!strcmp (type, tstring)) {
 			tmp = (gchar *)e_folder_get_physical_uri (folder);
 			if (g_str_has_prefix (tmp, uri_prefix)) {
@@ -129,7 +129,7 @@ e_exchange_calendar_pcalendar_on_change (GtkTreeView *treeview, ESource *source)
 	e_source_set_relative_uri (source, es_ruri);
 	g_free (ruri);
 	g_free (es_ruri);
-} 
+}
 
 GtkWidget *
 e_exchange_calendar_pcalendar (EPlugin *epl, EConfigHookItemFactoryData *data)
@@ -167,7 +167,7 @@ e_exchange_calendar_pcalendar (EPlugin *epl, EConfigHookItemFactoryData *data)
 		gtk_widget_destroy (scrw_pcalendar);
 		gtk_widget_destroy (tv_pcalendar);
 	}
-		
+
 	uri_text = e_source_get_uri (t->source);
 	uri = e_uri_new (uri_text);
 
@@ -182,12 +182,12 @@ e_exchange_calendar_pcalendar (EPlugin *epl, EConfigHookItemFactoryData *data)
 	parent = data->parent;
 	row = ((GtkTable*)parent)->nrows;
 
-	exchange_config_listener_get_offline_status (exchange_global_config_listener, 
+	exchange_config_listener_get_offline_status (exchange_global_config_listener,
 								    &offline_status);
 	if (offline_status == OFFLINE_MODE) {
 		/* Evolution is in offline mode; we will not be able to create
 		   new folders or modify existing folders. */
-		offline_msg = g_markup_printf_escaped ("<b>%s</b>", 
+		offline_msg = g_markup_printf_escaped ("<b>%s</b>",
 						       _("Evolution is in offline mode. You cannot create or modify folders now.\nPlease switch to online mode for such operations."));
 		lbl_offline_msg = gtk_label_new ("");
 		gtk_label_set_markup (GTK_LABEL (lbl_offline_msg), offline_msg);
@@ -195,7 +195,7 @@ e_exchange_calendar_pcalendar (EPlugin *epl, EConfigHookItemFactoryData *data)
 		gtk_widget_show (lbl_offline_msg);
 		gtk_table_attach (GTK_TABLE (parent), lbl_offline_msg, 0, 2, row, row+1, GTK_FILL|GTK_EXPAND, 0, 0, 0);
 		g_free (uri_text);
-		return lbl_offline_msg;		
+		return lbl_offline_msg;
 	}
 
 	rel_uri = e_source_peek_relative_uri (t->source);
@@ -207,7 +207,7 @@ e_exchange_calendar_pcalendar (EPlugin *epl, EConfigHookItemFactoryData *data)
 	else {
 		calendar_src_exists = FALSE;
 	}
-	
+
 	/* REVIEW: Should this handle be freed? - Attn: surf */
 	account = exchange_operations_get_exchange_account ();
 	if (!account) {
@@ -243,14 +243,14 @@ e_exchange_calendar_pcalendar (EPlugin *epl, EConfigHookItemFactoryData *data)
 	gtk_widget_show (lbl_pcalendar);
 	gtk_misc_set_alignment (GTK_MISC (lbl_pcalendar), 0.0, 0.5);
 	gtk_table_attach (GTK_TABLE (parent), lbl_pcalendar, 0, 2, row+1, row+2, GTK_FILL|GTK_EXPAND, 0, 0, 0);
-  
+
 	ts_pcalendar = gtk_tree_store_new (NUM_COLS, G_TYPE_STRING, G_TYPE_STRING);
 
 	callist = e_exchange_calendar_get_calendars (t->source_type);
 
 	for (i=0; i<callist->len; ++i) {
 		ruri = g_ptr_array_index (callist, i);
-		exchange_operations_cta_add_node_to_tree (ts_pcalendar, NULL, ruri);		
+		exchange_operations_cta_add_node_to_tree (ts_pcalendar, NULL, ruri);
 	}
 
 	cr_calendar = gtk_cell_renderer_text_new ();
@@ -259,7 +259,7 @@ e_exchange_calendar_pcalendar (EPlugin *epl, EConfigHookItemFactoryData *data)
 	gtk_tree_view_append_column (GTK_TREE_VIEW (tv_pcalendar), tvc_calendar);
 	g_object_set (tv_pcalendar, "expander-column", tvc_calendar, "headers-visible", TRUE, NULL);
 	gtk_tree_view_expand_all (GTK_TREE_VIEW (tv_pcalendar));
-	
+
 	scrw_pcalendar = gtk_scrolled_window_new (NULL, NULL);
 	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrw_pcalendar), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
 	gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrw_pcalendar), GTK_SHADOW_IN);
@@ -270,7 +270,7 @@ e_exchange_calendar_pcalendar (EPlugin *epl, EConfigHookItemFactoryData *data)
 
 	gtk_table_attach (GTK_TABLE (parent), scrw_pcalendar, 0, 2, row+2, row+3, GTK_EXPAND|GTK_FILL, 0, 0, 0);
 	gtk_widget_show_all (scrw_pcalendar);
-  
+
 	if (calendar_src_exists) {
 		gchar *uri_prefix, *sruri, *tmpruri;
 		int prefix_len;
@@ -278,7 +278,7 @@ e_exchange_calendar_pcalendar (EPlugin *epl, EConfigHookItemFactoryData *data)
 
 		uri_prefix = g_strconcat (account->account_filename, "/;", NULL);
 		prefix_len = strlen (uri_prefix);
-		
+
 		tmpruri = (gchar*) rel_uri;
 
 		if (g_str_has_prefix (tmpruri, uri_prefix)) {
@@ -287,14 +287,14 @@ e_exchange_calendar_pcalendar (EPlugin *epl, EConfigHookItemFactoryData *data)
 		else {
 			sruri = NULL;
 		}
-		
+
 		selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (tv_pcalendar));
 		exchange_operations_cta_select_node_from_tree (ts_pcalendar, NULL, sruri, sruri, selection);
-		gtk_widget_set_sensitive (tv_pcalendar, FALSE);		
+		gtk_widget_set_sensitive (tv_pcalendar, FALSE);
 		g_free (uri_prefix);
 		g_free (sruri);
 	}
-	
+
 	g_ptr_array_free (callist, TRUE);
 	g_object_unref (ts_pcalendar);
 	return tv_pcalendar;
@@ -318,7 +318,7 @@ e_exchange_calendar_check (EPlugin *epl, EConfigHookPageCheckData *data)
 	rel_uri = e_source_peek_relative_uri (t->source);
 	group = e_source_peek_group (t->source);
 	base_uri = e_source_group_peek_base_uri (group);
-	exchange_config_listener_get_offline_status (exchange_global_config_listener, 
+	exchange_config_listener_get_offline_status (exchange_global_config_listener,
 						     &offline_status);
 	if (base_uri && !strncmp (base_uri, "exchange", 8)) {
 		if (offline_status == OFFLINE_MODE)
@@ -364,7 +364,7 @@ e_exchange_calendar_check (EPlugin *epl, EConfigHookPageCheckData *data)
 	return TRUE;
 }
 
-void 
+void
 e_exchange_calendar_commit (EPlugin *epl, EConfigTarget *target)
 {
 	ECalConfigTargetSource *t = (ECalConfigTargetSource *) target;
@@ -382,7 +382,7 @@ e_exchange_calendar_commit (EPlugin *epl, EConfigTarget *target)
 	if (uri_text && strncmp (uri_text, "exchange", 8)) {
 		g_free (uri_text);
 		return ;
-	}	
+	}
 
 	status = exchange_is_offline (&offline_status);
 	if (offline_status == OFFLINE_MODE || status != CONFIG_LISTENER_STATUS_OK) {
@@ -412,10 +412,10 @@ e_exchange_calendar_commit (EPlugin *epl, EConfigTarget *target)
 		/* FIXME: This one would ever occur? */
 		ftype = g_strdup ("mail");
 	}
-	
+
 	gname = (gchar*) e_source_peek_name (source);
 	gruri = (gchar*) e_source_peek_relative_uri (source);
-	
+
 	if (calendar_src_exists) {
 		gchar *tmpruri, *uri_string, *temp_path, *prefix;
 		EUri *euri;
@@ -431,7 +431,7 @@ e_exchange_calendar_commit (EPlugin *epl, EConfigTarget *target)
 		/* sample gruri: user;auth=NTLM@host/;personal/Calendar */
 		/* sample ruri: user;auth=NTLM@host/personal/Calendar */
 		/* sample path: /personal/Calendar */
-		
+
 		uri_len = strlen (uri_string) + 1;
 		tmpruri = g_strdup (uri_string + strlen ("exchange://"));
 		temp_path = g_build_filename ("/", uri_text + uri_len, NULL);
@@ -449,7 +449,7 @@ e_exchange_calendar_commit (EPlugin *epl, EConfigTarget *target)
 		ruri = g_strconcat (gruri, "/", gname, NULL);
 		path = g_build_filename ("/", ruri+prefix_len, NULL);
 	}
-	
+
 	if (!calendar_src_exists) {
 		/* Create the new folder */
 		result = exchange_account_create_folder (account, path, ftype);
@@ -477,8 +477,8 @@ e_exchange_calendar_commit (EPlugin *epl, EConfigTarget *target)
 			}
 			e_source_set_property (source, "auth", "1");
 			if (rename) {
-				exchange_operations_update_child_esources (source, 
-							   calendar_old_source_uri, 
+				exchange_operations_update_child_esources (source,
+							   calendar_old_source_uri,
 							   ruri);
 			}
 		}
@@ -501,14 +501,14 @@ e_exchange_calendar_commit (EPlugin *epl, EConfigTarget *target)
 	case EXCHANGE_ACCOUNT_FOLDER_UNSUPPORTED_OPERATION:
 		e_error_run (NULL, ERROR_DOMAIN ":folder-unsupported-error", NULL);
 		break;
-	case EXCHANGE_ACCOUNT_FOLDER_GENERIC_ERROR:		
+	case EXCHANGE_ACCOUNT_FOLDER_GENERIC_ERROR:
 		e_error_run (NULL, ERROR_DOMAIN ":folder-generic-error", NULL);
 		break;
 	default:
 		break;
 	}
 
-done:	
+done:
 	g_free (uri_text);
 	g_free (ruri);
 	g_free (path);
diff --git a/plugins/exchange-operations/exchange-change-password.c b/plugins/exchange-operations/exchange-change-password.c
index 297a75e210..9ccf0617e3 100644
--- a/plugins/exchange-operations/exchange-change-password.c
+++ b/plugins/exchange-operations/exchange-change-password.c
@@ -98,7 +98,7 @@ exchange_get_new_password (const char *existing_password, gboolean voluntary)
 	if (voluntary)
 		gtk_widget_hide (GTK_WIDGET (top_label));
 
-run_dialog_again:	
+run_dialog_again:
 	response = gtk_dialog_run (GTK_DIALOG (top_widget));
 	if (response == GTK_RESPONSE_OK) {
 		const char *cur_pass, *new_pass1, *new_pass2;
diff --git a/plugins/exchange-operations/exchange-config-listener.c b/plugins/exchange-operations/exchange-config-listener.c
index 3f08d32c16..a562cc6493 100644
--- a/plugins/exchange-operations/exchange-config-listener.c
+++ b/plugins/exchange-operations/exchange-config-listener.c
@@ -93,12 +93,12 @@ static void account_changed (EAccountList *account_listener,
 static void account_removed (EAccountList *account_listener,
 			     EAccount     *account);
 #if LDEAD
-static void exchange_add_autocompletion_folders (GConfClient *gc_client, 
+static void exchange_add_autocompletion_folders (GConfClient *gc_client,
 						 ExchangeAccount *account);
 #endif
-static gboolean exchange_camel_urls_is_equal (const gchar *url1, 
+static gboolean exchange_camel_urls_is_equal (const gchar *url1,
 					      const gchar *url2);
-static void remove_selected_non_offline_esources (ExchangeAccount *account, 
+static void remove_selected_non_offline_esources (ExchangeAccount *account,
 						  const char *gconf_key);
 static void
 class_init (GObjectClass *object_class)
@@ -218,7 +218,7 @@ set_special_mail_folder (ExchangeAccount *account, const char *folder_type,
 	/* sample url_string: exchange://pnayak;auth=NTLM@164.99.168.136/ */
 	/* sample path:  personal/Drafts */
 	uri_len = strlen (url_string) + 1;
-	path = g_build_filename (physical_uri + uri_len, NULL); 
+	path = g_build_filename (physical_uri + uri_len, NULL);
 	*folder_uri = g_strconcat (url_string, path, NULL);
 	g_free (path);
 	g_free (url_string);
@@ -293,20 +293,20 @@ add_account_esources (ExchangeAccount *account,
 	exchange_account_is_offline_sync_set (account, &mode);
 	if (mode == OFFLINE_MODE) {
 		/* If account is marked for offline sync during account
-		 * creation, mark all the folders for offline sync 
+		 * creation, mark all the folders for offline sync
 		 */
 		offline_mode = TRUE;
 	}
 
 	username = exchange_account_get_username (account);
 
-	/* For each component create a source group */ 
+	/* For each component create a source group */
 
 	cal_source_group = e_source_group_new (account->account_name,
 					       EXCHANGE_URI_PREFIX);
-	tasks_source_group = e_source_group_new (account->account_name, 
+	tasks_source_group = e_source_group_new (account->account_name,
 					   	 EXCHANGE_URI_PREFIX);
-	contacts_source_group = e_source_group_new (account->account_name, 
+	contacts_source_group = e_source_group_new (account->account_name,
 					   	    EXCHANGE_URI_PREFIX);
 
 	if (!e_source_list_add_group (contacts_source_list, contacts_source_group, -1) ||
@@ -327,12 +327,12 @@ add_account_esources (ExchangeAccount *account,
 				e_source_set_property (source, "username", username);
 			e_source_set_property (source, "auth", "1");
 			e_source_set_property (source, "auth-domain", "Exchange");
-			e_source_group_add_source (contacts_source_group, 
+			e_source_group_add_source (contacts_source_group,
 						   source, -1);
 			g_object_unref (source);
 		}
 		else if (folder->type == EXCHANGE_CALENDAR_FOLDER){
-			relative_uri = g_strdup (folder->uri + 
+			relative_uri = g_strdup (folder->uri +
 						 strlen (EXCHANGE_URI_PREFIX));
 			source = e_source_new (folder->name, relative_uri);
 			if (offline_mode)
@@ -341,7 +341,7 @@ add_account_esources (ExchangeAccount *account,
 				e_source_set_property (source, "username", username);
 			e_source_set_property (source, "auth", "1");
 			e_source_set_property (source, "auth-domain", "Exchange");
-			e_source_group_add_source (cal_source_group, 
+			e_source_group_add_source (cal_source_group,
 						   source, -1);
 #if 0
 			ids = gconf_client_get_list (client,
@@ -358,10 +358,10 @@ add_account_esources (ExchangeAccount *account,
 			g_object_unref (source);
 			g_free (relative_uri);
 
-	
+
 		}
 		else if (folder->type == EXCHANGE_TASKS_FOLDER){
-			relative_uri = g_strdup (folder->uri + 
+			relative_uri = g_strdup (folder->uri +
 						 strlen (EXCHANGE_URI_PREFIX));
 			source = e_source_new (folder->name, relative_uri);
 			if (offline_mode == ONLINE_MODE)
@@ -370,7 +370,7 @@ add_account_esources (ExchangeAccount *account,
 				e_source_set_property (source, "username", username);
 			e_source_set_property (source, "auth", "1");
 			e_source_set_property (source, "auth-domain", "Exchange");
-			e_source_group_add_source (tasks_source_group, 
+			e_source_group_add_source (tasks_source_group,
 						   source, -1);
 #if 0
 			ids = gconf_client_get_list (client,
@@ -388,7 +388,7 @@ add_account_esources (ExchangeAccount *account,
 			g_free (relative_uri);
 		}
 	}
-		
+
 	e_source_list_sync (cal_source_list, NULL);
 	e_source_list_sync (tasks_source_list, NULL);
 	e_source_list_sync (contacts_source_list, NULL);
@@ -410,7 +410,7 @@ add_new_sources (ExchangeAccount *account)
 {
 	GPtrArray *exchange_folders;
 
-	exchange_folders = exchange_account_get_folders (account);                                                                                 
+	exchange_folders = exchange_account_get_folders (account);
         if (exchange_folders && exchange_folders->len > 0) {
 		int i;
 		const char *folder_type;
@@ -427,7 +427,7 @@ add_new_sources (ExchangeAccount *account)
 			hier = e_folder_exchange_get_hierarchy (folder);
 			if (hier->type != EXCHANGE_HIERARCHY_PUBLIC) {
 				folder_name = e_folder_get_name (folder);
-				folder_uri = e_folder_get_physical_uri (folder); 
+				folder_uri = e_folder_get_physical_uri (folder);
 				folder_type = e_folder_get_type_string (folder);
 
 				if (!(strcmp (folder_type, "calendar")) ||
@@ -451,7 +451,7 @@ add_new_sources (ExchangeAccount *account)
 				}
 
 				if (create_esource)
-					add_folder_esource (account, type, 
+					add_folder_esource (account, type,
 							folder_name, folder_uri);
 			} /* End hierarchy type check */
 		} /* End for loop */
@@ -463,7 +463,7 @@ add_sources (ExchangeAccount *account)
 {
 	GPtrArray *exchange_folders;
 
-	exchange_folders = exchange_account_get_folders (account);                                                                                 
+	exchange_folders = exchange_account_get_folders (account);
         if (exchange_folders && exchange_folders->len > 0) {
 		int i;
 		const char *folder_type;
@@ -479,14 +479,14 @@ add_sources (ExchangeAccount *account)
 			if (!(strcmp (folder_type, "calendar")) ||
 			    !(strcmp (folder_type, "calendar/public"))) {
 				folder_info->name = e_folder_get_name (folder);
-				folder_info->uri = e_folder_get_physical_uri (folder); 
+				folder_info->uri = e_folder_get_physical_uri (folder);
 				folder_info->type = EXCHANGE_CALENDAR_FOLDER;
 				folders = g_slist_append (folders, folder_info);
 			}
 			else if (!(strcmp (folder_type, "tasks")) ||
 			    	 !(strcmp (folder_type, "tasks/public"))) {
 				folder_info->name = e_folder_get_name (folder);
-				folder_info->uri = e_folder_get_physical_uri (folder); 
+				folder_info->uri = e_folder_get_physical_uri (folder);
 				folder_info->type = EXCHANGE_TASKS_FOLDER;
 				folders = g_slist_append (folders, folder_info);
 			}
@@ -494,7 +494,7 @@ add_sources (ExchangeAccount *account)
 			    	 !(strcmp (folder_type, "contacts/public")) ||
 			    	 !(strcmp (folder_type, "contacts/ldap"))) {
 				folder_info->name = e_folder_get_name (folder);
-				folder_info->uri = e_folder_get_physical_uri (folder); 
+				folder_info->uri = e_folder_get_physical_uri (folder);
 				folder_info->type = EXCHANGE_CONTACTS_FOLDER;
 				folders = g_slist_append (folders, folder_info);
 			}
@@ -509,8 +509,8 @@ add_sources (ExchangeAccount *account)
 }
 #endif
 
-static void 
-remove_account_esource (ExchangeAccount *account, 
+static void
+remove_account_esource (ExchangeAccount *account,
 		        FolderType folder_type)
 {
 	ESourceGroup *group;
@@ -528,10 +528,10 @@ remove_account_esource (ExchangeAccount *account,
 	client = gconf_client_get_default ();
 
 	if (folder_type == EXCHANGE_CONTACTS_FOLDER)
-		source_list = e_source_list_new_for_gconf ( client, 
+		source_list = e_source_list_new_for_gconf ( client,
 							CONF_KEY_CONTACTS);
 	else if (folder_type == EXCHANGE_CALENDAR_FOLDER)
-		source_list = e_source_list_new_for_gconf ( client, 
+		source_list = e_source_list_new_for_gconf ( client,
 							CONF_KEY_CAL);
 	else if (folder_type == EXCHANGE_TASKS_FOLDER)
 		source_list = e_source_list_new_for_gconf ( client,
@@ -555,19 +555,19 @@ remove_account_esource (ExchangeAccount *account,
 				/* Remove from the selected folders */
 				if (folder_type == EXCHANGE_CALENDAR_FOLDER) {
 					ids = gconf_client_get_list (
-							client, 
-							CONF_KEY_SELECTED_CAL_SOURCES , 
+							client,
+							CONF_KEY_SELECTED_CAL_SOURCES ,
 							GCONF_VALUE_STRING, NULL);
 					if (ids) {
 						node_to_be_deleted = g_slist_find_custom (
-									ids, 
-									source_uid, 
+									ids,
+									source_uid,
 									(GCompareFunc) strcmp);
 						if (node_to_be_deleted) {
 							g_free (node_to_be_deleted->data);
-							ids = g_slist_delete_link (ids, 
+							ids = g_slist_delete_link (ids,
 									node_to_be_deleted);
-							gconf_client_set_list (client, 
+							gconf_client_set_list (client,
 								CONF_KEY_SELECTED_CAL_SOURCES,
 								GCONF_VALUE_STRING, ids, NULL);
 						}
@@ -576,19 +576,19 @@ remove_account_esource (ExchangeAccount *account,
 					}
 				}
 				else if (folder_type == EXCHANGE_TASKS_FOLDER) {
-					ids = gconf_client_get_list (client, 
-								CONF_KEY_SELECTED_TASKS_SOURCES , 
+					ids = gconf_client_get_list (client,
+								CONF_KEY_SELECTED_TASKS_SOURCES ,
 								GCONF_VALUE_STRING, NULL);
 					if (ids) {
 						node_to_be_deleted = g_slist_find_custom (
 									ids,
-									source_uid, 
+									source_uid,
 									(GCompareFunc) strcmp);
 						if (node_to_be_deleted) {
 							g_free (node_to_be_deleted->data);
-							ids = g_slist_delete_link (ids, 
+							ids = g_slist_delete_link (ids,
 									node_to_be_deleted);
-							gconf_client_set_list (client, 
+							gconf_client_set_list (client,
 								CONF_KEY_SELECTED_TASKS_SOURCES,
 								GCONF_VALUE_STRING, ids, NULL);
 						}
@@ -617,17 +617,17 @@ remove_account_esources (ExchangeAccount *account)
 }
 
 #ifdef HAVE_KRB5
-static char * 
+static char *
 get_new_exchange_password (ExchangeAccount *account)
 {
 	char *old_password, *new_password;
 
 	old_password = exchange_account_get_password (account);
 	new_password = exchange_get_new_password (old_password, 0);
-	
+
 	if (new_password) {
-		exchange_account_set_password (account, 
-					       old_password, 
+		exchange_account_set_password (account,
+					       old_password,
 					       new_password);
 		g_free (old_password);
 		return new_password;
@@ -661,7 +661,7 @@ display_passwd_expiry_message (int max_passwd_age, ExchangeAccount *account)
 	GtkLabel *warning_msg_label;
 	char *passwd_expiry_msg =
 		g_strdup_printf (_("Your password will expire in the next %d days"), max_passwd_age);
-	
+
 	xml = glade_xml_new (FILENAME, ROOTNODE, NULL);
 	g_return_if_fail (xml != NULL);
 	top_widget = glade_xml_get_widget (xml, ROOTNODE);
@@ -677,17 +677,17 @@ display_passwd_expiry_message (int max_passwd_age, ExchangeAccount *account)
 	g_signal_connect (change_passwd_button,
 			  "clicked",
 			  G_CALLBACK (change_passwd_cb),
-			  account); 
+			  account);
 #endif
 	response = gtk_dialog_run (GTK_DIALOG (top_widget));
-	
+
 	gtk_widget_destroy (top_widget);
 	g_object_unref (xml);
 	g_free (passwd_expiry_msg);
 }
 
-ExchangeAccountResult 
-exchange_config_listener_authenticate (ExchangeConfigListener *ex_conf_listener, ExchangeAccount *account) 
+ExchangeAccountResult
+exchange_config_listener_authenticate (ExchangeConfigListener *ex_conf_listener, ExchangeAccount *account)
 {
 	ExchangeConfigListenerPrivate *priv;
 	ExchangeAccountResult result;
@@ -707,7 +707,7 @@ exchange_config_listener_authenticate (ExchangeConfigListener *ex_conf_listener,
 	remember_password = camel_url_get_param (camel_url, "save-passwd");
 	password = e_passwords_get_password ("Exchange", key);
 	if (!password) {
-		oldremember = remember = exchange_account_is_save_password (account);	
+		oldremember = remember = exchange_account_is_save_password (account);
 		title = g_strdup_printf (_("Enter Password for %s"), account->account_name);
 		password = e_passwords_ask_password (title, "Exchange", key, title,
 						     E_PASSWORDS_REMEMBER_FOREVER|E_PASSWORDS_SECRET,
@@ -760,17 +760,17 @@ exchange_config_listener_authenticate (ExchangeConfigListener *ex_conf_listener,
 
 		switch (result) {
 			case EXCHANGE_ACCOUNT_QUOTA_RECIEVE_ERROR:
-				current_quota_usage = g_strdup_printf ("%.2f", 
+				current_quota_usage = g_strdup_printf ("%.2f",
 							account->mbox_size);
 				error_code = "org-gnome-exchange-operations:account-quota-error";
 				break;
 			case EXCHANGE_ACCOUNT_QUOTA_SEND_ERROR:
-				current_quota_usage = g_strdup_printf ("%.2f", 
+				current_quota_usage = g_strdup_printf ("%.2f",
 							account->mbox_size);
 				error_code = "org-gnome-exchange-operations:account-quota-send-error";
 				break;
 			case EXCHANGE_ACCOUNT_QUOTA_WARN:
-				current_quota_usage = g_strdup_printf ("%.2f", 
+				current_quota_usage = g_strdup_printf ("%.2f",
 							account->mbox_size);
 				error_code = "org-gnome-exchange-operations:account-quota-warn";
 				break;
@@ -780,14 +780,14 @@ exchange_config_listener_authenticate (ExchangeConfigListener *ex_conf_listener,
 
 		if (current_quota_usage) {
 			widget = e_error_new (NULL, error_code, current_quota_usage);
-			g_signal_connect ((GtkDialog *)widget, "response", 
+			g_signal_connect ((GtkDialog *)widget, "response",
 					  G_CALLBACK (gtk_widget_destroy), widget);
 			gtk_widget_show (widget);
 			g_free (current_quota_usage);
 		}
 
-		/* reset result, so that we check if the password 
-		 * expiry warning period 
+		/* reset result, so that we check if the password
+		 * expiry warning period
 		 */
 		result = EXCHANGE_ACCOUNT_CONNECT_SUCCESS;
 	}
@@ -821,7 +821,7 @@ exchange_config_listener_authenticate (ExchangeConfigListener *ex_conf_listener,
 					g_object_unref (xml);
 					return result;
 				}
-	
+
 				response = gtk_dialog_run (GTK_DIALOG (dialog));
 				gtk_widget_destroy (dialog);
 				g_object_unref (xml);
@@ -925,7 +925,7 @@ requires_relogin (char *current_url, char *new_url)
 		relogin = TRUE;
 		goto end;
 	}
-	
+
 	if (current_uri->authmech || new_uri->authmech) {
 		if (current_uri->authmech && new_uri->authmech) {
 	    		if (strcmp (current_uri->authmech, new_uri->authmech)) {
@@ -933,7 +933,7 @@ requires_relogin (char *current_url, char *new_url)
 				relogin = TRUE;
 				goto end;
 			}
-		} 
+		}
 		else {
 			/* Auth mechanism is set for the first time */
 			relogin = TRUE;
@@ -941,10 +941,10 @@ requires_relogin (char *current_url, char *new_url)
 		}
 	}
 
-	for (i=0; i<n_params; i++) { 
+	for (i=0; i<n_params; i++) {
 		current_param_val = e2k_uri_get_param (current_uri, params[i]);
-		new_param_val = e2k_uri_get_param (new_uri, params[i]); 
-	
+		new_param_val = e2k_uri_get_param (new_uri, params[i]);
+
 		if (current_param_val && new_param_val) {
 			/* both the urls have params to be compared */
 			if (strcmp (current_param_val, new_param_val)) {
@@ -990,11 +990,11 @@ account_changed (EAccountList *account_list, EAccount *account)
 		return;
 	}
 
-	/* FIXME: The order of the parameters in the Camel URL string is not in 
+	/* FIXME: The order of the parameters in the Camel URL string is not in
 	 * order for the two given strings. So, we will not be able to use
 	 * plain string comparison. Instead compare the parameters one by one.
 	 */
-	if (exchange_camel_urls_is_equal (config_listener->priv->configured_uri, 
+	if (exchange_camel_urls_is_equal (config_listener->priv->configured_uri,
 					  account->source->url) &&
 	    !strcmp (config_listener->priv->configured_name, account->name)) {
 		/* The user changed something we don't care about. */
@@ -1025,18 +1025,18 @@ account_changed (EAccountList *account_list, EAccount *account)
 		return;
 	}
 
-	/* If account name has changed, or the url value has changed, which 
-	 * could be due to change in hostname or some parameter value, 
-	 * remove old e-sources 
+	/* If account name has changed, or the url value has changed, which
+	 * could be due to change in hostname or some parameter value,
+	 * remove old e-sources
 	 */
-	if (requires_relogin (config_listener->priv->configured_uri, 
+	if (requires_relogin (config_listener->priv->configured_uri,
 			      account->source->url)) {
 		remove_account_esources (priv->exchange_account);
 		exchange_account_forget_password (priv->exchange_account);
 	} else if (strcmp (config_listener->priv->configured_name, account->name)) {
 /* 		remove_account_esources (priv->exchange_account); */
 		exchange_config_listener_modify_esource_group_name (config_listener,
-								    config_listener->priv->configured_name, 
+								    config_listener->priv->configured_name,
 								    account->name);
 		g_free (config_listener->priv->configured_name);
 		config_listener->priv->configured_name = g_strdup (account->name);
@@ -1045,9 +1045,9 @@ account_changed (EAccountList *account_list, EAccount *account)
 		/* FIXME: Do ESources need to be modified? */
 		return;
 	}
-	
+
 	/* Nope. Let the user know we're ignoring him. */
-	e_error_run (NULL, "org-gnome-exchange-operations:apply-restart", 
+	e_error_run (NULL, "org-gnome-exchange-operations:apply-restart",
 		     priv->configured_name, NULL);
 
 	/* But note the new URI so if he changes something else, we
@@ -1085,7 +1085,7 @@ account_removed (EAccountList *account_list, EAccount *account)
 		priv->configured_uri = NULL;
 		g_free (priv->configured_name);
 		priv->configured_name = NULL;
-	} 
+	}
 }
 
 static gboolean
@@ -1124,7 +1124,7 @@ exchange_config_listener_get_offline_status (ExchangeConfigListener *excl,
 	gconf_value_free (value);
 	return status;
 
-}	
+}
 
 /**
  * exchange_config_listener_new:
@@ -1170,22 +1170,22 @@ exchange_config_listener_get_accounts (ExchangeConfigListener *config_listener)
 /**
  * exchange_config_listener_modify_esource_group_name
  *
- * @excl: Handle for Exchange Config Listener 
+ * @excl: Handle for Exchange Config Listener
  * @old_name: Old name of the ESourceGroup
  * @new_name: New name of the ESourceGroup
  *
  * This function modifies the old source group name to the specified new
  * source group name
- **/ 
-void 
+ **/
+void
 exchange_config_listener_modify_esource_group_name (ExchangeConfigListener *excl,
-							 const char *old_name, 
+							 const char *old_name,
 							 const char *new_name)
 {
 	GConfClient *client;
 	ESourceGroup *group;
 	GSList *groups;
-	ESourceList *c_source_list = NULL, *t_source_list = NULL, 
+	ESourceList *c_source_list = NULL, *t_source_list = NULL,
 		*a_source_list = NULL;
 
 	client = excl->priv->gconf;
@@ -1236,14 +1236,14 @@ exchange_config_listener_modify_esource_group_name (ExchangeConfigListener *excl
 #if LDEAD
 /**
  * exchange_add_autocompletion_folders:
- * 
+ *
  * @gc_client: GConfClient handle
  * @account: ExchangeAccount handle
  *
  * This function adds the GAL of the Exchange account to the autocompletion list
  * while configuring a new Exchange account
  *
- **/ 
+ **/
 static void
 exchange_add_autocompletion_folders (GConfClient *gc_client, ExchangeAccount *account)
 {
@@ -1262,7 +1262,7 @@ exchange_add_autocompletion_folders (GConfClient *gc_client, ExchangeAccount *ac
                     &&
 		    strcmp (e_source_group_peek_base_uri (group), EXCHANGE_URI_PREFIX) == 0) {
 			GSList *sources = e_source_group_peek_sources (group);
-			
+
 			for( ; sources != NULL; sources = g_slist_next (sources)) {
 				ESource *source = E_SOURCE (sources->data);
 				const gchar *absolute_uri;
@@ -1286,8 +1286,8 @@ exchange_add_autocompletion_folders (GConfClient *gc_client, ExchangeAccount *ac
 
 
 /**
- * exchange_camel_urls_is_equal 
- * 
+ * exchange_camel_urls_is_equal
+ *
  * @url1: CAMEL URL string 1
  * @url2: CAMEL URL string 2
  *
@@ -1296,7 +1296,7 @@ exchange_add_autocompletion_folders (GConfClient *gc_client, ExchangeAccount *ac
  *
  * Return Value: Boolean result of the comparision.
  *
- **/ 
+ **/
 static gboolean
 exchange_camel_urls_is_equal (const gchar *url1, const gchar *url2)
 {
@@ -1311,7 +1311,7 @@ exchange_camel_urls_is_equal (const gchar *url1, const gchar *url2)
 	};
 	const int n_params = 5;
 	int i;
-	
+
 	curl1 = camel_url_new (url1, NULL);
 	curl2 = camel_url_new (url2, NULL);
 
@@ -1325,7 +1325,7 @@ exchange_camel_urls_is_equal (const gchar *url1, const gchar *url2)
 			g_free (curl1);
 			g_free (curl2);
 			return FALSE;
-		}		
+		}
 		g_free (param1);
 		g_free (param2);
 	}
@@ -1337,14 +1337,14 @@ exchange_camel_urls_is_equal (const gchar *url1, const gchar *url2)
 
 /**
  * remove_selected_non_offline_esources
- * 
+ *
  * @account: Handle for Exchange Account
  * @gconf_key: GConf key of the calendar or tasks
  *
- * This function removes the non-offline calendars and taks list from the 
+ * This function removes the non-offline calendars and taks list from the
  * selection list
- **/ 
-static void 
+ **/
+static void
 remove_selected_non_offline_esources (ExchangeAccount *account, const char *gconf_key)
 {
 	ESourceGroup *group;
@@ -1388,21 +1388,21 @@ remove_selected_non_offline_esources (ExchangeAccount *account, const char *gcon
 				source_uid = e_source_peek_uid (source);
 
 				/* Remove from the selected folders */
-				ids = gconf_client_get_list (client, 
-							     selected_gconf_key, 
+				ids = gconf_client_get_list (client,
+							     selected_gconf_key,
 							     GCONF_VALUE_STRING, NULL);
 				if (ids) {
 					offline_mode = e_source_get_property (source, "offline_sync");
-					if (!offline_mode || 
+					if (!offline_mode ||
 					    (offline_mode && strcmp (offline_mode, "1"))) {
-						while ((node_to_be_deleted = 
-							g_slist_find_custom (ids, 
-									     source_uid, 
+						while ((node_to_be_deleted =
+							g_slist_find_custom (ids,
+									     source_uid,
 									     (GCompareFunc) strcmp))) {
 							g_free (node_to_be_deleted->data);
-							ids = g_slist_delete_link (ids, 
+							ids = g_slist_delete_link (ids,
 										   node_to_be_deleted);
-							gconf_client_set_list (client, 
+							gconf_client_set_list (client,
 									       selected_gconf_key,
 									       GCONF_VALUE_STRING, ids, NULL);
 						}
@@ -1415,7 +1415,7 @@ remove_selected_non_offline_esources (ExchangeAccount *account, const char *gcon
 			e_source_list_sync (source_list, NULL);
 		}
 	}
-	
+
 	g_free (selected_gconf_key);
 	g_object_unref (source_list);
 	g_object_unref (client);
diff --git a/plugins/exchange-operations/exchange-config-listener.h b/plugins/exchange-operations/exchange-config-listener.h
index 19f59f5c1a..edf6208255 100644
--- a/plugins/exchange-operations/exchange-config-listener.h
+++ b/plugins/exchange-operations/exchange-config-listener.h
@@ -59,10 +59,10 @@ void 			remove_folder_esource (ExchangeAccount *account, FolderType folder_type,
 ExchangeConfigListenerStatus exchange_config_listener_get_offline_status (ExchangeConfigListener *excl, gint *mode);
 
 void exchange_config_listener_modify_esource_group_name (ExchangeConfigListener *excl,
-							 const char *old_name, 
+							 const char *old_name,
 							 const char *new_name);
 
-ExchangeAccountResult exchange_config_listener_authenticate (ExchangeConfigListener *excl, 
+ExchangeAccountResult exchange_config_listener_authenticate (ExchangeConfigListener *excl,
 							ExchangeAccount *account);
 
 #ifdef __cplusplus
diff --git a/plugins/exchange-operations/exchange-contacts.c b/plugins/exchange-operations/exchange-contacts.c
index 3e6367a224..147bf1fe14 100644
--- a/plugins/exchange-operations/exchange-contacts.c
+++ b/plugins/exchange-operations/exchange-contacts.c
@@ -58,7 +58,7 @@ void e_exchange_contacts_commit (EPlugin *epl, EConfigTarget *target);
 
 /* FIXME: Reconsider the prototype of this function */
 static GPtrArray *
-e_exchange_contacts_get_contacts (void) 
+e_exchange_contacts_get_contacts (void)
 {
 	ExchangeAccount *account;
 	GPtrArray *folder_array;
@@ -156,14 +156,14 @@ e_exchange_contacts_pcontacts (EPlugin *epl, EConfigHookItemFactoryData *data)
 		}
 	}
 
-	exchange_config_listener_get_offline_status (exchange_global_config_listener, 
+	exchange_config_listener_get_offline_status (exchange_global_config_listener,
 								    &offline_status);
 	if (offline_status == OFFLINE_MODE) {
 		/* Evolution is in offline mode; we will not be able to create
 		   new folders or modify existing folders. */
-		offline_msg = g_markup_printf_escaped ("<b>%s</b>", 
+		offline_msg = g_markup_printf_escaped ("<b>%s</b>",
 						       _("Evolution is in offline mode. You cannot create or modify folders now.\nPlease switch to online mode for such operations."));
-		vb_offline_msg = gtk_vbox_new (FALSE, 6);		
+		vb_offline_msg = gtk_vbox_new (FALSE, 6);
 		gtk_container_add (GTK_CONTAINER (data->parent), vb_offline_msg);
 		lbl_offline_msg = gtk_label_new ("");
 		gtk_label_set_markup (GTK_LABEL (lbl_offline_msg), offline_msg);
@@ -171,7 +171,7 @@ e_exchange_contacts_pcontacts (EPlugin *epl, EConfigHookItemFactoryData *data)
 		gtk_box_pack_start (GTK_BOX (vb_offline_msg), lbl_offline_msg, FALSE, FALSE, 0);
 		gtk_widget_show_all (vb_offline_msg);
 		g_free (uri_text);
-		return vb_offline_msg;		
+		return vb_offline_msg;
 	}
 
 	if (gal_folder) {
@@ -235,14 +235,14 @@ e_exchange_contacts_pcontacts (EPlugin *epl, EConfigHookItemFactoryData *data)
 	gtk_widget_show (lbl_pcontacts);
 	gtk_misc_set_alignment (GTK_MISC (lbl_pcontacts), 0.0, 0.5);
 	gtk_box_pack_start (GTK_BOX (vb_pcontacts), lbl_pcontacts, FALSE, FALSE, 0);
-  
+
 	ts_pcontacts = gtk_tree_store_new (NUM_COLS, G_TYPE_STRING, G_TYPE_STRING);
 
 	conlist = e_exchange_contacts_get_contacts ();
 
 	for (i=0; i<conlist->len; ++i) {
 		ruri = g_ptr_array_index (conlist, i);
-		exchange_operations_cta_add_node_to_tree (ts_pcontacts, NULL, ruri);		
+		exchange_operations_cta_add_node_to_tree (ts_pcontacts, NULL, ruri);
 	}
 
 	cr_contacts = gtk_cell_renderer_text_new ();
@@ -251,7 +251,7 @@ e_exchange_contacts_pcontacts (EPlugin *epl, EConfigHookItemFactoryData *data)
 	gtk_tree_view_append_column (GTK_TREE_VIEW (tv_pcontacts), tvc_contacts);
 	g_object_set (tv_pcontacts,"expander-column", tvc_contacts, "headers-visible", TRUE, NULL);
 	gtk_tree_view_expand_all (GTK_TREE_VIEW (tv_pcontacts));
-	
+
 	scrw_pcontacts = gtk_scrolled_window_new (NULL, NULL);
 	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrw_pcontacts), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
 	gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrw_pcontacts), GTK_SHADOW_IN);
@@ -272,7 +272,7 @@ e_exchange_contacts_pcontacts (EPlugin *epl, EConfigHookItemFactoryData *data)
 		tmpruri = (gchar*) rel_uri;
 		uri_prefix = g_strconcat (account->account_filename, "/;", NULL);
 		prefix_len = strlen (uri_prefix);
-		
+
 		if (g_str_has_prefix (tmpruri, uri_prefix)) {
 			sruri = g_strdup (tmpruri+prefix_len);
 		}
@@ -281,24 +281,24 @@ e_exchange_contacts_pcontacts (EPlugin *epl, EConfigHookItemFactoryData *data)
 		}
 
 		selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (tv_pcontacts));
-		exchange_operations_cta_select_node_from_tree (ts_pcontacts, 
-							       NULL, 
-							       sruri, 
-							       sruri, 
+		exchange_operations_cta_select_node_from_tree (ts_pcontacts,
+							       NULL,
+							       sruri,
+							       sruri,
 							       selection);
-		gtk_widget_set_sensitive (tv_pcontacts, FALSE);		
-		
+		gtk_widget_set_sensitive (tv_pcontacts, FALSE);
+
 		g_free (uri_prefix);
 		g_free (sruri);
 	}
 
-	g_ptr_array_free (conlist, TRUE);  
+	g_ptr_array_free (conlist, TRUE);
 	g_object_unref (ts_pcontacts);
 	return vb_pcontacts;
 }
 
-gboolean 
-e_exchange_contacts_check (EPlugin *epl, EConfigHookPageCheckData *data) 
+gboolean
+e_exchange_contacts_check (EPlugin *epl, EConfigHookPageCheckData *data)
 {
 	/* FIXME - check pageid */
 	EABConfigTargetSource *t = (EABConfigTargetSource *) data->target;
@@ -311,7 +311,7 @@ e_exchange_contacts_check (EPlugin *epl, EConfigHookPageCheckData *data)
 	rel_uri = e_source_peek_relative_uri (t->source);
 	group = e_source_peek_group (t->source);
 	base_uri = e_source_group_peek_base_uri (group);
-	exchange_config_listener_get_offline_status (exchange_global_config_listener, 
+	exchange_config_listener_get_offline_status (exchange_global_config_listener,
 								    &offline_status);
 	if (base_uri && !g_ascii_strncasecmp (base_uri, "exchange", 8)) {
 		if (offline_status == OFFLINE_MODE)
@@ -335,7 +335,7 @@ e_exchange_contacts_check (EPlugin *epl, EConfigHookPageCheckData *data)
 		ESourceGroup *source_group = NULL;
 		GSList *groups;
 		ESource *source;
-		
+
 		/* GAL folder */
 		client = gconf_client_get_default ();
 		source_list = e_source_list_new_for_gconf ( client, CONF_KEY_CONTACTS);
@@ -345,7 +345,7 @@ e_exchange_contacts_check (EPlugin *epl, EConfigHookPageCheckData *data)
 		if ((source_group = e_source_list_peek_group_by_name (source_list,
                                         account->account_name))) {
 			source =  e_source_group_peek_source_by_name (source_group, e_source_peek_name (t->source));
-			if (e_source_group_peek_source_by_name (source_group, 
+			if (e_source_group_peek_source_by_name (source_group,
 							e_source_peek_name (t->source))) {
 				/* not a rename of GAL */
 				g_object_unref (source_list);
@@ -353,7 +353,7 @@ e_exchange_contacts_check (EPlugin *epl, EConfigHookPageCheckData *data)
 			}
 			else {
 				g_object_unref (source_list);
-				return FALSE; 
+				return FALSE;
 			}
 		}
 		else {
@@ -381,9 +381,9 @@ e_exchange_contacts_check (EPlugin *epl, EConfigHookPageCheckData *data)
 		folder_name = g_strdup (g_strrstr (path, "/") +1);
 		g_free (path);
 
-		if (strcmp (folder_name, e_source_peek_name (t->source))) { 
+		if (strcmp (folder_name, e_source_peek_name (t->source))) {
 			/* rename */
-			if (exchange_account_get_standard_uri (account, folder_name) || 
+			if (exchange_account_get_standard_uri (account, folder_name) ||
 			    !is_personal) {
 				/* rename of standard/non-personal folder */
 				g_free (folder_name);
@@ -395,7 +395,7 @@ e_exchange_contacts_check (EPlugin *epl, EConfigHookPageCheckData *data)
 	return TRUE;
 }
 
-void 
+void
 e_exchange_contacts_commit (EPlugin *epl, EConfigTarget *target)
 {
 	EABConfigTargetSource *t = (EABConfigTargetSource *) target;
@@ -407,15 +407,15 @@ e_exchange_contacts_commit (EPlugin *epl, EConfigTarget *target)
 	ExchangeAccountFolderResult result;
 	gint offline_status;
 	gboolean rename = FALSE;
-		
+
 	uri_text = e_source_get_uri (source);
 	if (uri_text && strncmp (uri_text, "exchange", 8)) {
 		/* here no need of checking for gal */
 		g_free (uri_text);
 		return;
-	}	
+	}
 
-	exchange_config_listener_get_offline_status (exchange_global_config_listener, 
+	exchange_config_listener_get_offline_status (exchange_global_config_listener,
 								    &offline_status);
 	if (offline_status == OFFLINE_MODE) {
 		g_free (uri_text);
@@ -444,11 +444,11 @@ e_exchange_contacts_commit (EPlugin *epl, EConfigTarget *target)
 		euri = e_uri_new (uri_text);
 		uri_string = e_uri_to_string (euri, FALSE);
 		e_uri_free (euri);
-	
-		uri_len = strlen (uri_string) + 1;	
+
+		uri_len = strlen (uri_string) + 1;
 		tmpruri = g_strdup (uri_string + strlen ("exchange://"));
 		temp_path = g_build_filename ("/", uri_text + uri_len, NULL);
-		prefix	= g_strndup (temp_path, strlen (temp_path) - strlen (g_strrstr (temp_path, "/"))); 
+		prefix	= g_strndup (temp_path, strlen (temp_path) - strlen (g_strrstr (temp_path, "/")));
 		g_free (temp_path);
 		path = g_build_filename (prefix, "/", gname, NULL);
 		ruri = g_strconcat (tmpruri, ";", path+1, NULL);
@@ -511,7 +511,7 @@ e_exchange_contacts_commit (EPlugin *epl, EConfigTarget *target)
 	case EXCHANGE_ACCOUNT_FOLDER_UNSUPPORTED_OPERATION:
 		e_error_run (NULL, ERROR_DOMAIN ":folder-unsupported-error", NULL);
 		break;
-	case EXCHANGE_ACCOUNT_FOLDER_GENERIC_ERROR:		
+	case EXCHANGE_ACCOUNT_FOLDER_GENERIC_ERROR:
 		e_error_run (NULL, ERROR_DOMAIN ":folder-generic-error", NULL);
 		break;
 	default:
diff --git a/plugins/exchange-operations/exchange-delegates-user.c b/plugins/exchange-operations/exchange-delegates-user.c
index 062a11a193..d7da5d22b5 100644
--- a/plugins/exchange-operations/exchange-delegates-user.c
+++ b/plugins/exchange-operations/exchange-delegates-user.c
@@ -76,8 +76,8 @@ const char *exchange_delegates_user_folder_names[] = {
 	"calendar", "tasks", "inbox", "contacts"
 };
 
-/* To translators: The folder names to be displayed in the message being 
-   sent to the delegatee. 
+/* To translators: The folder names to be displayed in the message being
+   sent to the delegatee.
 */
 static const char *folder_names_for_display[] = {
 	N_("Calendar"), N_("Tasks"), N_("Inbox"), N_("Contacts")
@@ -177,11 +177,11 @@ parent_window_destroyed (gpointer dialog, GObject *where_parent_window_was)
 */
 static const char *
 map_to_full_role_name (E2kPermissionsRole role_nam)
-{	
+{
 	const char *role_name;
 
 	switch (role_nam)
-	{	
+	{
 	/* To translators: The following are the various types of permissions that can
 	   assigned by an user to his folders.
 	*/
@@ -195,7 +195,7 @@ map_to_full_role_name (E2kPermissionsRole role_nam)
 
 		case E2K_PERMISSIONS_ROLE_REVIEWER: role_name = g_strdup (
 							_("Reviewer (read-only)"));
-						    break;	
+						    break;
 
 		default: role_name = g_strdup (_("None"));
 			 break;
@@ -224,10 +224,10 @@ em_utils_delegates_done (CamelFolder *folder, CamelMimeMessage *msg, CamelMessag
  * Return value: %TRUE for "OK", %FALSE for "Cancel".
  **/
 gboolean
-exchange_delegates_user_edit (ExchangeAccount *account, 
+exchange_delegates_user_edit (ExchangeAccount *account,
 			     ExchangeDelegatesUser *user,
 			     GtkWidget *parent_window)
-{	
+{
 	GladeXML *xml;
 	GtkWidget *dialog, *table, *label, *menu, *check, *check_delegate;
 	char *title;
@@ -303,11 +303,11 @@ exchange_delegates_user_edit (ExchangeAccount *account,
 
 	/* The following piece of code is used to construct a mail message to be sent to a Delegate
 	   summarizing all the permissions set for him on the user's various folders.
-	*/	
+	*/
 	check_delegate = glade_xml_get_widget (xml, "delegate_mail");
 	if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (check_delegate)) == TRUE) {
 		if (button == GTK_RESPONSE_OK) {
-			
+
 			EAccount *eaccount;
 			CamelMimeMessage *delegate_mail = camel_mime_message_new ();
 			CamelMultipart *body = camel_multipart_new ();
@@ -315,13 +315,13 @@ exchange_delegates_user_edit (ExchangeAccount *account,
 			CamelDataWrapper *delegate_mail_text, *delegate_mail_data;
 			CamelContentType *type;
 			CamelInternetAddress *addr;
-			CamelStream *stream;	
+			CamelStream *stream;
 			CamelFolder *out_folder;
-			CamelMessageInfo *info;			
+			CamelMessageInfo *info;
 			char *self_address, *delegate_mail_subject;
 			char *role_name;
 			char *role_name_final = "";
-			
+
 			const char *recipient_address;
 			const char *delegate_exchange_dn;
 			const char *msg_part1 = NULL, *msg_part2 = NULL;
@@ -332,7 +332,7 @@ exchange_delegates_user_edit (ExchangeAccount *account,
 			/* Create toplevel container */
 			camel_data_wrapper_set_mime_type (CAMEL_DATA_WRAPPER (body),
 					"multipart/alternative;");
-			camel_multipart_set_boundary (body, NULL);	
+			camel_multipart_set_boundary (body, NULL);
 
 			/* Create textual receipt */
 			delegate_mail_text = camel_data_wrapper_new ();
@@ -341,13 +341,13 @@ exchange_delegates_user_edit (ExchangeAccount *account,
 			camel_data_wrapper_set_mime_type_field (delegate_mail_text, type);
 			camel_content_type_unref (type);
 			stream = camel_stream_mem_new ();
-			
-			/* To translators: This is a part of the message to be sent to the delegatee 
+
+			/* To translators: This is a part of the message to be sent to the delegatee
 			   summarizing the permissions assigned to him.
 			*/
 			msg_part1 = _("This message was sent automatically by Evolution to inform you that you have been "
 				    	"designated as a delegate. You can now send messages on my behalf.");
-			
+
 			/* To translators: Another chunk of the same message.
 			*/
 			msg_part2 = _("You have been given the following permissions on my folders:");
@@ -367,14 +367,14 @@ exchange_delegates_user_edit (ExchangeAccount *account,
 			if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (check)) == TRUE) {
 				/* To translators: This message is included if the delegatee has been given access
 				   to the private items.
-				*/   
+				*/
 				camel_stream_printf (stream, "<br>%s", _("You are also permitted "
 							"to see my private items."));
 			}
 			else
 				/* To translators: This message is included if the delegatee has not been given access
 				   to the private items.
-				*/ 
+				*/
 				camel_stream_printf (stream, "<br>%s", _("However you are not permitted "
 							 "to see my private items."));
 			camel_data_wrapper_construct_from_stream (delegate_mail_text, stream);
@@ -386,7 +386,7 @@ exchange_delegates_user_edit (ExchangeAccount *account,
 			camel_medium_set_content_object (CAMEL_MEDIUM (part), delegate_mail_text);
 			camel_object_unref (delegate_mail_text);
 			camel_multipart_add_part (body, part);
-			camel_object_unref (part);	
+			camel_object_unref (part);
 
 			/* Create the machine-readable receipt */
 			delegate_mail_data = camel_data_wrapper_new ();
@@ -401,7 +401,7 @@ exchange_delegates_user_edit (ExchangeAccount *account,
 			camel_medium_set_content_object (CAMEL_MEDIUM (part), delegate_mail_data);
 			camel_object_unref (delegate_mail_data);
 			camel_multipart_add_part (body, part);
-			camel_object_unref (part);	
+			camel_object_unref (part);
 
 			/* Finish creating the message */
 			camel_medium_set_content_object (CAMEL_MEDIUM (delegate_mail), CAMEL_DATA_WRAPPER (body));
@@ -432,9 +432,9 @@ exchange_delegates_user_edit (ExchangeAccount *account,
 			if(eaccount) {
 				camel_medium_set_header (CAMEL_MEDIUM (delegate_mail),
 							 "X-Evolution-Account", eaccount->uid);
-				camel_medium_set_header (CAMEL_MEDIUM (delegate_mail), 
+				camel_medium_set_header (CAMEL_MEDIUM (delegate_mail),
 							 "X-Evolution-Transport", eaccount->transport->url);
-				camel_medium_set_header (CAMEL_MEDIUM (delegate_mail), 
+				camel_medium_set_header (CAMEL_MEDIUM (delegate_mail),
 							 "X-Evolution-Fcc", eaccount->sent_folder_uri);
 			}
 
diff --git a/plugins/exchange-operations/exchange-delegates-user.h b/plugins/exchange-operations/exchange-delegates-user.h
index ee4d8db80e..9a705f0d9d 100644
--- a/plugins/exchange-operations/exchange-delegates-user.h
+++ b/plugins/exchange-operations/exchange-delegates-user.h
@@ -59,9 +59,9 @@ ExchangeDelegatesUser *exchange_delegates_user_new_from_gc (E2kGlobalCatalog
 							    const char            *email,
 							    GByteArray            *creator_entryid);
 
-gboolean  exchange_delegates_user_edit (ExchangeAccount  *account, ExchangeDelegatesUser *user, 
+gboolean  exchange_delegates_user_edit (ExchangeAccount  *account, ExchangeDelegatesUser *user,
 					GtkWidget *parent_window);
- 
+
 
 
 #ifdef __cplusplus
diff --git a/plugins/exchange-operations/exchange-delegates.c b/plugins/exchange-operations/exchange-delegates.c
index 4c4bc7efc9..46088b9ba8 100644
--- a/plugins/exchange-operations/exchange-delegates.c
+++ b/plugins/exchange-operations/exchange-delegates.c
@@ -220,7 +220,7 @@ get_folder_security (ExchangeDelegates *delegates)
 		return delegates->loaded_folders;
 
 	if (!exchange_account_get_global_catalog (delegates->account)) {
-		e_error_run (GTK_WINDOW (delegates->table), ERROR_DOMAIN ":delegates-no-gcs-error", 
+		e_error_run (GTK_WINDOW (delegates->table), ERROR_DOMAIN ":delegates-no-gcs-error",
 			     NULL);
 		return FALSE;
 	}
@@ -259,7 +259,7 @@ get_folder_security (ExchangeDelegates *delegates)
 	status = e2k_result_iter_free (iter);
 
 	if (!E2K_HTTP_STATUS_IS_SUCCESSFUL (status)) {
-		e_error_run (GTK_WINDOW (delegates->table), ERROR_DOMAIN ":delegates-perm-read-error", 
+		e_error_run (GTK_WINDOW (delegates->table), ERROR_DOMAIN ":delegates-perm-read-error",
 			     NULL);
 		return FALSE;
 	}
@@ -359,7 +359,7 @@ get_user_list (ExchangeDelegates *delegates)
  * to end up in state 1. That's what this is for.
  */
 static void
-add_remove_user (ExchangeDelegatesUser *user, 
+add_remove_user (ExchangeDelegatesUser *user,
 		 GPtrArray *to_array, GPtrArray *from_array)
 {
 	ExchangeDelegatesUser *match;
@@ -450,7 +450,7 @@ add_button_clicked_cb (GtkWidget *widget, gpointer data)
 		match = delegates->users->pdata[u];
 		if (e2k_sid_binary_sid_equal (e2k_sid_get_binary_sid (user->sid),
 					      e2k_sid_get_binary_sid (match->sid))) {
-			e_error_run (GTK_WINDOW (parent_window), ERROR_DOMAIN ":delegate-existing", 
+			e_error_run (GTK_WINDOW (parent_window), ERROR_DOMAIN ":delegate-existing",
 				     user->display_name, NULL);
 			g_object_unref (user);
 			exchange_delegates_user_edit (delegates->account, match, parent_window);
@@ -524,9 +524,9 @@ email_look_up (const char *delegate_legacy, ExchangeAccount *account)
 	E2kGlobalCatalogStatus status;
 
 	const char *email_id;
-	
+
 	gc = exchange_account_get_global_catalog (account);
-	
+
 	if (!gc)
 		return NULL;
 
@@ -585,7 +585,7 @@ remove_button_clicked_cb (GtkWidget *widget, gpointer data)
 					 GTK_BUTTONS_YES_NO,
 					 _("Remove the delegate %s?"),
 					 user->display_name);
-	e_dialog_set_transient_for (GTK_WINDOW (dialog), widget); 
+	e_dialog_set_transient_for (GTK_WINDOW (dialog), widget);
 
 	btn = gtk_dialog_run (GTK_DIALOG (dialog));
 	gtk_widget_destroy (dialog);
@@ -757,7 +757,7 @@ delegates_apply (ExchangeDelegates *delegates)
 
 		for (i = 0; i < delegates->users->len; i++) {
 			user = delegates->users->pdata[i];
-			g_ptr_array_add (display_names, g_strdup (user->display_name)); 
+			g_ptr_array_add (display_names, g_strdup (user->display_name));
 			entryid_dup = g_byte_array_new ();
 			g_byte_array_append (entryid_dup, user->entryid->data,
 					     user->entryid->len);
@@ -765,7 +765,7 @@ delegates_apply (ExchangeDelegates *delegates)
 			g_ptr_array_add (privflags, g_strdup_printf ("%d", user->see_private));
 		}
 
-		props = e2k_properties_new (); 
+		props = e2k_properties_new ();
 		e2k_properties_set_string_array (
 			props, PR_DELEGATES_DISPLAY_NAMES, display_names);
 		e2k_properties_set_binary_array (
@@ -773,7 +773,7 @@ delegates_apply (ExchangeDelegates *delegates)
 		e2k_properties_set_int_array (
 			props, PR_DELEGATES_SEE_PRIVATE, privflags);
 	} else if (delegates->removed_users) {
-		props = e2k_properties_new (); 
+		props = e2k_properties_new ();
 		e2k_properties_remove (props, PR_DELEGATES_DISPLAY_NAMES);
 		e2k_properties_remove (props, PR_DELEGATES_ENTRYIDS);
 		e2k_properties_remove (props, PR_DELEGATES_SEE_PRIVATE);
@@ -920,7 +920,7 @@ exchange_delegates (ExchangeAccount *account, GtkWidget *parent)
 	GtkTreeViewColumn *column;
 	GtkTreeIter iter;
 	int i;
-	
+
 	g_return_if_fail (GTK_IS_WIDGET (parent));
 	g_return_if_fail (EXCHANGE_IS_ACCOUNT (account));
 
diff --git a/plugins/exchange-operations/exchange-folder-permission.c b/plugins/exchange-operations/exchange-folder-permission.c
index 5748dd491f..ed2a9c0f4a 100644
--- a/plugins/exchange-operations/exchange-folder-permission.c
+++ b/plugins/exchange-operations/exchange-folder-permission.c
@@ -44,7 +44,7 @@
 #include "calendar/gui/e-cal-model.h"
 #include "addressbook/gui/widgets/eab-menu.h"
 
-#define d(x) 
+#define d(x)
 
 static void org_folder_permissions_cb (EPopup *ep, EPopupItem *p, void *data);
 void org_gnome_exchange_folder_permissions (EPlugin *ep, EMPopupTargetFolder *t);
@@ -255,7 +255,7 @@ org_gnome_exchange_menu_cal_permissions (EPlugin *ep, ECalMenuTargetSelect *targ
 	uri = (gchar *) e_cal_get_uri (ecal);
 	if (!uri)
 		return;
-	else	
+	else
 		if (!g_str_has_prefix (uri, "exchange://"))
 			return;
 
@@ -289,7 +289,7 @@ org_gnome_exchange_menu_tasks_permissions (EPlugin *ep, ECalMenuTargetSelect *ta
 	uri = (gchar *) e_cal_get_uri (ecal);
 	if (!uri)
 		return;
-	else	
+	else
 		if (!g_str_has_prefix (uri, "exchange://"))
 			return;
 	account = exchange_operations_get_exchange_account ();
@@ -320,7 +320,7 @@ org_gnome_exchange_menu_ab_permissions (EPlugin *ep, EABMenuTargetSelect *target
 	uri = (gchar *) e_book_get_uri (ebook);
 	if (!uri)
 		return;
-	else	
+	else
 		if (!g_str_has_prefix (uri, "exchange://"))
 			return;
 
diff --git a/plugins/exchange-operations/exchange-folder-size-display.c b/plugins/exchange-operations/exchange-folder-size-display.c
index c12f1872d9..594ce34c0c 100644
--- a/plugins/exchange-operations/exchange-folder-size-display.c
+++ b/plugins/exchange-operations/exchange-folder-size-display.c
@@ -50,9 +50,9 @@ get_folder_size_func (GtkTreeModel *model,
 	GHashTable *info = (GHashTable *) user_data;
 	gdouble folder_size;
 	char *folder_name;
-	
+
 	gtk_tree_model_get(model, iter, COLUMN_SIZE, &folder_size, COLUMN_NAME, &folder_name, -1);
-	
+
 	g_hash_table_insert (info, g_strdup (folder_name), g_strdup_printf ("%.2f", folder_size));
 	return FALSE;
 }
@@ -90,9 +90,9 @@ format_size_func (GtkTreeViewColumn *col,
 	GtkCellRendererText *cell = (GtkCellRendererText *)renderer;
 	gdouble folder_size;
 	char * new_text;
-	
+
 	gtk_tree_model_get(model, iter, COLUMN_SIZE, &folder_size, -1);
-	
+
 	if (folder_size)
 		new_text = g_strdup_printf ("%.2f", folder_size);
 	else
@@ -138,7 +138,7 @@ exchange_folder_size_display (GtkListStore *model, GtkWidget *parent)
         column = gtk_tree_view_column_new_with_attributes (
                 col_name, gtk_cell_renderer_text_new (), "text", COLUMN_SIZE, NULL);
 	g_free (col_name);
-	
+
 	l = gtk_tree_view_column_get_cell_renderers (column);
 	cell = (GtkCellRenderer *)l->data;
 	gtk_tree_view_column_set_cell_data_func (column, cell, format_size_func, NULL, NULL );
diff --git a/plugins/exchange-operations/exchange-folder-subscription.c b/plugins/exchange-operations/exchange-folder-subscription.c
index 5f785500ad..17c7d27a52 100644
--- a/plugins/exchange-operations/exchange-folder-subscription.c
+++ b/plugins/exchange-operations/exchange-folder-subscription.c
@@ -171,7 +171,7 @@ typedef struct {
 	ExchangeAccount *account;
 	ENameSelector *name_selector;
 	GtkWidget *name_selector_widget;
-	GtkWidget *folder_name_entry;	
+	GtkWidget *folder_name_entry;
 }SubscriptionInfo;
 
 static void
@@ -184,8 +184,8 @@ destroy_subscription_info (SubscriptionInfo *subscription_info)
 	g_free (subscription_info);
 }
 
-static void 
-subscribe_to_folder (GtkWidget *dialog, gint response, gpointer data) 
+static void
+subscribe_to_folder (GtkWidget *dialog, gint response, gpointer data)
 {
 	SubscriptionInfo *subscription_info = data;
 	gchar *user_email_address = NULL, *folder_name = NULL, *path = NULL;
@@ -195,7 +195,7 @@ subscribe_to_folder (GtkWidget *dialog, gint response, gpointer data)
 	GList *destinations;
 	EDestination *destination;
 	ExchangeAccountFolderResult result;
-	
+
 	if (response == GTK_RESPONSE_CANCEL) {
 		gtk_widget_destroy (dialog);
 		destroy_subscription_info (subscription_info);
@@ -226,7 +226,7 @@ subscribe_to_folder (GtkWidget *dialog, gint response, gpointer data)
 				}
 			}
 
-			/* It would be nice to insensitivize the OK button appropriately 
+			/* It would be nice to insensitivize the OK button appropriately
 		   	instead of doing this, but unfortunately we can't do this for the
 		   	Bonobo control.  */
 			e_error_run (GTK_WINDOW (dialog), ERROR_DOMAIN ":select-user", NULL);
@@ -234,8 +234,8 @@ subscribe_to_folder (GtkWidget *dialog, gint response, gpointer data)
 
 		folder_name = g_strdup (gtk_entry_get_text (GTK_ENTRY (subscription_info->folder_name_entry)));
 		if (user_email_address && folder_name) {
-			result = exchange_account_discover_shared_folder (subscription_info->account, 
-									  user_email_address, 
+			result = exchange_account_discover_shared_folder (subscription_info->account,
+									  user_email_address,
 									  folder_name, &folder);
 			g_free (folder_name);
 			switch (result) {
diff --git a/plugins/exchange-operations/exchange-folder.c b/plugins/exchange-operations/exchange-folder.c
index 8cb64c26a5..db2dc0e475 100644
--- a/plugins/exchange-operations/exchange-folder.c
+++ b/plugins/exchange-operations/exchange-folder.c
@@ -94,7 +94,7 @@ org_gnome_exchange_folder_inbox_unsubscribe (EPopup *ep, EPopupItem *p, void *da
 	path = target->uri + strlen ("exchange://") + strlen (account->account_filename);
 	/* User will be able to unsubscribe by doing a right click on
 	   any one of this two-<other user's>Inbox or the
-	   <other user's folder> tree. 
+	   <other user's folder> tree.
 	  */
 	stored_path = strrchr (path + 1, '/');
 
@@ -125,13 +125,13 @@ org_gnome_exchange_folder_inbox_unsubscribe (EPopup *ep, EPopupItem *p, void *da
 			return;
 		case EXCHANGE_ACCOUNT_FOLDER_GENERIC_ERROR:
 			e_error_run (NULL, ERROR_DOMAIN ":folder-generic-error", NULL);
-			return;	
+			return;
 		case EXCHANGE_ACCOUNT_FOLDER_GC_NOTREACHABLE:
 			e_error_run (NULL, ERROR_DOMAIN ":folder-no-gc-error", NULL);
-			return;	
+			return;
 		case EXCHANGE_ACCOUNT_FOLDER_NO_SUCH_USER:
 			e_error_run (NULL, ERROR_DOMAIN ":no-user-error", NULL);
-			return;	
+			return;
 	}
 
 	/* We need to get the physical uri for the Inbox */
@@ -252,7 +252,7 @@ popup_ab_free (EPopup *ep, GSList *items, void *data)
 }
 
 void
-org_gnome_exchange_check_address_book_subscribed (EPlugin *ep, EABPopupTargetSource *target)  
+org_gnome_exchange_check_address_book_subscribed (EPlugin *ep, EABPopupTargetSource *target)
 {
 	GSList *menus = NULL;
 	int i = 0;
@@ -362,7 +362,7 @@ unsubscribe_dialog_ab_response (GtkDialog *dialog, int response, gpointer data)
 		e_source_group_remove_source_by_uid (source_group, source_uid);
 		g_free (path);
 		gtk_widget_destroy (GTK_WIDGET (dialog));
-	} 
+	}
 	if (response == GTK_RESPONSE_CANCEL)
 		gtk_widget_destroy (GTK_WIDGET (dialog));
 	if (response == GTK_RESPONSE_DELETE_EVENT)
@@ -397,19 +397,19 @@ unsubscribe_dialog_response (GtkDialog *dialog, int response, gpointer data)
 
 		path = g_strdup (ruri + strlen (account->account_filename));
 		exchange_account_remove_shared_folder (account, path);
-		ids = gconf_client_get_list (client, 
-					     CONF_KEY_SELECTED_CAL_SOURCES, 
+		ids = gconf_client_get_list (client,
+					     CONF_KEY_SELECTED_CAL_SOURCES,
 					     GCONF_VALUE_STRING, NULL);
 		if (ids) {
 			node_to_be_deleted = g_slist_find_custom (
-						ids, 
-						source_uid, 
+						ids,
+						source_uid,
 						(GCompareFunc) strcmp);
 			if (node_to_be_deleted) {
 				g_free (node_to_be_deleted->data);
-				ids = g_slist_delete_link (ids, 
+				ids = g_slist_delete_link (ids,
 						node_to_be_deleted);
-				gconf_client_set_list (client, 
+				gconf_client_set_list (client,
 					CONF_KEY_SELECTED_CAL_SOURCES,
 					GCONF_VALUE_STRING, ids, NULL);
 			}
@@ -421,7 +421,7 @@ unsubscribe_dialog_response (GtkDialog *dialog, int response, gpointer data)
 		e_source_group_remove_source_by_uid (source_group, source_uid);
 		g_free (path);
 		gtk_widget_destroy (GTK_WIDGET (dialog));
-	} 
+	}
 	if (response == GTK_RESPONSE_CANCEL)
 		gtk_widget_destroy (GTK_WIDGET (dialog));
 	if (response == GTK_RESPONSE_DELETE_EVENT)
@@ -454,7 +454,7 @@ org_gnome_exchange_folder_ab_unsubscribe (EPopup *ep, EPopupItem *p, void *data)
 	} else if (mode == OFFLINE_MODE) {
 		e_error_run (NULL, ERROR_DOMAIN ":account-offline-generic", NULL);
 		return;
-	}	
+	}
 
 	source = e_source_selector_peek_primary_selection (E_SOURCE_SELECTOR (target->selector));
 	displayed_folder_name = (gchar *) e_source_peek_name (source);
@@ -509,7 +509,7 @@ org_gnome_exchange_folder_unsubscribe (EPopup *ep, EPopupItem *p, void *data)
 	} else if (mode == OFFLINE_MODE) {
 		e_error_run (NULL, ERROR_DOMAIN ":account-offline-generic", NULL);
 		return;
-	}	
+	}
 
 	source = e_source_selector_peek_primary_selection (E_SOURCE_SELECTOR (target->selector));
 	displayed_folder_name =  e_source_peek_name (source);
@@ -556,15 +556,15 @@ org_gnome_exchange_folder_subscription (EPlugin *ep, EMMenuTargetSelect *target,
 	if (status != CONFIG_LISTENER_STATUS_OK) {
 		g_warning ("Config listener not found");
 		return;
-	}	
+	}
 	else if (mode == OFFLINE_MODE) {
-		/* Translators: this error code can be used for any operation 
-		 * (like subscribing to other user's folders, unsubscribing 
-		 * etc,) which can not be performed in offline mode 
+		/* Translators: this error code can be used for any operation
+		 * (like subscribing to other user's folders, unsubscribing
+		 * etc,) which can not be performed in offline mode
 		 */
 		e_error_run (NULL, ERROR_DOMAIN ":account-offline-generic", NULL);
 		return;
-	}	
+	}
 
 	create_folder_subscription_dialog (account, fname);
 }
diff --git a/plugins/exchange-operations/exchange-mail-send-options.c b/plugins/exchange-operations/exchange-mail-send-options.c
index df23f7f6a2..8852e993a0 100644
--- a/plugins/exchange-operations/exchange-mail-send-options.c
+++ b/plugins/exchange-operations/exchange-mail-send-options.c
@@ -3,16 +3,16 @@
  *  Authors: R.Raghavendran <raghavguru7@gmail.com>
  *
  * Copyright 2004 Novell, Inc. (www.novell.com)
- * 
+ *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
  * License as published by the Free Software Foundation.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
@@ -39,7 +39,7 @@ void org_gnome_exchange_send_options (EPlugin *ep, EMEventTargetComposer *t);
 
 static ExchangeSendOptionsDialog *dialog=NULL;
 
-static void  
+static void
 append_to_header (ExchangeSendOptionsDialog *dialog, gint state, gpointer data)
 {
 	EMsgComposer *composer;
@@ -54,8 +54,8 @@ append_to_header (ExchangeSendOptionsDialog *dialog, gint state, gpointer data)
 		if (dialog->options->importance) {
 			switch (dialog->options->importance) {
 				case E_IMP_HIGH :
-					e_msg_composer_modify_header (composer, "Importance", "high");		
-					break;	
+					e_msg_composer_modify_header (composer, "Importance", "high");
+					break;
 				case E_IMP_LOW :
 					e_msg_composer_modify_header (composer, "Importance", "low");
 					break;
@@ -66,7 +66,7 @@ append_to_header (ExchangeSendOptionsDialog *dialog, gint state, gpointer data)
 		}
 		else
 			e_msg_composer_remove_header (composer, "Importance");
-			
+
 		if (dialog->options->sensitivity) {
 			switch (dialog->options->sensitivity) {
 				case E_SENSITIVITY_CONFIDENTIAL :
@@ -85,37 +85,37 @@ append_to_header (ExchangeSendOptionsDialog *dialog, gint state, gpointer data)
 		}
 		else
 			e_msg_composer_remove_header (composer, "Sensitivity");
-			
+
 		hdrs = e_msg_composer_get_hdrs (composer);
 		sender_address = (CamelAddress *) e_msg_composer_hdrs_get_from (hdrs);
 		sender_id = (const char*) camel_address_encode (sender_address);
-	
+
 		addr = camel_header_address_decode (dialog->options->delegate_address, NULL);
 		sender_addr = camel_header_address_decode (sender_id, NULL);
-		
- 		if(dialog->options->send_as_del_enabled && 
-			dialog->options->delegate_address && 
+
+ 		if(dialog->options->send_as_del_enabled &&
+			dialog->options->delegate_address &&
 				g_ascii_strcasecmp(addr->v.addr, sender_addr->v.addr)) {
 
 			e_msg_composer_modify_header (composer, "Sender" , sender_id);
 
-			/* This block handles the case wherein the address to be added 
-			 * in the "From" field has no name associated with it. 
-			 * So for cases where there is no name we append the address 
+			/* This block handles the case wherein the address to be added
+			 * in the "From" field has no name associated with it.
+			 * So for cases where there is no name we append the address
 			 * (only email) within angular braces.
 			 */
 			if(!g_ascii_strcasecmp (addr->name, "")) {
-				recipient_id = g_strdup_printf ("<%s>", 
+				recipient_id = g_strdup_printf ("<%s>",
 						dialog->options->delegate_address);
 				e_msg_composer_add_header (composer, "From", recipient_id);
-			}		
-			
+			}
+
 			else
-		       		e_msg_composer_add_header (composer, "From", 
-							dialog->options->delegate_address);	
+		       		e_msg_composer_add_header (composer, "From",
+							dialog->options->delegate_address);
 		}
-		
-		
+
+
 		else {
 			e_msg_composer_remove_header (composer, "Sender");
 			e_msg_composer_add_header (composer, "From", sender_id);
@@ -123,7 +123,7 @@ append_to_header (ExchangeSendOptionsDialog *dialog, gint state, gpointer data)
 
 		if (dialog->options->delivery_enabled) {
 			EMsgComposerHdrs *hdrs = e_msg_composer_get_hdrs(composer);
-			
+
 			char *mdn_address = hdrs->account->id->reply_to;
 			if (!mdn_address || !*mdn_address)
 				mdn_address = hdrs->account->id->address;
@@ -134,7 +134,7 @@ append_to_header (ExchangeSendOptionsDialog *dialog, gint state, gpointer data)
 
 		if (dialog->options->read_enabled) {
 			EMsgComposerHdrs *hdrs = e_msg_composer_get_hdrs(composer);
-			
+
 			char *mdn_address = hdrs->account->id->reply_to;
 			if (!mdn_address || !*mdn_address)
 				mdn_address = hdrs->account->id->address;
@@ -145,27 +145,27 @@ append_to_header (ExchangeSendOptionsDialog *dialog, gint state, gpointer data)
 			e_msg_composer_remove_header (composer, "Disposition-Notification-To");
 	}
 }
-					
+
 static void
 send_options_commit (EMsgComposer *comp, gpointer user_data)
 {
 	if (!user_data && !EXCHANGE_IS_SENDOPTIONS_DIALOG (user_data))
 		return;
-		
+
 	if (dialog) {
 		g_print ("\nDialog getting unreferenced ");
 		g_object_unref (dialog);
-		dialog = NULL;	
+		dialog = NULL;
 	}
 }
 
-void 
+void
 org_gnome_exchange_send_options (EPlugin *ep, EMEventTargetComposer *target)
 {
 	EMsgComposer *composer = target->composer;
-	EAccount *account = NULL; 
+	EAccount *account = NULL;
 	char *temp = NULL;
-	
+
 	account = e_msg_composer_get_preferred_account (composer);
 	if (!account)
 		return;
@@ -185,5 +185,5 @@ org_gnome_exchange_send_options (EPlugin *ep, EMEventTargetComposer *target)
 
 	g_signal_connect (GTK_WIDGET (composer), "destroy",
 				  G_CALLBACK (send_options_commit), dialog);
-	
+
 }
diff --git a/plugins/exchange-operations/exchange-operations.c b/plugins/exchange-operations/exchange-operations.c
index 09814991cc..b407a3ab8b 100644
--- a/plugins/exchange-operations/exchange-operations.c
+++ b/plugins/exchange-operations/exchange-operations.c
@@ -66,9 +66,9 @@ e_plugin_lib_enable (EPluginLib *eplib, int enable)
 
 ExchangeConfigListenerStatus
 exchange_is_offline (gint *mode)
-{	
+{
 	return exchange_config_listener_get_offline_status (exchange_global_config_listener, mode);
-}	
+}
 
 /* FIXME: See if a GLib variant of this function available */
 gboolean
@@ -83,20 +83,20 @@ exchange_operations_tokenize_string (char **string, char *token, char delimit)
 		str++;
 	token[i]='\0';
 	*string = str;
-	if (i==0) 
+	if (i==0)
 		return FALSE;
 	return TRUE;
 }
 
 gboolean
-exchange_operations_cta_add_node_to_tree (GtkTreeStore *store, GtkTreeIter *parent, const char *ruri) 
+exchange_operations_cta_add_node_to_tree (GtkTreeStore *store, GtkTreeIter *parent, const char *ruri)
 {
 	GtkTreeIter iter;
 	char *luri=(char *)ruri;
 	char nodename[80];
 	gchar *uri;
 	gboolean status, found;
-	
+
 	exchange_operations_tokenize_string (&luri, nodename, '/');
 
        	if (!nodename[0]) {
@@ -133,9 +133,9 @@ exchange_operations_cta_add_node_to_tree (GtkTreeStore *store, GtkTreeIter *pare
 	}
 
 	if (!found) {
-	  gtk_tree_store_append (store, &iter, parent);		
-	  gtk_tree_store_set (store, &iter, 0, nodename, 1, uri, -1);		
-	  exchange_operations_cta_add_node_to_tree (store, &iter, luri);				
+	  gtk_tree_store_append (store, &iter, parent);
+	  gtk_tree_store_set (store, &iter, 0, nodename, 1, uri, -1);
+	  exchange_operations_cta_add_node_to_tree (store, &iter, luri);
 	}
 
 	g_free (uri);
@@ -143,7 +143,7 @@ exchange_operations_cta_add_node_to_tree (GtkTreeStore *store, GtkTreeIter *pare
 }
 
 void
-exchange_operations_cta_select_node_from_tree (GtkTreeStore *store, GtkTreeIter *parent, const char *nuri, const char *ruri, GtkTreeSelection *selection) 
+exchange_operations_cta_select_node_from_tree (GtkTreeStore *store, GtkTreeIter *parent, const char *nuri, const char *ruri, GtkTreeSelection *selection)
 {
 	char *luri=(char *)nuri;
 	char nodename[80];
@@ -185,7 +185,7 @@ exchange_operations_cta_select_node_from_tree (GtkTreeStore *store, GtkTreeIter
 }
 
 ExchangeAccount *
-exchange_operations_get_exchange_account (void) 
+exchange_operations_get_exchange_account (void)
 {
 	ExchangeAccount *account = NULL;
 	ExchangeAccountResult result;
@@ -195,8 +195,8 @@ exchange_operations_get_exchange_account (void)
 	acclist = exchange_config_listener_get_accounts (exchange_global_config_listener);
 	/* FIXME: Need to be changed for handling multiple accounts */
 	if (acclist) {
-		account = acclist->data; 
-	
+		account = acclist->data;
+
 		exchange_config_listener_get_offline_status (exchange_global_config_listener,
 							     &mode);
 
@@ -216,7 +216,7 @@ exchange_operations_get_exchange_account (void)
 				return account;
 		}
 	}
-	
+
 	return NULL;
 }
 
@@ -231,15 +231,15 @@ exchange_operations_report_error (ExchangeAccount *account, ExchangeAccountResul
 
 	if (result == EXCHANGE_ACCOUNT_CONNECT_SUCCESS)
 		return;
-	
+
 	error_string = g_strconcat ("org-gnome-exchange-operations:", error_ids[result], NULL);
-	
+
 	switch (result) {
 		case EXCHANGE_ACCOUNT_MAILBOX_NA:
 			widget = e_error_new (NULL, error_string, exchange_account_get_username (account), NULL);
 			break;
 		case EXCHANGE_ACCOUNT_NO_MAILBOX:
-			widget = e_error_new (NULL, error_string, exchange_account_get_username (account), 
+			widget = e_error_new (NULL, error_string, exchange_account_get_username (account),
 					      account->exchange_server, NULL);
 			break;
 		case EXCHANGE_ACCOUNT_RESOLVE_ERROR:
@@ -279,7 +279,7 @@ void exchange_operations_update_child_esources (ESource *source, const gchar *ol
 			truri = g_strjoinv (new_path, tmpv);
 			e_source_set_relative_uri (tsource->data, truri);
 			g_strfreev (tmpv);
-			g_free (truri);	
+			g_free (truri);
 		}
 	}
 }
diff --git a/plugins/exchange-operations/exchange-permissions-dialog.c b/plugins/exchange-operations/exchange-permissions-dialog.c
index 41fe731a29..d798ce8505 100644
--- a/plugins/exchange-operations/exchange-permissions-dialog.c
+++ b/plugins/exchange-operations/exchange-permissions-dialog.c
@@ -71,7 +71,7 @@ struct _ExchangePermissionsDialogPrivate {
 
 	/* Custom label is added or not */
 	gboolean custom_added;
-	
+
 	GtkWidget *separator, *custom;
 	E2kPermissionsRole selected_role;
 
@@ -220,7 +220,7 @@ exchange_permissions_dialog_new (ExchangeAccount *account,
 	folder_uri = e_folder_exchange_get_internal_uri (folder);
 	folder_path = e2k_uri_relative (dialog->priv->base_uri, folder_uri);
 	dialog->priv->folder_path = g_strdup (folder_path);
-		
+
 	/* And fetch the security descriptor */
 	status = e2k_context_propfind (ctx, NULL, folder_uri,
 				       sd_props, n_sd_props,
@@ -405,7 +405,7 @@ add_clicked (GtkButton *button, gpointer user_data)
 	gc = exchange_account_get_global_catalog (dialog->priv->account);
 
 	if (!gc) {
-		e_error_run (GTK_WINDOW (dialog), ERROR_DOMAIN ":acl-no-gcs-error", 
+		e_error_run (GTK_WINDOW (dialog), ERROR_DOMAIN ":acl-no-gcs-error",
 			     NULL);
 		return;
 	}
@@ -451,7 +451,7 @@ add_clicked (GtkButton *button, gpointer user_data)
 					    -1);
 			bsid2 = e2k_sid_get_binary_sid (sid2);
 			if (e2k_sid_binary_sid_equal (bsid, bsid2)) {
-				e_error_run (GTK_WINDOW (dialog), ERROR_DOMAIN ":perm-existing-error", 
+				e_error_run (GTK_WINDOW (dialog), ERROR_DOMAIN ":perm-existing-error",
 					     entry->display_name, NULL);
 				e2k_global_catalog_entry_free (gc, entry);
 				gtk_tree_selection_select_iter (dialog->priv->list_selection, &iter);
@@ -588,7 +588,7 @@ display_role (ExchangePermissionsDialog *dialog)
 			dialog->priv->custom_added = FALSE;
 		}
 	}
-		
+
 	gtk_combo_box_set_active (GTK_COMBO_BOX (dialog->priv->role_optionmenu), role);
 }
 
@@ -802,7 +802,7 @@ exchange_permissions_role_optionmenu_new (char *widget_name, char *string1, char
 		roles[role] = e2k_permissions_role_get_name (role);
 		gtk_combo_box_append_text (GTK_COMBO_BOX (menu), roles[role]);
 	}
-		
+
 	roles[role] = NULL;
 
 	g_free (roles);
diff --git a/plugins/exchange-operations/exchange-send-options.c b/plugins/exchange-operations/exchange-send-options.c
index f164a2bf10..0191435145 100644
--- a/plugins/exchange-operations/exchange-send-options.c
+++ b/plugins/exchange-operations/exchange-send-options.c
@@ -49,7 +49,7 @@ struct _ExchangeSendOptionsDialogPrivate {
 
 	/*name selector dialog*/
 	ENameSelector *proxy_name_selector;
-	
+
 	/*Importance*/
 	GtkWidget *importance;
 
@@ -96,17 +96,17 @@ exchange_send_options_get_widgets_data (ExchangeSendOptionsDialog *sod)
 	ExchangeSendOptionsDialogPrivate *priv;
 	ExchangeSendOptions *options;
 	const char *address, *email, *name;
-	
+
 	guint count=0;
 	ENameSelectorEntry *name_selector_entry;
 	EDestinationStore *destination_store;
-	GList *destinations, *tmp;	
+	GList *destinations, *tmp;
 
 	priv = sod->priv;
 	options = sod->options;
-	
-	/* This block helps us fetch the address of the delegator(s). If no delegator is selected or more 
-	   than one delegatee has been selected then an info dialog is popped up to help the user.	
+
+	/* This block helps us fetch the address of the delegator(s). If no delegator is selected or more
+	   than one delegatee has been selected then an info dialog is popped up to help the user.
 	*/
 	if(gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv->delegate_enabled))) {
 
@@ -115,12 +115,12 @@ exchange_send_options_get_widgets_data (ExchangeSendOptionsDialog *sod)
 		destinations = e_destination_store_list_destinations (destination_store);
 		tmp = destinations;
 
-		email = NULL;		
+		email = NULL;
 
-		/* The temporary variables address, email, and name are needed to fetch the list items. 
-		   Only the valid one is then copied into the storage variables. The "count" variable 
+		/* The temporary variables address, email, and name are needed to fetch the list items.
+		   Only the valid one is then copied into the storage variables. The "count" variable
 		   helps us keep a count of the exact number of items in the list. The g_list_length(GList *)
-		   produced ambiguous results. Hence count is used :) 
+		   produced ambiguous results. Hence count is used :)
 		*/
 		for (; tmp != NULL; tmp = g_list_next (tmp)) {
 			address = g_strdup ((char *) e_destination_get_address (tmp->data));
@@ -129,24 +129,24 @@ exchange_send_options_get_widgets_data (ExchangeSendOptionsDialog *sod)
 			if (g_str_equal (email, ""))
 				continue;
 			count++;
-				
+
 			options->delegate_address = address;
 			options->delegate_name = name;
 			options->delegate_email = email;
 		}
-	
+
 		if(count == 0) {
-			e_error_run ((GtkWindow *) priv->main, 
-				"org-gnome-exchange-operations:no-delegate-selected", NULL, NULL); 
+			e_error_run ((GtkWindow *) priv->main,
+				"org-gnome-exchange-operations:no-delegate-selected", NULL, NULL);
 			gtk_widget_grab_focus ((GtkWidget *) name_selector_entry);
 			options->delegate_address = NULL;
 			options->delegate_name = NULL;
 			options->delegate_email = NULL;
 			return -1;
 		}
-		
+
 		if(count > 1) {
-			e_error_run ((GtkWindow *)priv->main, 
+			e_error_run ((GtkWindow *)priv->main,
 				"org-gnome-exchange-operations:more-delegates-selected", NULL, NULL);
 			gtk_widget_grab_focus ((GtkWidget *) name_selector_entry);
 			options->delegate_address = NULL;
@@ -172,7 +172,7 @@ exchange_send_options_get_widgets_data (ExchangeSendOptionsDialog *sod)
 }
 
 static gboolean
-get_widgets (ExchangeSendOptionsDialog *sod) 
+get_widgets (ExchangeSendOptionsDialog *sod)
 {
 	ExchangeSendOptionsDialogPrivate *priv;
 
@@ -183,7 +183,7 @@ get_widgets (ExchangeSendOptionsDialog *sod)
 	priv->main = EXCHANGE ("send_options");
 	if (!priv->main)
 		return FALSE;
-	
+
 	priv->importance = EXCHANGE ("imp_combo_box");
 	priv->sensitivity = EXCHANGE ("sensitivity_combo_box");
 	priv->button_user = EXCHANGE ("button-user");
@@ -198,20 +198,20 @@ get_widgets (ExchangeSendOptionsDialog *sod)
 	return (priv->importance
 		&&priv->sensitivity
 		&&priv->button_user
-		&&priv->delegate_enabled		
+		&&priv->delegate_enabled
 		&&priv->read_receipt
 		&&priv->delivery_receipt
 		&&priv->importance_label
 		&&priv->sensitivity_label);
 }
-	
+
 static void
 exchange_send_options_fill_widgets_with_data (ExchangeSendOptionsDialog *sod)
 {
 	ExchangeSendOptionsDialogPrivate *priv;
 	ExchangeSendOptions *options;
 	ENameSelectorEntry *name_selector_entry;
-	
+
 	priv = sod->priv;
 	options = sod->options;
 
@@ -236,8 +236,8 @@ exchange_send_options_fill_widgets_with_data (ExchangeSendOptionsDialog *sod)
 		gtk_widget_set_sensitive ((GtkWidget *)name_selector_entry, FALSE);
 		gtk_widget_set_sensitive ((GtkWidget *)priv->button_user, FALSE);
 	}
-	
-	if (options->read_enabled) 
+
+	if (options->read_enabled)
 		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->read_receipt), TRUE);
 	else
 		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->read_receipt), FALSE);
@@ -253,7 +253,7 @@ exchange_sendoptions_dialog_new (void) {
 	ExchangeSendOptionsDialog *sod;
 
 	sod = g_object_new (EXCHANGE_TYPE_SENDOPTIONS_DIALOG, NULL);
-	
+
 	return sod;
 }
 
@@ -284,20 +284,20 @@ static void exchange_send_options_cb (GtkDialog *dialog, gint state, gpointer fu
 {
    	ExchangeSendOptionsDialogPrivate *priv;
    	ExchangeSendOptionsDialog *sod;
-        GError *error = NULL;     
-		
+        GError *error = NULL;
+
 	sod = func_data;
         priv = sod->priv;
-	
-	switch (state) {			
+
+	switch (state) {
 		case GTK_RESPONSE_OK:
-		     if(exchange_send_options_get_widgets_data (sod) < 0) 
+		     if(exchange_send_options_get_widgets_data (sod) < 0)
 			return;
 		case GTK_RESPONSE_CANCEL:
 		    	gtk_widget_hide (priv->main);
 	    	    	gtk_widget_destroy (priv->main);
 	           	g_object_unref (priv->xml);
-	             	break;	     
+	             	break;
 		case GTK_RESPONSE_HELP:
 		     	gnome_help_display (
 				"evolution.xml", priv->help_section, &error);
@@ -311,7 +311,7 @@ static void exchange_send_options_cb (GtkDialog *dialog, gint state, gpointer fu
 
 }
 
-/* This function acts as a listener for the toggling of "send_as_a_delegate" button. This is needed to 
+/* This function acts as a listener for the toggling of "send_as_a_delegate" button. This is needed to
    sensitize the name_selector_entry and the User Button
 */
 static void
@@ -320,19 +320,19 @@ delegate_option_toggled (GtkCheckButton *button, gpointer func_data)
 	ExchangeSendOptionsDialogPrivate *priv;
 	ExchangeSendOptionsDialog *sod;
 	ENameSelectorEntry *name_selector_entry;
-	ExchangeSendOptions *options;	
-	
+	ExchangeSendOptions *options;
+
 	sod=func_data;
 	priv=sod->priv;
 	options=sod->options;
-	
+
 	name_selector_entry = e_name_selector_peek_section_entry (priv->proxy_name_selector, "Add User");
 
 	if(gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv->delegate_enabled))) {
 		gtk_widget_set_sensitive ((GtkWidget *) name_selector_entry, TRUE);
 		gtk_widget_set_sensitive ((GtkWidget *) priv->button_user, TRUE);
 	}
-	
+
 	else {
 		gtk_widget_set_sensitive ((GtkWidget *) name_selector_entry, FALSE);
 		gtk_widget_set_sensitive ((GtkWidget *) priv->button_user, FALSE);
@@ -355,8 +355,8 @@ addressbook_entry_changed (GtkWidget *entry, gpointer user_data)
 */
 static void
 address_button_clicked (GtkButton *button, gpointer func_data)
-{	
-	
+{
+
 	ExchangeSendOptionsDialogPrivate *priv;
 	ExchangeSendOptionsDialog *sod;
 	ENameSelectorDialog *name_selector_dialog;
@@ -365,12 +365,12 @@ address_button_clicked (GtkButton *button, gpointer func_data)
 	priv=sod->priv;
 
 	name_selector_dialog = e_name_selector_peek_dialog (priv->proxy_name_selector);
-	gtk_widget_show (GTK_WIDGET (name_selector_dialog));		
+	gtk_widget_show (GTK_WIDGET (name_selector_dialog));
 }
-	
-gboolean 
+
+gboolean
 exchange_sendoptions_dialog_run (ExchangeSendOptionsDialog *sod, GtkWidget *parent)
-{	
+{
 	ExchangeSendOptionsDialogPrivate *priv;
 	ExchangeSendOptions *options;
 
@@ -384,7 +384,7 @@ exchange_sendoptions_dialog_run (ExchangeSendOptionsDialog *sod, GtkWidget *pare
 	GtkWidget *name_box;
 
 	g_return_val_if_fail (sod != NULL || EXCHANGE_IS_SENDOPTIONS_DIALOG (sod), FALSE);
-	
+
 	priv = sod->priv;
 	options = sod->options;
 
@@ -427,19 +427,19 @@ exchange_sendoptions_dialog_run (ExchangeSendOptionsDialog *sod, GtkWidget *pare
 		g_object_unref (des);
 	}
 
-	g_signal_connect ((GtkButton *) priv->button_user, "clicked", 
+	g_signal_connect ((GtkButton *) priv->button_user, "clicked",
 				G_CALLBACK (address_button_clicked), sod);
-	g_signal_connect (name_selector_dialog, "response", 
+	g_signal_connect (name_selector_dialog, "response",
 				G_CALLBACK (addressbook_dialog_response), sod);
-	g_signal_connect (GTK_DIALOG (priv->main), "response", 
+	g_signal_connect (GTK_DIALOG (priv->main), "response",
 				G_CALLBACK(exchange_send_options_cb), sod);
-	g_signal_connect ((GtkCheckButton *) priv->delegate_enabled, "toggled", 
+	g_signal_connect ((GtkCheckButton *) priv->delegate_enabled, "toggled",
 				G_CALLBACK(delegate_option_toggled), sod);
 
-	name_selector_entry = e_name_selector_peek_section_entry (priv->proxy_name_selector, 
+	name_selector_entry = e_name_selector_peek_section_entry (priv->proxy_name_selector,
 									"Add User");
 	g_signal_connect (name_selector_entry, "changed", G_CALLBACK (addressbook_entry_changed), sod);
-	
+
 	/* The name box is just a container. The name_selector_entry is added to it. This Widget
 	   is created dynamically*/
 	name_box = glade_xml_get_widget (priv->xml, "del_name_box");
@@ -449,7 +449,7 @@ exchange_sendoptions_dialog_run (ExchangeSendOptionsDialog *sod, GtkWidget *pare
 
 	gtk_window_set_modal ((GtkWindow *) priv->main, TRUE);
 	gtk_widget_show (priv->main);
-       
+
 	return TRUE;
 }
 
@@ -479,16 +479,16 @@ exchange_sendoptions_dialog_class_init (GObjectClass *object)
 static void
 exchange_sendoptions_dialog_init (GObject *object)
 {
-	
+
 	ExchangeSendOptionsDialog *sod;
 	ExchangeSendOptionsDialogPrivate *priv;
 	ExchangeSendOptions *new;
 
 	sod = EXCHANGE_SENDOPTIONS_DIALOG (object);
 	new = g_new0 (ExchangeSendOptions, 1);
-	
+
 	priv = g_new0 (ExchangeSendOptionsDialogPrivate, 1);
-	
+
 	sod->priv = priv;
 	sod->options = new;
 	sod->options->send_as_del_enabled = FALSE;
@@ -515,10 +515,10 @@ exchange_sendoptions_dialog_finalize (GObject *object)
 {
 	ExchangeSendOptionsDialog *sod = (ExchangeSendOptionsDialog *)object;
 	ExchangeSendOptionsDialogPrivate *priv;
-	
+
 	g_return_if_fail (EXCHANGE_IS_SENDOPTIONS_DIALOG (sod));
 	priv = sod->priv;
-	
+
 	g_free (priv->help_section);
 
 	if (sod->options) {
@@ -531,9 +531,9 @@ exchange_sendoptions_dialog_finalize (GObject *object)
 		sod->priv = NULL;
 	}
 
-	if (parent_class->finalize) 
+	if (parent_class->finalize)
 		(* parent_class->finalize) (object);
-	
+
 }
 
 static void
@@ -546,5 +546,5 @@ exchange_sendoptions_dialog_dispose (GObject *object)
 	if (parent_class->dispose)
 		(* parent_class->dispose) (object);
 
-}	
+}
 
diff --git a/plugins/exchange-operations/exchange-send-options.h b/plugins/exchange-operations/exchange-send-options.h
index 965d9fbc0c..8f50ab954c 100644
--- a/plugins/exchange-operations/exchange-send-options.h
+++ b/plugins/exchange-operations/exchange-send-options.h
@@ -48,7 +48,7 @@ typedef enum {
 	E_SENSITIVITY_CONFIDENTIAL
 } ExchangeSendOptionsSensitivity;
 
-/* We require the delegate_email and delegate_name to store the address of the delegator selected into 
+/* We require the delegate_email and delegate_name to store the address of the delegator selected into
    the destination store.
 */
 typedef struct {
diff --git a/plugins/external-editor/external-editor.c b/plugins/external-editor/external-editor.c
index 5cb9068265..fecc6e8de2 100644
--- a/plugins/external-editor/external-editor.c
+++ b/plugins/external-editor/external-editor.c
@@ -127,9 +127,9 @@ void org_gnome_external_editor (EPlugin *ep, EMMenuTargetSelect *select)
 			camel_mime_part_set_content ((CamelMimePart *)message, tokens [5], strlen (tokens [5]), "text/plain");
 
 
-			/* FIXME: We need to make mail-remote working properly. 
-			   So that we neednot invoke composer widget at all. 
-			   May be we can do it now itself by invoking local CamelTransport. 
+			/* FIXME: We need to make mail-remote working properly.
+			   So that we neednot invoke composer widget at all.
+			   May be we can do it now itself by invoking local CamelTransport.
 			   But all that is not needed for the first release.
 			 */
 
@@ -148,5 +148,5 @@ void org_gnome_external_editor (EPlugin *ep, EMMenuTargetSelect *select)
 	system (query);
 	g_free (query);
 
-#endif	
+#endif
 }
diff --git a/plugins/face/face.c b/plugins/face/face.c
index 2f9d1fb1c4..54010b625b 100644
--- a/plugins/face/face.c
+++ b/plugins/face/face.c
@@ -1,7 +1,7 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
  *  Author: Sankar P <psankar@novell.com>
- *   
+ *
  *  Copyright 2004 Novell, Inc. (www.novell.com)
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -30,7 +30,7 @@
 #include <mail/em-menu.h>
 #include <e-util/e-error.h>
 
-#define d(x) x 
+#define d(x) x
 
 void org_gnome_composer_face (EPlugin * ep, EMMenuTargetWidget * target);
 int e_plugin_lib_configure (EPlugin * ep);
diff --git a/plugins/folder-unsubscribe/folder-unsubscribe.c b/plugins/folder-unsubscribe/folder-unsubscribe.c
index 9b6e6fa38c..227da31ec1 100644
--- a/plugins/folder-unsubscribe/folder-unsubscribe.c
+++ b/plugins/folder-unsubscribe/folder-unsubscribe.c
@@ -45,7 +45,7 @@ void org_gnome_mail_folder_unsubscribe (EPlugin *plug, EMPopupTargetFolder *targ
 
 struct _folder_unsub_t {
 	struct _mail_msg msg;
-	
+
 	char *uri;
 };
 
@@ -53,7 +53,7 @@ static char *
 folder_unsubscribe__desc (struct _mail_msg *mm, int done)
 {
 	struct _folder_unsub_t *unsub = (struct _folder_unsub_t *) mm;
-	
+
 	return g_strdup_printf (_("Unsubscribing from folder \"%s\""), unsub->uri);
 }
 
@@ -65,19 +65,19 @@ folder_unsubscribe__unsub (struct _mail_msg *mm)
 	const char *path = NULL;
 	CamelStore *store;
 	CamelURL *url;
-	
+
 	if (!(store = camel_session_get_store (session, unsub->uri, &mm->ex)))
 		return;
-	
+
 	url = camel_url_new (unsub->uri, NULL);
 	if (((CamelService *) store)->provider->url_flags & CAMEL_URL_FRAGMENT_IS_PATH)
 		path = url->fragment;
 	else if (url->path && url->path[0])
 		path = url->path + 1;
-	
+
 	if (path != NULL)
 		camel_store_unsubscribe_folder (store, path, &mm->ex);
-	
+
 	camel_url_free (url);
 }
 
@@ -85,7 +85,7 @@ static void
 folder_unsubscribe__free (struct _mail_msg *mm)
 {
 	struct _folder_unsub_t *unsub = (struct _folder_unsub_t *) mm;
-	
+
 	g_free (unsub->uri);
 }
 
@@ -101,12 +101,12 @@ void
 org_gnome_mail_folder_unsubscribe (EPlugin *plug, EMPopupTargetFolder *target)
 {
 	struct _folder_unsub_t *unsub;
-	
+
 	if (target->uri == NULL)
 		return;
-	
+
 	unsub = mail_msg_new (&unsubscribe_op, NULL, sizeof (struct _folder_unsub_t));
 	unsub->uri = g_strdup (target->uri);
-	
+
 	e_thread_put (mail_thread_new, (EMsg *) unsub);
 }
diff --git a/plugins/google-account-setup/google-source.c b/plugins/google-account-setup/google-source.c
index 686623c414..f20d6d7209 100644
--- a/plugins/google-account-setup/google-source.c
+++ b/plugins/google-account-setup/google-source.c
@@ -1,12 +1,12 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * Authors : 
+/*
+ * Authors :
  *  Ebby Wiselyn <ebbywiselyn@gmail.com>
  *
  * Copyright 2007, Novell, Inc.
  *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of version 2 of the GNU Lesser General Public 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of version 2 of the GNU Lesser General Public
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
@@ -16,7 +16,7 @@
  *
  * * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, 
+ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  *
  */
@@ -50,7 +50,7 @@
 int              e_plugin_lib_enable      (EPluginLib                 *ep,
 					   int                         enable);
 
-GtkWidget *      plugin_google               (EPlugin                    *epl, 
+GtkWidget *      plugin_google               (EPlugin                    *epl,
 					   EConfigHookItemFactoryData *data);
 
 /*****************************************************************************/
@@ -62,7 +62,7 @@ ensure_google_source_group ()
 	ESourceList  *slist;
 	ESourceGroup *group;
 
-	
+
 	if (!e_cal_get_sources (&slist, E_CAL_SOURCE_TYPE_EVENT, NULL)) {
 		g_warning ("Could not get calendar source list from GConf!");
 		return;
@@ -77,13 +77,13 @@ ensure_google_source_group ()
 		gboolean res;
 		group = e_source_group_new (_("Google"), "Google://");
 		res = e_source_list_add_group (slist, group, -1);
-		
+
 		if (res == FALSE) {
-			g_warning ("Could not add Google source group!");	
+			g_warning ("Could not add Google source group!");
 		} else {
 			e_source_list_sync (slist, NULL);
 		}
-		
+
 		g_object_unref (group);
 		g_object_unref (slist);
 	}
@@ -147,7 +147,7 @@ FIXME: Not sure why this function is declared but called no where. This needs fi
 static void
 ssl_changed (GtkToggleButton *button, ESource *source)
 {
-	e_source_set_property(source, "ssl", 
+	e_source_set_property(source, "ssl",
 			      gtk_toggle_button_get_active(button) ? "1" : "0");
 }
 
@@ -162,15 +162,15 @@ user_changed (GtkEntry *editable, ESource *source)
 	char       *ruri;
 	const char *user;
 	char *projection;
-	
-	uri = e_source_get_uri (source); 
+
+	uri = e_source_get_uri (source);
 	user = gtk_entry_get_text (GTK_ENTRY (editable));
-	
+
 	if (uri == NULL) {
 		g_free (uri);
 		return;
 	}
-	
+
 	euri = e_uri_new (uri);
 	g_free (euri->user);
 
@@ -186,12 +186,12 @@ user_changed (GtkEntry *editable, ESource *source)
 	if (!g_str_has_suffix (user, "gmail.com\0")) {
 		user = g_strconcat (user, "@gmail.com", NULL);
 	}
-	
+
 	e_source_set_relative_uri (source, g_strconcat (CALENDAR_LOCATION, g_strdup(user), g_strdup (projection), NULL));
 	e_source_set_property (source, "username", euri->user);
 	e_source_set_property (source, "protocol", "google");
 	e_source_set_property (source, "auth-domain", "google");
-		
+
 	ruri = print_uri_noproto (euri);
 	g_free (ruri);
 	e_uri_free (euri);
@@ -232,7 +232,7 @@ spin_changed (GtkSpinButton *spin, ECalConfigTargetSource *t)
 	GtkWidget *option;
 
 	option = g_object_get_data (G_OBJECT(spin), "option");
-	
+
 	refresh_str = get_refresh_minutes ((GtkWidget *)spin, option);
 	e_source_set_property (t->source, "refresh", refresh_str);
 	g_free (refresh_str);
@@ -258,7 +258,7 @@ set_refresh_time (ESource *source, GtkWidget *spin, GtkWidget *option)
 	int item_num = 0;
 	const char *refresh_str = e_source_get_property (source, "refresh");
 	time = refresh_str ? atoi (refresh_str) : 30;
-	
+
 	if (time  && !(time % 10080)) {
 		/* weeks */
 		item_num = 3;
@@ -277,7 +277,7 @@ set_refresh_time (ESource *source, GtkWidget *spin, GtkWidget *option)
 }
 
 GtkWidget *
-plugin_google  (EPlugin                    *epl, 
+plugin_google  (EPlugin                    *epl,
 	     EConfigHookItemFactoryData *data)
 {
 	ECalConfigTargetSource *t = (ECalConfigTargetSource *) data->target;
@@ -294,20 +294,20 @@ plugin_google  (EPlugin                    *epl,
 	const char   *ssl_prop;
 	gboolean      ssl_enabled;
 	int           row;
-	
+
 	GtkWidget *option, *spin, *menu, *hbox;
 	GtkWidget *times [4];
 	int i;
-	
+
 	source = t->source;
 	group = e_source_peek_group (source);
-	
+
 	widget = NULL;
-	if (!g_str_has_prefix (e_source_group_peek_base_uri (group), 
+	if (!g_str_has_prefix (e_source_group_peek_base_uri (group),
 			       "Google")) {
 		return NULL;
 	}
-	
+
 	uri = e_source_get_uri (source);
 	euri = e_uri_new (uri);
 	g_free (uri);
@@ -320,7 +320,7 @@ plugin_google  (EPlugin                    *epl,
 	euri->user = NULL;
 	uri = e_uri_to_string (euri, FALSE);
 
-	ssl_prop = e_source_get_property (source, "ssl");	
+	ssl_prop = e_source_get_property (source, "ssl");
 	if (ssl_prop && ssl_prop[0] == '1') {
 		ssl_enabled = TRUE;
 	} else {
@@ -336,16 +336,16 @@ plugin_google  (EPlugin                    *epl,
 	cssl = gtk_check_button_new_with_mnemonic (_("Use _SSL"));
 	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(cssl), ssl_enabled);
 	gtk_widget_show (cssl);
-	gtk_table_attach (GTK_TABLE (parent), 
-			  cssl, 1, 2, 
-			  row + 3, row + 4, 
+	gtk_table_attach (GTK_TABLE (parent),
+			  cssl, 1, 2,
+			  row + 3, row + 4,
 			  GTK_FILL, 0, 0, 0);
 	luser = gtk_label_new_with_mnemonic (_("User_name:"));
 	gtk_widget_show (luser);
 	gtk_misc_set_alignment (GTK_MISC (luser), 0.0, 0.5);
-	gtk_table_attach (GTK_TABLE (parent), 
-			  luser, 0, 1, 
-			  row + 1, row + 2, 
+	gtk_table_attach (GTK_TABLE (parent),
+			  luser, 0, 1,
+			  row + 1, row + 2,
 			  GTK_FILL, 0, 0, 0);
 
 	user = gtk_entry_new ();
@@ -360,19 +360,19 @@ plugin_google  (EPlugin                    *epl,
 	GtkWidget *label = gtk_label_new_with_mnemonic (_("_Refresh:"));
 	gtk_widget_show (label);
 	gtk_misc_set_alignment (GTK_MISC(label), 0.0, 0.5);
-	gtk_table_attach (GTK_TABLE (parent), 
-			  label, 
+	gtk_table_attach (GTK_TABLE (parent),
+			  label,
 			  0, 1,
-			  row + 2, row + 3,	
+			  row + 2, row + 3,
 			 GTK_EXPAND | GTK_FILL, 0, 0, 0);
-		
+
 
 	hbox = gtk_hbox_new (FALSE, 6);
 	gtk_widget_show (hbox);
 
 	spin = gtk_spin_button_new_with_range (1, 100, 1);
  	gtk_label_set_mnemonic_widget (GTK_LABEL(label), spin);
-	gtk_widget_show (spin); 
+	gtk_widget_show (spin);
 	gtk_box_pack_start (GTK_BOX(hbox), spin, FALSE, TRUE, 0);
 
 	option = gtk_option_menu_new ();
@@ -381,7 +381,7 @@ plugin_google  (EPlugin                    *epl,
 	times[1] = gtk_menu_item_new_with_label (_("hours"));
 	times[2] = gtk_menu_item_new_with_label (_("days"));
 	times[3] = gtk_menu_item_new_with_label (_("weeks"));
-	
+
 	menu = gtk_menu_new ();
 	gtk_widget_show (menu);
 	for (i = 0; i < 4; i++) {
@@ -392,8 +392,8 @@ plugin_google  (EPlugin                    *epl,
 	set_refresh_time (source, spin, option);
 	gtk_box_pack_start (GTK_BOX (hbox), option, FALSE, TRUE, 0);
 
-	e_source_set_property (source, "refresh", "30");	
-	
+	e_source_set_property (source, "refresh", "30");
+
 	g_object_set_data (G_OBJECT (option), "spin", spin);
 	g_signal_connect (G_OBJECT (option), "changed", G_CALLBACK (option_changed), t);
 	g_object_set_data (G_OBJECT (spin), "option", option);
@@ -401,15 +401,15 @@ plugin_google  (EPlugin                    *epl,
 
 	gtk_table_attach (GTK_TABLE (parent), hbox, 1, 2, row + 2, row + 3, GTK_EXPAND | GTK_FILL, 0, 0, 0);
 
-	g_signal_connect (G_OBJECT (user), 
-			  "changed", 
+	g_signal_connect (G_OBJECT (user),
+			  "changed",
 			  G_CALLBACK (user_changed),
-			  source); 
+			  source);
 
         g_free (uri);
 	g_free (username);
-	
-	return widget;	
+
+	return widget;
 }
 
 
diff --git a/plugins/groupwise-account-setup/camel-gw-listener.c b/plugins/groupwise-account-setup/camel-gw-listener.c
index a2a957cf54..8b3d8c85bd 100644
--- a/plugins/groupwise-account-setup/camel-gw-listener.c
+++ b/plugins/groupwise-account-setup/camel-gw-listener.c
@@ -1,7 +1,7 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
  * Authors :
- *  
+ *
  *  Sivaiah Nallagatla <snallagatla@novell.com>
  *
  * Copyright 2003, Novell, Inc.
@@ -34,7 +34,7 @@
 #include <libedataserver/e-account.h>
 #include <libecal/e-cal.h>
 
-/*stores some info about all currently existing groupwise accounts 
+/*stores some info about all currently existing groupwise accounts
   list of GwAccountInfo structures */
 
 static 	GList *groupwise_accounts = NULL;
@@ -42,7 +42,7 @@ static 	GList *groupwise_accounts = NULL;
 struct _CamelGwListenerPrivate {
 	GConfClient *gconf_client;
 	/* we get notification about mail account changes form this object */
-	EAccountList *account_list;                  
+	EAccountList *account_list;
 };
 
 struct _GwAccountInfo {
@@ -53,7 +53,7 @@ struct _GwAccountInfo {
 
 typedef struct _GwAccountInfo GwAccountInfo;
 
-#define GROUPWISE_URI_PREFIX   "groupwise://" 
+#define GROUPWISE_URI_PREFIX   "groupwise://"
 #define GROUPWISE_PREFIX_LENGTH 12
 
 #define PARENT_TYPE G_TYPE_OBJECT
@@ -64,37 +64,37 @@ static void dispose (GObject *object);
 static void finalize (GObject *object);
 
 
-static void 
+static void
 camel_gw_listener_class_init (CamelGwListenerClass *class)
 {
 	GObjectClass *object_class;
-	
+
 	parent_class =  g_type_class_ref (PARENT_TYPE);
 	object_class = G_OBJECT_CLASS (class);
-	
+
 	/* virtual method override */
 	object_class->dispose = dispose;
 	object_class->finalize = finalize;
 }
 
-static void 
+static void
 camel_gw_listener_init (CamelGwListener *config_listener,  CamelGwListenerClass *class)
 {
-	config_listener->priv = g_new0 (CamelGwListenerPrivate, 1);	
+	config_listener->priv = g_new0 (CamelGwListenerPrivate, 1);
 }
 
-static void 
+static void
 dispose (GObject *object)
 {
 	CamelGwListener *config_listener = CAMEL_GW_LISTENER (object);
-	
+
 	g_object_unref (config_listener->priv->gconf_client);
 	g_object_unref (config_listener->priv->account_list);
 
 	G_OBJECT_CLASS (parent_class)->dispose (object);
 }
 
-static void 
+static void
 finalize (GObject *object)
 {
 	CamelGwListener *config_listener = CAMEL_GW_LISTENER (object);
@@ -106,18 +106,18 @@ finalize (GObject *object)
 	}
 
 	for ( list = g_list_first (groupwise_accounts); list ; list = g_list_next (list) ) {
-	       
+
 		info = (GwAccountInfo *) (list->data);
 
 		if (info) {
-			
+
 			g_free (info->uid);
 			g_free (info->name);
 			g_free (info->source_url);
 			g_free (info);
 		}
 	}
-	
+
 	g_list_free (groupwise_accounts);
 
 	G_OBJECT_CLASS (parent_class)->finalize (object);
@@ -137,13 +137,13 @@ is_groupwise_account (EAccount *account)
 
 /* looks up for an existing groupwise account info in the groupwise_accounts list based on uid */
 
-static GwAccountInfo* 
+static GwAccountInfo*
 lookup_account_info (const char *key)
 {
 	GList *list;
         GwAccountInfo *info ;
 	int found = 0;
-                                                                      
+
         if (!key)
                 return NULL;
 
@@ -181,7 +181,7 @@ add_esource (const char *conf_key, const char *group_name,  const char *source_n
 	const char * use_ssl;
 	const char *poa_address;
 	const char *offline_sync;
-	
+
 	poa_address = url->host;
 	if (!poa_address || strlen (poa_address) ==0)
 		return;
@@ -195,8 +195,8 @@ add_esource (const char *conf_key, const char *group_name,  const char *source_n
 
 
 	offline_sync = camel_url_get_param (url, "offline_sync");
-	
-	client = gconf_client_get_default();	
+
+	client = gconf_client_get_default();
 	source_list = e_source_list_new_for_gconf (client, conf_key);
 	group = e_source_group_new (group_name,  GROUPWISE_URI_PREFIX);
 
@@ -223,13 +223,13 @@ add_esource (const char *conf_key, const char *group_name,  const char *source_n
 	e_source_group_add_source (group, source, -1);
 	e_source_list_sync (source_list, NULL);
 
-	if (!strcmp (conf_key, CALENDAR_SOURCES)) 
+	if (!strcmp (conf_key, CALENDAR_SOURCES))
 		source_selection_key = SELECTED_CALENDARS;
 	else if (!strcmp (conf_key, TASKS_SOURCES))
 		source_selection_key = SELECTED_TASKS;
 	else if (!strcmp (conf_key, NOTES_SOURCES))
 		source_selection_key = SELECTED_NOTES;
-	else 
+	else
 		source_selection_key = NULL;
 
 	if (source_selection_key) {
@@ -243,7 +243,7 @@ add_esource (const char *conf_key, const char *group_name,  const char *source_n
 
 		g_slist_free (ids);
 	}
-	
+
 	g_object_unref (source);
 	g_object_unref (group);
 	g_object_unref (source_list);
@@ -251,7 +251,7 @@ add_esource (const char *conf_key, const char *group_name,  const char *source_n
 	g_free (relative_uri);
 }
 
-static void 
+static void
 remove_esource (const char *conf_key, const char *group_name, char* source_name, const char* relative_uri)
 {
 	ESourceList *list;
@@ -261,20 +261,20 @@ remove_esource (const char *conf_key, const char *group_name, char* source_name,
 	GSList *ids;
 	GSList *node_tobe_deleted;
 	char *source_selection_key;
-                                                                                                                             
+
         client = gconf_client_get_default();
         list = e_source_list_new_for_gconf (client, conf_key);
-	groups = e_source_list_peek_groups (list); 
-	
+	groups = e_source_list_peek_groups (list);
+
 	found_group = FALSE;
-	
+
 	for ( ; groups != NULL && !found_group; groups = g_slist_next (groups)) {
 		ESourceGroup *group = E_SOURCE_GROUP (groups->data);
-		
-		if (strcmp (e_source_group_peek_name (group), group_name) == 0 && 
+
+		if (strcmp (e_source_group_peek_name (group), group_name) == 0 &&
 		   strcmp (e_source_group_peek_base_uri (group), GROUPWISE_URI_PREFIX ) == 0) {
 			GSList *sources = e_source_group_peek_sources (group);
-			
+
 			for( ; sources != NULL; sources = g_slist_next (sources)) {
 				ESource *source = E_SOURCE (sources->data);
 				const gchar *source_relative_uri;
@@ -283,8 +283,8 @@ remove_esource (const char *conf_key, const char *group_name, char* source_name,
 				if (source_relative_uri == NULL)
 					continue;
 				if (strcmp (source_relative_uri, relative_uri) == 0) {
-				
-					if (!strcmp (conf_key, CALENDAR_SOURCES)) 
+
+					if (!strcmp (conf_key, CALENDAR_SOURCES))
 						source_selection_key = SELECTED_CALENDARS;
 					else if (!strcmp (conf_key, TASKS_SOURCES))
 						source_selection_key = SELECTED_TASKS;
@@ -292,38 +292,38 @@ remove_esource (const char *conf_key, const char *group_name, char* source_name,
 						source_selection_key = SELECTED_NOTES;
 					else source_selection_key = NULL;
 					if (source_selection_key) {
-						ids = gconf_client_get_list (client, source_selection_key , 
+						ids = gconf_client_get_list (client, source_selection_key ,
 									     GCONF_VALUE_STRING, NULL);
 						node_tobe_deleted = g_slist_find_custom (ids, e_source_peek_uid (source), (GCompareFunc) strcmp);
 						if (node_tobe_deleted) {
 							g_free (node_tobe_deleted->data);
 							ids = g_slist_delete_link (ids, node_tobe_deleted);
 						}
-						gconf_client_set_list (client,  source_selection_key, 
+						gconf_client_set_list (client,  source_selection_key,
 								       GCONF_VALUE_STRING, ids, NULL);
 
 					}
 					e_source_list_remove_group (list, group);
-					e_source_list_sync (list, NULL);	
+					e_source_list_sync (list, NULL);
 					found_group = TRUE;
 					break;
-					
+
 				}
 			}
 
 		}
-		
-	      
+
+
 	}
 
 	g_object_unref (list);
-	g_object_unref (client);		
-	
+	g_object_unref (client);
+
 }
 
 /* looks up for e-source with having same info as old_account_info and changes its values passed in new values */
 
-static void 
+static void
 modify_esource (const char* conf_key, GwAccountInfo *old_account_info, const char* new_group_name, CamelURL *new_url)
 {
 	ESourceList *list;
@@ -334,27 +334,27 @@ modify_esource (const char* conf_key, GwAccountInfo *old_account_info, const cha
       	GConfClient* client;
 	const char *poa_address;
 	const char *new_poa_address;
-	
+
 	url = camel_url_new (old_account_info->source_url, NULL);
-	poa_address = url->host; 
+	poa_address = url->host;
 	if (!poa_address || strlen (poa_address) ==0)
 		return;
 	new_poa_address = new_url->host;
-	
+
 	old_relative_uri =  g_strdup_printf ("%s@%s/", url->user, poa_address);
 	client = gconf_client_get_default ();
         list = e_source_list_new_for_gconf (client, conf_key);
-	groups = e_source_list_peek_groups (list); 
+	groups = e_source_list_peek_groups (list);
 
 	found_group = FALSE;
 
 	for ( ; groups != NULL &&  !found_group; groups = g_slist_next (groups)) {
 		ESourceGroup *group = E_SOURCE_GROUP (groups->data);
-		
-		if (strcmp (e_source_group_peek_name (group), old_account_info->name) == 0 && 
+
+		if (strcmp (e_source_group_peek_name (group), old_account_info->name) == 0 &&
 		    strcmp (e_source_group_peek_base_uri (group), GROUPWISE_URI_PREFIX) == 0) {
 			GSList *sources = e_source_group_peek_sources (group);
-			
+
 			for ( ; sources != NULL; sources = g_slist_next (sources)) {
 				ESource *source = E_SOURCE (sources->data);
 				const gchar *source_relative_uri;
@@ -365,7 +365,7 @@ modify_esource (const char* conf_key, GwAccountInfo *old_account_info, const cha
 				if (strcmp (source_relative_uri, old_relative_uri) == 0) {
 					gchar *new_relative_uri;
 
-					new_relative_uri = g_strdup_printf ("%s@%s/", new_url->user, new_poa_address); 
+					new_relative_uri = g_strdup_printf ("%s@%s/", new_url->user, new_poa_address);
 					e_source_group_set_name (group, new_group_name);
 					e_source_set_relative_uri (source, new_relative_uri);
 					e_source_set_property (source, "username", new_url->user);
@@ -386,30 +386,30 @@ modify_esource (const char* conf_key, GwAccountInfo *old_account_info, const cha
 	camel_url_free (url);
 	g_free (old_relative_uri);
 
-	
+
 }
 /* add sources for calendar and tasks if the account added is groupwise account
    adds the new account info to  groupwise_accounts list */
 
-static void 
+static void
 add_calendar_tasks_sources (GwAccountInfo *info)
 {
 	CamelURL *url;
-	
+
 	url = camel_url_new (info->source_url, NULL);
 	add_esource ("/apps/evolution/calendar/sources", info->name, _("Calendar"), url, NULL, FALSE);
 	add_esource ("/apps/evolution/tasks/sources", info->name, _("Tasks"), url, NULL, FALSE);
 	add_esource ("/apps/evolution/memos/sources", info->name, _("Notes"), url, NULL, TRUE);
-	
+
 	camel_url_free (url);
 
 
 }
 
-/* removes calendar and tasks sources if the account removed is groupwise account 
+/* removes calendar and tasks sources if the account removed is groupwise account
    removes the the account info from groupwise_account list */
 
-static void 
+static void
 remove_calendar_tasks_sources (GwAccountInfo *info)
 {
 	CamelURL *url;
@@ -419,7 +419,7 @@ remove_calendar_tasks_sources (GwAccountInfo *info)
 
 	url = camel_url_new (info->source_url, NULL);
 
-	poa_address = url->host; 
+	poa_address = url->host;
 	if (!poa_address || strlen (poa_address) ==0)
 		return;
 
@@ -431,7 +431,7 @@ remove_calendar_tasks_sources (GwAccountInfo *info)
 	remove_esource ("/apps/evolution/calendar/sources", info->name, _("Calendar"), relative_uri);
 	remove_esource ("/apps/evolution/tasks/sources", info->name,  _("Checklist"), relative_uri);
 	remove_esource ("/apps/evolution/memos/sources", info->name,  _("Notes"), relative_uri);
-	
+
 	camel_url_free (url);
 	g_free (relative_uri);
 
@@ -441,14 +441,14 @@ static GList*
 get_addressbook_names_from_server (char *source_url)
 {
   	char *key;
-        EGwConnection *cnc;	
+        EGwConnection *cnc;
 	char *password;
 	GList *book_list = NULL;
 	int status, count = 0;
 	const char *soap_port;
 	CamelURL *url;
 	gboolean remember;
-	char *failed_auth = NULL; 
+	char *failed_auth = NULL;
 	char *prompt;
 	char *password_prompt;
 	char *uri;
@@ -460,22 +460,22 @@ get_addressbook_names_from_server (char *source_url)
         if (url == NULL) {
                 return NULL;
         }
-	poa_address = url->host; 
+	poa_address = url->host;
 	if (!poa_address || strlen (poa_address) ==0)
 		return NULL;
-	
+
         soap_port = camel_url_get_param (url, "soap_port");
         if (!soap_port || strlen (soap_port) == 0)
                 soap_port = "7191";
 	use_ssl = camel_url_get_param (url, "use_ssl");
 
-	key =  g_strdup_printf ("groupwise://%s@%s/", url->user, poa_address); 
-	
+	key =  g_strdup_printf ("groupwise://%s@%s/", url->user, poa_address);
+
 	if (use_ssl && g_str_equal (use_ssl, "always"))
 		uri = g_strdup_printf ("https://%s:%s/soap", poa_address, soap_port);
-	else 
+	else
 		uri = g_strdup_printf ("http://%s:%s/soap", poa_address, soap_port);
-	
+
 	cnc = NULL;
 
 	do {
@@ -497,7 +497,7 @@ get_addressbook_names_from_server (char *source_url)
 					NULL);
 			g_free (prompt);
 
-			if (!password) 
+			if (!password)
 				break;
 		}
 
@@ -513,21 +513,21 @@ get_addressbook_names_from_server (char *source_url)
 	} while (cnc == NULL);
 
 	g_free (key);
-	
+
 	if (E_IS_GW_CONNECTION(cnc))  {
-		book_list = NULL;	
+		book_list = NULL;
 		status = e_gw_connection_get_address_book_list (cnc, &book_list);
 		if (status == E_GW_CONNECTION_STATUS_OK)
 			return book_list;
 	}
 
-	/*FIXME: This error message should be relocated to addressbook and should reflect 
+	/*FIXME: This error message should be relocated to addressbook and should reflect
 	 * that it actually failed to get the addressbooks*/
 	e_error_run (NULL, "mail:gw-accountsetup-error", poa_address, NULL);
 	return NULL;
 }
-                                                                                
-static void 
+
+static void
 add_proxy_sources (GwAccountInfo *info, const char *parent_name)
 {
 	CamelURL *url;
@@ -569,7 +569,7 @@ add_addressbook_sources (EAccount *account)
 		return FALSE;
 	}
 
-	poa_address = url->host; 
+	poa_address = url->host;
 	if (!poa_address || strlen (poa_address) ==0)
 		return FALSE;
 
@@ -591,16 +591,16 @@ add_addressbook_sources (EAccount *account)
 		 * by e_gw_connection_get_address_book_list()
 		 */
 		is_writable = e_gw_container_get_is_writable (E_GW_CONTAINER(temp_list->data));
-		if (is_writable && 
+		if (is_writable &&
 		    !g_ascii_strncasecmp (book_name, "Novell GroupWise Address Book", strlen (book_name))) {
-			/* This is a hack to not to show multiple groupwise system address books 
+			/* This is a hack to not to show multiple groupwise system address books
 			 * if they are the personal address books with the name of system address book
 			 * See http://bugzilla.gnome.org/show_bug.cgi?id=320119
 			 * and http://bugzilla.gnome.org/show_bug.cgi?id=309511
 			 */
 			continue;
-		} 
- 
+		}
+
 		if (!is_frequent_contacts)
 			is_frequent_contacts = e_gw_container_get_is_frequent_contacts (E_GW_CONTAINER (temp_list->data));
 		source = e_source_new (book_name, g_strconcat (";",book_name, NULL));
@@ -616,7 +616,7 @@ add_addressbook_sources (EAccount *account)
 		if (!is_writable)
 			e_source_set_property (source, "offline_sync", "1");
 		else
-			e_source_set_property (source, "offline_sync", 
+			e_source_set_property (source, "offline_sync",
 					       camel_url_get_param (url, "offline_sync") ? "1" : "0");
 		if (!is_writable)
 			e_source_set_property (source, "completion", "true");
@@ -636,11 +636,11 @@ add_addressbook_sources (EAccount *account)
 	if (!is_frequent_contacts) {
 		/* display warning message */
 		e_error_run (NULL, "addressbook:gw-book-list-init", NULL);
-	}	
+	}
 	return TRUE;
 }
 
-static void 
+static void
 modify_addressbook_sources ( EAccount *account, GwAccountInfo *existing_account_info )
 {
 	CamelURL *url;
@@ -657,20 +657,20 @@ modify_addressbook_sources ( EAccount *account, GwAccountInfo *existing_account_
 	ESource *source;
 	GConfClient *client;
 	const char *poa_address;
-	
+
 
 	url = camel_url_new (existing_account_info->source_url, NULL);
 	if (url == NULL) {
 		return;
 	}
 
-	poa_address = url->host; 
+	poa_address = url->host;
 	if (!poa_address || strlen (poa_address) ==0)
 		return;
 
 	old_base_uri =  g_strdup_printf ("groupwise://%s@%s", url->user, poa_address);
 	camel_url_free (url);
-	
+
 	url = camel_url_new (account->source->url, NULL);
 	if (url == NULL)
 		return ;
@@ -685,7 +685,7 @@ modify_addressbook_sources ( EAccount *account, GwAccountInfo *existing_account_
 
 	client = gconf_client_get_default ();
 	list = e_source_list_new_for_gconf (client, "/apps/evolution/addressbook/sources" );
-	groups = e_source_list_peek_groups (list); 
+	groups = e_source_list_peek_groups (list);
 	delete_group = FALSE;
 	if (strcmp (old_base_uri, new_base_uri) != 0)
 		delete_group = TRUE;
@@ -704,10 +704,10 @@ modify_addressbook_sources ( EAccount *account, GwAccountInfo *existing_account_
 					e_source_set_property (source, "port", soap_port);
 					e_source_set_property (source, "use_ssl", use_ssl);
 				}
-					
+
 				e_source_list_sync (list, NULL);
 			}
-		
+
 		}
 	}
 	if (found_group && delete_group) {
@@ -726,7 +726,7 @@ modify_addressbook_sources ( EAccount *account, GwAccountInfo *existing_account_
 
 }
 
-static void 
+static void
 remove_addressbook_sources (GwAccountInfo *existing_account_info)
 {
 	ESourceList *list;
@@ -744,7 +744,7 @@ remove_addressbook_sources (GwAccountInfo *existing_account_info)
 		return;
 	}
 
-	poa_address = url->host; 
+	poa_address = url->host;
 	if (!poa_address || strlen (poa_address) ==0)
 		return;
 
@@ -754,7 +754,7 @@ remove_addressbook_sources (GwAccountInfo *existing_account_info)
 	base_uri =  g_strdup_printf ("groupwise://%s@%s", url->user,  poa_address);
 	client = gconf_client_get_default ();
 	list = e_source_list_new_for_gconf (client, "/apps/evolution/addressbook/sources" );
-	groups = e_source_list_peek_groups (list); 
+	groups = e_source_list_peek_groups (list);
 
 	found_group = FALSE;
 
@@ -766,18 +766,18 @@ remove_addressbook_sources (GwAccountInfo *existing_account_info)
 			e_source_list_remove_group (list, group);
 			e_source_list_sync (list, NULL);
 			found_group = TRUE;
-						
+
 		}
 	}
 	g_object_unref (list);
 	g_object_unref (client);
 	g_free (base_uri);
 	camel_url_free (url);
-	
+
 
 }
 
-static void 
+static void
 account_added (EAccountList *account_listener, EAccount *account)
 {
 
@@ -788,7 +788,7 @@ account_added (EAccountList *account_listener, EAccount *account)
 
 	if (!is_groupwise_account (account))
 		return;
-	
+
 	info = g_new0 (GwAccountInfo, 1);
 	info->uid = g_strdup (account->uid);
 	info->name = g_strdup (account->name);
@@ -796,30 +796,30 @@ account_added (EAccountList *account_listener, EAccount *account)
 	if (account->parent_uid) {
 		parent = (EAccount *)e_account_list_find (account_listener, E_ACCOUNT_FIND_UID, account->parent_uid);
 
-		if (!parent) 
+		if (!parent)
 			return;
 
-		parent_url = camel_url_new (e_account_get_string(parent, E_ACCOUNT_SOURCE_URL), NULL);	
+		parent_url = camel_url_new (e_account_get_string(parent, E_ACCOUNT_SOURCE_URL), NULL);
 		add_proxy_sources (info, parent_url->user);
 	} else {
 		status = add_addressbook_sources (account);
-		
-		if (status) 
+
+		if (status)
 			add_calendar_tasks_sources (info);
 	}
 	groupwise_accounts = g_list_append (groupwise_accounts, info);
 }
 
-static void 
+static void
 account_removed (EAccountList *account_listener, EAccount *account)
 {
        	GwAccountInfo *info;
-	
+
 	if (!is_groupwise_account (account))
 		return;
-	
+
 	info = lookup_account_info (account->uid);
-	if (info == NULL) 
+	if (info == NULL)
 		return;
 
 	remove_calendar_tasks_sources (info);
@@ -841,11 +841,11 @@ account_changed (EAccountList *account_listener, EAccount *account)
 	GwAccountInfo *existing_account_info;
 	const char *old_use_ssl, *new_use_ssl;
 	const char *old_poa_address, *new_poa_address;
-	
+
 	is_gw_account = is_groupwise_account (account);
-	
+
 	existing_account_info = lookup_account_info (account->uid);
-       
+
 	if (existing_account_info == NULL && is_gw_account) {
 
 		if (!account->enabled)
@@ -864,21 +864,21 @@ account_changed (EAccountList *account_listener, EAccount *account)
 		g_free (existing_account_info->name);
 		g_free (existing_account_info->source_url);
 		g_free (existing_account_info);
-		
+
 	} else if ( existing_account_info != NULL && is_gw_account ) {
-		
+
 		if (!account->enabled) {
 			account_removed (account_listener, account);
 			return;
 		}
-		
+
 		/* some info of groupwise account is changed . update the sources with new info if required */
 		old_url = camel_url_new (existing_account_info->source_url, NULL);
-		old_poa_address = old_url->host; 
+		old_poa_address = old_url->host;
 		old_soap_port = camel_url_get_param (old_url, "soap_port");
 		old_use_ssl = camel_url_get_param (old_url, "use_ssl");
 		new_url = camel_url_new (account->source->url, NULL);
-		new_poa_address = new_url->host; 
+		new_poa_address = new_url->host;
 
 		if (!new_poa_address || strlen (new_poa_address) ==0)
 			return;
@@ -891,34 +891,34 @@ account_changed (EAccountList *account_listener, EAccount *account)
 		new_use_ssl = camel_url_get_param (new_url, "use_ssl");
 
 		if ((old_poa_address && strcmp (old_poa_address, new_poa_address))
-		   ||  (old_soap_port && strcmp (old_soap_port, new_soap_port)) 
+		   ||  (old_soap_port && strcmp (old_soap_port, new_soap_port))
 		   ||  strcmp (old_url->user, new_url->user)
-	           || (!old_use_ssl) 
+	           || (!old_use_ssl)
 		   || strcmp (old_use_ssl, new_use_ssl)) {
-			
+
 			account_removed (account_listener, account);
 			account_added (account_listener, account);
 		} else if (strcmp (existing_account_info->name, account->name)) {
-			
+
 			modify_esource ("/apps/evolution/calendar/sources", existing_account_info, account->name, new_url);
 			modify_esource ("/apps/evolution/tasks/sources", existing_account_info, account->name,  new_url);
 			modify_esource ("/apps/evolution/memos/sources", existing_account_info, account->name,  new_url);
 			modify_addressbook_sources (account, existing_account_info);
-			
+
 		}
-		
+
 		g_free (existing_account_info->name);
 		g_free (existing_account_info->source_url);
 		existing_account_info->name = g_strdup (account->name);
 		existing_account_info->source_url = g_strdup (account->source->url);
 		camel_url_free (old_url);
 		camel_url_free (new_url);
-	}	
-} 
+	}
+}
 
 static void
 prune_proxies (void) {
-	
+
 	GConfClient *client = gconf_client_get_default ();
 	EAccountList *account_list;
 	ESourceList *sources;
@@ -928,7 +928,7 @@ prune_proxies (void) {
 	GError *err = NULL;
 	const gchar *parent_id_name = NULL;
 	int i;
-	ECalSourceType types [] = { E_CAL_SOURCE_TYPE_EVENT, 
+	ECalSourceType types [] = { E_CAL_SOURCE_TYPE_EVENT,
 				    E_CAL_SOURCE_TYPE_TODO,
 				    E_CAL_SOURCE_TYPE_JOURNAL
 				  };
@@ -936,7 +936,7 @@ prune_proxies (void) {
 	account_list = e_account_list_new (client);
 	/* Is this being leaked */
 	g_object_unref (client);
-	
+
 	e_account_list_prune_proxies (account_list);
 
 	for (i=0; i<3; i++) {
@@ -954,15 +954,15 @@ prune_proxies (void) {
 					if (parent_id_name) {
 						e_source_group_remove_source (group, source);
 						e_source_list_remove_group (sources, group);
-					}	
-				}	
-			}	
+					}
+				}
+			}
 		}
 		e_source_list_sync (sources, NULL);
 	}
 	}
 
-}	
+}
 static void
 camel_gw_listener_construct (CamelGwListener *config_listener)
 {
@@ -971,28 +971,28 @@ camel_gw_listener_construct (CamelGwListener *config_listener)
 	GwAccountInfo *info ;
 
 	prune_proxies ();
-	
+
        	config_listener->priv->account_list = e_account_list_new (config_listener->priv->gconf_client);
 
 	for ( iter = e_list_get_iterator (E_LIST ( config_listener->priv->account_list) ) ; e_iterator_is_valid (iter); e_iterator_next (iter) ) {
-		
+
 		account = E_ACCOUNT (e_iterator_get (iter));
 
 		if ( is_groupwise_account (account) && account->enabled) {
-			
+
 		        info = g_new0 (GwAccountInfo, 1);
 			info->uid = g_strdup (account->uid);
 			info->name = g_strdup (account->name);
 			info->source_url = g_strdup (account->source->url);
 			groupwise_accounts = g_list_append (groupwise_accounts, info);
-			
+
 		}
-			
+
 	}
 
 	g_signal_connect (config_listener->priv->account_list, "account_added", G_CALLBACK (account_added), NULL);
 	g_signal_connect (config_listener->priv->account_list, "account_changed", G_CALLBACK (account_changed), NULL);
-	g_signal_connect (config_listener->priv->account_list, "account_removed", G_CALLBACK (account_removed), NULL);    
+	g_signal_connect (config_listener->priv->account_list, "account_removed", G_CALLBACK (account_removed), NULL);
 }
 
 GType
@@ -1021,10 +1021,10 @@ CamelGwListener*
 camel_gw_listener_new (void)
 {
 	CamelGwListener *config_listener;
-       
+
 	config_listener = g_object_new (CAMEL_TYPE_GW_LISTENER, NULL);
 	config_listener->priv->gconf_client = gconf_client_get_default();
-	
+
 	camel_gw_listener_construct (config_listener);
 
 	return config_listener;
diff --git a/plugins/groupwise-account-setup/camel-gw-listener.h b/plugins/groupwise-account-setup/camel-gw-listener.h
index c9a6a966f6..e09369fd58 100644
--- a/plugins/groupwise-account-setup/camel-gw-listener.h
+++ b/plugins/groupwise-account-setup/camel-gw-listener.h
@@ -1,7 +1,7 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
  * Authors :
- *  
+ *
  *  Sivaiah Nallagatla <snallagatla@novell.com>
  *
  * Copyright 2003, Novell, Inc.
@@ -28,7 +28,7 @@
 #include<libedataserver/e-source.h>
 #include<libedataserver/e-source-list.h>
 #include <camel/camel-url.h>
-                         
+
 G_BEGIN_DECLS
 
 #define CAMEL_TYPE_GW_LISTENER            (camel_gw_listener_get_type ())
@@ -42,12 +42,12 @@ typedef struct _CamelGwListenerClass CamelGwListenerClass;
 typedef struct _CamelGwListenerPrivate CamelGwListenerPrivate;
 struct _CamelGwListener {
        GObject parent;
-                                                                                                                        
+
        CamelGwListenerPrivate *priv;
 };
 
 struct _CamelGwListenerClass {
-       GObjectClass parent_class;     
+       GObjectClass parent_class;
 };
 
 GType                   camel_gw_listener_get_type (void);
diff --git a/plugins/groupwise-account-setup/groupwise-account-setup.c b/plugins/groupwise-account-setup/groupwise-account-setup.c
index 82f7829485..ccdf1f4305 100644
--- a/plugins/groupwise-account-setup/groupwise-account-setup.c
+++ b/plugins/groupwise-account-setup/groupwise-account-setup.c
@@ -10,10 +10,10 @@
  *  modify, merge, publish, distribute, sublicense, and/or sell copies
  *  of the Software, and to permit persons to whom the Software is
  *  furnished to do so, subject to the following conditions:
- *  
+ *
  *  The above copyright notice and this permission notice shall be
  *  included in all copies or substantial portions of the Software.
- *  
+ *
  *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
  *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
  *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
@@ -34,7 +34,7 @@ static CamelGwListener *config_listener = NULL;
 int e_plugin_lib_enable (EPluginLib *ep, int enable);
 GtkWidget* org_gnome_gw_account_setup(struct _EPlugin *epl, struct _EConfigHookItemFactoryData *data);
 
-static void 
+static void
 free_groupwise_listener ( void )
 {
 	g_object_unref (config_listener);
@@ -44,7 +44,7 @@ int
 e_plugin_lib_enable (EPluginLib *ep, int enable)
 {
 	if (!config_listener) {
-		config_listener = camel_gw_listener_new ();	
+		config_listener = camel_gw_listener_new ();
 	 	g_atexit ( free_groupwise_listener );
 	}
 
diff --git a/plugins/groupwise-features/addressbook-groupwise.c b/plugins/groupwise-features/addressbook-groupwise.c
index bb51b8f876..002eeaa0d4 100644
--- a/plugins/groupwise-features/addressbook-groupwise.c
+++ b/plugins/groupwise-features/addressbook-groupwise.c
@@ -35,7 +35,7 @@
 void commit_groupwise_addressbook (EPlugin *epl, EConfigTarget *target);
 GtkWidget *e_book_groupwise_dummy (EPlugin *epl, EConfigHookItemFactoryData *data);
 
-void 
+void
 commit_groupwise_addressbook (EPlugin *epl, EConfigTarget *target)
 {
 	EABConfigTargetSource *t = (EABConfigTargetSource *) target;
@@ -48,14 +48,14 @@ commit_groupwise_addressbook (EPlugin *epl, EConfigTarget *target)
 	uri_text = e_source_get_uri (source);
 	if (strncmp (uri_text, "groupwise", 9)) {
 		g_free (uri_text);
-		
+
 		return ;
-	}	
+	}
 	e_source_set_property (source, "auth-domain", "Groupwise");
 	relative_uri = g_strconcat (";", e_source_peek_name (source), NULL);
 	e_source_set_relative_uri (source, relative_uri);
 	g_free (relative_uri);
-  
+
 	source_group = e_source_peek_group (source);
 	l = e_source_group_peek_sources(source_group);
 	if (l && l->data ) {
@@ -69,7 +69,7 @@ commit_groupwise_addressbook (EPlugin *epl, EConfigTarget *target)
 GtkWidget *
 e_book_groupwise_dummy (EPlugin *epl, EConfigHookItemFactoryData *data)
 {
-	
-        
+
+
 	return NULL;
 }
diff --git a/plugins/groupwise-features/install-shared.c b/plugins/groupwise-features/install-shared.c
index 5f3bef5bf1..c0bffb23e0 100644
--- a/plugins/groupwise-features/install-shared.c
+++ b/plugins/groupwise-features/install-shared.c
@@ -93,20 +93,20 @@ install_folder_response (EMFolderSelector *emfs, int response, gpointer *data)
 				parent_name = names[parts -2];
 			else
 				parent_name = NULL;
-		}	
+		}
 		camel_exception_init (&ex);
 		if (!(store = (CamelStore *) camel_session_get_service (mail_component_peek_session(NULL), uri, CAMEL_PROVIDER_STORE, &ex))) {
 			camel_exception_clear (&ex);
 			return;
 		}
 
-		cnc = get_cnc (store);	
+		cnc = get_cnc (store);
 		if(E_IS_GW_CONNECTION (cnc)) {
-			container_id = get_container_id (cnc, parent_name);	
+			container_id = get_container_id (cnc, parent_name);
 
 			if(e_gw_connection_accept_shared_folder (cnc, folder_name, container_id, (char *)item_id, NULL) == E_GW_CONNECTION_STATUS_OK) {
 
-				
+
 				folder = camel_store_get_folder (store, "Mailbox", 0, NULL);
 				/*changes = camel_folder_change_info_new ();
 				camel_folder_change_info_remove_uid (changes, (char *) item_id);
@@ -114,7 +114,7 @@ install_folder_response (EMFolderSelector *emfs, int response, gpointer *data)
 				//camel_folder_delete_message (folder, item_id);
 				camel_folder_set_message_flags (folder, item_id, CAMEL_MESSAGE_DELETED, CAMEL_MESSAGE_DELETED);
 				camel_folder_summary_touch (folder->summary);
-				//camel_object_trigger_event (CAMEL_OBJECT (folder), "folder_changed", changes);	
+				//camel_object_trigger_event (CAMEL_OBJECT (folder), "folder_changed", changes);
 				uri = camel_url_to_string (((CamelService *) store)->url, CAMEL_URL_HIDE_ALL);
 				account = mail_config_get_account_by_source_url (uri);
 				uri = account->source->url;
@@ -131,7 +131,7 @@ install_folder_response (EMFolderSelector *emfs, int response, gpointer *data)
 
 				em_folder_tree_model_add_store (model, store, account->name);
 				camel_object_unref (store);
-			}  
+			}
 		}
 
 		g_strfreev(names);
@@ -149,13 +149,13 @@ accept_free(void *data)
 	g_free(accept_data);
 }
 
-static void 
+static void
 accept_clicked(GnomeDruidPage *page, GtkWidget *druid, CamelMimeMessage *msg)
 {
 	EMFolderTreeModel *model;
 	EMFolderTree *folder_tree;
 	GtkWidget *dialog;
-	struct AcceptData *accept_data; 
+	struct AcceptData *accept_data;
 	char *uri;
 
 	accept_data = g_new0(struct AcceptData, 1);
@@ -221,12 +221,12 @@ org_gnome_popup_wizard (EPlugin *ep, EMEventTargetMessage *target)
 			g_free(start_message);
 			wizard = GNOME_DRUID (gnome_druid_new_with_window (_("Shared Folder Installation"), NULL, TRUE, (GtkWidget**)(&window)));
 			gtk_window_set_position (GTK_WINDOW (window) , GTK_WIN_POS_CENTER_ALWAYS);
-			gnome_druid_append_page(wizard, GNOME_DRUID_PAGE(title_page));	
+			gnome_druid_append_page(wizard, GNOME_DRUID_PAGE(title_page));
 			gtk_widget_show_all (GTK_WIDGET (title_page));
 			camel_object_ref(msg);
 			g_object_set_data_full((GObject *)title_page, "msg", msg, camel_object_unref);
 			g_signal_connect (title_page, "next", G_CALLBACK(accept_clicked), msg);
-		} else 
+		} else
 			g_warning ("Could not get the sender name");
 
 		camel_object_unref(content);
diff --git a/plugins/groupwise-features/junk-mail-settings.c b/plugins/groupwise-features/junk-mail-settings.c
index 89c5e9fe3c..9d7b47c5f8 100644
--- a/plugins/groupwise-features/junk-mail-settings.c
+++ b/plugins/groupwise-features/junk-mail-settings.c
@@ -40,7 +40,7 @@
 #include "share-folder.h"
 #include "junk-settings.h"
 
-void 
+void
 org_gnome_junk_settings(EPlugin *ep, EMPopupTargetSelect *t);
 
 static void
@@ -63,7 +63,7 @@ junk_dialog_response (GtkWidget *dialog, int response, JunkSettings *js)
 
 }
 
-static void 
+static void
 junk_mail_settings (EPopup *ep, EPopupItem *item, void *data)
 {
 	GtkWidget *dialog ,*w, *notebook, *box;
@@ -72,8 +72,8 @@ junk_mail_settings (EPopup *ep, EPopupItem *item, void *data)
 	EGwConnection *cnc;
 	gchar *msg;
 	CamelFolder *folder = (CamelFolder *)data;
-	CamelStore *store = folder->parent_store;	
-	cnc = get_cnc (store);	
+	CamelStore *store = folder->parent_store;
+	cnc = get_cnc (store);
 
 	dialog =  gtk_dialog_new_with_buttons (_("Junk Settings"),
 			NULL,
@@ -87,7 +87,7 @@ junk_mail_settings (EPopup *ep, EPopupItem *item, void *data)
 	gtk_widget_ensure_style (dialog);
 	gtk_container_set_border_width ((GtkContainer *) ((GtkDialog *) dialog)->vbox, 12);
 	box = gtk_vbox_new (FALSE, 6);
-	w = gtk_label_new ("");	
+	w = gtk_label_new ("");
 	msg = g_strdup_printf("<b>%s</b>", _("Junk Mail Settings"));
 	gtk_label_set_markup (GTK_LABEL (w), msg);
 	gtk_box_pack_start ((GtkBox *) box, w, FALSE, FALSE, 6);
@@ -96,14 +96,14 @@ junk_mail_settings (EPopup *ep, EPopupItem *item, void *data)
 	junk_tab = junk_settings_new (cnc);
 	w = (GtkWidget *)junk_tab->vbox;
 	gtk_box_pack_start ((GtkBox *) box, w, FALSE, FALSE, 6);
-	
+
 	/*We might have to add more options for settings i.e. more pages*/
 	while (page_count > 0 ){
 		notebook = gtk_notebook_new ();
 		gtk_notebook_append_page ((GtkNotebook *)notebook, box, NULL);
 		gtk_box_pack_start ((GtkBox *) ((GtkDialog *) dialog)->vbox, notebook, TRUE, TRUE, 0);
 	}
-	
+
 	if (page_count == 0)
 		gtk_box_pack_start ((GtkBox *) ((GtkDialog *) dialog)->vbox, box, TRUE, TRUE, 0);
 
@@ -115,35 +115,35 @@ static EPopupItem popup_items[] = {
 { E_POPUP_ITEM, "50.emfv.05", N_("Junk Mail Settings..."), junk_mail_settings, NULL, NULL, 0, EM_POPUP_SELECT_MANY|EM_FOLDER_VIEW_SELECT_LISTONLY}
 };
 
-static void 
+static void
 popup_free (EPopup *ep, GSList *items, void *data)
 {
 g_slist_free (items);
 }
 
-void 
+void
 org_gnome_junk_settings(EPlugin *ep, EMPopupTargetSelect *t)
 {
 	GSList *menus = NULL;
-	
+
 	int i = 0;
 	static int first = 0;
-	
+
 	if (! g_strrstr (t->uri, "groupwise://"))
 		return ;
-	
+
 	/* for translation*/
 	if (!first) {
 		popup_items[0].label =  _(popup_items[0].label);
-	
+
 	}
-	
+
 	first++;
-	
+
 	for (i = 0; i < sizeof (popup_items) / sizeof (popup_items[0]); i++)
 		menus = g_slist_prepend (menus, &popup_items[i]);
-	
+
 	e_popup_add_items (t->target.popup, menus, NULL, popup_free, t->folder);
-       	
+
 }
 
diff --git a/plugins/groupwise-features/junk-settings.c b/plugins/groupwise-features/junk-settings.c
index 2cbf793f93..87ce3774d5 100644
--- a/plugins/groupwise-features/junk-settings.c
+++ b/plugins/groupwise-features/junk-settings.c
@@ -110,7 +110,7 @@ static void
 junk_settings_destroy (GtkObject *obj)
 {
 	JunkSettings *js = (JunkSettings *) obj;
-	free_all (js);	
+	free_all (js);
 	GTK_OBJECT_CLASS (parent_class)->destroy (obj);
 }
 
@@ -148,16 +148,16 @@ free_node(JunkEntry *nentry)
 	return;
 }
 
-static JunkEntry * 
+static JunkEntry *
 find_node(GList *list, gchar *match)
 {
 	JunkEntry *one_entry = NULL;
-	EGwJunkEntry *ent = NULL; 
+	EGwJunkEntry *ent = NULL;
 	GList *tmp;
 	gint i ;
-	
+
 	if(list){
-		tmp = g_list_first(list); 
+		tmp = g_list_first(list);
 		for(i=0; tmp  ; i++)
 		{
 			one_entry = tmp->data;
@@ -169,11 +169,11 @@ find_node(GList *list, gchar *match)
 			tmp= g_list_next(tmp);
 		}
 	}
-	
+
 	return NULL;
 }
 
-static void 
+static void
 free_all (JunkSettings *js)
 {
 	if (js->junk_list){
@@ -190,7 +190,7 @@ get_junk_list (JunkSettings *js)
 	char *entry;
 	char *msg;
 	int use_junk, use_block, use_pab, persistence;
-	
+
 	if (E_IS_GW_CONNECTION (js->cnc)) {
 		if (e_gw_connection_get_junk_settings (js->cnc, &use_junk, &use_block, &use_pab, &persistence) == E_GW_CONNECTION_STATUS_OK) {
 			if (use_junk) {
@@ -207,15 +207,15 @@ get_junk_list (JunkSettings *js)
 		if (e_gw_connection_get_junk_entries (js->cnc, &(list)) == E_GW_CONNECTION_STATUS_OK) {
 			js->users = g_list_length (list);
 			if (js->users) {
-/* I populate the list and set flags to 0 for the existing users*/ 
+/* I populate the list and set flags to 0 for the existing users*/
 				while (list) {
 					JunkEntry *junk_entry = g_new0 (JunkEntry , 1);
 					junk_entry->entry = list->data;
-					junk_entry->flag = 0;	
+					junk_entry->flag = 0;
 					entry = g_strdup ((junk_entry->entry)->match);
 					msg = g_strdup_printf ("%s", entry);
 					gtk_list_store_append (GTK_LIST_STORE (js->model), &(js->iter));
-					gtk_list_store_set (GTK_LIST_STORE (js->model), &(js->iter), 0, msg, -1);			 
+					gtk_list_store_set (GTK_LIST_STORE (js->model), &(js->iter), 0, msg, -1);
 					js->junk_list = g_list_append (js->junk_list, junk_entry);
 
 					g_free (msg);
@@ -224,7 +224,7 @@ get_junk_list (JunkSettings *js)
 					entry = NULL;
 					list = list->next;
 				}
-			} 
+			}
 		}
 		else
 			g_warning("Could not get the JUNK List");
@@ -243,11 +243,11 @@ commit_changes (JunkSettings *js)
 
 	for (node = js->junk_list; node; node = node->next)
 	{
-		junk_entry = node->data;	
+		junk_entry = node->data;
 		if (junk_entry->flag & 0x1)
-			new_list = g_list_append (new_list, junk_entry->entry);	
+			new_list = g_list_append (new_list, junk_entry->entry);
 		else if (junk_entry->flag & 0x4) {
-			remove_list = g_list_append (remove_list, junk_entry->entry);	
+			remove_list = g_list_append (remove_list, junk_entry->entry);
 		}
 	}
 
@@ -288,14 +288,14 @@ commit_changes (JunkSettings *js)
 	remove_list = NULL;
 }
 
-static void 
+static void
 enable_clicked (GtkRadioButton *button, JunkSettings *js)
 {
-	js->flag_for_ok = 0;        
+	js->flag_for_ok = 0;
 	gtk_widget_set_sensitive (GTK_WIDGET (js->table) ,TRUE);
 }
 
-static void 
+static void
 disable_clicked (GtkRadioButton *button, JunkSettings *js)
 {
 	js->flag_for_ok = 2;
@@ -310,17 +310,17 @@ add_clicked(GtkButton *button, JunkSettings *js)
 	JunkEntry *new_entry = NULL;
 	EGwJunkEntry *junk_entry = NULL;
 	gchar *msg = NULL;
-	
+
 	self_email = g_strdup (e_gw_connection_get_user_email (js->cnc));
 		email = gtk_entry_get_text (js->entry);
 		/* You can't mark junk sender yourself*/
 		if (g_strrstr (email, "@") == NULL || (!g_ascii_strcasecmp (email , self_email)) || !g_ascii_strcasecmp (email, "" ))
-		       return; 	
-		else {	
+		       return;
+		else {
 			/*check whether already exists*/
 			if (js->junk_list && email){
 				new_entry = find_node (js->junk_list, (gchar *)email);
-				if (new_entry) 
+				if (new_entry)
 					return;
 
 			}
@@ -331,13 +331,13 @@ add_clicked(GtkButton *button, JunkSettings *js)
 			new_entry->entry = junk_entry;
 			new_entry->flag = 1;
 			msg = g_strdup (email);
-			gtk_list_store_append (GTK_LIST_STORE (js->model), &(js->iter)); 
+			gtk_list_store_append (GTK_LIST_STORE (js->model), &(js->iter));
 			gtk_list_store_set (GTK_LIST_STORE (js->model), &(js->iter), 0, msg, -1);
 			g_free(msg);
 			js->junk_list = g_list_append (js->junk_list, new_entry);
 			js->flag_for_ok = 0;
 		}
-	gtk_entry_set_text (GTK_ENTRY(js->entry), ""); 
+	gtk_entry_set_text (GTK_ENTRY(js->entry), "");
 }
 
 static void
@@ -348,9 +348,9 @@ remove_clicked(GtkButton *button, JunkSettings *js)
 
 	gtk_tree_model_get ((GtkTreeModel *) js->model, &(js->iter), 0, &email, -1);
 	entry = find_node (js->junk_list, email);
-	if (entry->flag & 0x1) {	
+	if (entry->flag & 0x1) {
 		js->junk_list = g_list_remove (js->junk_list, entry);
-		free_node(entry);		
+		free_node(entry);
 	} else {
 		entry->flag = 0;
 		entry->flag |= 0x4;
@@ -360,19 +360,19 @@ remove_clicked(GtkButton *button, JunkSettings *js)
 }
 
 
-static void 
+static void
 user_selected(GtkTreeSelection *selection, JunkSettings *js)
 {
 	GtkTreeModel *model;
-	
+
 	gtk_tree_selection_set_mode(selection, GTK_SELECTION_SINGLE);
 	if (gtk_tree_selection_get_selected (selection, &model, &(js->iter))){
 		gtk_widget_set_sensitive (GTK_WIDGET (js->remove), TRUE);
 
-	} 
+	}
 }
-	
-static void 
+
+static void
 junk_settings_construct (JunkSettings *js)
 {
 	GladeXML *xml;
@@ -384,7 +384,7 @@ junk_settings_construct (JunkSettings *js)
 	xml = glade_xml_new (gladefile, ROOTNODE, NULL);
 	g_free (gladefile);
 
-	js->xml =xml; 
+	js->xml =xml;
 
 	if (!js->xml) {
 		g_warning ("could not get xml");
diff --git a/plugins/groupwise-features/junk-settings.h b/plugins/groupwise-features/junk-settings.h
index 5a9b57ce12..59204e1f14 100644
--- a/plugins/groupwise-features/junk-settings.h
+++ b/plugins/groupwise-features/junk-settings.h
@@ -59,11 +59,11 @@ struct _GtkVBox;
 
 struct _JunkSettings {
 	GtkVBox parent_object;
-	
+
 	struct _GladeXML *xml;
-	
+
 	/* General tab */
-	
+
 	/* Default Behavior */
 	struct _GtkTreeView *entry_list;
 	struct _GtkButton *add_button;
@@ -78,7 +78,7 @@ struct _JunkSettings {
 	struct _GtkVBox  *vbox;
 	struct _GtkVBox  *table;
 	struct _GtkWidget *window;
-	
+
 	GList *junk_list;
 	gint users;
 	gint flag_for_ok;
@@ -89,7 +89,7 @@ struct _JunkSettings {
 
 struct _JunkSettingsClass {
 	GtkVBoxClass parent_class;
-	
+
 };
 
 GType junk_settings_get_type (void);
diff --git a/plugins/groupwise-features/mail-retract.c b/plugins/groupwise-features/mail-retract.c
index 165ceac49e..2026bb714e 100644
--- a/plugins/groupwise-features/mail-retract.c
+++ b/plugins/groupwise-features/mail-retract.c
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
  *
- *  Author: 
+ *  Author:
  *  Sankar P ( psankar@novell.com )
  *
  *  Copyright 2004 Novell, Inc. (www.novell.com)
@@ -40,17 +40,17 @@ static void retract_mail_settings (EPopup *ep, EPopupItem *item, void *data)
 {
 	EGwConnection *cnc;
 	CamelFolder *folder = (CamelFolder *)data;
-	CamelStore *store = folder->parent_store;	
+	CamelStore *store = folder->parent_store;
 	char *id;
-	
-	cnc = get_cnc (store);	
+
+	cnc = get_cnc (store);
 	id = (char *)item->user_data;
 
 	if (e_gw_connection_retract_request (cnc, id, NULL, FALSE, FALSE) != E_GW_CONNECTION_STATUS_OK )
 		e_error_run (NULL, "org.gnome.evolution.message.retract:retract-failure", NULL);
 	else {
 		GtkWidget *dialog;
-		dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL, GTK_MESSAGE_INFO, GTK_BUTTONS_CLOSE, _("Message retracted successfully"));	
+		dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL, GTK_MESSAGE_INFO, GTK_BUTTONS_CLOSE, _("Message retracted successfully"));
 		gtk_dialog_run (GTK_DIALOG(dialog));
 		gtk_widget_destroy (dialog);
 	}
@@ -87,6 +87,6 @@ void org_gnome_retract_message (EPlugin *ep, EMPopupTargetSelect *t)
 			menus = g_slist_prepend (menus, &popup_items[i]);
 
 		e_popup_add_items (t->target.popup, menus, NULL, popup_free, t->folder);
-	} 
+	}
 	return ;
 }
diff --git a/plugins/groupwise-features/mail-send-options.c b/plugins/groupwise-features/mail-send-options.c
index 84ea84733e..6fefa06e4b 100644
--- a/plugins/groupwise-features/mail-send-options.c
+++ b/plugins/groupwise-features/mail-send-options.c
@@ -3,16 +3,16 @@
  *  Authors: Parthasarathi Susarla <sparthasarathi@novell.com>
  *
  * Copyright 2004 Novell, Inc. (www.novell.com)
- * 
+ *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
  * License as published by the Free Software Foundation.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
@@ -44,7 +44,7 @@ static ESendOptionsDialog * dialog = NULL ;
 
 void org_gnome_composer_send_options (EPlugin *ep, EMEventTargetComposer *t);
 
-static time_t 
+static time_t
 add_day_to_time (time_t time, int days)
 {
 	struct tm *tm;
@@ -65,7 +65,7 @@ feed_input_data(ESendOptionsDialog * dialog, gint state, gpointer data)
 
 	comp = (EMsgComposer *) data;
 	/* we are bothered only for ok response: other cases are handled generally*/
-	if (state == GTK_RESPONSE_OK) {	
+	if (state == GTK_RESPONSE_OK) {
 		if (dialog->data->gopts->reply_enabled) {
 			if (dialog->data->gopts->reply_convenient)
 				e_msg_composer_add_header (comp, X_REPLY_CONVENIENT ,"1" ) ;
@@ -116,13 +116,13 @@ feed_input_data(ESendOptionsDialog * dialog, gint state, gpointer data)
 			e_msg_composer_add_header (comp, X_SEND_OPT_PRIORITY, temp);
 			g_free (temp);
 		}
-		
+
 		if (dialog->data->gopts->security) {
 			temp = g_strdup_printf ("%d",dialog->data->gopts->security);
 			e_msg_composer_add_header (comp, X_SEND_OPT_SECURITY, temp);
 			g_free (temp);
 		}
-	} 
+	}
 }
 
 static void
@@ -130,21 +130,21 @@ send_options_commit (EMsgComposer *comp, gpointer user_data)
 {
 	if (!user_data && !E_IS_SENDOPTIONS_DIALOG (user_data))
 		return;
-		
+
 	if (dialog) {
 		g_object_unref (dialog);
-		dialog = NULL;	
+		dialog = NULL;
 	}
 }
 
-void 
+void
 org_gnome_composer_send_options (EPlugin *ep, EMEventTargetComposer *t)
 {
 
 	EMsgComposer *comp = (struct _EMsgComposer *)t->composer ;
-	EAccount *account = NULL; 
+	EAccount *account = NULL;
 	char *temp = NULL;
-	
+
 	account = e_msg_composer_get_preferred_account (comp) ;
 	if (!account)
 		return;
@@ -153,14 +153,14 @@ org_gnome_composer_send_options (EPlugin *ep, EMEventTargetComposer *t)
 	if (!temp) {
 		return;
 	}
-	e_msg_composer_set_send_options (comp, TRUE); 
+	e_msg_composer_set_send_options (comp, TRUE);
 	/* display the send options dialog */
 	if (!dialog) {
 		g_print ("New dialog\n\n") ;
 		dialog = e_sendoptions_dialog_new () ;
 	}
 	e_sendoptions_dialog_run (dialog, GTK_WIDGET (comp), E_ITEM_MAIL) ;
-	
+
 	g_signal_connect (dialog, "sod_response",
 				  G_CALLBACK (feed_input_data), comp);
 
diff --git a/plugins/groupwise-features/mail-send-options.h b/plugins/groupwise-features/mail-send-options.h
index 128777ba0b..c1d9eb04b5 100644
--- a/plugins/groupwise-features/mail-send-options.h
+++ b/plugins/groupwise-features/mail-send-options.h
@@ -3,16 +3,16 @@
  *  Authors: Parthasarathi Susarla <sparthasarathi@novell.com>
  *
  * Copyright 2004 Novell, Inc. (www.novell.com)
- * 
+ *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
  * License as published by the Free Software Foundation.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/plugins/groupwise-features/process-meeting.c b/plugins/groupwise-features/process-meeting.c
index 718a10d1c9..356781f344 100644
--- a/plugins/groupwise-features/process-meeting.c
+++ b/plugins/groupwise-features/process-meeting.c
@@ -50,14 +50,14 @@ static EPopupItem popup_items[] = {
 { E_POPUP_ITEM, "43.decline", N_("Decline"), on_decline_meeting, NULL, GTK_STOCK_CANCEL, 0, E_CAL_POPUP_SELECT_NOTEDITING | E_CAL_POPUP_SELECT_MEETING}
 };
 
-static void 
+static void
 popup_free (EPopup *ep, GSList *items, void *data)
 {
 	g_slist_free (items);
 	items = NULL;
 }
 
-void 
+void
 org_gnome_accept (EPlugin *ep, ECalPopupTargetSelect *target)
 {
 	GSList *menus = NULL;
@@ -116,8 +116,8 @@ receive_objects (gpointer data)
 {
 	GError *error = NULL;
 	ReceiveData *r_data = data;
-	
-	
+
+
 	icalcomponent_set_method (r_data->icalcomp, ICAL_METHOD_REQUEST);
 
 	if (!e_cal_receive_objects (r_data->ecal, r_data->icalcomp, &error)) {
@@ -158,7 +158,7 @@ find_attendee (icalcomponent *ical_comp, const char *address)
 		}
 		g_free (text);
 	}
-	
+
 	return prop;
 }
 static void
@@ -187,7 +187,7 @@ change_status (icalcomponent *ical_comp, const char *address, icalparameter_part
 	}
 }
 
-static void 
+static void
 process_meeting (ECalendarView *cal_view, icalparameter_partstat status)
 {
 	GList *selected;
@@ -202,7 +202,7 @@ process_meeting (ECalendarView *cal_view, icalparameter_partstat status)
 		GThread *thread = NULL;
 		GError *error = NULL;
 		char *address = NULL;
-		
+
 		e_cal_component_set_icalcomponent (comp, icalcomponent_new_clone (event->comp_data->icalcomp));
 		address = itip_get_comp_attendee (comp, event->comp_data->client);
 
@@ -212,7 +212,7 @@ process_meeting (ECalendarView *cal_view, icalparameter_partstat status)
 		/* Free comp */
 		g_object_unref (comp);
 		comp = NULL;
-		
+
 		clone = icalcomponent_new_clone (event->comp_data->icalcomp);
 		change_status (clone, address, status);
 
@@ -233,11 +233,11 @@ process_meeting (ECalendarView *cal_view, icalparameter_partstat status)
 				icalproperty *prop;
 				const char *uid = icalcomponent_get_uid (r_data->icalcomp);
 
-				prop = icalproperty_new_x ("All");	
+				prop = icalproperty_new_x ("All");
 				icalproperty_set_x_name (prop, "X-GW-RECUR-INSTANCES-MOD-TYPE");
 				icalcomponent_add_property (r_data->icalcomp, prop);
 
-				prop = icalproperty_new_x (uid);	
+				prop = icalproperty_new_x (uid);
 				icalproperty_set_x_name (prop, "X-GW-RECURRENCE-KEY");
 				icalcomponent_add_property (r_data->icalcomp, prop);
 
@@ -255,7 +255,7 @@ process_meeting (ECalendarView *cal_view, icalparameter_partstat status)
 	}
 }
 
-/*FIXME the data does not give us the ECalendarView object. 
+/*FIXME the data does not give us the ECalendarView object.
   we should remove the global c_view variable once we get it from the data*/
 static void
 on_accept_meeting (EPopup *ep, EPopupItem *pitem, void *data)
diff --git a/plugins/groupwise-features/proxy-login.c b/plugins/groupwise-features/proxy-login.c
index cab5d594ea..6259336728 100644
--- a/plugins/groupwise-features/proxy-login.c
+++ b/plugins/groupwise-features/proxy-login.c
@@ -1,7 +1,7 @@
 
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- *  Authors: 
+ *  Authors:
  *  Shreyas Srinivasan <sshreyas@novell.com>
  *  Sankar P <psankar@novell.com>
  *
@@ -104,7 +104,7 @@ proxy_login_finalize (GObject *object)
 		g_free (prd->priv);
 		prd->priv = NULL;
 	}
-	
+
 	if (parent_class->finalize)
 		(* parent_class->finalize) (object);
 }
@@ -144,7 +144,7 @@ proxy_login_init (GObject *object)
 	prd = PROXY_LOGIN (object);
 	priv = g_new0 (proxyLoginPrivate, 1);
 	prd->priv = priv;
-	
+
 	prd->proxy_list = NULL;
 	priv->xml = NULL;
 	priv->main = NULL;
@@ -152,7 +152,7 @@ proxy_login_init (GObject *object)
 	priv->tree = NULL;
 }
 
-GType 
+GType
 proxy_login_get_type (void)
 {
   static GType type = 0;
@@ -178,13 +178,13 @@ proxy_login_get_type (void)
   return type;
 }
 
-proxyLogin * 
+proxyLogin *
 proxy_login_new (void)
 {
 	proxyLogin *prd;
 
 	prd = g_object_new (TYPE_PROXY_LOGIN, NULL);
-	
+
 	return prd;
 }
 
@@ -196,27 +196,27 @@ proxy_get_password (EAccount *account, char **user_name, char **password)
 	const char *poa_address, *use_ssl = NULL, *soap_port;
 
 	url = camel_url_new (account->source->url, NULL);
-	if (url == NULL) 
+	if (url == NULL)
 		return 0;
 	*user_name = g_strdup (url->user);
-	poa_address = url->host; 
+	poa_address = url->host;
 	if (!poa_address || strlen (poa_address) ==0)
 		return 0;
-	
+
         soap_port = camel_url_get_param (url, "soap_port");
         if (!soap_port || strlen (soap_port) == 0)
                 soap_port = "7191";
 	use_ssl = camel_url_get_param (url, "use_ssl");
 
-	key =  g_strdup_printf ("groupwise://%s@%s/", url->user, poa_address); 
-	
+	key =  g_strdup_printf ("groupwise://%s@%s/", url->user, poa_address);
+
 	if (use_ssl && !g_str_equal (use_ssl, "never"))
 		uri = g_strdup_printf ("https://%s:%s/soap", poa_address, soap_port);
-	else 
+	else
 		uri = g_strdup_printf ("http://%s:%s/soap", poa_address, soap_port);
-	
+
 	failed_auth = "";
-	
+
 	prompt = g_strdup_printf (_("%sEnter password for %s (user %s)"),
 			failed_auth, poa_address, url->user);
 
@@ -224,13 +224,13 @@ proxy_get_password (EAccount *account, char **user_name, char **password)
 
 	g_free (key);
 	g_free (prompt);
-	g_free (uri); 
+	g_free (uri);
 	camel_url_free (url);
 
 	return 1;
 }
 
-static EGwConnection * 
+static EGwConnection *
 proxy_login_get_cnc (EAccount *account)
 {
 	EGwConnection *cnc;
@@ -238,27 +238,27 @@ proxy_login_get_cnc (EAccount *account)
 	char *uri = NULL, *failed_auth = NULL, *key = NULL, *prompt = NULL, *password = NULL;
 	const char *use_ssl = NULL, *soap_port;
 	gboolean remember;
-	
+
 	url = camel_url_new (account->source->url, NULL);
-	if (url == NULL) 
+	if (url == NULL)
 		return NULL;
 	if (!url->host || strlen (url->host) ==0)
 		return NULL;
-	
+
         soap_port = camel_url_get_param (url, "soap_port");
         if (!soap_port || strlen (soap_port) == 0)
                 soap_port = "7191";
 	use_ssl = camel_url_get_param (url, "use_ssl");
 
-	key =  g_strdup_printf ("groupwise://%s@%s/", url->user, url->host); 
+	key =  g_strdup_printf ("groupwise://%s@%s/", url->user, url->host);
 	if (use_ssl && !g_str_equal (use_ssl, "never"))
 		uri = g_strdup_printf ("https://%s:%s/soap", url->host, soap_port);
-	else 
+	else
 		uri = g_strdup_printf ("http://%s:%s/soap", url->host, soap_port);
-	
+
 	failed_auth = "";
 	cnc = NULL;
-	
+
 	prompt = g_strdup_printf (_("%sEnter password for %s (user %s)"),
 			failed_auth, url->host, url->user);
 
@@ -267,7 +267,7 @@ proxy_login_get_cnc (EAccount *account)
 	if (!password)
 		password = e_passwords_ask_password (prompt, "Groupwise", key, prompt,
 				E_PASSWORDS_REMEMBER_FOREVER|E_PASSWORDS_SECRET, &remember, NULL);
-	
+
 	g_free (prompt);
 	cnc = e_gw_connection_new (uri, url->user, password);
 	if (!E_IS_GW_CONNECTION(cnc) && use_ssl && g_str_equal (use_ssl, "when-possible")) {
@@ -275,17 +275,17 @@ proxy_login_get_cnc (EAccount *account)
 		cnc = e_gw_connection_new (http_uri, url->user, password);
 		g_free (http_uri);
 	}
-	
+
 	g_free (key);
 	g_free (password);
-	g_free (uri); 
+	g_free (uri);
 	camel_url_free (url);
 
 	return cnc;
 }
-	
 
-static void 
+
+static void
 proxy_login_cb (GtkDialog *dialog, gint state)
 {
 	GtkWidget *account_name_tbox;
@@ -300,7 +300,7 @@ proxy_login_cb (GtkDialog *dialog, gint state)
 	    case GTK_RESPONSE_OK:
 		    gtk_widget_destroy (priv->main);
 		    proxy_soap_login (proxy_name);
-		    g_object_unref (pld);    
+		    g_object_unref (pld);
 		    break;
 	    case GTK_RESPONSE_CANCEL:
     		    gtk_widget_destroy (priv->main);
@@ -313,7 +313,7 @@ proxy_login_cb (GtkDialog *dialog, gint state)
 	g_free (proxy_name);
 }
 
-static void 
+static void
 proxy_soap_login (char *email)
 {
 	EAccountList *accounts = mail_config_get_accounts();
@@ -326,30 +326,30 @@ proxy_soap_login (char *email)
 	char *name;
 	int i;
 	int permissions = 0;
-	
+
 	for (i=0; email[i]!='\0' && email[i]!='@' ; i++);
 	if (email[i]=='@')
 		name = g_strndup(email, i);
 	else {
 		e_error_run (NULL, "org.gnome.evolution.proxy-login:invalid-user",email ,NULL);
 		return;
-	}	
+	}
 
 	/* README: There should not be the weird scenario of the proxy itself configured as an account.
 	   If so, it is violating the (li)unix philosophy of User creation. So dont care about that scenario*/
 
-	if (e_account_list_find (accounts, E_ACCOUNT_FIND_ID_ADDRESS, email) != NULL) { 
+	if (e_account_list_find (accounts, E_ACCOUNT_FIND_ID_ADDRESS, email) != NULL) {
 		e_error_run (NULL, "org.gnome.evolution.proxy-login:already-loggedin", email, NULL);
 		g_free (name);
 		return;
 	}
-	
+
 	srcAccount = pld->account;
 	cnc = proxy_login_get_cnc(srcAccount);
 	proxy_get_password (srcAccount, &user_name, &password);
-	
+
 	proxy_cnc = e_gw_connection_get_proxy_connection (cnc, user_name, password, email, &permissions);
-	
+
 	if (proxy_cnc) {
 		parent = camel_url_new (e_account_get_string(srcAccount, E_ACCOUNT_SOURCE_URL), NULL);
 		parent_source_url = camel_url_to_string (parent, CAMEL_URL_HIDE_PASSWORD);
@@ -375,8 +375,8 @@ proxy_soap_login (char *email)
 		camel_url_free (parent);
 	} else {
 		e_error_run (NULL, "org.gnome.evolution.proxy-login:invalid-user",email ,NULL);
-		return;  
-	}	
+		return;
+	}
 
 	g_object_unref (cnc);
 	g_free (name);
@@ -384,8 +384,8 @@ proxy_soap_login (char *email)
 	g_free (password);
 }
 
- 
-static void 
+
+static void
 proxy_login_add_new_store (char *uri, CamelStore *store, void *user_data)
 {
 	MailComponent *component = mail_component_peek ();
@@ -402,7 +402,7 @@ proxy_login_add_new_store (char *uri, CamelStore *store, void *user_data)
 	mail_component_add_store (component, store, account->name);
 }
 
-static void 
+static void
 proxy_login_tree_view_changed_cb(GtkDialog *dialog)
 {
 	proxyLoginPrivate *priv = pld->priv;
@@ -420,14 +420,14 @@ proxy_login_tree_view_changed_cb(GtkDialog *dialog)
 	gtk_entry_set_text((GtkEntry*) account_name_tbox,account_mailid);
 }
 
-static void 
+static void
 proxy_login_setup_tree_view (void)
 {
 	proxyLoginPrivate *priv;
 	GtkTreeSelection *selection;
 	GtkCellRenderer *renderer;
 	GtkTreeViewColumn *column;
-	
+
 	priv = pld->priv;
 	renderer = g_object_new (GTK_TYPE_CELL_RENDERER_PIXBUF,
 				 "xpad", 4,
@@ -444,7 +444,7 @@ proxy_login_setup_tree_view (void)
 	g_signal_connect (G_OBJECT (selection), "changed", G_CALLBACK(proxy_login_tree_view_changed_cb), NULL);
 }
 
-static void 
+static void
 proxy_login_update_tree (void)
 {
     	GtkTreeIter iter;
@@ -457,7 +457,7 @@ proxy_login_update_tree (void)
 	proxyLoginPrivate *priv = pld->priv;
 	gchar *file_name = e_icon_factory_get_icon_filename ("stock_person", 48);
 	broken_image = gdk_pixbuf_new_from_file (file_name, NULL);
-	
+
 	cnc = proxy_login_get_cnc(pld->account);
 	e_gw_connection_get_proxy_list (cnc, &proxy_list);
 
@@ -511,17 +511,17 @@ org_gnome_proxy_account_login (EPopup *ep, EPopupItem *p, void *data)
 	proxy_login_setup_tree_view ();
 	proxy_login_update_tree ();
 	g_signal_connect (GTK_DIALOG (priv->main), "response", G_CALLBACK(proxy_login_cb), NULL);
-	gtk_widget_show (GTK_WIDGET (priv->main));		
+	gtk_widget_show (GTK_WIDGET (priv->main));
  }
 
 static EPopupItem popup_items[] = {
-/* To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a groupwise 
- * feature by which one person can send/read mails/appointments using another person's identity 
+/* To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a groupwise
+ * feature by which one person can send/read mails/appointments using another person's identity
  * without knowing his password, for example if that other person is on vacation */
 { E_POPUP_ITEM, "20.emc.04", N_("_Proxy Login..."), org_gnome_proxy_account_login, NULL, NULL, 0, EM_POPUP_FOLDER_STORE }
 };
 
-static void 
+static void
 popup_free (EPopup *ep, GSList *items, void *data)
 {
 	g_slist_free (items);
diff --git a/plugins/groupwise-features/proxy-login.h b/plugins/groupwise-features/proxy-login.h
index 86cabab444..4820721bd9 100644
--- a/plugins/groupwise-features/proxy-login.h
+++ b/plugins/groupwise-features/proxy-login.h
@@ -42,7 +42,7 @@ struct _proxyLogin{
     GList *proxy_list;
 
     /* Private Dialog Information*/
-    proxyLoginPrivate *priv;  
+    proxyLoginPrivate *priv;
 };
 
 struct _proxyLoginClass {
diff --git a/plugins/groupwise-features/proxy.c b/plugins/groupwise-features/proxy.c
index 7db7e510be..3ffb56579d 100644
--- a/plugins/groupwise-features/proxy.c
+++ b/plugins/groupwise-features/proxy.c
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
  *
- *  Authors: 
+ *  Authors:
  *  Shreyas Srinivasan (sshreyas@novell.com)
  *  Sankar P ( psankar@novell.com )
  *
@@ -89,7 +89,7 @@ struct _proxyDialogPrivate {
 
 	/*name selector dialog*/
 	ENameSelector *proxy_name_selector;
-	
+
 	GtkTreeView *tree;
 	GtkTreeStore *store;
 
@@ -134,7 +134,7 @@ free_proxy_handler (proxyHandler *handler)
 		g_free (handler->proxy_name);
 
 	if (handler->proxy_email)
-		g_free (handler->proxy_email);			
+		g_free (handler->proxy_email);
 
 	handler->uniqueid = NULL;
 	handler->proxy_name = NULL;
@@ -159,7 +159,7 @@ proxy_dialog_finalize (GObject *object)
 
 	g_return_if_fail (IS_PROXY_DIALOG (prd));
 	priv = prd->priv;
-	
+
 	if(priv->proxy_name_selector)
 		g_object_unref (priv->proxy_name_selector);
 
@@ -170,7 +170,7 @@ proxy_dialog_finalize (GObject *object)
 		g_free (prd->priv);
 		prd->priv = NULL;
 	}
-	
+
 	prd = NULL;
 	if (parent_class->finalize)
 		(* parent_class->finalize) (object);
@@ -203,7 +203,7 @@ proxy_dialog_init (GObject *object)
 	prd->priv = priv;
 
 	prd->cnc = NULL;
-	priv->tab_dialog = NULL;	
+	priv->tab_dialog = NULL;
 	priv->xml = NULL;
 	priv->xml_tab = NULL;
 	priv->main = NULL;
@@ -220,7 +220,7 @@ proxy_dialog_init (GObject *object)
 	priv->task_read = NULL;
 	priv->task_write = NULL;
 	priv->alarms = NULL;
-	priv->notifications = NULL; 
+	priv->notifications = NULL;
 	priv->options = NULL;
 	priv->private = NULL;
 	priv->help_section = NULL;
@@ -229,7 +229,7 @@ proxy_dialog_init (GObject *object)
 }
 
 GType
-proxy_dialog_get_type (void) 
+proxy_dialog_get_type (void)
 {
   static GType type = 0;
 
@@ -255,27 +255,27 @@ proxy_dialog_get_type (void)
   return type;
 }
 
-proxyDialog * 
+proxyDialog *
 proxy_dialog_new (void)
 {
 	proxyDialog *prd;
 
 	prd = g_object_new (TYPE_PROXY_DIALOG, NULL);
-	
+
 	return prd;
 }
 
-static int 
+static int
 proxy_get_permissions_from_dialog (EAccount *account)
 {
 	int permissions;
 	proxyDialogPrivate *priv;
 	proxyDialog *prd = NULL;
 
-	prd = g_object_get_data ((GObject *)account, "prd");    
+	prd = g_object_get_data ((GObject *)account, "prd");
 	priv = prd->priv;
 	permissions = 0;
-	
+
 	if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv->mail_read)))
 		permissions |= E_GW_PROXY_MAIL_READ;
 
@@ -315,7 +315,7 @@ proxy_get_permissions_from_dialog (EAccount *account)
 	return permissions;
 }
 
-static int 
+static int
 proxy_dialog_store_widgets_data (EAccount *account, gint32 dialog)
 {
 	GtkTreeIter iter;
@@ -326,7 +326,7 @@ proxy_dialog_store_widgets_data (EAccount *account, gint32 dialog)
 	char *account_mailid;
 	proxyDialog *prd = NULL;
 
-	prd = g_object_get_data ((GObject *)account, "prd");    
+	prd = g_object_get_data ((GObject *)account, "prd");
 	priv = prd->priv;
 
 	switch (dialog)
@@ -346,20 +346,20 @@ proxy_dialog_store_widgets_data (EAccount *account, gint32 dialog)
 
 				if (!tmp) {
 					e_error_run (NULL, "org.gnome.evolution.proxy:no-user",NULL ,NULL);
-					return -1; 
+					return -1;
 				}
-				
+
 				for (; tmp != NULL; tmp = g_list_next (tmp)) {
 					email = NULL;
 					email = (char *)e_destination_get_email (tmp->data);
 
 					if (g_str_equal(email, ""))
 						continue;
-					
+
 					if (g_strrstr (email, "@") == NULL) {
 						e_error_run (NULL, "org.gnome.evolution.proxy:invalid-user", email, NULL);
 						return -1;
-					} 	
+					}
 					if (! g_ascii_strcasecmp(e_gw_connection_get_user_email (prd->cnc), email)) {
 						e_error_run (NULL, "org.gnome.evolution.proxy:invalid-user", email, NULL);
 						return -1;
@@ -380,7 +380,7 @@ proxy_dialog_store_widgets_data (EAccount *account, gint32 dialog)
 								return 0;
 							}
 
-							
+
 							e_error_run (NULL, "org.gnome.evolution.proxy:user-is-proxy",email ,NULL);
 							return -1;
 						}
@@ -407,7 +407,7 @@ proxy_dialog_store_widgets_data (EAccount *account, gint32 dialog)
 					new_proxy->uniqueid = NULL;
 					new_proxy->flags =  E_GW_PROXY_NEW;
 					new_proxy->permissions = proxy_get_permissions_from_dialog (account);
-				
+
 					priv->proxy_list = g_list_append (priv->proxy_list, new_proxy);
 				}
 			}
@@ -426,7 +426,7 @@ proxy_dialog_store_widgets_data (EAccount *account, gint32 dialog)
 			break;
 		default:
 			return -1;
-	}    
+	}
 
 	return 0;
 }
@@ -438,7 +438,7 @@ proxy_dialog_initialize_widgets (EAccount *account)
 	proxyDialogPrivate *priv;
 	proxyDialog *prd = NULL;
 
-	prd = g_object_get_data ((GObject *)account, "prd");    
+	prd = g_object_get_data ((GObject *)account, "prd");
 	priv = prd->priv;
 	priv->account_name = GW ("proxy_account_name");
 	priv->mail_read = GW ("mailRead");
@@ -453,7 +453,7 @@ proxy_dialog_initialize_widgets (EAccount *account)
 	priv->notifications = GW ("notifications");
 	priv->options = GW ("modify_rules");
 	priv->private = GW ("read_private");
-	
+
 	return (priv->account_name
 		&& priv->mail_read
 		&& priv->mail_write
@@ -469,7 +469,7 @@ proxy_dialog_initialize_widgets (EAccount *account)
 		&& priv->private);
 }
 
-static EGwConnection * 
+static EGwConnection *
 proxy_get_cnc (EAccount *account, GtkWindow *parent_window)
 {
 	EGwConnection *cnc;
@@ -479,27 +479,27 @@ proxy_get_cnc (EAccount *account, GtkWindow *parent_window)
 	gboolean remember;
 
 	url = camel_url_new (account->source->url, NULL);
-	if (url == NULL) 
+	if (url == NULL)
 		return NULL;
-	poa_address = url->host; 
+	poa_address = url->host;
 	if (!poa_address || strlen (poa_address) ==0)
 		return NULL;
-	
+
         soap_port = camel_url_get_param (url, "soap_port");
         if (!soap_port || strlen (soap_port) == 0)
                 soap_port = "7191";
 	use_ssl = camel_url_get_param (url, "use_ssl");
 
-	key =  g_strdup_printf ("groupwise://%s@%s/", url->user, poa_address); 
-	
+	key =  g_strdup_printf ("groupwise://%s@%s/", url->user, poa_address);
+
 	if (use_ssl && !g_str_equal (use_ssl, "never"))
 		uri = g_strdup_printf ("https://%s:%s/soap", poa_address, soap_port);
-	else 
+	else
 		uri = g_strdup_printf ("http://%s:%s/soap", poa_address, soap_port);
-	
+
 	failed_auth = "";
 	cnc = NULL;
-	
+
 	prompt = g_strdup_printf (_("%sEnter password for %s (user %s)"),
 			failed_auth, poa_address, url->user);
 
@@ -520,7 +520,7 @@ proxy_get_cnc (EAccount *account, GtkWindow *parent_window)
 	return cnc;
 }
 
-void 
+void
 proxy_abort (GtkWidget *button, EConfigHookItemFactoryData *data)
 {
 	EMConfigTargetAccount *target_account;
@@ -529,8 +529,8 @@ proxy_abort (GtkWidget *button, EConfigHookItemFactoryData *data)
 
 	target_account = (EMConfigTargetAccount *)data->config->target;
 	account = target_account->account;
-	prd = g_object_get_data ((GObject *)account, "prd");    
-	
+	prd = g_object_get_data ((GObject *)account, "prd");
+
 	if (!prd || !prd->priv || !prd->priv->proxy_list)
 		return;
 
@@ -538,7 +538,7 @@ proxy_abort (GtkWidget *button, EConfigHookItemFactoryData *data)
 	prd = NULL;
 }
 
-void 
+void
 proxy_commit (GtkWidget *button, EConfigHookItemFactoryData *data)
 {
 	EAccount *account;
@@ -550,7 +550,7 @@ proxy_commit (GtkWidget *button, EConfigHookItemFactoryData *data)
 
 	target_account = (EMConfigTargetAccount *)data->config->target;
 	account = target_account->account;
-	prd = g_object_get_data ((GObject *)account, "prd");    
+	prd = g_object_get_data ((GObject *)account, "prd");
 
 	/* In case of non-GroupWise preferences edit, "prd" will be NULL. */
 	if (!prd || !prd->priv || !prd->priv->proxy_list)
@@ -567,8 +567,8 @@ proxy_commit (GtkWidget *button, EConfigHookItemFactoryData *data)
 			if ( !E_IS_GW_CONNECTION(prd->cnc)) 	/* Add check in case the connection request fails*/
 				prd->cnc = proxy_get_cnc (account, GTK_WINDOW (gtk_widget_get_toplevel (button)));
 
-			if (aclInstance->flags & E_GW_PROXY_NEW )         	
-				e_gw_connection_add_proxy (prd->cnc, aclInstance);		
+			if (aclInstance->flags & E_GW_PROXY_NEW )
+				e_gw_connection_add_proxy (prd->cnc, aclInstance);
 
 			if ((aclInstance->flags & E_GW_PROXY_DELETED) && !(aclInstance->flags & E_GW_PROXY_NEW))
 				e_gw_connection_remove_proxy (prd->cnc, aclInstance);
@@ -582,7 +582,7 @@ proxy_commit (GtkWidget *button, EConfigHookItemFactoryData *data)
 	prd = NULL;
 }
 
-static void 
+static void
 proxy_setup_meta_tree_view (EAccount *account)
 {
 	proxyDialog *prd = NULL;
@@ -591,7 +591,7 @@ proxy_setup_meta_tree_view (EAccount *account)
 	GtkCellRenderer *renderer;
 	GtkTreeViewColumn *column;
 
-	prd = g_object_get_data ((GObject *)account, "prd");    
+	prd = g_object_get_data ((GObject *)account, "prd");
 	priv = prd->priv;
 	renderer = g_object_new (GTK_TYPE_CELL_RENDERER_PIXBUF,
 				 "xpad", 4,
@@ -619,14 +619,14 @@ proxy_update_tree_view (EAccount *account)
 	gchar *file_name = e_icon_factory_get_icon_filename ("stock_person", E_ICON_SIZE_DIALOG);
 	proxyDialogPrivate *priv;
 
-	prd = g_object_get_data ((GObject *)account, "prd");    
+	prd = g_object_get_data ((GObject *)account, "prd");
 	priv = prd->priv;
 	broken_image = gdk_pixbuf_new_from_file (file_name, NULL);
-	
+
 	gtk_tree_store_clear (priv->store);
 	list_iter = priv->proxy_list;
 
-	for (;list_iter; list_iter = g_list_next(list_iter)) {        
+	for (;list_iter; list_iter = g_list_next(list_iter)) {
 	        aclInstance = (proxyHandler *) list_iter->data;
 
 		if(! (aclInstance->flags & E_GW_PROXY_DELETED )) {
@@ -634,7 +634,7 @@ proxy_update_tree_view (EAccount *account)
 			gtk_tree_store_set (priv->store, &iter, 0, broken_image, 1, g_strconcat(aclInstance->proxy_name,"\n",aclInstance->proxy_email, NULL), -1);
 		}
 	}
-   
+
    	g_free (file_name);
 	if (broken_image)
 		g_object_unref (broken_image);
@@ -643,7 +643,7 @@ proxy_update_tree_view (EAccount *account)
 	gtk_tree_view_set_model (GTK_TREE_VIEW(priv->tree), GTK_TREE_MODEL (priv->store));
 }
 
-GtkWidget* 
+GtkWidget*
 org_gnome_proxy (EPlugin *epl, EConfigHookItemFactoryData *data)
 {
 	EMConfigTargetAccount *target_account;
@@ -660,7 +660,7 @@ org_gnome_proxy (EPlugin *epl, EConfigHookItemFactoryData *data)
 	account = target_account->account;
 
 	camel_exception_init (&ex);
-	if (!(store = (CamelOfflineStore *) camel_session_get_service (session, e_account_get_string(account, E_ACCOUNT_SOURCE_URL), CAMEL_PROVIDER_STORE, &ex))) {	  
+	if (!(store = (CamelOfflineStore *) camel_session_get_service (session, e_account_get_string(account, E_ACCOUNT_SOURCE_URL), CAMEL_PROVIDER_STORE, &ex))) {
 		camel_exception_clear (&ex);
 		return NULL;
 	}
@@ -677,7 +677,7 @@ org_gnome_proxy (EPlugin *epl, EConfigHookItemFactoryData *data)
 		priv->xml_tab = glade_xml_new (gladefile, "proxy_vbox", NULL);
 		g_free (gladefile);
 
-		if (account->enabled && (store->state == CAMEL_OFFLINE_STORE_NETWORK_AVAIL)) {	
+		if (account->enabled && (store->state == CAMEL_OFFLINE_STORE_NETWORK_AVAIL)) {
 			priv->tab_dialog = GTK_WIDGET (glade_xml_get_widget (priv->xml_tab, "proxy_vbox"));
 			priv->tree = GTK_TREE_VIEW (glade_xml_get_widget (priv->xml_tab, "proxy_access_list"));
 			priv->store =  gtk_tree_store_new (2,
@@ -685,28 +685,28 @@ org_gnome_proxy (EPlugin *epl, EConfigHookItemFactoryData *data)
 							   G_TYPE_STRING
 				);
 			proxy_setup_meta_tree_view (account);
-			
+
 			addProxy = (GtkButton *) glade_xml_get_widget (priv->xml_tab, "add_proxy");
 			removeProxy = (GtkButton *) glade_xml_get_widget (priv->xml_tab, "remove_proxy");
 			editProxy = (GtkButton *) glade_xml_get_widget (priv->xml_tab, "edit_proxy");
-			
-			g_signal_connect (addProxy, "clicked", G_CALLBACK(proxy_add_account), account);	
+
+			g_signal_connect (addProxy, "clicked", G_CALLBACK(proxy_add_account), account);
 			g_signal_connect (removeProxy, "clicked", G_CALLBACK(proxy_remove_account), account);
 			g_signal_connect (editProxy, "clicked", G_CALLBACK(proxy_edit_account), account);
-			
+
 			priv->proxy_list = NULL;
 		} else if (account->enabled){
 			GtkWidget *label;
 			priv->tab_dialog = gtk_vbox_new (TRUE, 10);
 			label = gtk_label_new (_("The Proxy tab will be available only when the account is online."));
-			gtk_box_pack_start ((GtkBox *)priv->tab_dialog, label, TRUE, TRUE, 10);	
+			gtk_box_pack_start ((GtkBox *)priv->tab_dialog, label, TRUE, TRUE, 10);
 		} else {
 			GtkWidget *label;
 			priv->tab_dialog = gtk_vbox_new (TRUE, 10);
 			label = gtk_label_new (_("The Proxy tab will be available only when the account is enabled."));
-			gtk_box_pack_start ((GtkBox *)priv->tab_dialog, label, TRUE, TRUE, 10);	
-		}	
-			
+			gtk_box_pack_start ((GtkBox *)priv->tab_dialog, label, TRUE, TRUE, 10);
+		}
+
 		gtk_notebook_append_page ((GtkNotebook *)(data->parent), (GtkWidget *)priv->tab_dialog, gtk_label_new("Proxy"));
 		g_signal_connect ((GtkNotebook *)(data->parent), "switch-page", G_CALLBACK (proxy_page_changed_cb), account);
 		pag_num = gtk_notebook_page_num ((GtkNotebook *)(data->parent), (GtkWidget *)priv->tab_dialog);
@@ -720,11 +720,11 @@ org_gnome_proxy (EPlugin *epl, EConfigHookItemFactoryData *data)
 
 			if (priv) {
 				pag_num = gtk_notebook_page_num ( (GtkNotebook *)(data->parent), (GtkWidget *) priv->tab_dialog);
-				gtk_notebook_remove_page ( (GtkNotebook *)(data->parent), pag_num); 
+				gtk_notebook_remove_page ( (GtkNotebook *)(data->parent), pag_num);
 			}
-		}	
+		}
 	}
-	
+
 	camel_object_unref (store);
 	camel_exception_clear (&ex);
 	return NULL;
@@ -759,15 +759,15 @@ proxy_page_changed_cb (GtkNotebook *notebook, GtkNotebookPage *page, int num, EA
 				prd->cnc = proxy_get_cnc (account, GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (notebook))));
 			priv = prd->priv;
 
-			if (e_gw_connection_get_proxy_access_list(prd->cnc, &priv->proxy_list)!= E_GW_CONNECTION_STATUS_OK) 
+			if (e_gw_connection_get_proxy_access_list(prd->cnc, &priv->proxy_list)!= E_GW_CONNECTION_STATUS_OK)
 				return FALSE;
 
- 
+
 			list_iter = priv->proxy_list;
- 
-			for (;list_iter; list_iter = g_list_next(list_iter)) {        
+
+			for (;list_iter; list_iter = g_list_next(list_iter)) {
 				aclInstance = (proxyHandler *) list_iter->data;
- 
+
 				/* NOTE: All User Access is not supported */
 				if (!g_ascii_strcasecmp (aclInstance->proxy_name, "<All User Access>")) {
 					priv->proxy_list = g_list_delete_link (priv->proxy_list, list_iter);
@@ -796,12 +796,12 @@ proxy_cancel(GtkWidget *button, EAccount *account)
 }
 
 
-static void 
+static void
 proxy_add_ok (GtkWidget *button, EAccount *account)
 {
 	proxyDialog *prd = NULL;
 	proxyDialogPrivate *priv;
-	
+
 	prd = g_object_get_data ((GObject *)account, "prd");
 	priv = prd->priv;
 
@@ -813,12 +813,12 @@ proxy_add_ok (GtkWidget *button, EAccount *account)
 	g_object_unref (priv->xml);
 }
 
-static void 
+static void
 proxy_edit_ok (GtkWidget *button, EAccount *account)
 {
 	proxyDialog *prd = NULL;
 	proxyDialogPrivate *priv;
-	
+
 	prd = g_object_get_data ((GObject *)account, "prd");
 	priv = prd->priv;
 
@@ -830,19 +830,19 @@ proxy_edit_ok (GtkWidget *button, EAccount *account)
 	g_object_unref (priv->xml);
 }
 
-static proxyHandler * 
+static proxyHandler *
 proxy_get_item_from_list (EAccount *account, char *account_name)
 {
 	proxyDialogPrivate *priv;
 	proxyDialog *prd = NULL;
 	GList *list_iter;
 	proxyHandler *iter;
-	
-	prd = g_object_get_data ((GObject *)account, "prd");    
+
+	prd = g_object_get_data ((GObject *)account, "prd");
 	priv = prd->priv;
 	list_iter = priv->proxy_list;
 
-	for (;list_iter; list_iter = g_list_next(list_iter)) {        
+	for (;list_iter; list_iter = g_list_next(list_iter)) {
 	        iter = (proxyHandler *) list_iter->data;
 
 		if ( g_str_equal (iter->proxy_email,account_name))
@@ -852,7 +852,7 @@ proxy_get_item_from_list (EAccount *account, char *account_name)
 	return NULL;
 }
 
-static void 
+static void
 proxy_remove_account (GtkWidget *button, EAccount *account)
 {
 	GtkTreeIter iter;
@@ -863,7 +863,7 @@ proxy_remove_account (GtkWidget *button, EAccount *account)
 	char *account_mailid;
 	proxyDialog *prd = NULL;
 
-	prd = g_object_get_data ((GObject *)account, "prd");    
+	prd = g_object_get_data ((GObject *)account, "prd");
 	priv = prd->priv;
 	account_select = gtk_tree_view_get_selection (GTK_TREE_VIEW (priv->tree));
 
@@ -897,13 +897,13 @@ address_button_clicked (GtkButton *button, EAccount *account)
 	proxyDialogPrivate *priv;
 	ENameSelectorDialog *name_selector_dialog;
 
-	prd = g_object_get_data ((GObject *)account, "prd");    
+	prd = g_object_get_data ((GObject *)account, "prd");
 	priv = prd->priv;
 	name_selector_dialog = e_name_selector_peek_dialog (priv->proxy_name_selector);
 	gtk_widget_show (GTK_WIDGET (name_selector_dialog));
 }
 
-static void 
+static void
 proxy_add_account (GtkWidget *button, EAccount *account)
 {
 	GtkButton *contacts, *cancel;
@@ -916,7 +916,7 @@ proxy_add_account (GtkWidget *button, EAccount *account)
 	proxyDialog *prd = NULL;
 	char *gladefile;
 
-	prd = g_object_get_data ((GObject *)account, "prd");    
+	prd = g_object_get_data ((GObject *)account, "prd");
 	priv = prd->priv;
 
 	gladefile = g_build_filename (EVOLUTION_GLADEDIR,
@@ -938,7 +938,7 @@ proxy_add_account (GtkWidget *button, EAccount *account)
 	g_signal_connect ((GtkWidget *)cancel, "clicked", G_CALLBACK (proxy_cancel), account);
 	g_signal_connect ((GtkWidget *)contacts, "clicked", G_CALLBACK (address_button_clicked), account);
 	g_signal_connect (name_selector_dialog, "response", G_CALLBACK (addressbook_dialog_response), account);
-	gtk_widget_show (GTK_WIDGET (priv->main));		
+	gtk_widget_show (GTK_WIDGET (priv->main));
 
 	name_selector_model = e_name_selector_peek_model (priv->proxy_name_selector);
 	e_name_selector_model_add_section (name_selector_model, "Add User", "Add User", NULL);
@@ -955,17 +955,17 @@ proxy_add_account (GtkWidget *button, EAccount *account)
 	gtk_widget_grab_focus ((GtkWidget *) name_selector_entry);
 }
 
-static void 
+static void
 proxy_load_edit_dialog (EAccount *account, proxyHandler *edited)
 {
 	proxyDialogPrivate *priv;
 	proxyDialog *prd = NULL;
 
-	prd = g_object_get_data ((GObject *)account, "prd");    
+	prd = g_object_get_data ((GObject *)account, "prd");
 	priv = prd->priv;
 	gtk_entry_set_text ((GtkEntry *) priv->account_name, edited->proxy_email);
 	gtk_widget_set_sensitive (priv->account_name, FALSE);
-	
+
 	if (edited->permissions & E_GW_PROXY_MAIL_READ)
 		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (priv->mail_read), TRUE);
 
@@ -985,25 +985,25 @@ proxy_load_edit_dialog (EAccount *account, proxyHandler *edited)
 		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (priv->note_write), TRUE);
 
 	if (edited->permissions & E_GW_PROXY_TASK_READ)
-		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (priv->task_read), TRUE); 
+		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (priv->task_read), TRUE);
 
 	if (edited->permissions & E_GW_PROXY_TASK_WRITE)
-		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (priv->task_write), TRUE); 
+		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (priv->task_write), TRUE);
 
 	if (edited->permissions & E_GW_PROXY_GET_ALARMS)
-		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (priv->alarms), TRUE); 
+		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (priv->alarms), TRUE);
 
 	if (edited->permissions & E_GW_PROXY_GET_NOTIFICATIONS)
-		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (priv->notifications), TRUE); 
+		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (priv->notifications), TRUE);
 
 	if (edited->permissions & E_GW_PROXY_MODIFY_FOLDERS)
-		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (priv->options), TRUE); 
+		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (priv->options), TRUE);
 
 	if (edited->permissions & E_GW_PROXY_READ_PRIVATE)
-		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (priv->private), TRUE); 
-}	
+		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (priv->private), TRUE);
+}
 
-static void 
+static void
 proxy_edit_account (GtkWidget *button, EAccount *account)
 {
 	GtkTreeIter iter;
@@ -1017,11 +1017,11 @@ proxy_edit_account (GtkWidget *button, EAccount *account)
 	proxyDialog *prd = NULL;
 	char *gladefile;
 
-	prd = g_object_get_data ((GObject *)account, "prd");    
+	prd = g_object_get_data ((GObject *)account, "prd");
 	priv = prd->priv;
-	
+
 	/*FIXME: If multiple properties dialogs are launched then the widgets lose data*/
-		
+
 	account_select = gtk_tree_view_get_selection (GTK_TREE_VIEW (priv->tree));
 
         if (gtk_tree_selection_get_selected (account_select, &model, &iter)) {
@@ -1045,7 +1045,7 @@ proxy_edit_account (GtkWidget *button, EAccount *account)
 			g_signal_connect ((GtkWidget *)proxyCancel, "clicked", G_CALLBACK (proxy_cancel), account);
 			proxy_load_edit_dialog (account, edited);
 			gtk_widget_hide (contacts);
-			gtk_widget_show (GTK_WIDGET (priv->main));		
-		}	
+			gtk_widget_show (GTK_WIDGET (priv->main));
+		}
         }
 }
diff --git a/plugins/groupwise-features/proxy.h b/plugins/groupwise-features/proxy.h
index 1d3562536f..36e1fc688c 100644
--- a/plugins/groupwise-features/proxy.h
+++ b/plugins/groupwise-features/proxy.h
@@ -2,7 +2,7 @@
  *
  * Copyright (C) 2005 Novell, Inc.
  *
- * Authors: 
+ * Authors:
  * Shreyas Srinivasan <sshreyas@novell.com>
  * Sankar P <psankar@novell.com>
  *
diff --git a/plugins/groupwise-features/send-options.c b/plugins/groupwise-features/send-options.c
index e6b07664ae..abfde2fd61 100644
--- a/plugins/groupwise-features/send-options.c
+++ b/plugins/groupwise-features/send-options.c
@@ -49,7 +49,7 @@ void send_options_commit (EPlugin *epl, EConfigHookItemFactoryData *data);
 void send_options_changed (EPlugin *epl, EConfigHookItemFactoryData *data);
 void send_options_abort (EPlugin *epl, EConfigHookItemFactoryData *data);
 
-static EGwConnection * 
+static EGwConnection *
 get_cnc (GtkWindow *parent_window)
 {
 	EGwConnection *cnc;
@@ -59,27 +59,27 @@ get_cnc (GtkWindow *parent_window)
 	gboolean remember;
 
 	url = camel_url_new (account->source->url, NULL);
-	if (url == NULL) 
+	if (url == NULL)
 		return NULL;
-	poa_address = url->host; 
+	poa_address = url->host;
 	if (!poa_address || strlen (poa_address) ==0)
 		return NULL;
-	
+
         soap_port = camel_url_get_param (url, "soap_port");
         if (!soap_port || strlen (soap_port) == 0)
                 soap_port = "7191";
 	use_ssl = camel_url_get_param (url, "use_ssl");
 
-	key =  g_strdup_printf ("groupwise://%s@%s/", url->user, poa_address); 
-	
+	key =  g_strdup_printf ("groupwise://%s@%s/", url->user, poa_address);
+
 	if (use_ssl && !g_str_equal (use_ssl, "never"))
 		uri = g_strdup_printf ("https://%s:%s/soap", poa_address, soap_port);
-	else 
+	else
 		uri = g_strdup_printf ("http://%s:%s/soap", poa_address, soap_port);
-	
+
 	failed_auth = "";
 	cnc = NULL;
-	
+
 	prompt = g_strdup_printf (_("%sEnter password for %s (user %s)"),
 			failed_auth, poa_address, url->user);
 
@@ -101,7 +101,7 @@ get_cnc (GtkWindow *parent_window)
 }
 
 
-static void 
+static void
 e_send_options_load_general_opts (ESendOptionsGeneral *gopts, EGwSendOptionsGeneral *ggopts)
 {
 	time_t temp;
@@ -113,12 +113,12 @@ e_send_options_load_general_opts (ESendOptionsGeneral *gopts, EGwSendOptionsGene
 	gopts->reply_enabled = ggopts->reply_enabled;
 	gopts->reply_convenient = ggopts->reply_convenient;
 	gopts->reply_within = ggopts->reply_within;
-	
+
 	gopts->expiration_enabled = ggopts->expiration_enabled;
 	gopts->expire_after = ggopts->expire_after;
 
 	gopts->delay_enabled = ggopts->delay_enabled;
-	
+
 	/* TODO convert int to timet comparing the current day */
 	if (ggopts->delay_until) {
 		gopts->delay_until = time_add_day_with_zone (temp, ggopts->delay_until, NULL);
@@ -141,12 +141,12 @@ e_send_options_load_status_options (ESendOptionsStatusTracking *sopts, EGwSendOp
 }
 
 static void
-e_send_options_load_default_data (EGwSendOptions *opts, ESendOptionsDialog *sod) 
+e_send_options_load_default_data (EGwSendOptions *opts, ESendOptionsDialog *sod)
 {
 	EGwSendOptionsGeneral *ggopts;
-	EGwSendOptionsStatusTracking *gmopts;	
-	EGwSendOptionsStatusTracking *gcopts;	
-	EGwSendOptionsStatusTracking *gtopts;	
+	EGwSendOptionsStatusTracking *gmopts;
+	EGwSendOptionsStatusTracking *gcopts;
+	EGwSendOptionsStatusTracking *gtopts;
 
 	ggopts = e_gw_sendoptions_get_general_options (opts);
 	gmopts = e_gw_sendoptions_get_status_tracking_options (opts, "mail");
@@ -165,16 +165,16 @@ e_sendoptions_clicked_cb (GtkWidget *button, gpointer data)
 	EGwConnectionStatus status;
 	account = (EAccount *) data;
 	if (!sod) {
-		sod = e_sendoptions_dialog_new ();	
+		sod = e_sendoptions_dialog_new ();
 		e_sendoptions_set_global (sod, TRUE);
-		if (!n_cnc) 
+		if (!n_cnc)
 			n_cnc = get_cnc (GTK_WINDOW (gtk_widget_get_toplevel (button)));
 
 		if (!n_cnc) {
 			g_warning ("Send Options: Could not get the connection to the server \n");
 			return;
 		}
-			
+
 		status = e_gw_connection_get_settings (n_cnc, &opts);
 		if (status == E_GW_CONNECTION_STATUS_INVALID_CONNECTION)
 			status = e_gw_connection_get_settings (n_cnc, &opts);
@@ -184,7 +184,7 @@ e_sendoptions_clicked_cb (GtkWidget *button, gpointer data)
 		}
 		e_send_options_load_default_data (opts, sod);
 	}
-	
+
 	if (n_cnc)
 		e_sendoptions_dialog_run (sod, parent ? parent : NULL, E_ITEM_NONE);
 	else
@@ -196,21 +196,21 @@ org_gnome_send_options (EPlugin *epl, EConfigHookItemFactoryData *data)
 {
 	EMConfigTargetAccount *target_account;
 	GtkWidget *frame, *button, *label, *vbox;
-	
+
 	target_account = (EMConfigTargetAccount *)data->config->target;
 	account = target_account->account;
 
 	if(!g_strrstr (account->source->url, "groupwise://"))
 		return NULL;
-	
+
 	vbox = gtk_vbox_new (FALSE, 0);
 	frame = gtk_frame_new ("");
 	label = gtk_frame_get_label_widget (GTK_FRAME (frame));
-	gtk_label_set_markup (GTK_LABEL (label), "<b>Send Options</b>"); 
+	gtk_label_set_markup (GTK_LABEL (label), "<b>Send Options</b>");
 	button = gtk_button_new_with_label ("Advanced send options");
 	gtk_widget_show (button);
 
-	g_signal_connect(button, "clicked", 
+	g_signal_connect(button, "clicked",
 			    G_CALLBACK (e_sendoptions_clicked_cb), account);
 
 	parent = gtk_widget_get_toplevel (GTK_WIDGET (data->parent));
@@ -221,7 +221,7 @@ org_gnome_send_options (EPlugin *epl, EConfigHookItemFactoryData *data)
 	gtk_box_pack_start (GTK_BOX (vbox), frame, 0, 0, 0);
 	gtk_container_add (GTK_CONTAINER (frame), button);
 	gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_NONE);
-	gtk_widget_show (frame);	
+	gtk_widget_show (frame);
 	gtk_box_set_spacing (GTK_BOX (data->parent), 12);
 	gtk_box_pack_start (GTK_BOX (data->parent), vbox, FALSE, FALSE, 0);
 
@@ -235,7 +235,7 @@ send_options_finalize (void)
 		g_object_unref (n_cnc);
 		n_cnc = NULL;
 	}
-	
+
 	if (sod) {
 		g_object_unref (sod);
 		sod = NULL;
@@ -247,7 +247,7 @@ send_options_finalize (void)
 	}
 }
 
-static void 
+static void
 e_send_options_copy_general_opts (ESendOptionsGeneral *gopts, EGwSendOptionsGeneral *ggopts)
 {
 	ggopts->priority = gopts->priority;
@@ -255,7 +255,7 @@ e_send_options_copy_general_opts (ESendOptionsGeneral *gopts, EGwSendOptionsGene
 	ggopts->reply_enabled = gopts->reply_enabled;
 	ggopts->reply_convenient = gopts->reply_convenient;
 	ggopts->reply_within = gopts->reply_within;
-	
+
 	ggopts->expire_after = gopts->expire_after;
 
 	if (gopts->expire_after == 0) {
@@ -265,11 +265,11 @@ e_send_options_copy_general_opts (ESendOptionsGeneral *gopts, EGwSendOptionsGene
 		ggopts->expiration_enabled = gopts->expiration_enabled;
 
 	ggopts->delay_enabled = gopts->delay_enabled;
-	
+
 	if (gopts->delay_until) {
 		int diff;
 		icaltimetype temp, current;
-		
+
 		temp = icaltime_from_timet (gopts->delay_until, 0);
 		current = icaltime_today ();
 		diff = temp.day - current.day;
@@ -302,7 +302,7 @@ check_status_options_changed (EGwSendOptionsStatusTracking *n_sopts, EGwSendOpti
 		&& n_sopts->declined == o_sopts->declined
 		&& n_sopts->accepted == o_sopts->accepted
 		&& n_sopts->completed == o_sopts->completed));
-		
+
 }
 
 static gboolean
@@ -319,12 +319,12 @@ check_general_changed (EGwSendOptionsGeneral *n_gopts, EGwSendOptionsGeneral *o_
 }
 
 static void
-send_options_copy_check_changed (EGwSendOptions *n_opts) 
+send_options_copy_check_changed (EGwSendOptions *n_opts)
 {
 	EGwSendOptionsGeneral *ggopts, *o_gopts;
-	EGwSendOptionsStatusTracking *gmopts, *o_gmopts ;	
-	EGwSendOptionsStatusTracking *gcopts, *o_gcopts;	
-	EGwSendOptionsStatusTracking *gtopts, *o_gtopts;	
+	EGwSendOptionsStatusTracking *gmopts, *o_gmopts ;
+	EGwSendOptionsStatusTracking *gcopts, *o_gcopts;
+	EGwSendOptionsStatusTracking *gtopts, *o_gtopts;
 
 	ggopts = e_gw_sendoptions_get_general_options (n_opts);
 	gmopts = e_gw_sendoptions_get_status_tracking_options (n_opts, "mail");
@@ -340,7 +340,7 @@ send_options_copy_check_changed (EGwSendOptions *n_opts)
 	e_send_options_copy_status_options (sod->data->mopts, gmopts);
 	e_send_options_copy_status_options (sod->data->copts, gcopts);
 	e_send_options_copy_status_options (sod->data->topts, gtopts);
-	
+
         if (check_general_changed (ggopts, o_gopts))
 		changed = TRUE;
 	if (check_status_options_changed (gmopts, o_gmopts))
@@ -357,21 +357,21 @@ get_source (ESourceList *list)
 	GSList *p, *l;
 	char **temp = g_strsplit (account->source->url, ";", -1);
 	char *uri = temp [0];
-	
-	
+
+
 	l = e_source_list_peek_groups (list);
 
 	for (p = l; p != NULL; p = p->next) {
 		char *so_uri;
-		GSList *r, *s;	
+		GSList *r, *s;
 		ESourceGroup *group = E_SOURCE_GROUP (p->data);
 
 		s = e_source_group_peek_sources (group);
 		for (r = s; r != NULL; r = r->next) {
 			ESource *so = E_SOURCE (r->data);
-			so_uri = e_source_get_uri (so); 
-			
-			if (so_uri) {	
+			so_uri = e_source_get_uri (so);
+
+			if (so_uri) {
 				if (!strcmp (so_uri, uri)) {
 					g_free (so_uri), so_uri = NULL;
 					return E_SOURCE (r->data);
@@ -386,31 +386,31 @@ get_source (ESourceList *list)
 	return NULL;
 }
 
-static void 
+static void
 add_return_value (EGwSendOptionsReturnNotify track, ESource *source, char *notify)
 {
 	char *value;
-	
+
 	switch (track) {
 		case E_GW_RETURN_NOTIFY_MAIL:
 			value =  g_strdup ("mail");
 			break;
 		default:
-			value = g_strdup ("none");		
+			value = g_strdup ("none");
 	}
-	
+
 	e_source_set_property (source, notify, value);
 	g_free (value), value = NULL;
 }
 
-static void 
+static void
 put_options_in_source (ESource *source, EGwSendOptionsGeneral *gopts, EGwSendOptionsStatusTracking *sopts)
 {
 	char *value;
 	const char *val;
 	icaltimetype tt;
 	CamelURL  *url;
-      
+
        url = camel_url_new (account->source->url, NULL);
 
 	if (gopts) {
@@ -437,13 +437,13 @@ put_options_in_source (ESource *source, EGwSendOptionsGeneral *gopts, EGwSendOpt
 		if (gopts->reply_enabled) {
 			if (gopts->reply_convenient)
 				value = g_strdup ("convinient");
-			else 
+			else
 				value = g_strdup_printf ("%d",gopts->reply_within);
 		 } else
 			value = g_strdup ("none");
 		e_source_set_property (source, "reply-requested", value);
 		g_free (value), value = NULL;
-		
+
 			/* Delay delivery */
 		if (gopts->delay_enabled) {
 				tt = icaltime_today ();
@@ -452,7 +452,7 @@ put_options_in_source (ESource *source, EGwSendOptionsGeneral *gopts, EGwSendOpt
 		} else
 			val = "none";
 		e_source_set_property (source, "delay-delivery", val);
-		
+
 			/* Expiration date */
 		if (gopts->expiration_enabled)
 			value =  g_strdup_printf ("%d", gopts->expire_after);
@@ -461,7 +461,7 @@ put_options_in_source (ESource *source, EGwSendOptionsGeneral *gopts, EGwSendOpt
 		e_source_set_property (source, "expiration", value);
 		g_free (value), value = NULL;
 	}
-		
+
 	if (sopts) {
 			/* status tracking */
 		if (sopts->tracking_enabled) {
@@ -480,14 +480,14 @@ put_options_in_source (ESource *source, EGwSendOptionsGeneral *gopts, EGwSendOpt
 		e_source_set_property (source, "status-tracking", value);
 		g_free (value), value = NULL;
 
-		add_return_value (sopts->opened, source, "return-open"); 
-		add_return_value (sopts->accepted, source, "return-accept"); 
-		add_return_value (sopts->declined, source, "return-decline"); 
-		add_return_value (sopts->completed, source, "return-complete"); 
+		add_return_value (sopts->opened, source, "return-open");
+		add_return_value (sopts->accepted, source, "return-accept");
+		add_return_value (sopts->declined, source, "return-decline");
+		add_return_value (sopts->completed, source, "return-complete");
 	}
 }
-	
-static void 
+
+static void
 add_send_options_to_source (EGwSendOptions *n_opts)
 {
 	GConfClient *gconf = gconf_client_get_default ();
@@ -501,14 +501,14 @@ add_send_options_to_source (EGwSendOptions *n_opts)
 
 	list = e_source_list_new_for_gconf (gconf, "/apps/evolution/tasks/sources");
 	tsource = get_source (list);
-	
+
 	gopts = e_gw_sendoptions_get_general_options (n_opts);
 	copts = e_gw_sendoptions_get_status_tracking_options (n_opts, "calendar");
 	topts = e_gw_sendoptions_get_status_tracking_options (n_opts, "task");
 
 	if (csource)
 		put_options_in_source (csource, gopts, copts);
-	
+
 	if (tsource)
 		put_options_in_source (tsource, gopts, topts);
 
@@ -518,16 +518,16 @@ add_send_options_to_source (EGwSendOptions *n_opts)
 void
 send_options_commit (EPlugin *epl, EConfigHookItemFactoryData *data)
 {
-	EGwSendOptions *n_opts;	
+	EGwSendOptions *n_opts;
 	EGwConnectionStatus status = E_GW_CONNECTION_STATUS_OK;
-	
+
 	if (sod) {
 		n_opts = e_gw_sendoptions_new ();
 		send_options_copy_check_changed (n_opts);
-	
-		if (changed) 
+
+		if (changed)
 			status = e_gw_connection_modify_settings (n_cnc, n_opts);
-	
+
 		if (!changed || status != E_GW_CONNECTION_STATUS_OK) {
 			g_warning (G_STRLOC "Cannot modify Send Options:  %s", e_gw_connection_get_error_message (status));
 			g_object_unref (n_opts);
diff --git a/plugins/groupwise-features/share-folder-common.c b/plugins/groupwise-features/share-folder-common.c
index 5db802ffc3..20acd894d4 100644
--- a/plugins/groupwise-features/share-folder-common.c
+++ b/plugins/groupwise-features/share-folder-common.c
@@ -58,7 +58,7 @@ struct ShareInfo {
 	EMFolderTreeModel *model;
 	EMFolderSelector *emfs;
 };
-	
+
 GtkWidget * org_gnome_shared_folder_factory (EPlugin *ep, EConfigHookItemFactoryData *hook_data);
 void org_gnome_create_option(EPlugin *ep, EMPopupTargetFolder *target);
 static void create_shared_folder(EPopup *ep, EPopupItem *p, void *data);
@@ -68,7 +68,7 @@ void shared_folder_abort (EPlugin *ep, EConfigTarget *target);
 
 static void refresh_folder_tree (EMFolderTreeModel *model, CamelStore *store);
 
-static void 
+static void
 refresh_folder_tree (EMFolderTreeModel *model, CamelStore *store)
 {
 	gchar *uri;
@@ -96,12 +96,12 @@ refresh_folder_tree (EMFolderTreeModel *model, CamelStore *store)
 	//camel_object_unref (store);
 }
 
-void 
+void
 shared_folder_commit (EPlugin *ep, EConfigTarget *tget)
 {
 	EMConfigTargetFolder *target =  (EMConfigTargetFolder *)tget->config->target;
 	CamelFolder *folder = target->folder;
-	CamelStore *store = folder->parent_store;	
+	CamelStore *store = folder->parent_store;
 	EMFolderTreeModel *model = mail_component_peek_tree_model (mail_component_peek ());
 	if (common) {
 		share_folder (common);
@@ -111,7 +111,7 @@ shared_folder_commit (EPlugin *ep, EConfigTarget *tget)
 	}
 }
 
-void 
+void
 shared_folder_abort (EPlugin *ep, EConfigTarget *target)
 {
 	if (common) {
@@ -122,26 +122,26 @@ shared_folder_abort (EPlugin *ep, EConfigTarget *target)
 
 struct _EMCreateFolder {
 	struct _mail_msg msg;
-	
+
 	/* input data */
 	CamelStore *store;
 	char *full_name;
 	char *parent;
 	char *name;
-	
+
 	/* output data */
 	CamelFolderInfo *fi;
-	
+
 	/* callback data */
 	void (* done) (struct _EMCreateFolder *m, void *user_data);
 	void *user_data;
 };
-	
+
 static char *
 create_folder__desc (struct _mail_msg *mm, int done)
 {
 	struct _EMCreateFolder *m = (struct _EMCreateFolder *) mm;
-	
+
 	return g_strdup_printf (_("Creating folder `%s'"), m->full_name);
 }
 
@@ -149,9 +149,9 @@ static void
 create_folder__create (struct _mail_msg *mm)
 {
 	struct _EMCreateFolder *m = (struct _EMCreateFolder *) mm;
-	
+
 	d(printf ("creating folder parent='%s' name='%s' full_name='%s'\n", m->parent, m->name, m->full_name));
-	
+
 	if ((m->fi = camel_store_create_folder (m->store, m->parent, m->name, &mm->ex))) {
 		if (camel_store_supports_subscriptions (m->store))
 			camel_store_subscribe_folder (m->store, m->full_name, &mm->ex);
@@ -165,7 +165,7 @@ create_folder__created (struct _mail_msg *mm)
 	struct ShareInfo *ssi = (struct ShareInfo *) m->user_data;
 	CamelStore *store = CAMEL_STORE (m->store) ;
 	EGwConnection *ccnc;
-	
+
 	if (m->done) {
 		ccnc = get_cnc (store);
 		if(E_IS_GW_CONNECTION (ccnc)) {
@@ -178,12 +178,12 @@ create_folder__created (struct _mail_msg *mm)
 		m->done (m, m->user_data);
 	}
 }
-	
+
 static void
 create_folder__free (struct _mail_msg *mm)
 {
 	struct _EMCreateFolder *m = (struct _EMCreateFolder *) mm;
-	
+
 	camel_store_free_folder_info (m->store, m->fi);
 	camel_object_unref (m->store);
 	g_free (m->full_name);
@@ -228,7 +228,7 @@ create_folder (CamelStore *store, const char *full_name, void (* done) (struct _
 		*name++ = '\0';
 		parent = namebuf;
 	}
-	
+
 	m = mail_msg_new (&create_folder_op, NULL, sizeof (struct _EMCreateFolder));
 	camel_object_ref (store);
 	m->store = store;
@@ -240,11 +240,11 @@ create_folder (CamelStore *store, const char *full_name, void (* done) (struct _
 	g_free (namebuf);
 	id = m->msg.seq;
 	e_thread_put (mail_thread_new, (EMsg *) m);
-		
+
 	return id;
 }
 
-static void 
+static void
 users_dialog_response(GtkWidget *dialog, int response, struct ShareInfo *ssi)
 {
 	struct _EMFolderTreeModelStoreInfo *si;
@@ -263,13 +263,13 @@ users_dialog_response(GtkWidget *dialog, int response, struct ShareInfo *ssi)
 	path = em_folder_selector_get_selected_path (emfs);
 
 	d(printf ("Creating new folder: %s (%s)\n", path, uri));
-	
+
 	camel_exception_init (&ex);
 	if (!(store = (CamelStore *) camel_session_get_service (session, uri, CAMEL_PROVIDER_STORE, &ex))) {
 		camel_exception_clear (&ex);
 		return;
 	}
-	
+
 	if (!(si = g_hash_table_lookup ((ssi->model)->store_hash, store))) {
 		g_assert_not_reached ();
 		camel_object_unref (store);
@@ -308,7 +308,7 @@ new_folder_response (EMFolderSelector *emfs, int response, EMFolderTreeModel *mo
 		gtk_widget_destroy ((GtkWidget *) emfs);
 		return;
 	}
-	
+
 	/* i want store at this point to get cnc not sure proper or not*/
 	uri = em_folder_selector_get_selected_uri (emfs);
 	camel_exception_init (&ex);
@@ -324,7 +324,7 @@ new_folder_response (EMFolderSelector *emfs, int response, EMFolderTreeModel *mo
 	gtk_widget_show(w);
 	gtk_box_pack_start(GTK_BOX (GTK_DIALOG (users_dialog)->vbox), (GtkWidget *) w, TRUE, TRUE, 6);
 	ssi->sf = share_folder_new (cnc, NULL);
-	gtk_widget_set_sensitive (GTK_WIDGET ((ssi->sf)->table), TRUE);	
+	gtk_widget_set_sensitive (GTK_WIDGET ((ssi->sf)->table), TRUE);
 	ssi->model = model;
 	ssi->emfs = emfs;
 	gtk_widget_reparent (GTK_WIDGET ((ssi->sf)->table), GTK_DIALOG (users_dialog)->vbox);
@@ -332,7 +332,7 @@ new_folder_response (EMFolderSelector *emfs, int response, EMFolderTreeModel *mo
 	gtk_window_resize (GTK_WINDOW (users_dialog), 350, 300);
 	gtk_widget_show(users_dialog);
 	g_signal_connect (users_dialog, "response", G_CALLBACK (users_dialog_response), ssi);
-	
+
 	camel_object_unref (store);
 	return ;
 
@@ -342,39 +342,39 @@ static EPopupItem popup_items[] = {
 { E_POPUP_ITEM, "20.emc.001", N_("New _Shared Folder..."), create_shared_folder, NULL, "folder-new", 0, EM_POPUP_FOLDER_INFERIORS }
 };
 
-static void 
+static void
 popup_free (EPopup *ep, GSList *items, void *data)
 {
 g_slist_free (items);
 }
 
-void 
+void
 org_gnome_create_option(EPlugin *ep, EMPopupTargetFolder *t)
 {
 	GSList *menus = NULL;
 	int i = 0;
 	static int first = 0;
-	
+
 
 	if (! g_strrstr (t->uri, "groupwise://"))
 		return ;
-	
+
 	/* for translation*/
 	if (!first) {
 		popup_items[0].label =  _(popup_items[0].label);
-	
+
 	}
-	
+
 	first++;
-	
+
 	for (i = 0; i < sizeof (popup_items) / sizeof (popup_items[0]); i++)
 		menus = g_slist_prepend (menus, &popup_items[i]);
-	
+
 	e_popup_add_items (t->target.popup, menus, NULL, popup_free, NULL);
-       	
+
 }
-	
-static void 
+
+static void
 create_shared_folder(EPopup *ep, EPopupItem *p, void *data)
 {
 
@@ -382,7 +382,7 @@ create_shared_folder(EPopup *ep, EPopupItem *p, void *data)
 	EMFolderTree *folder_tree;
 	GtkWidget *dialog ;
 	char *uri;
-	
+
 	model = mail_component_peek_tree_model (mail_component_peek ());
 	folder_tree = (EMFolderTree *) em_folder_tree_new_with_model (model);
 	dialog = em_folder_selector_create_new (folder_tree, 0, _("Create folder"), _("Specify where to create the folder:"));
@@ -392,7 +392,7 @@ create_shared_folder(EPopup *ep, EPopupItem *p, void *data)
 	g_signal_connect (dialog, "response", G_CALLBACK (new_folder_response), model);
 	gtk_window_set_title (GTK_WINDOW (dialog), "New Shared Folder" );
 	gtk_widget_show(dialog);
-	
+
 }
 
 GtkWidget *
@@ -407,26 +407,26 @@ org_gnome_shared_folder_factory (EPlugin *ep, EConfigHookItemFactoryData *hook_d
 	ShareFolder *sharing_tab;
 	EMConfigTargetFolder *target=  (EMConfigTargetFolder *)hook_data->config->target;
 	CamelFolder *folder = target->folder;
-	
+
 	folder_name = g_strdup (folder->full_name);
 	folderuri = g_strdup(target->uri);
-	if (folderuri && folder_name) 
+	if (folderuri && folder_name)
 		account = g_strrstr(folderuri, "groupwise");
 	else
 		return NULL;
 
 	 /* This is kind of bad..but we don't have types for all these folders.*/
 
-	if ( !( strcmp (folder_name, "Mailbox") 
-	     && strcmp (folder_name, "Calendar") 
-	     && strcmp (folder_name, "Contacts") 
-	     && strcmp (folder_name, "Documents") 
-	     && strcmp (folder_name, "Authored") 
-	     && strcmp (folder_name, "Default Library") 
-	     && strcmp (folder_name, "Work In Progress") 
-	     && strcmp (folder_name, "Cabinet") 
-	     && strcmp (folder_name, "Sent Items") 
-	     && strcmp (folder_name, "Trash") 
+	if ( !( strcmp (folder_name, "Mailbox")
+	     && strcmp (folder_name, "Calendar")
+	     && strcmp (folder_name, "Contacts")
+	     && strcmp (folder_name, "Documents")
+	     && strcmp (folder_name, "Authored")
+	     && strcmp (folder_name, "Default Library")
+	     && strcmp (folder_name, "Work In Progress")
+	     && strcmp (folder_name, "Cabinet")
+	     && strcmp (folder_name, "Sent Items")
+	     && strcmp (folder_name, "Trash")
 	     && strcmp (folder_name, "Checklist"))) {
 
 		g_free (folderuri);
@@ -434,19 +434,19 @@ org_gnome_shared_folder_factory (EPlugin *ep, EConfigHookItemFactoryData *hook_d
 	}
 
 	if (account) {
-		CamelStore *store = folder->parent_store;	
-		cnc = get_cnc (store);	
-	
-		if (E_IS_GW_CONNECTION (cnc)) 
+		CamelStore *store = folder->parent_store;
+		cnc = get_cnc (store);
+
+		if (E_IS_GW_CONNECTION (cnc))
 			id = get_container_id (cnc, folder_name);
 		else
 			g_warning("Could not Connnect\n");
-		
+
 		if (cnc && id)
 			sharing_tab = share_folder_new (cnc, id);
-		else 
+		else
 			return NULL;
-		
+
 		gtk_notebook_append_page((GtkNotebook *) hook_data->parent, (GtkWidget *) sharing_tab->vbox, gtk_label_new_with_mnemonic N_("Sharing"));
 		common = sharing_tab;
 		g_free (folderuri);
@@ -455,7 +455,7 @@ org_gnome_shared_folder_factory (EPlugin *ep, EConfigHookItemFactoryData *hook_d
 		return NULL;
 }
 
-EGwConnection * 
+EGwConnection *
 get_cnc (CamelStore *store)
 {
 		EGwConnection *cnc;
@@ -463,7 +463,7 @@ get_cnc (CamelStore *store)
 		char *use_ssl;
 		CamelService *service;
 		CamelURL *url;
-		
+
 		if (!store)
 			return  NULL;
 
@@ -481,7 +481,7 @@ get_cnc (CamelStore *store)
 			port = g_strdup (property_value);
 
 		if (use_ssl && !g_str_equal (use_ssl, "never"))
-			uri = g_strconcat ("https://", server_name, ":", port, "/soap", NULL);	
+			uri = g_strconcat ("https://", server_name, ":", port, "/soap", NULL);
 		else
 			uri = g_strconcat ("http://", server_name, ":", port, "/soap", NULL);
 
@@ -501,7 +501,7 @@ get_cnc (CamelStore *store)
 gchar *
 get_container_id(EGwConnection *cnc, gchar *fname)
 {
-	GList *container_list = NULL;	
+	GList *container_list = NULL;
 	gchar *id = NULL;
 	gchar *name;
 	gchar **names;
@@ -511,7 +511,7 @@ get_container_id(EGwConnection *cnc, gchar *fname)
 	if(names){
 		while (names [parts])
 			parts++;
-		fname = names[i]; 
+		fname = names[i];
 	}
 
 	/* get list of containers */
diff --git a/plugins/groupwise-features/share-folder.c b/plugins/groupwise-features/share-folder.c
index 104da0fd60..b6982c520d 100644
--- a/plugins/groupwise-features/share-folder.c
+++ b/plugins/groupwise-features/share-folder.c
@@ -114,7 +114,7 @@ share_folder_finalise (GObject *obj)
 {
 	ShareFolder *sf = (ShareFolder *) obj;
 	g_object_unref (sf->xml);
-	free_all(sf);	
+	free_all(sf);
 	G_OBJECT_CLASS (parent_class)->finalize (obj);
 }
 
@@ -123,7 +123,7 @@ share_folder_destroy (GtkObject *obj)
 {
 
 	ShareFolder *sf = (ShareFolder *) obj;
-	free_all (sf);	
+	free_all (sf);
 	GTK_OBJECT_CLASS (parent_class)->destroy (obj);
 }
 
@@ -161,16 +161,16 @@ free_node(SharedUser *usr)
 	return ;
 }
 
-static SharedUser * 
+static SharedUser *
 find_node(GList *list, gchar *email)
 {
 	SharedUser *user = NULL;
-	EShUsers *usr = NULL; 
+	EShUsers *usr = NULL;
 	GList *tmp;
 	gint i ;
-	
+
 	if(list){
-		tmp = g_list_first(list); 
+		tmp = g_list_first(list);
 		for(i=0; tmp  ; i++)
 		{
 			user = tmp->data;
@@ -184,7 +184,7 @@ find_node(GList *list, gchar *email)
 	return NULL;
 }
 
-static void 
+static void
 free_all (ShareFolder *sf)
 {
 	if (sf->users_list){
@@ -197,7 +197,7 @@ free_all (ShareFolder *sf)
 }
 
 
-static void	
+static void
 display_container (EGwContainer *container , ShareFolder *sf)
 {
 	gboolean byme = FALSE;
@@ -211,7 +211,7 @@ display_container (EGwContainer *container , ShareFolder *sf)
 	if(!(byme = e_gw_container_get_is_shared_by_me(container)))
 		tome = e_gw_container_get_is_shared_to_me(container);
 	if(byme || tome) {
-		e_gw_container_get_user_list (sf->gcontainer, &user_list);	
+		e_gw_container_get_user_list (sf->gcontainer, &user_list);
 		sf->users = g_list_length (user_list);
 		if(sf->users != 0) {
 			sf->is_shared = TRUE;
@@ -229,20 +229,20 @@ display_container (EGwContainer *container , ShareFolder *sf)
 				email = g_strdup (e_gw_container_get_owner (sf->gcontainer));
 				msg = g_strconcat (email, "  (Owner)", NULL);
 				gtk_list_store_append (GTK_LIST_STORE (sf->model), &(sf->iter));
-				gtk_list_store_set (GTK_LIST_STORE (sf->model), &(sf->iter), 0, msg, -1);			 
+				gtk_list_store_set (GTK_LIST_STORE (sf->model), &(sf->iter), 0, msg, -1);
 				g_free (msg);
 				g_free (email);
 
 			} else
 				gtk_widget_set_sensitive (GTK_WIDGET (sf->table), TRUE);
-			/* I populate the list and set flags to 0 for the existing users*/ 
+			/* I populate the list and set flags to 0 for the existing users*/
 			while (user_list) {
 				SharedUser *shared_user = g_new0 (SharedUser , 1);
 				gboolean add, edit, delete;
 				add = edit = delete = FALSE;
 				user = user_list->data;
 				shared_user->user_node = user;
-				shared_user->flag = 0;	
+				shared_user->flag = 0;
 				email = g_strdup (user->email);
 				if (user->rights & 0x1)
 					add = TRUE;
@@ -253,7 +253,7 @@ display_container (EGwContainer *container , ShareFolder *sf)
 
 				msg = g_strdup_printf ("%s", email);
 				gtk_list_store_append (GTK_LIST_STORE (sf->model), &(sf->iter));
-				gtk_list_store_set (GTK_LIST_STORE (sf->model), &(sf->iter), 0, msg, 1, add, 2, edit, 3, delete, -1);			 
+				gtk_list_store_set (GTK_LIST_STORE (sf->model), &(sf->iter), 0, msg, 1, add, 2, edit, 3, delete, -1);
 				sf->users_list = g_list_append (sf->users_list, shared_user);
 				g_free (msg);
 				g_free (email);
@@ -301,7 +301,7 @@ get_container_list (ShareFolder *sf)
 					g_free (id_unshared);
 					break;
 				}
-			
+
 				g_free (id_shared);
 				g_free (id_unshared);
 			}
@@ -312,15 +312,15 @@ get_container_list (ShareFolder *sf)
 }
 
 
-static void 
+static void
 shared_clicked (GtkRadioButton *button, ShareFolder *sf)
 {
 
 	gtk_widget_set_sensitive (GTK_WIDGET (sf->table) ,TRUE);
-	sf->flag_for_ok = 0;        
+	sf->flag_for_ok = 0;
 }
 
-static void 
+static void
 not_shared_clicked (GtkRadioButton *button, ShareFolder *sf)
 {
 	if (!sf->is_shared) {
@@ -354,9 +354,9 @@ add_clicked(GtkButton *button, ShareFolder *sf)
 	for (; tmp != NULL; tmp = g_list_next (tmp)) {
 		email = e_destination_get_email (tmp->data);
 		/* You can't share a folder with yourself*/
-		if (g_strrstr (email, "@") == NULL || (!g_ascii_strcasecmp (email , self_email))) 
+		if (g_strrstr (email, "@") == NULL || (!g_ascii_strcasecmp (email , self_email)))
 			e_error_run (NULL, "org.gnome.evolution.mail_shared_folder:invalid-user",email ,NULL);
-		else {	
+		else {
 			if (!g_ascii_strcasecmp (email, "" )) {
 				e_error_run (NULL, "org.gnome.evolution.mail_shared_folder:no-user",NULL);
 
@@ -367,7 +367,7 @@ add_clicked(GtkButton *button, ShareFolder *sf)
 			/*check whether already exists*/
 			if (sf->users_list && email){
 				new_user = find_node (sf->users_list, (gchar *)email);
-				if (new_user) 
+				if (new_user)
 					return ;
 
 			}
@@ -379,8 +379,8 @@ add_clicked(GtkButton *button, ShareFolder *sf)
 			new_user->flag = 1;
 			msg = g_strdup (email);
 			gtk_list_store_append (GTK_LIST_STORE (sf->model), &(sf->iter));
-			
-		/*  have to add code for rights*/	
+
+		/*  have to add code for rights*/
 			gtk_list_store_set (GTK_LIST_STORE (sf->model), &(sf->iter), 0, msg, -1);
 			g_free(msg);
 			sf->users_list = g_list_append (sf->users_list, new_user);
@@ -400,9 +400,9 @@ remove_clicked(GtkButton *button, ShareFolder *sf)
 
 	gtk_tree_model_get ((GtkTreeModel *) sf->model, &(sf->iter), 0, &email, -1);
 	usr = find_node (sf->users_list, email);
-	if (usr->flag & 0x1) {	
+	if (usr->flag & 0x1) {
 		sf->users_list = g_list_remove (sf->users_list, usr);
-		free_node(usr);		
+		free_node(usr);
 	} else {
 		usr->flag = 0;
 		usr->flag |= 0x4;
@@ -413,10 +413,10 @@ remove_clicked(GtkButton *button, ShareFolder *sf)
 	sf->flag_for_ok = 1;
 }
 
-void 
+void
 share_folder (ShareFolder *sf)
 {
-	
+
 	GList *new_list = NULL;
 	GList *update_list = NULL;
 	GList *remove_list = NULL;
@@ -425,13 +425,13 @@ share_folder (ShareFolder *sf)
 
 	for (node = sf->users_list; node; node = node->next)
 	{
-		user = node->data;	
+		user = node->data;
 		if (user->flag & 0x1)
-			new_list = g_list_append (new_list, user->user_node);	
+			new_list = g_list_append (new_list, user->user_node);
 		else if (user->flag & 0x2)
-			update_list = g_list_append (update_list, user->user_node);	
+			update_list = g_list_append (update_list, user->user_node);
 		else if (user->flag & 0x4) {
-			remove_list = g_list_append (remove_list, user->user_node);	
+			remove_list = g_list_append (remove_list, user->user_node);
 		}
 	}
 
@@ -460,7 +460,7 @@ share_folder (ShareFolder *sf)
 
 			} else {
 				g_warning("Container is Null");
-			}	
+			}
 
 
 		} else {
@@ -473,7 +473,7 @@ share_folder (ShareFolder *sf)
 
 				if (e_gw_connection_share_folder (sf->cnc, sf->container_id, update_list, sf->sub, sf->mesg, 2) == E_GW_CONNECTION_STATUS_OK);
 			}
-		}  
+		}
 		if (remove_list) {
 			sf->sub = "Shared Folder removed";
 			if (e_gw_connection_share_folder (sf->cnc, sf->container_id, remove_list, sf->sub, sf->mesg, 1) == E_GW_CONNECTION_STATUS_OK);
@@ -507,7 +507,7 @@ not_ok_clicked(GtkButton *button, ShareFolder *sf)
 
 }
 
-static void 
+static void
 not_cancel_clicked(GtkButton *button, GtkWidget *window)
 {
 	gtk_widget_destroy(window);
@@ -546,7 +546,7 @@ notification_clicked(GtkButton *button, ShareFolder *sf)
 	gtk_widget_reparent (GTK_WIDGET (sf->window), GTK_WIDGET (sf->vbox));
 	gtk_window_set_transient_for ((GtkWindow *)sf->window, GTK_WINDOW(sf->vbox));
 	gtk_window_set_modal ((GtkWindow *)sf->window, TRUE);
-	gtk_window_present ((GtkWindow *)sf->window); 
+	gtk_window_present ((GtkWindow *)sf->window);
 	gtk_widget_show_all (sf->window);
 }
 
@@ -572,7 +572,7 @@ address_button_clicked_cb (GtkButton *button, gpointer data)
 	gtk_widget_show (GTK_WIDGET (name_selector_dialog));
 }
 
-	static void 
+	static void
 user_selected(GtkTreeSelection *selection, ShareFolder *sf)
 {
 	GtkTreeModel *model;
@@ -581,7 +581,7 @@ user_selected(GtkTreeSelection *selection, ShareFolder *sf)
 	if (gtk_tree_selection_get_selected (selection, &model, &sf->iter))
 		gtk_widget_set_sensitive (GTK_WIDGET (sf->remove), TRUE);
 }
-	
+
 static void
 add_right_clicked (GtkCellRenderer *renderer, gchar *arg1, ShareFolder *sf )
 {
@@ -603,13 +603,13 @@ add_right_clicked (GtkCellRenderer *renderer, gchar *arg1, ShareFolder *sf )
 		return;
 	}
 	if(! usr->flag)  /* if user was already existing one change the flag to update*/
-		usr->flag = usr->flag | 0x2;	
+		usr->flag = usr->flag | 0x2;
 	user = usr->user_node;
 	if (!right) {
-		user->rights |= 0x1;	
-		gtk_list_store_set (GTK_LIST_STORE (sf->model), &(sf->iter), 1, TRUE, -1);		
+		user->rights |= 0x1;
+		gtk_list_store_set (GTK_LIST_STORE (sf->model), &(sf->iter), 1, TRUE, -1);
 	} else {
-		user->rights &= 0x6;	
+		user->rights &= 0x6;
 		gtk_list_store_set (GTK_LIST_STORE (sf->model), &(sf->iter), 1, FALSE, -1);
 	}
 	gtk_tree_path_free (path);
@@ -636,14 +636,14 @@ edit_right_clicked(GtkCellRenderer *renderer, gchar *arg1, ShareFolder *sf )
 		return;
 	}
 	if(! usr->flag)  /* if user was already existing one change the flag to update*/
-		usr->flag = usr->flag | 0x2;	
+		usr->flag = usr->flag | 0x2;
 	user = usr->user_node;
 
 	if (!right) {
-		user->rights |= 0x2;	
-		gtk_list_store_set (GTK_LIST_STORE (sf->model), &(sf->iter), 2, TRUE, -1);		
+		user->rights |= 0x2;
+		gtk_list_store_set (GTK_LIST_STORE (sf->model), &(sf->iter), 2, TRUE, -1);
 	} else {
-		user->rights &= 0x5;	
+		user->rights &= 0x5;
 		gtk_list_store_set (GTK_LIST_STORE (sf->model), &(sf->iter), 2, FALSE, -1);
 	}
 	gtk_tree_path_free (path);
@@ -670,19 +670,19 @@ delete_right_clicked(GtkCellRenderer *renderer, gchar *arg1, ShareFolder *sf )
 		return;
 	}
 	if(! usr->flag)  /* if user was already existing one change the flag to update*/
-		usr->flag = usr->flag | 0x2;	
+		usr->flag = usr->flag | 0x2;
 	user = usr->user_node;
 	if (!right) {
-		user->rights |= 0x4;	
-		gtk_list_store_set (GTK_LIST_STORE (sf->model), &(sf->iter), 3, TRUE, -1);		
+		user->rights |= 0x4;
+		gtk_list_store_set (GTK_LIST_STORE (sf->model), &(sf->iter), 3, TRUE, -1);
 	} else {
-		user->rights &= 0x3;	
+		user->rights &= 0x3;
 		gtk_list_store_set (GTK_LIST_STORE (sf->model), &(sf->iter), 3, FALSE, -1);
 	}
 	gtk_tree_path_free (path);
 }
 
-static void 
+static void
 share_folder_construct (ShareFolder *sf)
 {
 	GladeXML *xml;
@@ -698,7 +698,7 @@ share_folder_construct (ShareFolder *sf)
 	xml = glade_xml_new (gladefile, ROOTNODE, NULL);
 	g_free (gladefile);
 
-	sf->xml =xml; 
+	sf->xml =xml;
 
 	if (!sf->xml) {
 		g_warning ("could not get xml");
@@ -766,7 +766,7 @@ share_folder_construct (ShareFolder *sf)
 	gtk_tree_view_append_column (GTK_TREE_VIEW (sf->user_list),
 			GTK_TREE_VIEW_COLUMN (sf->column));
 	g_signal_connect (sf->cell, "toggled", G_CALLBACK (add_right_clicked), sf);
-	
+
 	sf->cell = gtk_cell_renderer_toggle_new ();
 	sf->column = gtk_tree_view_column_new_with_attributes (_("Modify"), sf->cell, "active", 2, NULL);
 	gtk_tree_view_append_column (GTK_TREE_VIEW (sf->user_list),
diff --git a/plugins/groupwise-features/share-folder.h b/plugins/groupwise-features/share-folder.h
index 5baeb6ac09..76516ac778 100644
--- a/plugins/groupwise-features/share-folder.h
+++ b/plugins/groupwise-features/share-folder.h
@@ -60,11 +60,11 @@ struct _GtkVBox;
 
 struct _ShareFolder {
 	GtkVBox parent_object;
-	
+
 	struct _GladeXML *xml;
-	
+
 	/* General tab */
-	
+
 	/* Default Behavior */
 	struct _GtkTreeView *user_list;
 	struct _GtkTextView *message;
@@ -83,7 +83,7 @@ struct _ShareFolder {
 	struct _GtkVBox  *vbox;
 	struct _GtkVBox  *table;
 	struct _GtkWidget *window;
-	
+
 	GList *users_list;
 	EGwContainer *gcontainer;
 	gint users;
@@ -99,12 +99,12 @@ struct _ShareFolder {
 	GList *container_list;
 	GtkTreeIter iter;
 	ENameSelector *name_selector;
-	
+
 };
 
 struct _ShareFolderClass {
 	GtkVBoxClass parent_class;
-	
+
 };
 
 GType share_folderget_type (void);
diff --git a/plugins/groupwise-features/status-track.c b/plugins/groupwise-features/status-track.c
index 0db1aab090..baf3f243cf 100644
--- a/plugins/groupwise-features/status-track.c
+++ b/plugins/groupwise-features/status-track.c
@@ -58,7 +58,7 @@ format_date (const char * value)
 	return str;
 }
 
-static void 
+static void
 track_status (EPopup *ep, EPopupItem *item, void *data)
 {
 	EMPopupTargetSelect *t = (EMPopupTargetSelect *)data;
@@ -97,7 +97,7 @@ track_status (EPopup *ep, EPopupItem *item, void *data)
 		/* No need to make any call if this header is not available.
 		This is the server side identifier for sent-items */
 		return ;
-	} 
+	}
 
 	/*Create the dialog*/
 	d = (GtkDialog *) gtk_dialog_new ();
@@ -249,7 +249,7 @@ static EPopupItem popup_items[] = {
 { E_POPUP_ITEM, "20.emfv.02", N_("Track Message Status..."), track_status, NULL, NULL, 0, EM_POPUP_SELECT_ONE|EM_FOLDER_VIEW_SELECT_LISTONLY}
 };
 
-static void 
+static void
 popup_free (EPopup *ep, GSList *items, void *data)
 {
 	g_slist_free (items);
@@ -258,24 +258,24 @@ popup_free (EPopup *ep, GSList *items, void *data)
 void org_gnome_track_status (void *ep, EMPopupTargetSelect *t)
 {
 	GSList *menus = NULL;
-	
+
 	int i = 0;
 	static int first = 0;
 
 	if (! g_strrstr (t->uri, "groupwise://") || g_ascii_strncasecmp ((t->folder)->full_name, "Sent Items", 10))
 		return;
-	
+
 	/* for translation*/
 	if (!first) {
 		popup_items[0].label =  _(popup_items[0].label);
-	
+
 	}
-	
+
 	first++;
-	
+
 	for (i = 0; i < sizeof (popup_items) / sizeof (popup_items[0]); i++)
 		menus = g_slist_prepend (menus, &popup_items[i]);
-	
+
 	e_popup_add_items (t->target.popup, menus, NULL, popup_free, t);
-       	
+
 }
diff --git a/plugins/hula-account-setup/camel-hula-listener.c b/plugins/hula-account-setup/camel-hula-listener.c
index df28b7e34a..4dbcb44a94 100644
--- a/plugins/hula-account-setup/camel-hula-listener.c
+++ b/plugins/hula-account-setup/camel-hula-listener.c
@@ -1,7 +1,7 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
  * Authors :
- *  
+ *
  *  Harish Krishnaswamy <kharish@novell.com>
  *
  * Copyright 2005, Novell, Inc.
@@ -38,7 +38,7 @@ static 	GList *hula_accounts = NULL;
 struct _CamelHulaListenerPrivate {
 	GConfClient *gconf_client;
 	/* we get notification about mail account changes form this object */
-	EAccountList *account_list;                  
+	EAccountList *account_list;
 };
 
 struct _HulaAccountInfo {
@@ -61,37 +61,37 @@ static void dispose (GObject *object);
 static void finalize (GObject *object);
 
 
-static void 
+static void
 camel_hula_listener_class_init (CamelHulaListenerClass *class)
 {
 	GObjectClass *object_class;
-	
+
 	parent_class =  g_type_class_ref (PARENT_TYPE);
 	object_class = G_OBJECT_CLASS (class);
-	
+
 	/* virtual method override */
 	object_class->dispose = dispose;
 	object_class->finalize = finalize;
 }
 
-static void 
+static void
 camel_hula_listener_init (CamelHulaListener *config_listener,  CamelHulaListenerClass *class)
 {
-	config_listener->priv = g_new0 (CamelHulaListenerPrivate, 1);	
+	config_listener->priv = g_new0 (CamelHulaListenerPrivate, 1);
 }
 
-static void 
+static void
 dispose (GObject *object)
 {
 	CamelHulaListener *config_listener = CAMEL_HULA_LISTENER (object);
-	
+
 	g_object_unref (config_listener->priv->gconf_client);
 	g_object_unref (config_listener->priv->account_list);
 
 	G_OBJECT_CLASS (parent_class)->dispose (object);
 }
 
-static void 
+static void
 finalize (GObject *object)
 {
 	CamelHulaListener *config_listener = CAMEL_HULA_LISTENER (object);
@@ -103,18 +103,18 @@ finalize (GObject *object)
 	}
 
 	for ( list = g_list_first (hula_accounts); list ; list = g_list_next (list) ) {
-	       
+
 		info = (HulaAccountInfo *) (list->data);
 
 		if (info) {
-			
+
 			g_free (info->uid);
 			g_free (info->name);
 			g_free (info->source_url);
 			g_free (info);
 		}
 	}
-	
+
 	g_list_free (hula_accounts);
 
 	G_OBJECT_CLASS (parent_class)->finalize (object);
@@ -144,13 +144,13 @@ is_hula_caldav_account (EAccount *account)
 
 /* looks up for an existing hula account info in the hula_accounts list based on uid */
 
-static HulaAccountInfo* 
+static HulaAccountInfo*
 lookup_account_info (const char *key)
 {
 	GList *list;
         HulaAccountInfo *info ;
 	int found = 0;
-                                                                      
+
         if (!key)
                 return NULL;
 
@@ -183,11 +183,11 @@ add_esource (const char *conf_key, const char *group_name,  const char *source_n
 	char *relative_uri;
 	const char *cal_port = "8081";
 	/* const char *use_ssl = ""; */
-	/* offline_sync to come soon */ 
-	
+	/* offline_sync to come soon */
+
 	/* TODO use_ssl = camel_url_get_param (url, "use_ssl"); */
 
-	client = gconf_client_get_default();	
+	client = gconf_client_get_default();
 	if (!client) {
 		g_message ("could not get a valid gconf client\n");
 		return;
@@ -198,7 +198,7 @@ add_esource (const char *conf_key, const char *group_name,  const char *source_n
 	result = e_source_list_add_group (source_list, group, -1);
 
 	if (result == FALSE) {
-		g_warning ("Could not add Hula source group!");	
+		g_warning ("Could not add Hula source group!");
 	} else {
 		e_source_list_sync (source_list, NULL);
 	}
@@ -207,16 +207,16 @@ add_esource (const char *conf_key, const char *group_name,  const char *source_n
 
 	relative_uri = g_strdup_printf ("%s@%s:%s/dav/%s/calendar/Personal", url->user, url->host, cal_port, url->user);
 	g_message ("Relative uri is %s\n", relative_uri);
-	
+
 	source = e_source_new (source_name, relative_uri);
 	/* e_source_set_property (source, "port", camel_url_get_param (url,
-	 * "port")); 
+	 * "port"));
 	e_source_set_property (source, "auth-domain", "Hula");
 	e_source_set_property (source, "use_ssl", use_ssl); */
 	e_source_group_add_source (group, source, -1);
 	e_source_list_sync (source_list, NULL);
 
-	if (!strcmp (conf_key, CALENDAR_SOURCES)) 
+	if (!strcmp (conf_key, CALENDAR_SOURCES))
 		source_selection_key = SELECTED_CALENDARS;
 	else source_selection_key = NULL;
 	if (source_selection_key) {
@@ -228,7 +228,7 @@ add_esource (const char *conf_key, const char *group_name,  const char *source_n
 			g_free (temp->data);
 		g_slist_free (ids);
 	}
-	
+
 	g_object_unref (source);
 	g_object_unref (group);
 	g_object_unref (source_list);
@@ -237,7 +237,7 @@ add_esource (const char *conf_key, const char *group_name,  const char *source_n
 }
 
 
-static void 
+static void
 remove_esource (const char *conf_key, const char *group_name, char* source_name, const char* relative_uri)
 {
 	ESourceList *list;
@@ -247,20 +247,20 @@ remove_esource (const char *conf_key, const char *group_name, char* source_name,
 	GSList *ids;
 	GSList *node_tobe_deleted;
 	char *source_selection_key;
-                                                                                                                             
+
         client = gconf_client_get_default();
         list = e_source_list_new_for_gconf (client, conf_key);
-	groups = e_source_list_peek_groups (list); 
-	
+	groups = e_source_list_peek_groups (list);
+
 	found_group = FALSE;
-	
+
 	for ( ; groups != NULL && !found_group; groups = g_slist_next (groups)) {
 		ESourceGroup *group = E_SOURCE_GROUP (groups->data);
-		
-		if (strcmp (e_source_group_peek_name (group), group_name) == 0 && 
+
+		if (strcmp (e_source_group_peek_name (group), group_name) == 0 &&
 		   strcmp (e_source_group_peek_base_uri (group), HULA_CALDAV_URI_PREFIX ) == 0) {
 			GSList *sources = e_source_group_peek_sources (group);
-			
+
 			for( ; sources != NULL; sources = g_slist_next (sources)) {
 				ESource *source = E_SOURCE (sources->data);
 				const gchar *source_relative_uri;
@@ -269,43 +269,43 @@ remove_esource (const char *conf_key, const char *group_name, char* source_name,
 				if (source_relative_uri == NULL)
 					continue;
 				if (strcmp (source_relative_uri, relative_uri) == 0) {
-				
-					if (!strcmp (conf_key, CALENDAR_SOURCES)) 
+
+					if (!strcmp (conf_key, CALENDAR_SOURCES))
 						source_selection_key = SELECTED_CALENDARS;
 					else source_selection_key = NULL;
 					if (source_selection_key) {
-						ids = gconf_client_get_list (client, source_selection_key , 
+						ids = gconf_client_get_list (client, source_selection_key ,
 									     GCONF_VALUE_STRING, NULL);
 						node_tobe_deleted = g_slist_find_custom (ids, e_source_peek_uid (source), (GCompareFunc) strcmp);
 						if (node_tobe_deleted) {
 							g_free (node_tobe_deleted->data);
 							ids = g_slist_delete_link (ids, node_tobe_deleted);
 						}
-						gconf_client_set_list (client,  source_selection_key, 
+						gconf_client_set_list (client,  source_selection_key,
 								       GCONF_VALUE_STRING, ids, NULL);
 
 					}
 					e_source_list_remove_group (list, group);
-					e_source_list_sync (list, NULL);	
+					e_source_list_sync (list, NULL);
 					found_group = TRUE;
 					break;
-					
+
 				}
 			}
 
 		}
-		
-	      
+
+
 	}
 
 	g_object_unref (list);
-	g_object_unref (client);		
-	
+	g_object_unref (client);
+
 }
 
 /* looks for e-source with the same info as old_account_info and changes its values to the values passed in */
 
-static void 
+static void
 modify_esource (const char* conf_key, HulaAccountInfo *old_account_info, const char* new_group_name, CamelURL *new_url)
 {
 	ESourceList *list;
@@ -314,7 +314,7 @@ modify_esource (const char* conf_key, HulaAccountInfo *old_account_info, const c
 	CamelURL *url;
 	gboolean found_group;
       	GConfClient* client;
-	
+
 	url = camel_url_new (old_account_info->source_url, NULL);
 	if (!url->host || strlen (url->host) ==0)
 		return;
@@ -322,18 +322,18 @@ modify_esource (const char* conf_key, HulaAccountInfo *old_account_info, const c
 	old_relative_uri = g_strdup_printf ("%s@%s:%d/dav/%s/calendar/Personal", url->user, url->host, url->port, url->user);
 	client = gconf_client_get_default ();
         list = e_source_list_new_for_gconf (client, conf_key);
-	groups = e_source_list_peek_groups (list); 
+	groups = e_source_list_peek_groups (list);
 
 	found_group = FALSE;
 
 	for ( ; groups != NULL &&  !found_group; groups = g_slist_next (groups)) {
 
 		ESourceGroup *group = E_SOURCE_GROUP (groups->data);
-		
-		if (strcmp (e_source_group_peek_name (group), old_account_info->name) == 0 && 
+
+		if (strcmp (e_source_group_peek_name (group), old_account_info->name) == 0 &&
 		    strcmp (e_source_group_peek_base_uri (group), HULA_CALDAV_URI_PREFIX) == 0) {
 			GSList *sources = e_source_group_peek_sources (group);
-			
+
 			for ( ; sources != NULL; sources = g_slist_next (sources)) {
 				ESource *source = E_SOURCE (sources->data);
 				const gchar *source_relative_uri;
@@ -364,28 +364,28 @@ modify_esource (const char* conf_key, HulaAccountInfo *old_account_info, const c
 	camel_url_free (url);
 	g_free (old_relative_uri);
 
-	
+
 }
 /* add sources for calendar if the account added is HULA account
    adds the new account info to  HULA accounts list */
 
-static void 
+static void
 add_calendar_sources (HulaAccountInfo *info)
 {
 	CamelURL *url;
-	
+
 	url = camel_url_new (info->source_url, NULL);
 	add_esource ("/apps/evolution/calendar/sources", info->name, _("Calendar"), url);
-	
+
 	camel_url_free (url);
 
 
 }
 
-/* removes calendar  sources if the account removed is HULA account 
+/* removes calendar  sources if the account removed is HULA account
    removes the the account info from HULA_account list */
 
-static void 
+static void
 remove_calendar_sources (HulaAccountInfo *info)
 {
 	CamelURL *url;
@@ -395,7 +395,7 @@ remove_calendar_sources (HulaAccountInfo *info)
 
 	url = camel_url_new (info->source_url, NULL);
 
-	address = url->host; 
+	address = url->host;
 	if (!address || strlen (address) ==0)
 		return;
 
@@ -410,7 +410,7 @@ remove_calendar_sources (HulaAccountInfo *info)
 
 }
 
-static void 
+static void
 account_added (EAccountList *account_listener, EAccount *account)
 {
 
@@ -420,7 +420,7 @@ account_added (EAccountList *account_listener, EAccount *account)
 
 	if (!is_hula_account (account) || !is_hula_caldav_account (account))
 		return;
-	
+
 	info = g_new0 (HulaAccountInfo, 1);
 	info->uid = g_strdup (account->uid);
 	info->name = g_strdup (account->name);
@@ -428,26 +428,26 @@ account_added (EAccountList *account_listener, EAccount *account)
 	if (account->parent_uid) {
 		parent = (EAccount *)e_account_list_find (account_listener, E_ACCOUNT_FIND_UID, account->parent_uid);
 
-		if (!parent) 
+		if (!parent)
 			return;
 
-		parent_url = camel_url_new (e_account_get_string(parent, E_ACCOUNT_SOURCE_URL), NULL);	
-	} else 
+		parent_url = camel_url_new (e_account_get_string(parent, E_ACCOUNT_SOURCE_URL), NULL);
+	} else
 		add_calendar_sources (info);
-	
+
 	hula_accounts = g_list_append (hula_accounts, info);
 }
 
-static void 
+static void
 account_removed (EAccountList *account_listener, EAccount *account)
 {
        	HulaAccountInfo *info;
-	
+
 	if (!is_hula_account (account) || !is_hula_caldav_account (account))
 		return;
-	
+
 	info = lookup_account_info (account->uid);
-	if (info == NULL) 
+	if (info == NULL)
 		return;
 
 	remove_calendar_sources (info);
@@ -468,13 +468,13 @@ account_changed (EAccountList *account_listener, EAccount *account)
 	HulaAccountInfo *existing_account_info;
 	const char *old_use_ssl, *new_use_ssl;
 	const char *old_address, *new_address;
-	
+
 	is_hula = is_hula_account (account);
 	if (is_hula == FALSE)
 		is_hula = is_hula_caldav_account (account);
-	
+
 	existing_account_info = lookup_account_info (account->uid);
-       
+
 	if (existing_account_info == NULL && is_hula) {
 
 		if (!account->enabled)
@@ -492,21 +492,21 @@ account_changed (EAccountList *account_listener, EAccount *account)
 		g_free (existing_account_info->name);
 		g_free (existing_account_info->source_url);
 		g_free (existing_account_info);
-		
+
 	} else if ( existing_account_info != NULL && is_hula ) {
-		
+
 		if (!account->enabled) {
 			account_removed (account_listener, account);
 			return;
 		}
-		
+
 		/* some info of hula account is changed. update the sources with new info if required */
 		old_url = camel_url_new (existing_account_info->source_url, NULL);
-		old_address = old_url->host; 
+		old_address = old_url->host;
 		old_caldav_port = camel_url_get_param (old_url, "caldav_port");
 		old_use_ssl = camel_url_get_param (old_url, "use_ssl");
 		new_url = camel_url_new (account->source->url, NULL);
-		new_address = new_url->host; 
+		new_address = new_url->host;
 
 		if (!new_address || strlen (new_address) ==0)
 			return;
@@ -519,26 +519,26 @@ account_changed (EAccountList *account_listener, EAccount *account)
 		new_use_ssl = camel_url_get_param (new_url, "use_ssl");
 
 		if ((old_address && strcmp (old_address, new_address))
-		   ||  (old_caldav_port && strcmp (old_caldav_port, new_caldav_port)) 
-		   ||  strcmp (old_url->user, new_url->user) 
+		   ||  (old_caldav_port && strcmp (old_caldav_port, new_caldav_port))
+		   ||  strcmp (old_url->user, new_url->user)
 		   || strcmp (old_use_ssl, new_use_ssl)) {
-			
+
 			account_removed (account_listener, account);
 			account_added (account_listener, account);
 		} else if (strcmp (existing_account_info->name, account->name)) {
-			
+
 			modify_esource ("/apps/evolution/calendar/sources", existing_account_info, account->name, new_url);
-			
+
 		}
-		
+
 		g_free (existing_account_info->name);
 		g_free (existing_account_info->source_url);
 		existing_account_info->name = g_strdup (account->name);
 		existing_account_info->source_url = g_strdup (account->source->url);
 		camel_url_free (old_url);
 		camel_url_free (new_url);
-	}	
-} 
+	}
+}
 
 static void
 camel_hula_listener_construct (CamelHulaListener *config_listener)
@@ -546,27 +546,27 @@ camel_hula_listener_construct (CamelHulaListener *config_listener)
 	EIterator *iter;
 	EAccount *account;
 	HulaAccountInfo *info ;
-	
+
        	config_listener->priv->account_list = e_account_list_new (config_listener->priv->gconf_client);
 
 	for ( iter = e_list_get_iterator (E_LIST ( config_listener->priv->account_list) ) ; e_iterator_is_valid (iter); e_iterator_next (iter) ) {
-		
+
 		account = E_ACCOUNT (e_iterator_get (iter));
 
 		if ( is_hula_account (account) && account->enabled) {
-			
+
 		        info = g_new0 (HulaAccountInfo, 1);
 			info->uid = g_strdup (account->uid);
 			info->name = g_strdup (account->name);
 			info->source_url = g_strdup (account->source->url);
 			hula_accounts = g_list_append (hula_accounts, info);
-			
+
 		}
-			
+
 	}
 	g_signal_connect (config_listener->priv->account_list, "account_added", G_CALLBACK (account_added), NULL);
 	g_signal_connect (config_listener->priv->account_list, "account_changed", G_CALLBACK (account_changed), NULL);
-	g_signal_connect (config_listener->priv->account_list, "account_removed", G_CALLBACK (account_removed), NULL);    
+	g_signal_connect (config_listener->priv->account_list, "account_removed", G_CALLBACK (account_removed), NULL);
 }
 
 GType
@@ -595,10 +595,10 @@ CamelHulaListener*
 camel_hula_listener_new (void)
 {
 	CamelHulaListener *config_listener;
-       
+
 	config_listener = g_object_new (CAMEL_TYPE_HULA_LISTENER, NULL);
 	config_listener->priv->gconf_client = gconf_client_get_default();
-	
+
 	camel_hula_listener_construct (config_listener);
 
 	return config_listener;
diff --git a/plugins/hula-account-setup/camel-hula-listener.h b/plugins/hula-account-setup/camel-hula-listener.h
index 6bf5c900d1..5fc1d22fb9 100644
--- a/plugins/hula-account-setup/camel-hula-listener.h
+++ b/plugins/hula-account-setup/camel-hula-listener.h
@@ -1,7 +1,7 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
  * Authors :
- *  
+ *
  *  Harish Krishnaswamy <kharish@novell.com>
  *
  * Copyright 2005, Novell, Inc.
@@ -28,7 +28,7 @@
 #include<libedataserver/e-source.h>
 #include<libedataserver/e-source-list.h>
 #include <camel/camel-url.h>
-                         
+
 G_BEGIN_DECLS
 
 #define CAMEL_TYPE_HULA_LISTENER            (camel_hula_listener_get_type ())
@@ -42,12 +42,12 @@ typedef struct _CamelHulaListenerClass CamelHulaListenerClass;
 typedef struct _CamelHulaListenerPrivate CamelHulaListenerPrivate;
 struct _CamelHulaListener {
        GObject parent;
-                                                                                                                        
+
        CamelHulaListenerPrivate *priv;
 };
 
 struct _CamelHulaListenerClass {
-       GObjectClass parent_class;     
+       GObjectClass parent_class;
 };
 
 GType              camel_hula_listener_get_type (void);
diff --git a/plugins/hula-account-setup/hula-account-setup.c b/plugins/hula-account-setup/hula-account-setup.c
index 45475690c6..79440bafc9 100644
--- a/plugins/hula-account-setup/hula-account-setup.c
+++ b/plugins/hula-account-setup/hula-account-setup.c
@@ -11,10 +11,10 @@
  *  modify, merge, publish, distribute, sublicense, and/or sell copies
  *  of the Software, and to permit persons to whom the Software is
  *  furnished to do so, subject to the following conditions:
- *  
+ *
  *  The above copyright notice and this permission notice shall be
  *  included in all copies or substantial portions of the Software.
- *  
+ *
  *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
  *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
  *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
@@ -35,7 +35,7 @@ static CamelHulaListener *config_listener = NULL;
 int e_plugin_lib_enable (EPluginLib *ep, int enable);
 GtkWidget* org_gnome_evolution_hula_account_setup (struct _EPlugin *epl, struct _EConfigHookItemFactoryData *data);
 
-static void 
+static void
 free_hula_listener ( void )
 {
 	g_object_unref (config_listener);
@@ -45,7 +45,7 @@ int
 e_plugin_lib_enable (EPluginLib *ep, int enable)
 {
 	if (!config_listener) {
-		config_listener = camel_hula_listener_new ();	
+		config_listener = camel_hula_listener_new ();
 	 	g_atexit ( free_hula_listener );
 	}
 
diff --git a/plugins/imap-features/imap-headers.c b/plugins/imap-features/imap-headers.c
index 6c65a61153..4b5c28912f 100644
--- a/plugins/imap-features/imap-headers.c
+++ b/plugins/imap-features/imap-headers.c
@@ -1,7 +1,7 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
  *  Author: Sankar P <psankar@novell.com>
- *   
+ *
  *  Copyright 2004 Novell, Inc. (www.novell.com)
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -67,13 +67,13 @@ void imap_headers_abort (EPlugin *efp, EConfigHookItemFactoryData *data);
 void imap_headers_commit (EPlugin *efp, EConfigHookItemFactoryData *data);
 GtkWidget * org_gnome_imap_headers (EPlugin *epl, EConfigHookItemFactoryData *data);
 
-void 
+void
 imap_headers_abort (EPlugin *efp, EConfigHookItemFactoryData *data)
 {
 	/* Nothing to do here */
 }
 
-void 
+void
 imap_headers_commit (EPlugin *efp, EConfigHookItemFactoryData *data)
 {
 	EMConfigTargetAccount *target_account;
@@ -137,13 +137,13 @@ imap_headers_commit (EPlugin *efp, EConfigHookItemFactoryData *data)
 static gboolean
 epif_header_is_valid (const char *header)
 {
-	gint len = g_utf8_strlen (header, -1); 
+	gint len = g_utf8_strlen (header, -1);
 
 	if (header[0] == 0
 	    || g_utf8_strchr (header, len, ':') != NULL
 	    || g_utf8_strchr (header, len, ' ') != NULL)
 		return FALSE;
-	
+
 	return TRUE;
 }
 
@@ -153,21 +153,21 @@ epif_add_sensitivity (EPImapFeaturesData *ui)
 	const char *entry_contents;
 	GtkTreeIter iter;
 	gboolean valid;
-	
-	/* the add header button should be sensitive if the text box contains 
-	 * a valid header string, that is not a duplicate with something already 
+
+	/* the add header button should be sensitive if the text box contains
+	 * a valid header string, that is not a duplicate with something already
 	 * in the list view */
 	entry_contents = gtk_entry_get_text (GTK_ENTRY (ui->entry_header));
 	if (!epif_header_is_valid (entry_contents)) {
 		gtk_widget_set_sensitive (GTK_WIDGET (ui->add_header), FALSE);
 		return;
 	}
-	
+
 	/* check if this is a duplicate */
 	valid = gtk_tree_model_get_iter_first (GTK_TREE_MODEL (ui->store), &iter);
 	while (valid) {
 		char *header_name;
-		
+
 		gtk_tree_model_get (GTK_TREE_MODEL (ui->store), &iter,
 						    0, &header_name,
 						    -1);
@@ -175,10 +175,10 @@ epif_add_sensitivity (EPImapFeaturesData *ui)
 			gtk_widget_set_sensitive (GTK_WIDGET (ui->add_header), FALSE);
 			return;
  		}
-		
+
 		valid = gtk_tree_model_iter_next (GTK_TREE_MODEL (ui->store), &iter);
 	}
-	
+
 	gtk_widget_set_sensitive (GTK_WIDGET (ui->add_header), TRUE);
 }
 
@@ -189,12 +189,12 @@ epif_add_header (GtkButton *button, EPImapFeaturesData *ui)
 	GtkTreeIter iter, first;
 
 	model = gtk_tree_view_get_model (ui->custom_headers_tree);
-	gtk_tree_store_append (GTK_TREE_STORE(model), &iter, NULL); 
+	gtk_tree_store_append (GTK_TREE_STORE(model), &iter, NULL);
 	gtk_tree_store_set (GTK_TREE_STORE(model), &iter, 0, gtk_entry_get_text (ui->entry_header), -1);
 
 	if (gtk_tree_model_get_iter_first (model, &first)!=FALSE)
 		gtk_widget_set_sensitive (GTK_WIDGET (ui->remove_header), TRUE);
-		
+
 	gtk_entry_set_text (ui->entry_header, "");
 	epif_add_sensitivity (ui);
 }
@@ -207,14 +207,14 @@ epif_remove_header_clicked (GtkButton *button, EPImapFeaturesData *ui)
 	GtkTreeIter iter, first;
 	GtkTreePath *path;
 	gboolean valid = TRUE;
-	
+
 	select = gtk_tree_view_get_selection (ui->custom_headers_tree);
 
 	if (gtk_tree_selection_get_selected (select, &model, &iter))
 	{
 		path = gtk_tree_model_get_path (model, &iter);
 		gtk_tree_store_remove(GTK_TREE_STORE(model), &iter);
-		
+
 		if (gtk_tree_path_prev (path)) {
 			gtk_tree_model_get_iter (model, &iter, path);
 		} else {
@@ -224,10 +224,10 @@ epif_remove_header_clicked (GtkButton *button, EPImapFeaturesData *ui)
 		if (valid)
 			gtk_tree_selection_select_iter (select, &iter);
 	}
-	
+
 	if (gtk_tree_model_get_iter_first (model, &first)==FALSE)
 		gtk_widget_set_sensitive (GTK_WIDGET (button), FALSE);
-		
+
 	epif_add_sensitivity (ui);
 }
 
@@ -297,7 +297,7 @@ org_gnome_imap_headers (EPlugin *epl, EConfigHookItemFactoryData *data)
 			ui->custom_headers_array = g_strsplit (custom_headers, " ", -1);
 			while (ui->custom_headers_array[i] ) {
 				if (strlen(g_strstrip(ui->custom_headers_array[i]))) {
-					gtk_tree_store_append (ui->store, &iter, NULL); 
+					gtk_tree_store_append (ui->store, &iter, NULL);
 					gtk_tree_store_set (ui->store, &iter, 0, ui->custom_headers_array[i], -1);
 				}
 				i++;
@@ -311,7 +311,7 @@ org_gnome_imap_headers (EPlugin *epl, EConfigHookItemFactoryData *data)
 		if (camel_url_get_param (url, "all_headers")) {
 				gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (ui->all_headers), TRUE);
 				gtk_widget_set_sensitive (ui->custom_headers_box, FALSE);
-		} else if (camel_url_get_param (url, "basic_headers")) 
+		} else if (camel_url_get_param (url, "basic_headers"))
 				gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (ui->basic_headers), TRUE);
 		camel_url_free (url);
 	}
diff --git a/plugins/import-ics-attachments/icsimporter.c b/plugins/import-ics-attachments/icsimporter.c
index 802fe9dee5..dbcb597a20 100644
--- a/plugins/import-ics-attachments/icsimporter.c
+++ b/plugins/import-ics-attachments/icsimporter.c
@@ -72,7 +72,7 @@ static icalcomponent_kind get_menu_type (void *data);
 void org_gnome_evolution_import_ics_attachments (EPlugin *ep, EMPopupTargetAttachments *t);
 void org_gnome_evolution_import_ics_part (EPlugin *ep, EMPopupTargetPart *t);
 
-static void 
+static void
 popup_free (EPopup *ep, GSList *items, void *data)
 {
 	g_slist_free (items);
@@ -89,7 +89,7 @@ static EPopupItem popup_tasks_items[] = {
 };
 
 
-void org_gnome_evolution_import_ics_attachments (EPlugin *ep, EMPopupTargetAttachments *t) 
+void org_gnome_evolution_import_ics_attachments (EPlugin *ep, EMPopupTargetAttachments *t)
 {
 	GSList *menus = NULL;
 	icalcomponent_kind kind;
@@ -98,7 +98,7 @@ void org_gnome_evolution_import_ics_attachments (EPlugin *ep, EMPopupTargetAttac
 	CamelContentType *type;
 
 	len = g_slist_length(t->attachments);
-	
+
 	if (len != 1)
 		return;
 
@@ -119,7 +119,7 @@ void org_gnome_evolution_import_ics_attachments (EPlugin *ep, EMPopupTargetAttac
 	}
 }
 
-void org_gnome_evolution_import_ics_part (EPlugin*ep, EMPopupTargetPart *t) 
+void org_gnome_evolution_import_ics_part (EPlugin*ep, EMPopupTargetPart *t)
 {
 	GSList *menus = NULL;
 	icalcomponent_kind kind;
@@ -148,7 +148,7 @@ get_menu_type (void *data)
 	char *path;
 	icalcomponent *icalcomp, *subcomp;
 	icalcomponent_kind kind;
-	EPopupTarget *target = (EPopupTarget *) data;	
+	EPopupTarget *target = (EPopupTarget *) data;
 
 	if (target->type == EM_POPUP_TARGET_ATTACHMENTS)
 		part = ((EAttachment *) ((EMPopupTargetAttachments *) target)->attachments->data)->body;
@@ -175,7 +175,7 @@ import_ics (EPlugin *ep, EPopupTarget *t, void *data)
 {
 	CamelMimePart *part;
 	char *path;
-	EPopupTarget *target = (EPopupTarget *) data;	
+	EPopupTarget *target = (EPopupTarget *) data;
 
 	if (target->type == EM_POPUP_TARGET_ATTACHMENTS)
 		part = ((EAttachment *) ((EMPopupTargetAttachments *) target)->attachments->data)->body;
@@ -189,7 +189,7 @@ import_ics (EPlugin *ep, EPopupTarget *t, void *data)
 static void
 init_widgets(char *path)
 {
-	
+
 	GtkWidget *vbox, *hbox, *dialog;
 	icalcomponent_kind kind;
 	icalcomponent *subcomp;
@@ -203,8 +203,8 @@ init_widgets(char *path)
 	char *markup;
 
 	g_return_if_fail ( path != NULL);
-	dialog = gtk_dialog_new_with_buttons (_("Import ICS"), 
-						NULL, GTK_DIALOG_DESTROY_WITH_PARENT, 
+	dialog = gtk_dialog_new_with_buttons (_("Import ICS"),
+						NULL, GTK_DIALOG_DESTROY_WITH_PARENT,
 						GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
 						NULL);
 	icidata->window = dialog;
@@ -254,7 +254,7 @@ init_widgets(char *path)
 	gtk_box_pack_start (GTK_BOX (hbox), scrolled, TRUE, TRUE, 6);
 	gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE, 6);
 	icidata->selector = selector;
-	
+
 
 	/* FIXME What if no sources? */
 	primary = e_source_list_peek_source_any (source_list);
@@ -270,7 +270,7 @@ init_widgets(char *path)
 	button = gtk_button_new ();
 	gtk_container_add (GTK_CONTAINER (button), hbox);
 	gtk_dialog_add_action_widget (GTK_DIALOG (dialog), button, GTK_RESPONSE_OK);
-	gtk_widget_grab_focus (button); 
+	gtk_widget_grab_focus (button);
 
 	gtk_window_set_default_size (GTK_WINDOW (dialog), 210,340);
 	gtk_widget_show_all (dialog);
@@ -287,12 +287,12 @@ dialog_response_cb (GtkDialog *dialog, gint response_id, ICalImporterData *icida
 
 		case GTK_RESPONSE_CANCEL :
 		case GTK_RESPONSE_DELETE_EVENT :
-			gtk_signal_emit_by_name ((GtkObject *)dialog, "close");	
+			gtk_signal_emit_by_name ((GtkObject *)dialog, "close");
 		break;
 	}
 }
 
-static void 
+static void
 dialog_close_cb (GtkDialog *dialog, ICalImporterData *icidata)
 {
 	gtk_widget_destroy ((GtkWidget *)dialog);
@@ -307,7 +307,7 @@ prepare_events (icalcomponent *icalcomp, GList **vtodos)
 
 	if (vtodos)
 		*vtodos = NULL;
-	
+
 	iter = icalcomponent_begin_component (icalcomp, ICAL_ANY_COMPONENT);
 	while ((subcomp = icalcompiter_deref (&iter)) != NULL) {
 		icalcomponent_kind child_kind = icalcomponent_isa (subcomp);
@@ -356,7 +356,7 @@ prepare_tasks (icalcomponent *icalcomp, GList *vtodos)
 	g_list_free (vtodos);
 }
 
-static void 
+static void
 import_items(ICalImporterData *icidata)
 {
 	ESource *source;
diff --git a/plugins/ipod-sync/evolution-ipod-sync.c b/plugins/ipod-sync/evolution-ipod-sync.c
index 73e5536c17..63372f5459 100644
--- a/plugins/ipod-sync/evolution-ipod-sync.c
+++ b/plugins/ipod-sync/evolution-ipod-sync.c
@@ -25,7 +25,7 @@ ipod_check_status (gboolean silent)
 {
 	LibHalContext *ctx;
 	DBusConnection *conn;
-	
+
 	if (check_hal () == FALSE)
 	{
 		if (!silent) {
@@ -45,9 +45,9 @@ ipod_check_status (gboolean silent)
 			gtk_widget_destroy (message);
 		}
 		return FALSE;
-			
+
 	}
-	
+
 	conn = dbus_bus_get (DBUS_BUS_SYSTEM, NULL);
 
 	ctx = libhal_ctx_new ();
@@ -55,7 +55,7 @@ ipod_check_status (gboolean silent)
 	if (!libhal_ctx_init(ctx, NULL))
 		return FALSE;
 
-	
+
 	mount_point = find_ipod_mount_point (ctx);
 
 	if (mount_point == NULL) {
diff --git a/plugins/ipod-sync/ical-format.c b/plugins/ipod-sync/ical-format.c
index e747255124..38607a6e97 100644
--- a/plugins/ipod-sync/ical-format.c
+++ b/plugins/ipod-sync/ical-format.c
@@ -1,8 +1,8 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
  *
- *  Authors: Rodrigo Moya <rodrigo@novell.com> 
+ *  Authors: Rodrigo Moya <rodrigo@novell.com>
  *           Philip Van Hoof <pvanhoof@gnome.org>
- *           
+ *
  *  Copyright 2004 Novell, Inc. (www.novell.com)
  *
  *  This program is free software; you can redistribute it and/or
@@ -85,7 +85,7 @@ do_save_calendar_ical (FormatHandler *handler, EPlugin *ep, ECalPopupTargetSourc
 
 		while (objects != NULL) {
 			icalcomponent *icalcomp = objects->data;
-			
+
 			icalcomponent_add_component (top_level, icalcomp);
 
 			/* remove item from the list */
diff --git a/plugins/ipod-sync/ipod-sync.c b/plugins/ipod-sync/ipod-sync.c
index dc8a0d67be..dd89b34e8f 100644
--- a/plugins/ipod-sync/ipod-sync.c
+++ b/plugins/ipod-sync/ipod-sync.c
@@ -75,13 +75,13 @@ destination_save_addressbook  (EPlugin *ep, EABPopupTargetSource *target)
 	char *mount = ipod_get_mount();
 
 	primary_source = e_source_selector_peek_primary_selection (target->selector);
-	
+
 	/* use g_file api here to build path*/
 	dest_uri = g_strdup_printf("%s/%s/Evolution-Addressbook-%s.vcf", mount, "Contacts", e_source_peek_name (primary_source));
 	g_free (mount);
-	
+
 	uri = e_source_get_uri (primary_source);
-	
+
 	book = e_book_new_from_uri (uri, NULL);
 
 	if (!book
@@ -112,7 +112,7 @@ destination_save_addressbook  (EPlugin *ep, EABPopupTargetSource *target)
 				EContact *contact = tmp->data;
 				gchar *temp = e_vcard_to_string (E_VCARD (contact), EVC_FORMAT_VCARD_30);
 				gchar *vcard;
-				
+
 				vcard = g_strconcat(temp, "\r\n", NULL);
 				if ((result = gnome_vfs_write (handle, (gconstpointer) vcard, strlen (vcard), &bytes_written))
 				    != GNOME_VFS_OK) {
@@ -137,7 +137,7 @@ destination_save_addressbook  (EPlugin *ep, EABPopupTargetSource *target)
 	g_free (uri);
 }
 
-static void 
+static void
 destination_save_cal (EPlugin *ep, ECalPopupTargetSource *target, ECalSourceType type)
 {
 	FormatHandler *handler = NULL;
@@ -155,7 +155,7 @@ destination_save_cal (EPlugin *ep, ECalPopupTargetSource *target, ECalSourceType
 	handler->save (handler, ep, target, type, dest_uri);
 
 	sync();
-	
+
 	g_free (dest_uri);
 	g_free (mount);
 	g_free (handler);
@@ -175,7 +175,7 @@ org_gnome_sync_tasks (EPlugin *ep, ECalPopupTargetSource *target)
 {
 	if (!ipod_check_status(FALSE))
 		return;
-	
+
 	destination_save_cal (ep, target, E_CAL_SOURCE_TYPE_TODO);
 }
 
diff --git a/plugins/ipod-sync/ipod.c b/plugins/ipod-sync/ipod.c
index 292d07681f..4edfd6a2dd 100644
--- a/plugins/ipod-sync/ipod.c
+++ b/plugins/ipod-sync/ipod.c
@@ -23,7 +23,7 @@ check_hal (void)
 	char **devices;
 	int num;
 	DBusConnection *conn;
-	
+
 	conn = dbus_bus_get (DBUS_BUS_SYSTEM, NULL);
 
 	ctx = libhal_ctx_new ();
@@ -105,7 +105,7 @@ static gboolean
 is_ipod (char *mount_point)
 {
 	gboolean ret = FALSE;
-	
+
 	char *itunes_path;
 
 	itunes_path = g_build_path (G_DIR_SEPARATOR_S, mount_point,
@@ -114,7 +114,7 @@ is_ipod (char *mount_point)
 
 	if (!g_file_test (itunes_path, G_FILE_TEST_IS_DIR))
 		goto out;
-	
+
 	ret = TRUE;
 
 out:
@@ -147,7 +147,7 @@ find_ipod_mount_point (LibHalContext *ctx)
 	for (i = 0; i < apple_count; i++)
 	{
 		udi = apple_devices[i];
-		
+
 		volumes = NULL;
 		volumes = libhal_manager_find_device_string_match (ctx,
 							"info.parent",
@@ -161,7 +161,7 @@ find_ipod_mount_point (LibHalContext *ctx)
 
 			/* Only interested if it has a filesystem. */
 			has_fs = 0;
-			
+
 			if (!libhal_device_property_exists (ctx, udi2,
 								"volume.is_filesystem", NULL) ||
 				  !libhal_device_get_property_bool (ctx, udi2,
@@ -169,7 +169,7 @@ find_ipod_mount_point (LibHalContext *ctx)
 			{
 				has_fs = 1;
 			}
-			
+
 			fsusage = libhal_device_get_property_string (ctx, udi2,
 				 				"volume.fsusage", NULL);
 
@@ -185,7 +185,7 @@ find_ipod_mount_point (LibHalContext *ctx)
 
 			if (has_fs == 0)
 				continue;
-				
+
 			device = libhal_device_get_property_string (ctx, udi2,
 									"block.device", NULL);
 
@@ -198,7 +198,7 @@ find_ipod_mount_point (LibHalContext *ctx)
 				/* It isn't, so let's attempt to mount it */
 				if (device != NULL)
 				{
-					try_mount (device);	
+					try_mount (device);
 				}
 			}
 
@@ -210,10 +210,10 @@ find_ipod_mount_point (LibHalContext *ctx)
 			}
 
 			libhal_free_string (device);
-			
+
 			mount_point = libhal_device_get_property_string (ctx, udi2,
 											"volume.mount_point", NULL);
-			
+
 			if (is_ipod (mount_point))
 			{
 				goto out;
@@ -227,15 +227,15 @@ find_ipod_mount_point (LibHalContext *ctx)
 out:
 	if (volumes != NULL)
 		libhal_free_string_array (volumes);
-	
+
 	if (apple_devices != NULL)
 		libhal_free_string_array (apple_devices);
-	
+
 	if (mount_point != NULL)
 	{
 		retval = g_strdup (mount_point);
 		libhal_free_string (mount_point);
 	}
-	
+
 	return (retval);
 }
diff --git a/plugins/ipod-sync/sync.c b/plugins/ipod-sync/sync.c
index 4d555b4a83..b826dca5f3 100644
--- a/plugins/ipod-sync/sync.c
+++ b/plugins/ipod-sync/sync.c
@@ -39,18 +39,18 @@ static void pulse (void)
  */
 static void error_dialog (char *title, char *error)
 {
-	GtkWidget *error_dlg = 
+	GtkWidget *error_dlg =
 			gtk_message_dialog_new (NULL, 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK,
 											"<span weight=\"bold\" size=\"larger\">"
 											"%s</span>\n\n%s.", title, error);
-	
+
 	gtk_dialog_set_has_separator (GTK_DIALOG (error_dlg), FALSE);
 	gtk_container_set_border_width (GTK_CONTAINER (error_dlg), 5);
 	gtk_label_set_use_markup (GTK_LABEL (GTK_MESSAGE_DIALOG (error_dlg)->label),
 									  TRUE);
 	gtk_dialog_set_default_response (GTK_DIALOG (error_dlg),
 												GTK_RESPONSE_OK);
-	
+
 	gtk_dialog_run (GTK_DIALOG (error_dlg));
 	gtk_widget_destroy (error_dlg);
 }
@@ -114,8 +114,8 @@ static void
 force_little_endian (gunichar2 *data, int length)
 {
 	int i;
-	
-	/* We're big-endian? 
+
+	/* We're big-endian?
 	   (A little tidier than before) */
 	if (G_BYTE_ORDER == G_BIG_ENDIAN)
 	{
@@ -128,7 +128,7 @@ force_little_endian (gunichar2 *data, int length)
 
 			data[i] = c;
 		}
-	}	
+	}
 }
 
 /**
@@ -147,7 +147,7 @@ write_to_ipod (GString *str, char *path, char *filename)
 	gunichar2	*utf16;
 	guchar		bom[2] = {0xFF, 0xFE};
 	int			i, count;
-	
+
 	output_path = g_build_path (G_DIR_SEPARATOR_S,
 										ipod_info.mount_point,
 										path, NULL);
@@ -164,11 +164,11 @@ write_to_ipod (GString *str, char *path, char *filename)
 	output_file = g_build_filename (output_path, filename, NULL);
 
 	g_free (output_path);
-	
+
 	f = fopen (output_file, "w");
 
 	g_free (output_file);
-	
+
 	if (f == NULL)
 	{
 		critical_error (_("Could not export data!"), strerror (errno));
@@ -179,24 +179,24 @@ write_to_ipod (GString *str, char *path, char *filename)
 	if (g_utf8_validate (utf8, -1, NULL))
 	{
 		utf16 = g_utf8_to_utf16 (utf8, -1, NULL, NULL, NULL);
-		
+
 		/* Swap the bytes if we're big-endian so that the output
 		 * remains little-endian according to the BOM. */
 		force_little_endian (utf16, g_utf8_strlen (utf8, -1));
 	}
-	
+
 	count = 2 * g_utf8_strlen (utf8, -1);
-	
-	/* Write the BOM 
+
+	/* Write the BOM
 	 * 0xFF 0xFE
 	 * UTF-16 Little Endian
 	 */
 	for (i = 0; i < 2; i++)
 		fwrite (&bom[i], 1, 1, f);
-	
+
 	if ((fwrite(utf16, count, 1, f) != 1) &&
 		 (count > 0))
-	{	
+	{
 		g_free (utf16);
 		fclose (f);
 		critical_error (_("Could not export data!"),
@@ -217,15 +217,15 @@ uri_list_to_vcard_string (GSList *uris)
 	GSList		*uri;
 
 	qry = e_book_query_field_exists (E_CONTACT_FILE_AS);
-	
+
 	str = g_string_new (NULL);
-	
+
 	for (uri = uris; uri != NULL; uri = uri->next)
 	{
 		g_assert (uri->data != NULL);
 
 		book = e_book_new_from_uri (uri->data, NULL);
-	
+
 		if (e_book_open (book, TRUE, NULL) == FALSE)
 		{
 			error_dialog (_("Could not open addressbook!"),
@@ -247,7 +247,7 @@ uri_list_to_vcard_string (GSList *uris)
 		{
 			gchar *tmp;
 			EContact *contact = E_CONTACT (c->data);
-			
+
 			tmp = e_vcard_to_string (E_VCARD (contact),
 											 EVC_FORMAT_VCARD_30);
 
@@ -259,7 +259,7 @@ uri_list_to_vcard_string (GSList *uris)
 
 		if (contacts != NULL)
 			g_list_free (contacts);
-		
+
 		g_object_unref (book);
 	}
 
@@ -277,7 +277,7 @@ uri_list_to_vcal_string (GSList *uris, ECalSourceType type)
 	icalcomponent *obj = NULL;
 	GList			*objects = NULL, *o = NULL;
 	GSList		*uri;
-	
+
 	str = g_string_new (NULL);
 
 	for (uri = uris; uri != NULL; uri = uri->next)
@@ -285,7 +285,7 @@ uri_list_to_vcal_string (GSList *uris, ECalSourceType type)
 		g_assert (uri->data != NULL);
 
 		cal = e_cal_new_from_uri (uri->data, type);
-		
+
 		if (e_cal_open (cal, TRUE, NULL) == FALSE)
 		{
 			error_dialog (_("Could not open calendar/todo!"),
@@ -295,14 +295,14 @@ uri_list_to_vcal_string (GSList *uris, ECalSourceType type)
 			continue;
 		}
 
-		
+
 		e_cal_get_object_list (cal, "#t", &objects, NULL);
 
 		for (o = objects; o != NULL; o = o->next)
 		{
 			gchar *tmp;
 			icalcomponent *comp;
-		
+
 			g_assert (o->data != NULL);
 
 			comp = o->data;
@@ -310,7 +310,7 @@ uri_list_to_vcal_string (GSList *uris, ECalSourceType type)
 			g_string_append (str, tmp);
 			g_free (tmp);
 		}
-		
+
 		g_object_unref (cal);
 	}
 
@@ -326,15 +326,15 @@ export_addressbook (void)
 	GSList *uris;
 	GString *data;
 	pulse ();
-	
+
 	uris = get_source_uris_for_type (EBOOK_SOURCE_LIST);
 
 	pulse ();
-	
+
 	data = uri_list_to_vcard_string (uris);
 
 	write_to_ipod (data, "/Contacts/", "evolution.vcf");
-	
+
 	g_string_free (data, TRUE);
 
 	pulse ();
@@ -360,11 +360,11 @@ export_calendar (void)
 	data = uri_list_to_vcal_string (uris, E_CAL_SOURCE_TYPE_EVENT);
 
 	write_to_ipod (data, "/Calendars/", "evolution-cal.ics");
-	
+
 	g_string_free (data, TRUE);
 
 	free_uri_list (uris);
-	
+
 	pulse ();
 }
 
@@ -388,7 +388,7 @@ export_tasks (void)
 	g_string_free (data, TRUE);
 
 	free_uri_list (uris);
-	
+
 	pulse ();
 }
 
@@ -396,13 +396,13 @@ void
 export_to_ipod (void)
 {
 	pulse ();
-	
+
 	if (ipod_info.addressbook == TRUE)
 		export_addressbook ();
 
 	if (ipod_info.calendar == TRUE)
 		export_calendar ();
-	
+
 	if (ipod_info.tasks == TRUE)
 		export_tasks ();
 
diff --git a/plugins/itip-formatter/itip-formatter.c b/plugins/itip-formatter/itip-formatter.c
index e44740ff6e..7d7fabfe01 100644
--- a/plugins/itip-formatter/itip-formatter.c
+++ b/plugins/itip-formatter/itip-formatter.c
@@ -59,7 +59,7 @@
 #define CLASSID "itip://"
 #define GCONF_KEY_DELETE "/apps/evolution/itip/delete_processed"
 
-#define d(x) 
+#define d(x)
 
 void format_itip (EPlugin *ep, EMFormatHookTarget *target);
 GtkWidget *itip_formatter_page_factory (EPlugin *ep, EConfigHookItemFactoryData *hook_data);
@@ -68,9 +68,9 @@ typedef struct {
 	EMFormatHTMLPObject pobject;
 
 	GtkWidget *view;
-	
+
 	ESourceList *source_lists[E_CAL_SOURCE_TYPE_LAST];
-	GHashTable *ecals[E_CAL_SOURCE_TYPE_LAST];	
+	GHashTable *ecals[E_CAL_SOURCE_TYPE_LAST];
 
 	ECal *current_ecal;
 	ECalSourceType type;
@@ -84,14 +84,14 @@ typedef struct {
 	icalproperty_method method;
 	time_t start_time;
 	time_t end_time;
-	
+
 	int current;
 	int total;
 
 	gchar *calendar_uid;
 
 	EAccountList *accounts;
-	
+
 	gchar *from_address;
 	gchar *from_name;
 	gchar *to_address;
@@ -147,7 +147,7 @@ find_attendee (icalcomponent *ical_comp, const char *address)
 		}
 		g_free (text);
 	}
-	
+
 	return prop;
 }
 
@@ -183,7 +183,7 @@ find_attendee_if_sentby (icalcomponent *ical_comp, const char *address)
 		}
 		g_free (text);
 	}
-	
+
 	return prop;
 }
 
@@ -191,7 +191,7 @@ static void
 find_to_address (FormatItipPObject *pitip, icalcomponent *ical_comp, icalparameter_partstat *status)
 {
 	EIterator *it;
-	
+
 	it = e_list_get_iterator((EList *)pitip->accounts);
 
 	/* Look through the list of attendees to find the user's address */
@@ -236,14 +236,14 @@ find_to_address (FormatItipPObject *pitip, icalcomponent *ical_comp, icalparamet
 	e_iterator_reset (it);
 
 	/* If the user's address was not found in the attendee's list, then the user
-	 * might be responding on behalf of his/her delegator. In this case, we 
-	 * would want to go through the SENT-BY fields of the attendees to find 
+	 * might be responding on behalf of his/her delegator. In this case, we
+	 * would want to go through the SENT-BY fields of the attendees to find
 	 * the user's address.
 	 *
-	 * Note: This functionality could have been (easily) implemented in the 
-	 * previous loop, but it would hurt the performance for all providers in 
+	 * Note: This functionality could have been (easily) implemented in the
+	 * previous loop, but it would hurt the performance for all providers in
 	 * general. Hence, we choose to iterate through the accounts list again.
-	 */	
+	 */
 
 	if (!pitip->my_address)
 		while (e_iterator_is_valid(it)) {
@@ -320,7 +320,7 @@ find_from_address (FormatItipPObject *pitip, icalcomponent *ical_comp)
 		return;
 
 	pitip->from_address = g_strdup (organizer_clean);
-	
+
 	param = icalproperty_get_first_parameter (prop, ICAL_CN_PARAMETER);
 	if (param)
 		pitip->from_name = g_strdup (icalparameter_get_cn (param));
@@ -334,7 +334,7 @@ find_from_address (FormatItipPObject *pitip, icalcomponent *ical_comp)
 			continue;
 		}
 
-		if ((organizer_clean && !g_ascii_strcasecmp (organizer_clean, account->id->address)) 
+		if ((organizer_clean && !g_ascii_strcasecmp (organizer_clean, account->id->address))
 		    || (organizer_sentby_clean && !g_ascii_strcasecmp (organizer_sentby_clean, account->id->address))) {
 			pitip->my_address = g_strdup (account->id->address);
 
@@ -375,13 +375,13 @@ static void
 adjust_item (FormatItipPObject *pitip, ECalComponent *comp)
 {
 	ECalComponent *real_comp;
-	
+
 	real_comp = get_real_item (pitip);
 	if (real_comp != NULL) {
 		ECalComponentText text;
 		const char *string;
 		GSList *l;
-		
+
 		e_cal_component_get_summary (real_comp, &text);
 		e_cal_component_set_summary (comp, &text);
 		e_cal_component_get_location (real_comp, &string);
@@ -389,11 +389,11 @@ adjust_item (FormatItipPObject *pitip, ECalComponent *comp)
 		e_cal_component_get_description_list (real_comp, &l);
 		e_cal_component_set_description_list (comp, l);
 		e_cal_component_free_text_list (l);
-		
+
 		g_object_unref (real_comp);
 	} else {
 		ECalComponentText text = {_("Unknown"), NULL};
-		
+
 		e_cal_component_set_summary (comp, &text);
 	}
 }
@@ -401,11 +401,11 @@ adjust_item (FormatItipPObject *pitip, ECalComponent *comp)
 static void
 set_buttons_sensitive (FormatItipPObject *pitip)
 {
-	gboolean read_only = TRUE;	
-	
+	gboolean read_only = TRUE;
+
 	if (pitip->current_ecal)
 		e_cal_is_read_only (pitip->current_ecal, &read_only, NULL);
-	
+
 	itip_view_set_buttons_sensitive (ITIP_VIEW (pitip->view), pitip->current_ecal != NULL && !read_only);
 }
 
@@ -419,7 +419,7 @@ cal_opened_cb (ECal *ecal, ECalendarStatus status, gpointer data)
 
 	source_type = e_cal_get_source_type (ecal);
 	source = e_cal_get_source (ecal);
-	
+
 	g_signal_handlers_disconnect_matched (ecal, G_SIGNAL_MATCH_FUNC, 0, 0, NULL, cal_opened_cb, NULL);
 
 	if (status != E_CALENDAR_STATUS_OK) {
@@ -428,7 +428,7 @@ cal_opened_cb (ECal *ecal, ECalendarStatus status, gpointer data)
 						      ITIP_VIEW_INFO_ITEM_TYPE_WARNING,
 						      _("Failed to load the calendar '%s'"),
 						      e_source_peek_name (source));
-		 
+
 		if (pitip->current_ecal == ecal) {
 			pitip->current_ecal = NULL;
 			itip_view_set_buttons_sensitive (ITIP_VIEW (pitip->view), FALSE);
@@ -437,7 +437,7 @@ cal_opened_cb (ECal *ecal, ECalendarStatus status, gpointer data)
 		g_hash_table_remove (pitip->ecals[source_type], e_source_peek_uid (source));
 		return;
 	}
-	
+
 	if (e_cal_get_static_capability (ecal, CAL_STATIC_CAPABILITY_RECURRENCES_NO_MASTER)) {
 		icalcomponent *icalcomp = e_cal_component_get_icalcomponent (pitip->comp);
 
@@ -448,13 +448,13 @@ cal_opened_cb (ECal *ecal, ECalendarStatus status, gpointer data)
 	}
 
 	if (pitip->type == E_CAL_SOURCE_TYPE_JOURNAL) {
-		if (e_cal_get_static_capability (ecal, CAL_STATIC_CAPABILITY_HAS_UNACCEPTED_MEETING)) 
+		if (e_cal_get_static_capability (ecal, CAL_STATIC_CAPABILITY_HAS_UNACCEPTED_MEETING))
 			itip_view_set_needs_decline (ITIP_VIEW (pitip->view), TRUE);
 		else
 			itip_view_set_needs_decline (ITIP_VIEW (pitip->view), FALSE);
 		itip_view_set_mode (ITIP_VIEW (pitip->view), ITIP_VIEW_MODE_PUBLISH);
 	}
-		
+
 	pitip->current_ecal = ecal;
 
 	set_buttons_sensitive (pitip);
@@ -465,7 +465,7 @@ start_calendar_server (FormatItipPObject *pitip, ESource *source, ECalSourceType
 {
 	ECal *ecal;
 	icaltimezone *zone = NULL;
-	
+
 	ecal = g_hash_table_lookup (pitip->ecals[type], e_source_peek_uid (source));
 	if (ecal) {
 		pitip->current_ecal = ecal;
@@ -475,18 +475,18 @@ start_calendar_server (FormatItipPObject *pitip, ESource *source, ECalSourceType
 
 		set_buttons_sensitive (pitip);
 
-		return ecal;		
+		return ecal;
 	}
-	
+
 	ecal = auth_new_cal_from_source (source, type);
-	
+
 	if (!ecal)
 		return NULL;
-	
+
 	g_signal_connect (G_OBJECT (ecal), "cal_opened", G_CALLBACK (func), data);
 
 	g_hash_table_insert (pitip->ecals[type], g_strdup (e_source_peek_uid (source)), ecal);
-	
+
 	zone = calendar_config_get_icaltimezone ();
 	e_cal_set_default_timezone (ecal, zone, NULL);
 
@@ -509,7 +509,7 @@ start_calendar_server_by_uid (FormatItipPObject *pitip, const char *uid, ECalSou
 		if (source)
 			return start_calendar_server (pitip, source, type, cal_opened_cb, pitip);
 	}
-	
+
 	return NULL;
 }
 
@@ -517,7 +517,7 @@ static void
 source_selected_cb (ItipView *view, ESource *source, gpointer data)
 {
 	FormatItipPObject *pitip = data;
-	
+
 	itip_view_set_buttons_sensitive (ITIP_VIEW (pitip->view), FALSE);
 
 	start_calendar_server (pitip, source, pitip->type, cal_opened_cb, pitip);
@@ -532,12 +532,12 @@ find_cal_opened_cb (ECal *ecal, ECalendarStatus status, gpointer data)
 	ECalSourceType source_type;
 	icalcomponent *icalcomp;
 	GList *objects = NULL;
-	
+
 	source_type = e_cal_get_source_type (ecal);
 	source = e_cal_get_source (ecal);
-	
+
 	fd->count--;
-	
+
 	g_signal_handlers_disconnect_matched (ecal, G_SIGNAL_MATCH_FUNC, 0, 0, NULL, find_cal_opened_cb, NULL);
 
 	if (status != E_CALENDAR_STATUS_OK) {
@@ -553,7 +553,7 @@ find_cal_opened_cb (ECal *ecal, ECalendarStatus status, gpointer data)
 			pitip->current_ecal = NULL;
 			itip_view_set_buttons_sensitive (ITIP_VIEW (pitip->view), FALSE);
 		}
-			
+
 		g_hash_table_remove (pitip->ecals[source_type], e_source_peek_uid (source));
 		goto cleanup;
 	}
@@ -561,12 +561,12 @@ find_cal_opened_cb (ECal *ecal, ECalendarStatus status, gpointer data)
 	/* Check for conflicts */
 	/* If the query fails, we'll just ignore it */
 	/* FIXME What happens for recurring conflicts? */
-	if (pitip->type == E_CAL_SOURCE_TYPE_EVENT 
+	if (pitip->type == E_CAL_SOURCE_TYPE_EVENT
 	    && e_source_get_property (E_SOURCE (source), "conflict")
 	    && !g_ascii_strcasecmp (e_source_get_property (E_SOURCE (source), "conflict"), "true")
 	    && e_cal_get_object_list (ecal, fd->sexp, &objects, NULL)
 	    && g_list_length (objects) > 0) {
-		itip_view_add_upper_info_item_printf (ITIP_VIEW (pitip->view), ITIP_VIEW_INFO_ITEM_TYPE_WARNING, 
+		itip_view_add_upper_info_item_printf (ITIP_VIEW (pitip->view), ITIP_VIEW_INFO_ITEM_TYPE_WARNING,
 						      _("An appointment in the calendar '%s' conflicts with this meeting"), e_source_peek_name (source));
 
 		e_cal_free_object_list (objects);
@@ -575,7 +575,7 @@ find_cal_opened_cb (ECal *ecal, ECalendarStatus status, gpointer data)
 
 	if (!pitip->current_ecal && e_cal_get_object (ecal, fd->uid, fd->rid, &icalcomp, NULL)) {
 		icalcomponent_free (icalcomp);
-		
+
 		pitip->current_ecal = ecal;
 
 		/* Provide extra info, since its not in the component */
@@ -592,7 +592,7 @@ find_cal_opened_cb (ECal *ecal, ECalendarStatus status, gpointer data)
 		pitip->progress_info_id = 0;
 
 		/* FIXME Check read only state of calendar? */
-		itip_view_add_lower_info_item_printf (ITIP_VIEW (pitip->view), ITIP_VIEW_INFO_ITEM_TYPE_INFO, 
+		itip_view_add_lower_info_item_printf (ITIP_VIEW (pitip->view), ITIP_VIEW_INFO_ITEM_TYPE_INFO,
 						      _("Found the appointment in the calendar '%s'"), e_source_peek_name (source));
 
 		set_buttons_sensitive (pitip);
@@ -610,7 +610,7 @@ find_cal_opened_cb (ECal *ecal, ECalendarStatus status, gpointer data)
 
 		if (pitip->type == E_CAL_SOURCE_TYPE_JOURNAL) {
 			/* TODO The static capability should be made generic to convey that the calendar contains unaccepted items */
-			if (e_cal_get_static_capability (pitip->current_ecal, CAL_STATIC_CAPABILITY_HAS_UNACCEPTED_MEETING)) 
+			if (e_cal_get_static_capability (pitip->current_ecal, CAL_STATIC_CAPABILITY_HAS_UNACCEPTED_MEETING))
 				itip_view_set_needs_decline (ITIP_VIEW (pitip->view), TRUE);
 			else
 				itip_view_set_needs_decline (ITIP_VIEW (pitip->view), FALSE);
@@ -626,7 +626,7 @@ find_cal_opened_cb (ECal *ecal, ECalendarStatus status, gpointer data)
 		itip_view_remove_lower_info_item (ITIP_VIEW (pitip->view), pitip->progress_info_id);
 		pitip->progress_info_id = 0;
 
-		if ((pitip->method == ICAL_METHOD_PUBLISH || pitip->method ==  ICAL_METHOD_REQUEST) 
+		if ((pitip->method == ICAL_METHOD_PUBLISH || pitip->method ==  ICAL_METHOD_REQUEST)
 		    && !pitip->current_ecal) {
 			/* Reuse already declared one or rename? */
 			ESource *source = NULL;
@@ -645,8 +645,8 @@ find_cal_opened_cb (ECal *ecal, ECalendarStatus status, gpointer data)
 			default:
 				uid = NULL;
 				g_assert_not_reached ();
-			}	
-	
+			}
+
 			if (uid) {
 				source = e_source_list_peek_source_by_uid (pitip->source_lists[pitip->type], uid);
 				g_free (uid);
@@ -675,15 +675,15 @@ find_cal_opened_cb (ECal *ecal, ECalendarStatus status, gpointer data)
 		} else if (!pitip->current_ecal) {
 			switch (pitip->type) {
 			case E_CAL_SOURCE_TYPE_EVENT:
-				itip_view_add_lower_info_item_printf (ITIP_VIEW (pitip->view), ITIP_VIEW_INFO_ITEM_TYPE_WARNING, 
+				itip_view_add_lower_info_item_printf (ITIP_VIEW (pitip->view), ITIP_VIEW_INFO_ITEM_TYPE_WARNING,
 								      _("Unable to find this meeting in any calendar"));
 				break;
 			case E_CAL_SOURCE_TYPE_TODO:
-				itip_view_add_lower_info_item_printf (ITIP_VIEW (pitip->view), ITIP_VIEW_INFO_ITEM_TYPE_WARNING, 
+				itip_view_add_lower_info_item_printf (ITIP_VIEW (pitip->view), ITIP_VIEW_INFO_ITEM_TYPE_WARNING,
 								      _("Unable to find this task in any task list"));
 				break;
 			case E_CAL_SOURCE_TYPE_JOURNAL:
-				itip_view_add_lower_info_item_printf (ITIP_VIEW (pitip->view), ITIP_VIEW_INFO_ITEM_TYPE_WARNING, 
+				itip_view_add_lower_info_item_printf (ITIP_VIEW (pitip->view), ITIP_VIEW_INFO_ITEM_TYPE_WARNING,
 								      _("Unable to find this memo in any memo list"));
 				break;
 			default:
@@ -691,7 +691,7 @@ find_cal_opened_cb (ECal *ecal, ECalendarStatus status, gpointer data)
 				break;
 			}
 		}
-		
+
 		g_free (fd->uid);
 		g_free (fd->rid);
 		g_free (fd);
@@ -723,21 +723,21 @@ find_server (FormatItipPObject *pitip, ECalComponent *comp)
 	for (l = groups; l; l = l->next) {
 		ESourceGroup *group;
 		GSList *sources, *m;
-		
+
 		group = l->data;
 
 		sources = e_source_group_peek_sources (group);
 		for (m = sources; m; m = m->next) {
                         char *source_uri = NULL;
-			
+
 			source = m->data;
-			
+
 			if (e_source_get_property (source, "conflict"))
 				sources_conflict = g_slist_prepend (sources_conflict, source);
 
 			if (current_source)
 				continue;
-			
+
 			source_uri = e_source_get_uri (source);
 			if (source_uri && (strcmp (uri, source_uri) == 0)) {
 				current_source = source;
@@ -746,17 +746,17 @@ find_server (FormatItipPObject *pitip, ECalComponent *comp)
 				g_free (source_uri);
 				continue;
 			}
-	
+
 			all_sources = g_slist_prepend (all_sources, source);
 			g_free (source_uri);
-	
+
 		}
 	}
-	
-	if (current_source)		
+
+	if (current_source)
 		l = sources_conflict;
 	else {
-		pitip->progress_info_id = itip_view_add_lower_info_item (ITIP_VIEW (pitip->view), ITIP_VIEW_INFO_ITEM_TYPE_PROGRESS, 
+		pitip->progress_info_id = itip_view_add_lower_info_item (ITIP_VIEW (pitip->view), ITIP_VIEW_INFO_ITEM_TYPE_PROGRESS,
 				_("Searching for an existing version of this appointment"));
 
 		l = all_sources;
@@ -778,7 +778,7 @@ find_server (FormatItipPObject *pitip, ECalComponent *comp)
 				start = isodate_from_time_t (pitip->start_time);
 				end = isodate_from_time_t (pitip->end_time);
 
-				fd->sexp = g_strdup_printf ("(and (occur-in-time-range? (make-time \"%s\") (make-time \"%s\")) (not (uid? \"%s\")))", 
+				fd->sexp = g_strdup_printf ("(and (occur-in-time-range? (make-time \"%s\") (make-time \"%s\")) (not (uid? \"%s\")))",
 						start, end, icalcomponent_get_uid (pitip->ical_comp));
 			}
 
@@ -790,10 +790,10 @@ find_server (FormatItipPObject *pitip, ECalComponent *comp)
 
 		if (current_source == source)
 			pitip->current_ecal = start_calendar_server (pitip, source, pitip->type, find_cal_opened_cb, fd);
-		else 
+		else
 			ecal = start_calendar_server (pitip, source, pitip->type, find_cal_opened_cb, fd);
 
-	}		
+	}
 
 	g_slist_free (all_sources);
 	g_slist_free (sources_conflict);
@@ -804,11 +804,11 @@ static void
 cleanup_ecal (gpointer data)
 {
 	ECal *ecal = data;
-	
+
 	/* Clean up any signals */
 	g_signal_handlers_disconnect_matched (ecal, G_SIGNAL_MATCH_FUNC, 0, 0, NULL, cal_opened_cb, NULL);
 	g_signal_handlers_disconnect_matched (ecal, G_SIGNAL_MATCH_FUNC, 0, 0, NULL, find_cal_opened_cb, NULL);
-	
+
 	g_object_unref (ecal);
 }
 
@@ -826,7 +826,7 @@ change_status (icalcomponent *ical_comp, const char *address, icalparameter_part
 		icalproperty_add_parameter (prop, param);
 	} else {
 		icalparameter *param;
-		
+
 		if (address != NULL) {
 			prop = icalproperty_new_attendee (address);
 			icalcomponent_add_property (ical_comp, prop);
@@ -840,16 +840,16 @@ change_status (icalcomponent *ical_comp, const char *address, icalparameter_part
 			EAccount *a;
 
 			a = itip_addresses_get_default ();
-			
+
 			prop = icalproperty_new_attendee (a->id->address);
 			icalcomponent_add_property (ical_comp, prop);
-			
+
 			param = icalparameter_new_cn (a->id->name);
-			icalproperty_add_parameter (prop, param);	
+			icalproperty_add_parameter (prop, param);
 
 			param = icalparameter_new_role (ICAL_ROLE_REQPARTICIPANT);
 			icalproperty_add_parameter (prop, param);
-			
+
 			param = icalparameter_new_partstat (status);
 			icalproperty_add_parameter (prop, param);
 		}
@@ -869,19 +869,19 @@ message_foreach_part (CamelMimePart *part, GSList **part_list)
 		return;
 
 	*part_list = g_slist_append (*part_list, part);
-	
+
 	containee = camel_medium_get_content_object (CAMEL_MEDIUM (part));
-	
+
 	if (containee == NULL)
 		return;
-	
+
 	/* using the object types is more accurate than using the mime/types */
 	if (CAMEL_IS_MULTIPART (containee)) {
 		parts = camel_multipart_get_number (CAMEL_MULTIPART (containee));
 		for (i = 0; go && i < parts; i++) {
 			/* Reuse already declared *parts? */
 			CamelMimePart *part = camel_multipart_get_part (CAMEL_MULTIPART (containee), i);
-			
+
 			message_foreach_part (part, part_list);
 		}
 	} else if (CAMEL_IS_MIME_MESSAGE (containee)) {
@@ -889,7 +889,7 @@ message_foreach_part (CamelMimePart *part, GSList **part_list)
 	}
 }
 
-static gboolean 
+static gboolean
 update_item (FormatItipPObject *pitip, ItipViewResponse response)
 {
 	struct icaltimetype stamp;
@@ -930,9 +930,9 @@ update_item (FormatItipPObject *pitip, ItipViewResponse response)
 		&& (response != ITIP_VIEW_RESPONSE_DECLINE)){
 		GSList *attachments = NULL, *new_attachments = NULL, *l;
 		CamelMimeMessage *msg = ((EMFormat *) pitip->pobject.format)->message;
-		
+
 		e_cal_component_get_attachment_list (clone_comp, &attachments);
-		
+
 		for (l = attachments; l; l = l->next) {
 			GSList *parts = NULL, *m;
 			char *uri, *new_uri;
@@ -972,13 +972,13 @@ update_item (FormatItipPObject *pitip, ItipViewResponse response)
 
 		g_slist_foreach (attachments, (GFunc) g_free, NULL);
 		g_slist_free (attachments);
-				
+
 		e_cal_component_set_attachment_list (clone_comp, new_attachments);
 	}
 
 	if (!e_cal_receive_objects (pitip->current_ecal, pitip->top_level, &error)) {
 		itip_view_add_lower_info_item_printf (ITIP_VIEW (pitip->view), ITIP_VIEW_INFO_ITEM_TYPE_INFO,
-						      _("Unable to send item to calendar '%s'.  %s"), 
+						      _("Unable to send item to calendar '%s'.  %s"),
 						      e_source_peek_name (source), error->message);
 		g_error_free (error);
 		result = FALSE;
@@ -989,21 +989,21 @@ update_item (FormatItipPObject *pitip, ItipViewResponse response)
 
 		switch (response) {
 		case ITIP_VIEW_RESPONSE_ACCEPT:
-			itip_view_add_lower_info_item_printf (ITIP_VIEW (pitip->view), ITIP_VIEW_INFO_ITEM_TYPE_INFO, 
+			itip_view_add_lower_info_item_printf (ITIP_VIEW (pitip->view), ITIP_VIEW_INFO_ITEM_TYPE_INFO,
 							      _("Sent to calendar '%s' as accepted"), e_source_peek_name (source));
 			break;
 		case ITIP_VIEW_RESPONSE_TENTATIVE:
-			itip_view_add_lower_info_item_printf (ITIP_VIEW (pitip->view), ITIP_VIEW_INFO_ITEM_TYPE_INFO, 
+			itip_view_add_lower_info_item_printf (ITIP_VIEW (pitip->view), ITIP_VIEW_INFO_ITEM_TYPE_INFO,
 							      _("Sent to calendar '%s' as tentative"), e_source_peek_name (source));
 			break;
 		case ITIP_VIEW_RESPONSE_DECLINE:
 			/* FIXME some calendars just might not save it at all, is this accurate? */
-			itip_view_add_lower_info_item_printf (ITIP_VIEW (pitip->view), ITIP_VIEW_INFO_ITEM_TYPE_INFO, 
+			itip_view_add_lower_info_item_printf (ITIP_VIEW (pitip->view), ITIP_VIEW_INFO_ITEM_TYPE_INFO,
 							      _("Sent to calendar '%s' as declined"), e_source_peek_name (source));
 			break;
 		case ITIP_VIEW_RESPONSE_CANCEL:
 			/* FIXME some calendars just might not save it at all, is this accurate? */
-			itip_view_add_lower_info_item_printf (ITIP_VIEW (pitip->view), ITIP_VIEW_INFO_ITEM_TYPE_INFO, 
+			itip_view_add_lower_info_item_printf (ITIP_VIEW (pitip->view), ITIP_VIEW_INFO_ITEM_TYPE_INFO,
 							      _("Sent to calendar '%s' as canceled"), e_source_peek_name (source));
 			break;
 		default:
@@ -1024,10 +1024,10 @@ update_item (FormatItipPObject *pitip, ItipViewResponse response)
 static void
 set_attendee (ECalComponent *comp, const char *address)
 {
-	icalproperty *prop;	
+	icalproperty *prop;
 	icalcomponent *icalcomp;
 	gboolean found = FALSE;
-	
+
 	icalcomp = e_cal_component_get_icalcomponent (comp);
 
 	for (prop = icalcomponent_get_first_property (icalcomp, ICAL_ATTENDEE_PROPERTY);
@@ -1044,7 +1044,7 @@ set_attendee (ECalComponent *comp, const char *address)
 	if (!found) {
 		icalparameter *param;
 		char *temp = g_strdup_printf ("MAILTO:%s", address);
-		
+
 		prop = icalproperty_new_attendee ((const char *) temp);
 		icalcomponent_add_property (icalcomp, prop);
 
@@ -1066,17 +1066,17 @@ set_attendee (ECalComponent *comp, const char *address)
 }
 
 static gboolean
-send_comp_to_attendee (ECalComponentItipMethod method, ECalComponent *comp, const char *user, ECal *client, const char *comment) 
+send_comp_to_attendee (ECalComponentItipMethod method, ECalComponent *comp, const char *user, ECal *client, const char *comment)
 {
 	gboolean status;
-	ECalComponent *send_comp = e_cal_component_clone (comp); 
-		
-	set_attendee (send_comp, user);		
-	
+	ECalComponent *send_comp = e_cal_component_clone (comp);
+
+	set_attendee (send_comp, user);
+
 	if (comment) {
 		GSList comments;
 		ECalComponentText text;
-			
+
 		text.value = comment;
 		text.altrep = NULL;
 
@@ -1085,17 +1085,17 @@ send_comp_to_attendee (ECalComponentItipMethod method, ECalComponent *comp, cons
 
 		e_cal_component_set_comment_list (send_comp, &comments);
 	}
-	
+
 	/* FIXME send the attachments in the request */
 	status = itip_send_comp (method, send_comp, client, NULL, NULL, NULL);
-	
+
 	g_object_unref (send_comp);
 
-	return status;	
+	return status;
 }
 
-static void 
-remove_delegate (FormatItipPObject *pitip, const char *delegate, const char *delegator, ECalComponent *comp) 
+static void
+remove_delegate (FormatItipPObject *pitip, const char *delegate, const char *delegator, ECalComponent *comp)
 {
 	gboolean status;
 	char *comment = g_strdup_printf (_("Organizer has removed the delegate %s "), itip_strip_mailto (delegate));
@@ -1104,7 +1104,7 @@ remove_delegate (FormatItipPObject *pitip, const char *delegate, const char *del
 	status = send_comp_to_attendee (E_CAL_COMPONENT_METHOD_CANCEL, pitip->comp, delegate, pitip->current_ecal, comment);
 	if (status)
 		send_comp_to_attendee (E_CAL_COMPONENT_METHOD_REQUEST, pitip->comp, delegator, pitip->current_ecal, comment);
-	if (status) {			
+	if (status) {
 		itip_view_add_lower_info_item (ITIP_VIEW (pitip->view), ITIP_VIEW_INFO_ITEM_TYPE_INFO, _("Sent a cancelation notice to the delegate"));
 	} else
 		itip_view_add_lower_info_item (ITIP_VIEW (pitip->view), ITIP_VIEW_INFO_ITEM_TYPE_INFO, _("Could not send the cancelation notice to the delegate"));
@@ -1121,7 +1121,7 @@ update_attendee_status (FormatItipPObject *pitip)
 	const char *uid, *rid;
 	const char *delegate;
 	GError *error = NULL;
-	
+
 	/* Obtain our version */
 	e_cal_component_get_uid (pitip->comp, &uid);
 	org_icalcomp = e_cal_component_get_icalcomponent (pitip->comp);
@@ -1142,9 +1142,9 @@ update_attendee_status (FormatItipPObject *pitip)
 				icalproperty *prop, *del_prop;
 
 				prop = find_attendee (icalcomp, itip_strip_mailto (a->value));
-				if ((a->status == ICAL_PARTSTAT_DELEGATED) && (del_prop = find_attendee (org_icalcomp, itip_strip_mailto (a->delto))) && !(find_attendee (icalcomp, itip_strip_mailto (a->delto)))) {			
+				if ((a->status == ICAL_PARTSTAT_DELEGATED) && (del_prop = find_attendee (org_icalcomp, itip_strip_mailto (a->delto))) && !(find_attendee (icalcomp, itip_strip_mailto (a->delto)))) {
 					gint response;
-					delegate = icalproperty_get_attendee (del_prop);	 	
+					delegate = icalproperty_get_attendee (del_prop);
 					response = e_error_run (NULL, "org.gnome.itip-formatter:add-delegate",
 								itip_strip_mailto (a->value),
 								itip_strip_mailto (delegate), NULL);
@@ -1152,7 +1152,7 @@ update_attendee_status (FormatItipPObject *pitip)
 						icalcomponent_add_property (icalcomp, icalproperty_new_clone (del_prop));
 						e_cal_component_rescan (comp);
 					} else if (response == GTK_RESPONSE_NO) {
-				 		remove_delegate (pitip, delegate, itip_strip_mailto (a->value), comp); 
+				 		remove_delegate (pitip, delegate, itip_strip_mailto (a->value), comp);
 						goto cleanup;
 					} else {
 						goto cleanup;
@@ -1161,7 +1161,7 @@ update_attendee_status (FormatItipPObject *pitip)
 
 				if (prop == NULL) {
 					gint response;
-					
+
 					if (a->delfrom && *a->delfrom) {
 						response = e_error_run (NULL, "org.gnome.itip-formatter:add-delegate",
 									itip_strip_mailto (a->delfrom),
@@ -1191,7 +1191,7 @@ update_attendee_status (FormatItipPObject *pitip)
 						goto cleanup;
 					}
 				} else if (a->status == ICAL_PARTSTAT_NONE || a->status == ICAL_PARTSTAT_X) {
-					itip_view_add_lower_info_item (ITIP_VIEW (pitip->view), ITIP_VIEW_INFO_ITEM_TYPE_ERROR, 
+					itip_view_add_lower_info_item (ITIP_VIEW (pitip->view), ITIP_VIEW_INFO_ITEM_TYPE_ERROR,
 								       _("Attendee status could not be updated because the status is invalid"));
 					goto cleanup;
 				} else {
@@ -1216,17 +1216,17 @@ update_attendee_status (FormatItipPObject *pitip)
 			e_cal_component_commit_sequence (comp);
 			itip_send_comp (E_CAL_COMPONENT_METHOD_REQUEST, comp, pitip->current_ecal, NULL, NULL, NULL);
 		}
-		
+
 		if (!e_cal_modify_object (pitip->current_ecal, icalcomp, rid ? CALOBJ_MOD_THIS : CALOBJ_MOD_ALL, &error)) {
-			itip_view_add_lower_info_item_printf (ITIP_VIEW (pitip->view), ITIP_VIEW_INFO_ITEM_TYPE_ERROR, 
+			itip_view_add_lower_info_item_printf (ITIP_VIEW (pitip->view), ITIP_VIEW_INFO_ITEM_TYPE_ERROR,
 							      _("Unable to update attendee. %s"), error->message);
-			
+
 			g_error_free (error);
 		} else {
 			itip_view_add_lower_info_item (ITIP_VIEW (pitip->view), ITIP_VIEW_INFO_ITEM_TYPE_INFO, _("Attendee status updated"));
 		}
 	} else {
-		itip_view_add_lower_info_item (ITIP_VIEW (pitip->view), ITIP_VIEW_INFO_ITEM_TYPE_WARNING, 
+		itip_view_add_lower_info_item (ITIP_VIEW (pitip->view), ITIP_VIEW_INFO_ITEM_TYPE_WARNING,
 					       _("Attendee status can not be updated because the item no longer exists"));
 	}
 
@@ -1241,7 +1241,7 @@ send_item (FormatItipPObject *pitip)
 	ECalComponent *comp;
 
 	comp = get_real_item (pitip);
-	
+
 	if (comp != NULL) {
 		itip_send_comp (E_CAL_COMPONENT_METHOD_REQUEST, comp, pitip->current_ecal, NULL, NULL, NULL);
 		g_object_unref (comp);
@@ -1290,7 +1290,7 @@ get_next (icalcompiter *iter)
 		if (ret == NULL)
 			break;
 		kind = icalcomponent_isa (ret);
-	} while (ret != NULL 
+	} while (ret != NULL
 		 && kind != ICAL_VEVENT_COMPONENT
 		 && kind != ICAL_VTODO_COMPONENT
 		 && kind != ICAL_VFREEBUSY_COMPONENT);
@@ -1306,25 +1306,25 @@ set_itip_error (FormatItipPObject *pitip, GtkContainer *container, const char *p
 
 	vbox = gtk_vbox_new (FALSE, 12);
 	gtk_widget_show (vbox);
-	
+
 	message = g_strdup_printf ("<b>%s</b>", primary);
 	label = gtk_label_new (NULL);
-	gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);	
-	gtk_label_set_markup (GTK_LABEL (label), message);     
+	gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+	gtk_label_set_markup (GTK_LABEL (label), message);
 	g_free (message);
 	gtk_widget_show (label);
-	gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);		
+	gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
 
 	label = gtk_label_new (secondary);
 	gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
 	gtk_widget_show (label);
 	gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
-     
+
 	gtk_container_add (container, vbox);
 }
 
 static gboolean
-extract_itip_data (FormatItipPObject *pitip, GtkContainer *container) 
+extract_itip_data (FormatItipPObject *pitip, GtkContainer *container)
 {
 	CamelDataWrapper *content;
 	CamelStream *mem;
@@ -1342,9 +1342,9 @@ extract_itip_data (FormatItipPObject *pitip, GtkContainer *container)
 	camel_data_wrapper_decode_to_stream (content, mem);
 
 	if (((CamelStreamMem *) mem)->buffer->len == 0) {
-		camel_object_unref (mem);	
-		set_itip_error (pitip, container, 
-				_("The calendar attached is not valid"), 
+		camel_object_unref (mem);
+		set_itip_error (pitip, container,
+				_("The calendar attached is not valid"),
 				_("The message claims to contain a calendar, but the calendar is not a valid iCalendar."));
 
 		return FALSE;
@@ -1352,14 +1352,14 @@ extract_itip_data (FormatItipPObject *pitip, GtkContainer *container)
 
 	pitip->vcalendar = g_strndup ((char *)((CamelStreamMem *) mem)->buffer->data, ((CamelStreamMem *) mem)->buffer->len);
 
-	camel_object_unref (mem);	
+	camel_object_unref (mem);
 
 	pitip->top_level = e_cal_util_new_top_level ();
 
 	pitip->main_comp = icalparser_parse_string (pitip->vcalendar);
 	if (pitip->main_comp == NULL) {
-		set_itip_error (pitip, container, 
-				_("The calendar attached is not valid"), 
+		set_itip_error (pitip, container,
+				_("The calendar attached is not valid"),
 				_("The message claims to contain a calendar, but the calendar is not a valid iCalendar."));
 
 		return FALSE;
@@ -1394,11 +1394,11 @@ extract_itip_data (FormatItipPObject *pitip, GtkContainer *container)
 	}
 
 	if (pitip->ical_comp == NULL) {
-		set_itip_error (pitip, container, 
-				_("The item in the calendar is not valid"), 
+		set_itip_error (pitip, container,
+				_("The item in the calendar is not valid"),
 				_("The message does contain a calendar, but the calendar contains no events, tasks or free/busy information"));
 
-		return FALSE;	       
+		return FALSE;
 	}
 
 	switch (icalcomponent_isa (pitip->ical_comp)) {
@@ -1412,23 +1412,23 @@ extract_itip_data (FormatItipPObject *pitip, GtkContainer *container)
 		pitip->type = E_CAL_SOURCE_TYPE_JOURNAL;
 		break;
 	default:
-		set_itip_error (pitip, container, 
-				_("The item in the calendar is not valid"), 
+		set_itip_error (pitip, container,
+				_("The item in the calendar is not valid"),
 				_("The message does contain a calendar, but the calendar contains no events, tasks or free/busy information"));
 		return FALSE;
 	}
-	
+
 	pitip->total = icalcomponent_count_components (pitip->main_comp, ICAL_VEVENT_COMPONENT);
 	pitip->total += icalcomponent_count_components (pitip->main_comp, ICAL_VTODO_COMPONENT);
 	pitip->total += icalcomponent_count_components (pitip->main_comp, ICAL_VFREEBUSY_COMPONENT);
 	pitip->total += icalcomponent_count_components (pitip->main_comp, ICAL_VJOURNAL_COMPONENT);
 
 	if (pitip->total > 1) {
-		set_itip_error (pitip, container, 
-				_("The calendar attached contains multiple items"), 
+		set_itip_error (pitip, container,
+				_("The calendar attached contains multiple items"),
 				_("To process all of these items, the file should be saved and the calendar imported"));
 
-		return FALSE;		
+		return FALSE;
 	} if (pitip->total > 0) {
 		pitip->current = 1;
 	} else {
@@ -1449,7 +1449,7 @@ extract_itip_data (FormatItipPObject *pitip, GtkContainer *container)
 			prop = find_attendee_if_sentby (pitip->ical_comp, my_address);
 		if (prop) {
 			icalparameter *param;
-			const char * delfrom; 
+			const char * delfrom;
 
 			if ((param = icalproperty_get_first_parameter (prop, ICAL_DELEGATEDFROM_PARAMETER))) {
 				delfrom = icalparameter_get_delegatedfrom (param);
@@ -1494,11 +1494,11 @@ extract_itip_data (FormatItipPObject *pitip, GtkContainer *container)
 		g_object_unref (pitip->comp);
 		pitip->comp = NULL;
 
-		set_itip_error (pitip, container, 
-				_("The item in the calendar is not valid"), 
+		set_itip_error (pitip, container,
+				_("The item in the calendar is not valid"),
 				_("The message does contain a calendar, but the calendar contains no events, tasks or free/busy information"));
 
-		return FALSE;	       
+		return FALSE;
 	};
 
 	/* Add default reminder if the config says so */
@@ -1524,10 +1524,10 @@ extract_itip_data (FormatItipPObject *pitip, GtkContainer *container)
 			case CAL_MINUTES:
 				trigger.u.rel_duration.minutes = interval;
 				break;
-			case CAL_HOURS:	
+			case CAL_HOURS:
 				trigger.u.rel_duration.hours = interval;
 				break;
-			case CAL_DAYS:	
+			case CAL_DAYS:
 				trigger.u.rel_duration.days = interval;
 				break;
 			default:
@@ -1591,13 +1591,13 @@ static struct _mail_msg_op open_calendar_op = {
 };
 
 static gboolean
-idle_open_cb (gpointer data) 
+idle_open_cb (gpointer data)
 {
-	FormatItipPObject *pitip = data;	
+	FormatItipPObject *pitip = data;
 	struct _opencal_msg *m;
-	
+
 	m = mail_msg_new (&open_calendar_op, NULL, sizeof (*m));
-	m->command = g_strdup_printf ("evolution \"calendar://?startdate=%s&enddate=%s\"", 
+	m->command = g_strdup_printf ("evolution \"calendar://?startdate=%s&enddate=%s\"",
 				   isodate_from_time_t (pitip->start_time), isodate_from_time_t (pitip->end_time));
 	e_thread_put (mail_thread_queued_slow, (EMsg *)m);
 
@@ -1625,7 +1625,7 @@ view_response_cb (GtkWidget *widget, ItipViewResponse response, gpointer data)
 	/* check if it is a  recur instance (no master object) and
 	 * add a property */
 	if (itip_view_get_recur_check_state (ITIP_VIEW (pitip->view))) {
-		prop = icalproperty_new_x ("All");	
+		prop = icalproperty_new_x ("All");
 		icalproperty_set_x_name (prop, "X-GW-RECUR-INSTANCES-MOD-TYPE");
 		icalcomponent_add_property (pitip->ical_comp, prop);
 	}
@@ -1633,7 +1633,7 @@ view_response_cb (GtkWidget *widget, ItipViewResponse response, gpointer data)
 	switch (response) {
 		case ITIP_VIEW_RESPONSE_ACCEPT:
 			if (pitip->type != E_CAL_SOURCE_TYPE_JOURNAL)
-				status = change_status (pitip->ical_comp, pitip->to_address, 
+				status = change_status (pitip->ical_comp, pitip->to_address,
 					ICAL_PARTSTAT_ACCEPTED);
 			else
 				status = TRUE;
@@ -1660,7 +1660,7 @@ view_response_cb (GtkWidget *widget, ItipViewResponse response, gpointer data)
 				status = change_status (pitip->ical_comp, pitip->to_address,
 					ICAL_PARTSTAT_DECLINED);
 			else {
-				prop = icalproperty_new_x ("1");	
+				prop = icalproperty_new_x ("1");
 				icalproperty_set_x_name (prop, "X-GW-DECLINED");
 				icalcomponent_add_property (pitip->ical_comp, prop);
 				status = TRUE;
@@ -1718,7 +1718,7 @@ view_response_cb (GtkWidget *widget, ItipViewResponse response, gpointer data)
 						camel_message_info_free (mi);
 					}
 					camel_folder_summary_array_free (((EMFormat *) pitip->pobject.format)->folder->summary, summary_array);
-				} 
+				}
 			} else {
 				/* Either not a recurring appointment or "apply-to-all" is not selected. So just delete this instance alone */
 				camel_folder_summary_remove_uid(((EMFormat *) pitip->pobject.format)->folder->summary, ((EMFormat *) pitip->pobject.format)->uid);
@@ -1726,14 +1726,14 @@ view_response_cb (GtkWidget *widget, ItipViewResponse response, gpointer data)
 			}
 			camel_object_trigger_event (((EMFormat *) pitip->pobject.format)->folder, "folder_changed", changes);
 			camel_folder_change_info_free (changes);
-		} 
+		}
 	}
 
 	if (!delete_invitation_from_cache && pitip->delete_message) {
 		g_message ("Deleting!");
 		camel_folder_delete_message (((EMFormat *) pitip->pobject.format)->folder, ((EMFormat *) pitip->pobject.format)->uid);
 	}
-	
+
 
         if (itip_view_get_rsvp (ITIP_VIEW (pitip->view)) && status) {
                 ECalComponent *comp = NULL;
@@ -1742,11 +1742,11 @@ view_response_cb (GtkWidget *widget, ItipViewResponse response, gpointer data)
                 const char *attendee, *comment;
                 GSList *l, *list = NULL;
 		gboolean found;
-		
-                comp = e_cal_component_clone (pitip->comp);		
+
+                comp = e_cal_component_clone (pitip->comp);
                 if (comp == NULL)
                         return;
-		
+
                 if (pitip->to_address == NULL)
                         find_to_address (pitip, pitip->ical_comp, NULL);
                 g_assert (pitip->to_address != NULL);
@@ -1760,23 +1760,23 @@ view_response_cb (GtkWidget *widget, ItipViewResponse response, gpointer data)
                      prop = icalcomponent_get_next_property (ical_comp, ICAL_ATTENDEE_PROPERTY))
                 {
                         char *text;
-			
+
                         value = icalproperty_get_value (prop);
                         if (!value)
                                 continue;
-			
+
                         attendee = icalvalue_get_string (value);
-			
+
                         text = g_strdup (itip_strip_mailto (attendee));
                         text = g_strstrip (text);
-			
+
 			/* We do this to ensure there is at most one
 			 * attendee in the response */
             		if (found || g_ascii_strcasecmp (pitip->to_address, text))
             			list = g_slist_prepend (list, prop);
 			else if (!g_ascii_strcasecmp (pitip->to_address, text))
 				found = TRUE;
-                        g_free (text);			
+                        g_free (text);
                 }
 
                 for (l = list; l; l = l->next) {
@@ -1791,28 +1791,28 @@ view_response_cb (GtkWidget *widget, ItipViewResponse response, gpointer data)
 		if (comment) {
 			GSList comments;
 			ECalComponentText text;
-			
+
 			text.value = comment;
 			text.altrep = NULL;
-			
+
 			comments.data = &text;
 			comments.next = NULL;
-			
+
 			e_cal_component_set_comment_list (comp, &comments);
 		}
-		
+
                 e_cal_component_rescan (comp);
                 if (itip_send_comp (E_CAL_COMPONENT_METHOD_REPLY, comp, pitip->current_ecal, pitip->top_level, NULL, NULL)) {
 			camel_folder_set_message_flags (((EMFormat *) pitip->pobject.format)->folder, ((EMFormat *) pitip->pobject.format)->uid, CAMEL_MESSAGE_ANSWERED, CAMEL_MESSAGE_ANSWERED);
 		}
 
                 g_object_unref (comp);
-		
+
         }
 }
 
 static gboolean
-check_is_instance (icalcomponent *icalcomp) 
+check_is_instance (icalcomponent *icalcomp)
 {
 	icalproperty *icalprop;
 
@@ -1869,16 +1869,16 @@ format_itip_object (EMFormatHTML *efh, GtkHTMLEmbedded *eb, EMFormatHTMLPObject
 
 	/* Accounts */
 	pitip->accounts = itip_addresses_get ();
-	
+
 	/* Source Lists and open ecal clients */
 	for (i = 0; i < E_CAL_SOURCE_TYPE_LAST; i++) {
 		if (!e_cal_get_sources (&pitip->source_lists[i], i, NULL))
 			/* FIXME More error handling? */
 			pitip->source_lists[i] = NULL;
 
-		/* Initialize the ecal hashes */		
+		/* Initialize the ecal hashes */
 		pitip->ecals[i] = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, cleanup_ecal);
-	}	
+	}
 
 	/* FIXME Handle multiple VEVENTS with the same UID, ie detached instances */
 	if (!extract_itip_data (pitip, GTK_CONTAINER (eb)))
@@ -1931,7 +1931,7 @@ format_itip_object (EMFormatHTML *efh, GtkHTMLEmbedded *eb, EMFormatHTMLPObject
 	}
 
 	itip_view_set_item_type (ITIP_VIEW (pitip->view), pitip->type);
-	
+
 	if (response_enabled) {
 		switch (pitip->method) {
 		case ICAL_METHOD_REQUEST:
@@ -1967,7 +1967,7 @@ format_itip_object (EMFormatHTML *efh, GtkHTMLEmbedded *eb, EMFormatHTMLPObject
 			e_cal_component_get_attendee_list (pitip->comp, &list);
 			if (list != NULL) {
 				ECalComponentAttendee *attendee;
-			
+
 				attendee = list->data;
 
 				itip_view_set_attendee (ITIP_VIEW (pitip->view), attendee->cn ? attendee->cn : itip_strip_mailto (attendee->value));
@@ -1978,13 +1978,13 @@ format_itip_object (EMFormatHTML *efh, GtkHTMLEmbedded *eb, EMFormatHTMLPObject
 				if (pitip->my_address) {
 					if (!(attendee->value && !g_ascii_strcasecmp (itip_strip_mailto (attendee->value), pitip->my_address))
 					&& !(attendee->sentby && !g_ascii_strcasecmp (itip_strip_mailto (attendee->sentby), pitip->my_address))
-					&& (pitip->from_address && g_ascii_strcasecmp (pitip->from_address, pitip->my_address))) 
+					&& (pitip->from_address && g_ascii_strcasecmp (pitip->from_address, pitip->my_address)))
 						itip_view_set_proxy (ITIP_VIEW (pitip->view), pitip->from_name ? pitip->from_name : pitip->from_address);
 				}
 
 				e_cal_component_free_attendee_list (list);
 			}
-			break;		
+			break;
 		default:
 			g_assert_not_reached ();
 			break;
@@ -2001,8 +2001,8 @@ format_itip_object (EMFormatHTML *efh, GtkHTMLEmbedded *eb, EMFormatHTMLPObject
 	if (response_enabled && pitip->method == ICAL_METHOD_REPLY) {
 		e_cal_component_get_attendee_list (pitip->comp, &list);
 		if (list != NULL) {
-			ECalComponentAttendee *a = list->data;			
-			
+			ECalComponentAttendee *a = list->data;
+
 			switch (a->status) {
 			case ICAL_PARTSTAT_ACCEPTED:
 				itip_view_set_status (ITIP_VIEW (pitip->view), _("Accepted"));
@@ -2019,29 +2019,29 @@ format_itip_object (EMFormatHTML *efh, GtkHTMLEmbedded *eb, EMFormatHTMLPObject
 			default:
 				itip_view_set_status (ITIP_VIEW (pitip->view), _("Unknown"));
 			}
-		}		
+		}
 		e_cal_component_free_attendee_list (list);
 	}
 
-	if (pitip->method == ICAL_METHOD_REPLY 
-	    || pitip->method == ICAL_METHOD_COUNTER 
+	if (pitip->method == ICAL_METHOD_REPLY
+	    || pitip->method == ICAL_METHOD_COUNTER
 	    || pitip->method == ICAL_METHOD_DECLINECOUNTER) {
 		/* FIXME Check spec to see if multiple comments are actually valid */
 		/* Comments for iTIP are limited to one per object */
 		e_cal_component_get_comment_list (pitip->comp, &list);
 		if (list) {
 			ECalComponentText *text = list->data;
-			
-			if (text->value)			
+
+			if (text->value)
 				itip_view_set_comment (ITIP_VIEW (pitip->view), text->value);
-		}		
+		}
 		e_cal_component_free_text_list (list);
 	}
-	
+
 	e_cal_component_get_description_list (pitip->comp, &list);
 	for (l = list; l; l = l->next) {
 		ECalComponentText *text = l->data;
-		
+
 		if (!gstring && text->value)
 			gstring = g_string_new (text->value);
 		else if (text->value)
@@ -2053,23 +2053,23 @@ format_itip_object (EMFormatHTML *efh, GtkHTMLEmbedded *eb, EMFormatHTMLPObject
 		itip_view_set_description (ITIP_VIEW (pitip->view), gstring->str);
 		g_string_free (gstring, TRUE);
 	}
-	
+
 	to_zone = calendar_config_get_icaltimezone ();
-	
+
 	e_cal_component_get_dtstart (pitip->comp, &datetime);
 	pitip->start_time = 0;
 	if (datetime.value) {
 		struct tm start_tm;
-		
+
 		/* If the timezone is not in the component, guess the local time */
 		/* Should we guess if the timezone is an olsen name somehow? */
 		if (datetime.value->is_utc)
 			from_zone = icaltimezone_get_utc_timezone ();
-		else if (!datetime.value->is_utc && datetime.tzid) 
+		else if (!datetime.value->is_utc && datetime.tzid)
 			from_zone = icalcomponent_get_timezone (pitip->top_level, datetime.tzid);
-		else	
+		else
 			from_zone = NULL;
-		
+
 		start_tm = icaltimetype_to_tm_with_zone (datetime.value, from_zone, to_zone);
 
 		itip_view_set_start (ITIP_VIEW (pitip->view), &start_tm);
@@ -2101,13 +2101,13 @@ format_itip_object (EMFormatHTML *efh, GtkHTMLEmbedded *eb, EMFormatHTMLPObject
 		/* Should we guess if the timezone is an olsen name somehow? */
 		if (datetime.value->is_utc)
 			from_zone = icaltimezone_get_utc_timezone ();
-		else if (!datetime.value->is_utc && datetime.tzid) 
+		else if (!datetime.value->is_utc && datetime.tzid)
 			from_zone = icalcomponent_get_timezone (pitip->top_level, datetime.tzid);
 		else
 			from_zone = NULL;
-		
+
 		end_tm = icaltimetype_to_tm_with_zone (datetime.value, from_zone, to_zone);
-		
+
 		itip_view_set_end (ITIP_VIEW (pitip->view), &end_tm);
 		pitip->end_time = icaltime_as_timet_with_zone (*datetime.value, from_zone);
 	}
@@ -2148,16 +2148,16 @@ format_itip_object (EMFormatHTML *efh, GtkHTMLEmbedded *eb, EMFormatHTMLPObject
 }
 
 static void
-pitip_free (EMFormatHTMLPObject *pobject) 
+pitip_free (EMFormatHTMLPObject *pobject)
 {
 	FormatItipPObject *pitip = (FormatItipPObject *) pobject;
 	int i;
-	
+
 	for (i = 0; i < E_CAL_SOURCE_TYPE_LAST; i++) {
 		if (pitip->source_lists[i])
 		g_object_unref (pitip->source_lists[i]);
 		pitip->source_lists[i] = NULL;
-		
+
 		g_hash_table_destroy (pitip->ecals[i]);
 		pitip->ecals[i] = NULL;
 	}
@@ -2189,15 +2189,15 @@ pitip_free (EMFormatHTMLPObject *pobject)
 	g_free (pitip->from_name);
 	pitip->from_name = NULL;
 	g_free (pitip->to_address);
-	pitip->to_address = NULL;	
+	pitip->to_address = NULL;
 	g_free (pitip->to_name);
-	pitip->to_name = NULL;	
+	pitip->to_name = NULL;
 	g_free (pitip->delegator_address);
 	pitip->delegator_address = NULL;
 	g_free (pitip->delegator_name);
 	pitip->delegator_name = NULL;
 	g_free (pitip->my_address);
-	pitip->my_address = NULL;	
+	pitip->my_address = NULL;
 }
 
 void
@@ -2206,7 +2206,7 @@ format_itip (EPlugin *ep, EMFormatHookTarget *target)
 	FormatItipPObject *pitip;
 	GConfClient *gconf;
 	char *classid;
-	
+
 	classid = g_strdup_printf("itip:///%s", ((EMFormat *) target->format)->part_id->str);
 
 	pitip = (FormatItipPObject *) em_format_html_add_pobject ((EMFormatHTML *) target->format, sizeof (FormatItipPObject), classid, target->part, format_itip_object);
@@ -2215,7 +2215,7 @@ format_itip (EPlugin *ep, EMFormatHookTarget *target)
 	gconf = gconf_client_get_default ();
 	pitip->delete_message = gconf_client_get_bool (gconf, GCONF_KEY_DELETE, NULL);
 	g_object_unref (gconf);
-	
+
 	camel_stream_printf (target->stream, "<table border=0 width=\"100%%\" cellpadding=3><tr>");
 	camel_stream_printf (target->stream, "<td valign=top><object classid=\"%s\"></object></td><td width=100%% valign=top>", classid);
 	camel_stream_printf (target->stream, "</td></tr></table>");
@@ -2227,7 +2227,7 @@ static void
 delete_toggled_cb (GtkWidget *widget, gpointer data)
 {
 	EMConfigTargetPrefs *target = data;
-	
+
 	gconf_client_set_bool (target->gconf, GCONF_KEY_DELETE, gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget)), NULL);
 }
 
@@ -2299,7 +2299,7 @@ itip_formatter_page_factory (EPlugin *ep, EConfigHookItemFactoryData *hook_data)
 	GtkWidget *scrolledwin;
 	ESourceList *source_list;
 	gchar *str;
-	
+
 	/* Create a new notebook page */
 	page = gtk_vbox_new (FALSE, 0);
 	GTK_CONTAINER (page)->border_width = 12;
@@ -2325,7 +2325,7 @@ itip_formatter_page_factory (EPlugin *ep, EConfigHookItemFactoryData *hook_data)
 	gtk_box_pack_start (GTK_BOX (hbox), padding_label, FALSE, FALSE, 0);
 	inner_vbox = gtk_vbox_new (FALSE, 6);
 	gtk_box_pack_start (GTK_BOX (hbox), inner_vbox, FALSE, FALSE, 0);
-	
+
 	/* Delete message after acting */
 	/* FIXME Need a schema for this */
 	check = gtk_check_button_new_with_mnemonic (_("_Delete message after acting"));
@@ -2351,7 +2351,7 @@ itip_formatter_page_factory (EPlugin *ep, EConfigHookItemFactoryData *hook_data)
 	gtk_box_pack_start (GTK_BOX (hbox), padding_label, FALSE, FALSE, 0);
 	inner_vbox = gtk_vbox_new (FALSE, 6);
 	gtk_box_pack_start (GTK_BOX (hbox), inner_vbox, TRUE, TRUE, 0);
-	
+
 	/* Source selector */
 	label = gtk_label_new (_("Select the calendars to search for meeting conflicts"));
 	gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
@@ -2374,7 +2374,7 @@ itip_formatter_page_factory (EPlugin *ep, EConfigHookItemFactoryData *hook_data)
 	gtk_container_add (GTK_CONTAINER (scrolledwin), ess);
 
 	initialize_selection (E_SOURCE_SELECTOR (ess), source_list);
-	
+
 	g_signal_connect (ess, "selection_changed", G_CALLBACK (source_selection_changed), source_list);
 	g_object_weak_ref (G_OBJECT (page), (GWeakNotify) g_object_unref, source_list);
 
diff --git a/plugins/itip-formatter/itip-view.c b/plugins/itip-formatter/itip-view.c
index d48973dd4b..fb60c4fa31 100644
--- a/plugins/itip-formatter/itip-view.c
+++ b/plugins/itip-formatter/itip-view.c
@@ -61,7 +61,7 @@ typedef struct  {
 struct _ItipViewPrivate {
 	ItipViewMode mode;
 	ECalSourceType type;
-	
+
 	GtkWidget *sender_label;
 	char *organizer;
 	char *organizer_sentby;
@@ -72,7 +72,7 @@ struct _ItipViewPrivate {
 
 	GtkWidget *summary_label;
 	char *summary;
-	
+
 	GtkWidget *location_header;
 	GtkWidget *location_label;
 	char *location;
@@ -88,7 +88,7 @@ struct _ItipViewPrivate {
 	GtkWidget *start_header;
 	GtkWidget *start_label;
 	struct tm *start_tm;
-	
+
 	GtkWidget *end_header;
 	GtkWidget *end_label;
 	struct tm *end_tm;
@@ -108,7 +108,7 @@ struct _ItipViewPrivate {
 	GtkWidget *escb;
 	GtkWidget *escb_header;
 	ESourceList *source_list;
-	
+
 	GtkWidget *rsvp_box;
 	GtkWidget *rsvp_check;
 	GtkWidget *rsvp_comment_header;
@@ -121,7 +121,7 @@ struct _ItipViewPrivate {
 	GtkWidget *update_box;
 	GtkWidget *update_check;
 	gboolean update_show;
-	
+
 	GtkWidget *button_box;
 	gboolean buttons_sensitive;
 
@@ -148,7 +148,7 @@ format_date_and_time_x		(struct tm	*date_tm,
 {
 	char *format;
 	struct tm tomorrow_tm, week_tm;
-	
+
 	/* Calculate a normalized "tomorrow" */
 	tomorrow_tm = *current_tm;
 	/* Don't need this if date is in the past. Also, year assumption won't fail. */
@@ -160,7 +160,7 @@ format_date_and_time_x		(struct tm	*date_tm,
 		} else {
 			tomorrow_tm.tm_mon++;
 		}
-	} else {		
+	} else {
 		tomorrow_tm.tm_mday++;
 	}
 
@@ -175,7 +175,7 @@ format_date_and_time_x		(struct tm	*date_tm,
 		} else {
 			week_tm.tm_mon++;
 		}
-	} else {		
+	} else {
 		week_tm.tm_mday += 6;
 	}
 
@@ -189,11 +189,11 @@ format_date_and_time_x		(struct tm	*date_tm,
 			format = _("Today");
 		} else if (use_24_hour_format) {
 			if (!show_zero_seconds && date_tm->tm_sec == 0)
-				/* strftime format of a time, 
+				/* strftime format of a time,
 				   in 24-hour format, without seconds. */
 				format = _("Today %H:%M");
 			else
-				/* strftime format of a time, 
+				/* strftime format of a time,
 				   in 24-hour format. */
 				format = _("Today %H:%M:%S");
 		} else {
@@ -202,12 +202,12 @@ format_date_and_time_x		(struct tm	*date_tm,
 				   in 12-hour format, without seconds. */
 				format = _("Today %l:%M %p");
 			else
-				/* strftime format of a time, 
+				/* strftime format of a time,
 				   in 12-hour format. */
 				format = _("Today %l:%M:%S %p");
 		}
 
-	/* Tomorrow */		
+	/* Tomorrow */
 	} else if (date_tm->tm_mday == tomorrow_tm.tm_mday &&
 		   date_tm->tm_mon == tomorrow_tm.tm_mon &&
 		   date_tm->tm_year == tomorrow_tm.tm_year) {
@@ -217,11 +217,11 @@ format_date_and_time_x		(struct tm	*date_tm,
 			format = _("Tomorrow");
 		} else if (use_24_hour_format) {
 			if (!show_zero_seconds && date_tm->tm_sec == 0)
-				/* strftime format of a time, 
+				/* strftime format of a time,
 				   in 24-hour format, without seconds. */
 				format = _("Tomorrow %H:%M");
 			else
-				/* strftime format of a time, 
+				/* strftime format of a time,
 				   in 24-hour format. */
 				format = _("Tomorrow %H:%M:%S");
 		} else {
@@ -230,12 +230,12 @@ format_date_and_time_x		(struct tm	*date_tm,
 				   in 12-hour format, without seconds. */
 				format = _("Tomorrow %l:%M %p");
 			else
-				/* strftime format of a time, 
+				/* strftime format of a time,
 				   in 12-hour format. */
 				format = _("Tomorrow %l:%M:%S %p");
 		}
 
-	/* Within 6 days */		
+	/* Within 6 days */
 	} else if ((date_tm->tm_year >= current_tm->tm_year &&
 		    date_tm->tm_mon >= current_tm->tm_mon &&
 		    date_tm->tm_mday >= current_tm->tm_mday) &&
@@ -272,7 +272,7 @@ format_date_and_time_x		(struct tm	*date_tm,
 				format = _("%A %l:%M:%S %p");
 		}
 
-	/* This Year */		
+	/* This Year */
 	} else if (date_tm->tm_year == current_tm->tm_year) {
 		if (!show_midnight && date_tm->tm_hour == 0
 		    && date_tm->tm_min == 0 && date_tm->tm_sec == 0) {
@@ -281,8 +281,8 @@ format_date_and_time_x		(struct tm	*date_tm,
 			format = _("%A, %B %e");
 		} else if (use_24_hour_format) {
 			if (!show_zero_seconds && date_tm->tm_sec == 0)
-				/* strftime format of a weekday, a date 
-				   without a year and a time, 
+				/* strftime format of a weekday, a date
+				   without a year and a time,
 				   in 24-hour format, without seconds. */
 				format = _("%A, %B %e %H:%M");
 			else
@@ -291,7 +291,7 @@ format_date_and_time_x		(struct tm	*date_tm,
 				format = _("%A, %B %e %H:%M:%S");
 		} else {
 			if (!show_zero_seconds && date_tm->tm_sec == 0)
-				/* strftime format of a weekday, a date without a year 
+				/* strftime format of a weekday, a date without a year
 				   and a time, in 12-hour format, without seconds. */
 				format = _("%A, %B %e %l:%M %p");
 			else
@@ -324,7 +324,7 @@ format_date_and_time_x		(struct tm	*date_tm,
 				format = _("%A, %B %e, %Y %l:%M:%S %p");
 		}
 	}
-	
+
 	/* strftime returns 0 if the string doesn't fit, and leaves the buffer
 	   undefined, so we set it to the empty string in that case. */
 	if (e_utf8_strftime_fix_am_pm (buffer, buffer_size, format, date_tm) == 0)
@@ -378,7 +378,7 @@ set_calendar_sender_text (ItipView *view)
 	case ITIP_VIEW_MODE_REFRESH:
 		if (priv->attendee_sentby)
 			sender = g_strdup_printf (_("<b>%s</b> through %s wishes to receive the latest information for the following meeting:"), attendee, priv->attendee_sentby);
-		else		
+		else
 			sender = g_strdup_printf (_("<b>%s</b> wishes to receive the latest information for the following meeting:"), attendee);
 		break;
 	case ITIP_VIEW_MODE_REPLY:
@@ -396,7 +396,7 @@ set_calendar_sender_text (ItipView *view)
 	case ITIP_VIEW_MODE_COUNTER:
 		if (priv->attendee_sentby)
 			sender = g_strdup_printf (_("<b>%s</b> through %s has proposed the following meeting changes."), attendee, priv->attendee_sentby);
-		else 
+		else
 			sender = g_strdup_printf (_("<b>%s</b> has proposed the following meeting changes."), attendee);
 		break;
 	case ITIP_VIEW_MODE_DECLINECOUNTER:
@@ -431,7 +431,7 @@ set_tasklist_sender_text (ItipView *view)
 
 	organizer = priv->organizer ? priv->organizer : _("An unknown person");
 	attendee = priv->attendee ? priv->attendee : _("An unknown person");
-	
+
 	/* The current account ID (i.e. the delegatee) is receiving a copy of the request/response. Here we ask the delegatee to respond/accept on behalf of the delegator. */
 	if (priv->organizer && priv->proxy)
 		on_behalf_of = g_strdup_printf (_("Please respond on behalf of <b>%s</b>"), priv->proxy);
@@ -519,7 +519,7 @@ set_journal_sender_text (ItipView *view)
 
 	organizer = priv->organizer ? priv->organizer : _("An unknown person");
 	attendee = priv->attendee ? priv->attendee : _("An unknown person");
-	
+
 	/* The current account ID (i.e. the delegatee) is receiving a copy of the request/response. Here we ask the delegatee to respond/accept on behalf of the delegator. */
 	if (priv->organizer && priv->proxy)
 		on_behalf_of = g_strdup_printf (_("Please respond on behalf of <b>%s</b>"), priv->proxy);
@@ -567,7 +567,7 @@ set_sender_text (ItipView *view)
 	ItipViewPrivate *priv;
 
 	priv = view->priv;
-	
+
 	switch (priv->type) {
 	case E_CAL_SOURCE_TYPE_EVENT:
 		set_calendar_sender_text (view);
@@ -657,12 +657,12 @@ set_start_text (ItipView *view)
 	char buffer[256];
 	time_t now;
 	struct tm *now_tm;
-	
+
 	priv = view->priv;
 
 	now = time (NULL);
 	now_tm = localtime (&now);
-	
+
 	if (priv->start_tm) {
 		format_date_and_time_x (priv->start_tm, now_tm, FALSE, TRUE, FALSE, buffer, 256);
 		gtk_label_set_text (GTK_LABEL (priv->start_label), buffer);
@@ -681,7 +681,7 @@ set_end_text (ItipView *view)
 	char buffer[256];
 	time_t now;
 	struct tm *now_tm;
-	
+
 	priv = view->priv;
 
 	now = time (NULL);
@@ -699,25 +699,25 @@ set_end_text (ItipView *view)
 }
 
 static void
-set_info_items (GtkWidget *info_box, GSList *info_items) 
+set_info_items (GtkWidget *info_box, GSList *info_items)
 {
 	GSList *l;
-	
+
 	gtk_container_foreach (GTK_CONTAINER (info_box), (GtkCallback) gtk_widget_destroy, NULL);
-	
+
 	for (l = info_items; l; l = l->next) {
-		ItipViewInfoItem *item = l->data;	
+		ItipViewInfoItem *item = l->data;
 		GtkWidget *hbox, *image, *label;
-		
+
 		hbox = gtk_hbox_new (FALSE, 0);
 
 		switch (item->type) {
 		case ITIP_VIEW_INFO_ITEM_TYPE_INFO:
 			image = gtk_image_new_from_stock (GTK_STOCK_DIALOG_INFO, GTK_ICON_SIZE_SMALL_TOOLBAR);
 			break;
-		case ITIP_VIEW_INFO_ITEM_TYPE_WARNING:			
+		case ITIP_VIEW_INFO_ITEM_TYPE_WARNING:
 			image = gtk_image_new_from_stock (GTK_STOCK_DIALOG_WARNING, GTK_ICON_SIZE_SMALL_TOOLBAR);
-			break;			
+			break;
 		case ITIP_VIEW_INFO_ITEM_TYPE_ERROR:
 			image = gtk_image_new_from_stock (GTK_STOCK_DIALOG_ERROR, GTK_ICON_SIZE_SMALL_TOOLBAR);
 			break;
@@ -728,26 +728,26 @@ set_info_items (GtkWidget *info_box, GSList *info_items)
 		default:
 			image = NULL;
 		}
-		
+
 		if (image) {
 			gtk_widget_show (image);
 			gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, FALSE, 6);
 		}
-		
+
 		label = gtk_label_new (item->message);
 		gtk_widget_show (label);
 		gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 6);
 
 		gtk_widget_show (hbox);
 		gtk_box_pack_start (GTK_BOX (info_box), hbox, FALSE, FALSE, 6);
-	}	
+	}
 }
 
 static void
 set_upper_info_items (ItipView *view)
 {
 	ItipViewPrivate *priv;
-	
+
 	priv = view->priv;
 
 	set_info_items (priv->upper_info_box, priv->upper_info_items);
@@ -757,7 +757,7 @@ static void
 set_lower_info_items (ItipView *view)
 {
 	ItipViewPrivate *priv;
-	
+
 	priv = view->priv;
 
 	set_info_items (priv->lower_info_box, priv->lower_info_items);
@@ -766,10 +766,10 @@ set_lower_info_items (ItipView *view)
 #define DATA_RESPONSE_KEY "ItipView::button_response"
 
 static void
-button_clicked_cb (GtkWidget *widget, gpointer data) 
+button_clicked_cb (GtkWidget *widget, gpointer data)
 {
 	ItipViewResponse response;
-	
+
 	response = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (widget), DATA_RESPONSE_KEY));
 
 	g_message ("Response %d", response);
@@ -777,13 +777,13 @@ button_clicked_cb (GtkWidget *widget, gpointer data)
 }
 
 static void
-set_one_button (ItipView *view, char *label, char *stock_id, ItipViewResponse response) 
+set_one_button (ItipView *view, char *label, char *stock_id, ItipViewResponse response)
 {
 	ItipViewPrivate *priv;
 	GtkWidget *button;
 	GtkWidget *image;
 	gpointer data;
-	
+
 	priv = view->priv;
 
 	button = gtk_button_new_with_mnemonic (label);
@@ -801,7 +801,7 @@ set_one_button (ItipView *view, char *label, char *stock_id, ItipViewResponse re
 }
 
 static void
-set_buttons (ItipView *view) 
+set_buttons (ItipView *view)
 {
 	ItipViewPrivate *priv;
 	gboolean is_recur_set = FALSE;
@@ -816,7 +816,7 @@ set_buttons (ItipView *view)
 
 	/* Everything gets the open button */
 	set_one_button (view, _("_Open Calendar"), GTK_STOCK_JUMP_TO, ITIP_VIEW_RESPONSE_OPEN);
-	
+
 	switch (priv->mode) {
 	case ITIP_VIEW_MODE_PUBLISH:
 		/* FIXME Is this really the right button? */
@@ -863,12 +863,12 @@ set_buttons (ItipView *view)
 }
 
 static void
-itip_view_destroy (GtkObject *object) 
+itip_view_destroy (GtkObject *object)
 {
 	ItipView *view = ITIP_VIEW (object);
 	ItipViewPrivate *priv = view->priv;
-	
-	if (priv) {		
+
+	if (priv) {
 		g_free (priv->organizer);
 		g_free (priv->organizer_sentby);
 		g_free (priv->delegator);
@@ -885,7 +885,7 @@ itip_view_destroy (GtkObject *object)
 
 		itip_view_clear_upper_info_items (view);
 		itip_view_clear_lower_info_items (view);
-		
+
 		g_free (priv);
 		view->priv = NULL;
 	}
@@ -897,9 +897,9 @@ static void
 itip_view_class_init (ItipViewClass *klass)
 {
 	GtkObjectClass *gtkobject_class;
-	
+
 	gtkobject_class = GTK_OBJECT_CLASS (klass);
-	
+
 	gtkobject_class->destroy = itip_view_destroy;
 
 	signals[SOURCE_SELECTED] =
@@ -922,14 +922,14 @@ itip_view_class_init (ItipViewClass *klass)
 }
 
 static void
-rsvp_toggled_cb (GtkWidget *widget, gpointer data) 
+rsvp_toggled_cb (GtkWidget *widget, gpointer data)
 {
 	ItipView *view = data;
 	ItipViewPrivate *priv;
 	gboolean rsvp;
-	
+
 	priv = view->priv;
-	
+
 	rsvp = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv->rsvp_check));
 
 	gtk_widget_set_sensitive (priv->rsvp_comment_header, rsvp);
@@ -937,13 +937,13 @@ rsvp_toggled_cb (GtkWidget *widget, gpointer data)
 }
 
 static void
-recur_toggled_cb (GtkWidget *widget, gpointer data) 
+recur_toggled_cb (GtkWidget *widget, gpointer data)
 {
 	ItipView *view = data;
 	ItipViewPrivate *priv;
-	
+
 	priv = view->priv;
-	
+
 	itip_view_set_mode (view, priv->mode);
 }
 
@@ -954,11 +954,11 @@ itip_view_init (ItipView *view)
 	ItipViewPrivate *priv;
 	GtkWidget *icon, *vbox, *hbox, *separator, *table, *label;
 
-	priv = g_new0 (ItipViewPrivate, 1);	
+	priv = g_new0 (ItipViewPrivate, 1);
 	view->priv = priv;
 
 	priv->mode = ITIP_VIEW_MODE_NONE;
-	
+
 	gtk_box_set_spacing (GTK_BOX (view), 12);
 
 	/* The meeting icon */
@@ -1004,7 +1004,7 @@ itip_view_init (ItipView *view)
 	gtk_misc_set_alignment (GTK_MISC (priv->location_label), 0, 0.5);
 	gtk_table_attach (GTK_TABLE (table), priv->location_header, 0, 1, 1, 2, GTK_FILL, 0, 0, 0);
 	gtk_table_attach (GTK_TABLE (table), priv->location_label, 1, 2, 1, 2, GTK_FILL, 0, 0, 0);
-	
+
 	/* Start time */
 	priv->start_header = gtk_label_new (_("Start time:"));
 	priv->start_label = gtk_label_new (NULL);
@@ -1062,7 +1062,7 @@ itip_view_init (ItipView *view)
 	priv->selector_box = gtk_hbox_new (FALSE, 12);
 	gtk_widget_show (priv->selector_box);
 	gtk_box_pack_start (GTK_BOX (vbox), priv->selector_box, FALSE, FALSE, 0);
-	
+
 	/* RSVP area */
 	priv->rsvp_box = gtk_vbox_new (FALSE, 12);
 	gtk_box_pack_start (GTK_BOX (vbox), priv->rsvp_box, FALSE, FALSE, 0);
@@ -1085,7 +1085,7 @@ itip_view_init (ItipView *view)
 	gtk_widget_set_sensitive (priv->rsvp_comment_header, FALSE);
 	gtk_widget_show (priv->rsvp_comment_header);
 	gtk_box_pack_start (GTK_BOX (hbox), priv->rsvp_comment_header, FALSE, FALSE, 0);
-	
+
 	priv->rsvp_comment_entry = gtk_entry_new ();
 	gtk_widget_set_sensitive (priv->rsvp_comment_entry, FALSE);
 	gtk_widget_show (priv->rsvp_comment_entry);
@@ -1123,7 +1123,7 @@ GtkWidget *
 itip_view_new (void)
 {
 	 ItipView *itip_view = g_object_new (ITIP_TYPE_VIEW, "homogeneous", FALSE, "spacing", 6, NULL);
-	
+
 	 return GTK_WIDGET (itip_view);
 }
 
@@ -1131,12 +1131,12 @@ void
 itip_view_set_mode (ItipView *view, ItipViewMode mode)
 {
 	ItipViewPrivate *priv;
-	
+
 	g_return_if_fail (view != NULL);
-	g_return_if_fail (ITIP_IS_VIEW (view));	
-	
+	g_return_if_fail (ITIP_IS_VIEW (view));
+
 	priv = view->priv;
-	
+
 	priv->mode = mode;
 
 	set_sender_text (view);
@@ -1150,9 +1150,9 @@ itip_view_get_mode (ItipView *view)
 
 	g_return_val_if_fail (view != NULL, ITIP_VIEW_MODE_NONE);
 	g_return_val_if_fail (ITIP_IS_VIEW (view), ITIP_VIEW_MODE_NONE);
-	
+
 	priv = view->priv;
-	
+
 	return priv->mode;
 }
 
@@ -1160,12 +1160,12 @@ void
 itip_view_set_item_type (ItipView *view, ECalSourceType type)
 {
 	ItipViewPrivate *priv;
-	
+
 	g_return_if_fail (view != NULL);
-	g_return_if_fail (ITIP_IS_VIEW (view));	
-	
+	g_return_if_fail (ITIP_IS_VIEW (view));
+
 	priv = view->priv;
-	
+
 	priv->type = type;
 
 	set_sender_text (view);
@@ -1178,9 +1178,9 @@ itip_view_get_item_type (ItipView *view)
 
 	g_return_val_if_fail (view != NULL, ITIP_VIEW_MODE_NONE);
 	g_return_val_if_fail (ITIP_IS_VIEW (view), ITIP_VIEW_MODE_NONE);
-	
+
 	priv = view->priv;
-	
+
 	return priv->type;
 }
 
@@ -1189,12 +1189,12 @@ void
 itip_view_set_organizer (ItipView *view, const char *organizer)
 {
 	ItipViewPrivate *priv;
-	
+
 	g_return_if_fail (view != NULL);
-	g_return_if_fail (ITIP_IS_VIEW (view));	
-	
+	g_return_if_fail (ITIP_IS_VIEW (view));
+
 	priv = view->priv;
-	
+
 	if (priv->organizer)
 		g_free (priv->organizer);
 
@@ -1205,14 +1205,14 @@ itip_view_set_organizer (ItipView *view, const char *organizer)
 
 const char *
 itip_view_get_organizer (ItipView *view)
-{	
+{
 	ItipViewPrivate *priv;
 
 	g_return_val_if_fail (view != NULL, NULL);
 	g_return_val_if_fail (ITIP_IS_VIEW (view), NULL);
-	
+
 	priv = view->priv;
-	
+
 	return priv->organizer;
 }
 
@@ -1220,12 +1220,12 @@ void
 itip_view_set_organizer_sentby (ItipView *view, const char *sentby)
 {
 	ItipViewPrivate *priv;
-	
+
 	g_return_if_fail (view != NULL);
-	g_return_if_fail (ITIP_IS_VIEW (view));	
-	
+	g_return_if_fail (ITIP_IS_VIEW (view));
+
 	priv = view->priv;
-	
+
 	if (priv->organizer_sentby)
 		g_free (priv->organizer_sentby);
 
@@ -1241,9 +1241,9 @@ itip_view_get_organizer_sentby (ItipView *view)
 
 	g_return_val_if_fail (view != NULL, NULL);
 	g_return_val_if_fail (ITIP_IS_VIEW (view), NULL);
-	
+
 	priv = view->priv;
-	
+
 	return priv->organizer_sentby;
 }
 
@@ -1251,18 +1251,18 @@ void
 itip_view_set_attendee (ItipView *view, const char *attendee)
 {
 	ItipViewPrivate *priv;
-	
+
 	g_return_if_fail (view != NULL);
-	g_return_if_fail (ITIP_IS_VIEW (view));	
-	
+	g_return_if_fail (ITIP_IS_VIEW (view));
+
 	priv = view->priv;
-	
+
 	if (priv->attendee)
 		g_free (priv->attendee);
 
 	priv->attendee = g_strdup (attendee);
 
-	set_sender_text (view);	
+	set_sender_text (view);
 }
 
 const char *
@@ -1272,9 +1272,9 @@ itip_view_get_attendee (ItipView *view)
 
 	g_return_val_if_fail (view != NULL, NULL);
 	g_return_val_if_fail (ITIP_IS_VIEW (view), NULL);
-	
+
 	priv = view->priv;
-	
+
 	return priv->attendee;
 }
 
@@ -1282,12 +1282,12 @@ void
 itip_view_set_attendee_sentby (ItipView *view, const char *sentby)
 {
 	ItipViewPrivate *priv;
-	
+
 	g_return_if_fail (view != NULL);
-	g_return_if_fail (ITIP_IS_VIEW (view));	
-	
+	g_return_if_fail (ITIP_IS_VIEW (view));
+
 	priv = view->priv;
-	
+
 	if (priv->attendee_sentby)
 		g_free (priv->attendee_sentby);
 
@@ -1303,9 +1303,9 @@ itip_view_get_attendee_sentby (ItipView *view)
 
 	g_return_val_if_fail (view != NULL, NULL);
 	g_return_val_if_fail (ITIP_IS_VIEW (view), NULL);
-	
+
 	priv = view->priv;
-	
+
 	return priv->attendee_sentby;
 }
 
@@ -1313,12 +1313,12 @@ void
 itip_view_set_proxy (ItipView *view, const char *proxy)
 {
 	ItipViewPrivate *priv;
-	
+
 	g_return_if_fail (view != NULL);
-	g_return_if_fail (ITIP_IS_VIEW (view));	
-	
+	g_return_if_fail (ITIP_IS_VIEW (view));
+
 	priv = view->priv;
-	
+
 	if (priv->proxy)
 		g_free (priv->proxy);
 
@@ -1334,9 +1334,9 @@ itip_view_get_proxy (ItipView *view)
 
 	g_return_val_if_fail (view != NULL, NULL);
 	g_return_val_if_fail (ITIP_IS_VIEW (view), NULL);
-	
+
 	priv = view->priv;
-	
+
 	return priv->proxy;
 }
 
@@ -1344,18 +1344,18 @@ void
 itip_view_set_delegator (ItipView *view, const char *delegator)
 {
 	ItipViewPrivate *priv;
-	
+
 	g_return_if_fail (view != NULL);
-	g_return_if_fail (ITIP_IS_VIEW (view));	
-	
+	g_return_if_fail (ITIP_IS_VIEW (view));
+
 	priv = view->priv;
-	
+
 	if (priv->delegator)
 		g_free (priv->delegator);
 
 	priv->delegator = g_strdup (delegator);
 
-	set_sender_text (view);	
+	set_sender_text (view);
 }
 
 const char *
@@ -1365,9 +1365,9 @@ itip_view_get_delegator (ItipView *view)
 
 	g_return_val_if_fail (view != NULL, NULL);
 	g_return_val_if_fail (ITIP_IS_VIEW (view), NULL);
-	
+
 	priv = view->priv;
-	
+
 	return priv->delegator;
 }
 
@@ -1375,12 +1375,12 @@ void
 itip_view_set_summary (ItipView *view, const char *summary)
 {
 	ItipViewPrivate *priv;
-	
+
 	g_return_if_fail (view != NULL);
-	g_return_if_fail (ITIP_IS_VIEW (view));	
-	
+	g_return_if_fail (ITIP_IS_VIEW (view));
+
 	priv = view->priv;
-	
+
 	if (priv->summary)
 		g_free (priv->summary);
 
@@ -1396,9 +1396,9 @@ itip_view_get_summary (ItipView *view)
 
 	g_return_val_if_fail (view != NULL, NULL);
 	g_return_val_if_fail (ITIP_IS_VIEW (view), NULL);
-	
+
 	priv = view->priv;
-	
+
 	return priv->summary;
 }
 
@@ -1406,12 +1406,12 @@ void
 itip_view_set_location (ItipView *view, const char *location)
 {
 	ItipViewPrivate *priv;
-	
+
 	g_return_if_fail (view != NULL);
-	g_return_if_fail (ITIP_IS_VIEW (view));	
-	
+	g_return_if_fail (ITIP_IS_VIEW (view));
+
 	priv = view->priv;
-	
+
 	if (priv->location)
 		g_free (priv->location);
 
@@ -1427,9 +1427,9 @@ itip_view_get_location (ItipView *view)
 
 	g_return_val_if_fail (view != NULL, NULL);
 	g_return_val_if_fail (ITIP_IS_VIEW (view), NULL);
-	
+
 	priv = view->priv;
-	
+
 	return priv->location;
 }
 
@@ -1437,12 +1437,12 @@ void
 itip_view_set_status (ItipView *view, const char *status)
 {
 	ItipViewPrivate *priv;
-	
+
 	g_return_if_fail (view != NULL);
-	g_return_if_fail (ITIP_IS_VIEW (view));	
-	
+	g_return_if_fail (ITIP_IS_VIEW (view));
+
 	priv = view->priv;
-	
+
 	if (priv->status)
 		g_free (priv->status);
 
@@ -1458,9 +1458,9 @@ itip_view_get_status (ItipView *view)
 
 	g_return_val_if_fail (view != NULL, NULL);
 	g_return_val_if_fail (ITIP_IS_VIEW (view), NULL);
-	
+
 	priv = view->priv;
-	
+
 	return priv->status;
 }
 
@@ -1468,12 +1468,12 @@ void
 itip_view_set_comment (ItipView *view, const char *comment)
 {
 	ItipViewPrivate *priv;
-	
+
 	g_return_if_fail (view != NULL);
-	g_return_if_fail (ITIP_IS_VIEW (view));	
-	
+	g_return_if_fail (ITIP_IS_VIEW (view));
+
 	priv = view->priv;
-	
+
 	if (priv->comment)
 		g_free (priv->comment);
 
@@ -1489,9 +1489,9 @@ itip_view_get_comment (ItipView *view)
 
 	g_return_val_if_fail (view != NULL, NULL);
 	g_return_val_if_fail (ITIP_IS_VIEW (view), NULL);
-	
+
 	priv = view->priv;
-	
+
 	return priv->comment;
 }
 
@@ -1500,12 +1500,12 @@ void
 itip_view_set_description (ItipView *view, const char *description)
 {
 	ItipViewPrivate *priv;
-	
+
 	g_return_if_fail (view != NULL);
-	g_return_if_fail (ITIP_IS_VIEW (view));	
-	
+	g_return_if_fail (ITIP_IS_VIEW (view));
+
 	priv = view->priv;
-	
+
 	if (priv->description)
 		g_free (priv->description);
 
@@ -1521,9 +1521,9 @@ itip_view_get_description (ItipView *view)
 
 	g_return_val_if_fail (view != NULL, NULL);
 	g_return_val_if_fail (ITIP_IS_VIEW (view), NULL);
-	
+
 	priv = view->priv;
-	
+
 	return priv->description;
 }
 
@@ -1532,22 +1532,22 @@ void
 itip_view_set_start (ItipView *view, struct tm *start)
 {
 	ItipViewPrivate *priv;
-	
+
 	g_return_if_fail (view != NULL);
-	g_return_if_fail (ITIP_IS_VIEW (view));	
-	
+	g_return_if_fail (ITIP_IS_VIEW (view));
+
 	priv = view->priv;
-	
+
 	if (priv->start_tm && !start) {
 		g_free (priv->start_tm);
 		priv->start_tm = NULL;
 	} else if (start) {
 		if (!priv->start_tm)
 			priv->start_tm = g_new0 (struct tm, 1);
-	
+
 		*priv->start_tm = *start;
-	} 
-	
+	}
+
 	set_start_text (view);
 }
 
@@ -1558,9 +1558,9 @@ itip_view_get_start (ItipView *view)
 
 	g_return_val_if_fail (view != NULL, NULL);
 	g_return_val_if_fail (ITIP_IS_VIEW (view), NULL);
-	
+
 	priv = view->priv;
-	
+
 	return priv->start_tm;
 }
 
@@ -1568,22 +1568,22 @@ void
 itip_view_set_end (ItipView *view, struct tm *end)
 {
 	ItipViewPrivate *priv;
-	
+
 	g_return_if_fail (view != NULL);
-	g_return_if_fail (ITIP_IS_VIEW (view));	
-	
+	g_return_if_fail (ITIP_IS_VIEW (view));
+
 	priv = view->priv;
-	
+
 	if (priv->end_tm && !end) {
 		g_free (priv->end_tm);
 		priv->end_tm = NULL;
 	} else if (end) {
 		if (!priv->end_tm)
 			priv->end_tm = g_new0 (struct tm, 1);
-	
+
 		*priv->end_tm = *end;
-	} 
-	
+	}
+
 	set_end_text (view);
 }
 
@@ -1594,9 +1594,9 @@ itip_view_get_end (ItipView *view)
 
 	g_return_val_if_fail (view != NULL, NULL);
 	g_return_val_if_fail (ITIP_IS_VIEW (view), NULL);
-	
+
 	priv = view->priv;
-	
+
 	return priv->end_tm;
 }
 
@@ -1608,7 +1608,7 @@ itip_view_add_upper_info_item (ItipView *view, ItipViewInfoItemType type, const
 
 	g_return_val_if_fail (view != NULL, 0);
 	g_return_val_if_fail (ITIP_IS_VIEW (view), 0);
-	
+
 	priv = view->priv;
 
 	item = g_new0 (ItipViewInfoItem, 1);
@@ -1616,7 +1616,7 @@ itip_view_add_upper_info_item (ItipView *view, ItipViewInfoItemType type, const
 	item->type = type;
 	item->message = g_strdup (message);
 	item->id = priv->next_info_item_id++;
-	
+
 	priv->upper_info_items = g_slist_append (priv->upper_info_items, item);
 
 	set_upper_info_items (view);
@@ -1630,17 +1630,17 @@ itip_view_add_upper_info_item_printf (ItipView *view, ItipViewInfoItemType type,
 	va_list args;
 	char *message;
 	guint id;
-	
+
 	g_return_val_if_fail (view != NULL, 0);
-	g_return_val_if_fail (ITIP_IS_VIEW (view), 0);	
-	
+	g_return_val_if_fail (ITIP_IS_VIEW (view), 0);
+
 	va_start (args, format);
 	message = g_strdup_vprintf (format, args);
 	va_end (args);
 
 	id = itip_view_add_upper_info_item (view, type, message);
 	g_free (message);
-	
+
 	return id;
 }
 
@@ -1649,10 +1649,10 @@ itip_view_remove_upper_info_item (ItipView *view, guint id)
 {
 	ItipViewPrivate *priv;
 	GSList *l;
-	
+
 	g_return_if_fail (view != NULL);
-	g_return_if_fail (ITIP_IS_VIEW (view));	
-	
+	g_return_if_fail (ITIP_IS_VIEW (view));
+
 	priv = view->priv;
 
 	for (l = priv->upper_info_items; l; l = l->next) {
@@ -1676,10 +1676,10 @@ itip_view_clear_upper_info_items (ItipView *view)
 {
 	ItipViewPrivate *priv;
 	GSList *l;
-	
+
 	g_return_if_fail (view != NULL);
-	g_return_if_fail (ITIP_IS_VIEW (view));	
-	
+	g_return_if_fail (ITIP_IS_VIEW (view));
+
 	priv = view->priv;
 
 	gtk_container_foreach (GTK_CONTAINER (priv->upper_info_box), (GtkCallback) gtk_widget_destroy, NULL);
@@ -1702,8 +1702,8 @@ itip_view_add_lower_info_item (ItipView *view, ItipViewInfoItemType type, const
 	ItipViewInfoItem *item;
 
 	g_return_val_if_fail (view != NULL, 0);
-	g_return_val_if_fail (ITIP_IS_VIEW (view), 0);	
-	
+	g_return_val_if_fail (ITIP_IS_VIEW (view), 0);
+
 	priv = view->priv;
 
 	item = g_new0 (ItipViewInfoItem, 1);
@@ -1711,7 +1711,7 @@ itip_view_add_lower_info_item (ItipView *view, ItipViewInfoItemType type, const
 	item->type = type;
 	item->message = g_strdup (message);
 	item->id = priv->next_info_item_id++;
-	
+
 	priv->lower_info_items = g_slist_append (priv->lower_info_items, item);
 
 	set_lower_info_items (view);
@@ -1725,17 +1725,17 @@ itip_view_add_lower_info_item_printf (ItipView *view, ItipViewInfoItemType type,
 	va_list args;
 	char *message;
 	guint id;
-	
+
 	g_return_val_if_fail (view != NULL, 0);
-	g_return_val_if_fail (ITIP_IS_VIEW (view), 0);	
-	
+	g_return_val_if_fail (ITIP_IS_VIEW (view), 0);
+
 	va_start (args, format);
 	message = g_strdup_vprintf (format, args);
 	va_end (args);
 
 	id = itip_view_add_lower_info_item (view, type, message);
 	g_free (message);
-	
+
 	return id;
 }
 
@@ -1744,10 +1744,10 @@ itip_view_remove_lower_info_item (ItipView *view, guint id)
 {
 	ItipViewPrivate *priv;
 	GSList *l;
-	
+
 	g_return_if_fail (view != NULL);
-	g_return_if_fail (ITIP_IS_VIEW (view));	
-	
+	g_return_if_fail (ITIP_IS_VIEW (view));
+
 	priv = view->priv;
 
 	for (l = priv->lower_info_items; l; l = l->next) {
@@ -1771,10 +1771,10 @@ itip_view_clear_lower_info_items (ItipView *view)
 {
 	ItipViewPrivate *priv;
 	GSList *l;
-	
+
 	g_return_if_fail (view != NULL);
-	g_return_if_fail (ITIP_IS_VIEW (view));	
-	
+	g_return_if_fail (ITIP_IS_VIEW (view));
+
 	priv = view->priv;
 
 	gtk_container_foreach (GTK_CONTAINER (priv->lower_info_box), (GtkCallback) gtk_widget_destroy, NULL);
@@ -1804,10 +1804,10 @@ void
 itip_view_set_source_list (ItipView *view, ESourceList *source_list)
 {
 	ItipViewPrivate *priv;
-	
+
 	g_return_if_fail (view != NULL);
-	g_return_if_fail (ITIP_IS_VIEW (view));	
-	
+	g_return_if_fail (ITIP_IS_VIEW (view));
+
 	priv = view->priv;
 
 	if (priv->source_list)
@@ -1815,7 +1815,7 @@ itip_view_set_source_list (ItipView *view, ESourceList *source_list)
 
 	if (priv->escb)
 		gtk_widget_destroy (priv->escb);
-		
+
 	if (!source_list) {
 		if (priv->escb_header)
 			gtk_widget_destroy (priv->escb_header);
@@ -1823,12 +1823,12 @@ itip_view_set_source_list (ItipView *view, ESourceList *source_list)
 		priv->source_list = NULL;
 		priv->escb = NULL;
 		priv->escb_header = NULL;
-		
+
 		return;
 	}
 
 	priv->source_list = g_object_ref (source_list);
-	
+
 	priv->escb = e_source_combo_box_new (source_list);
 	gtk_widget_show (priv->escb);
 	g_signal_connect (
@@ -1846,7 +1846,7 @@ itip_view_set_source_list (ItipView *view, ESourceList *source_list)
 		gtk_label_set_mnemonic_widget (GTK_LABEL (priv->escb_header), priv->escb);
 		gtk_widget_show (priv->escb_header);
 	}
-	
+
 	gtk_box_pack_start (GTK_BOX (priv->selector_box), priv->escb_header, FALSE, TRUE, 6);
 	gtk_box_pack_start (GTK_BOX (priv->selector_box), priv->escb, FALSE, TRUE, 0);
 }
@@ -1858,9 +1858,9 @@ itip_view_get_source_list (ItipView *view)
 
 	g_return_val_if_fail (view != NULL, NULL);
 	g_return_val_if_fail (ITIP_IS_VIEW (view), NULL);
-	
+
 	priv = view->priv;
-	
+
 	return priv->source_list;
 }
 
@@ -1868,10 +1868,10 @@ void
 itip_view_set_source (ItipView *view, ESource *source)
 {
 	ItipViewPrivate *priv;
-	
+
 	g_return_if_fail (view != NULL);
-	g_return_if_fail (ITIP_IS_VIEW (view));	
-	
+	g_return_if_fail (ITIP_IS_VIEW (view));
+
 	priv = view->priv;
 
 	if (!priv->escb)
@@ -1888,9 +1888,9 @@ itip_view_get_source (ItipView *view)
 
 	g_return_val_if_fail (view != NULL, NULL);
 	g_return_val_if_fail (ITIP_IS_VIEW (view), NULL);
-	
+
 	priv = view->priv;
-	
+
 	if (!priv->escb)
 		return NULL;
 
@@ -1902,12 +1902,12 @@ void
 itip_view_set_rsvp (ItipView *view, gboolean rsvp)
 {
 	ItipViewPrivate *priv;
-	
+
 	g_return_if_fail (view != NULL);
-	g_return_if_fail (ITIP_IS_VIEW (view));	
-	
+	g_return_if_fail (ITIP_IS_VIEW (view));
+
 	priv = view->priv;
-	
+
 	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->rsvp_check), rsvp);
 
 	gtk_widget_set_sensitive (priv->rsvp_comment_header, rsvp);
@@ -1921,9 +1921,9 @@ itip_view_get_rsvp (ItipView *view)
 
 	g_return_val_if_fail (view != NULL, FALSE);
 	g_return_val_if_fail (ITIP_IS_VIEW (view), FALSE);
-	
+
 	priv = view->priv;
-	
+
 	return gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv->rsvp_check));
 }
 
@@ -1931,12 +1931,12 @@ void
 itip_view_set_show_rsvp (ItipView *view, gboolean rsvp)
 {
 	ItipViewPrivate *priv;
-	
+
 	g_return_if_fail (view != NULL);
-	g_return_if_fail (ITIP_IS_VIEW (view));	
-	
+	g_return_if_fail (ITIP_IS_VIEW (view));
+
 	priv = view->priv;
-	
+
 	priv->rsvp_show = rsvp;
 
 	priv->rsvp_show ? gtk_widget_show (priv->rsvp_box) : gtk_widget_hide (priv->rsvp_box);
@@ -1949,9 +1949,9 @@ itip_view_get_show_rsvp (ItipView *view)
 
 	g_return_val_if_fail (view != NULL, FALSE);
 	g_return_val_if_fail (ITIP_IS_VIEW (view), FALSE);
-	
+
 	priv = view->priv;
-	
+
 	return priv->rsvp_show;
 }
 
@@ -1959,12 +1959,12 @@ void
 itip_view_set_update (ItipView *view, gboolean update)
 {
 	ItipViewPrivate *priv;
-	
+
 	g_return_if_fail (view != NULL);
-	g_return_if_fail (ITIP_IS_VIEW (view));	
-	
+	g_return_if_fail (ITIP_IS_VIEW (view));
+
 	priv = view->priv;
-	
+
 	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->update_check), update);
 }
 
@@ -1975,9 +1975,9 @@ itip_view_get_update (ItipView *view)
 
 	g_return_val_if_fail (view != NULL, FALSE);
 	g_return_val_if_fail (ITIP_IS_VIEW (view), FALSE);
-	
+
 	priv = view->priv;
-	
+
 	return gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv->update_check));
 }
 
@@ -1985,12 +1985,12 @@ void
 itip_view_set_show_update (ItipView *view, gboolean update)
 {
 	ItipViewPrivate *priv;
-	
+
 	g_return_if_fail (view != NULL);
-	g_return_if_fail (ITIP_IS_VIEW (view));	
-	
+	g_return_if_fail (ITIP_IS_VIEW (view));
+
 	priv = view->priv;
-	
+
 	priv->update_show = update;
 
 	priv->update_show ? gtk_widget_show (priv->update_box) : gtk_widget_hide (priv->update_box);
@@ -2003,9 +2003,9 @@ itip_view_get_show_update (ItipView *view)
 
 	g_return_val_if_fail (view != NULL, FALSE);
 	g_return_val_if_fail (ITIP_IS_VIEW (view), FALSE);
-	
+
 	priv = view->priv;
-	
+
 	return priv->update_show;
 }
 
@@ -2013,12 +2013,12 @@ void
 itip_view_set_rsvp_comment (ItipView *view, const char *comment)
 {
 	ItipViewPrivate *priv;
-	
+
 	g_return_if_fail (view != NULL);
-	g_return_if_fail (ITIP_IS_VIEW (view));	
-	
+	g_return_if_fail (ITIP_IS_VIEW (view));
+
 	priv = view->priv;
-	
+
 	gtk_entry_set_text (GTK_ENTRY (priv->rsvp_comment_entry), comment);
 }
 
@@ -2029,9 +2029,9 @@ itip_view_get_rsvp_comment (ItipView *view)
 
 	g_return_val_if_fail (view != NULL, NULL);
 	g_return_val_if_fail (ITIP_IS_VIEW (view), NULL);
-	
+
 	priv = view->priv;
-	
+
 	return gtk_entry_get_text (GTK_ENTRY (priv->rsvp_comment_entry));
 }
 
@@ -2039,12 +2039,12 @@ void
 itip_view_set_needs_decline (ItipView *view, gboolean needs_decline)
 {
 	ItipViewPrivate *priv;
-	
+
 	g_return_if_fail (view != NULL);
-	g_return_if_fail (ITIP_IS_VIEW (view));	
-	
+	g_return_if_fail (ITIP_IS_VIEW (view));
+
 	priv = view->priv;
-	
+
 	priv->needs_decline = needs_decline;
 }
 
@@ -2052,12 +2052,12 @@ void
 itip_view_set_buttons_sensitive (ItipView *view, gboolean sensitive)
 {
 	ItipViewPrivate *priv;
-	
+
 	g_return_if_fail (view != NULL);
-	g_return_if_fail (ITIP_IS_VIEW (view));	
-	
+	g_return_if_fail (ITIP_IS_VIEW (view));
+
 	priv = view->priv;
-	
+
 	priv->buttons_sensitive = sensitive;
 
 	gtk_widget_set_sensitive (priv->button_box, priv->buttons_sensitive);
@@ -2070,13 +2070,13 @@ itip_view_get_buttons_sensitive (ItipView *view)
 
 	g_return_val_if_fail (view != NULL, FALSE);
 	g_return_val_if_fail (ITIP_IS_VIEW (view), FALSE);
-	
+
 	priv = view->priv;
-	
+
 	return priv->buttons_sensitive;
 }
 
-gboolean	
+gboolean
 itip_view_get_recur_check_state (ItipView *view)
 {
 	return gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (view->priv->recur_check));
@@ -2086,8 +2086,8 @@ void
 itip_view_set_show_recur_check (ItipView *view, gboolean show)
 {
 	g_return_if_fail (view != NULL);
-	g_return_if_fail (ITIP_IS_VIEW (view));	
-	
+	g_return_if_fail (ITIP_IS_VIEW (view));
+
 	if (show)
 		gtk_widget_show (view->priv->recur_check);
 	else  {
diff --git a/plugins/itip-formatter/itip-view.h b/plugins/itip-formatter/itip-view.h
index f66d1957a9..a93da5c53c 100644
--- a/plugins/itip-formatter/itip-view.h
+++ b/plugins/itip-formatter/itip-view.h
@@ -77,7 +77,7 @@ typedef enum {
 
 struct _ItipView {
 	GtkHBox parent_instance;
-	
+
 	ItipViewPrivate *priv;
 
 	GtkWidget *action_vbox;
@@ -138,12 +138,12 @@ const struct tm *itip_view_get_start (ItipView *view);
 void itip_view_set_end (ItipView *view, struct tm *end);
 const struct tm *itip_view_get_end (ItipView *view);
 
-guint itip_view_add_upper_info_item (ItipView *view, ItipViewInfoItemType type, const char *message); 
+guint itip_view_add_upper_info_item (ItipView *view, ItipViewInfoItemType type, const char *message);
 guint itip_view_add_upper_info_item_printf (ItipView *view, ItipViewInfoItemType, const char *format, ...) G_GNUC_PRINTF (3, 4);
 void itip_view_remove_upper_info_item (ItipView *view, guint id);
 void itip_view_clear_upper_info_items (ItipView *view);
 
-guint itip_view_add_lower_info_item (ItipView *view, ItipViewInfoItemType type, const char *message); 
+guint itip_view_add_lower_info_item (ItipView *view, ItipViewInfoItemType type, const char *message);
 guint itip_view_add_lower_info_item_printf (ItipView *view, ItipViewInfoItemType type, const char *format, ...) G_GNUC_PRINTF (3, 4);
 void itip_view_remove_lower_info_item (ItipView *view, guint id);
 void itip_view_clear_lower_info_items (ItipView *view);
diff --git a/plugins/mail-account-disable/mail-account-disable.c b/plugins/mail-account-disable/mail-account-disable.c
index 931525321c..bd6df815b0 100644
--- a/plugins/mail-account-disable/mail-account-disable.c
+++ b/plugins/mail-account-disable/mail-account-disable.c
@@ -47,7 +47,7 @@ static EPopupItem popup_items[] = {
 	{ E_POPUP_ITEM, "20.emc.04", N_("Proxy _Logout"), mail_account_disable, NULL, NULL, 0, EM_POPUP_FOLDER_STORE }
 };
 
-static void 
+static void
 popup_free (EPopup *ep, GSList *items, void *data)
 {
 	g_slist_free (items);
@@ -65,11 +65,11 @@ mail_account_disable (EPopup *ep, EPopupItem *p, void *data)
 
 	if (mail_config_has_proxies (account))
 		mail_config_remove_account_proxies (account);
-		
+
 	account->enabled = !account->enabled;
 	e_account_list_change (mail_config_get_accounts (), account);
 	mail_component_remove_store_by_uri (component, account->source->url);
- 
+
 	if (account->parent_uid)
 		mail_config_remove_account (account);
 
diff --git a/plugins/mail-notification/mail-notification.c b/plugins/mail-notification/mail-notification.c
index bcdac7263e..7025579172 100644
--- a/plugins/mail-notification/mail-notification.c
+++ b/plugins/mail-notification/mail-notification.c
@@ -36,7 +36,7 @@
 #include <mail/em-folder-tree-model.h>
 #include <camel/camel-folder.h>
 
-#ifdef HAVE_LIBNOTIFY	
+#ifdef HAVE_LIBNOTIFY
 #include <libnotify/notify.h>
 #endif
 
@@ -50,7 +50,7 @@ void org_gnome_mail_read_notify (EPlugin *ep, EMEventTargetMessage *t);
 static gboolean enabled = FALSE;
 static GtkStatusIcon *status_icon = NULL;
 
-#ifdef HAVE_LIBNOTIFY	
+#ifdef HAVE_LIBNOTIFY
 static gboolean notification_callback (gpointer notify);
 static NotifyNotification *notify = NULL;
 #endif
@@ -67,7 +67,7 @@ org_gnome_mail_read_notify (EPlugin *ep, EMEventTargetMessage *t)
 		return;
 	}
 
-#ifdef HAVE_LIBNOTIFY	
+#ifdef HAVE_LIBNOTIFY
 	notify_notification_close (notify, NULL);
 #endif
 	gtk_status_icon_set_visible (status_icon, FALSE);
@@ -76,28 +76,28 @@ org_gnome_mail_read_notify (EPlugin *ep, EMEventTargetMessage *t)
 }
 
 static void
-#ifdef HAVE_LIBNOTIFY	
+#ifdef HAVE_LIBNOTIFY
 icon_activated (GtkStatusIcon *icon, NotifyNotification *notify)
 #else
 icon_activated (GtkStatusIcon *icon, gpointer notify)
 #endif
 {
 	g_static_mutex_lock (&mlock);
-#ifdef HAVE_LIBNOTIFY		
+#ifdef HAVE_LIBNOTIFY
 	notify_notification_close (notify, NULL);
-#endif	
+#endif
 	gtk_status_icon_set_visible (status_icon, FALSE);
 	g_static_mutex_unlock (&mlock);
 
 }
 
-#ifdef HAVE_LIBNOTIFY	
+#ifdef HAVE_LIBNOTIFY
 gboolean
 notification_callback (gpointer notify)
 {
 	printf("fff\n");
 	return (!notify_notification_show(notify, NULL));
-	
+
 }
 #endif
 
@@ -119,7 +119,7 @@ org_gnome_mail_new_notify (EPlugin *ep, EMEventTargetFolder *t)
 	is_key = gconf_client_get (client, GCONF_KEY_BLINK, NULL);
 	if (!is_key)
 		gconf_client_set_bool (client, GCONF_KEY_BLINK, TRUE, NULL);
-	else 
+	else
 		gconf_value_free (is_key);
 
 	if (!status_icon) {
@@ -133,10 +133,10 @@ org_gnome_mail_new_notify (EPlugin *ep, EMEventTargetFolder *t)
 
 	gtk_status_icon_set_tooltip (status_icon, msg);
 	gtk_status_icon_set_visible (status_icon, TRUE);
-	gtk_status_icon_set_blinking (status_icon, 
+	gtk_status_icon_set_blinking (status_icon,
 			gconf_client_get_bool (client, GCONF_KEY_BLINK, NULL));
 
-#ifdef HAVE_LIBNOTIFY	
+#ifdef HAVE_LIBNOTIFY
 	/* See whether the notification key has already been set */
 	is_key = gconf_client_get (client, GCONF_KEY_NOTIFICATION, NULL);
 	if (!is_key)
@@ -150,8 +150,8 @@ org_gnome_mail_new_notify (EPlugin *ep, EMEventTargetFolder *t)
 			fprintf(stderr,"notify init error");
 
 		notify  = notify_notification_new (
-				_("New email"), 
-				msg, 
+				_("New email"),
+				msg,
 				"stock_mail",
 				NULL);
 		notify_notification_attach_to_status_icon (notify, status_icon);
@@ -166,13 +166,13 @@ org_gnome_mail_new_notify (EPlugin *ep, EMEventTargetFolder *t)
 	g_free (folder);
 	g_free (msg);
 	g_object_unref (client);
-#ifdef HAVE_LIBNOTIFY		
+#ifdef HAVE_LIBNOTIFY
 	g_signal_connect (G_OBJECT (status_icon), "activate",
 			  G_CALLBACK (icon_activated), notify);
 #else
 	g_signal_connect (G_OBJECT (status_icon), "activate",
 			  G_CALLBACK (icon_activated), NULL);
-#endif	
+#endif
 	g_static_mutex_unlock (&mlock);
 }
 
@@ -186,7 +186,7 @@ e_plugin_lib_enable (EPluginLib *ep, int enable)
 		enabled = TRUE;
 	else
 		enabled = FALSE;
-	
+
 	return 0;
 }
 
diff --git a/plugins/mail-remote/client.c b/plugins/mail-remote/client.c
index 5740d526c6..2c633c9d1d 100644
--- a/plugins/mail-remote/client.c
+++ b/plugins/mail-remote/client.c
@@ -219,7 +219,7 @@ add_message(Evolution_Mail_Folder folder, const char *msg)
 	mis.flagMask = CAMEL_MESSAGE_SEEN;
 
 	mem = (BonoboObject *)evolution_mail_messagestream_new_buffer(msg, strlen(msg));
-			
+
 	printf("attempt send mail to store\n");
 	Evolution_Mail_Folder_appendMessage(folder, &mis, bonobo_object_corba_objref(mem), &ev);
 	if (ev._major != CORBA_NO_EXCEPTION) {
@@ -260,9 +260,9 @@ static int domain(void *data)
 		Evolution_Mail_Properties *props;
 #endif
 		Evolution_Mail_Store store = stores->_buffer[i].store;
-		
+
 		printf("store %p '%s' uid '%s'\n", store, stores->_buffer[i].name, stores->_buffer[i].uid);
-			
+
 #if 0
 		Evolution_Mail_Store_getProperties(store, &names, &props, &ev);
 		if (ev._major != CORBA_NO_EXCEPTION) {
@@ -287,12 +287,12 @@ static int domain(void *data)
 		{
 			char *msg = "To: notzed@novell.com\r\n"
 				"Subject: This is a test from auto-send\r\n"
-				"\r\n" 
+				"\r\n"
 				"Blah blah, test message!\r\n";
 			BonoboObject *mem;
 
 			mem = (BonoboObject *)evolution_mail_messagestream_new_buffer(msg, strlen(msg));
-			
+
 			printf("attempt send mail to store\n");
 			Evolution_Mail_Store_sendMessage(store, bonobo_object_corba_objref(mem), &ev);
 			if (ev._major != CORBA_NO_EXCEPTION)
@@ -313,7 +313,7 @@ static int domain(void *data)
 				if (!strcmp(folders->_buffer[f].full_name, "Private")) {
 					const char *msg = "To: notzed@novell.com\r\n"
 						"Subject: This is a test append from client\r\n"
-						"\r\n" 
+						"\r\n"
 						"Blah blah, test appended message!\r\n";
 
 					list_folder(folders->_buffer[f].folder);
diff --git a/plugins/mail-remote/em-message-stream.c b/plugins/mail-remote/em-message-stream.c
index dc8ff9653e..4506cde6bb 100644
--- a/plugins/mail-remote/em-message-stream.c
+++ b/plugins/mail-remote/em-message-stream.c
@@ -112,7 +112,7 @@ CamelType
 em_message_stream_get_type (void)
 {
 	static CamelType type = CAMEL_INVALID_TYPE;
-	
+
 	if (type == CAMEL_INVALID_TYPE) {
 		type = camel_type_register (CAMEL_STREAM_TYPE,
 					    "EMMessageStream",
@@ -123,7 +123,7 @@ em_message_stream_get_type (void)
 					    (CamelObjectInitFunc) em_message_stream_init,
 					    (CamelObjectFinalizeFunc) em_message_stream_finalize);
 	}
-	
+
 	return type;
 }
 
diff --git a/plugins/mail-remote/evolution-mail-folder.c b/plugins/mail-remote/evolution-mail-folder.c
index b1be464121..55adac81eb 100644
--- a/plugins/mail-remote/evolution-mail-folder.c
+++ b/plugins/mail-remote/evolution-mail-folder.c
@@ -1,5 +1,5 @@
 /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* 
+/*
  * Copyright (C) 2005  Novell, Inc.
  *
  * Authors: Michael Zucchi <notzed@novell.com>
@@ -216,7 +216,7 @@ impl_getMessage(PortableServer_Servant _servant, const CORBA_char * uid, CORBA_E
 	return out;
 }
 
-static void 
+static void
 impl_appendMessage(PortableServer_Servant _servant, const Evolution_Mail_MessageInfoSet*mi, const Evolution_Mail_MessageStream message, CORBA_Environment *ev)
 {
 	EvolutionMailFolder *emf = (EvolutionMailFolder *)bonobo_object_from_servant(_servant);
diff --git a/plugins/mail-remote/evolution-mail-folderlistener.c b/plugins/mail-remote/evolution-mail-folderlistener.c
index f2a0d83f16..e9fa86dd4f 100644
--- a/plugins/mail-remote/evolution-mail-folderlistener.c
+++ b/plugins/mail-remote/evolution-mail-folderlistener.c
@@ -1,5 +1,5 @@
 /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* 
+/*
  * Copyright (C) 2005  Novell, Inc.
  *
  * This program is free software; you can redistribute it and/or
diff --git a/plugins/mail-remote/evolution-mail-messageiterator.c b/plugins/mail-remote/evolution-mail-messageiterator.c
index 6f86ff97f0..bb254100d1 100644
--- a/plugins/mail-remote/evolution-mail-messageiterator.c
+++ b/plugins/mail-remote/evolution-mail-messageiterator.c
@@ -1,5 +1,5 @@
 /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* 
+/*
  * Copyright (C) 2005  Novell, Inc.
  *
  * Authors: Michael Zucchi <notzed@novell.com>
diff --git a/plugins/mail-remote/evolution-mail-messagestream.c b/plugins/mail-remote/evolution-mail-messagestream.c
index a1eeed4979..7a7ce9b192 100644
--- a/plugins/mail-remote/evolution-mail-messagestream.c
+++ b/plugins/mail-remote/evolution-mail-messagestream.c
@@ -1,5 +1,5 @@
 /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* 
+/*
  * Copyright (C) 2005  Novell, Inc.
  *
  * Authors: Michael Zucchi <notzed@novell.com>
diff --git a/plugins/mail-remote/evolution-mail-session.c b/plugins/mail-remote/evolution-mail-session.c
index d499775c7b..cf9ad7b8f2 100644
--- a/plugins/mail-remote/evolution-mail-session.c
+++ b/plugins/mail-remote/evolution-mail-session.c
@@ -1,5 +1,5 @@
 /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* 
+/*
  * Copyright (C) 2005  Novell, Inc.
  *
  * This program is free software; you can redistribute it and/or
diff --git a/plugins/mail-remote/evolution-mail-sessionlistener.c b/plugins/mail-remote/evolution-mail-sessionlistener.c
index e0efbe2ea5..3c84092bf0 100644
--- a/plugins/mail-remote/evolution-mail-sessionlistener.c
+++ b/plugins/mail-remote/evolution-mail-sessionlistener.c
@@ -1,5 +1,5 @@
 /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* 
+/*
  * Copyright (C) 2005  Novell, Inc.
  *
  * This program is free software; you can redistribute it and/or
diff --git a/plugins/mail-remote/evolution-mail-store.c b/plugins/mail-remote/evolution-mail-store.c
index ac81d84345..2286441128 100644
--- a/plugins/mail-remote/evolution-mail-store.c
+++ b/plugins/mail-remote/evolution-mail-store.c
@@ -1,5 +1,5 @@
 /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* 
+/*
  * Copyright (C) 2005  Novell, Inc.
  *
  * Authors: Michael Zucchi <notzed@novell.com>
diff --git a/plugins/mail-remote/evolution-mail-storelistener.c b/plugins/mail-remote/evolution-mail-storelistener.c
index 1481e90554..ef7a83fdcf 100644
--- a/plugins/mail-remote/evolution-mail-storelistener.c
+++ b/plugins/mail-remote/evolution-mail-storelistener.c
@@ -1,5 +1,5 @@
 /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* 
+/*
  * Copyright (C) 2005  Novell, Inc.
  *
  * This program is free software; you can redistribute it and/or
diff --git a/plugins/mail-to-task/mail-to-task.c b/plugins/mail-to-task/mail-to-task.c
index 6d4f0c4735..2d1968073d 100644
--- a/plugins/mail-to-task/mail-to-task.c
+++ b/plugins/mail-to-task/mail-to-task.c
@@ -84,11 +84,11 @@ set_attendees (ECalComponent *comp, CamelMimeMessage *message)
 				char *temp;
 
 				ca = g_new0 (ECalComponentAttendee, 1);
-				
+
 				temp = g_strconcat ("mailto:", addr, NULL);
 				ca->value = temp;
 				to_free = g_slist_prepend (to_free, temp);
-				
+
 				ca->cn = name;
 				/* FIXME: missing many fields */
 
@@ -103,7 +103,7 @@ set_attendees (ECalComponent *comp, CamelMimeMessage *message)
 		g_free (l->data);
 
 	g_slist_foreach (to_free, (GFunc) g_free, NULL);
-	
+
 	g_slist_free (to_free);
 	g_slist_free (attendees);
 }
@@ -151,14 +151,14 @@ set_description (ECalComponent *comp, CamelMimeMessage *message)
 	/* convert to UTF-8 string */
 	if (str && content->mime_type->params && content->mime_type->params->value)
 	{
-		convert_str = g_convert (str, strlen (str), 
+		convert_str = g_convert (str, strlen (str),
 					 "UTF-8", content->mime_type->params->value,
 					 &bytes_read, &bytes_written, NULL);
 	}
 
 	if (convert_str)
 		text.value = convert_str;
-	else 
+	else
 		text.value = str;
 	text.altrep = NULL;
 	sl.next = NULL;
@@ -193,7 +193,7 @@ set_organizer (ECalComponent *comp, CamelMimeMessage *message)
 	organizer.value = temp;
 	organizer.cn = name;
 	e_cal_component_set_organizer (comp, &organizer);
-	
+
 	g_free (temp);
 }
 
@@ -244,7 +244,7 @@ set_attachments (ECal *client, ECalComponent *comp, CamelMimeMessage *message)
 			list = g_slist_append (list, g_strdup (uri));
 			g_free (uri);
 		}
-		
+
 		g_free (tmp);
 		g_free (filename);
 		g_free (path);
@@ -255,7 +255,7 @@ set_attachments (ECal *client, ECalComponent *comp, CamelMimeMessage *message)
 	e_cal_component_set_attachment_list (comp, list);
 }
 
-static gboolean 
+static gboolean
 do_mail_to_task (AsyncData *data)
 {
 	ECal *client = data->client;
@@ -265,7 +265,7 @@ do_mail_to_task (AsyncData *data)
 	/* open the task client */
 	if (e_cal_open (client, FALSE, NULL)) {
 		int i;
-			
+
 		for (i = 0; i < (uids ? uids->len : 0); i++) {
 			CamelMimeMessage *message;
 			ECalComponent *comp;
@@ -307,18 +307,18 @@ do_mail_to_task (AsyncData *data)
 			set_attachments (client, comp, message);
 
 			icalcomp = e_cal_component_get_icalcomponent (comp);
-			
+
 			icalprop = icalproperty_new_x ("1");
 			icalproperty_set_x_name (icalprop, "X-EVOLUTION-MOVE-CALENDAR");
 			icalcomponent_add_property (icalcomp, icalprop);
-			
+
 			/* save the task to the selected source */
 			e_cal_create_object (client, icalcomp, NULL, NULL);
 
 			g_object_unref (comp);
 		}
 	}
-	
+
 	/* free memory */
 	g_object_unref (data->client);
 	g_ptr_array_free (data->uids, TRUE);
@@ -333,7 +333,7 @@ void org_gnome_mail_to_task (void *ep, EMPopupTargetSelect *t);
 void org_gnome_mail_to_task_menu (EPlugin *ep, EMMenuTargetSelect *target);
 
 static void
-copy_uids (char *uid, GPtrArray *uid_array) 
+copy_uids (char *uid, GPtrArray *uid_array)
 {
 	g_ptr_array_add (uid_array, g_strdup (uid));
 }
@@ -391,7 +391,7 @@ convert_to_task (GPtrArray *uid_array, struct _CamelFolder *folder, EMFolderView
 	GtkWidget *dialog;
 	GConfClient *conf_client;
 	ESourceList *source_list;
-	
+
 	/* ask the user which tasks list to save to */
 	conf_client = gconf_client_get_default ();
 	source_list = e_source_list_new_for_gconf (conf_client, "/apps/evolution/tasks/sources");
@@ -408,11 +408,11 @@ convert_to_task (GPtrArray *uid_array, struct _CamelFolder *folder, EMFolderView
 			AsyncData *data = NULL;
 			GThread *thread = NULL;
 			GError *error = NULL;
-			
+
 			client = auth_new_cal_from_source (source, E_CAL_SOURCE_TYPE_TODO);
 			if (!client) {
 				char *uri = e_source_get_uri (source);
-				
+
 				g_warning ("Could not create the client: %s \n", uri);
 
 				g_free (uri);
@@ -421,11 +421,11 @@ convert_to_task (GPtrArray *uid_array, struct _CamelFolder *folder, EMFolderView
 				gtk_widget_destroy (dialog);
 				return;
 			}
-			
+
 			/* Fill the elements in AsynData */
 			data = g_new0 (AsyncData, 1);
 			data->client = client;
-			data->folder = folder; 
+			data->folder = folder;
 			data->uids = uid_array;
 
 			if (uid_array->len == 1)
@@ -445,7 +445,7 @@ convert_to_task (GPtrArray *uid_array, struct _CamelFolder *folder, EMFolderView
 	g_object_unref (conf_client);
 	g_object_unref (source_list);
 	gtk_widget_destroy (dialog);
-	
+
 }
 
 void
@@ -454,7 +454,7 @@ org_gnome_mail_to_task (void *ep, EMPopupTargetSelect *t)
 	GPtrArray *uid_array = NULL;
 
 	if (t->uids->len > 0) {
-		/* FIXME Some how in the thread function the values inside t->uids gets freed 
+		/* FIXME Some how in the thread function the values inside t->uids gets freed
 		   and are corrupted which needs to be fixed, this is sought of work around fix for
 		   the gui inresponsiveness */
 		uid_array = g_ptr_array_new ();
@@ -471,7 +471,7 @@ void org_gnome_mail_to_task_menu (EPlugin *ep, EMMenuTargetSelect *t)
 	GPtrArray *uid_array = NULL;
 
 	if (t->uids->len > 0) {
-		/* FIXME Some how in the thread function the values inside t->uids gets freed 
+		/* FIXME Some how in the thread function the values inside t->uids gets freed
 		   and are corrupted which needs to be fixed, this is sought of work around fix for
 		   the gui inresponsiveness */
 		uid_array = g_ptr_array_new ();
diff --git a/plugins/mailing-list-actions/mailing-list-actions.c b/plugins/mailing-list-actions/mailing-list-actions.c
index f8ae698a80..f872a0e983 100644
--- a/plugins/mailing-list-actions/mailing-list-actions.c
+++ b/plugins/mailing-list-actions/mailing-list-actions.c
@@ -91,7 +91,7 @@ void emla_list_action (EPlugin *item, EMMenuTargetSelect* sel, EmlaAction action
 	mail_get_message (sel->folder, (const char*) g_ptr_array_index (sel->uids, 0),
 	                  emla_list_action_do, data, mail_thread_new);
 }
-	
+
 void emla_list_action_do (CamelFolder *folder, const char *uid, CamelMimeMessage *msg, void *data)
 {
 	emla_action_data *action_data = (emla_action_data *) data;
@@ -127,7 +127,7 @@ void emla_list_action_do (CamelFolder *folder, const char *uid, CamelMimeMessage
 			goto exit;
 		}
 	}
-	
+
 	/* parse the action value */
 	while (*headerpos) {
 		/* skip whitespace */
@@ -136,7 +136,7 @@ void emla_list_action_do (CamelFolder *folder, const char *uid, CamelMimeMessage
 			e_error_run (NULL, "org.gnome.mailing-list-actions:malformed-header", emla_action_headers[t].header, header, NULL);
 			goto exit;
 		}
-		
+
 		/* get URL portion */
 		url = g_strndup(headerpos, end - headerpos);
 
@@ -163,22 +163,22 @@ void emla_list_action_do (CamelFolder *folder, const char *uid, CamelMimeMessage
 			gnome_url_show (url, &err);
 			if (!err)
 				goto exit;
-			g_error_free (err);			
+			g_error_free (err);
 		}
 		g_free (url);
 		url = NULL;
 		headerpos = end++;
-		
+
 		/* ignore everything 'till next comma */
 		headerpos = strchr (headerpos, ',');
 		if (!headerpos)
 			break;
 		headerpos++;
 	}
-	
+
 	/* if we got here, there's no valid action */
 	e_error_run (NULL, "org.gnome.mailing-list-actions:no-action", header, NULL);
-	
+
 exit:
 	free (action_data->uri);
 	free (action_data);
diff --git a/plugins/mark-all-read/mark-all-read.c b/plugins/mark-all-read/mark-all-read.c
index 9d3a67bc5a..e766d45df5 100644
--- a/plugins/mark-all-read/mark-all-read.c
+++ b/plugins/mark-all-read/mark-all-read.c
@@ -34,16 +34,16 @@
 #include "e-util/e-error.h"
 
 void org_gnome_mark_all_read (EPlugin *ep, EMPopupTargetFolder *target);
-static void mar_got_folder (char *uri, CamelFolder *folder, void *data); 
+static void mar_got_folder (char *uri, CamelFolder *folder, void *data);
 static void mar_all_sub_folders (CamelStore *store, CamelFolderInfo *fi, CamelException *ex);
 
-void 
+void
 org_gnome_mark_all_read (EPlugin *ep, EMPopupTargetFolder *t)
 {
 	if (t->uri == NULL) {
 		return;
 	}
-	
+
 	mail_get_folder(t->uri, 0, mar_got_folder, NULL, mail_thread_new);
 }
 
@@ -52,17 +52,17 @@ mark_all_as_read (CamelFolder *folder)
 {
 	GPtrArray *uids;
 	int i;
-	
-	uids =  camel_folder_get_uids (folder); 
+
+	uids =  camel_folder_get_uids (folder);
 	camel_folder_freeze(folder);
 	for (i=0;i<uids->len;i++)
 		camel_folder_set_message_flags(folder, uids->pdata[i], CAMEL_MESSAGE_SEEN, CAMEL_MESSAGE_SEEN);
 	camel_folder_thaw(folder);
-	camel_folder_free_uids (folder, uids); 
+	camel_folder_free_uids (folder, uids);
 }
 
-static void 
-mar_got_folder (char *uri, CamelFolder *folder, void *data) 
+static void
+mar_got_folder (char *uri, CamelFolder *folder, void *data)
 {
 	CamelFolderInfo *info;
 	CamelStore *store;
@@ -77,26 +77,26 @@ mar_got_folder (char *uri, CamelFolder *folder, void *data)
 		return;
 
 	store = folder->parent_store;
-	info = camel_store_get_folder_info (store, folder->full_name, flags, &ex); 
+	info = camel_store_get_folder_info (store, folder->full_name, flags, &ex);
 
-	if (camel_exception_is_set (&ex)) { 
+	if (camel_exception_is_set (&ex)) {
 		camel_exception_clear (&ex);
 		return;
 	}
-	
+
 	if (info && (info->child || info->next)) {
 		response = e_error_run (NULL, "mail:ask-mark-read", NULL);
 	} else {
 		mark_all_as_read (folder);
 		return;
 	}
-				
+
 	if (response == GTK_RESPONSE_NO) {
 		mark_all_as_read (folder);
 	} else if (response == GTK_RESPONSE_YES){
-		mar_all_sub_folders (store, info, &ex); 
+		mar_all_sub_folders (store, info, &ex);
 	}
-	 
+
 }
 
 static void
@@ -104,20 +104,20 @@ mar_all_sub_folders (CamelStore *store, CamelFolderInfo *fi, CamelException *ex)
 {
 	while (fi) {
 		CamelFolder *folder;
-		
+
 		if (fi->child) {
 			mar_all_sub_folders (store, fi->child, ex);
 			if (camel_exception_is_set (ex))
 				return;
 		}
-		
+
 		if (!(folder = camel_store_get_folder (store, fi->full_name, 0, ex)))
 			return;
-		
+
 		if (!CAMEL_IS_VEE_FOLDER (folder)) {
-			mark_all_as_read (folder);	
+			mark_all_as_read (folder);
 		}
-		
+
 		fi = fi->next;
 	}
 }
diff --git a/plugins/mark-calendar-offline/mark-calendar-offline.c b/plugins/mark-calendar-offline/mark-calendar-offline.c
index dea9baf28a..fee8595883 100644
--- a/plugins/mark-calendar-offline/mark-calendar-offline.c
+++ b/plugins/mark-calendar-offline/mark-calendar-offline.c
@@ -20,7 +20,7 @@
  */
 
 /* This is prototype code only, this may, or may not, use undocumented
- * unstable or private internal function calls. 
+ * unstable or private internal function calls.
  * This code has been derived from the source of the sample eplugin
  * select_one_source.
  */
@@ -38,7 +38,7 @@ void
 org_gnome_mark_calendar_no_offline (EPlugin *ep, ECalPopupTargetSource *target)
 {
 	ESource *source;
-	
+
 	source = e_source_selector_peek_primary_selection (target->selector);
 	e_source_set_property (source, "offline", "0");
 }
@@ -47,7 +47,7 @@ void
 org_gnome_mark_calendar_offline (EPlugin *ep, ECalPopupTargetSource *target)
 {
 	ESource *source;
-	
+
 	source = e_source_selector_peek_primary_selection (target->selector);
 	e_source_set_property (source, "offline", "1");
 }
diff --git a/plugins/mono/mono-plugin.c b/plugins/mono/mono-plugin.c
index d945ae5508..7a89046f15 100644
--- a/plugins/mono/mono-plugin.c
+++ b/plugins/mono/mono-plugin.c
@@ -184,7 +184,7 @@ void *
 org_gnome_evolution_mono_get_type(void *a, void *b)
 {
 	static GType type = 0;
-	
+
 	if (!type) {
 		static const GTypeInfo info = {
 			sizeof(EPluginMonoClass), NULL, NULL, (GClassInitFunc) epm_class_init, NULL, NULL,
@@ -196,6 +196,6 @@ org_gnome_evolution_mono_get_type(void *a, void *b)
 		domain = mono_jit_init("Evolution");
 		mono_thread_attach(domain);
 	}
-	
+
 	return GUINT_TO_POINTER(type);
 }
diff --git a/plugins/new-mail-notify/new-mail-notify.c b/plugins/new-mail-notify/new-mail-notify.c
index 9960e40b11..139838b64a 100644
--- a/plugins/new-mail-notify/new-mail-notify.c
+++ b/plugins/new-mail-notify/new-mail-notify.c
@@ -49,18 +49,18 @@ static void
 send_dbus_message (const char *name, const char *data, guint new)
 {
 	DBusMessage *message;
-	
+
 	/* Create a new message on the DBUS_INTERFACE */
 	if (!(message = dbus_message_new_signal (DBUS_PATH, DBUS_INTERFACE, name)))
 		return;
-	
+
 	/* Appends the data as an argument to the message */
 	dbus_message_append_args (message,
 #if DBUS_VERSION >= 310
 				  DBUS_TYPE_STRING, &data,
 #else
 				  DBUS_TYPE_STRING, data,
-#endif	
+#endif
 				  DBUS_TYPE_INVALID);
 
 	if (new) {
@@ -70,14 +70,14 @@ send_dbus_message (const char *name, const char *data, guint new)
 					  DBUS_TYPE_STRING, &display_name, DBUS_TYPE_UINT32, &new,
 #else
 					  DBUS_TYPE_STRING, display_name, DBUS_TYPE_UINT32, new,
-#endif	
+#endif
 					  DBUS_TYPE_INVALID);
-		
+
 	}
 
 	/* Sends the message */
 	dbus_connection_send (bus, message, NULL);
-	
+
 	/* Frees the message */
 	dbus_message_unref (message);
 }
@@ -102,9 +102,9 @@ reinit_dbus (gpointer user_data)
 {
 	if (!enabled || init_dbus ())
 		return FALSE;
-	
+
 	/* keep trying to re-establish dbus connection */
-	
+
 	return TRUE;
 }
 
@@ -115,12 +115,12 @@ filter_function (DBusConnection *connection, DBusMessage *message, void *user_da
 	    strcmp (dbus_message_get_path (message), DBUS_PATH_LOCAL) == 0) {
 		dbus_connection_unref (bus);
 		bus = NULL;
-		
+
 		g_timeout_add (3000, reinit_dbus, NULL);
-		
+
 		return DBUS_HANDLER_RESULT_HANDLED;
 	}
-	
+
 	return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
 }
 
@@ -128,22 +128,22 @@ static gboolean
 init_dbus (void)
 {
 	DBusError error;
-	
+
 	if (bus != NULL)
 		return TRUE;
-	
+
 	dbus_error_init (&error);
 	if (!(bus = dbus_bus_get (DBUS_BUS_SESSION, &error))) {
 		g_warning ("could not get system bus: %s\n", error.message);
 		dbus_error_free (&error);
 		return FALSE;
 	}
-	
+
 	dbus_connection_setup_with_g_main (bus, NULL);
 	dbus_connection_set_exit_on_disconnect (bus, FALSE);
-	
+
 	dbus_connection_add_filter (bus, filter_function, NULL, NULL);
-	
+
 	return TRUE;
 }
 
@@ -154,17 +154,17 @@ e_plugin_lib_enable (EPluginLib *ep, int enable)
 	if (enable) {
 		if (!init_dbus ())
 			return -1;
-		
+
 		enabled = TRUE;
 	} else {
 		if (bus != NULL) {
 			dbus_connection_unref (bus);
 			bus = NULL;
 		}
-		
+
 		enabled = FALSE;
 	}
-	
+
 	return 0;
 }
 
diff --git a/plugins/plugin-manager/plugin-manager.c b/plugins/plugin-manager/plugin-manager.c
index 86b94c290d..4352254bf7 100644
--- a/plugins/plugin-manager/plugin-manager.c
+++ b/plugins/plugin-manager/plugin-manager.c
@@ -91,7 +91,7 @@ eppm_show_plugin(Manager *m, EPlugin *ep)
 		string = g_strdup_printf("<span size=\"x-large\">%s</span>", ep->name);
 		gtk_label_set_markup(GTK_LABEL(m->items[LABEL_NAME]), string);
 		g_free(string);
-		
+
 		if (ep->authors) {
 			GSList *l = ep->authors;
 			GString *out = g_string_new("");
@@ -154,7 +154,7 @@ eppm_enable_toggled(GtkCellRendererToggle *renderer, const char *path_string, Ma
 	EPlugin *plugin;
 
 	path = gtk_tree_path_new_from_string(path_string);
-	
+
 	if (gtk_tree_model_get_iter(m->model, &iter, path)) {
 		gtk_tree_model_get(m->model, &iter, COL_PLUGIN_DATA, &plugin, -1);
 		e_plugin_enable(plugin, !plugin->enabled);
@@ -165,7 +165,7 @@ eppm_enable_toggled(GtkCellRendererToggle *renderer, const char *path_string, Ma
 				   COL_PLUGIN_ENABLED, plugin->enabled,
 				   -1);
 	}
-	
+
 	gtk_tree_path_free(path);
 }
 
@@ -231,8 +231,8 @@ org_gnome_plugin_manager_manage(void *ep, ESMenuTargetShell *t)
 	m->dialog = (GtkDialog *)gtk_dialog_new_with_buttons(_("Plugin Manager"),
 							     (GtkWindow *)gtk_widget_get_toplevel(t->target.widget),
 							     GTK_DIALOG_DESTROY_WITH_PARENT,
-							     _("Con_figure"), RESPONSE_CONFIGURE, 
-							     GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE, 
+							     _("Con_figure"), RESPONSE_CONFIGURE,
+							     GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,
 							     NULL);
 
 	gtk_window_set_default_size((GtkWindow *)m->dialog, 640, 400);
@@ -377,7 +377,7 @@ e_plugin_lib_enable(EPluginLib *ep, int enable)
 	return 0;
 }
 
-int 
+int
 e_plugin_lib_configure(EPluginLib *ep)
 {
 	d(printf ("\n\a e_plugin_lib_configure in plugin-manager\n\a"));
diff --git a/plugins/prefer-plain/prefer-plain.c b/plugins/prefer-plain/prefer-plain.c
index ff96e91da1..4846486053 100644
--- a/plugins/prefer-plain/prefer-plain.c
+++ b/plugins/prefer-plain/prefer-plain.c
@@ -105,8 +105,8 @@ org_gnome_prefer_plain_multipart_alternative(void *ep, EMFormatHookTarget *t)
 		em_format_format_source(t->format, t->stream, t->part);
 		return;
 	}
-	
-	nparts = camel_multipart_get_number(mp);	
+
+	nparts = camel_multipart_get_number(mp);
 	for (i=0; i<nparts; i++) {
 		part = camel_multipart_get_part(mp, i);
 		if (part && camel_content_type_is(camel_mime_part_get_content_type(part), "text", "plain")) {
diff --git a/plugins/print-message/print-message.c b/plugins/print-message/print-message.c
index 71d875a070..e8a7c84be7 100644
--- a/plugins/print-message/print-message.c
+++ b/plugins/print-message/print-message.c
@@ -3,16 +3,16 @@
  *  Authors: Vivek Jain <jvivek@novell.com>
  *
  * Copyright 2004 Novell, Inc. (www.novell.com)
- * 
+ *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
  * License as published by the Free Software Foundation.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
@@ -40,7 +40,7 @@ void org_gnome_compose_print_message (EPlugin *ep, EMMenuTargetWidget *t);
 void org_gnome_print_message (EPlugin *ep, EMMenuTargetWidget *t);
 void org_gnome_print_preview (EPlugin *ep, EMMenuTargetWidget *t);
 
-void 
+void
 org_gnome_print_message (EPlugin *ep, EMMenuTargetWidget *t)
 {
        	EMsgComposer *composer = (EMsgComposer *)t->target.widget;
diff --git a/plugins/publish-calendar/publish-calendar.c b/plugins/publish-calendar/publish-calendar.c
index 5d11e7c86f..e2f87bfce3 100644
--- a/plugins/publish-calendar/publish-calendar.c
+++ b/plugins/publish-calendar/publish-calendar.c
@@ -50,7 +50,7 @@ static void  update_timestamp (EPublishUri *uri);
 static void publish (EPublishUri *uri);
 
 static void
-publish_uri_async (EPublishUri *uri) 
+publish_uri_async (EPublishUri *uri)
 {
 	GThread *thread = NULL;
 	GError *error = NULL;
@@ -83,13 +83,13 @@ publish (EPublishUri *uri)
 
 		password = e_passwords_get_password ("Calendar", uri->location);
 		username = gnome_vfs_uri_get_user_name (vfs_uri);
-		req_pass = ((username && *username) && !(uri->service_type == TYPE_ANON_FTP && 
+		req_pass = ((username && *username) && !(uri->service_type == TYPE_ANON_FTP &&
 					!strcmp (username, "anonymous"))) ? TRUE:FALSE;
 
 		if (!password && req_pass) {
 			gboolean remember;
 			char *prompt = g_strdup_printf (_("Enter the password for `%s'"), uri->location);
-			
+
 			password = e_passwords_ask_password (_("Enter password"), "", uri->location, prompt,
 						     E_PASSWORDS_REMEMBER_FOREVER|E_PASSWORDS_SECRET|E_PASSWORDS_ONLINE,
 						     &remember,
@@ -500,7 +500,7 @@ publish_calendar_locations (EPlugin *epl, EConfigHookItemFactoryData *data)
 	ui->treeview = glade_xml_get_widget (xml, "url list");
 	if (store == NULL)
 		store = gtk_list_store_new (URL_LIST_N_COLUMNS, G_TYPE_BOOLEAN, G_TYPE_STRING, G_TYPE_POINTER);
-	else 
+	else
 		gtk_list_store_clear (store);
 
 	gtk_tree_view_set_model (GTK_TREE_VIEW (ui->treeview), GTK_TREE_MODEL (store));
@@ -556,7 +556,7 @@ publish_calendar_locations (EPlugin *epl, EConfigHookItemFactoryData *data)
 	return toplevel;
 }
 
-static gpointer 
+static gpointer
 publish_urls (gpointer data)
 {
 	GSList *l;
@@ -574,7 +574,7 @@ action_publish (EPlugin *ep, ECalMenuTargetSelect *t)
 {
 	GThread *thread = NULL;
 	GError *error = NULL;
-	
+
 	thread = g_thread_create ((GThreadFunc) publish_urls, NULL, FALSE, &error);
 	if (!thread) {
 		g_warning (G_STRLOC ": %s", error->message);
diff --git a/plugins/publish-calendar/publish-format-fb.c b/plugins/publish-calendar/publish-format-fb.c
index c6b14cf030..7a4eae3b65 100644
--- a/plugins/publish-calendar/publish-format-fb.c
+++ b/plugins/publish-calendar/publish-format-fb.c
@@ -62,9 +62,9 @@ write_calendar (gchar *uid, ESourceList *source_list, GnomeVFSHandle *handle)
 		g_error_free (error);
 		return FALSE;
 	}
-	
+
 	if (e_cal_get_cal_address (client, &email, &error)) {
-		if (email && *email)	
+		if (email && *email)
 			users = g_list_append (users, email);
 	}
 
@@ -93,14 +93,14 @@ write_calendar (gchar *uid, ESourceList *source_list, GnomeVFSHandle *handle)
 		/* FIXME: EError */
 		g_object_unref (client);
 		g_error_free (error);
-		if (users) 
+		if (users)
 			g_list_free (users);
 		g_free (email);
-		
+
 		return FALSE;
 	}
-	
-	if (users) 
+
+	if (users)
 		g_list_free (users);
 
 	g_free (email);
diff --git a/plugins/publish-calendar/publish-format-ical.c b/plugins/publish-calendar/publish-format-ical.c
index 1208cdbd42..5f620accc9 100644
--- a/plugins/publish-calendar/publish-format-ical.c
+++ b/plugins/publish-calendar/publish-format-ical.c
@@ -33,7 +33,7 @@ typedef struct {
 	GHashTable *zones;
 	ECal *ecal;
 } CompTzData;
- 
+
  static void
 insert_tz_comps (icalparameter *param, void *cb_data)
 {
@@ -44,16 +44,16 @@ insert_tz_comps (icalparameter *param, void *cb_data)
 	GError *error = NULL;
 
 	tzid = icalparameter_get_tzid (param);
-	
+
 	if (g_hash_table_lookup (tdata->zones, tzid))
 		return;
-	
+
 	if (!e_cal_get_timezone (tdata->ecal, tzid, &zone, &error)) {
 		g_warning ("Could not get the timezone information for %s :  %s \n", tzid, error->message);
 		g_error_free (error);
 		return;
 	}
-	
+
 	tzcomp = icalcomponent_new_clone (icaltimezone_get_component (zone));
 	g_hash_table_insert (tdata->zones, (gpointer) tzid, (gpointer) tzcomp);
 }
@@ -96,7 +96,7 @@ write_calendar (gchar *uid, ESourceList *source_list, GnomeVFSHandle *handle)
 		GnomeVFSFileSize bytes_written = 0;
 		GnomeVFSResult result;
 		CompTzData tdata;
- 
+
 		tdata.zones = g_hash_table_new (g_str_hash, g_str_equal);
 		tdata.ecal = client;
 
diff --git a/plugins/publish-calendar/publish-location.c b/plugins/publish-calendar/publish-location.c
index 372b484e3f..e4414a8109 100644
--- a/plugins/publish-calendar/publish-location.c
+++ b/plugins/publish-calendar/publish-location.c
@@ -60,12 +60,12 @@ migrateURI (const gchar *xml, xmlDocPtr doc)
 	username = xmlGetProp (root, (const unsigned char *)"username");
 
 	vfs_uri = gnome_vfs_uri_new ((char *)location);
-	
+
 	if (!vfs_uri) {
 		g_warning ("Could not form the uri for %s \n", location);
-		goto cleanup;		
+		goto cleanup;
 	}
-	
+
 	gnome_vfs_uri_set_user_name ((GnomeVFSURI *)vfs_uri, (char *)username);
 	temp = gnome_vfs_uri_to_string (vfs_uri, GNOME_VFS_URI_HIDE_TOPLEVEL_METHOD | GNOME_VFS_URI_HIDE_PASSWORD);
 	uri->location = g_strdup_printf ("dav://%s", temp);
@@ -132,7 +132,7 @@ e_publish_uri_from_xml (const gchar *xml)
 	if ((username = xmlGetProp (root, (const unsigned char *)"username"))) {
 		xmlFree (username);
 		return migrateURI (xml, doc);
-		
+
 	}
 
 	uri = g_new0 (EPublishUri, 1);
diff --git a/plugins/publish-calendar/url-editor-dialog.c b/plugins/publish-calendar/url-editor-dialog.c
index 4d6268664d..627c64fa87 100644
--- a/plugins/publish-calendar/url-editor-dialog.c
+++ b/plugins/publish-calendar/url-editor-dialog.c
@@ -287,10 +287,10 @@ set_from_uri (UrlEditorDialog *dialog)
 	else
 		uri->service_type = TYPE_URI;
 
-	if (euri->user) 
+	if (euri->user)
 		gtk_entry_set_text (GTK_ENTRY (dialog->username_entry), euri->user);
 
-	if (euri->host)	
+	if (euri->host)
 		gtk_entry_set_text (GTK_ENTRY (dialog->server_entry), euri->host);
 
 	if (euri->port) {
diff --git a/plugins/sa-junk-plugin/em-junk-filter.c b/plugins/sa-junk-plugin/em-junk-filter.c
index bfe1fbbd8d..a39f5cffdf 100644
--- a/plugins/sa-junk-plugin/em-junk-filter.c
+++ b/plugins/sa-junk-plugin/em-junk-filter.c
@@ -116,11 +116,11 @@ pipe_to_sa_full (CamelMimeMessage *msg, const char *in, char **argv, int rv_err,
 	CamelStream *stream;
 	char *program;
 	pid_t pid;
-	
+
 
 	if (camel_debug_start ("junk")) {
 		int i;
-		
+
 		printf ("pipe_to_sa ");
 		for (i = 0; argv[i]; i++)
 			printf ("%s ", argv[i]);
@@ -134,14 +134,14 @@ pipe_to_sa_full (CamelMimeMessage *msg, const char *in, char **argv, int rv_err,
 		return rv_err;
 	}
 	g_free (program);
-	
+
 	if (pipe (fds) == -1) {
 		errnosav = errno;
 		d(printf ("failed to create a pipe (for use with spamassassin: %s\n", strerror (errno)));
 		errno = errnosav;
 		return rv_err;
 	}
-	
+
 	if (output_buffer && pipe (out_fds) == -1) {
 		errnosav = errno;
 		d(printf ("failed to create a pipe (for use with spamassassin: %s\n", strerror (errno)));
@@ -150,13 +150,13 @@ pipe_to_sa_full (CamelMimeMessage *msg, const char *in, char **argv, int rv_err,
 		errno = errnosav;
 		return rv_err;
 	}
-	
+
 	if (!(pid = fork ())) {
 		/* child process */
 		int maxfd, fd, nullfd;
-		
+
 		nullfd = open ("/dev/null", O_WRONLY);
-		
+
 		if (dup2 (fds[0], STDIN_FILENO) == -1 ||
 		    dup2 (nullfd, STDERR_FILENO) == -1 ||
 		    (output_buffer == NULL && dup2 (nullfd, STDOUT_FILENO) == -1) ||
@@ -167,11 +167,11 @@ pipe_to_sa_full (CamelMimeMessage *msg, const char *in, char **argv, int rv_err,
 			close (out_fds [1]);
 
 		setsid ();
-		
+
 		maxfd = sysconf (_SC_OPEN_MAX);
 		for (fd = 3; fd < maxfd; fd++)
 			fcntl (fd, F_SETFD, FD_CLOEXEC);
-		
+
 		execvp (argv[0], argv);
 		_exit (rv_err & 0377);
 	} else if (pid < 0) {
@@ -185,15 +185,15 @@ pipe_to_sa_full (CamelMimeMessage *msg, const char *in, char **argv, int rv_err,
 		errno = errnosav;
 		return rv_err;
 	}
-	
+
 	/* parent process */
 	close (fds[0]);
 	if (output_buffer)
 		close (out_fds [1]);
-	
+
 	if (msg) {
 		stream = camel_stream_fs_new_with_fd (fds[1]);
-		
+
 		camel_data_wrapper_write_to_stream (CAMEL_DATA_WRAPPER (msg), stream);
 		camel_stream_flush (stream);
 		camel_stream_close (stream);
@@ -207,21 +207,21 @@ pipe_to_sa_full (CamelMimeMessage *msg, const char *in, char **argv, int rv_err,
 		CamelStreamMem *memstream;
 
 		stream = camel_stream_fs_new_with_fd (out_fds[0]);
-		
+
 		memstream = (CamelStreamMem *) camel_stream_mem_new ();
 		camel_stream_mem_set_byte_array (memstream, output_buffer);
-		
+
 		camel_stream_write_to_stream (stream, (CamelStream *) memstream);
 		camel_object_unref (stream);
 		g_byte_array_append (output_buffer, (unsigned char *)"", 1);
 
 		d(printf ("child process output: %s len: %d\n", output_buffer->data, output_buffer->len));
 	}
-	
+
 	if (wait_for_termination) {
 		d(printf ("wait for child %d termination\n", pid));
 		result = waitpid (pid, &status, 0);
-	
+
 		d(printf ("child %d terminated with result %d status %d exited %d exitstatus %d\n", pid, result, status, WIFEXITED (status), WEXITSTATUS (status)));
 
 		if (result == -1 && errno == EINTR) {
@@ -236,7 +236,7 @@ pipe_to_sa_full (CamelMimeMessage *msg, const char *in, char **argv, int rv_err,
 				result = waitpid (pid, &status, WNOHANG);
 			}
 		}
-	
+
 		if (result != -1 && WIFEXITED (status))
 			return WEXITSTATUS (status);
 		else
@@ -270,17 +270,17 @@ em_junk_sa_test_spamd_running (char *binary, gboolean system)
 	pthread_mutex_lock (&em_junk_sa_preferred_socket_path_lock);
 
 	d(fprintf (stderr, "test if spamd is running (system %d) or using socket path %s\n", system, em_junk_sa_get_socket_path ()));
-	
+
 	argv[i++] = binary;
 	argv[i++] = "-x";
-	
+
 	if (!system) {
 		argv[i++] = "-U";
 		argv[i++] = em_junk_sa_get_socket_path ();
 	}
-	
+
 	argv[i] = NULL;
-	
+
 	rv = pipe_to_sa (NULL, "From test@127.0.0.1", argv) == 0;
 
 	d(fprintf (stderr, "result: %d (%s)\n", rv, rv ? "success" : "failed"));
@@ -298,7 +298,7 @@ em_junk_sa_test_spamassassin (void)
 		"--version",
 		NULL,
 	};
-	
+
 	if (pipe_to_sa (NULL, NULL, argv) != 0)
 		em_junk_sa_available = FALSE;
 	else
@@ -324,7 +324,7 @@ em_junk_sa_run_spamd (char *binary)
 	argv[i++] = binary;
 	argv[i++] = "--socketpath";
 	argv[i++] = em_junk_sa_get_socket_path ();
-		
+
 	if (em_junk_sa_local_only)
 		argv[i++] = "--local";
 
@@ -336,7 +336,7 @@ em_junk_sa_run_spamd (char *binary)
 	argv[i] = NULL;
 
 	d(fprintf (stderr, "trying to run %s with socket path %s\n", binary, em_junk_sa_get_socket_path ()));
-			
+
 	if (!pipe_to_sa_full (NULL, NULL, argv, -1, 0, NULL)) {
 		struct timespec time_req;
 		struct stat stat_buf;
@@ -411,7 +411,7 @@ em_junk_sa_test_spamd (void)
 		em_junk_sa_spamc_binaries [0] = em_junk_sa_spamc_gconf_binary;
 		em_junk_sa_spamc_binaries [1] = NULL;
 	}
-  
+
 	if (em_junk_sa_spamd_gconf_binary) {
 		em_junk_sa_spamd_binaries [0] = em_junk_sa_spamd_gconf_binary;
 		em_junk_sa_spamd_binaries [1] = NULL;
@@ -465,7 +465,7 @@ em_junk_sa_test_spamd (void)
 	em_junk_sa_find_spamc ();
 
 	d(fprintf (stderr, "use spamd: %s\n", em_junk_sa_use_spamc ? "yes" : "no"));
-	
+
 	em_junk_sa_spamd_tested = TRUE;
 }
 
@@ -481,7 +481,7 @@ em_junk_sa_is_available (void)
 		em_junk_sa_test_spamd ();
 
 	pthread_mutex_unlock (&em_junk_sa_init_lock);
-	
+
 	return em_junk_sa_available;
 }
 
@@ -548,7 +548,7 @@ em_junk_sa_check_junk(EPlugin *ep, EMJunkHookTarget *target)
 	CamelMimeMessage *msg = target->m;
 
 	d(fprintf (stderr, "em_junk_sa_check_junk\n"));
-	
+
 	if (!em_junk_sa_is_available ())
 		return FALSE;
 
@@ -572,7 +572,7 @@ em_junk_sa_check_junk(EPlugin *ep, EMJunkHookTarget *target)
 		if (em_junk_sa_local_only)
 			argv [i++] = "--local";
 	}
-	
+
 	argv[i] = NULL;
 
 	rv = pipe_to_sa_full (msg, NULL, argv, 0, 1, out) != 0;
@@ -605,25 +605,25 @@ em_junk_sa_check_junk(EPlugin *ep, EMJunkHookTarget *target)
 
 static guint
 get_spamassassin_version ()
-{	
+{
 	GByteArray *out = NULL;
 	int i;
-	
+
 	char * argv[3] = {
 		"sa-learn",
 		"--version",
 		NULL
 	};
-	
+
 	if (!em_junk_sa_checked_spamassassin_version){
 		out = g_byte_array_new ();
-		
+
 		if (pipe_to_sa_full (NULL, NULL, argv, -1, 1, out) != 0){
 			if(out)
 				g_byte_array_free (out, TRUE);
 			return em_junk_sa_spamassassin_version;
 		}
-	
+
 		if(out->len > 0){
 			for(i = 0; i < out->len; i++){
 				if(g_ascii_isdigit (out->data[i])){
@@ -631,14 +631,14 @@ get_spamassassin_version ()
 					em_junk_sa_checked_spamassassin_version = TRUE;
 					break;
 				}
-			}	
+			}
 		}
 
 
 		if(out)
 			g_byte_array_free (out, TRUE);
 	}
-	
+
 	return em_junk_sa_spamassassin_version;
 }
 
@@ -654,18 +654,18 @@ em_junk_sa_report_junk (EPlugin *ep, EMJunkHookTarget *target)
 		NULL,
 		NULL
 	};
-	gchar *sub = NULL;	
+	gchar *sub = NULL;
 	CamelMimeMessage *msg = target->m;
-	
+
 	sub = g_strdup (camel_mime_message_get_subject (msg));
 	g_print ("\nreport junk?? %s\n", sub);
-		
+
 	d(fprintf (stderr, "em_junk_sa_report_junk\n"));
-	
+
 	if (em_junk_sa_is_available ()) {
 		if (em_junk_sa_local_only)
 			argv[4] = "--local";
-		
+
 		pthread_mutex_lock (&em_junk_sa_report_lock);
 		pipe_to_sa (msg, NULL, argv);
 		pthread_mutex_unlock (&em_junk_sa_report_lock);
@@ -687,11 +687,11 @@ em_junk_sa_report_non_junk (EPlugin *ep, EMJunkHookTarget *target)
 	CamelMimeMessage *msg = target->m;
 
 	d(fprintf (stderr, "em_junk_sa_report_notjunk\n"));
-	
+
 	if (em_junk_sa_is_available ()) {
 		if (em_junk_sa_local_only)
 			argv[4] = "--local";
-		
+
 		pthread_mutex_lock (&em_junk_sa_report_lock);
 		pipe_to_sa (msg, NULL, argv);
 		pthread_mutex_unlock (&em_junk_sa_report_lock);
@@ -708,13 +708,13 @@ em_junk_sa_commit_reports (EPlugin *ep, EMJunkHookTarget *target)
 		NULL,
 		NULL
 	};
-	
+
 	d(fprintf (stderr, "em_junk_sa_commit_reports\n"));
-	
+
 	if (em_junk_sa_is_available ()) {
 		if (em_junk_sa_local_only)
 			argv[2] = "--local";
-		
+
 		pthread_mutex_lock (&em_junk_sa_report_lock);
 		pipe_to_sa (NULL, NULL, argv);
 		pthread_mutex_unlock (&em_junk_sa_report_lock);
@@ -734,10 +734,10 @@ em_junk_sa_setting_notify(GConfClient *gconf, guint cnxn_id, GConfEntry *entry,
 	char *tkey;
 
 	g_return_if_fail (gconf_entry_get_key (entry) != NULL);
-	
+
 	if (!(value = gconf_entry_get_value (entry)))
 		return;
-	
+
 	tkey = strrchr(entry->key, '/');
 	g_return_if_fail (tkey != NULL);
 
@@ -847,10 +847,10 @@ org_gnome_sa_use_remote_tests (struct _EPlugin *epl, struct _EConfigHookItemFact
    	GtkWidget *check, *vbox, *label;
 	char *text = g_strdup_printf ("    <small>%s</small>", _("This will make Spamassasin more reliable, but slower"));
 	guint i = ((GtkTable *)data->parent)->nrows;
-    
+
 	if (data->old)
                 return data->old;
-		
+
 	check = gtk_check_button_new_with_mnemonic (_("I_nclude remote tests"));
 	label = gtk_label_new (NULL);
 	gtk_label_set_markup (GTK_LABEL (label), text);
diff --git a/plugins/save-attachments/save-attachments.c b/plugins/save-attachments/save-attachments.c
index c4558fb1ec..269a9e95c7 100644
--- a/plugins/save-attachments/save-attachments.c
+++ b/plugins/save-attachments/save-attachments.c
@@ -218,8 +218,8 @@ save_part(GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, void *d)
 	/* FIXME: if part == data->msg then we need to save this
 	 * differently, not using the envelope MimePart */
 
-	/* 
-	 * The underlying em_utils_save_part_to_file ain't using gnome-vfs. Therefor 
+	/*
+	 * The underlying em_utils_save_part_to_file ain't using gnome-vfs. Therefor
 	 * the POSIX access-call should suffice for checking the file existence.
 	 */
 
@@ -297,7 +297,7 @@ toggle_changed(GtkWidget *entry, const char *spath, struct _save_data *data)
 {
         GtkTreePath *path;
         GtkTreeIter iter;
-        
+
         path = gtk_tree_path_new_from_string(spath);
         if (gtk_tree_model_get_iter((GtkTreeModel *)data->model, &iter, path)) {
 		gboolean on;
@@ -305,7 +305,7 @@ toggle_changed(GtkWidget *entry, const char *spath, struct _save_data *data)
                 gtk_tree_model_get((GtkTreeModel *)data->model, &iter, 0, &on, -1);
 		gtk_tree_store_set(data->model, &iter, 0, !on, -1);
         }
-        
+
         gtk_tree_path_free (path);
 }
 
@@ -360,7 +360,7 @@ save_got_message(CamelFolder *folder, const char *uid, CamelMimeMessage *msg, vo
 	g_signal_connect(renderer, "toggled", G_CALLBACK(toggle_changed), data);
 
 	gtk_tree_view_insert_column_with_attributes((GtkTreeView *)tree, -1,
-						    _("Save"), renderer, "active", 0, NULL);	
+						    _("Save"), renderer, "active", 0, NULL);
 	renderer = gtk_cell_renderer_text_new();
 	gtk_tree_view_insert_column_with_attributes((GtkTreeView *)tree, -1,
 						    _("Name"), renderer, "text", 2, NULL);
diff --git a/plugins/save-calendar/csv-format.c b/plugins/save-calendar/csv-format.c
index 8ee52e2641..8deaf05282 100644
--- a/plugins/save-calendar/csv-format.c
+++ b/plugins/save-calendar/csv-format.c
@@ -84,7 +84,7 @@ static GString *
 add_list_to_csv (GString *line, GSList *list_in, CsvConfig *config, gint type)
 {
 
-	/* 
+	/*
 	 * This one will write 'ECalComponentText' and 'const char' GSLists. It will
 	 * put quotes around the complete written value if there's was only one value
 	 * but it required having quotes and if there was more than one value (in which
@@ -122,7 +122,7 @@ add_list_to_csv (GString *line, GSList *list_in, CsvConfig *config, gint type)
 			if (list)
 				tmp = g_string_append (tmp, config->delimiter);
 		}
-	
+
 		if (needquotes)
 			line = g_string_append (line, config->quote);
 		line = g_string_append_len (line, tmp->str, tmp->len);
@@ -139,7 +139,7 @@ static GString *
 add_nummeric_to_csv (GString *line, gint *nummeric, CsvConfig *config)
 {
 
-	/* 
+	/*
 	 * This one will write {-1}..{00}..{01}..{99}
 	 * it prepends a 0 if it's < 10 and > -1
 	 */
@@ -159,25 +159,25 @@ add_time_to_csv (GString *line, icaltimetype *time, CsvConfig *config)
 		gboolean needquotes = FALSE;
 		struct tm mytm =  icaltimetype_to_tm (time);
 		gchar *str = (gchar*) g_malloc (sizeof (gchar) * 200);
-		
-		/* 
+
+		/*
 		 * Translator: the %F %T is the thirth argument for a strftime function.
 		 * It lets you define the formatting of the date in the csv-file.
 		 * */
 		e_utf8_strftime (str, 200, _("%F %T"), &mytm);
-		
+
 		needquotes = string_needsquotes (str, config);
-		
+
 		if (needquotes)
-			line = g_string_append (line, config->quote);	
-		
+			line = g_string_append (line, config->quote);
+
 		line = g_string_append (line, str);
-		
+
 		if (needquotes)
 			line = g_string_append (line, config->quote);
-	
+
 		g_free (str);
-		
+
 	}
 
 	line = g_string_append (line, config->delimiter);
@@ -191,8 +191,8 @@ string_needsquotes (const char *value, CsvConfig *config)
 
 	/* This is the actual need for quotes-checker */
 
-	/* 
-	 * These are the simple substring-checks 
+	/*
+	 * These are the simple substring-checks
 	 *
 	 * Example: {Mom, can you please do that for me?}
 	 * Will be written as {"Mom, can you please do that for me?"}
@@ -202,15 +202,15 @@ string_needsquotes (const char *value, CsvConfig *config)
 
 	if (!needquotes) {
 		needquotes = strstr (value, config->newline) ? TRUE:FALSE;
-		if (!needquotes) 
+		if (!needquotes)
 			needquotes = strstr (value, config->quote) ? TRUE:FALSE;
 	}
 
 
-	/* 
+	/*
 	 * If the special-char is char+onespace (so like {, } {" }, {\n }) and it occurs
 	 * the value that is going to be written
-	 * 
+	 *
 	 * In this case we don't trust the user . . . and are going to quote the string
 	 * just to play save -- Quoting is always allowed in the CSV format. If you can
 	 * avoid it, it's better to do so since a lot applications don't support CSV
@@ -220,7 +220,7 @@ string_needsquotes (const char *value, CsvConfig *config)
 	 * This example will be written as {"Mom,can you please do that for me?"} because
 	 * there's a {,} behind {Mom} and the delimiter is {, } (so we searched only the
 	 * first character of {, } and didn't trust the user).
-	 */	
+	 */
 
 
 	if (!needquotes) {
@@ -234,7 +234,7 @@ string_needsquotes (const char *value, CsvConfig *config)
 					if (!needquotes) {
 						len = strlen (config->quote);
 						if ((len == 2) && (config->quote[1] == ' ')) {
-							needquotes = strchr 
+							needquotes = strchr
 								(value, config->quote[0])?TRUE:FALSE;
 						}
 					}
@@ -283,13 +283,13 @@ userstring_to_systemstring (const gchar *userstring)
 			case '\\':
 				str = g_string_append_c (str, '\\');
 				i++;
-				break; 
+				break;
 			case 'r':
 				str = g_string_append_c (str, '\r');
-				i++;		
+				i++;
 				break;
 			case 't':
-                                str = g_string_append_c (str, '\t'); 
+                                str = g_string_append_c (str, '\t');
                                 i++;
                                 break;
 			}
@@ -303,17 +303,17 @@ userstring_to_systemstring (const gchar *userstring)
 	retval = str->str;
 	g_string_free (str, FALSE);
 
-	return retval; 
+	return retval;
 }
 
 static void
 do_save_calendar_csv (FormatHandler *handler, EPlugin *ep, ECalPopupTargetSource *target, ECalSourceType type, char *dest_uri)
 {
 
-	/* 
-	 * According to some documentation about CSV, newlines 'are' allowed 
+	/*
+	 * According to some documentation about CSV, newlines 'are' allowed
 	 * in CSV-files. But you 'do' have to put the value between quotes.
-	 * The helper 'string_needsquotes' will check for that 
+	 * The helper 'string_needsquotes' will check for that
 	 *
 	 * http://www.creativyst.com/Doc/Articles/CSV/CSV01.htm
 	 * http://www.creativyst.com/cgi-bin/Prod/15/eg/csv2xml.pl
@@ -347,7 +347,7 @@ do_save_calendar_csv (FormatHandler *handler, EPlugin *ep, ECalPopupTargetSource
 	}
 
 	config = g_new (CsvConfig, 1);
-	
+
 	tmp = gtk_entry_get_text (GTK_ENTRY(d->delimiter_entry));
 	config->delimiter = userstring_to_systemstring (tmp?tmp:", ");
 	tmp = gtk_entry_get_text (GTK_ENTRY(d->newline_entry));
@@ -368,15 +368,15 @@ do_save_calendar_csv (FormatHandler *handler, EPlugin *ep, ECalPopupTargetSource
 		if (result != GNOME_VFS_OK) {
 			gnome_vfs_create (&handle, dest_uri, GNOME_VFS_OPEN_WRITE, TRUE, GNOME_VFS_PERM_USER_ALL);
 			result = gnome_vfs_open_uri (&handle, uri, GNOME_VFS_OPEN_WRITE);
-		} 
+		}
 	}
 
 	if (result == GNOME_VFS_OK && doit && e_cal_get_object_list_as_comp (source_client, "#t", &objects, NULL)) {
 
 		if (config->header) {
-			
+
 			gint i=0;
-			
+
 			static gchar *labels[] = {
 				 N_("UID"),
 				 N_("Summary"),
@@ -403,14 +403,14 @@ do_save_calendar_csv (FormatHandler *handler, EPlugin *ep, ECalPopupTargetSource
 					line = g_string_append(line, config->delimiter);
 				line = g_string_append(line, _(labels[i]));
 			}
-			
+
 			line = g_string_append (line, config->newline);
 
 			gnome_vfs_write (handle, line->str, line->len, NULL);
 			g_string_free (line, TRUE);
 		}
 
-	
+
 		while (objects != NULL) {
 			ECalComponent *comp = objects->data;
 			gchar *delimiter_temp = NULL;
@@ -419,7 +419,7 @@ do_save_calendar_csv (FormatHandler *handler, EPlugin *ep, ECalPopupTargetSource
 			ECalComponentDateTime temp_dt;
 			struct icaltimetype *temp_time;
 			int *temp_int;
-			ECalComponentText temp_comptext; 
+			ECalComponentText temp_comptext;
 
 			line = g_string_new ("");
 
@@ -501,7 +501,7 @@ do_save_calendar_csv (FormatHandler *handler, EPlugin *ep, ECalPopupTargetSource
 			/* Append a newline (record delimiter) */
 			delimiter_temp = config->delimiter;
 			config->delimiter = config->newline;
- 
+
 			line = add_time_to_csv (line, temp_time, config);
 
 			/* And restore for the next record */
@@ -548,7 +548,7 @@ create_options_widget (FormatHandler *handler)
 		  *csv_options = gtk_expander_new (_("Advanced options for the CSV format")),
 		  *vbox = gtk_vbox_new (FALSE, 0);
 	CsvPluginData *d = handler->data;
-	
+
 	d->delimiter_entry = gtk_entry_new ();
 	d->newline_entry = gtk_entry_new ();
 	d->quote_entry = gtk_entry_new ();
@@ -563,20 +563,20 @@ create_options_widget (FormatHandler *handler)
 	gtk_table_set_col_spacings (GTK_TABLE (table), 5);
 	label = gtk_label_new (_("Value delimiter:"));
 	gtk_misc_set_alignment (GTK_MISC (label), 0, 0.0);
-	gtk_table_attach (GTK_TABLE (table), label, 0, 1, 0, 1, 
-			  (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); 
+	gtk_table_attach (GTK_TABLE (table), label, 0, 1, 0, 1,
+			  (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0);
 	gtk_table_attach (GTK_TABLE (table), d->delimiter_entry, 1, 2, 0, 1,
 			  (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), (GtkAttachOptions) (0), 0, 0);
 	label = gtk_label_new (_("Record delimiter:"));
 	gtk_misc_set_alignment (GTK_MISC (label), 0, 0.0);
-	gtk_table_attach (GTK_TABLE (table), label, 0, 1, 1, 2, 
-			  (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); 
+	gtk_table_attach (GTK_TABLE (table), label, 0, 1, 1, 2,
+			  (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0);
 	gtk_table_attach (GTK_TABLE (table), d->newline_entry, 1, 2, 1, 2,
 			  (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), (GtkAttachOptions) (0), 0, 0);
 	label = gtk_label_new (_("Encapsulate values with:"));
 	gtk_misc_set_alignment (GTK_MISC (label), 0, 0.0);
-	gtk_table_attach (GTK_TABLE (table), label, 0, 1, 2, 3, 
-			  (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); 
+	gtk_table_attach (GTK_TABLE (table), label, 0, 1, 2, 3,
+			  (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0);
 	gtk_table_attach (GTK_TABLE (table), d->quote_entry, 1, 2, 2, 3,
 			  (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), (GtkAttachOptions) (0), 0, 0);
 
diff --git a/plugins/save-calendar/ical-format.c b/plugins/save-calendar/ical-format.c
index 46be87e53a..ce57d00576 100644
--- a/plugins/save-calendar/ical-format.c
+++ b/plugins/save-calendar/ical-format.c
@@ -1,8 +1,8 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
  *
- *  Authors: Rodrigo Moya <rodrigo@novell.com> 
+ *  Authors: Rodrigo Moya <rodrigo@novell.com>
  *           Philip Van Hoof <pvanhoof@gnome.org>
- *           
+ *
  *  Copyright 2004 Novell, Inc. (www.novell.com)
  *
  *  This program is free software; you can redistribute it and/or
@@ -68,16 +68,16 @@ insert_tz_comps (icalparameter *param, void *cb_data)
 	GError *error = NULL;
 
 	tzid = icalparameter_get_tzid (param);
-	
+
 	if (g_hash_table_lookup (tdata->zones, tzid))
 		return;
-	
+
 	if (!e_cal_get_timezone (tdata->ecal, tzid, &zone, &error)) {
 		g_warning ("Could not get the timezone information for %s :  %s \n", tzid, error->message);
 		g_error_free (error);
 		return;
 	}
-	
+
 	tzcomp = icalcomponent_new_clone (icaltimezone_get_component (zone));
 	g_hash_table_insert (tdata->zones, (gpointer) tzid, (gpointer) tzcomp);
 }
@@ -97,7 +97,7 @@ do_save_calendar_ical (FormatHandler *handler, EPlugin *ep, ECalPopupTargetSourc
 	GList *objects;
 	icalcomponent *top_level = NULL;
 	GnomeVFSURI *uri;
-	gboolean doit = TRUE;	
+	gboolean doit = TRUE;
 
 	primary_source = e_source_selector_peek_primary_selection (target->selector);
 
@@ -127,7 +127,7 @@ do_save_calendar_ical (FormatHandler *handler, EPlugin *ep, ECalPopupTargetSourc
 
 		while (objects != NULL) {
 			icalcomponent *icalcomp = objects->data;
-		
+
 			icalcomponent_foreach_tzid (icalcomp, insert_tz_comps, &tdata);
 			icalcomponent_add_component (top_level, icalcomp);
 
@@ -142,7 +142,7 @@ do_save_calendar_ical (FormatHandler *handler, EPlugin *ep, ECalPopupTargetSourc
 
 		/* save the file */
 		uri = gnome_vfs_uri_new (dest_uri);
-	
+
 		result = gnome_vfs_open_uri (&handle, uri, GNOME_VFS_OPEN_READ);
 		if (result == GNOME_VFS_OK)
 			doit = e_error_run(GTK_WINDOW(gtk_widget_get_toplevel (GTK_WIDGET (target->selector))),
@@ -157,18 +157,18 @@ do_save_calendar_ical (FormatHandler *handler, EPlugin *ep, ECalPopupTargetSourc
 						       gnome_vfs_result_to_string (result));
 					}
 			}
-	
+
 			if (result == GNOME_VFS_OK) {
 				char *ical_str;
 				GnomeVFSFileSize bytes_written;
-	
+
 				ical_str = icalcomponent_as_ical_string (top_level);
 				if ((result = gnome_vfs_write (handle, (gconstpointer) ical_str, strlen (ical_str), &bytes_written))
 				    != GNOME_VFS_OK) {
 					display_error_message (gtk_widget_get_toplevel (GTK_WIDGET (target->selector)),
 								       gnome_vfs_result_to_string (result));
 				}
-	
+
 				gnome_vfs_close (handle);
 			}
 		}
diff --git a/plugins/save-calendar/rdf-format.c b/plugins/save-calendar/rdf-format.c
index c3f2dbbefa..33cded34bd 100644
--- a/plugins/save-calendar/rdf-format.c
+++ b/plugins/save-calendar/rdf-format.c
@@ -48,7 +48,7 @@
 
 #include "format-handler.h"
 
-static void 
+static void
 add_string_to_rdf (xmlNodePtr node, const gchar *tag, const char *value);
 
 /* Use { */
@@ -72,7 +72,7 @@ calendar_config_get_timezone (void)
 		config = gconf_client_get_default ();
 
 	retval = gconf_client_get_string (config, CALENDAR_CONFIG_TIMEZONE, NULL);
-	if (!retval) 
+	if (!retval)
 		retval = g_strdup ("UTC");
 
 	return retval;
@@ -97,7 +97,7 @@ display_error_message (GtkWidget *parent, GError *error)
 }
 
 /* Some helpers for the xml stuff */
-static void 
+static void
 add_list_to_rdf (xmlNodePtr node, const gchar *tag, GSList *list_in, gint type)
 {
 	if (list_in) {
@@ -126,7 +126,7 @@ add_list_to_rdf (xmlNodePtr node, const gchar *tag, GSList *list_in, gint type)
 	}
 }
 
-static void 
+static void
 add_nummeric_to_rdf (xmlNodePtr node, const gchar *tag, gint *nummeric)
 {
 	if (nummeric) {
@@ -149,7 +149,7 @@ add_time_to_rdf (xmlNodePtr node, const gchar *tag, icaltimetype *time)
 		/*
 		 * Translator: the %FT%T is the thirth argument for a strftime function.
 		 * It lets you define the formatting of the date in the rdf-file.
-		 * Also check out http://www.w3.org/2002/12/cal/tzd 
+		 * Also check out http://www.w3.org/2002/12/cal/tzd
 		 * */
 		e_utf8_strftime (str, 200, _("%FT%T"), &mytm);
 
@@ -166,7 +166,7 @@ add_time_to_rdf (xmlNodePtr node, const gchar *tag, icaltimetype *time)
 }
 
 
-static void 
+static void
 add_string_to_rdf (xmlNodePtr node, const gchar *tag, const char *value)
 {
 	if (value) {
@@ -183,10 +183,10 @@ static void
 do_save_calendar_rdf (FormatHandler *handler, EPlugin *ep, ECalPopupTargetSource *target, ECalSourceType type, char *dest_uri)
 {
 
-	/* 
-	 * According to some documentation about CSV, newlines 'are' allowed 
+	/*
+	 * According to some documentation about CSV, newlines 'are' allowed
 	 * in CSV-files. But you 'do' have to put the value between quotes.
-	 * The helper 'string_needsquotes' will check for that 
+	 * The helper 'string_needsquotes' will check for that
 	 *
 	 * http://www.creativyst.com/Doc/Articles/CSV/CSV01.htm
 	 * http://www.creativyst.com/cgi-bin/Prod/15/eg/csv2xml.pl
@@ -219,7 +219,7 @@ do_save_calendar_rdf (FormatHandler *handler, EPlugin *ep, ECalPopupTargetSource
 	uri = gnome_vfs_uri_new (dest_uri);
 
 	result = gnome_vfs_open_uri (&handle, uri, GNOME_VFS_OPEN_READ);
-	if (result == GNOME_VFS_OK) 
+	if (result == GNOME_VFS_OK)
 		doit = e_error_run(GTK_WINDOW(gtk_widget_get_toplevel (GTK_WIDGET (target->selector))),
 			 E_ERROR_ASK_FILE_EXISTS_OVERWRITE, dest_uri, NULL) == GTK_RESPONSE_OK;
 
@@ -228,7 +228,7 @@ do_save_calendar_rdf (FormatHandler *handler, EPlugin *ep, ECalPopupTargetSource
 		if (result != GNOME_VFS_OK) {
 			gnome_vfs_create (&handle, dest_uri, GNOME_VFS_OPEN_WRITE, TRUE, GNOME_VFS_PERM_USER_ALL);
 			result = gnome_vfs_open_uri (&handle, uri, GNOME_VFS_OPEN_WRITE);
-		} 
+		}
 	}
 
 
@@ -274,7 +274,7 @@ do_save_calendar_rdf (FormatHandler *handler, EPlugin *ep, ECalPopupTargetSource
 			ECalComponentDateTime temp_dt;
 			struct icaltimetype *temp_time;
 			int *temp_int;
-			ECalComponentText temp_comptext; 
+			ECalComponentText temp_comptext;
 			xmlNodePtr c_node = xmlNewChild (fnode, NULL, (const unsigned char *)"component", NULL);
 			xmlNodePtr node = xmlNewChild (c_node, NULL, (const unsigned char *)"Vevent", NULL);
 
diff --git a/plugins/save-calendar/save-calendar.c b/plugins/save-calendar/save-calendar.c
index bce7bc3504..bd5dff3f06 100644
--- a/plugins/save-calendar/save-calendar.c
+++ b/plugins/save-calendar/save-calendar.c
@@ -53,14 +53,14 @@ void org_gnome_save_calendar (EPlugin *ep, ECalPopupTargetSource *target);
 void org_gnome_save_tasks (EPlugin *ep, ECalPopupTargetSource *target);
 
 
-static void 
+static void
 extra_widget_foreach_hide (GtkWidget *widget, gpointer data)
 {
 	if (widget != data)
 		gtk_widget_hide (widget);
 }
 
-static void 
+static void
 on_type_combobox_changed (GtkComboBox *combobox, gpointer data)
 {
 	FormatHandler *handler = NULL;
@@ -68,23 +68,23 @@ on_type_combobox_changed (GtkComboBox *combobox, gpointer data)
 	GtkTreeIter iter;
 	GtkTreeModel *model = gtk_combo_box_get_model (combobox);
 
-	gtk_container_foreach (GTK_CONTAINER (extra_widget), 
+	gtk_container_foreach (GTK_CONTAINER (extra_widget),
 		extra_widget_foreach_hide, combobox);
 
 	gtk_combo_box_get_active_iter (combobox, &iter);
 
-	gtk_tree_model_get (model, &iter, 
+	gtk_tree_model_get (model, &iter,
 		DEST_HANDLER, &handler, -1);
 
 
 	if (handler->options_widget)
 	{
 		gtk_widget_show (handler->options_widget);
-	} 
+	}
 
 }
 
-static void 
+static void
 format_handlers_foreach_free (gpointer data, gpointer user_data)
 {
 	FormatHandler *handler = data;
@@ -98,14 +98,14 @@ format_handlers_foreach_free (gpointer data, gpointer user_data)
 	g_free (data);
 }
 
-static void 
+static void
 ask_destination_and_save (EPlugin *ep, ECalPopupTargetSource *target, ECalSourceType type)
 {
 	FormatHandler *handler = NULL;
 
 	GtkWidget *extra_widget = gtk_vbox_new (FALSE, 0);
 	GtkComboBox *combo = GTK_COMBO_BOX(gtk_combo_box_new ());
-	GtkTreeModel *model = GTK_TREE_MODEL (gtk_list_store_new 
+	GtkTreeModel *model = GTK_TREE_MODEL (gtk_list_store_new
 		(N_DEST_COLUMNS, G_TYPE_STRING, G_TYPE_POINTER));
 	GtkCellRenderer *renderer=NULL;
 	GtkListStore *store = GTK_LIST_STORE (model);
@@ -116,33 +116,33 @@ ask_destination_and_save (EPlugin *ep, ECalPopupTargetSource *target, ECalSource
 	GList *format_handlers = NULL;
 
 	/* The available formathandlers */
-	format_handlers = g_list_append (format_handlers, 
+	format_handlers = g_list_append (format_handlers,
 		ical_format_handler_new ());
-	format_handlers = g_list_append (format_handlers, 
+	format_handlers = g_list_append (format_handlers,
 		csv_format_handler_new ());
-	format_handlers = g_list_append (format_handlers, 
+	format_handlers = g_list_append (format_handlers,
 		rdf_format_handler_new ());
 
 	/* The Type GtkComboBox */
-	gtk_box_pack_start (GTK_BOX (extra_widget), GTK_WIDGET (combo), 
+	gtk_box_pack_start (GTK_BOX (extra_widget), GTK_WIDGET (combo),
 		TRUE, TRUE, 0);
 	gtk_combo_box_set_model (combo, model);
 
 	gtk_list_store_clear (store);
 	renderer = gtk_cell_renderer_text_new ();
 	gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combo), renderer, TRUE);
-	gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (combo), 
+	gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (combo),
 			renderer, "text", DEST_NAME_COLUMN, NULL);
 
 	while (format_handlers) {
 		handler = format_handlers->data;
 		gtk_list_store_append (store, &iter);
-		gtk_list_store_set (store, &iter, DEST_NAME_COLUMN, 
+		gtk_list_store_set (store, &iter, DEST_NAME_COLUMN,
 			handler->combo_label, -1);
 		gtk_list_store_set (store, &iter, DEST_HANDLER, handler, -1);
 
 		if (handler->options_widget) {
-			gtk_box_pack_start (GTK_BOX (extra_widget), 
+			gtk_box_pack_start (GTK_BOX (extra_widget),
 				GTK_WIDGET (handler->options_widget), TRUE, TRUE, 0);
 			gtk_widget_hide (handler->options_widget);
 		}
@@ -157,7 +157,7 @@ ask_destination_and_save (EPlugin *ep, ECalPopupTargetSource *target, ECalSource
 	}
 
 
-	g_signal_connect (G_OBJECT(combo), "changed", 
+	g_signal_connect (G_OBJECT(combo), "changed",
 		G_CALLBACK (on_type_combobox_changed), extra_widget);
 
 	dialog = gtk_file_chooser_dialog_new (_("Select destination file"),
@@ -178,10 +178,10 @@ ask_destination_and_save (EPlugin *ep, ECalPopupTargetSource *target, ECalSource
 		char *tmp = NULL;
 
 		gtk_combo_box_get_active_iter (combo, &iter);
-		gtk_tree_model_get (model, &iter, 
+		gtk_tree_model_get (model, &iter,
 			DEST_HANDLER, &handler, -1);
 
-	       dest_uri = gtk_file_chooser_get_uri 
+	       dest_uri = gtk_file_chooser_get_uri
 			(GTK_FILE_CHOOSER (dialog));
 
 		tmp = strstr (dest_uri, handler->filename_ext);
@@ -202,7 +202,7 @@ ask_destination_and_save (EPlugin *ep, ECalPopupTargetSource *target, ECalSource
 	g_list_free (format_handlers);
 
 	/* Now we can destroy it */
-	gtk_widget_destroy (dialog);	
+	gtk_widget_destroy (dialog);
 	g_free (dest_uri);
 
 }
diff --git a/plugins/select-one-source/mark-calendar-offline.c b/plugins/select-one-source/mark-calendar-offline.c
index dea9baf28a..fee8595883 100644
--- a/plugins/select-one-source/mark-calendar-offline.c
+++ b/plugins/select-one-source/mark-calendar-offline.c
@@ -20,7 +20,7 @@
  */
 
 /* This is prototype code only, this may, or may not, use undocumented
- * unstable or private internal function calls. 
+ * unstable or private internal function calls.
  * This code has been derived from the source of the sample eplugin
  * select_one_source.
  */
@@ -38,7 +38,7 @@ void
 org_gnome_mark_calendar_no_offline (EPlugin *ep, ECalPopupTargetSource *target)
 {
 	ESource *source;
-	
+
 	source = e_source_selector_peek_primary_selection (target->selector);
 	e_source_set_property (source, "offline", "0");
 }
@@ -47,7 +47,7 @@ void
 org_gnome_mark_calendar_offline (EPlugin *ep, ECalPopupTargetSource *target)
 {
 	ESource *source;
-	
+
 	source = e_source_selector_peek_primary_selection (target->selector);
 	e_source_set_property (source, "offline", "1");
 }
diff --git a/plugins/select-one-source/select-one-source.c b/plugins/select-one-source/select-one-source.c
index 12aa5bda95..e571c77935 100644
--- a/plugins/select-one-source/select-one-source.c
+++ b/plugins/select-one-source/select-one-source.c
@@ -35,10 +35,10 @@ org_gnome_select_one_source (EPlugin *ep, ECalPopupTargetSource *target)
 {
 	GSList *selection, *l;
 	ESource *primary_source;
-	
+
 	selection = e_source_selector_get_selection (target->selector);
 	primary_source = e_source_selector_peek_primary_selection (target->selector);
-	
+
 	for (l = selection; l; l = l->next) {
 		ESource *source = l->data;
 
@@ -47,6 +47,6 @@ org_gnome_select_one_source (EPlugin *ep, ECalPopupTargetSource *target)
 	}
 
 	e_source_selector_select_source (target->selector, primary_source);
-	
+
 	e_source_selector_free_selection (selection);
 }
diff --git a/plugins/startup-wizard/startup-wizard.c b/plugins/startup-wizard/startup-wizard.c
index 117fcb77d2..793d2514be 100644
--- a/plugins/startup-wizard/startup-wizard.c
+++ b/plugins/startup-wizard/startup-wizard.c
@@ -59,17 +59,17 @@ startup_wizard (EPlugin *ep, ESEventTargetUpgrade *target)
 	GSList *accounts;
 	EMAccountEditor *emae;
 	GnomeDruidPageEdge *start_page;
-	
+
 	client = gconf_client_get_default ();
 	accounts = gconf_client_get_list (client, "/apps/evolution/mail/accounts", GCONF_VALUE_STRING, NULL);
 	g_object_unref (client);
-	
+
 	if (accounts != NULL) {
 		g_slist_foreach (accounts, (GFunc) g_free, NULL);
 		g_slist_free (accounts);
 
 		return;
-	}	
+	}
 
 	/** @HookPoint-EMConfig: New Mail Account Wizard
 	 * @Id: org.gnome.evolution.mail.config.accountWizard
@@ -91,7 +91,7 @@ startup_wizard (EPlugin *ep, ESEventTargetUpgrade *target)
 					"\n"
 					"Please click the \"Forward\" button to continue. "));
 	g_signal_connect (emae->editor, "delete-event", G_CALLBACK (startup_wizard_delete), NULL);
-	
+
 	gtk_widget_show (emae->editor);
 	gtk_main ();
 }
@@ -101,15 +101,15 @@ startup_wizard_timezone_page (EPlugin *ep, EConfigHookItemFactoryData *hook_data
 {
 	ETimezoneDialog *etd;
 	GtkWidget *page;
-	
+
 	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);
 
 	e_timezone_dialog_set_timezone (etd, NULL);
-	
+
 	gnome_druid_append_page (GNOME_DRUID (hook_data->parent), GNOME_DRUID_PAGE (page));
 
 	return GTK_WIDGET (page);
@@ -138,7 +138,7 @@ startup_wizard_importer_page (EPlugin *ep, EConfigHookItemFactoryData *hook_data
 
 	sep = gtk_hseparator_new ();
 	gtk_box_pack_start (GTK_BOX (GNOME_DRUID_PAGE_STANDARD (page)->vbox), sep, FALSE, FALSE, 3);
-	
+
 	table = gtk_table_new(g_slist_length(import_importers), 2, FALSE);
 	for (l = import_importers; l; l = l->next) {
 		EImportImporter *eii = l->data;
@@ -153,7 +153,7 @@ startup_wizard_importer_page (EPlugin *ep, EConfigHookItemFactoryData *hook_data
 		gtk_widget_show(label);
 		g_free(str);
 
-		gtk_misc_set_alignment((GtkMisc *)label, 0, .5); 
+		gtk_misc_set_alignment((GtkMisc *)label, 0, .5);
 
 		gtk_table_attach((GtkTable *)table, label, 0, 1, row, row+1, GTK_FILL, 0, 0, 0);
 		if (w)
@@ -162,7 +162,7 @@ startup_wizard_importer_page (EPlugin *ep, EConfigHookItemFactoryData *hook_data
 	}
 	gtk_widget_show(table);
 	gtk_box_pack_start((GtkBox *)((GnomeDruidPageStandard *)page)->vbox, table, FALSE, FALSE, 3);
-	
+
 	gnome_druid_append_page (GNOME_DRUID (hook_data->parent), GNOME_DRUID_PAGE (page));
 
 	return page;
diff --git a/plugins/subject-thread/subject-thread.c b/plugins/subject-thread/subject-thread.c
index 867b01ec1b..c2d518e6cf 100644
--- a/plugins/subject-thread/subject-thread.c
+++ b/plugins/subject-thread/subject-thread.c
@@ -39,7 +39,7 @@ static void
 toggled_cb (GtkWidget *widget, EConfig *config)
 {
 	EMConfigTargetPrefs *target = (EMConfigTargetPrefs *) config->target;
-	
+
 	/* Save the new setting to gconf */
 	gconf_client_set_bool (target->gconf, GCONF_KEY, gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget)), NULL);
 }
@@ -49,7 +49,7 @@ org_gnome_subject_thread_factory (EPlugin *ep, EConfigHookItemFactoryData *hook_
 {
 	GtkWidget *check;
 	EMConfigTargetPrefs *target = (EMConfigTargetPrefs *) hook_data->config->target;
-	
+
 	/* Create the checkbox we will display, complete with mnemonic that is unique in the dialog */
 	check = gtk_check_button_new_with_mnemonic (_("F_all back to threading messages by subject"));
 
@@ -58,10 +58,10 @@ org_gnome_subject_thread_factory (EPlugin *ep, EConfigHookItemFactoryData *hook_
 
 	/* Listen for the item being toggled on and off */
 	g_signal_connect (GTK_TOGGLE_BUTTON (check), "toggled", G_CALLBACK (toggled_cb), hook_data->config);
-	
+
 	/* Pack the checkbox in the parent widget and show it */
 	gtk_box_pack_start (GTK_BOX (hook_data->parent), check, FALSE, FALSE, 0);
 	gtk_widget_show (check);
-	
+
 	return check;
 }
diff --git a/plugins/tnef-attachments/tnef-plugin.c b/plugins/tnef-attachments/tnef-plugin.c
index 0faac25811..cea0081cfe 100644
--- a/plugins/tnef-attachments/tnef-plugin.c
+++ b/plugins/tnef-attachments/tnef-plugin.c
@@ -44,7 +44,7 @@ void saveVTask(TNEFStruct *tnef);
 void org_gnome_format_tnef(void *ep, EMFormatHookTarget *t);
 
 /* Other Prototypes */
-void fprintProperty(TNEFStruct *tnef, FILE *fptr, DWORD proptype, DWORD propid, char text[]); 
+void fprintProperty(TNEFStruct *tnef, FILE *fptr, DWORD proptype, DWORD propid, char text[]);
 void fprintUserProp(TNEFStruct *tnef, FILE *fptr, DWORD proptype, DWORD propid, char text[]);
 void quotedfprint(FILE *fptr, variableLength *vl);
 void cstylefprint(FILE *fptr, variableLength *vl);
@@ -69,11 +69,11 @@ org_gnome_format_tnef(void *ep, EMFormatHookTarget *t)
 	int len;
 	TNEFStruct *tnef;
 	tnef = (TNEFStruct *) g_malloc(sizeof(TNEFStruct));
-	
+
 	tmpdir = e_mkdtemp("tnef-attachment-XXXXXX");
 	if (tmpdir == NULL)
 		return;
-	
+
 	filepath = tmpdir;
 
 	name = g_build_filename(tmpdir, ".evo-attachment.tnef", NULL);
@@ -96,8 +96,8 @@ org_gnome_format_tnef(void *ep, EMFormatHookTarget *t)
 	tnef->Debug = verbose;
         if (TNEFParseFile(name, tnef) == -1) {
             printf("ERROR processing file\n");
-        } 
-	processTnef(tnef); 
+        }
+	processTnef(tnef);
 
         TNEFFree(tnef);
 	/* Extraction done */
@@ -121,13 +121,13 @@ org_gnome_format_tnef(void *ep, EMFormatHookTarget *t)
 		char *path;
 		const char *type;
 
-		if (!strcmp(d->d_name, ".") 
-		    || !strcmp(d->d_name, "..") 
+		if (!strcmp(d->d_name, ".")
+		    || !strcmp(d->d_name, "..")
 		    || !strcmp(d->d_name, ".evo-attachment.tnef"))
 		    continue;
-		
+
 		path = g_build_filename(tmpdir, d->d_name, NULL);
-		
+
 		stream = camel_stream_fs_new_with_name(path, O_RDONLY, 0);
 		content = camel_data_wrapper_new();
 		camel_data_wrapper_construct_from_stream(content, stream);
@@ -138,20 +138,20 @@ org_gnome_format_tnef(void *ep, EMFormatHookTarget *t)
 
 		camel_medium_set_content_object((CamelMedium *)part, content);
 		camel_object_unref(content);
-		
+
 		type = em_utils_snoop_type(part);
 		if (type)
 		    camel_data_wrapper_set_mime_type((CamelDataWrapper *)part, type);
-		
+
 		camel_mime_part_set_filename(part, d->d_name);
-		
+
 		g_free(path);
-		
+
 		camel_multipart_add_part(mp, part);
 	}
-	
+
 	closedir(dir);
-	
+
 	len = t->format->part_id->len;
 	g_string_append_printf(t->format->part_id, ".tnef");
 
@@ -161,7 +161,7 @@ org_gnome_format_tnef(void *ep, EMFormatHookTarget *t)
 	    t->item->handler.old->handler(t->format, t->stream, t->part, t->item->handler.old);
 
 	g_string_truncate(t->format->part_id, len);
-	
+
 	camel_object_unref(mainpart);
 
 	goto ok;
@@ -186,12 +186,12 @@ e_plugin_lib_enable(EPluginLib *ep, int enable)
     if (enable) {
 	bindtextdomain(GETTEXT_PACKAGE, LOCALEDIR);
 	    bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8");
-    } 
+    }
 
     return 0;
 }
 
-void processTnef(TNEFStruct *tnef) { 
+void processTnef(TNEFStruct *tnef) {
     variableLength *filename;
     variableLength *filedata;
     Attachment *p;
@@ -203,7 +203,7 @@ void processTnef(TNEFStruct *tnef) {
 
     FILE *fptr;
     ifilename = (char *) g_malloc(sizeof(char) * 256);
-    
+
     /* First see if this requires special processing. */
     /* ie: it's a Contact Card, Task, or Meeting request (vCal/vCard) */
     if (tnef->messageClass[0] != 0)  {
@@ -218,8 +218,8 @@ void processTnef(TNEFStruct *tnef) {
             foundCal = 1;
         }
     }
-    
-    if ((filename = MAPIFindUserProp(&(tnef->MapiProperties), 
+
+    if ((filename = MAPIFindUserProp(&(tnef->MapiProperties),
                         PROP_TAG(PT_STRING8,0x24))) != MAPI_UNDEFINED) {
         if (strcmp(filename->data, "IPM.Appointment") == 0) {
              /* If it's "indicated" twice, we don't want to save 2 calendar entries. */
@@ -245,16 +245,16 @@ void processTnef(TNEFStruct *tnef) {
                     } else {
                         sprintf(ifilename, "%s/%s.rtf", filepath, tnef->subject.data);
                     }
-                    for(i=0; i<strlen(ifilename); i++) 
-                        if (ifilename[i] == ' ') 
+                    for(i=0; i<strlen(ifilename); i++)
+                        if (ifilename[i] == ' ')
                             ifilename[i] = '_';
 
                     if ((fptr = fopen(ifilename, "wb"))==NULL) {
                         printf("ERROR: Error writing file to disk!");
                     } else {
                         fwrite(buf->data,
-                                sizeof(BYTE), 
-                                buf->size, 
+                                sizeof(BYTE),
+                                buf->size,
                                 fptr);
                         fclose(fptr);
                     }
@@ -262,7 +262,7 @@ void processTnef(TNEFStruct *tnef) {
 		    buf->data="";
 		    buf->size=0;
                 }
-            } 
+            }
 	}
     }
 
@@ -273,15 +273,15 @@ void processTnef(TNEFStruct *tnef) {
         count++;
         /* Make sure it has a size. */
         if (p->FileData.size > 0) {
-            object = 1;           
-            
+            object = 1;
+
             /* See if the contents are stored as "attached data" */
 	    /* Inside the MAPI blocks. */
-            if((filedata = MAPIFindProperty(&(p->MAPI), 
-                                    PROP_TAG(PT_OBJECT, PR_ATTACH_DATA_OBJ))) 
+            if((filedata = MAPIFindProperty(&(p->MAPI),
+                                    PROP_TAG(PT_OBJECT, PR_ATTACH_DATA_OBJ)))
                     == MAPI_UNDEFINED) {
-                if((filedata = MAPIFindProperty(&(p->MAPI), 
-                                    PROP_TAG(PT_BINARY, PR_ATTACH_DATA_OBJ))) 
+                if((filedata = MAPIFindProperty(&(p->MAPI),
+                                    PROP_TAG(PT_BINARY, PR_ATTACH_DATA_OBJ)))
 		   == MAPI_UNDEFINED) {
                     /* Nope, standard TNEF stuff. */
                     filedata = &(p->FileData);
@@ -301,7 +301,7 @@ void processTnef(TNEFStruct *tnef) {
                     /* Has a TNEF signature, so process it. */
                     TNEFInitialize(emb_tnef);
                     emb_tnef->Debug = tnef->Debug;
-                    if (TNEFParseMemory(filedata->data+16, 
+                    if (TNEFParseMemory(filedata->data+16,
                              filedata->size-16, emb_tnef) != -1) {
                         processTnef(emb_tnef);
                         RealAttachment = 0;
@@ -317,7 +317,7 @@ void processTnef(TNEFStruct *tnef) {
                     /* Has a TNEF signature, so process it. */
                     TNEFInitialize(emb_tnef);
                     emb_tnef->Debug = tnef->Debug;
-                    if (TNEFParseMemory(filedata->data, 
+                    if (TNEFParseMemory(filedata->data,
                             filedata->size, emb_tnef) != -1) {
                         processTnef(emb_tnef);
                         RealAttachment = 0;
@@ -328,11 +328,11 @@ void processTnef(TNEFStruct *tnef) {
             if ((RealAttachment == 1) || (saveintermediate == 1)) {
                 /* Ok, it's not an embedded stream, so now we */
 		/* process it. */
-                if ((filename = MAPIFindProperty(&(p->MAPI), 
-                                        PROP_TAG(30,0x3707))) 
+                if ((filename = MAPIFindProperty(&(p->MAPI),
+                                        PROP_TAG(30,0x3707)))
                         == MAPI_UNDEFINED) {
-                    if ((filename = MAPIFindProperty(&(p->MAPI), 
-                                        PROP_TAG(30,0x3001))) 
+                    if ((filename = MAPIFindProperty(&(p->MAPI),
+                                        PROP_TAG(30,0x3001)))
                             == MAPI_UNDEFINED) {
                         filename = &(p->Title);
                     }
@@ -348,27 +348,27 @@ void processTnef(TNEFStruct *tnef) {
                 } else {
                     sprintf(ifilename, "%s/%s", filepath, filename->data);
                 }
-                for(i=0; i<strlen(ifilename); i++) 
-                    if (ifilename[i] == ' ') 
+                for(i=0; i<strlen(ifilename); i++)
+                    if (ifilename[i] == ' ')
                         ifilename[i] = '_';
 
 		if ((fptr = fopen(ifilename, "wb"))==NULL) {
 		    printf("ERROR: Error writing file to disk!");
 		} else {
 		    if (object == 1) {
-			fwrite(filedata->data + 16, 
-			       sizeof(BYTE), 
-			       filedata->size - 16, 
+			fwrite(filedata->data + 16,
+			       sizeof(BYTE),
+			       filedata->size - 16,
 			       fptr);
 		    } else {
-			fwrite(filedata->data, 
-			       sizeof(BYTE), 
-			       filedata->size, 
+			fwrite(filedata->data,
+			       sizeof(BYTE),
+			       filedata->size,
 			       fptr);
 		    }
 		    fclose(fptr);
-		} 
-            } 
+		}
+            }
         } /* if size>0 */
         p=p->next;
     } /* while p!= null */
@@ -413,8 +413,8 @@ void saveVCard(TNEFStruct *tnef) {
             sprintf(ifilename, "%s/%s.vcard", filepath, vl->data);
         }
     }
-    for(i=0; i<strlen(ifilename); i++) 
-        if (ifilename[i] == ' ') 
+    for(i=0; i<strlen(ifilename); i++)
+        if (ifilename[i] == ' ')
             ifilename[i] = '_';
     printf("%s\n", ifilename);
 
@@ -429,7 +429,7 @@ void saveVCard(TNEFStruct *tnef) {
         fprintProperty(tnef, fptr, PT_STRING8, PR_NICKNAME, "NICKNAME:%s\n");
         fprintUserProp(tnef, fptr, PT_STRING8, 0x8554, "MAILER:Microsoft Outlook %s\n");
         fprintProperty(tnef, fptr, PT_STRING8, PR_SPOUSE_NAME, "X-EVOLUTION-SPOUSE:%s\n");
-        fprintProperty(tnef, fptr, PT_STRING8, PR_MANAGER_NAME, "X-EVOLUTION-MANAGER:%s\n");       
+        fprintProperty(tnef, fptr, PT_STRING8, PR_MANAGER_NAME, "X-EVOLUTION-MANAGER:%s\n");
         fprintProperty(tnef, fptr, PT_STRING8, PR_ASSISTANT, "X-EVOLUTION-ASSISTANT:%s\n");
 
         /* Organizational */
@@ -638,21 +638,21 @@ void saveVCard(TNEFStruct *tnef) {
             vl=MAPIFindUserProp(&(tnef->MapiProperties), PROP_TAG(PT_STRING8, 0x8084));
         }
         if (vl != MAPI_UNDEFINED) {
-            if (vl->size > 0) 
+            if (vl->size > 0)
                 fprintf(fptr, "EMAIL:%s\n", vl->data);
         }
         if ((vl=MAPIFindUserProp(&(tnef->MapiProperties), PROP_TAG(PT_STRING8, 0x8093))) == MAPI_UNDEFINED) {
             vl=MAPIFindUserProp(&(tnef->MapiProperties), PROP_TAG(PT_STRING8, 0x8094));
         }
         if (vl != MAPI_UNDEFINED) {
-            if (vl->size > 0) 
+            if (vl->size > 0)
                 fprintf(fptr, "EMAIL:%s\n", vl->data);
         }
         if ((vl=MAPIFindUserProp(&(tnef->MapiProperties), PROP_TAG(PT_STRING8, 0x80a3))) == MAPI_UNDEFINED) {
             vl=MAPIFindUserProp(&(tnef->MapiProperties), PROP_TAG(PT_STRING8, 0x80a4));
         }
         if (vl != MAPI_UNDEFINED) {
-            if (vl->size > 0) 
+            if (vl->size > 0)
                 fprintf(fptr, "EMAIL:%s\n", vl->data);
         }
 
@@ -786,7 +786,7 @@ char * getRruleDayname(unsigned char a) {
     return(daystring);
 }
 
-void printRrule(FILE *fptr, char *recur_data, int size, TNEFStruct *tnef) 
+void printRrule(FILE *fptr, char *recur_data, int size, TNEFStruct *tnef)
 {
     variableLength *filename;
 
@@ -806,21 +806,21 @@ void printRrule(FILE *fptr, char *recur_data, int size, TNEFStruct *tnef)
                 fprintf(fptr, ";INTERVAL=%d", *(filename->data));
             }
             if (recur_data[0x16] == 0x22 || recur_data[0x16] == 0x21) {
-                fprintf(fptr, ";COUNT=%d", 
+                fprintf(fptr, ";COUNT=%d",
                     getRruleCount(recur_data[0x1B], recur_data[0x1A]));
             }
         } else if (recur_data[0x16] == 0x3E) {
             fprintf(fptr, ";BYDAY=MO,TU,WE,TH,FR");
             if (recur_data[0x1A] == 0x22 || recur_data[0x1A] == 0x21) {
-                fprintf(fptr, ";COUNT=%d", 
+                fprintf(fptr, ";COUNT=%d",
                     getRruleCount(recur_data[0x1F], recur_data[0x1E]));
             }
         }
     } else if (recur_data[0x04] == 0x0B) {
-        fprintf(fptr, "WEEKLY;INTERVAL=%d;BYDAY=%s", 
+        fprintf(fptr, "WEEKLY;INTERVAL=%d;BYDAY=%s",
             recur_data[0x0E], getRruleDayname(recur_data[0x16]));
         if (recur_data[0x1A] == 0x22 || recur_data[0x1A] == 0x21) {
-            fprintf(fptr, ";COUNT=%d", 
+            fprintf(fptr, ";COUNT=%d",
                 getRruleCount(recur_data[0x1F], recur_data[0x1E]));
         }
     } else if (recur_data[0x04] == 0x0C) {
@@ -829,11 +829,11 @@ void printRrule(FILE *fptr, char *recur_data, int size, TNEFStruct *tnef)
             fprintf(fptr, ";INTERVAL=%d;BYMONTHDAY=%d", recur_data[0x0E],
                 recur_data[0x16]);
             if (recur_data[0x1A] == 0x22 || recur_data[0x1A] == 0x21) {
-                fprintf(fptr, ";COUNT=%d", getRruleCount(recur_data[0x1F], 
+                fprintf(fptr, ";COUNT=%d", getRruleCount(recur_data[0x1F],
                     recur_data[0x1E]));
             }
         } else if (recur_data[0x06] == 0x03) {
-            fprintf(fptr, ";BYDAY=%s;BYSETPOS=%d;INTERVAL=%d", 
+            fprintf(fptr, ";BYDAY=%s;BYSETPOS=%d;INTERVAL=%d",
                 getRruleDayname(recur_data[0x16]),
                 recur_data[0x1A] == 0x05 ? -1 : recur_data[0x1A],
                 recur_data[0x0E]);
@@ -901,17 +901,17 @@ void saveVCalendar(TNEFStruct *tnef) {
         fprintf(fptr, "VERSION:2.0\n");
         fprintf(fptr, "BEGIN:VEVENT\n");
 
-	/* UID 
-	   After alot of comparisons, I'm reasonably sure this is totally 
+	/* UID
+	   After alot of comparisons, I'm reasonably sure this is totally
 	   wrong.  But it's not really necessary. */
-	
-	/* I think it only exists to connect future modification entries to 
-	   this entry. so as long as it's incorrectly interpreted the same way 
+
+	/* I think it only exists to connect future modification entries to
+	   this entry. so as long as it's incorrectly interpreted the same way
 	   every time, it should be ok :) */
         filename = NULL;
-        if ((filename=MAPIFindUserProp(&(tnef->MapiProperties), 
+        if ((filename=MAPIFindUserProp(&(tnef->MapiProperties),
                         PROP_TAG(PT_BINARY, 0x3))) == MAPI_UNDEFINED) {
-            if ((filename=MAPIFindUserProp(&(tnef->MapiProperties), 
+            if ((filename=MAPIFindUserProp(&(tnef->MapiProperties),
                             PROP_TAG(PT_BINARY, 0x23))) == MAPI_UNDEFINED) {
                 filename = NULL;
             }
@@ -926,28 +926,28 @@ void saveVCalendar(TNEFStruct *tnef) {
 
         /* Sequence */
         filename = NULL;
-        if ((filename=MAPIFindUserProp(&(tnef->MapiProperties), 
+        if ((filename=MAPIFindUserProp(&(tnef->MapiProperties),
                         PROP_TAG(PT_LONG, 0x8201))) != MAPI_UNDEFINED) {
             ddword_ptr = (DDWORD*)filename->data;
             fprintf(fptr, "SEQUENCE:%i\n", (int) *ddword_ptr);
         }
-        if ((filename=MAPIFindProperty(&(tnef->MapiProperties), 
-                        PROP_TAG(PT_BINARY, PR_SENDER_SEARCH_KEY))) 
+        if ((filename=MAPIFindProperty(&(tnef->MapiProperties),
+                        PROP_TAG(PT_BINARY, PR_SENDER_SEARCH_KEY)))
                 != MAPI_UNDEFINED) {
             charptr = filename->data;
             charptr2 = strstr(charptr, ":");
-            if (charptr2 == NULL) 
+            if (charptr2 == NULL)
                 charptr2 = charptr;
             else
                 charptr2++;
-            fprintf(fptr, "ORGANIZER;CN=\"%s\":MAILTO:%s\n", 
+            fprintf(fptr, "ORGANIZER;CN=\"%s\":MAILTO:%s\n",
                     charptr2, charptr2);
         }
 
         /* Required Attendees */
-        if ((filename = MAPIFindUserProp(&(tnef->MapiProperties), 
+        if ((filename = MAPIFindUserProp(&(tnef->MapiProperties),
                         PROP_TAG(PT_STRING8, 0x823b))) != MAPI_UNDEFINED) {
-	    /* We have a list of required participants, so 
+	    /* We have a list of required participants, so
 	       write them out. */
             if (filename->size > 1) {
                 charptr = filename->data-1;
@@ -958,7 +958,7 @@ void saveVCalendar(TNEFStruct *tnef) {
                     if (charptr2 != NULL) {
                         *charptr2 = 0;
                     }
-                    while (*charptr == ' ') 
+                    while (*charptr == ' ')
                         charptr++;
                     fprintf(fptr, "ATTENDEE;PARTSTAT=NEEDS-ACTION;");
                     fprintf(fptr, "ROLE=REQ-PARTICIPANT;RSVP=TRUE;");
@@ -968,7 +968,7 @@ void saveVCalendar(TNEFStruct *tnef) {
                 }
             }
             /* Optional attendees */
-            if ((filename = MAPIFindUserProp(&(tnef->MapiProperties), 
+            if ((filename = MAPIFindUserProp(&(tnef->MapiProperties),
                             PROP_TAG(PT_STRING8, 0x823c))) != MAPI_UNDEFINED) {
                     /* The list of optional participants */
                 if (filename->size > 1) {
@@ -980,7 +980,7 @@ void saveVCalendar(TNEFStruct *tnef) {
                         if (charptr2 != NULL) {
                             *charptr2 = 0;
                         }
-                        while (*charptr == ' ') 
+                        while (*charptr == ' ')
                             charptr++;
                         fprintf(fptr, "ATTENDEE;PARTSTAT=NEEDS-ACTION;");
                         fprintf(fptr, "ROLE=OPT-PARTICIPANT;RSVP=TRUE;");
@@ -990,7 +990,7 @@ void saveVCalendar(TNEFStruct *tnef) {
                     }
                 }
             }
-        } else if ((filename = MAPIFindUserProp(&(tnef->MapiProperties), 
+        } else if ((filename = MAPIFindUserProp(&(tnef->MapiProperties),
                         PROP_TAG(PT_STRING8, 0x8238))) != MAPI_UNDEFINED) {
             if (filename->size > 1) {
                 charptr = filename->data-1;
@@ -1001,7 +1001,7 @@ void saveVCalendar(TNEFStruct *tnef) {
                     if (charptr2 != NULL) {
                         *charptr2 = 0;
                     }
-                    while (*charptr == ' ') 
+                    while (*charptr == ' ')
                         charptr++;
                     fprintf(fptr, "ATTENDEE;PARTSTAT=NEEDS-ACTION;");
                     fprintf(fptr, "ROLE=REQ-PARTICIPANT;RSVP=TRUE;");
@@ -1014,8 +1014,8 @@ void saveVCalendar(TNEFStruct *tnef) {
         }
         /* Summary */
         filename = NULL;
-        if((filename=MAPIFindProperty(&(tnef->MapiProperties), 
-                        PROP_TAG(PT_STRING8, PR_CONVERSATION_TOPIC))) 
+        if((filename=MAPIFindProperty(&(tnef->MapiProperties),
+                        PROP_TAG(PT_STRING8, PR_CONVERSATION_TOPIC)))
                 != MAPI_UNDEFINED) {
             fprintf(fptr, "SUMMARY:");
             cstylefprint(fptr, filename);
@@ -1033,14 +1033,14 @@ void saveVCalendar(TNEFStruct *tnef) {
                 printRtf(fptr, &buf);
                 free(buf->data);
             }
-            
-        } 
+
+        }
 
         /* Location */
         filename = NULL;
-        if ((filename=MAPIFindUserProp(&(tnef->MapiProperties), 
+        if ((filename=MAPIFindUserProp(&(tnef->MapiProperties),
                         PROP_TAG(PT_STRING8, 0x0002))) == MAPI_UNDEFINED) {
-            if ((filename=MAPIFindUserProp(&(tnef->MapiProperties), 
+            if ((filename=MAPIFindUserProp(&(tnef->MapiProperties),
                             PROP_TAG(PT_STRING8, 0x8208))) == MAPI_UNDEFINED) {
                 filename = NULL;
             }
@@ -1050,9 +1050,9 @@ void saveVCalendar(TNEFStruct *tnef) {
         }
         /* Date Start */
         filename = NULL;
-        if ((filename=MAPIFindUserProp(&(tnef->MapiProperties), 
+        if ((filename=MAPIFindUserProp(&(tnef->MapiProperties),
                         PROP_TAG(PT_SYSTIME, 0x820d))) == MAPI_UNDEFINED) {
-            if ((filename=MAPIFindUserProp(&(tnef->MapiProperties), 
+            if ((filename=MAPIFindUserProp(&(tnef->MapiProperties),
                             PROP_TAG(PT_SYSTIME, 0x8516))) == MAPI_UNDEFINED) {
                 filename=NULL;
             }
@@ -1060,15 +1060,15 @@ void saveVCalendar(TNEFStruct *tnef) {
         if (filename != NULL) {
             fprintf(fptr, "DTSTART:");
             MAPISysTimetoDTR(filename->data, &thedate);
-            fprintf(fptr,"%04i%02i%02iT%02i%02i%02iZ\n", 
+            fprintf(fptr,"%04i%02i%02iT%02i%02i%02iZ\n",
                     thedate.wYear, thedate.wMonth, thedate.wDay,
                     thedate.wHour, thedate.wMinute, thedate.wSecond);
         }
         /* Date End */
         filename = NULL;
-        if ((filename=MAPIFindUserProp(&(tnef->MapiProperties), 
+        if ((filename=MAPIFindUserProp(&(tnef->MapiProperties),
                         PROP_TAG(PT_SYSTIME, 0x820e))) == MAPI_UNDEFINED) {
-            if ((filename=MAPIFindUserProp(&(tnef->MapiProperties), 
+            if ((filename=MAPIFindUserProp(&(tnef->MapiProperties),
                             PROP_TAG(PT_SYSTIME, 0x8517))) == MAPI_UNDEFINED) {
                 filename=NULL;
             }
@@ -1076,23 +1076,23 @@ void saveVCalendar(TNEFStruct *tnef) {
         if (filename != NULL) {
             fprintf(fptr, "DTEND:");
             MAPISysTimetoDTR(filename->data, &thedate);
-            fprintf(fptr,"%04i%02i%02iT%02i%02i%02iZ\n", 
+            fprintf(fptr,"%04i%02i%02iT%02i%02i%02iZ\n",
                     thedate.wYear, thedate.wMonth, thedate.wDay,
                     thedate.wHour, thedate.wMinute, thedate.wSecond);
         }
         /* Date Stamp */
         filename = NULL;
-        if ((filename=MAPIFindUserProp(&(tnef->MapiProperties), 
+        if ((filename=MAPIFindUserProp(&(tnef->MapiProperties),
                         PROP_TAG(PT_SYSTIME, 0x8202))) != MAPI_UNDEFINED) {
             fprintf(fptr, "CREATED:");
             MAPISysTimetoDTR(filename->data, &thedate);
-            fprintf(fptr,"%04i%02i%02iT%02i%02i%02iZ\n", 
+            fprintf(fptr,"%04i%02i%02iT%02i%02i%02iZ\n",
                     thedate.wYear, thedate.wMonth, thedate.wDay,
                     thedate.wHour, thedate.wMinute, thedate.wSecond);
         }
         /* Class */
         filename = NULL;
-        if ((filename=MAPIFindUserProp(&(tnef->MapiProperties), 
+        if ((filename=MAPIFindUserProp(&(tnef->MapiProperties),
                         PROP_TAG(PT_BOOLEAN, 0x8506))) != MAPI_UNDEFINED) {
             ddword_ptr = (DDWORD*)filename->data;
             ddword_val = SwapDDWord((BYTE*)ddword_ptr);
@@ -1105,7 +1105,7 @@ void saveVCalendar(TNEFStruct *tnef) {
         }
         /* Recurrence */
         filename = NULL;
-        if ((filename=MAPIFindUserProp(&(tnef->MapiProperties), 
+        if ((filename=MAPIFindUserProp(&(tnef->MapiProperties),
                         PROP_TAG(PT_BINARY, 0x8216))) != MAPI_UNDEFINED) {
             printRrule(fptr, filename->data, filename->size, tnef);
         }
@@ -1127,7 +1127,7 @@ void saveVTask(TNEFStruct *tnef) {
     FILE *fptr;
     DDWORD *ddword_ptr;
     DDWORD ddword_val;
-    
+
     vl = MAPIFindProperty(&(tnef->MapiProperties), PROP_TAG(PT_STRING8, PR_CONVERSATION_TOPIC));
 
     if (vl == MAPI_UNDEFINED) {
@@ -1135,7 +1135,7 @@ void saveVTask(TNEFStruct *tnef) {
     }
 
     index = strlen(vl->data);
-    while (vl->data[index] == ' ') 
+    while (vl->data[index] == ' ')
             vl->data[index--] = 0;
 
     if (filepath == NULL) {
@@ -1143,8 +1143,8 @@ void saveVTask(TNEFStruct *tnef) {
     } else {
         sprintf(ifilename, "%s/%s.vcf", filepath, vl->data);
     }
-    for(i=0; i<strlen(ifilename); i++) 
-        if (ifilename[i] == ' ') 
+    for(i=0; i<strlen(ifilename); i++)
+        if (ifilename[i] == ' ')
             ifilename[i] = '_';
     printf("%s\n", ifilename);
 
@@ -1165,7 +1165,7 @@ void saveVTask(TNEFStruct *tnef) {
         if (filename != MAPI_UNDEFINED) {
             fprintf(fptr, "ORGANIZER:%s\n", filename->data);
         }
-                 
+
 
         if ((filename = MAPIFindProperty(&(tnef->MapiProperties), PROP_TAG(PT_STRING8, PR_DISPLAY_TO))) != MAPI_UNDEFINED) {
             filename = MAPIFindUserProp(&(tnef->MapiProperties), PROP_TAG(PT_STRING8, 0x811f));
@@ -1179,7 +1179,7 @@ void saveVTask(TNEFStruct *tnef) {
                 if (charptr2 != NULL) {
                     *charptr2 = 0;
                 }
-                while (*charptr == ' ') 
+                while (*charptr == ' ')
                     charptr++;
                 fprintf(fptr, "ATTENDEE;CN=%s;ROLE=REQ-PARTICIPANT:%s\n", charptr, charptr);
                 charptr = charptr2;
@@ -1203,7 +1203,7 @@ void saveVTask(TNEFStruct *tnef) {
         if (filename != MAPI_UNDEFINED) {
             fprintf(fptr, "DTSTAMP:");
             MAPISysTimetoDTR(filename->data, &thedate);
-            fprintf(fptr,"%04i%02i%02iT%02i%02i%02iZ\n", 
+            fprintf(fptr,"%04i%02i%02iT%02i%02i%02iZ\n",
                     thedate.wYear, thedate.wMonth, thedate.wDay,
                     thedate.wHour, thedate.wMinute, thedate.wSecond);
         }
@@ -1213,7 +1213,7 @@ void saveVTask(TNEFStruct *tnef) {
         if (filename != MAPI_UNDEFINED) {
             fprintf(fptr, "DUE:");
             MAPISysTimetoDTR(filename->data, &thedate);
-            fprintf(fptr,"%04i%02i%02iT%02i%02i%02iZ\n", 
+            fprintf(fptr,"%04i%02i%02iT%02i%02i%02iZ\n",
                     thedate.wYear, thedate.wMonth, thedate.wDay,
                     thedate.wHour, thedate.wMinute, thedate.wSecond);
         }
@@ -1222,7 +1222,7 @@ void saveVTask(TNEFStruct *tnef) {
         if (filename != MAPI_UNDEFINED) {
             fprintf(fptr, "LAST-MODIFIED:");
             MAPISysTimetoDTR(filename->data, &thedate);
-            fprintf(fptr,"%04i%02i%02iT%02i%02i%02iZ\n", 
+            fprintf(fptr,"%04i%02i%02iT%02i%02i%02iZ\n",
                     thedate.wYear, thedate.wMonth, thedate.wDay,
                     thedate.wHour, thedate.wMinute, thedate.wSecond);
         }
@@ -1248,24 +1248,24 @@ void saveVTask(TNEFStruct *tnef) {
 
 void fprintProperty(TNEFStruct *tnef, FILE *fptr, DWORD proptype, DWORD propid, char text[]) {
     variableLength *vl;
-    if ((vl=MAPIFindProperty(&(tnef->MapiProperties), PROP_TAG(proptype, propid))) != MAPI_UNDEFINED) { 
+    if ((vl=MAPIFindProperty(&(tnef->MapiProperties), PROP_TAG(proptype, propid))) != MAPI_UNDEFINED) {
         if (vl->size > 0) {
             if ((vl->size == 1) && (vl->data[0] == 0)) {
-            } else { 
-                fprintf(fptr, text, vl->data); 
-            } 
+            } else {
+                fprintf(fptr, text, vl->data);
+            }
 	}
     }
 }
 
 void fprintUserProp(TNEFStruct *tnef, FILE *fptr, DWORD proptype, DWORD propid, char text[]) {
     variableLength *vl;
-    if ((vl=MAPIFindUserProp(&(tnef->MapiProperties), PROP_TAG(proptype, propid))) != MAPI_UNDEFINED) { 
+    if ((vl=MAPIFindUserProp(&(tnef->MapiProperties), PROP_TAG(proptype, propid))) != MAPI_UNDEFINED) {
         if (vl->size > 0) {
             if ((vl->size == 1) && (vl->data[0] == 0)) {
-            } else { 
-                fprintf(fptr, text, vl->data); 
-            } 
+            } else {
+                fprintf(fptr, text, vl->data);
+            }
 	}
     }
 }
@@ -1273,23 +1273,23 @@ void fprintUserProp(TNEFStruct *tnef, FILE *fptr, DWORD proptype, DWORD propid,
 void quotedfprint(FILE *fptr, variableLength *vl) {
     int index;
 
-    for (index=0;index<vl->size-1; index++) { 
-        if (vl->data[index] == '\n') { 
-            fprintf(fptr, "=0A"); 
-        } else if (vl->data[index] == '\r') { 
-        } else { 
-            fprintf(fptr, "%c", vl->data[index]); 
-        } 
+    for (index=0;index<vl->size-1; index++) {
+        if (vl->data[index] == '\n') {
+            fprintf(fptr, "=0A");
+        } else if (vl->data[index] == '\r') {
+        } else {
+            fprintf(fptr, "%c", vl->data[index]);
+        }
     }
 }
 
 void cstylefprint(FILE *fptr, variableLength *vl) {
     int index;
 
-    for (index=0;index<vl->size-1; index++) { 
-        if (vl->data[index] == '\n') { 
-            fprintf(fptr, "\\n"); 
-        } else if (vl->data[index] == '\r') { 
+    for (index=0;index<vl->size-1; index++) {
+        if (vl->data[index] == '\n') {
+            fprintf(fptr, "\\n");
+        } else if (vl->data[index] == '\r') {
             /* Print nothing. */
         } else if (vl->data[index] == ';') {
             fprintf(fptr, "\\;");
@@ -1297,9 +1297,9 @@ void cstylefprint(FILE *fptr, variableLength *vl) {
             fprintf(fptr, "\\,");
         } else if (vl->data[index] == '\\') {
             fprintf(fptr, "\\");
-        } else { 
-            fprintf(fptr, "%c", vl->data[index]); 
-        } 
+        } else {
+            fprintf(fptr, "%c", vl->data[index]);
+        }
     }
 }
 
@@ -1329,9 +1329,9 @@ void printRtf(FILE *fptr, variableLength *vl) {
             key = 0;
         }
         if ((brace_ct == 1) && (key == 0)) {
-            if (*byte == '\n') { 
-                fprintf(fptr, "\\n"); 
-            } else if (*byte == '\r') { 
+            if (*byte == '\n') {
+                fprintf(fptr, "\\n");
+            } else if (*byte == '\r') {
 		/* Print nothing. */
             } else if (*byte == ';') {
                 fprintf(fptr, "\\;");
@@ -1339,9 +1339,9 @@ void printRtf(FILE *fptr, variableLength *vl) {
                 fprintf(fptr, "\\,");
             } else if (*byte == '\\') {
                 fprintf(fptr, "\\");
-            } else { 
+            } else {
                 fprintf(fptr, "%c", *byte);
-            } 
+            }
         }
     }
     fprintf(fptr, "\n");