Index: addressbook/gui/component/addressbook-view.c
===================================================================
--- addressbook/gui/component/addressbook-view.c	(revision 36759)
+++ addressbook/gui/component/addressbook-view.c	(working copy)
@@ -911,6 +911,16 @@ new_addressbook_cb(EPopup *ep, EPopupIte
 }
 
 static void
+rename_addressbook_cb (EPopup *ep, EPopupItem *pitem, void *data)
+{
+	AddressbookView *view = data;
+	ESourceSelector *selector;
+
+	selector = E_SOURCE_SELECTOR (view->priv->selector);
+	e_source_selector_edit_primary_selection (selector);
+}
+
+static void
 save_addressbook_cb(EPopup *ep, EPopupItem *pitem, void *data)
 {
 	AddressbookView *view = data;
@@ -940,6 +950,7 @@ primary_source_selection_changed_callbac
 static EPopupItem abv_source_popups[] = {
 	{ E_POPUP_ITEM, "10.new", N_("_New Address Book"), new_addressbook_cb, NULL, "address-book-new", 0, 0 },
  	{ E_POPUP_ITEM, "20.saveasvcard", N_("Save As vCard..."), save_addressbook_cb, NULL,"document-save-as", 0, EAB_POPUP_SOURCE_PRIMARY },
+	{ E_POPUP_ITEM, "25.rename", N_("_Rename..."), rename_addressbook_cb, NULL, NULL, 0, EAB_POPUP_SOURCE_PRIMARY },
 
 	{ E_POPUP_BAR,  "30.bar" },
 	{ E_POPUP_ITEM, "30.delete", N_("_Delete"), delete_addressbook_cb, NULL, "edit-delete", 0, EAB_POPUP_SOURCE_USER|EAB_POPUP_SOURCE_PRIMARY },
Index: calendar/gui/tasks-component.c
===================================================================
--- calendar/gui/tasks-component.c	(revision 36759)
+++ calendar/gui/tasks-component.c	(working copy)
@@ -439,6 +439,16 @@ new_task_list_cb (EPopup *ep, EPopupItem
 }
 
 static void
+rename_task_list_cb (EPopup *ep, EPopupItem *pitem, void *data)
+{
+	TasksComponentView *component_view = data;
+	ESourceSelector *selector;
+
+	selector = E_SOURCE_SELECTOR (component_view->source_selector);
+	e_source_selector_edit_primary_selection (selector);
+}
+
+static void
 edit_task_list_cb (EPopup *ep, EPopupItem *pitem, void *data)
 {
 	TasksComponentView *component_view = data;
@@ -479,6 +489,7 @@ mark_offline_cb (EPopup *ep, EPopupItem 
 static EPopupItem etc_source_popups[] = {
 	{ E_POPUP_ITEM, "10.new", N_("_New Task List"), new_task_list_cb, NULL, "stock_todo", 0, 0 },
 	{ E_POPUP_ITEM, "15.copy", N_("_Copy..."), copy_task_list_cb, NULL, "edit-copy", 0, E_CAL_POPUP_SOURCE_PRIMARY },
+	{ E_POPUP_ITEM, "18.rename", N_("_Rename..."), rename_task_list_cb, NULL, NULL, 0, E_CAL_POPUP_SOURCE_PRIMARY },
 
 	{ E_POPUP_BAR, "20.bar" },
 	{ E_POPUP_ITEM, "20.delete", N_("_Delete"), delete_task_list_cb, NULL, "edit-delete", 0, E_CAL_POPUP_SOURCE_USER|E_CAL_POPUP_SOURCE_PRIMARY },
Index: calendar/gui/calendar-component.c
===================================================================
--- calendar/gui/calendar-component.c	(revision 36759)
+++ calendar/gui/calendar-component.c	(working copy)
@@ -607,6 +607,16 @@ new_calendar_cb (EPopup *ep, EPopupItem 
 }
 
 static void
+rename_calendar_cb (EPopup *ep, EPopupItem *pitem, void *data)
+{
+	CalendarComponentView *component_view = data;
+	ESourceSelector *selector;
+
+	selector = E_SOURCE_SELECTOR (component_view->source_selector);
+	e_source_selector_edit_primary_selection (selector);
+}
+
+static void
 edit_calendar_cb (EPopup *ep, EPopupItem *pitem, void *data)
 {
 	CalendarComponentView *component_view = data;
@@ -647,6 +657,7 @@ mark_offline_cb (EPopup *ep, EPopupItem 
 static EPopupItem ecc_source_popups[] = {
 	{ E_POPUP_ITEM, "10.new", N_("_New Calendar"), new_calendar_cb, NULL, "x-office-calendar", 0, 0 },
 	{ E_POPUP_ITEM, "15.copy", N_("_Copy..."), copy_calendar_cb, NULL, "edit-copy", 0, E_CAL_POPUP_SOURCE_PRIMARY },
+	{ E_POPUP_ITEM, "18.rename", N_("_Rename..."), rename_calendar_cb, NULL, NULL, 0, E_CAL_POPUP_SOURCE_PRIMARY },
 
 	{ E_POPUP_BAR, "20.bar" },
 	{ E_POPUP_ITEM, "20.delete", N_("_Delete"), delete_calendar_cb, NULL, "edit-delete", 0,E_CAL_POPUP_SOURCE_USER|E_CAL_POPUP_SOURCE_PRIMARY|E_CAL_POPUP_SOURCE_DELETE },
Index: calendar/gui/memos-component.c
===================================================================
--- calendar/gui/memos-component.c	(revision 36759)
+++ calendar/gui/memos-component.c	(working copy)
@@ -448,6 +448,16 @@ new_memo_list_cb (EPopup *ep, EPopupItem
 }
 
 static void
+rename_memo_list_cb (EPopup *ep, EPopupItem *pitem, void *data)
+{
+	MemosComponentView *component_view = data;
+	ESourceSelector *selector;
+
+	selector = E_SOURCE_SELECTOR (component_view->source_selector);
+	e_source_selector_edit_primary_selection (selector);
+}
+
+static void
 edit_memo_list_cb (EPopup *ep, EPopupItem *pitem, void *data)
 {
 	MemosComponentView *component_view = data;
@@ -488,6 +498,7 @@ mark_offline_cb (EPopup *ep, EPopupItem 
 static EPopupItem emc_source_popups[] = {
 	{ E_POPUP_ITEM, "10.new", N_("_New Memo List"), new_memo_list_cb, NULL, "stock_notes", 0, 0 },
 	{ E_POPUP_ITEM, "15.copy", N_("_Copy..."), copy_memo_list_cb, NULL, "edit-copy", 0, E_CAL_POPUP_SOURCE_PRIMARY },
+	{ E_POPUP_ITEM, "18.rename", N_("_Rename..."), rename_memo_list_cb, NULL, NULL, 0, E_CAL_POPUP_SOURCE_PRIMARY },
 
 	{ E_POPUP_BAR, "20.bar" },
 	{ E_POPUP_ITEM, "20.delete", N_("_Delete"), delete_memo_list_cb, NULL, "edit-delete", 0, E_CAL_POPUP_SOURCE_USER|E_CAL_POPUP_SOURCE_PRIMARY },
