Whitespace cleanup.

Replace 8-space indentation with tab characters, and various other
automated cleanups.

4 files changed, 287 insertions, 287 deletions

diff --git a/plugins/email-custom-header/email-custom-header.c b/plugins/email-custom-header/email-custom-header.c
index 324007d615..f6db2c2a35 100644
--- a/plugins/email-custom-header/email-custom-header.c
+++ b/plugins/email-custom-header/email-custom-header.c
@@ -455,7 +455,7 @@ epech_custom_header_options_commit (EMsgComposer *comp,
 	if (!user_data || !EMAIL_CUSTOM_HEADER_OPTIONS_IS_DIALOG (user_data))
 		return;
 
-        new_email_custom_header_window = g_object_get_data ((GObject *) composer, "compowindow");
+	new_email_custom_header_window = g_object_get_data ((GObject *) composer, "compowindow");
 
 	if (new_email_custom_header_window) {
 		current_dialog = new_email_custom_header_window->epech_dialog;
@@ -520,7 +520,7 @@ static void action_email_custom_header_cb (GtkAction *action, EMsgComposer *comp
 			new_email_custom_header_window = g_new0 (EmailCustomHeaderWindow, 1);
 			new_email_custom_header_window->epech_window = window;
 			new_email_custom_header_window->epech_dialog = dialog;
-                        g_object_set_data_full ((GObject *) composer, "compowindow", new_email_custom_header_window, destroy_compo_data);
+			g_object_set_data_full ((GObject *) composer, "compowindow", new_email_custom_header_window, destroy_compo_data);
 		}
 	}
 
@@ -581,7 +581,7 @@ commit_changes (ConfigData *cd)
                 /* Check if the keyword is not empty */
 		if ((keyword) && (g_utf8_strlen (g_strstrip (keyword), -1) > 0)) {
 			if ((value) && (g_utf8_strlen (g_strstrip (value), -1) > 0)) {
-                                keyword = g_strconcat (keyword, "=", value, NULL);
+				keyword = g_strconcat (keyword, "=", value, NULL);
 			}
 			header_config_list = g_slist_append (header_config_list, g_strdup (keyword));
 		}
diff --git a/plugins/itip-formatter/itip-formatter.c b/plugins/itip-formatter/itip-formatter.c
index b59b6f76b8..cf17295292 100644
--- a/plugins/itip-formatter/itip-formatter.c
+++ b/plugins/itip-formatter/itip-formatter.c
@@ -687,7 +687,7 @@ find_cal_update_ui (FormatItipFindData *fd,
 
 		/* FIXME Check read only state of calendar? */
 		itip_view_add_lower_info_item_printf (view, ITIP_VIEW_INFO_ITEM_TYPE_INFO,
-                        _("Found the appointment in the calendar '%s'"), e_source_peek_name (source));
+			_("Found the appointment in the calendar '%s'"), e_source_peek_name (source));
 
 		set_buttons_sensitive (pitip, view);
 	} else if (!pitip->current_client)
@@ -1499,7 +1499,7 @@ receive_objects_ready_cb (GObject *ecalclient,
 			pitip->update_item_error_info_id =
 				itip_view_add_lower_info_item_printf (
 					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 ? error->message : _("Unknown error"));
 		}
 		g_clear_error (&error);
@@ -1531,7 +1531,7 @@ receive_objects_ready_cb (GObject *ecalclient,
 		/* FIXME some calendars just might not save it at all, is this accurate? */
 		itip_view_add_lower_info_item_printf (
 			view, ITIP_VIEW_INFO_ITEM_TYPE_INFO,
-                        _("Sent to calendar '%s' as canceled"), e_source_peek_name (source));
+			_("Sent to calendar '%s' as canceled"), e_source_peek_name (source));
 		break;
 	default:
 		g_assert_not_reached ();
@@ -1839,11 +1839,11 @@ remove_delegate (ItipPURI *pitip,
 	if (status) {
 		itip_view_add_lower_info_item (
 			view, ITIP_VIEW_INFO_ITEM_TYPE_INFO,
-                        _("Sent a cancelation notice to the delegate"));
+			_("Sent a cancelation notice to the delegate"));
 	} else
 		itip_view_add_lower_info_item (
 			view, ITIP_VIEW_INFO_ITEM_TYPE_INFO,
-                        _("Could not send the cancelation notice to the delegate"));
+			_("Could not send the cancelation notice to the delegate"));
 
 	g_free (comment);
 
@@ -1892,8 +1892,8 @@ modify_object_cb (GObject *ecalclient,
 			itip_view_add_lower_info_item_printf (
 				view,
 				ITIP_VIEW_INFO_ITEM_TYPE_ERROR,
-			        _("Unable to update attendee. %s"),
-                                error ? error->message : _("Unknown error"));
+				_("Unable to update attendee. %s"),
+				error ? error->message : _("Unknown error"));
 
 		g_clear_error (&error);
 	} else {
@@ -1922,7 +1922,7 @@ update_attendee_status_icalcomp (ItipPURI *pitip,
 
 		itip_view_add_lower_info_item (
 			view, ITIP_VIEW_INFO_ITEM_TYPE_ERROR,
-                        _("The meeting is invalid and cannot be updated"));
+			_("The meeting is invalid and cannot be updated"));
 	} else {
 		icalcomponent *org_icalcomp;
 		const gchar *delegate;
@@ -2154,17 +2154,17 @@ send_item (ItipPURI *pitip,
 		case E_CAL_CLIENT_SOURCE_TYPE_EVENTS:
 			itip_view_add_lower_info_item (
 				view, ITIP_VIEW_INFO_ITEM_TYPE_INFO,
-                                _("Meeting information sent"));
+				_("Meeting information sent"));
 			break;
 		case E_CAL_CLIENT_SOURCE_TYPE_TASKS:
 			itip_view_add_lower_info_item (
 				view, ITIP_VIEW_INFO_ITEM_TYPE_INFO,
-                                _("Task information sent"));
+				_("Task information sent"));
 			break;
 		case E_CAL_CLIENT_SOURCE_TYPE_MEMOS:
 			itip_view_add_lower_info_item (
 				view, ITIP_VIEW_INFO_ITEM_TYPE_INFO,
-                                _("Memo information sent"));
+				_("Memo information sent"));
 			break;
 		default:
 			g_assert_not_reached ();
@@ -2175,17 +2175,17 @@ send_item (ItipPURI *pitip,
 		case E_CAL_CLIENT_SOURCE_TYPE_EVENTS:
 			itip_view_add_lower_info_item (
 				view, ITIP_VIEW_INFO_ITEM_TYPE_ERROR,
-                                _("Unable to send meeting information, the meeting does not exist"));
+				_("Unable to send meeting information, the meeting does not exist"));
 			break;
 		case E_CAL_CLIENT_SOURCE_TYPE_TASKS:
 			itip_view_add_lower_info_item (
 				view, ITIP_VIEW_INFO_ITEM_TYPE_ERROR,
-                                _("Unable to send task information, the task does not exist"));
+				_("Unable to send task information, the task does not exist"));
 			break;
 		case E_CAL_CLIENT_SOURCE_TYPE_MEMOS:
 			itip_view_add_lower_info_item (
 				view, ITIP_VIEW_INFO_ITEM_TYPE_ERROR,
-                                _("Unable to send memo information, the memo does not exist"));
+				_("Unable to send memo information, the memo does not exist"));
 			break;
 		default:
 			g_assert_not_reached ();
