--- a/src/lib-storage/index/dbox-multi/mdbox-storage.c	Sun Feb 14 22:30:43 2010 +0200
+++ b/src/lib-storage/index/dbox-multi/mdbox-storage.c	Sun Feb 14 22:32:59 2010 +0200
@@ -313,21 +313,6 @@
 	return index_storage_mailbox_delete(box);
 }
 
-static int
-mdbox_list_rename_mailbox(struct mailbox_list *oldlist, const char *oldname,
-			  struct mailbox_list *newlist, const char *newname,
-			  bool rename_children)
-{
-	struct mdbox_mailbox_list *oldmlist = MDBOX_LIST_CONTEXT(oldlist);
-
-	if (oldmlist->module_ctx.super.
-	    		rename_mailbox(oldlist, oldname, newlist, newname,
-				       rename_children) < 0)
-		return -1;
-	return dbox_list_rename_mailbox(oldlist, oldname, newlist, newname,
-					rename_children);
-}
-
 static void dbox_storage_add_list(struct mail_storage *storage ATTR_UNUSED,
 				  struct mailbox_list *list)
 {
@@ -335,10 +320,7 @@
 
 	mlist = p_new(list->pool, struct mdbox_mailbox_list, 1);
 	mlist->module_ctx.super = list->v;
-
 	list->v.iter_is_mailbox = dbox_list_iter_is_mailbox;
-	list->v.rename_mailbox = mdbox_list_rename_mailbox;
-	list->v.rename_mailbox_pre = dbox_list_rename_mailbox_pre;
 
 	MODULE_CONTEXT_SET(list, mdbox_mailbox_list_module, mlist);
 }
@@ -370,6 +352,7 @@
 		dbox_mailbox_create,
 		mdbox_mailbox_update,
 		mdbox_mailbox_delete,
+		index_storage_mailbox_rename,
 		index_storage_get_status,
 		mdbox_mailbox_get_guid,
 		NULL,