Index: plugins/exchange-operations/exchange-folder-subscription.c
===================================================================
RCS file: /cvs/gnome/evolution/plugins/exchange-operations/exchange-folder-subscription.c,v
retrieving revision 1.8
diff -u -p -r1.8 exchange-folder-subscription.c
--- plugins/exchange-operations/exchange-folder-subscription.c	3 Feb 2006 10:27:26 -0000	1.8
+++ plugins/exchange-operations/exchange-folder-subscription.c	21 Apr 2006 04:09:05 -0000
@@ -215,6 +215,7 @@ subscribe_to_folder (GtkWidget *dialog, 
 			g_free (folder_name);
 			switch (result) {
 				case EXCHANGE_ACCOUNT_FOLDER_OK:
+					exchange_account_rescan_tree (subscription_info->account);
 					break;
 				case EXCHANGE_ACCOUNT_FOLDER_ALREADY_EXISTS:
 					e_error_run (NULL, ERROR_DOMAIN ":folder-exists-error", NULL);
@@ -265,6 +266,11 @@ create_folder_subscription_dialog (Excha
 	GladeXML *glade_xml;
 	GtkWidget *dialog;
 	SubscriptionInfo *subscription_info;
+	int mode;
+
+	exchange_account_is_offline (account, &mode);
+	if (mode == OFFLINE_MODE)
+		return FALSE;
 
 	subscription_info = g_new0 (SubscriptionInfo, 1);
 	subscription_info->account = account;