diff --git a/src/e-util/e-webdav-browser.c b/src/e-util/e-webdav-browser.c
index 0455ef31b9ae77ac5c8795345f746d553a86c98d..6838e57f3c7f5498f9258075a8ffd19fda368291 100644
--- a/src/e-util/e-webdav-browser.c
+++ b/src/e-util/e-webdav-browser.c
@@ -536,7 +536,10 @@ webdav_browser_update_ui (EWebDAVBrowser *webdav_browser)
 			}
 			if (rd->resource->kind == E_WEBDAV_RESOURCE_KIND_CALENDAR) {
 				icon_name = "x-office-calendar";
-				g_string_prepend (type_info, _("Calendar"));
+				if ((rd->resource->supports & E_WEBDAV_DISCOVER_SUPPORTS_CALENDAR_AUTO_SCHEDULE) != 0)
+					g_string_prepend (type_info, _("Calendar handling meeting invitations"));
+				else
+					g_string_prepend (type_info, _("Calendar"));
 			} else if (rd->resource->kind == E_WEBDAV_RESOURCE_KIND_SCHEDULE_INBOX) {
 				icon_name = "mail-inbox";
 				g_string_prepend (type_info, _("Scheduling Inbox"));
@@ -931,6 +934,9 @@ webdav_browser_gather_href_resources_sync (EWebDAVBrowser *webdav_browser,
 				   there might not be any login errors here, but even if, then bad luck. */
 				if (e_webdav_session_options_sync (session, resource->href, &capabilities, &allows, cancellable, NULL)) {
 					editing_flags = webdav_browser_options_to_editing_flags (capabilities, allows);
+					if (capabilities && g_hash_table_contains (capabilities, E_WEBDAV_CAPABILITY_CALENDAR_AUTO_SCHEDULE))
+						resource->supports |= E_WEBDAV_DISCOVER_SUPPORTS_CALENDAR_AUTO_SCHEDULE;
+
 				}
 
 				if (capabilities)
diff --git a/src/modules/cal-config-caldav/evolution-cal-config-caldav.c b/src/modules/cal-config-caldav/evolution-cal-config-caldav.c
index b678c10634778f9e008fdbca55457dd4cb3c2925..2da62e56542a22b6169eeb678b67d7d57bc57f6f 100644
--- a/src/modules/cal-config-caldav/evolution-cal-config-caldav.c
+++ b/src/modules/cal-config-caldav/evolution-cal-config-caldav.c
@@ -108,7 +108,7 @@ cal_config_caldav_run_dialog (GtkButton *button,
 
 	switch (source_type) {
 	case E_CAL_CLIENT_SOURCE_TYPE_EVENTS:
-		supports_filter = E_WEBDAV_DISCOVER_SUPPORTS_EVENTS;
+		supports_filter = E_WEBDAV_DISCOVER_SUPPORTS_EVENTS | E_WEBDAV_DISCOVER_SUPPORTS_CALENDAR_AUTO_SCHEDULE;
 		title = _("Choose a Calendar");
 		break;
 	case E_CAL_CLIENT_SOURCE_TYPE_MEMOS:
@@ -116,7 +116,7 @@ cal_config_caldav_run_dialog (GtkButton *button,
 		title = _("Choose a Memo List");
 		break;
 	case E_CAL_CLIENT_SOURCE_TYPE_TASKS:
-		supports_filter = E_WEBDAV_DISCOVER_SUPPORTS_TASKS;
+		supports_filter = E_WEBDAV_DISCOVER_SUPPORTS_TASKS | E_WEBDAV_DISCOVER_SUPPORTS_CALENDAR_AUTO_SCHEDULE;
 		title = _("Choose a Task List");
 		break;
 	default: