diff --git a/calendar/gui/itip-utils.c b/calendar/gui/itip-utils.c
index 30ad982..a7c849e 100644
--- a/calendar/gui/itip-utils.c
+++ b/calendar/gui/itip-utils.c
@@ -40,6 +40,11 @@
 #include <mail/em-composer-utils.h>
 #include <camel/camel-mime-filter-tohtml.h>
 
+#include "e-comp-editor-registry.h"
+#include "dialogs/event-editor.h"
+#include "dialogs/task-editor.h"
+#include "dialogs/memo-editor.h"
+
 static const gchar *itip_methods[] = {
 	"PUBLISH",
 	"REQUEST",
@@ -1723,3 +1728,119 @@ is_icalcomp_valid (icalcomponent *icalcomp)
 		check_time (icalcomponent_get_dtstart (icalcomp), FALSE) &&
 		check_time (icalcomponent_get_dtend (icalcomp), TRUE);
 }
+
+extern ECompEditorRegistry *comp_editor_registry;
+
+/**
+ * open_component_editor:
+ * @client: Already opened #ECal, where to store the component
+ * @comp: #ECalComponent component to be stored
+ * @error: #GError for possible error reporting
+ *
+ * Opens component editor for the event stored in the comp component.
+ * If such component exists in the client already (with the same UID),
+ * then there's opened already stored event, instead of the comp.
+ *
+ * It blocks until finished and should be called in the main thread.
+ **/
+void
+open_component_editor (ECal *client, ECalComponent *comp, GError **error)
+{
+	ECalComponentId *id;
+	icalcomponent *icalcomp = NULL;
+	GError *err = NULL;
+	ECalComponent *edit_comp = NULL;
+
+	g_return_if_fail (client != NULL);
+	g_return_if_fail (comp != NULL);
+
+	id = e_cal_component_get_id (comp);
+	g_return_if_fail (id != NULL);
+	g_return_if_fail (id->uid != NULL);
+
+	if (!e_cal_get_object (client, id->uid, id->rid, &icalcomp, &err)) {
+		if (err && g_error_matches (err, E_CALENDAR_ERROR, E_CALENDAR_STATUS_OBJECT_NOT_FOUND)) {
+			/* create new object */
+			edit_comp = g_object_ref (comp);
+		} else {
+			g_propagate_error (error, err);
+		}
+	} else {
+		ECalComponent *old = e_cal_component_new ();
+
+		if (!e_cal_component_set_icalcomponent (old, icalcomp)) {
+			if (error)
+				*error = g_error_new (E_CALENDAR_ERROR, E_CALENDAR_STATUS_INVALID_OBJECT, "%s", _("Invalid object returned from a server"));
+
+			if (icalcomp)
+				icalcomponent_free (icalcomp);
+
+			g_object_unref (old);
+		} else {
+			edit_comp = old;
+		}
+	}
+
+	if (edit_comp != NULL) {
+		CompEditorFlags flags = 0;
+		CompEditor *editor = NULL;
+
+		if (edit_comp == comp) {
+			flags |= COMP_EDITOR_NEW_ITEM;
+		} else {
+			editor = e_comp_editor_registry_find (comp_editor_registry, id->uid);
+		}
+
+		if (!editor) {
+			if (itip_organizer_is_user (edit_comp, client))
+				flags |= COMP_EDITOR_USER_ORG;
+
+			switch (e_cal_component_get_vtype (edit_comp)) {
+			case E_CAL_COMPONENT_EVENT:
+				if (e_cal_component_has_attendees (edit_comp))
+					flags |= COMP_EDITOR_MEETING;
+
+				editor = event_editor_new (client, flags);
+
+				if (flags & COMP_EDITOR_MEETING)
+					event_editor_show_meeting (EVENT_EDITOR (editor));
+				break;
+			case E_CAL_COMPONENT_TODO:
+				if (e_cal_component_has_attendees (edit_comp))
+					flags |= COMP_EDITOR_IS_ASSIGNED;
+
+				editor = task_editor_new (client, flags);
+
+				if (flags & COMP_EDITOR_IS_ASSIGNED)
+					task_editor_show_assignment (TASK_EDITOR (editor));
+				break;
+			case E_CAL_COMPONENT_JOURNAL:
+				if (e_cal_component_has_organizer (edit_comp))
+					flags |= COMP_EDITOR_IS_SHARED;
+
+				editor = memo_editor_new (client, flags);
+				break;
+			default:
+				if (error)
+					*error = g_error_new (E_CALENDAR_ERROR, E_CALENDAR_STATUS_INVALID_OBJECT, "%s", _("Invalid object"));
+				break;
+			}
+
+			if (editor) {
+				comp_editor_edit_comp (editor, edit_comp);
+
+				/* request save for new events */
+				comp_editor_set_changed (editor, edit_comp == comp);
+
+				e_comp_editor_registry_add (comp_editor_registry, editor, TRUE);
+			}
+		}
+
+		if (editor)
+			gtk_window_present (GTK_WINDOW (editor));
+
+		g_object_unref (edit_comp);
+	}
+
+	e_cal_component_free_id (id);
+}
diff --git a/calendar/gui/itip-utils.h b/calendar/gui/itip-utils.h
index 9c8ffa1..e9dcc3e 100644
--- a/calendar/gui/itip-utils.h
+++ b/calendar/gui/itip-utils.h
@@ -72,4 +72,6 @@ gboolean reply_to_calendar_comp (ECalComponentItipMethod method, ECalComponent *
 
 gboolean is_icalcomp_valid (icalcomponent *icalcomp);
 
+void open_component_editor (ECal *client, ECalComponent *comp, GError **error);
+
 #endif
diff --git a/plugins/mail-to-task/mail-to-task.c b/plugins/mail-to-task/mail-to-task.c
index 44a7d8b..5844688 100644
--- a/plugins/mail-to-task/mail-to-task.c
+++ b/plugins/mail-to-task/mail-to-task.c
@@ -52,6 +52,7 @@
 #include "e-util/e-dialog-utils.h"
 #include <gtkhtml/gtkhtml.h>
 #include <calendar/common/authentication.h>
+#include <calendar/gui/itip-utils.h>
 
 static char *
 clean_name(const unsigned char *s)
@@ -321,6 +322,209 @@ report_error_idle (const char *format, const char *param)
 	g_idle_add ((GSourceFunc)do_report_error, err);
 }
 