@@ -2276,9 +2276,9 @@ set_itip_error (ItipView *view,
 	gchar *error;
 
 	error = g_strdup_printf (
-                "<div class=\"error\">"
-                "<p><b>%s</b></p>"
-                "<p>%s</p>",
+		"<div class=\"error\">"
+		"<p><b>%s</b></p>"
+		"<p>%s</p>",
 		primary, secondary);
 
 	itip_view_set_error (view, error, save_btn);
@@ -2307,7 +2307,7 @@ extract_itip_data (ItipPURI *pitip,
 
 	if (!pitip->vcalendar) {
 		set_itip_error (view,
-                        _("The calendar attached is not valid"),
+			_("The calendar attached is not valid"),
 			_("The message claims to contain a calendar, but the calendar is not a valid iCalendar."),
 			FALSE);
 
@@ -2319,7 +2319,7 @@ extract_itip_data (ItipPURI *pitip,
 	pitip->main_comp = icalparser_parse_string (pitip->vcalendar);
 	if (pitip->main_comp == NULL || !is_icalcomp_valid (pitip->main_comp)) {
 		set_itip_error (view,
-                        _("The calendar attached is not valid"),
+			_("The calendar attached is not valid"),
 			_("The message claims to contain a calendar, but the calendar is not a valid iCalendar."),
 			FALSE);
 
@@ -2361,7 +2361,7 @@ extract_itip_data (ItipPURI *pitip,
 
 	if (pitip->ical_comp == NULL) {
 		set_itip_error (view,
-                        _("The item in the calendar is not valid"),
+			_("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"),
 			FALSE);
 
@@ -2390,7 +2390,7 @@ extract_itip_data (ItipPURI *pitip,
 		break;
 	default:
 		set_itip_error (view,
-                        _("The item in the calendar is not valid"),
+			_("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"),
 			FALSE);
 
@@ -2405,7 +2405,7 @@ extract_itip_data (ItipPURI *pitip,
 	if (pitip->total > 1) {
 
 		set_itip_error (view,
-                        _("The calendar attached contains multiple items"),
+			_("The calendar attached contains multiple items"),
 			_("To process all of these items, the file should be saved and the calendar imported"),
 			TRUE);
 
@@ -2488,7 +2488,7 @@ extract_itip_data (ItipPURI *pitip,
 		pitip->comp = NULL;
 
 		set_itip_error (view,
-                        _("The item in the calendar is not valid"),
+			_("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"),
 			FALSE);
 
@@ -2921,7 +2921,7 @@ init_itip_view (ItipPURI *info,
 	}
 
 	e_cal_component_get_summary (info->comp, &text);
-        itip_view_set_summary (view, text.value ? text.value : C_("cal-itip", "None"));
+	itip_view_set_summary (view, text.value ? text.value : C_("cal-itip", "None"));
 
 	e_cal_component_get_location (info->comp, &string);
 	itip_view_set_location (view, string);
@@ -2934,19 +2934,19 @@ init_itip_view (ItipPURI *info,
 
 			switch (a->status) {
 				case ICAL_PARTSTAT_ACCEPTED:
-                                        itip_view_set_status (view, _("Accepted"));
+					itip_view_set_status (view, _("Accepted"));
 					break;
 				case ICAL_PARTSTAT_TENTATIVE:
-                                        itip_view_set_status (view, _("Tentatively Accepted"));
+					itip_view_set_status (view, _("Tentatively Accepted"));
 					break;
 				case ICAL_PARTSTAT_DECLINED:
-                                        itip_view_set_status (view, _("Declined"));
+					itip_view_set_status (view, _("Declined"));
 					break;
 				case ICAL_PARTSTAT_DELEGATED:
-                                        itip_view_set_status (view, _("Delegated"));
+					itip_view_set_status (view, _("Delegated"));
 					break;
 				default:
-                                        itip_view_set_status (view, _("Unknown"));
+					itip_view_set_status (view, _("Unknown"));
 			}
 		}
 		e_cal_component_free_attendee_list (list);
@@ -2986,7 +2986,7 @@ init_itip_view (ItipPURI *info,
 		if (!gstring && text->value)
 			gstring = g_string_new (text->value);
 		else if (text->value)
-                        g_string_append_printf (gstring, "\n\n%s", text->value);
+			g_string_append_printf (gstring, "\n\n%s", text->value);
 	}
 
 	e_cal_component_free_text_list (list);
@@ -3008,7 +3008,7 @@ init_itip_view (ItipPURI *info,
 		g_free (html);
 	}
 
-        to_zone = e_shell_settings_get_pointer (shell_settings, "cal-timezone");
+	to_zone = e_shell_settings_get_pointer (shell_settings, "cal-timezone");
 
 	e_cal_component_get_dtstart (info->comp, &datetime);
 	info->start_time = 0;
@@ -3080,13 +3080,13 @@ init_itip_view (ItipPURI *info,
                 /* FIXME Tell the user we don't support recurring tasks */
 		switch (info->type) {
 			case E_CAL_CLIENT_SOURCE_TYPE_EVENTS:
-                                itip_view_add_upper_info_item (view, ITIP_VIEW_INFO_ITEM_TYPE_INFO, _("This meeting recurs"));
+				itip_view_add_upper_info_item (view, ITIP_VIEW_INFO_ITEM_TYPE_INFO, _("This meeting recurs"));
 				break;
 			case E_CAL_CLIENT_SOURCE_TYPE_TASKS:
-                                itip_view_add_upper_info_item (view, ITIP_VIEW_INFO_ITEM_TYPE_INFO, _("This task recurs"));
+				itip_view_add_upper_info_item (view, ITIP_VIEW_INFO_ITEM_TYPE_INFO, _("This task recurs"));
 				break;
 			case E_CAL_CLIENT_SOURCE_TYPE_MEMOS:
-                                itip_view_add_upper_info_item (view, ITIP_VIEW_INFO_ITEM_TYPE_INFO, _("This memo recurs"));
+				itip_view_add_upper_info_item (view, ITIP_VIEW_INFO_ITEM_TYPE_INFO, _("This memo recurs"));
 				break;
 			default:
 				g_assert_not_reached ();
@@ -3096,7 +3096,7 @@ init_itip_view (ItipPURI *info,
 
 	if (response_enabled) {
 		g_signal_connect (
-                        view, "response",
+			view, "response",
 			G_CALLBACK (view_response_cb), info);
 
 		itip_view_set_show_free_time_check (view, info->type == E_CAL_CLIENT_SOURCE_TYPE_EVENTS && (info->method == ICAL_METHOD_PUBLISH || info->method ==  ICAL_METHOD_REQUEST));
@@ -3202,17 +3202,17 @@ write_itip_view (EMFormat *emf,
 
 		uri = em_format_build_mail_uri (
 			emf->folder, emf->message_uid,
-                        "part_id", G_TYPE_STRING, puri->uri,
-                        "mode", G_TYPE_INT, EM_FORMAT_WRITE_MODE_RAW,
+			"part_id", G_TYPE_STRING, puri->uri,
+			"mode", G_TYPE_INT, EM_FORMAT_WRITE_MODE_RAW,
 			NULL);
 
 		buffer = g_string_sized_new (256);
 		g_string_append_printf (buffer,
-                        "<div class=\"part-container\" "
-                             "style=\"border: none; background: none;\">"
-                        "<iframe width=\"100%%\" height=\"auto\""
-                        " frameborder=\"0\" src=\"%s\" name=\"%s\" id=\"%s\"></iframe>"
-                        "</div>",
+			"<div class=\"part-container\" "
+			     "style=\"border: none; background: none;\">"
+			"<iframe width=\"100%%\" height=\"auto\""
+			" frameborder=\"0\" src=\"%s\" name=\"%s\" id=\"%s\"></iframe>"
+			"</div>",
 			uri, puri->uri, puri->uri);
 
 		g_free (uri);
@@ -3228,7 +3228,7 @@ bind_itip_view (WebKitDOMElement *element,
                 EMFormatPURI *puri)
 {
 	if (WEBKIT_DOM_IS_HTML_IFRAME_ELEMENT (element)) {
-                GString *buffer = g_string_new ("");
+		GString *buffer = g_string_new ("");
 		WebKitDOMDocument *document;
 		ItipView *view;
 
@@ -3236,7 +3236,7 @@ bind_itip_view (WebKitDOMElement *element,
 				WEBKIT_DOM_HTML_IFRAME_ELEMENT (element));
 
 		view = itip_view_new ((ItipPURI *) puri);
-                g_object_set_data_full (G_OBJECT (element), "view", view,
+		g_object_set_data_full (G_OBJECT (element), "view", view,
 					(GDestroyNotify) g_object_unref);
 
 		itip_view_create_dom_bindings (view,
@@ -3275,7 +3275,7 @@ format_itip (EPlugin *ep,
 	puri->puri.bind_func = bind_itip_view;
 	puri->puri.free = puri_free;
 	puri->puri.is_attachment = target->info->is_attachment;
-        puri->puri.mime_type = g_strdup ("text/html");
+	puri->puri.mime_type = g_strdup ("text/html");
 	puri->delete_message = g_settings_get_boolean (settings, CONF_KEY_DELETE);
 	puri->has_organizer = FALSE;
 	puri->no_reply_wanted = FALSE;
diff --git a/plugins/itip-formatter/itip-view.c b/plugins/itip-formatter/itip-view.c
index 53bba25100..018ae98f00 100644
--- a/plugins/itip-formatter/itip-view.c
+++ b/plugins/itip-formatter/itip-view.c
@@ -649,13 +649,13 @@ update_start_end_times (ItipView *view)
 		/* it's an all day event in one particular day */
 		format_date_and_time_x (priv->start_tm, now_tm, FALSE, TRUE, FALSE, priv->start_tm_is_date, buffer, 256);
 		priv->start_label = g_strdup (buffer);
-                priv->start_header = _("All day:");
+		priv->start_header = _("All day:");
 		priv->end_header = NULL;
 		priv->end_label = NULL;
 	} else {
 		if (priv->start_tm) {
 			format_date_and_time_x (priv->start_tm, now_tm, FALSE, TRUE, FALSE, priv->start_tm_is_date, buffer, 256);
-                        priv->start_header = priv->start_tm_is_date ? _("Start day:") : _("Start time:");
+			priv->start_header = priv->start_tm_is_date ? _("Start day:") : _("Start time:");
 			priv->start_label = g_strdup (buffer);
 		} else {
 			priv->start_header = NULL;
@@ -664,7 +664,7 @@ update_start_end_times (ItipView *view)
 
 		if (priv->end_tm) {
 			format_date_and_time_x (priv->end_tm, now_tm, FALSE, TRUE, FALSE, priv->end_tm_is_date, buffer, 256);
-                        priv->end_header = priv->end_tm_is_date ? _("End day:") : _("End time:");
+			priv->end_header = priv->end_tm_is_date ? _("End day:") : _("End time:");
 			priv->end_label = g_strdup (buffer);
 		} else {
 			priv->end_header = NULL;
@@ -725,7 +725,7 @@ button_clicked_cb (WebKitDOMElement *element,
 
 	response = atoi (responseStr);
 
-        //d(printf("Clicked btton %d\n", response));
+	//d(printf("Clicked btton %d\n", response));
 	g_signal_emit (G_OBJECT (data), signals[RESPONSE], 0, response);
 }
 
@@ -737,7 +737,7 @@ itip_view_finalize (GObject *object)
 
 	priv = ITIP_VIEW_GET_PRIVATE (object);
 
-        d(printf("Itip view finalized!\n"));
+	d(printf("Itip view finalized!\n"));
 
 	if (priv->sender) {
 		g_free (priv->sender);
@@ -943,7 +943,7 @@ source_changed_cb (WebKitDOMElement *select,
 
 	source = itip_view_get_source (view);
 
-        d(printf("Source changed to '%s'\n", e_source_peek_name (source)));
+	d(printf("Source changed to '%s'\n", e_source_peek_name (source)));
 	g_signal_emit (view, signals[SOURCE_SELECTED], 0, source);
 }
 
@@ -954,10 +954,10 @@ append_checkbox_table_row (GString *buffer,
 {
 	g_string_append_printf (
 		buffer,
-                "<tr id=\"table_row_%s\" hidden=\"\"><td colspan=\"2\">"
-                "<input type=\"checkbox\" name=\"%s\" id=\"%s\" value=\"%s\" >"
-                "<label for=\"%s\">%s</label>"
-                "</td></tr>\n",
+		"<tr id=\"table_row_%s\" hidden=\"\"><td colspan=\"2\">"
+		"<input type=\"checkbox\" name=\"%s\" id=\"%s\" value=\"%s\" >"
+		"<label for=\"%s\">%s</label>"
+		"</td></tr>\n",
 		name, name, name, name, name, label);
 }
 
@@ -970,14 +970,14 @@ append_text_table_row (GString *buffer,
 	if (label && *label) {
 
 		g_string_append_printf (buffer,
-                        "<tr id=\"%s\" %s><th>%s</th><td>%s</td></tr>\n",
-                        id, (value && *value) ? "" : "hidden=\"\"", label, value);
+			"<tr id=\"%s\" %s><th>%s</th><td>%s</td></tr>\n",
+			id, (value && *value) ? "" : "hidden=\"\"", label, value);
 
 	} else {
 
 		g_string_append_printf (
 			buffer,
-                        "<tr id=\"%s\" hidden=\"\"><td colspan=\"2\"></td></tr>\n",
+			"<tr id=\"%s\" hidden=\"\"><td colspan=\"2\"></td></tr>\n",
 			id);
 
 	}
@@ -998,7 +998,7 @@ append_info_item_row (ItipView *view,
 	row = webkit_dom_html_table_element_insert_row (
 		WEBKIT_DOM_HTML_TABLE_ELEMENT (table), -1, NULL);
 
-        id = g_strdup_printf ("%s_row_%d", table_id, item->id);
+	id = g_strdup_printf ("%s_row_%d", table_id, item->id);
 	webkit_dom_html_element_set_id (row, id);
 	g_free (id);
 
@@ -1028,9 +1028,9 @@ append_info_item_row (ItipView *view,
 		gchar *icon_uri;
 
 		image = webkit_dom_document_create_element (
-                        view->priv->dom_document, "IMG", NULL);
+			view->priv->dom_document, "IMG", NULL);
 
-                icon_uri = g_strdup_printf ("gtk-stock://%s", icon_name);
+		icon_uri = g_strdup_printf ("gtk-stock://%s", icon_name);
 		webkit_dom_html_image_element_set_src (
 			WEBKIT_DOM_HTML_IMAGE_ELEMENT (image), icon_uri);
 		g_free (icon_uri);
@@ -1046,7 +1046,7 @@ append_info_item_row (ItipView *view,
 
 	webkit_dom_html_element_set_inner_html (cell, item->message, NULL);
 
-        d(printf("Added row %s_row_%d ('%s')\n", table_id, item->id, item->message));
+	d(printf("Added row %s_row_%d ('%s')\n", table_id, item->id, item->message));
 }
 
 static void
@@ -1057,7 +1057,7 @@ remove_info_item_row (ItipView *view,
 	WebKitDOMElement *row;
 	gchar *row_id;
 
-        row_id = g_strdup_printf ("%s_row_%d", table_id, id);
+	row_id = g_strdup_printf ("%s_row_%d", table_id, id);
 	row = webkit_dom_document_get_element_by_id (
 		view->priv->dom_document, row_id);
 	g_free (row_id);
@@ -1067,7 +1067,7 @@ remove_info_item_row (ItipView *view,
 		WEBKIT_DOM_NODE (row),
 		NULL);
 
-        d(printf("Removed row %s_row_%d\n", table_id, id));
+	d(printf("Removed row %s_row_%d\n", table_id, id));
 }
 
 static void
@@ -1079,9 +1079,9 @@ buttons_table_write_button (GString *buffer,
 {
 	g_string_append_printf (
 		buffer,
-                "<td><button type=\"button\" name=\"%s\" value=\"%d\" id=\"%s\" hidden>"
-                "<div><img src=\"gtk-stock://%s?size=%d\"> <span>%s</span></div>"
-                "</button></td>\n",
+		"<td><button type=\"button\" name=\"%s\" value=\"%d\" id=\"%s\" hidden>"
+		"<div><img src=\"gtk-stock://%s?size=%d\"> <span>%s</span></div>"
+		"</button></td>\n",
 		name, response, name, icon, GTK_ICON_SIZE_BUTTON, label);
 }
 
@@ -1089,145 +1089,145 @@ static void
 append_buttons_table (GString *buffer)
 {
 	g_string_append (buffer,
-                         "<table class=\"itip buttons\" border=\"0\" "
-                                "id=\"" TABLE_BUTTONS "\" cellspacing=\"6\" "
-                                "cellpadding=\"0\" >"
-                         "<tr id=\"" TABLE_ROW_BUTTONS "\">");
+			 "<table class=\"itip buttons\" border=\"0\" "
+				"id=\"" TABLE_BUTTONS "\" cellspacing=\"6\" "
+				"cellpadding=\"0\" >"
+			 "<tr id=\"" TABLE_ROW_BUTTONS "\">");
 
         /* Everything gets the open button */
 	buttons_table_write_button (
-                buffer, BUTTON_OPEN_CALENDAR, _("Open Calendar"),
+		buffer, BUTTON_OPEN_CALENDAR, _("Open Calendar"),
 		GTK_STOCK_JUMP_TO, ITIP_VIEW_RESPONSE_OPEN);
 	buttons_table_write_button (
-                buffer, BUTTON_DECLINE_ALL, _("Decline all"),
+		buffer, BUTTON_DECLINE_ALL, _("Decline all"),
 		GTK_STOCK_CANCEL, ITIP_VIEW_RESPONSE_DECLINE);
 	buttons_table_write_button (
-                buffer, BUTTON_DECLINE, _("Decline"),
+		buffer, BUTTON_DECLINE, _("Decline"),
 		GTK_STOCK_CANCEL, ITIP_VIEW_RESPONSE_DECLINE);
 	buttons_table_write_button (
-                buffer, BUTTON_TENTATIVE_ALL, _("Tentative all"),
+		buffer, BUTTON_TENTATIVE_ALL, _("Tentative all"),
 		GTK_STOCK_DIALOG_QUESTION, ITIP_VIEW_RESPONSE_TENTATIVE);
 	buttons_table_write_button (
-                buffer, BUTTON_TENTATIVE, _("Tentative"),
+		buffer, BUTTON_TENTATIVE, _("Tentative"),
 		GTK_STOCK_DIALOG_QUESTION, ITIP_VIEW_RESPONSE_TENTATIVE);
 	buttons_table_write_button (
-                buffer, BUTTON_ACCEPT_ALL, _("Accept all"),
+		buffer, BUTTON_ACCEPT_ALL, _("Accept all"),
 		GTK_STOCK_APPLY, ITIP_VIEW_RESPONSE_ACCEPT);
 	buttons_table_write_button (
-                buffer, BUTTON_ACCEPT, _("Accept"),
+		buffer, BUTTON_ACCEPT, _("Accept"),
 		GTK_STOCK_APPLY, ITIP_VIEW_RESPONSE_ACCEPT);
 	buttons_table_write_button (
-                buffer, BUTTON_SEND_INFORMATION, _("Send Information"),
+		buffer, BUTTON_SEND_INFORMATION, _("Send Information"),
 		GTK_STOCK_REFRESH, ITIP_VIEW_RESPONSE_REFRESH);
 	buttons_table_write_button (
-                buffer, BUTTON_UPDATE_ATTENDEE_STATUS, _("Update Attendee Status"),
+		buffer, BUTTON_UPDATE_ATTENDEE_STATUS, _("Update Attendee Status"),
 		GTK_STOCK_REFRESH, ITIP_VIEW_RESPONSE_UPDATE);
 	buttons_table_write_button (
-                buffer, BUTTON_UPDATE,  _("Update"),
+		buffer, BUTTON_UPDATE,  _("Update"),
 		GTK_STOCK_REFRESH, ITIP_VIEW_RESPONSE_CANCEL);
 
-        g_string_append (buffer, "</tr></table>");
+	g_string_append (buffer, "</tr></table>");
 }
 
 void
 itip_view_write (GString *buffer)
 {
 	g_string_append (buffer,
-                "<html>\n"
-                "<head>\n"
-                "<title>ITIP</title>\n"
-                "<link type=\"text/css\" rel=\"stylesheet\" href=\"evo-file://" EVOLUTION_PRIVDATADIR "/theme/webview.css\" />\n"
-                "</head>\n"
-                "<body>\n");
+		"<html>\n"
+		"<head>\n"
+		"<title>ITIP</title>\n"
+		"<link type=\"text/css\" rel=\"stylesheet\" href=\"evo-file://" EVOLUTION_PRIVDATADIR "/theme/webview.css\" />\n"
+		"</head>\n"
+		"<body>\n");
 
 	g_string_append_printf (buffer,
-                "<img src=\"gtk-stock://%s?size=%d\" class=\"itip icon\" />\n",
+		"<img src=\"gtk-stock://%s?size=%d\" class=\"itip icon\" />\n",
 			MEETING_ICON, GTK_ICON_SIZE_BUTTON);
 
 	g_string_append (buffer,
-                "<div class=\"itip content\" id=\"" DIV_ITIP_CONTENT "\">\n");
+		"<div class=\"itip content\" id=\"" DIV_ITIP_CONTENT "\">\n");
 
         /* The first section listing the sender */
         /* FIXME What to do if the send and organizer do not match */
 	g_string_append (buffer,
-                "<div id=\"" TEXT_ROW_SENDER "\" class=\"itip sender\"></div>\n");
+		"<div id=\"" TEXT_ROW_SENDER "\" class=\"itip sender\"></div>\n");
 
-        g_string_append (buffer, "<hr>\n");
+	g_string_append (buffer, "<hr>\n");
 
         /* Elementary event information */
 	g_string_append (buffer,
-                "<table class=\"itip table\" border=\"0\" "
-                       "cellspacing=\"5\" cellpadding=\"0\">\n");
+		"<table class=\"itip table\" border=\"0\" "
+		       "cellspacing=\"5\" cellpadding=\"0\">\n");
 
 	append_text_table_row (buffer, TABLE_ROW_SUMMARY, NULL, NULL);
-        append_text_table_row (buffer, TABLE_ROW_LOCATION, _("Location:"), NULL);
-        append_text_table_row (buffer, TABLE_ROW_START_DATE, _("Start time:"), NULL);
-        append_text_table_row (buffer, TABLE_ROW_END_DATE, _("End time:"), NULL);
-        append_text_table_row (buffer, TABLE_ROW_STATUS, _("Status:"), NULL);
-        append_text_table_row (buffer, TABLE_ROW_COMMENT, _("Comment:"), NULL);
+	append_text_table_row (buffer, TABLE_ROW_LOCATION, _("Location:"), NULL);
+	append_text_table_row (buffer, TABLE_ROW_START_DATE, _("Start time:"), NULL);
+	append_text_table_row (buffer, TABLE_ROW_END_DATE, _("End time:"), NULL);
+	append_text_table_row (buffer, TABLE_ROW_STATUS, _("Status:"), NULL);
+	append_text_table_row (buffer, TABLE_ROW_COMMENT, _("Comment:"), NULL);
 
-        g_string_append (buffer, "</table>\n");
+	g_string_append (buffer, "</table>\n");
 
 	/* Upper Info items */
 	g_string_append (buffer,
-                "<table class=\"itip info\" id=\"" TABLE_UPPER_ITIP_INFO "\" border=\"0\" "
-                       "cellspacing=\"5\" cellpadding=\"0\">");
+		"<table class=\"itip info\" id=\"" TABLE_UPPER_ITIP_INFO "\" border=\"0\" "
+		       "cellspacing=\"5\" cellpadding=\"0\">");
 
         /* Description */
 	g_string_append (buffer,
-                "<div id=\"" TABLE_ROW_DESCRIPTION "\" class=\"itip description\" hidden=\"\"></div>\n");
+		"<div id=\"" TABLE_ROW_DESCRIPTION "\" class=\"itip description\" hidden=\"\"></div>\n");
 
 	g_string_append (buffer, "<hr>\n");
 
 	/* Lower Info items */
 	g_string_append (buffer,
-                "<table class=\"itip info\" id=\"" TABLE_LOWER_ITIP_INFO "\" border=\"0\" "
-                       "cellspacing=\"5\" cellpadding=\"0\">");
+		"<table class=\"itip info\" id=\"" TABLE_LOWER_ITIP_INFO "\" border=\"0\" "
+		       "cellspacing=\"5\" cellpadding=\"0\">");
 
 	g_string_append (buffer,
-                "<table class=\"itip table\" border=\"0\" "
-                       "cellspacing=\"5\" cellpadding=\"0\">\n");
+		"<table class=\"itip table\" border=\"0\" "
+		       "cellspacing=\"5\" cellpadding=\"0\">\n");
 
 	g_string_append (buffer,
-                "<tr id=\"" TABLE_ROW_ESCB "\" hidden=\"\""">"
-                "<th></th>"
-                "<td><select name=\"" SELECT_ESOURCE "\" id=\"" SELECT_ESOURCE "\"></select></td>"
-                "</tr>\n");
+		"<tr id=\"" TABLE_ROW_ESCB "\" hidden=\"\""">"
+		"<th></th>"
+		"<td><select name=\"" SELECT_ESOURCE "\" id=\"" SELECT_ESOURCE "\"></select></td>"
+		"</tr>\n");
 
 	/* RSVP area */
-        append_checkbox_table_row (buffer, CHECKBOX_RSVP, _("Send reply to sender"));
+	append_checkbox_table_row (buffer, CHECKBOX_RSVP, _("Send reply to sender"));
 
         /* Comments */
 	g_string_append_printf (buffer,
-                "<tr id=\"" TABLE_ROW_RSVP_COMMENT "\" hidden=\"\">"
-                "<th>%s</th>"
-                "<td><textarea name=\"" TEXTAREA_RSVP_COMMENT "\" "
-                              "id=\"" TEXTAREA_RSVP_COMMENT "\" "
-                              "rows=\"3\" cols=\"40\" disabled=\"\">"
-                "</textarea></td>\n"
-                "</tr>\n",
-                _("Comment:"));
+		"<tr id=\"" TABLE_ROW_RSVP_COMMENT "\" hidden=\"\">"
+		"<th>%s</th>"
+		"<td><textarea name=\"" TEXTAREA_RSVP_COMMENT "\" "
+			      "id=\"" TEXTAREA_RSVP_COMMENT "\" "
+			      "rows=\"3\" cols=\"40\" disabled=\"\">"
+		"</textarea></td>\n"
+		"</tr>\n",
+		_("Comment:"));
 
         /* Updates */
-        append_checkbox_table_row (buffer, CHECKBOX_UPDATE, _("Send updates to attendees"));
+	append_checkbox_table_row (buffer, CHECKBOX_UPDATE, _("Send updates to attendees"));
 
         /* The recurrence check button */
-        append_checkbox_table_row (buffer, CHECKBOX_RECUR, _("Apply to all instances"));
-        append_checkbox_table_row (buffer, CHECKBOX_FREE_TIME, _("Show time as free"));
-        append_checkbox_table_row (buffer, CHECKBOX_KEEP_ALARM, _("Preserve my reminder"));
-        append_checkbox_table_row (buffer, CHECKBOX_INHERIT_ALARM, _("Inherit reminder"));
+	append_checkbox_table_row (buffer, CHECKBOX_RECUR, _("Apply to all instances"));
+	append_checkbox_table_row (buffer, CHECKBOX_FREE_TIME, _("Show time as free"));
+	append_checkbox_table_row (buffer, CHECKBOX_KEEP_ALARM, _("Preserve my reminder"));
+	append_checkbox_table_row (buffer, CHECKBOX_INHERIT_ALARM, _("Inherit reminder"));
 
-        g_string_append (buffer, "</table>\n");
+	g_string_append (buffer, "</table>\n");
 
         /* Buttons table */
 	append_buttons_table (buffer);
 
         /* <div class="itip content" > */
-        g_string_append (buffer, "</div>\n");
+	g_string_append (buffer, "</div>\n");
 
-        g_string_append (buffer, "<div class=\"itip error\" id=\"" DIV_ITIP_ERROR "\"></div>");
+	g_string_append (buffer, "<div class=\"itip error\" id=\"" DIV_ITIP_ERROR "\"></div>");
 
-        g_string_append (buffer, "</body></html>");
+	g_string_append (buffer, "</body></html>");
 }
 
 void
@@ -1240,27 +1240,27 @@ itip_view_write_for_printing (ItipView *view,
 	}
 
 	g_string_append (buffer,
-                "<div class=\"itip print_content\" id=\"" DIV_ITIP_CONTENT "\">\n");
+		"<div class=\"itip print_content\" id=\"" DIV_ITIP_CONTENT "\">\n");
 
         /* The first section listing the sender */
         /* FIXME What to do if the send and organizer do not match */
 	g_string_append_printf (buffer,
-                "<div id=\"" TEXT_ROW_SENDER "\" class=\"itip sender\">%s</div>\n",
-                view->priv->sender ? view->priv->sender : "");
+		"<div id=\"" TEXT_ROW_SENDER "\" class=\"itip sender\">%s</div>\n",
+		view->priv->sender ? view->priv->sender : "");
 
-        g_string_append (buffer, "<hr>\n");
+	g_string_append (buffer, "<hr>\n");
 
         /* Elementary event information */
 	g_string_append (buffer,
-                "<table class=\"itip table\" border=\"0\" "
-                       "cellspacing=\"5\" cellpadding=\"0\">\n");
+		"<table class=\"itip table\" border=\"0\" "
+		       "cellspacing=\"5\" cellpadding=\"0\">\n");
 
 	append_text_table_row (
 		buffer, TABLE_ROW_SUMMARY,
 		NULL, view->priv->summary);
 	append_text_table_row (
 		buffer, TABLE_ROW_LOCATION,
-                _("Location:"), view->priv->location);
+		_("Location:"), view->priv->location);
 	append_text_table_row (
 		buffer, TABLE_ROW_START_DATE,
 		view->priv->start_header, view->priv->start_label);
@@ -1269,21 +1269,21 @@ itip_view_write_for_printing (ItipView *view,
 		view->priv->end_header, view->priv->end_label);
 	append_text_table_row (
 		buffer, TABLE_ROW_STATUS,
-                _("Status:"), view->priv->status);
+		_("Status:"), view->priv->status);
 	append_text_table_row (
 		buffer, TABLE_ROW_COMMENT,
-                _("Comment:"), view->priv->comment);
+		_("Comment:"), view->priv->comment);
 
-        g_string_append (buffer, "</table>\n");
+	g_string_append (buffer, "</table>\n");
 
         /* Description */
 	g_string_append_printf (
 		buffer,
-                "<div id=\"" TABLE_ROW_DESCRIPTION "\" "
-                     "class=\"itip description\" %s>%s</div>\n",
-                view->priv->description ? "" : "hidden=\"\"", view->priv->description);
+		"<div id=\"" TABLE_ROW_DESCRIPTION "\" "
+		     "class=\"itip description\" %s>%s</div>\n",
+		view->priv->description ? "" : "hidden=\"\"", view->priv->description);
 
-        g_string_append (buffer, "</div>");
+	g_string_append (buffer, "</div>");
 }
 
 void
@@ -1299,105 +1299,105 @@ itip_view_create_dom_bindings (ItipView *view,
 	el = webkit_dom_document_get_element_by_id (doc, CHECKBOX_RECUR);
 	if (el) {
 		webkit_dom_event_target_add_event_listener (
-                        WEBKIT_DOM_EVENT_TARGET (el), "click",
+			WEBKIT_DOM_EVENT_TARGET (el), "click",
 			G_CALLBACK (recur_toggled_cb), FALSE, view);
 	}
 
 	el = webkit_dom_document_get_element_by_id (doc, CHECKBOX_RSVP);
 	if (el) {
 		webkit_dom_event_target_add_event_listener (
-                        WEBKIT_DOM_EVENT_TARGET (el), "click",
+			WEBKIT_DOM_EVENT_TARGET (el), "click",
 			G_CALLBACK (rsvp_toggled_cb), FALSE, view);
 	}
 
 	el = webkit_dom_document_get_element_by_id (doc, CHECKBOX_INHERIT_ALARM);
 	if (el) {
 		webkit_dom_event_target_add_event_listener (
-                        WEBKIT_DOM_EVENT_TARGET (el), "click",
+			WEBKIT_DOM_EVENT_TARGET (el), "click",
 			G_CALLBACK (alarm_check_toggled_cb), FALSE, view);
 	}
 
 	el = webkit_dom_document_get_element_by_id (doc, CHECKBOX_KEEP_ALARM);
 	if (el) {
 		webkit_dom_event_target_add_event_listener (
-                        WEBKIT_DOM_EVENT_TARGET (el), "click",
+			WEBKIT_DOM_EVENT_TARGET (el), "click",
 			G_CALLBACK (alarm_check_toggled_cb), FALSE, view);
 	}
 
 	el = webkit_dom_document_get_element_by_id (doc, BUTTON_OPEN_CALENDAR);
 	if (el) {
 		webkit_dom_event_target_add_event_listener (
-                        WEBKIT_DOM_EVENT_TARGET (el), "click",
+			WEBKIT_DOM_EVENT_TARGET (el), "click",
 			G_CALLBACK (button_clicked_cb), FALSE, view);
 	}
 
 	el = webkit_dom_document_get_element_by_id (doc, BUTTON_ACCEPT);
 	if (el) {
 		webkit_dom_event_target_add_event_listener (
-                        WEBKIT_DOM_EVENT_TARGET (el), "click",
+			WEBKIT_DOM_EVENT_TARGET (el), "click",
 			G_CALLBACK (button_clicked_cb), FALSE, view);
 	}
 
 	el = webkit_dom_document_get_element_by_id (doc, BUTTON_ACCEPT_ALL);
 	if (el) {
 		webkit_dom_event_target_add_event_listener (
-                        WEBKIT_DOM_EVENT_TARGET (el), "click",
+			WEBKIT_DOM_EVENT_TARGET (el), "click",
 			G_CALLBACK (button_clicked_cb), FALSE, view);
 	}
 
 	el = webkit_dom_document_get_element_by_id (doc, BUTTON_TENTATIVE);
 	if (el) {
 		webkit_dom_event_target_add_event_listener (
-                        WEBKIT_DOM_EVENT_TARGET (el), "click",
+			WEBKIT_DOM_EVENT_TARGET (el), "click",
 			G_CALLBACK (button_clicked_cb), FALSE, view);
 	}
 
 	el = webkit_dom_document_get_element_by_id (doc, BUTTON_TENTATIVE_ALL);
 	if (el) {
 		webkit_dom_event_target_add_event_listener (
-                        WEBKIT_DOM_EVENT_TARGET (el), "click",
+			WEBKIT_DOM_EVENT_TARGET (el), "click",
 			G_CALLBACK (button_clicked_cb), FALSE, view);
 	}
 
 	el = webkit_dom_document_get_element_by_id (doc, BUTTON_DECLINE);
 	if (el) {
 		webkit_dom_event_target_add_event_listener (
-                        WEBKIT_DOM_EVENT_TARGET (el), "click",
+			WEBKIT_DOM_EVENT_TARGET (el), "click",
 			G_CALLBACK (button_clicked_cb), FALSE, view);
 	}
 
 	el = webkit_dom_document_get_element_by_id (doc, BUTTON_DECLINE_ALL);
 	if (el) {
 		webkit_dom_event_target_add_event_listener (
-                        WEBKIT_DOM_EVENT_TARGET (el), "click",
+			WEBKIT_DOM_EVENT_TARGET (el), "click",
 			G_CALLBACK (button_clicked_cb), FALSE, view);
 	}
 
 	el = webkit_dom_document_get_element_by_id (doc, BUTTON_UPDATE);
 	if (el) {
 		webkit_dom_event_target_add_event_listener (
-                        WEBKIT_DOM_EVENT_TARGET (el), "click",
+			WEBKIT_DOM_EVENT_TARGET (el), "click",
 			G_CALLBACK (button_clicked_cb), FALSE, view);
 	}
 
 	el = webkit_dom_document_get_element_by_id (doc, BUTTON_UPDATE_ATTENDEE_STATUS);
 	if (el) {
 		webkit_dom_event_target_add_event_listener (
-                        WEBKIT_DOM_EVENT_TARGET (el), "click",
+			WEBKIT_DOM_EVENT_TARGET (el), "click",
 			G_CALLBACK (button_clicked_cb), FALSE, view);
 	}
 
 	el = webkit_dom_document_get_element_by_id (doc, BUTTON_SEND_INFORMATION);
 	if (el) {
 		webkit_dom_event_target_add_event_listener (
-                        WEBKIT_DOM_EVENT_TARGET (el), "click",
+			WEBKIT_DOM_EVENT_TARGET (el), "click",
 			G_CALLBACK (button_clicked_cb), FALSE, view);
 	}
 
 	el = webkit_dom_document_get_element_by_id (doc, SELECT_ESOURCE);
 	if (el) {
 		webkit_dom_event_target_add_event_listener (
-                        WEBKIT_DOM_EVENT_TARGET (el), "change",
+			WEBKIT_DOM_EVENT_TARGET (el), "change",
 			G_CALLBACK (source_changed_cb), FALSE, view);
 	}
 }
@@ -1536,13 +1536,13 @@ itip_view_set_item_type (ItipView *view,
 
 	switch (view->priv->type) {
 		case E_CAL_CLIENT_SOURCE_TYPE_EVENTS:
-                        header = _("Calendar:");
+			header = _("Calendar:");
 			break;
 		case E_CAL_CLIENT_SOURCE_TYPE_TASKS:
-                        header = _("Tasks:");
+			header = _("Tasks:");
 			break;
 		case E_CAL_CLIENT_SOURCE_TYPE_MEMOS:
-                        header = _("Memos:");
+			header = _("Memos:");
 			break;
 		default:
 			header = NULL;
@@ -1550,7 +1550,7 @@ itip_view_set_item_type (ItipView *view,
 	}
 
 	webkit_dom_html_element_set_inner_html (
-                WEBKIT_DOM_HTML_ELEMENT (cell), header ? header : "", NULL);
+		WEBKIT_DOM_HTML_ELEMENT (cell), header ? header : "", NULL);
 
 	set_sender_text (view);
 }
@@ -1719,7 +1719,7 @@ itip_view_set_summary (ItipView *view,
 	col = webkit_dom_element_get_last_element_child (row);
 	webkit_dom_html_element_set_inner_html (
 		WEBKIT_DOM_HTML_ELEMENT (col),
-                view->priv->summary ? view->priv->summary : "",
+		view->priv->summary ? view->priv->summary : "",
 		NULL);
 }
 
@@ -1755,7 +1755,7 @@ itip_view_set_location (ItipView *view,
 	col = webkit_dom_element_get_last_element_child (row);
 	webkit_dom_html_element_set_inner_html (
 		WEBKIT_DOM_HTML_ELEMENT (col),
-                view->priv->location ? view->priv->location : "",
+		view->priv->location ? view->priv->location : "",
 		NULL);
 }
 
@@ -1791,7 +1791,7 @@ itip_view_set_status (ItipView *view,
 	col = webkit_dom_element_get_last_element_child (row);
 	webkit_dom_html_element_set_inner_html (
 		WEBKIT_DOM_HTML_ELEMENT (col),
-                view->priv->status ? view->priv->status : "",
+		view->priv->status ? view->priv->status : "",
 		NULL);
 }
 
@@ -1827,7 +1827,7 @@ itip_view_set_comment (ItipView *view,
 	col = webkit_dom_element_get_last_element_child (row);
 	webkit_dom_html_element_set_inner_html (
 		WEBKIT_DOM_HTML_ELEMENT (col),
-                view->priv->comment ? view->priv->comment : "",
+		view->priv->comment ? view->priv->comment : "",
 		NULL);
 }
 
@@ -1862,7 +1862,7 @@ itip_view_set_description (ItipView *view,
 
 	webkit_dom_html_element_set_inner_html (
 		WEBKIT_DOM_HTML_ELEMENT (div),
-                view->priv->description ? view->priv->description : "",
+		view->priv->description ? view->priv->description : "",
 		NULL);
 }
 
@@ -2161,7 +2161,7 @@ source_list_changed_cb (ESourceList *source_list,
 	GSList *groups, *iter;
 	WebKitDOMElement *select;
 
-        d(printf("Assigning a new source list!\n"));
+	d(printf("Assigning a new source list!\n"));
 
 	if (!view->priv->dom_document)
 		return;
@@ -2188,7 +2188,7 @@ source_list_changed_cb (ESourceList *source_list,
 			continue;
 
 		optgroup = webkit_dom_document_create_element (
-                        view->priv->dom_document, "OPTGROUP", NULL);
+			view->priv->dom_document, "OPTGROUP", NULL);
 		webkit_dom_html_opt_group_element_set_label (
 			WEBKIT_DOM_HTML_OPT_GROUP_ELEMENT (optgroup),
 			e_source_group_peek_name (group));
@@ -2204,7 +2204,7 @@ source_list_changed_cb (ESourceList *source_list,
 			ESource *source = iter2->data;
 
 			option = webkit_dom_document_create_element (
-                                view->priv->dom_document, "OPTION", NULL);
+				view->priv->dom_document, "OPTION", NULL);
 			webkit_dom_html_option_element_set_value (
 				WEBKIT_DOM_HTML_OPTION_ELEMENT (option),
 				e_source_peek_uid (source));
@@ -2215,7 +2215,7 @@ source_list_changed_cb (ESourceList *source_list,
 				WEBKIT_DOM_HTML_ELEMENT (option),
 				e_source_peek_name (source), NULL);
 			webkit_dom_html_element_set_class_name (
-                                WEBKIT_DOM_HTML_ELEMENT (option), "calendar");
+				WEBKIT_DOM_HTML_ELEMENT (option), "calendar");
 
 			webkit_dom_node_append_child (
 				WEBKIT_DOM_NODE (optgroup),
@@ -2249,7 +2249,7 @@ itip_view_set_source_list (ItipView *view,
 
 	source_list_changed_cb (source_list, view);
 
-        g_signal_connect (source_list, "changed",
+	g_signal_connect (source_list, "changed",
 		G_CALLBACK (source_list_changed_cb), view);
 }
 
@@ -2271,7 +2271,7 @@ itip_view_set_source (ItipView *view,
 
 	g_return_if_fail (ITIP_IS_VIEW (view));
 
-        d(printf("Settings default source '%s'\n", e_source_peek_name (source)));
+	d(printf("Settings default source '%s'\n", e_source_peek_name (source)));
 
 	if (!view->priv->dom_document)
 		return;
@@ -2411,7 +2411,7 @@ itip_view_set_show_rsvp_check (ItipView *view,
 		return;
 
 	el = webkit_dom_document_get_element_by_id (
-                view->priv->dom_document, "table_row_" CHECKBOX_RSVP);
+		view->priv->dom_document, "table_row_" CHECKBOX_RSVP);
 	webkit_dom_html_element_set_hidden (WEBKIT_DOM_HTML_ELEMENT (el), !show);
 
 	el = webkit_dom_document_get_element_by_id (
@@ -2490,7 +2490,7 @@ itip_view_set_show_update_check (ItipView *view,
 		return;
 
 	el = webkit_dom_document_get_element_by_id (
-                view->priv->dom_document, "table_row_" CHECKBOX_UPDATE);
+		view->priv->dom_document, "table_row_" CHECKBOX_UPDATE);
 	webkit_dom_html_element_set_hidden (WEBKIT_DOM_HTML_ELEMENT (el), !show);
 
 	el = webkit_dom_document_get_element_by_id (
@@ -2579,7 +2579,7 @@ itip_view_set_buttons_sensitive (ItipView *view,
 
 	g_return_if_fail (ITIP_IS_VIEW (view));
 
-        d(printf("Settings buttons %s\n", sensitive ? "sensitive" : "insensitive"));
+	d(printf("Settings buttons %s\n", sensitive ? "sensitive" : "insensitive"));
 
 	view->priv->buttons_sensitive = sensitive;
 
@@ -2677,7 +2677,7 @@ itip_view_set_show_recur_check (ItipView *view,
 		return;
 
 	el = webkit_dom_document_get_element_by_id (
-                view->priv->dom_document, "table_row_" CHECKBOX_RECUR);
+		view->priv->dom_document, "table_row_" CHECKBOX_RECUR);
 	webkit_dom_html_element_set_hidden (WEBKIT_DOM_HTML_ELEMENT (el), !show);
 
 	el = webkit_dom_document_get_element_by_id (
@@ -2709,7 +2709,7 @@ itip_view_set_show_free_time_check (ItipView *view,
 		return;
 
 	el = webkit_dom_document_get_element_by_id (
-                view->priv->dom_document, "table_row_" CHECKBOX_FREE_TIME);
+		view->priv->dom_document, "table_row_" CHECKBOX_FREE_TIME);
 	webkit_dom_html_element_set_hidden (WEBKIT_DOM_HTML_ELEMENT (el), !show);
 
 	el = webkit_dom_document_get_element_by_id (
@@ -2757,7 +2757,7 @@ itip_view_set_show_keep_alarm_check (ItipView *view,
 		return;
 
 	el = webkit_dom_document_get_element_by_id (
-                view->priv->dom_document, "table_row_" CHECKBOX_KEEP_ALARM);
+		view->priv->dom_document, "table_row_" CHECKBOX_KEEP_ALARM);
 	webkit_dom_html_element_set_hidden (WEBKIT_DOM_HTML_ELEMENT (el), !show);
 
 	el = webkit_dom_document_get_element_by_id (
@@ -2805,7 +2805,7 @@ itip_view_set_show_inherit_alarm_check (ItipView *view,
 		return;
 
 	el = webkit_dom_document_get_element_by_id (
-                view->priv->dom_document, "table_row_" CHECKBOX_INHERIT_ALARM);
+		view->priv->dom_document, "table_row_" CHECKBOX_INHERIT_ALARM);
 	webkit_dom_html_element_set_hidden (WEBKIT_DOM_HTML_ELEMENT (el), !show);
 
 	el = webkit_dom_document_get_element_by_id (
@@ -2855,14 +2855,14 @@ itip_view_set_error (ItipView *view,
 
 	if (show_save_btn) {
 		g_string_append (str,
-                        "<table border=\"0\" width=\"100%\">"
-                        "<tr width=\"100%\" id=\"" TABLE_ROW_BUTTONS "\">");
+			"<table border=\"0\" width=\"100%\">"
+			"<tr width=\"100%\" id=\"" TABLE_ROW_BUTTONS "\">");
 
 		buttons_table_write_button (
-                        str, BUTTON_SAVE, _("Save"),
+			str, BUTTON_SAVE, _("Save"),
 			GTK_STOCK_SAVE, ITIP_VIEW_RESPONSE_SAVE);
 
-                g_string_append (str, "</tr></table>");
+		g_string_append (str, "</tr></table>");
 	}
 
 	view->priv->error = str->str;
@@ -2892,7 +2892,7 @@ itip_view_set_error (ItipView *view,
 		el = webkit_dom_document_get_element_by_id (
 			view->priv->dom_document, BUTTON_SAVE);
 		webkit_dom_event_target_add_event_listener (
-                        WEBKIT_DOM_EVENT_TARGET (el), "click",
+			WEBKIT_DOM_EVENT_TARGET (el), "click",
 			G_CALLBACK (button_clicked_cb), FALSE, view);
 	}
 }
diff --git a/plugins/tnef-attachments/tnef-plugin.c b/plugins/tnef-attachments/tnef-plugin.c
index 0621c12dd3..52cd68664f 100644
--- a/plugins/tnef-attachments/tnef-plugin.c
+++ b/plugins/tnef-attachments/tnef-plugin.c
@@ -125,7 +125,7 @@ org_gnome_format_tnef (gpointer ep,
 	TNEFInitialize (&tnef);
 	tnef.Debug = verbose;
 	if (TNEFParseFile (name, &tnef) == -1) {
-            printf("ERROR processing file\n");
+	    printf("ERROR processing file\n");
 	}
 	processTnef (&tnef, tmpdir);
 
@@ -191,7 +191,7 @@ org_gnome_format_tnef (gpointer ep,
 	g_string_append_printf(t->part_id, ".tnef");
 
 	if (camel_multipart_get_number (mp) > 0) {
-                handler = em_format_find_handler (t->format, "multiplart/mixed");
+		handler = em_format_find_handler (t->format, "multiplart/mixed");
                 /* FIXME Not passing a GCancellable here. */
 		if (handler && handler->parse_func) {
 			CamelMimePart *part = camel_mime_part_new ();
@@ -244,13 +244,13 @@ processTnef (TNEFStruct *tnef,
     /* First see if this requires special processing. */
     /* ie: it's a Contact Card, Task, or Meeting request (vCal/vCard) */
     if (tnef->messageClass[0] != 0)  {
-        if (strcmp(tnef->messageClass, "IPM.Contact") == 0) {
+	if (strcmp(tnef->messageClass, "IPM.Contact") == 0) {
 	    saveVCard (tnef, tmpdir);
 	}
-        if (strcmp(tnef->messageClass, "IPM.Task") == 0) {
+	if (strcmp(tnef->messageClass, "IPM.Task") == 0) {
 	    saveVTask (tnef, tmpdir);
 	}
-        if (strcmp(tnef->messageClass, "IPM.Appointment") == 0) {
+	if (strcmp(tnef->messageClass, "IPM.Appointment") == 0) {
 	    saveVCalendar (tnef, tmpdir);
 	    foundCal = 1;
 	}
@@ -258,7 +258,7 @@ processTnef (TNEFStruct *tnef,
 
     if ((filename = MAPIFindUserProp (&(tnef->MapiProperties),
 			PROP_TAG (PT_STRING8,0x24))) != MAPI_UNDEFINED) {
-        if (strcmp(filename->data, "IPM.Appointment") == 0) {
+	if (strcmp(filename->data, "IPM.Appointment") == 0) {
              /* If it's "indicated" twice, we don't want to save 2 calendar entries. */
 	    if (foundCal == 0) {
 		saveVCalendar (tnef, tmpdir);
@@ -277,13 +277,13 @@ processTnef (TNEFStruct *tnef,
 		    file = sanitize_filename (tnef->subject.data);
 		    if (!file)
 			    return;
-                    absfilename = g_strconcat (file, ".rtf", NULL);
+		    absfilename = g_strconcat (file, ".rtf", NULL);
 		    ifilename = g_build_filename (tmpdir, file, NULL);
 		    g_free (absfilename);
 		    g_free (file);
 
-                    if ((fptr = fopen(ifilename, "wb"))==NULL) {
-                        printf("ERROR: Error writing file to disk!");
+		    if ((fptr = fopen(ifilename, "wb"))==NULL) {
+			printf("ERROR: Error writing file to disk!");
 		    } else {
 			fwrite (buf.data,
 				sizeof (BYTE),
@@ -369,7 +369,7 @@ processTnef (TNEFStruct *tnef,
 		}
 		if (filename->size == 1) {
 		    filename->size = 20;
-                    g_sprintf(tmpname, "file_%03i.dat", count);
+		    g_sprintf(tmpname, "file_%03i.dat", count);
 		    filename->data = tmpname;
 		}
 		absfilename = sanitize_filename (filename->data);
@@ -421,7 +421,7 @@ saveVCard (TNEFStruct *tnef,
 		    return;
 		absfilename = g_strconcat (file, ".vcard", NULL);
 	    } else
-                absfilename = g_strdup ("unknown.vcard");       
+		absfilename = g_strdup ("unknown.vcard");       
      } else {
 	    file = sanitize_filename (vl->data);
 	    if (!file)
@@ -440,41 +440,41 @@ saveVCard (TNEFStruct *tnef,
     g_free (absfilename);
 
     if ((fptr = fopen(ifilename, "wb"))==NULL) {
-            printf("Error writing file to disk!");
+	    printf("Error writing file to disk!");
     } else {
-        fprintf(fptr, "BEGIN:VCARD\n");
-        fprintf(fptr, "VERSION:2.1\n");
+	fprintf(fptr, "BEGIN:VCARD\n");
+	fprintf(fptr, "VERSION:2.1\n");
 	if (vl != MAPI_UNDEFINED) {
-            fprintf(fptr, "FN:%s\n", vl->data);
+	    fprintf(fptr, "FN:%s\n", vl->data);
 	}
-        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_ASSISTANT, "X-EVOLUTION-ASSISTANT:%s\n");
+	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_ASSISTANT, "X-EVOLUTION-ASSISTANT:%s\n");
 
         /* Organizational */
 	if ((vl = MAPIFindProperty (&(tnef->MapiProperties), PROP_TAG (PT_STRING8, PR_COMPANY_NAME))) != MAPI_UNDEFINED) {
 	    if (vl->size > 0) {
 		if ((vl->size == 1) && (vl->data[0] == 0)) {
 		} else {
-                    fprintf(fptr,"ORG:%s", vl->data);
+		    fprintf(fptr,"ORG:%s", vl->data);
 		    if ((vl = MAPIFindProperty (&(tnef->MapiProperties), PROP_TAG (PT_STRING8, PR_DEPARTMENT_NAME))) != MAPI_UNDEFINED) {
-                        fprintf(fptr,";%s", vl->data);
+			fprintf(fptr,";%s", vl->data);
 		    }
-                    fprintf(fptr, "\n");
+		    fprintf(fptr, "\n");
 		}
 	    }
 	}
 
-        fprintProperty(tnef, fptr, PT_STRING8, PR_OFFICE_LOCATION, "X-EVOLUTION-OFFICE:%s\n");
-        fprintProperty(tnef, fptr, PT_STRING8, PR_TITLE, "TITLE:%s\n");
-        fprintProperty(tnef, fptr, PT_STRING8, PR_PROFESSION, "ROLE:%s\n");
-        fprintProperty(tnef, fptr, PT_STRING8, PR_BODY, "NOTE:%s\n");
+	fprintProperty(tnef, fptr, PT_STRING8, PR_OFFICE_LOCATION, "X-EVOLUTION-OFFICE:%s\n");
+	fprintProperty(tnef, fptr, PT_STRING8, PR_TITLE, "TITLE:%s\n");
+	fprintProperty(tnef, fptr, PT_STRING8, PR_PROFESSION, "ROLE:%s\n");
+	fprintProperty(tnef, fptr, PT_STRING8, PR_BODY, "NOTE:%s\n");
 	if (tnef->body.size > 0) {
-            fprintf(fptr, "NOTE;QUOTED-PRINTABLE:");
+	    fprintf(fptr, "NOTE;QUOTED-PRINTABLE:");
 	    quotedfprint (fptr, &(tnef->body));
-            fprintf(fptr,"\n");
+	    fprintf(fptr,"\n");
 	}
 
         /* Business Address */
@@ -498,35 +498,35 @@ saveVCard (TNEFStruct *tnef,
 	    boolean = 1;
 	}
 	if (boolean == 1) {
-            fprintf(fptr, "ADR;QUOTED-PRINTABLE;WORK:");
+	    fprintf(fptr, "ADR;QUOTED-PRINTABLE;WORK:");
 	    if (pobox != MAPI_UNDEFINED) {
 		quotedfprint (fptr, pobox);
 	    }
-            fprintf(fptr, ";;");
+	    fprintf(fptr, ";;");
 	    if (street != MAPI_UNDEFINED) {
 		quotedfprint (fptr, street);
 	    }
-            fprintf(fptr, ";");
+	    fprintf(fptr, ";");
 	    if (city != MAPI_UNDEFINED) {
 		quotedfprint (fptr, city);
 	    }
-            fprintf(fptr, ";");
+	    fprintf(fptr, ";");
 	    if (state != MAPI_UNDEFINED) {
 		quotedfprint (fptr, state);
 	    }
-            fprintf(fptr, ";");
+	    fprintf(fptr, ";");
 	    if (zip != MAPI_UNDEFINED) {
 		quotedfprint (fptr, zip);
 	    }
-            fprintf(fptr, ";");
+	    fprintf(fptr, ";");
 	    if (country != MAPI_UNDEFINED) {
 		quotedfprint (fptr, country);
 	    }
-            fprintf(fptr,"\n");
+	    fprintf(fptr,"\n");
 	    if ((vl = MAPIFindUserProp (&(tnef->MapiProperties), PROP_TAG (PT_STRING8, 0x801b))) != MAPI_UNDEFINED) {
-                fprintf(fptr, "LABEL;QUOTED-PRINTABLE;WORK:");
+		fprintf(fptr, "LABEL;QUOTED-PRINTABLE;WORK:");
 		quotedfprint (fptr, vl);
-                fprintf(fptr,"\n");
+		fprintf(fptr,"\n");
 	    }
 	}
 
@@ -551,35 +551,35 @@ saveVCard (TNEFStruct *tnef,
 	    boolean = 1;
 	}
 	if (boolean == 1) {
-            fprintf(fptr, "ADR;QUOTED-PRINTABLE;HOME:");
+	    fprintf(fptr, "ADR;QUOTED-PRINTABLE;HOME:");
 	    if (pobox != MAPI_UNDEFINED) {
 		quotedfprint (fptr, pobox);
 	    }
-            fprintf(fptr, ";;");
+	    fprintf(fptr, ";;");
 	    if (street != MAPI_UNDEFINED) {
 		quotedfprint (fptr, street);
 	    }
-            fprintf(fptr, ";");
+	    fprintf(fptr, ";");
 	    if (city != MAPI_UNDEFINED) {
 		quotedfprint (fptr, city);
 	    }
-            fprintf(fptr, ";");
+	    fprintf(fptr, ";");
 	    if (state != MAPI_UNDEFINED) {
 		quotedfprint (fptr, state);
 	    }
-            fprintf(fptr, ";");
+	    fprintf(fptr, ";");
 	    if (zip != MAPI_UNDEFINED) {
 		quotedfprint (fptr, zip);
 	    }
-            fprintf(fptr, ";");
+	    fprintf(fptr, ";");
 	    if (country != MAPI_UNDEFINED) {
 		quotedfprint (fptr, country);
 	    }
-            fprintf(fptr,"\n");
+	    fprintf(fptr,"\n");
 	    if ((vl = MAPIFindUserProp (&(tnef->MapiProperties), PROP_TAG (PT_STRING8, 0x801a))) != MAPI_UNDEFINED) {
-                fprintf(fptr, "LABEL;QUOTED-PRINTABLE;WORK:");
+		fprintf(fptr, "LABEL;QUOTED-PRINTABLE;WORK:");
 		quotedfprint (fptr, vl);
-                fprintf(fptr,"\n");
+		fprintf(fptr,"\n");
 	    }
 	}
 
@@ -604,52 +604,52 @@ saveVCard (TNEFStruct *tnef,
 	    boolean = 1;
 	}
 	if (boolean == 1) {
-            fprintf(fptr, "ADR;QUOTED-PRINTABLE;OTHER:");
+	    fprintf(fptr, "ADR;QUOTED-PRINTABLE;OTHER:");
 	    if (pobox != MAPI_UNDEFINED) {
 		quotedfprint (fptr, pobox);
 	    }
-            fprintf(fptr, ";;");
+	    fprintf(fptr, ";;");
 	    if (street != MAPI_UNDEFINED) {
 		quotedfprint (fptr, street);
 	    }
-            fprintf(fptr, ";");
+	    fprintf(fptr, ";");
 	    if (city != MAPI_UNDEFINED) {
 		quotedfprint (fptr, city);
 	    }
-            fprintf(fptr, ";");
+	    fprintf(fptr, ";");
 	    if (state != MAPI_UNDEFINED) {
 		quotedfprint (fptr, state);
 	    }
-            fprintf(fptr, ";");
+	    fprintf(fptr, ";");
 	    if (zip != MAPI_UNDEFINED) {
 		quotedfprint (fptr, zip);
 	    }
-            fprintf(fptr, ";");
+	    fprintf(fptr, ";");
 	    if (country != MAPI_UNDEFINED) {
 		quotedfprint (fptr, country);
 	    }
-            fprintf(fptr,"\n");
+	    fprintf(fptr,"\n");
 	}
 
-        fprintProperty(tnef, fptr, PT_STRING8, PR_CALLBACK_TELEPHONE_NUMBER, "TEL;X-EVOLUTION-CALLBACK:%s\n");
-        fprintProperty(tnef, fptr, PT_STRING8, PR_PRIMARY_TELEPHONE_NUMBER, "TEL;PREF:%s\n");
-        fprintProperty(tnef, fptr, PT_STRING8, PR_MOBILE_TELEPHONE_NUMBER, "TEL;CELL:%s\n");
-        fprintProperty(tnef, fptr, PT_STRING8, PR_RADIO_TELEPHONE_NUMBER, "TEL;X-EVOLUTION-RADIO:%s\n");
-        fprintProperty(tnef, fptr, PT_STRING8, PR_CAR_TELEPHONE_NUMBER, "TEL;CAR:%s\n");
-        fprintProperty(tnef, fptr, PT_STRING8, PR_OTHER_TELEPHONE_NUMBER, "TEL;VOICE:%s\n");
-        fprintProperty(tnef, fptr, PT_STRING8, PR_PAGER_TELEPHONE_NUMBER, "TEL;PAGER:%s\n");
-        fprintProperty(tnef, fptr, PT_STRING8, PR_TELEX_NUMBER, "TEL;X-EVOLUTION-TELEX:%s\n");
-        fprintProperty(tnef, fptr, PT_STRING8, PR_ISDN_NUMBER, "TEL;ISDN:%s\n");
-        fprintProperty(tnef, fptr, PT_STRING8, PR_HOME2_TELEPHONE_NUMBER, "TEL;HOME:%s\n");
-        fprintProperty(tnef, fptr, PT_STRING8, PR_TTYTDD_PHONE_NUMBER, "TEL;X-EVOLUTION-TTYTDD:%s\n");
-        fprintProperty(tnef, fptr, PT_STRING8, PR_HOME_TELEPHONE_NUMBER, "TEL;HOME;VOICE:%s\n");
-        fprintProperty(tnef, fptr, PT_STRING8, PR_ASSISTANT_TELEPHONE_NUMBER, "TEL;X-EVOLUTION-ASSISTANT:%s\n");
-        fprintProperty(tnef, fptr, PT_STRING8, PR_COMPANY_MAIN_PHONE_NUMBER, "TEL;WORK:%s\n");
-        fprintProperty(tnef, fptr, PT_STRING8, PR_BUSINESS_TELEPHONE_NUMBER, "TEL;WORK:%s\n");
-        fprintProperty(tnef, fptr, PT_STRING8, PR_BUSINESS2_TELEPHONE_NUMBER, "TEL;WORK;VOICE:%s\n");
-        fprintProperty(tnef, fptr, PT_STRING8, PR_PRIMARY_FAX_NUMBER, "TEL;PREF;FAX:%s\n");
-        fprintProperty(tnef, fptr, PT_STRING8, PR_BUSINESS_FAX_NUMBER, "TEL;WORK;FAX:%s\n");
-        fprintProperty(tnef, fptr, PT_STRING8, PR_HOME_FAX_NUMBER, "TEL;HOME;FAX:%s\n");
+	fprintProperty(tnef, fptr, PT_STRING8, PR_CALLBACK_TELEPHONE_NUMBER, "TEL;X-EVOLUTION-CALLBACK:%s\n");
+	fprintProperty(tnef, fptr, PT_STRING8, PR_PRIMARY_TELEPHONE_NUMBER, "TEL;PREF:%s\n");
+	fprintProperty(tnef, fptr, PT_STRING8, PR_MOBILE_TELEPHONE_NUMBER, "TEL;CELL:%s\n");
+	fprintProperty(tnef, fptr, PT_STRING8, PR_RADIO_TELEPHONE_NUMBER, "TEL;X-EVOLUTION-RADIO:%s\n");
+	fprintProperty(tnef, fptr, PT_STRING8, PR_CAR_TELEPHONE_NUMBER, "TEL;CAR:%s\n");
+	fprintProperty(tnef, fptr, PT_STRING8, PR_OTHER_TELEPHONE_NUMBER, "TEL;VOICE:%s\n");
+	fprintProperty(tnef, fptr, PT_STRING8, PR_PAGER_TELEPHONE_NUMBER, "TEL;PAGER:%s\n");
+	fprintProperty(tnef, fptr, PT_STRING8, PR_TELEX_NUMBER, "TEL;X-EVOLUTION-TELEX:%s\n");
+	fprintProperty(tnef, fptr, PT_STRING8, PR_ISDN_NUMBER, "TEL;ISDN:%s\n");
+	fprintProperty(tnef, fptr, PT_STRING8, PR_HOME2_TELEPHONE_NUMBER, "TEL;HOME:%s\n");
+	fprintProperty(tnef, fptr, PT_STRING8, PR_TTYTDD_PHONE_NUMBER, "TEL;X-EVOLUTION-TTYTDD:%s\n");
+	fprintProperty(tnef, fptr, PT_STRING8, PR_HOME_TELEPHONE_NUMBER, "TEL;HOME;VOICE:%s\n");
+	fprintProperty(tnef, fptr, PT_STRING8, PR_ASSISTANT_TELEPHONE_NUMBER, "TEL;X-EVOLUTION-ASSISTANT:%s\n");
+	fprintProperty(tnef, fptr, PT_STRING8, PR_COMPANY_MAIN_PHONE_NUMBER, "TEL;WORK:%s\n");
+	fprintProperty(tnef, fptr, PT_STRING8, PR_BUSINESS_TELEPHONE_NUMBER, "TEL;WORK:%s\n");
+	fprintProperty(tnef, fptr, PT_STRING8, PR_BUSINESS2_TELEPHONE_NUMBER, "TEL;WORK;VOICE:%s\n");
+	fprintProperty(tnef, fptr, PT_STRING8, PR_PRIMARY_FAX_NUMBER, "TEL;PREF;FAX:%s\n");
+	fprintProperty(tnef, fptr, PT_STRING8, PR_BUSINESS_FAX_NUMBER, "TEL;WORK;FAX:%s\n");
+	fprintProperty(tnef, fptr, PT_STRING8, PR_HOME_FAX_NUMBER, "TEL;HOME;FAX:%s\n");
 
         /* Email addresses */
 	if ((vl = MAPIFindUserProp (&(tnef->MapiProperties), PROP_TAG (PT_STRING8, 0x8083))) == MAPI_UNDEFINED) {
@@ -657,40 +657,40 @@ saveVCard (TNEFStruct *tnef,
 	}
 	if (vl != MAPI_UNDEFINED) {
 	    if (vl->size > 0)
-                fprintf(fptr, "EMAIL:%s\n", vl->data);
+		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)
-                fprintf(fptr, "EMAIL:%s\n", vl->data);
+		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)
-                fprintf(fptr, "EMAIL:%s\n", vl->data);
+		fprintf(fptr, "EMAIL:%s\n", vl->data);
 	}
 
-        fprintProperty(tnef, fptr, PT_STRING8, PR_BUSINESS_HOME_PAGE, "URL:%s\n");
-        fprintUserProp(tnef, fptr, PT_STRING8, 0x80d8, "FBURL:%s\n");
+	fprintProperty(tnef, fptr, PT_STRING8, PR_BUSINESS_HOME_PAGE, "URL:%s\n");
+	fprintUserProp(tnef, fptr, PT_STRING8, 0x80d8, "FBURL:%s\n");
 
         /* Birthday */
 	if ((vl = MAPIFindProperty (&(tnef->MapiProperties), PROP_TAG (PT_SYSTIME, PR_BIRTHDAY))) != MAPI_UNDEFINED) {
-            fprintf(fptr, "BDAY:");
+	    fprintf(fptr, "BDAY:");
 	    MAPISysTimetoDTR ((guchar *) vl->data, &thedate);
-            fprintf(fptr, "%i-%02i-%02i\n", thedate.wYear, thedate.wMonth, thedate.wDay);
+	    fprintf(fptr, "%i-%02i-%02i\n", thedate.wYear, thedate.wMonth, thedate.wDay);
 	}
 
         /* Anniversary */
 	if ((vl = MAPIFindProperty (&(tnef->MapiProperties), PROP_TAG (PT_SYSTIME, PR_WEDDING_ANNIVERSARY))) != MAPI_UNDEFINED) {
-            fprintf(fptr, "X-EVOLUTION-ANNIVERSARY:");
+	    fprintf(fptr, "X-EVOLUTION-ANNIVERSARY:");
 	    MAPISysTimetoDTR ((guchar *) vl->data, &thedate);
-            fprintf(fptr, "%i-%02i-%02i\n", thedate.wYear, thedate.wMonth, thedate.wDay);
+	    fprintf(fptr, "%i-%02i-%02i\n", thedate.wYear, thedate.wMonth, thedate.wDay);
 	}
-        fprintf(fptr, "END:VCARD\n");
+	fprintf(fptr, "END:VCARD\n");
 	fclose (fptr);
     }
     g_free (ifilename);
@@ -815,63 +815,63 @@ void printRrule (FILE *fptr, gchar *recur_data, gint size, TNEFStruct *tnef)
     fprintf(fptr, "RRULE:FREQ=");
 
     if (recur_data[0x04] == 0x0A) {
-        fprintf(fptr, "DAILY");
+	fprintf(fptr, "DAILY");
 
 	if (recur_data[0x16] == 0x23 || recur_data[0x16] == 0x22 ||
 		recur_data[0x16] == 0x21) {
 	    if ((filename = MAPIFindUserProp (&(tnef->MapiProperties),
 		    PROP_TAG (PT_I2, 0x0011))) != MAPI_UNDEFINED) {
-                fprintf(fptr, ";INTERVAL=%d", *(filename->data));
+		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");
+	    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) {
-        fprintf(fptr, "MONTHLY");
+	fprintf(fptr, "MONTHLY");
 	if (recur_data[0x06] == 0x02) {
-            fprintf(fptr, ";INTERVAL=%d;BYMONTHDAY=%d", recur_data[0x0E],
+	    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]);
 	    if (recur_data[0x1E] == 0x22 || recur_data[0x1E] == 0x21) {
-                fprintf(fptr, ";COUNT=%d", getRruleCount(recur_data[0x23],
+		fprintf(fptr, ";COUNT=%d", getRruleCount(recur_data[0x23],
 		    recur_data[0x22]));
 	    }
 	}
     } else if (recur_data[0x04] == 0x0D) {
-        fprintf(fptr, "YEARLY;BYMONTH=%d",
+	fprintf(fptr, "YEARLY;BYMONTH=%d",
 		getRruleMonthNum (recur_data[0x0A], recur_data[0x0B]));
 	if (recur_data[0x06] == 0x02) {
-            fprintf(fptr, ";BYMONTHDAY=%d", recur_data[0x16]);
+	    fprintf(fptr, ";BYMONTHDAY=%d", recur_data[0x16]);
 	} else if (recur_data[0x06] == 0x03) {
-            fprintf(fptr, ";BYDAY=%s;BYSETPOS=%d",
+	    fprintf(fptr, ";BYDAY=%s;BYSETPOS=%d",
 		getRruleDayname (recur_data[0x16]),
 		recur_data[0x1A] == 0x05 ? -1 : recur_data[0x1A]);
 	}
 	if (recur_data[0x1E] == 0x22 || recur_data[0x1E] == 0x21) {
-            fprintf(fptr, ";COUNT=%d", getRruleCount(recur_data[0x23],
+	    fprintf(fptr, ";COUNT=%d", getRruleCount(recur_data[0x23],
 		recur_data[0x22]));
 	}
     }