Index: calendar/gui/dialogs/comp-editor.c
===================================================================
--- calendar/gui/dialogs/comp-editor.c	(revision 36992)
+++ calendar/gui/dialogs/comp-editor.c	(working copy)
@@ -2433,6 +2433,7 @@
 	editor->priv->summary = g_strdup (summary);
 
 	show_warning =
+		!(editor->priv->flags & COMP_EDITOR_DELEGATE) &&
 		!editor->priv->warned &&
 		editor->priv->existing_org &&
 		!editor->priv->user_org;
@@ -2482,6 +2483,7 @@
 
 	show_warning =
 		changed && !editor->priv->warned &&
+		!(editor->priv->flags & COMP_EDITOR_DELEGATE) &&
 		editor->priv->existing_org && !editor->priv->user_org;
 
 	if (show_warning) {