+struct _manage_comp
+{
+	ECal *client;
+	ECalComponent *comp;
+	icalcomponent *stored_comp; /* the one in client already */
+};
+
+static void
+free_manage_comp_struct (struct _manage_comp *mc)
+{
+	g_return_if_fail (mc != NULL);
+
+	g_object_unref (mc->comp);
+	g_object_unref (mc->client);
+	if (mc->stored_comp)
+		icalcomponent_free (mc->stored_comp);
+	g_free (mc);
+}
+
+static gint
+do_ask (const char *text)
+{
+	gint res;
+	GtkWidget *dialog = gtk_message_dialog_new (NULL,
+		GTK_DIALOG_MODAL, 
+		GTK_MESSAGE_QUESTION,
+		GTK_BUTTONS_YES_NO,
+		"%s", text);
+
+	res = gtk_dialog_run (GTK_DIALOG (dialog));
+
+	gtk_widget_destroy (dialog);
+
+	return res;
+}
+
+static gboolean
+do_manage_comp_idle (GSList *manage_comp_datas)
+{
+	GError *error = NULL;
+	guint with_old = 0;
+	gboolean need_editor = FALSE;
+	ECalSourceType source_type = E_CAL_SOURCE_TYPE_LAST;
+	GSList *l;
+
+	g_return_val_if_fail (manage_comp_datas != NULL, FALSE);
+
+	if (manage_comp_datas->data) {
+		struct _manage_comp *mc = manage_comp_datas->data;
+
+		if (mc->comp && (e_cal_component_has_attendees (mc->comp) || e_cal_component_has_organizer (mc->comp)))
+			need_editor = TRUE;
+
+		source_type = e_cal_get_source_type (mc->client);
+	}
+
+	if (source_type == E_CAL_SOURCE_TYPE_LAST) {
+		g_slist_foreach (manage_comp_datas, (GFunc) free_manage_comp_struct, NULL);
+		g_slist_free (manage_comp_datas);
+
+		g_warning ("mail-to-task: Incorrect call of %s, no data given", G_STRFUNC);
+		return FALSE;
+	}
+
+	for (l = manage_comp_datas; l; l = l->next) {
+		struct _manage_comp *mc = l->data;
+
+		if (mc && mc->stored_comp)
+			with_old++;
+	}
+
+	if (need_editor) {
+		for (l = manage_comp_datas; l && !error; l = l->next) {
+			ECalComponent *edit_comp = NULL;
+			struct _manage_comp *mc = l->data;
+
+			if (!mc)
+				continue;
+
+			if (mc->stored_comp) {
+				const char *ask = NULL;
+
+				switch (source_type) {
+				case E_CAL_SOURCE_TYPE_EVENT:
+					ask = _("Selected calendar contains event '%s' already. Would you like to edit the old event?");
+					break;
+				case E_CAL_SOURCE_TYPE_TODO:
+					ask = _("Selected calendar contains task '%s' already. Would you like to edit the old task?");
+					break;
+				case E_CAL_SOURCE_TYPE_JOURNAL:
+					ask = _("Selected calendar contains memo '%s' already. Would you like to edit the old memo?");
+					break;
+				default:
+					g_assert_not_reached ();
+					break;
+				}
+
+				if (ask) {
+					char *msg = g_strdup_printf (ask, icalcomponent_get_summary (mc->stored_comp) ? icalcomponent_get_summary (mc->stored_comp) : _("[No Summary]"));
+
+					if (do_ask (msg) == GTK_RESPONSE_YES) {
+						edit_comp = e_cal_component_new ();
+						if (!e_cal_component_set_icalcomponent (edit_comp, icalcomponent_new_clone (mc->stored_comp))) {
+							g_object_unref (edit_comp);
+							edit_comp = NULL;
+
+							error = g_error_new (E_CALENDAR_ERROR, E_CALENDAR_STATUS_INVALID_OBJECT, "%s", _("Invalid object returned from a server"));
+						}
+					}
+				}
+			} else {
+				edit_comp = mc->comp;
+			}
+
+			if (edit_comp) {
+				open_component_editor (mc->client, edit_comp, &error);
+				if (edit_comp != mc->comp)
+					g_object_unref (edit_comp);
+			}
+		}
+	} else {
+		gboolean can = TRUE;
+
+		if (with_old > 0) {
+			const char *ask = NULL;
+
+			can = FALSE;
+			
+			if (with_old == g_slist_length (manage_comp_datas)) {
+				switch (source_type) {
+				case E_CAL_SOURCE_TYPE_EVENT:
+					ask = ngettext (
+						"Selected calendar contains an event for the given mail already. Would you like to create new event anyway?",
+						"Selected calendar contains events for the given mails already. Would you like to create new events anyway?",
+						with_old);
+					break;
+				case E_CAL_SOURCE_TYPE_TODO:
+					ask = ngettext (
+						"Selected calendar contains a task for the given mail already. Would you like to create new task anyway?",
+						"Selected calendar contains tasks for the given mails already. Would you like to create new tasks anyway?",
+						with_old);
+					break;
+				case E_CAL_SOURCE_TYPE_JOURNAL:
+					ask = ngettext (
+						"Selected calendar contains a memo for the given mail already. Would you like to create new memo anyway?",
+						"Selected calendar contains memos for the given mails already. Would you like to create new memos anyway?",
+						with_old);
+					break;
+				default:
+					g_assert_not_reached ();
+					break;
+				}
+			} else {
+				switch (source_type) {
+				case E_CAL_SOURCE_TYPE_EVENT:
+					ask = _("Selected calendar contains some events for the given mails already. Would you like to create new events anyway?");
+					break;
+				case E_CAL_SOURCE_TYPE_TODO:
+					ask = _("Selected calendar contains some tasks for the given mails already. Would you like to create new tasks anyway?");
+					break;
+				case E_CAL_SOURCE_TYPE_JOURNAL:
+					ask = _("Selected calendar contains some memos for the given mails already. Would you like to create new memos anyway?");
+					break;
+				default:
+					g_assert_not_reached ();
+					break;
+				}
+			}
+
+			if (ask)
+				can = do_ask (ask) == GTK_RESPONSE_YES;
+		}
+
+		if (can) {
+			for (l = manage_comp_datas; l && !error; l = l->next) {
+				struct _manage_comp *mc = l->data;
+
+				if (!mc)
+					continue;
+
+				if (mc->stored_comp) {
+					char *uid = e_cal_component_gen_uid ();
+
+					e_cal_component_set_uid (mc->comp, uid);
+					g_free (uid);
+				}
+
+				e_cal_create_object (mc->client, e_cal_component_get_icalcomponent (mc->comp), NULL, &error);
+			}
+		}
+	}
+
+	if (error) {
+		e_notice (NULL, GTK_MESSAGE_ERROR, _("An error occurred during processing: %s"), error->message);
+		g_error_free (error);
+	}
+
+	g_slist_foreach (manage_comp_datas, (GFunc) free_manage_comp_struct, NULL);
+	g_slist_free (manage_comp_datas);
+
+	return FALSE;
+}
+
 typedef struct {
 	ECal *client;
 	struct _CamelFolder *folder;
@@ -361,6 +565,7 @@ do_mail_to_event (AsyncData *data)
 			}
 		}
 	} else {
+		GSList *mcs = NULL;
 		int i;
 		ECalSourceType source_type = e_cal_get_source_type (client);
 		ECalComponentDateTime dt, dt2;
@@ -382,6 +587,7 @@ do_mail_to_event (AsyncData *data)
 			ECalComponentText text;
 			icalproperty *icalprop;
 			icalcomponent *icalcomp;
+			struct _manage_comp *mc;
 
 			/* retrieve the message from the CamelFolder */
 			message = camel_folder_get_message (folder, g_ptr_array_index (uids, i), NULL);
@@ -444,23 +650,31 @@ do_mail_to_event (AsyncData *data)
 			/* set attachment files */
 			set_attachments (client, comp, message);
 
+			/* no need to increment a sequence number, this is a new component */
+			e_cal_component_abort_sequence (comp);
+
 			icalcomp = e_cal_component_get_icalcomponent (comp);
 
 			icalprop = icalproperty_new_x ("1");
 			icalproperty_set_x_name (icalprop, "X-EVOLUTION-MOVE-CALENDAR");
 			icalcomponent_add_property (icalcomp, icalprop);
 
-			/* save the task to the selected source */
-			if (!e_cal_create_object (client, icalcomp, NULL, &err)) {
-				report_error_idle (_("Could not create object. %s"), err ? err->message : _("Unknown error"));
+			mc = g_new0 (struct _manage_comp, 1);
+			mc->client = g_object_ref (client);
+			mc->comp = g_object_ref (comp);
 
-				if (err)
-					g_error_free (err);
-				err = NULL;
-			}
+			if (!e_cal_get_object (client, icalcomponent_get_uid (icalcomp), NULL, &(mc->stored_comp), NULL))
+				mc->stored_comp = NULL;
+
+			mcs = g_slist_append (mcs, mc);
 
 			g_object_unref (comp);
 		}
