Whitespace cleanup.

26 files changed, 188 insertions, 188 deletions

diff --git a/servers/exchange/lib/e2k-action.h b/servers/exchange/lib/e2k-action.h
index 6011c7f3a..69b425d18 100644
--- a/servers/exchange/lib/e2k-action.h
+++ b/servers/exchange/lib/e2k-action.h
@@ -13,44 +13,44 @@ extern "C" {
 #pragma }
 #endif /* __cplusplus */
 
-gboolean     e2k_actions_extract       (guint8        	    **data,
-					int           	     *len,
-					GPtrArray     	    **actions);
-void         e2k_actions_append        (GByteArray    	     *ba,
-					GPtrArray     	     *actions);
-
-E2kAction   *e2k_action_move           (GByteArray    	     *store_entryid,
-					GByteArray    	     *folder_source_key);
-E2kAction   *e2k_action_copy           (GByteArray    	     *store_entryid,
-					GByteArray    	     *folder_source_key);
-E2kAction   *e2k_action_reply          (GByteArray    	     *template_entryid,
-					guint8    	      template_guid[16]);
-E2kAction   *e2k_action_oof_reply      (GByteArray    	     *template_entryid,
-					guint8    	      template_guid[16]);
+gboolean     e2k_actions_extract       (guint8		    **data,
+					int		     *len,
+					GPtrArray	    **actions);
+void         e2k_actions_append        (GByteArray	     *ba,
+					GPtrArray	     *actions);
+
+E2kAction   *e2k_action_move           (GByteArray	     *store_entryid,
+					GByteArray	     *folder_source_key);
+E2kAction   *e2k_action_copy           (GByteArray	     *store_entryid,
+					GByteArray	     *folder_source_key);
+E2kAction   *e2k_action_reply          (GByteArray	     *template_entryid,
+					guint8	      template_guid[16]);
+E2kAction   *e2k_action_oof_reply      (GByteArray	     *template_entryid,
+					guint8	      template_guid[16]);
 E2kAction   *e2k_action_defer          (GByteArray           *data);
 E2kAction   *e2k_action_bounce         (E2kActionBounceCode   bounce_code);
-E2kAction   *e2k_action_forward        (E2kAddrList    	     *list);
-E2kAction   *e2k_action_delegate       (E2kAddrList    	     *list);
-E2kAction   *e2k_action_tag            (const char     	     *propname,
-					E2kPropType    	      type,
-					gpointer       	      value);
+E2kAction   *e2k_action_forward        (E2kAddrList	     *list);
+E2kAction   *e2k_action_delegate       (E2kAddrList	     *list);
+E2kAction   *e2k_action_tag            (const char	     *propname,
+					E2kPropType	      type,
+					gpointer	      value);
 E2kAction   *e2k_action_delete         (void);
 
-void         e2k_actions_free          (GPtrArray      	     *actions);
+void         e2k_actions_free          (GPtrArray	     *actions);
 void         e2k_action_free           (E2kAction            *act);
 
 
-E2kAddrList *e2k_addr_list_new         (int            	      nentries);
-void         e2k_addr_list_set_local   (E2kAddrList    	     *list,
-					int            	      entry_num,
-					const char     	     *display_name,
-					const char     	     *exchange_dn,
-					const char     	     *email);
-void         e2k_addr_list_set_oneoff  (E2kAddrList    	     *list,
-					int            	      entry_num,
-					const char     	     *display_name,
-					const char     	     *email);
-void         e2k_addr_list_free        (E2kAddrList    	     *list);
+E2kAddrList *e2k_addr_list_new         (int		      nentries);
+void         e2k_addr_list_set_local   (E2kAddrList	     *list,
+					int		      entry_num,
+					const char	     *display_name,
+					const char	     *exchange_dn,
+					const char	     *email);
+void         e2k_addr_list_set_oneoff  (E2kAddrList	     *list,
+					int		      entry_num,
+					const char	     *display_name,
+					const char	     *email);
+void         e2k_addr_list_free        (E2kAddrList	     *list);
 
 #ifdef __cplusplus
 }
diff --git a/servers/exchange/lib/e2k-autoconfig.c b/servers/exchange/lib/e2k-autoconfig.c
index 85a74b976..ead223c83 100644
--- a/servers/exchange/lib/e2k-autoconfig.c
+++ b/servers/exchange/lib/e2k-autoconfig.c
@@ -1576,18 +1576,18 @@ validate (const char *owa_url, char *user, char *password, ExchangeParams *excha
 
 			/* SURF : e_notice (NULL, GTK_MESSAGE_ERROR,
 				  _("Could not connect to the Exchange "
-			    	    "server.\nMake sure the URL is correct "
-			    	    "(try \"%s\" instead of \"%s\"?) "
-			    	    "and try again."), new, old);
+				    "server.\nMake sure the URL is correct "
+				    "(try \"%s\" instead of \"%s\"?) "
+				    "and try again."), new, old);
 			*/
 			valid = FALSE;
 			break;
 
 		case E2K_AUTOCONFIG_CANT_RESOLVE:
 		/* SURF :	e_notice (NULL, GTK_MESSAGE_ERROR,
-			  	_("Could not locate Exchange server.\n"
-			    	  "Make sure the server name is spelled correctly "
-			    	  "and try again."));
+				_("Could not locate Exchange server.\n"
+				  "Make sure the server name is spelled correctly "
+				  "and try again."));
 		*/
 			valid = FALSE;
 			break;
@@ -1596,22 +1596,22 @@ validate (const char *owa_url, char *user, char *password, ExchangeParams *excha
 		case E2K_AUTOCONFIG_AUTH_ERROR_TRY_NTLM:
 		case E2K_AUTOCONFIG_AUTH_ERROR_TRY_BASIC:
 		/* SURF :	e_notice (NULL, GTK_MESSAGE_ERROR,
-			  	_("Could not authenticate to the Exchange "
-			    	  "server.\nMake sure the username and "
-			    	  "password are correct and try again."));
+				_("Could not authenticate to the Exchange "
+				  "server.\nMake sure the username and "
+				  "password are correct and try again."));
 		*/
 			valid = FALSE;
 			break;
 
 		case E2K_AUTOCONFIG_AUTH_ERROR_TRY_DOMAIN:
-		/* SURF : 		e_notice (NULL, GTK_MESSAGE_ERROR,
-			  	_("Could not authenticate to the Exchange "
-			    	  "server.\nMake sure the username and "
-			    	  "password are correct and try again.\n\n"
-			    	  "You may need to specify the Windows "
-			    	  "domain name as part of your username "
-			    	  "(eg, \"MY-DOMAIN\\%s\")."),
-			  	  ac->username);
+		/* SURF :		e_notice (NULL, GTK_MESSAGE_ERROR,
+				_("Could not authenticate to the Exchange "
+				  "server.\nMake sure the username and "
+				  "password are correct and try again.\n\n"
+				  "You may need to specify the Windows "
+				  "domain name as part of your username "
+				  "(eg, \"MY-DOMAIN\\%s\")."),
+				  ac->username);
 		*/
 			valid = FALSE;
 			break;
@@ -1619,8 +1619,8 @@ validate (const char *owa_url, char *user, char *password, ExchangeParams *excha
 		case E2K_AUTOCONFIG_NO_OWA:
 		case E2K_AUTOCONFIG_NOT_EXCHANGE:
 		/* SURF :	e_notice (NULL, GTK_MESSAGE_ERROR,
-			  	_("Could not find OWA data at the indicated URL.\n"
-			    	  "Make sure the URL is correct and try again."));
+				_("Could not find OWA data at the indicated URL.\n"
+				  "Make sure the URL is correct and try again."));
 		*/
 			valid = FALSE;
 			break;
@@ -1629,13 +1629,13 @@ validate (const char *owa_url, char *user, char *password, ExchangeParams *excha
 		/* SURF :	e_notice (
 				NULL, GTK_MESSAGE_ERROR,
 				_("Ximian Connector requires access to certain "
-			  	"functionality on the Exchange Server that appears "
-			  	"to be disabled or blocked.  (This is usually "
-			  	"unintentional.)  Your Exchange Administrator will "
-			  	"need to enable this functionality in order for "
-			  	"you to be able to use Ximian Connector.\n\n"
-			  	"For information to provide to your Exchange "
-			  	"administrator, please follow the link below:\n"
+				"functionality on the Exchange Server that appears "
+				"to be disabled or blocked.  (This is usually "
+				"unintentional.)  Your Exchange Administrator will "
+				"need to enable this functionality in order for "
+				"you to be able to use Ximian Connector.\n\n"
+				"For information to provide to your Exchange "
+				"administrator, please follow the link below:\n"
 				"http://support.novell.com/cgi-bin/search/searchtid.cgi?/ximian/ximian328.html "));
 		*/
 			valid = FALSE;
@@ -1645,17 +1645,17 @@ validate (const char *owa_url, char *user, char *password, ExchangeParams *excha
 		/* SURF :	e_notice (
 				NULL, GTK_MESSAGE_ERROR,
 				_("The Exchange server URL you provided is for an "
-			  	"Exchange 5.5 Server. Ximian Connector supports "
-			  	"Microsoft Exchange 2000 and 2003 only."));
+				"Exchange 5.5 Server. Ximian Connector supports "
+				"Microsoft Exchange 2000 and 2003 only."));
 		*/
 			valid = FALSE;
 			break;
 
 		default:
 		/* SURF :	e_notice (NULL, GTK_MESSAGE_ERROR,
-			  	_("Could not configure Exchange account because "
-			    	  "an unknown error occurred. Check the URL, "
-			    	  "username, and password, and try again."));
+				_("Could not configure Exchange account because "
+				  "an unknown error occurred. Check the URL, "
+				  "username, and password, and try again."));
 		*/
 			valid = FALSE; /* FIXME return valid */
 			break;
diff --git a/servers/exchange/lib/e2k-context.c b/servers/exchange/lib/e2k-context.c
index 0b89552f5..1d9e07cbf 100644
--- a/servers/exchange/lib/e2k-context.c
+++ b/servers/exchange/lib/e2k-context.c
@@ -622,7 +622,7 @@ e2k_context_fba (E2kContext *ctx, SoupMessage *failed_msg)
 		const char *location;
 
 		location = soup_message_headers_get (failed_msg->response_headers,
-		                                     "Location");
+						     "Location");
 		if (location != NULL) {/*Make sure we can get absolute path*/
 			suri = soup_uri_new (location);
 			if (suri != NULL) {/*Valid URI*/
@@ -632,7 +632,7 @@ e2k_context_fba (E2kContext *ctx, SoupMessage *failed_msg)
 				path_end = strrchr (suri->path, '/') + 1;
 				*path_end = '\0';
 				suri->path = g_realloc (suri->path,
-		                                path_end - suri->path + strlen (value) + 1);
+						path_end - suri->path + strlen (value) + 1);
 				strcat (suri->path, value);
 				g_free (suri->query);
 				suri->query = NULL;
diff --git a/servers/exchange/lib/e2k-path.c b/servers/exchange/lib/e2k-path.c
index 9ec1a3024..7a4760050 100644
--- a/servers/exchange/lib/e2k-path.c
+++ b/servers/exchange/lib/e2k-path.c
@@ -98,7 +98,7 @@ e_path_to_physical (const char *prefix, const char *vpath)
 
 	/* Copy the mangled path.  */
 	p = vpath;
- 	while (1) {
+	while (1) {
 		newp = strchr (p, '/');
 		if (newp == NULL) {
 			strcpy (dp, p);
diff --git a/servers/exchange/lib/ebrowse.c b/servers/exchange/lib/ebrowse.c
index 06ddc6a3f..cbdf70713 100644
--- a/servers/exchange/lib/ebrowse.c
+++ b/servers/exchange/lib/ebrowse.c
@@ -639,7 +639,7 @@ usage (void)
 	printf ("       ebrowse -s URI                       (subscribe and listen)\n");
 	printf ("       ebrowse [ -m | -c ] SRC DEST         (move/copy)\n");
 	printf ("       ebrowse -n ALIAS URI                 (lookup name)\n");
-	printf ("       ebrowse -f URI                 	     (lookup favorite folder props)\n");
+	printf ("       ebrowse -f URI			     (lookup favorite folder props)\n");
 	exit (1);
 }
 
diff --git a/servers/exchange/storage/e-folder-exchange.c b/servers/exchange/storage/e-folder-exchange.c
index b7aaa3f5f..856831eea 100644
--- a/servers/exchange/storage/e-folder-exchange.c
+++ b/servers/exchange/storage/e-folder-exchange.c
@@ -190,23 +190,23 @@ e_folder_exchange_new (ExchangeHierarchy *hier, const char *name,
 		if ((strcmp (type, "calendar") == 0) ||
 		    (strcmp (type, "calendar/public") == 0)) {
 			add_folder_esource (hier->account,
-				     	    EXCHANGE_CALENDAR_FOLDER,
-				     	    name,
-				     	    physical_uri);
+					    EXCHANGE_CALENDAR_FOLDER,
+					    name,
+					    physical_uri);
 		}
 		else if ((strcmp (type, "tasks") == 0) ||
 			 (strcmp (type, "tasks/public") == 0)) {
 			add_folder_esource (hier->account,
-				     	    EXCHANGE_TASKS_FOLDER,
-				     	    name,
-				     	    physical_uri);
+					    EXCHANGE_TASKS_FOLDER,
+					    name,
+					    physical_uri);
 		}
 		else if ((strcmp (type, "contacts") == 0) ||
 			 (strcmp (type, "contacts/public") == 0)) {
 			add_folder_esource (hier->account,
-				     	    EXCHANGE_CONTACTS_FOLDER,
-				     	    name,
-				     	    physical_uri);
+					    EXCHANGE_CONTACTS_FOLDER,
+					    name,
+					    physical_uri);
 		}
 	}
 	return ef;
diff --git a/servers/exchange/storage/e-folder-exchange.h b/servers/exchange/storage/e-folder-exchange.h
index 1109f5737..5be257055 100644
--- a/servers/exchange/storage/e-folder-exchange.h
+++ b/servers/exchange/storage/e-folder-exchange.h
@@ -55,8 +55,8 @@ const char *e_folder_exchange_get_permanent_uri    (EFolder    *folder);
 void        e_folder_exchange_set_permanent_uri    (EFolder    *folder,
 						    const char *permanent_uri);
 
-long long int 	e_folder_exchange_get_folder_size (EFolder *folder);
-void 		e_folder_exchange_set_folder_size (EFolder *folder, long long int folder_size);
+long long int	e_folder_exchange_get_folder_size (EFolder *folder);
+void		e_folder_exchange_set_folder_size (EFolder *folder, long long int folder_size);
 
 gboolean    e_folder_exchange_get_has_subfolders   (EFolder    *folder);
 void        e_folder_exchange_set_has_subfolders   (EFolder    *folder,
diff --git a/servers/exchange/storage/e-folder.h b/servers/exchange/storage/e-folder.h
index 63769e909..5be7856fd 100644
--- a/servers/exchange/storage/e-folder.h
+++ b/servers/exchange/storage/e-folder.h
@@ -71,13 +71,13 @@ EFolder *e_folder_new        (const char *name,
 			      const char *type,
 			      const char *description);
 
-const char *e_folder_get_name         	  (EFolder *folder);
-const char *e_folder_get_type_string  	  (EFolder *folder);
-const char *e_folder_get_description  	  (EFolder *folder);
-const char *e_folder_get_physical_uri 	  (EFolder *folder);
-int         e_folder_get_unread_count 	  (EFolder *folder);
-gboolean    e_folder_get_highlighted  	  (EFolder *folder);
-gboolean    e_folder_get_is_stock     	  (EFolder *folder);
+const char *e_folder_get_name		  (EFolder *folder);
+const char *e_folder_get_type_string	  (EFolder *folder);
+const char *e_folder_get_description	  (EFolder *folder);
+const char *e_folder_get_physical_uri	  (EFolder *folder);
+int         e_folder_get_unread_count	  (EFolder *folder);
+gboolean    e_folder_get_highlighted	  (EFolder *folder);
+gboolean    e_folder_get_is_stock	  (EFolder *folder);
 gboolean    e_folder_get_can_sync_offline (EFolder *folder);
 gboolean    e_folder_get_has_subfolders   (EFolder *folder);
 const char *e_folder_get_custom_icon_name (EFolder *folder);
diff --git a/servers/exchange/storage/e-storage.h b/servers/exchange/storage/e-storage.h
index 871b516c0..e9747ff83 100644
--- a/servers/exchange/storage/e-storage.h
+++ b/servers/exchange/storage/e-storage.h
@@ -83,9 +83,9 @@ struct EStorageClass {
 
 	GList      * (* get_subfolder_paths)     (EStorage *storage,
 						  const char *path);
-	EFolder    * (* get_folder)    	         (EStorage *storage,
+	EFolder    * (* get_folder)		 (EStorage *storage,
 						  const char *path);
-	const char * (* get_name)      	         (EStorage *storage);
+	const char * (* get_name)		 (EStorage *storage);
 
 	void         (* async_create_folder)  (EStorage *storage,
 					       const char *path,
@@ -115,17 +115,17 @@ struct EStorageClass {
 					       EFolder *source);
 
 	void         (* async_discover_shared_folder)  (EStorage *storage,
-						        const char *owner,
-						        const char *folder_name,
-						        EStorageDiscoveryCallback callback,
-						        void *data);
+							const char *owner,
+							const char *folder_name,
+							EStorageDiscoveryCallback callback,
+							void *data);
 	void         (* cancel_discover_shared_folder) (EStorage *storage,
 							const char *owner,
 							const char *folder_name);
 	void         (* async_remove_shared_folder)    (EStorage *storage,
-						        const char *path,
-						        EStorageResultCallback callback,
-						        void *data);
+							const char *path,
+							EStorageResultCallback callback,
+							void *data);
 };
 
 GType       e_storage_get_type                (void);
diff --git a/servers/exchange/storage/exchange-account.c b/servers/exchange/storage/exchange-account.c
index dbf963f2a..55191f0cf 100644
--- a/servers/exchange/storage/exchange-account.c
+++ b/servers/exchange/storage/exchange-account.c
@@ -975,9 +975,9 @@ get_password (ExchangeAccount *account, E2kAutoconfig *ac, ExchangeAccountResult
 		}
 		else if (!account->priv->account->source->save_passwd) {
 			/* get_password returns the password cached but user has not
-		 	 * selected remember password option, forget this password
-		 	 * whis is stored temporarily by e2k_validate_user()
-		 	 */
+			 * selected remember password option, forget this password
+			 * whis is stored temporarily by e2k_validate_user()
+			 */
 			e_passwords_forget_password ("Exchange", account->priv->password_key);
 		}
 	}
@@ -986,9 +986,9 @@ get_password (ExchangeAccount *account, E2kAutoconfig *ac, ExchangeAccountResult
 	}
 	else if (!account->priv->account->source->save_passwd) {
 		/* get_password returns the password cached but user has not
-	 	 * selected remember password option, forget this password
-	 	 * whis is stored temporarily by e2k_validate_user()
-	 	 */
+		 * selected remember password option, forget this password
+		 * whis is stored temporarily by e2k_validate_user()
+		 */
 		e_passwords_forget_password ("Exchange", account->priv->password_key);
 	}
 
@@ -2037,7 +2037,7 @@ exchange_account_get_folder_tree (ExchangeAccount *account, char* path)
 	qsort (folders->pdata, folders->len,
 	       sizeof (EFolder *), folder_comparator);
 
- 	g_free (fld_tree);
+	g_free (fld_tree);
 
 	return folders;
 }
diff --git a/servers/exchange/storage/exchange-account.h b/servers/exchange/storage/exchange-account.h
index be060ac75..2e3764c56 100644
--- a/servers/exchange/storage/exchange-account.h
+++ b/servers/exchange/storage/exchange-account.h
@@ -80,7 +80,7 @@ ExchangeAccount       *exchange_account_new                  (EAccountList *acco
 E2kContext            *exchange_account_get_context          (ExchangeAccount  *acct);
 E2kGlobalCatalog      *exchange_account_get_global_catalog   (ExchangeAccount  *acct);
 
-EAccount 	      *exchange_account_fetch 		     (ExchangeAccount *acct);
+EAccount	      *exchange_account_fetch		     (ExchangeAccount *acct);
 char                  *exchange_account_get_account_uri_param (ExchangeAccount *acct, const char *param);
 
 const char            *exchange_account_get_standard_uri     (ExchangeAccount  *acct,
@@ -94,7 +94,7 @@ char                  *exchange_account_get_foreign_uri      (ExchangeAccount  *
 							      const char       *std_uri_prop);
 ExchangeHierarchy     *exchange_account_get_hierarchy_by_email (ExchangeAccount *account, const char *email);
 
-char 		      *exchange_account_get_authtype 	     (ExchangeAccount *account);
+char		      *exchange_account_get_authtype	     (ExchangeAccount *account);
 
 E2kContext            *exchange_account_connect              (ExchangeAccount  *acct,
 							      const char *pword,
@@ -104,20 +104,20 @@ EFolder               *exchange_account_get_folder           (ExchangeAccount  *
 							      const char       *path_or_uri);
 GPtrArray             *exchange_account_get_folders          (ExchangeAccount  *acct);
 
-GPtrArray 	       *exchange_account_get_folder_tree      (ExchangeAccount *account, char* path);
+GPtrArray	       *exchange_account_get_folder_tree      (ExchangeAccount *account, char* path);
 
 ExchangeHierarchy     *exchange_account_get_hierarchy_by_type	      (ExchangeAccount *acct,
 							       ExchangeHierarchyType type);
 
 void                   exchange_account_rescan_tree          (ExchangeAccount  *acct);
 
-char 		      *exchange_account_get_password 	     (ExchangeAccount  *acct);
+char		      *exchange_account_get_password	     (ExchangeAccount  *acct);
 
-ExchangeAccountResult exchange_account_set_password 	     (ExchangeAccount  *acct,
+ExchangeAccountResult exchange_account_set_password	     (ExchangeAccount  *acct,
 							      char             *old_password,
 							      char             *new_password);
 
-void 		       exchange_account_forget_password       (ExchangeAccount  *acct);
+void		       exchange_account_forget_password       (ExchangeAccount  *acct);
 
 void		       exchange_account_set_save_password    (ExchangeAccount *account,
 							      gboolean save_password);
@@ -176,29 +176,29 @@ ExchangeAccountFolderResult exchange_account_remove_favorite (ExchangeAccount *a
 							      EFolder         *folder);
 
 gboolean exchange_account_is_favorite_folder              (ExchangeAccount *account,
-						           EFolder         *folder);
+							   EFolder         *folder);
 
-char * exchange_account_get_username 			  (ExchangeAccount *account);
+char * exchange_account_get_username			  (ExchangeAccount *account);
 
-char * exchange_account_get_windows_domain 		  (ExchangeAccount *account);
+char * exchange_account_get_windows_domain		  (ExchangeAccount *account);
 
-char * exchange_account_get_email_id 			  (ExchangeAccount *account);
+char * exchange_account_get_email_id			  (ExchangeAccount *account);
 
 int exchange_account_get_quota_limit			  (ExchangeAccount *account);
 
 int exchange_account_check_password_expiry		  (ExchangeAccount *account);
 
 /* Folder Size methods */
-void 			exchange_account_folder_size_add   (ExchangeAccount *account,
-	 					     	     const char *folder_name,
-						     	     gdouble size);
-void 			exchange_account_folder_size_remove (ExchangeAccount *account,
-						     	     const char *folder_name);
-void 			exchange_account_folder_size_rename (ExchangeAccount *account,
-						     	     const char *old_name,
-						     	     const char *new_name);
-GtkListStore 	       *exchange_account_folder_size_get_model (ExchangeAccount *account);
-void 		  	exchange_account_scan_foreign_hierarchy (ExchangeAccount *account,
+void			exchange_account_folder_size_add   (ExchangeAccount *account,
+							     const char *folder_name,
+							     gdouble size);
+void			exchange_account_folder_size_remove (ExchangeAccount *account,
+							     const char *folder_name);
+void			exchange_account_folder_size_rename (ExchangeAccount *account,
+							     const char *old_name,
+							     const char *new_name);
+GtkListStore	       *exchange_account_folder_size_get_model (ExchangeAccount *account);
+void			exchange_account_scan_foreign_hierarchy (ExchangeAccount *account,
 							      const char *user_email);
 
 
diff --git a/servers/exchange/storage/exchange-esource.c b/servers/exchange/storage/exchange-esource.c
index bd8b90127..0a560cf79 100644
--- a/servers/exchange/storage/exchange-esource.c
+++ b/servers/exchange/storage/exchange-esource.c
@@ -69,9 +69,9 @@ find_account_group (ESourceList *source_list, ExchangeAccount *exa)
 
 void
 add_folder_esource (ExchangeAccount *account,
-	     	    FolderType folder_type,
-	     	    const char *folder_name,
-	     	    const char *physical_uri)
+		    FolderType folder_type,
+		    const char *folder_name,
+		    const char *physical_uri)
 {
 	ESource *source = NULL;
 	ESourceGroup *source_group = NULL;
@@ -133,7 +133,7 @@ add_folder_esource (ExchangeAccount *account,
 			g_object_unref (source_list);
 			g_object_unref (source_group);
 			g_object_unref (client);
-        		g_free (relative_uri);
+			g_free (relative_uri);
 			g_free (username);
 			if (authtype)
 				g_free (authtype);
@@ -194,7 +194,7 @@ add_folder_esource (ExchangeAccount *account,
 				g_free (browse);
 			}
 			else {
-        			source = e_source_new (folder_name, relative_uri);
+				source = e_source_new (folder_name, relative_uri);
 			}
 
 			if (mode == OFFLINE_MODE)
diff --git a/servers/exchange/storage/exchange-esource.h b/servers/exchange/storage/exchange-esource.h
index c669271bc..53a76813c 100644
--- a/servers/exchange/storage/exchange-esource.h
+++ b/servers/exchange/storage/exchange-esource.h
@@ -19,8 +19,8 @@ extern "C" {
 #define CONF_KEY_CONTACTS "/apps/evolution/addressbook/sources"
 #define EXCHANGE_URI_PREFIX "exchange://"
 
-void 			add_folder_esource (ExchangeAccount *account, FolderType folder_type, const char *folder_name, const char *physical_uri);
-void 			remove_folder_esource (ExchangeAccount *account, FolderType folder_type, const char *physical_uri);
+void			add_folder_esource (ExchangeAccount *account, FolderType folder_type, const char *folder_name, const char *physical_uri);
+void			remove_folder_esource (ExchangeAccount *account, FolderType folder_type, const char *physical_uri);
 
 /* Remove this ugly hack by moving this to exchange-account.h */
 char * exchange_account_get_authtype (ExchangeAccount *account);
diff --git a/servers/exchange/storage/exchange-hierarchy-foreign.c b/servers/exchange/storage/exchange-hierarchy-foreign.c
index 463717660..ce0308a04 100644
--- a/servers/exchange/storage/exchange-hierarchy-foreign.c
+++ b/servers/exchange/storage/exchange-hierarchy-foreign.c
@@ -442,26 +442,26 @@ exchange_hierarchy_foreign_add_folder (ExchangeHierarchy *hier,
 		!(strcmp (folder_type, "calendar/public"))) {
 			folder_mask = EXCHANGE_CALENDAR_FOLDER | FORIEGN_FOLDER_FLAG;
 			add_folder_esource (hier->account,
-				     	    folder_mask,
-				     	    new_folder_name,
-				    	    physical_uri);
+					    folder_mask,
+					    new_folder_name,
+					    physical_uri);
 		}
 		else if (!(strcmp (folder_type, "tasks")) ||
 			 !(strcmp (folder_type, "tasks/public"))) {
 			folder_mask = EXCHANGE_TASKS_FOLDER | FORIEGN_FOLDER_FLAG;
 				add_folder_esource (hier->account,
-				     		    folder_mask,
-				     		    new_folder_name,
-				     		    physical_uri);
+						    folder_mask,
+						    new_folder_name,
+						    physical_uri);
 		}
 		else if (!(strcmp (folder_type, "contacts")) ||
 			 !(strcmp (folder_type, "contacts/public")) ||
 			 !(strcmp (folder_type, "contacts/ldap"))) {
 				folder_mask = EXCHANGE_CONTACTS_FOLDER | FORIEGN_FOLDER_FLAG;
 				add_folder_esource (hier->account,
-				     		    folder_mask,
-				     		    new_folder_name,
-				     		    physical_uri);
+						    folder_mask,
+						    new_folder_name,
+						    physical_uri);
 		}
 		g_free (new_folder_name);
 	}
diff --git a/servers/exchange/storage/exchange-hierarchy-gal.c b/servers/exchange/storage/exchange-hierarchy-gal.c
index 844bbaa6e..f1d381900 100644
--- a/servers/exchange/storage/exchange-hierarchy-gal.c
+++ b/servers/exchange/storage/exchange-hierarchy-gal.c
@@ -61,7 +61,7 @@ exchange_hierarchy_gal_new (ExchangeAccount *account,
 				      NULL, NULL, NULL);
 	/* Add ESource */
 	add_folder_esource (hier->account, EXCHANGE_CONTACTS_FOLDER,
-		     	    hierarchy_name, physical_uri_prefix);
+			    hierarchy_name, physical_uri_prefix);
 
 	g_object_unref (toplevel);
 
diff --git a/servers/exchange/storage/exchange-types.h b/servers/exchange/storage/exchange-types.h
index 892ff801c..c93010066 100644
--- a/servers/exchange/storage/exchange-types.h
+++ b/servers/exchange/storage/exchange-types.h
@@ -49,9 +49,9 @@ typedef struct  XCBackendComponent               XCBackendComponent;
 typedef struct  XCBackendComponentPrivate        XCBackendComponentPrivate;
 typedef struct  XCBackendComponentClass          XCBackendComponentClass;
 
-typedef struct  XCBackendView               	 XCBackendView;
-typedef struct  XCBackendViewPrivate        	 XCBackendViewPrivate;
-typedef struct  XCBackendViewClass          	 XCBackendViewClass;
+typedef struct  XCBackendView		 XCBackendView;
+typedef struct  XCBackendViewPrivate		 XCBackendViewPrivate;
+typedef struct  XCBackendViewClass		 XCBackendViewClass;
 
 typedef enum {
 	EXCHANGE_HIERARCHY_PERSONAL,
diff --git a/servers/google/libgdata-google/gdata-google-service.c b/servers/google/libgdata-google/gdata-google-service.c
index 282badd3d..d4cb8f3f3 100644
--- a/servers/google/libgdata-google/gdata-google-service.c
+++ b/servers/google/libgdata-google/gdata-google-service.c
@@ -312,7 +312,7 @@ gdata_google_service_delete_entry (GDataService *service, GDataEntry *entry, GEr
 	entry_edit_url = gdata_entry_get_edit_link (entry);
 	priv = GDATA_GOOGLE_SERVICE_GET_PRIVATE (GDATA_GOOGLE_SERVICE (service));
 	auth = (GDataGoogleServiceAuth *) priv->auth;
-	soup_session = 	(SoupSession *)priv->soup_session;
+	soup_session =	(SoupSession *)priv->soup_session;
 
 	msg = soup_message_new (SOUP_METHOD_DELETE, entry_edit_url);
 	soup_message_headers_append (msg->request_headers,
@@ -323,7 +323,7 @@ gdata_google_service_delete_entry (GDataService *service, GDataEntry *entry, GEr
 	/* Handle redirects ourself */
 	send_and_handle_google_redirection (soup_session, msg);
 
-    	if (msg->status_code != 200) {
+	if (msg->status_code != 200) {
 		g_set_error (error, SOUP_HTTP_ERROR,
 					 msg->status_code, "%s", msg->reason_phrase);
 	} else {
@@ -407,7 +407,7 @@ gdata_google_service_update_entry_with_link (GDataService *service, GDataEntry *
 	/* Handle redirects ourself */
 	send_and_handle_google_redirection (soup_session, msg);
 
-    	if (msg->status_code != 200) {
+	if (msg->status_code != 200) {
 		g_set_error (error, SOUP_HTTP_ERROR,
 					 msg->status_code, "%s", msg->reason_phrase);
 		g_object_unref (msg);
@@ -701,7 +701,7 @@ gdata_google_service_authenticate (GDataGoogleService *service, GError **error)
 
 	soup_session_send_message (priv->soup_session, msg);
 
-    	if (msg->status_code != 200) {
+	if (msg->status_code != 200) {
 		g_set_error (error, SOUP_HTTP_ERROR,
 					 msg->status_code, "%s", msg->reason_phrase);
 		g_object_unref(msg);
diff --git a/servers/google/libgdata/gdata-entry.c b/servers/google/libgdata/gdata-entry.c
index bc2518218..f2a3a0e0b 100644
--- a/servers/google/libgdata/gdata-entry.c
+++ b/servers/google/libgdata/gdata-entry.c
@@ -44,7 +44,7 @@ struct _GDataEntryPrivate {
 	GSList *attendees;
 	gchar *location;
 	gchar *content;
-    	gchar *title;
+	gchar *title;
 	gchar *reminder;
 	gchar *status;
 	gchar *visibility;
diff --git a/servers/groupwise/e-gw-connection.c b/servers/groupwise/e-gw-connection.c
index 56b767460..4187bb57b 100644
--- a/servers/groupwise/e-gw-connection.c
+++ b/servers/groupwise/e-gw-connection.c
@@ -804,7 +804,7 @@ e_gw_connection_get_container_id (EGwConnection *cnc, const char *name)
 
         status = e_gw_connection_get_container_list (cnc, "folders", &container_list);
 	if (status == E_GW_CONNECTION_STATUS_INVALID_CONNECTION)
-        	status = e_gw_connection_get_container_list (cnc, "folders", &container_list);
+		status = e_gw_connection_get_container_list (cnc, "folders", &container_list);
 	if (status != E_GW_CONNECTION_STATUS_OK) {
 		e_gw_connection_free_container_list (container_list);
                 return NULL;
@@ -972,7 +972,7 @@ e_gw_connection_get_items_delta (EGwConnection *cnc, const char *container, cons
 	if (view)
 		e_gw_message_write_string_parameter (msg, "view", NULL, view);
 
-      	soup_soap_message_start_element (msg, "deltaInfo", NULL, NULL);
+	soup_soap_message_start_element (msg, "deltaInfo", NULL, NULL);
 	e_gw_message_write_string_parameter (msg, "firstSequence", NULL, start_sequence);
 	e_gw_message_write_string_parameter (msg, "count", NULL, count);
 	soup_soap_message_end_element(msg);
@@ -1122,7 +1122,7 @@ e_gw_connection_get_items_from_ids (EGwConnection *cnc, const char *container, c
 	e_gw_message_write_string_parameter (msg, "container", NULL, container);
 	if (view)
 		e_gw_message_write_string_parameter (msg, "view", NULL, view);
-      	soup_soap_message_start_element (msg, "items", NULL, NULL);
+	soup_soap_message_start_element (msg, "items", NULL, NULL);
 	for (i = 0; i < item_ids->len; i ++) {
 		char *id = g_ptr_array_index (item_ids, i);
 		e_gw_message_write_string_parameter (msg, "item", NULL, id);
@@ -1176,15 +1176,15 @@ e_gw_connection_get_items_from_ids (EGwConnection *cnc, const char *container, c
 EGwConnectionStatus
 e_gw_connection_get_deltas ( EGwConnection *cnc, GSList **adds, GSList **deletes, GSList **updates)
 {
- 	SoupSoapMessage *msg;
+	SoupSoapMessage *msg;
         SoupSoapResponse *response;
         EGwConnectionStatus status;
         SoupSoapParameter *param, *subparam;
 	char *tmp;
 
- 	g_return_val_if_fail (E_IS_GW_CONNECTION (cnc), E_GW_CONNECTION_STATUS_INVALID_OBJECT);
+	g_return_val_if_fail (E_IS_GW_CONNECTION (cnc), E_GW_CONNECTION_STATUS_INVALID_OBJECT);
 
- 	/* build the SOAP message */
+	/* build the SOAP message */
          msg = e_gw_message_new_with_header (cnc->priv->uri, cnc->priv->session_id, "getDeltaRequest");
          if (!msg) {
                  g_warning (G_STRLOC ": Could not build SOAP message");
@@ -1207,14 +1207,14 @@ e_gw_connection_get_deltas ( EGwConnection *cnc, GSList **adds, GSList **deletes
 
          status = e_gw_connection_parse_response_status (response);
          if (status != E_GW_CONNECTION_STATUS_OK) {
- 		g_object_unref (response);
+		g_object_unref (response);
 		g_object_unref (msg);
 		/* g_object_unref (cnc); */
- 		return status;
- 	}
+		return status;
+	}
 
- 	/* if status is OK - parse result. return the list */
- 	param = soup_soap_response_get_first_parameter_by_name (response, "changed");
+	/* if status is OK - parse result. return the list */
+	param = soup_soap_response_get_first_parameter_by_name (response, "changed");
          if (!param) {
                  g_object_unref (response);
                  g_object_unref (msg);
@@ -1280,7 +1280,7 @@ e_gw_connection_get_deltas ( EGwConnection *cnc, GSList **adds, GSList **deletes
                                          g_object_unref (response);
                                          g_object_unref (msg);
 					/* g_object_unref (cnc); */
- 					return E_GW_CONNECTION_STATUS_INVALID_RESPONSE;
+					return E_GW_CONNECTION_STATUS_INVALID_RESPONSE;
                                  }
                                  /*if (!e_cal_backend_cache_put_component (cache, comp))
                                          g_message ("Could not add the component"); */
@@ -1292,8 +1292,8 @@ e_gw_connection_get_deltas ( EGwConnection *cnc, GSList **adds, GSList **deletes
          param = soup_soap_parameter_get_first_child_by_name (param, "update");
          if (param) {
                  for (subparam = soup_soap_parameter_get_first_child_by_name(param, "item");
- 		     subparam != NULL;
- 		     subparam = soup_soap_parameter_get_next_child (subparam)) {
+		     subparam != NULL;
+		     subparam = soup_soap_parameter_get_next_child (subparam)) {
 			 EGwItem *item;
 			 /*process each item */
 			 /*item = get_item_from_updates (subparam);*/
@@ -1504,7 +1504,7 @@ e_gw_connection_get_item (EGwConnection *cnc, const char *container, const char
                 return E_GW_CONNECTION_STATUS_INVALID_RESPONSE;
         }
 
-       	*item = e_gw_item_new_from_soap_parameter (cnc->priv->user_email, container, param);
+	*item = e_gw_item_new_from_soap_parameter (cnc->priv->user_email, container, param);
 
 	/* free memory */
         g_object_unref (response);
@@ -1942,7 +1942,7 @@ e_gw_connection_get_address_book_list (EGwConnection *cnc, GList **container_lis
                 return E_GW_CONNECTION_STATUS_UNKNOWN;
         }
 
-       	e_gw_message_write_footer (msg);
+	e_gw_message_write_footer (msg);
 
         /* send message to server */
 	response = e_gw_connection_send_message (cnc, msg);
@@ -1989,7 +1989,7 @@ e_gw_connection_get_address_book_list (EGwConnection *cnc, GList **container_lis
 					e_gw_container_set_is_writable (container, FALSE);
 				g_free (value);
 				value = NULL;
-			        type_param = soup_soap_parameter_get_first_child_by_name (subparam, "isFrequentContacts");
+				type_param = soup_soap_parameter_get_first_child_by_name (subparam, "isFrequentContacts");
 				if (type_param)
                                         value = soup_soap_parameter_get_string_value (type_param);
                                 if (value && g_str_equal(value , "1"))
@@ -2064,7 +2064,7 @@ e_gw_connection_modify_settings (EGwConnection *cnc, EGwSendOptions *opts)
 		return E_GW_CONNECTION_STATUS_INVALID_OBJECT;
 	}
 
-       	e_gw_message_write_footer (msg);
+	e_gw_message_write_footer (msg);
 
         /* send message to server */
         response = e_gw_connection_send_message (cnc, msg);
@@ -2074,7 +2074,7 @@ e_gw_connection_modify_settings (EGwConnection *cnc, EGwSendOptions *opts)
         }
 
 	status = e_gw_connection_parse_response_status (response);
-       	if (status != E_GW_CONNECTION_STATUS_OK) {
+	if (status != E_GW_CONNECTION_STATUS_OK) {
 		if (status == E_GW_CONNECTION_STATUS_INVALID_CONNECTION)
 			reauthenticate (cnc);
 		g_object_unref (response);
@@ -2123,7 +2123,7 @@ e_gw_connection_get_settings (EGwConnection *cnc, EGwSendOptions **opts)
 		g_static_mutex_unlock (&connecting);
                 return E_GW_CONNECTION_STATUS_UNKNOWN;
         }
-       	e_gw_message_write_footer (msg);
+	e_gw_message_write_footer (msg);
 
         /* send message to server */
         response = e_gw_connection_send_message (cnc, msg);
@@ -2191,7 +2191,7 @@ e_gw_connection_get_categories (EGwConnection *cnc, GHashTable **categories_by_i
 		g_static_mutex_unlock (&connecting);
                 return E_GW_CONNECTION_STATUS_UNKNOWN;
         }
-       	e_gw_message_write_footer (msg);
+	e_gw_message_write_footer (msg);
 
         /* send message to server */
         response = e_gw_connection_send_message (cnc, msg);
@@ -2599,10 +2599,10 @@ EGwConnectionStatus e_gw_connection_get_quick_messages (EGwConnection *cnc, cons
 			view_is_id = TRUE;
 		/* We are  interested only in getting the ids */
 		for (subparam = soup_soap_parameter_get_first_child_by_name (param, "item");
-	     	     subparam != NULL;
-	             subparam = soup_soap_parameter_get_next_child_by_name (subparam, "item")) {
+		     subparam != NULL;
+		     subparam = soup_soap_parameter_get_next_child_by_name (subparam, "item")) {
 			SoupSoapParameter *param_id;
-		     	char *id;
+			char *id;
 
 			if (view_is_id) {
 				param_id = soup_soap_parameter_get_first_child_by_name (subparam, "id");
@@ -3942,7 +3942,7 @@ e_gw_connection_get_proxy_access_list (EGwConnection *cnc, GList **proxy_list)
 	if (!param) {
 		g_object_unref (response);
 		return status;
-	} else 	{
+	} else	{
 		e_gw_proxy_construct_proxy_access_list (param, proxy_list);
 	}
 	/* free memory */
diff --git a/servers/groupwise/e-gw-connection.h b/servers/groupwise/e-gw-connection.h
index c9ef3b07a..18a8f612c 100644
--- a/servers/groupwise/e-gw-connection.h
+++ b/servers/groupwise/e-gw-connection.h
@@ -120,7 +120,7 @@ const char         *e_gw_connection_get_session_id (EGwConnection *cnc);
 const char         *e_gw_connection_get_user_name (EGwConnection *cnc);
 const char         *e_gw_connection_get_user_email (EGwConnection *cnc);
 const char         *e_gw_connection_get_user_uuid (EGwConnection *cnc);
-const char 	   *e_gw_connection_get_version (EGwConnection *cnc);
+const char	   *e_gw_connection_get_version (EGwConnection *cnc);
 const char	   *e_gw_connection_get_server_time (EGwConnection *cnc) ;
 
 
diff --git a/servers/groupwise/e-gw-container.c b/servers/groupwise/e-gw-container.c
index 7960a5310..8d8b9c62c 100644
--- a/servers/groupwise/e-gw-container.c
+++ b/servers/groupwise/e-gw-container.c
@@ -736,7 +736,7 @@ e_gw_container_form_message (SoupSoapMessage *msg, gchar *id, GList *new_list, c
 		soup_soap_message_end_element (msg);
 		soup_soap_message_end_element (msg);
 
-	} else 	if (flag == 1) {
+	} else	if (flag == 1) {
 		soup_soap_message_start_element (msg, "delete", NULL, NULL);
 		soup_soap_message_start_element (msg, "acl", NULL, NULL);
 
diff --git a/servers/groupwise/e-gw-container.h b/servers/groupwise/e-gw-container.h
index c9f1db9ac..9cfebcc16 100644
--- a/servers/groupwise/e-gw-container.h
+++ b/servers/groupwise/e-gw-container.h
@@ -80,7 +80,7 @@ void          e_gw_container_set_name (EGwContainer *container, const char *new_
 const char   *e_gw_container_get_id (EGwContainer *container);
 void          e_gw_container_set_id (EGwContainer *container, const char *new_id);
 const char   *e_gw_container_get_parent_id (EGwContainer *container) ;
-void 	      e_gw_container_set_parent_id (EGwContainer *container, const char *parent_id) ;
+void	      e_gw_container_set_parent_id (EGwContainer *container, const char *parent_id) ;
 guint32       e_gw_container_get_total_count (EGwContainer *container) ;
 guint32       e_gw_container_get_unread_count (EGwContainer *container) ;
 gboolean      e_gw_container_get_is_writable (EGwContainer *container);
@@ -93,9 +93,9 @@ const char *  e_gw_container_get_modified(EGwContainer *container);
 int           e_gw_container_get_sequence(EGwContainer *container);
 gboolean      e_gw_container_get_is_shared_by_me(EGwContainer *container);
 gboolean      e_gw_container_get_is_shared_to_me(EGwContainer *container);
-int 	      e_gw_container_get_rights(EGwContainer *container, gchar *email);
+int	      e_gw_container_get_rights(EGwContainer *container, gchar *email);
 EGwContainerType e_gw_container_get_container_type (EGwContainer *container) ;
-void 	      e_gw_container_get_user_list(EGwContainer *container, GList **user_list);
+void	      e_gw_container_get_user_list(EGwContainer *container, GList **user_list);
 void	      e_gw_container_form_message (SoupSoapMessage *msg, gchar *id, GList *new_list, const char *sub, const char *mesg, int flag);
 gboolean e_gw_container_get_is_system_folder (EGwContainer *container);
 void e_gw_container_set_is_system_folder (EGwContainer *container, gboolean is_system_folder);
diff --git a/servers/groupwise/e-gw-filter.c b/servers/groupwise/e-gw-filter.c
index 88bbc40b9..efa93d6ec 100644
--- a/servers/groupwise/e-gw-filter.c
+++ b/servers/groupwise/e-gw-filter.c
@@ -90,7 +90,7 @@ append_child_component (FilterComponent* filter_component, SoupSoapMessage *msg)
 
 	switch (filter_component->operation) {
 
-	        case E_GW_FILTER_OP_EQUAL :
+		case E_GW_FILTER_OP_EQUAL :
 			operation_name = "eq";
 			break;
 		case E_GW_FILTER_OP_NOTEQUAL :
diff --git a/servers/groupwise/e-gw-item.c b/servers/groupwise/e-gw-item.c
index b42e8ecfb..a8395e2a6 100644
--- a/servers/groupwise/e-gw-item.c
+++ b/servers/groupwise/e-gw-item.c
@@ -670,11 +670,11 @@ set_recipient_list_from_soap_parameter (EGwItem *item, SoupSoapParameter *param)
 		 to none. */
 		subparam = soup_soap_parameter_get_first_child_by_name (param_recipient, "recipientStatus");
                 if (subparam) {
-       			char *formatted_date, *value;
+			char *formatted_date, *value;
 			SoupSoapParameter *temp_param ;
 
 			recipient->status_enabled = TRUE;
-       			if ( (temp_param = soup_soap_parameter_get_first_child_by_name (subparam, "deleted")) ) {
+			if ( (temp_param = soup_soap_parameter_get_first_child_by_name (subparam, "deleted")) ) {
 				recipient->status = E_GW_ITEM_STAT_DELETED;
 				value = soup_soap_parameter_get_string_value (temp_param);
 				formatted_date = e_gw_connection_format_date_string (value);
@@ -756,7 +756,7 @@ get_notification_value (SoupSoapParameter *param, const char *param_name)
 			value = soup_soap_parameter_get_string_value (subparam);
 		if (value && !g_ascii_strcasecmp (value, "1")) {
 			g_free (value), value = NULL;
-	 		return E_GW_ITEM_NOTIFY_MAIL;
+			return E_GW_ITEM_NOTIFY_MAIL;
 		}
 		g_free (value), value = NULL;
 	}
@@ -811,7 +811,7 @@ set_sendoptions_from_soap_parameter (EGwItem *item, SoupSoapParameter *param)
 
 		       value = soup_soap_parameter_get_property (subparam, "autoDelete");
 		       if (value && !g_ascii_strcasecmp (value, "1"))
-		      		priv->autodelete = TRUE;
+				priv->autodelete = TRUE;
 		       g_free (value), value = NULL;
 	       }
 	}
@@ -1428,7 +1428,7 @@ set_organization_fields_from_soap_parameter (EGwItem *item, SoupSoapParameter *p
 
 	}
 
-       	subparam = soup_soap_parameter_get_first_child_by_name (param, "website");
+	subparam = soup_soap_parameter_get_first_child_by_name (param, "website");
 	if(subparam) {
 		value = soup_soap_parameter_get_string_value (subparam);
 		if(value)
@@ -1494,7 +1494,7 @@ append_full_name_to_soap_message (FullName *full_name, char *display_name, SoupS
 		e_gw_message_write_string_parameter (msg, "namePrefix", NULL, full_name->name_prefix);
 	if (full_name->first_name)
 		e_gw_message_write_string_parameter (msg, "firstName", NULL, full_name->first_name);
-       	if (full_name->middle_name)
+	if (full_name->middle_name)
 		e_gw_message_write_string_parameter (msg, "middleName", NULL, full_name->middle_name);
 	if (full_name->last_name)
 		e_gw_message_write_string_parameter (msg, "lastName", NULL, full_name->last_name) ;
diff --git a/servers/groupwise/e-gw-item.h b/servers/groupwise/e-gw-item.h
index 2c91cf272..3e610e2a1 100644
--- a/servers/groupwise/e-gw-item.h
+++ b/servers/groupwise/e-gw-item.h
@@ -209,7 +209,7 @@ GList*      e_gw_item_get_im_list (EGwItem *item);
 void        e_gw_item_set_im_list (EGwItem *item, GList *im_list);
 void        e_gw_item_set_categories (EGwItem *item, GList *category_list);
 GList*      e_gw_item_get_categories (EGwItem *item);
-void 	    e_gw_item_set_to (EGwItem *item, const char *to) ;
+void	    e_gw_item_set_to (EGwItem *item, const char *to) ;
 const char* e_gw_item_get_to (EGwItem *item) ;
 const char *e_gw_item_get_msg_content_type (EGwItem *item) ;
 guint32     e_gw_item_get_item_status (EGwItem *item);
diff --git a/servers/groupwise/e-gw-sendoptions.c b/servers/groupwise/e-gw-sendoptions.c
index 572ea64fb..fe76d50e2 100644
--- a/servers/groupwise/e-gw-sendoptions.c
+++ b/servers/groupwise/e-gw-sendoptions.c
@@ -316,7 +316,7 @@ parse_general_options (SoupSoapParameter *group_param, EGwSendOptionsGeneral *go
 		       if (val_param)
 				val = soup_soap_parameter_get_string_value (val_param);
 
-	       		if (val) {
+			if (val) {
 				if (!g_ascii_strcasecmp (val, "None"))
 					gopts->reply_enabled = FALSE;
 				else if (!g_ascii_strcasecmp (val, "WhenConvenient")) {
@@ -413,7 +413,7 @@ e_gw_sendoptions_store_settings (SoupSoapParameter *param, EGwSendOptions *opts)
 
 		temp = soup_soap_parameter_get_property (group_param, "type");
 
-	        if (!temp)
+		if (!temp)
 			continue;
 
 		if (!g_ascii_strcasecmp (temp, "MailMessageSettings")) {
@@ -421,13 +421,13 @@ e_gw_sendoptions_store_settings (SoupSoapParameter *param, EGwSendOptions *opts)
 			parse_general_options (group_param, priv->gopts);
 		}
 
-	        if (!g_ascii_strcasecmp (temp, "AppointmentMessageSettings")) {
+		if (!g_ascii_strcasecmp (temp, "AppointmentMessageSettings")) {
 			parse_status_tracking_options (group_param, 11, priv->copts);
 		}
-	        if (!g_ascii_strcasecmp (temp, "TaskMessageSettings"))
+		if (!g_ascii_strcasecmp (temp, "TaskMessageSettings"))
 			parse_status_tracking_options (group_param, 4, priv->topts);
 
-	        if (!g_ascii_strcasecmp (temp, "AdvancedSettings"))
+		if (!g_ascii_strcasecmp (temp, "AdvancedSettings"))
 			parse_advanced_settings (group_param, priv->gopts);
 
 		g_free (temp);