Whitespace cleanup.

26 files changed, 87 insertions, 87 deletions

diff --git a/mail/em-account-prefs.c b/mail/em-account-prefs.c
index f5a86fe9b0..be431db9cc 100644
--- a/mail/em-account-prefs.c
+++ b/mail/em-account-prefs.c
@@ -363,7 +363,7 @@ account_cursor_change (GtkTreeSelection *selection, EMAccountPrefs *prefs)
 	EAccount *account = NULL;
 	GtkTreeModel *model;
 	GtkTreeIter iter;
- 	const gchar *url = NULL;
+	const gchar *url = NULL;
 	gint state;
 	EAccount *default_account;
 	default_account = mail_config_get_default_account ();
@@ -561,7 +561,7 @@ em_account_prefs_construct (EMAccountPrefs *prefs)
 			  "changed", G_CALLBACK (account_cursor_change), prefs);
 	g_signal_connect (prefs->table, "row-activated", G_CALLBACK (account_double_click), prefs);
 
- 	account_cursor_change(gtk_tree_view_get_selection(prefs->table), prefs);
+	account_cursor_change(gtk_tree_view_get_selection(prefs->table), prefs);
 }
 
 GtkWidget *
diff --git a/mail/em-composer-prefs.c b/mail/em-composer-prefs.c
index 6c01dffa08..ab2bb2d8a4 100644
--- a/mail/em-composer-prefs.c
+++ b/mail/em-composer-prefs.c
@@ -945,7 +945,7 @@ em_composer_prefs_construct (EMComposerPrefs *prefs)
 
 	gtk_tree_view_insert_column_with_attributes (
 		view, -1, _("Language(s)"),
-     		gtk_cell_renderer_text_new (),
+		gtk_cell_renderer_text_new (),
 		"text", 1, NULL);
 	selection = gtk_tree_view_get_selection (view);
 	gtk_tree_selection_set_mode (selection, GTK_SELECTION_NONE);
diff --git a/mail/em-composer-utils.c b/mail/em-composer-utils.c
index e8abdd30b3..19a20b2c1b 100644
--- a/mail/em-composer-utils.c
+++ b/mail/em-composer-utils.c
@@ -659,10 +659,10 @@ create_new_composer (const gchar *subject, const gchar *fromuri, gboolean use_de
 	EComposerHeaderTable *table;
 	EAccount *account = NULL;
 
- 	if (lite)
- 		composer = e_msg_composer_lite_new ();
- 	else
- 		composer = e_msg_composer_new ();
+	if (lite)
+		composer = e_msg_composer_lite_new ();
+	else
+		composer = e_msg_composer_new ();
 	table = e_msg_composer_get_header_table (composer);
 
 	if (fromuri != NULL) {
diff --git a/mail/em-event.h b/mail/em-event.h
index 81173fe690..0af32086cf 100644
--- a/mail/em-event.h
+++ b/mail/em-event.h
@@ -134,7 +134,7 @@ struct _EMEventTargetCustomIcon {
 	EEventTarget target;
 
 	GtkCellRenderer *renderer;
-	const gchar 	*folder_name;
+	const gchar	*folder_name;
 };
 
 typedef struct _EEventItem EMEventItem;
diff --git a/mail/em-filter-context.c b/mail/em-filter-context.c
index 5a82c6ea9d..4817d896b5 100644
--- a/mail/em-filter-context.c
+++ b/mail/em-filter-context.c
@@ -291,7 +291,7 @@ filter_new_element(RuleContext *rc, const gchar *type)
 	} else if (!strcmp(type, "score")) {
 		return (FilterElement *) filter_int_new_type("score", -3, 3);
 	} else if (!strcmp(type, "source")) {
-    	        return (FilterElement *) em_filter_source_element_new();
+		return (FilterElement *) em_filter_source_element_new();
 	} else {
 		return parent_class->new_element(rc, type);
 	}
diff --git a/mail/em-folder-browser.c b/mail/em-folder-browser.c
index 0fc37b46bd..b0481d46d5 100644
--- a/mail/em-folder-browser.c
+++ b/mail/em-folder-browser.c
@@ -298,7 +298,7 @@ generate_viewoption_menu (GtkWidget *emfv)
 
 			str = e_str_without_underscores (_(emfb_view_items[i].search.text));
 			menu_item = gtk_image_menu_item_new_with_label (str);
- 			if (emfb_view_items[i].image) {
+			if (emfb_view_items[i].image) {
 				GtkWidget *image;
 
 				image = gtk_image_new_from_icon_name (
@@ -524,7 +524,7 @@ emfb_init(GObject *o)
 		efb = (EFilterBar *)emfb->search;
 		efb->account_search_vf = NULL;
 		efb->all_account_search_vf = NULL;
- 		efb->account_search_cancel = NULL;
+		efb->account_search_cancel = NULL;
 		e_search_bar_set_menu ((ESearchBar *)emfb->search, emfb_search_items);
 		e_search_bar_set_scopeoption ((ESearchBar *)emfb->search, emfb_search_scope_items);
 		emfb->priv->scope_restricted = TRUE;
@@ -982,7 +982,7 @@ get_view_query (ESearchBar *esb, CamelFolder *folder, const gchar *folder_uri)
 		g_string_append (s, ")");
 
 		duplicate = FALSE;
-	        view_sexp = g_string_free (s, FALSE);
+		view_sexp = g_string_free (s, FALSE);
 		} break;
         case VIEW_LABEL:
 		tag = (gchar *)g_object_get_data (G_OBJECT (menu_item), "LabelTag");
@@ -1118,9 +1118,9 @@ vfolder_setup(CamelFolder *folder, const gchar *query, GList *sources_uri, GList
 	m->sources_uri = sources_uri;
 	m->sources_folder = sources_folder;
 
- 	if (cancel) {
- 		m->cancel = cancel;
- 	}
+	if (cancel) {
+		m->cancel = cancel;
+	}
 
 	id = m->base.seq;
 	mail_msg_slow_ordered_push (m);
@@ -2196,8 +2196,8 @@ emfb_activate(EMFolderView *emfv, BonoboUIComponent *uic, gint act)
 
 		/* FIXME: finish */
 		/* (Pre)view pane size (do this first because it affects the
-	           preview settings - see folder_browser_set_message_preview()
-	           internals for details) */
+		   preview settings - see folder_browser_set_message_preview()
+		   internals for details) */
 		g_signal_handler_block(emfb->vpane, emfb->priv->vpane_resize_id);
 		gtk_paned_set_position((GtkPaned *)emfb->vpane, gconf_client_get_int (gconf, emfb->priv->show_wide ? "/apps/evolution/mail/display/hpaned_size": "/apps/evolution/mail/display/paned_size", NULL));
 		g_signal_handler_unblock(emfb->vpane, emfb->priv->vpane_resize_id);
diff --git a/mail/em-folder-tree.c b/mail/em-folder-tree.c
index 3d1a8564f2..b62702bbd7 100644
--- a/mail/em-folder-tree.c
+++ b/mail/em-folder-tree.c
@@ -615,7 +615,7 @@ emft_maybe_expand_row (EMFolderTreeModel *model, GtkTreePath *tree_path, GtkTree
 
 	si = g_hash_table_lookup (model->store_hash, store);
 	if ((account = mail_config_get_account_by_name (si->display_name))) {
-	        key = g_strdup_printf ("%s/%s", account->uid, full_name ? full_name : "");
+		key = g_strdup_printf ("%s/%s", account->uid, full_name ? full_name : "");
 	} else if (CAMEL_IS_VEE_STORE (store)) {
 		/* vfolder store */
 		key = g_strdup_printf ("vfolder/%s", full_name ? full_name : "");
@@ -1779,7 +1779,7 @@ emft_update_model_expanded_state (struct _EMFolderTreePrivate *priv, GtkTreeIter
 
 	si = g_hash_table_lookup (priv->model->store_hash, store);
 	if ((account = mail_config_get_account_by_name (si->display_name))) {
-	        key = g_strdup_printf ("%s/%s", account->uid, full_name ? full_name : "");
+		key = g_strdup_printf ("%s/%s", account->uid, full_name ? full_name : "");
 	} else if (CAMEL_IS_VEE_STORE (store)) {
 		/* vfolder store */
 		key = g_strdup_printf ("vfolder/%s", full_name ? full_name : "");
diff --git a/mail/em-folder-utils.c b/mail/em-folder-utils.c
index 682ffc77c5..b9fda4f9b0 100644
--- a/mail/em-folder-utils.c
+++ b/mail/em-folder-utils.c
@@ -621,7 +621,7 @@ new_folder_created_cb (CamelFolderInfo *fi, gpointer user_data)
 	}
 	g_object_unref (emcftd->emfs);
 	g_free (emcftd->uri);
-   	g_free (emcftd);
+	g_free (emcftd);
 }
 
 static void
diff --git a/mail/em-folder-view.c b/mail/em-folder-view.c
index 5de430e34b..4a23dceb03 100644
--- a/mail/em-folder-view.c
+++ b/mail/em-folder-view.c
@@ -3058,7 +3058,7 @@ emfv_setting_notify(GConfClient *gconf, guint cnxn_id, GConfEntry *entry, EMFold
 		EMFormat *emf = (EMFormat *)emfv->preview;
 
 		header_config_list = gconf_client_get_list(gconf, "/apps/evolution/mail/display/headers", GCONF_VALUE_STRING, NULL);
-      		em_format_clear_headers((EMFormat *)emfv->preview);
+		em_format_clear_headers((EMFormat *)emfv->preview);
 		p = header_config_list;
 		while (p) {
 			EMMailerPrefsHeader *h;
diff --git a/mail/em-format-html-display.c b/mail/em-format-html-display.c
index 044ffe598a..28e67f0f18 100644
--- a/mail/em-format-html-display.c
+++ b/mail/em-format-html-display.c
@@ -1285,7 +1285,7 @@ efhd_change_cursor(GtkWidget *w, GdkEventCrossing *event, struct _attach_puri *i
 	if (info->shown && info->image) {
 		if (info->fit_width != 0) {
 			if (em_icon_stream_is_resized(info->puri.cid, info->fit_width, info->fit_height))
-			    	e_cursor_set(w->window, E_CURSOR_ZOOM_IN);
+				e_cursor_set(w->window, E_CURSOR_ZOOM_IN);
 
 		}
 	}
@@ -1732,7 +1732,7 @@ efhd_format_optional(EMFormat *emf, CamelStream *fstream, CamelMimePart *part, C
 	g_free(html);
 
 	camel_stream_write_string(stream,
-/* 				  "</font></h2></td></tr></table>\n" */
+/*				  "</font></h2></td></tr></table>\n" */
 				  EM_FORMAT_HTML_VPAD);
 
 	g_free(classid);
diff --git a/mail/em-format-html.c b/mail/em-format-html.c
index c7d35a3423..9a2c6a184b 100644
--- a/mail/em-format-html.c
+++ b/mail/em-format-html.c
@@ -805,7 +805,7 @@ efh_text_plain(EMFormatHTML *efh, CamelStream *stream, CamelMimePart *part, EMFo
 		type = camel_mime_part_get_content_type(newpart);
 		if (camel_content_type_is (type, "text", "*") && !camel_content_type_is(type, "text", "calendar")) {
 			camel_stream_printf (stream,
-   					"<div style=\"border: solid #%06x 1px; background-color: #%06x; padding: 10px; color: #%06x;\">\n",
+					"<div style=\"border: solid #%06x 1px; background-color: #%06x; padding: 10px; color: #%06x;\">\n",
 					     efh->frame_colour & 0xffffff, efh->content_colour & 0xffffff, efh->text_colour & 0xffffff);
 			camel_stream_write_string(stream, "<tt>\n" EFH_MESSAGE_START);
 			em_format_format_text((EMFormat *)efh, (CamelStream *)filtered_stream, (CamelDataWrapper *)newpart);
diff --git a/mail/em-format.c b/mail/em-format.c
index 85459682ad..ed7d48ea06 100644
--- a/mail/em-format.c
+++ b/mail/em-format.c
@@ -220,7 +220,7 @@ em_format_get_type(void)
 void
 em_format_class_add_handler(EMFormatClass *emfc, EMFormatHandler *info)
 {
-	d(printf("adding format handler to '%s' '%s'\n", 	g_type_name_from_class((GTypeClass *)emfc), info->mime_type));
+	d(printf("adding format handler to '%s' '%s'\n",	g_type_name_from_class((GTypeClass *)emfc), info->mime_type));
 	info->old = g_hash_table_lookup(emfc->type_handlers, info->mime_type);
 	g_hash_table_insert(emfc->type_handlers, (gpointer) info->mime_type, info);
 }
@@ -1636,7 +1636,7 @@ emf_inlinepgp_signed(EMFormat *emf, CamelStream *stream, CamelMimePart *ipart, E
 		camel_exception_free(ex);
 		camel_object_unref(cipher);
 		return;
-    	}
+	}
 
 	/* Setup output stream */
 	ostream = camel_stream_mem_new();
diff --git a/mail/em-junk-hook.c b/mail/em-junk-hook.c
index 42c15f754e..a0a2a205ce 100644
--- a/mail/em-junk-hook.c
+++ b/mail/em-junk-hook.c
@@ -55,7 +55,7 @@ static const EPluginHookTargetKey emjh_flag_map[] = {
   <hook class="org.gnome.evolution.mail.junk:1.0">
   <group id="EMJunk">
      <item check_junk="sa_check_junk"
-     	   report_junk="sa_report_junk"
+	   report_junk="sa_report_junk"
 	   report_non_junk="sa_report_non_junk"
 	   commit_reports = "sa_commit_reports"/>
   </group>
@@ -90,7 +90,7 @@ em_junk_get_name (CamelJunkPlugin *csp)
 	if (item->hook && item->hook->hook.plugin->enabled) {
 		return (item->hook->hook.plugin->name);
 	} else
-		return 	_("None");
+		return	_("None");
 
 }
 
diff --git a/mail/em-mailer-prefs.c b/mail/em-mailer-prefs.c
index a03bcd6cf3..ac6f3db5d9 100644
--- a/mail/em-mailer-prefs.c
+++ b/mail/em-mailer-prefs.c
@@ -434,7 +434,7 @@ init_junk_tree (GtkTreeView *jh_tree, EMMailerPrefs *prefs)
 
 	store = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_STRING);
 	gtk_tree_view_set_model (GTK_TREE_VIEW (jh_tree), GTK_TREE_MODEL (store));
- 	g_object_unref (store);
+	g_object_unref (store);
 
 	renderer = gtk_cell_renderer_text_new ();
 	col = gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (jh_tree), -1, _("Header"), renderer, "text", JH_LIST_COLUMN_NAME, NULL);
@@ -446,7 +446,7 @@ init_junk_tree (GtkTreeView *jh_tree, EMMailerPrefs *prefs)
 
 	jh_tree_refill (prefs);
 
- 	return TRUE;
+	return TRUE;
 }
 
 static gboolean
@@ -461,7 +461,7 @@ init_label_tree (GtkWidget *label_tree, EMMailerPrefs *prefs, gboolean locked)
 
 	store = gtk_list_store_new (3, GDK_TYPE_COLOR, G_TYPE_STRING, G_TYPE_STRING);
 	gtk_tree_view_set_model (GTK_TREE_VIEW (label_tree), GTK_TREE_MODEL (store));
- 	g_object_unref (store);
+	g_object_unref (store);
 
 	renderer = e_cell_renderer_color_new ();
 	gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (label_tree), -1, _("Color"), renderer, "color", LABEL_LIST_COLUMN_COLOR, NULL);
diff --git a/mail/em-migrate.c b/mail/em-migrate.c
index 1745171ac0..3d32783298 100644
--- a/mail/em-migrate.c
+++ b/mail/em-migrate.c
@@ -2342,7 +2342,7 @@ e_path_to_physical (const gchar *prefix, const gchar *vpath)
 
 	/* Copy the mangled path.  */
 	p = vpath;
- 	while (1) {
+	while (1) {
 		newp = strchr (p, '/');
 		if (newp == NULL) {
 			strcpy (dp, p);
diff --git a/mail/em-subscribe-editor.c b/mail/em-subscribe-editor.c
index df58c808db..95714a948b 100644
--- a/mail/em-subscribe-editor.c
+++ b/mail/em-subscribe-editor.c
@@ -219,8 +219,8 @@ sub_folder_done (struct _zsubscribe_msg *m)
 	msgListNode = (MailMsgListNode *) e_dlist_remhead(&m->sub->subscribe);
 	if (msgListNode) {
 		next = (struct _zsubscribe_msg *) msgListNode->msg;
-	        /* Free the memory of the MailMsgListNode which won't be used anymore. */
-        	g_free(msgListNode);
+		/* Free the memory of the MailMsgListNode which won't be used anymore. */
+		g_free(msgListNode);
 		next->sub->subscribe_id = next->base.seq;
                 mail_msg_unordered_push (next);
 	} else {
diff --git a/mail/em-utils.c b/mail/em-utils.c
index 2f0fb39789..7204d761c3 100644
--- a/mail/em-utils.c
+++ b/mail/em-utils.c
@@ -2217,7 +2217,7 @@ em_utils_contact_photo (struct _CamelInternetAddress *cia, gboolean local)
 		}
 	}
 
-    	query = e_book_query_field_test(E_CONTACT_EMAIL, E_BOOK_QUERY_IS, addr);
+	query = e_book_query_field_test(E_CONTACT_EMAIL, E_BOOK_QUERY_IS, addr);
 	for (g = e_source_list_peek_groups(emu_addr_list); g; g = g_slist_next(g)) {
 		if (local && !is_local (g->data))
 			continue;
@@ -2289,8 +2289,8 @@ em_utils_contact_photo (struct _CamelInternetAddress *cia, gboolean local)
 	/* Form a mime part out of the photo */
 	part = camel_mime_part_new();
 	camel_mime_part_set_content(part,
-	                            (const gchar *) photo->data.inlined.data,
-	                            photo->data.inlined.length, "image/jpeg");
+				    (const gchar *) photo->data.inlined.data,
+				    photo->data.inlined.length, "image/jpeg");
 
 	e_contact_photo_free (photo);
 
diff --git a/mail/importers/mail-importer.c b/mail/importers/mail-importer.c
index bfaf7896aa..ab5cf18e9b 100644
--- a/mail/importers/mail-importer.c
+++ b/mail/importers/mail-importer.c
@@ -364,7 +364,7 @@ import_folders_rec(struct _import_folders_data *m, const gchar *filepath, const
 	const gchar *folder;
 
 	dir = g_dir_open(filepath, 0, NULL);
- 	if (dir == NULL)
+	if (dir == NULL)
 		return;
 
 	utf8_filename = g_filename_to_utf8 (filepath, -1, NULL, NULL, NULL);
diff --git a/mail/importers/pine-importer.c b/mail/importers/pine-importer.c
index e460d66d2e..0c5b5fd92e 100644
--- a/mail/importers/pine-importer.c
+++ b/mail/importers/pine-importer.c
@@ -15,7 +15,7 @@
  *
  * Authors:
  *		Iain Holmes  <iain@ximian.com>
- *    	Michael Zucchi <notzed@ximian.com>
+ *	Michael Zucchi <notzed@ximian.com>
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
diff --git a/mail/mail-component.c b/mail/mail-component.c
index 339e2345e0..bda9e7ea18 100644
--- a/mail/mail-component.c
+++ b/mail/mail-component.c
@@ -586,7 +586,7 @@ view_changed(EMFolderView *emfv, EComponentView *component_view)
 			|| !strcmp (name, "Outbox") || !strcmp (name, "Sent") || !strcmp (name, "Templates")))
 			use_name = _(name);
 		else if (!strcmp (name, "INBOX"))
- 			use_name = _("Inbox");
+			use_name = _("Inbox");
 		else
 			use_name = name;
 
@@ -1177,7 +1177,7 @@ status_check (GNOME_Evolution_ShellState shell_state)
 	    case GNOME_Evolution_USER_OFFLINE:
 		    status = OFFLINE;
 		    if (em_utils_prompt_user (NULL, "/apps/evolution/mail/prompts/quick_offline", "mail:ask-quick-offline", NULL))
-		    	break;
+			break;
 	    case GNOME_Evolution_FORCED_OFFLINE:
 		    /*Network is down so change network state on the camel session*/
 		    status = OFFLINE;
diff --git a/mail/mail-ops.c b/mail/mail-ops.c
index 06ea94a594..a75d330e93 100644
--- a/mail/mail-ops.c
+++ b/mail/mail-ops.c
@@ -17,7 +17,7 @@
  *
  * Authors:
  *		Dan Winship <danw@ximian.com>
- *  	Jeffrey Stedfast <fejj@ximian.com>
+ *	Jeffrey Stedfast <fejj@ximian.com>
  *      Peter Williams <peterw@ximian.com>
  *      Michael Zucchi <notzed@ximian.com>
  *
@@ -719,11 +719,11 @@ send_queue_exec (struct _send_queue_msg *m)
 
 	if (m->cancel)
 		camel_operation_register (m->cancel);
- 	else
- 		camel_operation_register (m->base.cancel);
+	else
+		camel_operation_register (m->base.cancel);
 
- 	if (!m->cancel)
- 		camel_operation_start (NULL, _("Sending message"));
+	if (!m->cancel)
+		camel_operation_start (NULL, _("Sending message"));
 
 	camel_exception_init (&ex);
 
@@ -734,8 +734,8 @@ send_queue_exec (struct _send_queue_msg *m)
 		gint pc = (100 * i) / send_uids->len;
 
 		report_status (m, CAMEL_FILTER_STATUS_START, pc, _("Sending message %d of %d"), i+1, send_uids->len);
- 		if (!m->cancel)
- 			camel_operation_progress (NULL, (i+1) * 100 / send_uids->len);
+		if (!m->cancel)
+			camel_operation_progress (NULL, (i+1) * 100 / send_uids->len);
 
 		mail_send_message (m->queue, send_uids->pdata[i], m->destination, m->driver, &ex);
 		if (camel_exception_is_set (&ex)) {
@@ -784,13 +784,13 @@ send_queue_exec (struct _send_queue_msg *m)
 		camel_exception_clear (&ex);
 	}
 
- 	if (!m->cancel)
- 		camel_operation_end (NULL);
+	if (!m->cancel)
+		camel_operation_end (NULL);
 
 	if (m->cancel)
 		camel_operation_unregister (m->cancel);
- 	else
- 		camel_operation_unregister (m->base.cancel);
+	else
+		camel_operation_unregister (m->base.cancel);
 
 }
 
@@ -2459,7 +2459,7 @@ prepare_offline_exec (struct _set_offline_msg *m)
 {
 	if (CAMEL_IS_DISCO_STORE (m->store)) {
 		camel_disco_store_prepare_for_offline (CAMEL_DISCO_STORE (m->store),
-				      	       &m->base.ex);
+					       &m->base.ex);
 	} else if (CAMEL_IS_OFFLINE_STORE (m->store)) {
 		camel_offline_store_prepare_for_offline (CAMEL_OFFLINE_STORE (m->store),
 							 &m->base.ex);
diff --git a/mail/mail-send-recv.c b/mail/mail-send-recv.c
index c6f7df9c2d..b26203c6da 100644
--- a/mail/mail-send-recv.c
+++ b/mail/mail-send-recv.c
@@ -305,7 +305,7 @@ static gchar *
 format_url(const gchar *internal_url, const gchar *account_name)
 {
 	CamelURL *url;
-       	gchar *pretty_url;
+	gchar *pretty_url;
 
 	url = camel_url_new(internal_url, NULL);
 	if (account_name) {
@@ -487,7 +487,7 @@ build_dialog (EAccountList *accounts, CamelFolder *outbox, const gchar *destinat
 
 		recv_icon = gtk_image_new_from_icon_name (
 			"mail-inbox", GTK_ICON_SIZE_LARGE_TOOLBAR);
-	       	pretty_url = format_url (source->url, account->name);
+		pretty_url = format_url (source->url, account->name);
 		label = gtk_label_new (NULL);
 		gtk_label_set_ellipsize (
 			GTK_LABEL (label), PANGO_ELLIPSIZE_END);
@@ -508,7 +508,7 @@ build_dialog (EAccountList *accounts, CamelFolder *outbox, const gchar *destinat
 		gtk_misc_set_alignment (GTK_MISC (label), 0, .5);
 		gtk_misc_set_alignment (GTK_MISC (status_label), 0, .5);
 
-	        gtk_table_attach (
+		gtk_table_attach (
 			GTK_TABLE (table), recv_icon,
 			0, 1, row, row+2, 0, 0, 0, 0);
 		gtk_table_attach (
diff --git a/mail/mail-vfolder.c b/mail/mail-vfolder.c
index 5014594a00..de79eaa694 100644
--- a/mail/mail-vfolder.c
+++ b/mail/mail-vfolder.c
@@ -442,7 +442,7 @@ mail_vfolder_add_uri(CamelStore *store, const gchar *curi, gint remove)
 
 	LOCK();
 
-/* 	d(printf("%s uri to check: %s\n", remove?"Removing":"Adding", uri)); */
+/*	d(printf("%s uri to check: %s\n", remove?"Removing":"Adding", uri)); */
 
 	/* maintain the source folders lists for changed rules later on */
 	if (CAMEL_IS_VEE_STORE(store)) {
@@ -473,7 +473,7 @@ mail_vfolder_add_uri(CamelStore *store, const gchar *curi, gint remove)
 	if (context == NULL)
 		goto done;
 
- 	rule = NULL;
+	rule = NULL;
 	while ((rule = rule_context_next_rule((RuleContext *)context, rule, NULL))) {
 		gint found = FALSE;
 
@@ -546,7 +546,7 @@ mail_vfolder_delete_uri(CamelStore *store, const gchar *curi)
 		goto done;
 
 	/* see if any rules directly reference this removed uri */
- 	rule = NULL;
+	rule = NULL;
 	while ((rule = rule_context_next_rule ((RuleContext *) context, rule, NULL))) {
 
 		if (!rule->name) {
@@ -631,7 +631,7 @@ mail_vfolder_rename_uri(CamelStore *store, const gchar *cfrom, const gchar *cto)
 	LOCK();
 
 	/* see if any rules directly reference this removed uri */
- 	rule = NULL;
+	rule = NULL;
 	while ( (rule = rule_context_next_rule((RuleContext *)context, rule, NULL)) ) {
 		source = NULL;
 		while ( (source = em_vfolder_rule_next_source((EMVFolderRule *)rule, source)) ) {
diff --git a/mail/message-list.c b/mail/message-list.c
index a5a344f4e5..bfa51250df 100644
--- a/mail/message-list.c
+++ b/mail/message-list.c
@@ -1501,32 +1501,32 @@ ml_tree_value_at (ETreeModel *etm, ETreePath path, gint col, gpointer model_data
 			folder = message_list->folder;
 		}
 
- 		url = mail_tools_folder_to_url (folder);
- 		euri = em_uri_from_camel(url);
-
- 		account = mail_config_get_account_by_source_url (url);
-
- 		if (account) {
- 			curl = camel_url_new (url, &ex);
- 			location = g_strconcat (account->name, ":", curl->path, NULL);
- 		} else {
- 			/* Local account */
- 			euri = em_uri_from_camel(url);
- 			curl = camel_url_new (euri, &ex);
- 			if (curl->host && !strcmp(curl->host, "local") && curl->user && !strcmp(curl->user, "local"))
- 				location = g_strconcat (_("On This Computer"), ":",curl->path, NULL);
- 		}
-
- 		camel_exception_clear (&ex);
+		url = mail_tools_folder_to_url (folder);
+		euri = em_uri_from_camel(url);
+
+		account = mail_config_get_account_by_source_url (url);
+
+		if (account) {
+			curl = camel_url_new (url, &ex);
+			location = g_strconcat (account->name, ":", curl->path, NULL);
+		} else {
+			/* Local account */
+			euri = em_uri_from_camel(url);
+			curl = camel_url_new (euri, &ex);
+			if (curl->host && !strcmp(curl->host, "local") && curl->user && !strcmp(curl->user, "local"))
+				location = g_strconcat (_("On This Computer"), ":",curl->path, NULL);
+		}
+
+		camel_exception_clear (&ex);
 		camel_url_free (curl);
- 		g_free (url);
- 		g_free (euri);
+		g_free (url);
+		g_free (euri);
 
- 		return location;
+		return location;
 	}
 	case COL_MIXED_RECIPIENTS:
 	case COL_RECIPIENTS:{
-        	str = camel_message_info_to (msg_info);
+		str = camel_message_info_to (msg_info);
 
 		return sanitize_recipients(str);
 	}
@@ -1561,7 +1561,7 @@ ml_tree_value_at (ETreeModel *etm, ETreePath path, gint col, gpointer model_data
 		} else
 			return (gpointer) ("");
 	}
- 	default:
+	default:
 		g_warning ("This shouldn't be reached\n");
 		return NULL;
 	}
@@ -1748,7 +1748,7 @@ static ECell * create_composite_cell (gint col)
 
 	cell_sub = e_cell_text_new(fixed_name? fixed_name:NULL, GTK_JUSTIFY_LEFT);
 	g_object_set (G_OBJECT (cell_sub),
-/* 		      "bold_column", COL_UNREAD, */
+/*		      "bold_column", COL_UNREAD, */
 		      "color_column", COL_COLOUR,
 		      NULL);
 	cell_tree = e_cell_tree_new (NULL, NULL, TRUE, cell_sub);
@@ -2495,7 +2495,7 @@ message_list_construct (MessageList *message_list)
 
 	e_tree_memory_set_expanded_default(E_TREE_MEMORY(message_list->model),
 					   read_boolean_with_default (gconf,
-					   			      "/apps/evolution/mail/display/thread_expand",
+								      "/apps/evolution/mail/display/thread_expand",
 								      TRUE));
 
 	message_list->priv->thread_latest = read_boolean_with_default (gconf, "/apps/evolution/mail/display/thread_latest", TRUE);
@@ -3862,7 +3862,7 @@ message_list_hide_clear (MessageList *ml)
 /* version 1 file is:
    uintf	1
    uintf	hide_before
-   uintf       	hide_after
+   uintf	hide_after
    string*	uids
 */
 
diff --git a/mail/message-list.h b/mail/message-list.h
index eb908a7c9b..02bd486920 100644
--- a/mail/message-list.h
+++ b/mail/message-list.h
@@ -53,7 +53,7 @@ enum {
 	COL_FOLLOWUP_FLAG_STATUS,
 	COL_FOLLOWUP_FLAG,
 	COL_FOLLOWUP_DUE_BY,
-	COL_LOCATION,	        /* vfolder location? */
+	COL_LOCATION,		/* vfolder location? */
 	COL_SENDER,
 	COL_RECIPIENTS,
 	COL_MIXED_SENDER,
diff --git a/mail/message-tag-editor.h b/mail/message-tag-editor.h
index 30d3ec1e9b..5193ac2103 100644
--- a/mail/message-tag-editor.h
+++ b/mail/message-tag-editor.h
@@ -34,7 +34,7 @@ extern "C" {
 #endif /* __cplusplus */
 
 #define MESSAGE_TAG_EDITOR_TYPE            (message_tag_editor_get_type ())
-#define MESSAGE_TAG_EDITOR(obj)	           (G_TYPE_CHECK_INSTANCE_CAST (obj, MESSAGE_TAG_EDITOR_TYPE, MessageTagEditor))
+#define MESSAGE_TAG_EDITOR(obj)		   (G_TYPE_CHECK_INSTANCE_CAST (obj, MESSAGE_TAG_EDITOR_TYPE, MessageTagEditor))
 #define MESSAGE_TAG_EDITOR_CLASS(klass)	   (G_TYPE_CHECK_CLASS_CAST (klass, MESSAGE_TAG_EDITOR_TYPE, MessageTagEditorClass))
 #define IS_MESSAGE_TAG_EDITOR(obj)         (G_TYPE_CHECK_INSTANCE_TYPE (obj, MESSAGE_TAG_EDITOR_TYPE))
 #define IS_MESSAGE_TAG_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), MESSAGE_TAG_EDITOR_TYPE))