+
+		if (mcs) {
+			/* process this in the main thread, as we may ask user too */
+			g_idle_add ((GSourceFunc)do_manage_comp_idle, mcs);
+		}
 	}
 
 	/* free memory */
@@ -588,6 +802,8 @@ mail_to_event (ECalSourceType source_type, gboolean with_attendees, GPtrArray *u
 		/* ask the user which tasks list to save to */
 		dialog = e_source_selector_dialog_new (NULL, source_list);
 
+		e_source_selector_dialog_select_default_source (E_SOURCE_SELECTOR_DIALOG (dialog));
+
 		if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_OK)
 			source = e_source_selector_dialog_peek_primary_selection (E_SOURCE_SELECTOR_DIALOG (dialog));
 
@@ -678,13 +894,15 @@ org_gnome_mail_to_meeting_menu (EPlugin *ep, EMMenuTargetSelect *t)
 void
 org_gnome_mail_to_task (void *ep, EMPopupTargetSelect *t)
 {
-	mail_to_event (E_CAL_SOURCE_TYPE_TODO, TRUE, t->uids, t->folder, (EMFolderView *) t->target.widget);
+	/* do not create assigned tasks */
+	mail_to_event (E_CAL_SOURCE_TYPE_TODO, FALSE, t->uids, t->folder, (EMFolderView *) t->target.widget);
 }
 
 void
 org_gnome_mail_to_task_menu (EPlugin *ep, EMMenuTargetSelect *t)
 {
-	mail_to_event (E_CAL_SOURCE_TYPE_TODO, TRUE, t->uids, t->folder, (EMFolderView *) t->target.widget);
+	/* do not create assigned tasks */
+	mail_to_event (E_CAL_SOURCE_TYPE_TODO, FALSE, t->uids, t->folder, (EMFolderView *) t->target.widget);
 }
 
 void
