--- a/src/lib-storage/mailbox-list.c	Fri Mar 30 22:35:07 2007 +0300
+++ b/src/lib-storage/mailbox-list.c	Fri Mar 30 22:36:19 2007 +0300
@@ -257,6 +257,10 @@
 		mailbox_list_set_error(list, "Invalid mailbox name");
 		return -1;
 	}
+	if (strcmp(name, "INBOX") == 0) {
+		mailbox_list_set_error(list, "INBOX can't be deleted.");
+		return -1;
+	}
 	return list->v.delete_mailbox(list, name);
 }
 
@@ -277,16 +281,6 @@
 {
 	const char *path, *index_dir, *dir;
 
-	if (strcmp(name, "INBOX") == 0) {
-		mailbox_list_set_error(list, "INBOX can't be deleted.");
-		return -1;
-	}
-
-	if (!mailbox_list_is_valid_existing_name(list, name)) {
-		mailbox_list_set_error(list, "Invalid mailbox name");
-		return -1;
-	}
-
 	path = mailbox_list_get_path(list, name,
 				     MAILBOX_LIST_PATH_TYPE_MAILBOX);