diff --git a/plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml b/plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml
index 65ae2f4..e8494fb 100644
--- a/plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml
+++ b/plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml
@@ -15,7 +15,7 @@
 	  type="item"
 	  path="70.mail_to_event1"
 	  icon="appointment-new"
-	  _label="Convert to an _Event"
+	  _label="Create an _Event"
 	  enable="many"
 	  visible="many"
 	  activate="org_gnome_mail_to_event"/>
@@ -23,15 +23,15 @@
 	  type="item"
 	  path="70.mail_to_event2"
 	  icon="stock_new-meeting"
-	  _label="Convert to a _Meeting"
-	  enable="many"
+	  _label="Create a _Meeting"
+	  enable="one"
 	  visible="many"
 	  activate="org_gnome_mail_to_meeting"/>
 	<item
 	  type="item"
 	  path="70.mail_to_event3"
 	  icon="stock_todo"
-	  _label="Convert to a _Task"
+	  _label="Create a _Task"
 	  enable="many"
 	  visible="many"
 	  activate="org_gnome_mail_to_task"/>
@@ -39,7 +39,7 @@
 	  type="item"
 	  path="70.mail_to_event4"
 	  icon="stock_insert-note"
-	  _label="Convert to a Mem_o"
+	  _label="Create a Mem_o"
 	  enable="many"
 	  visible="many"
 	  activate="org_gnome_mail_to_memo"/>
@@ -59,7 +59,7 @@
 	  type="item"
 	  verb="ConvertMeeting"
 	  path="/commands/ConvertMeeting"
-	  enable="many"
+	  enable="one"
 	  activate="org_gnome_mail_to_meeting_menu"/>
 	<item
 	  type="item"
diff --git a/plugins/mail-to-task/org-gnome-mail-to-task.xml b/plugins/mail-to-task/org-gnome-mail-to-task.xml
index 98accf4..c3d72b6 100644
--- a/plugins/mail-to-task/org-gnome-mail-to-task.xml
+++ b/plugins/mail-to-task/org-gnome-mail-to-task.xml
@@ -1,16 +1,16 @@
 <Root>
   <commands>
-    <cmd name="ConvertEvent" _label="Convert to an _Event"
-      _tip="Convert the selected message to a new event"
+    <cmd name="ConvertEvent" _label="Create an _Event"
+      _tip="Create a new event from the selected message"
       pixtype="stock" pixname="appointment-new"/>
-    <cmd name="ConvertMeeting" _label="Convert to a _Meeting"
-      _tip="Convert the selected message to a new meeting"
+    <cmd name="ConvertMeeting" _label="Create a _Meeting"
+      _tip="Create a new meeting from the selected message"
       pixtype="stock" pixname="stock_new-meeting"/>
-    <cmd name="ConvertTask" _label="Convert to a _Task"
-      _tip="Convert the selected message to a new task"
+    <cmd name="ConvertTask" _label="Create a _Task"
+      _tip="Create a new task from the selected message"
       pixtype="stock" pixname="stock_todo"/>
-    <cmd name="ConvertMemo" _label="Convert to a Mem_o"
-      _tip="Convert the selected message to a new memo"
+    <cmd name="ConvertMemo" _label="Create a Mem_o"
+      _tip="Create a new memo from the selected message"
       pixtype="stock" pixname="stock_insert-note"/>
   </commands>
 
