--- a/src/lib-storage/index/dbox-single/sdbox-file.c	Sun Mar 21 17:08:36 2010 +0200
+++ b/src/lib-storage/index/dbox-single/sdbox-file.c	Sun Mar 21 18:12:24 2010 +0200
@@ -45,13 +45,17 @@
 		}
 	} T_END;
 	dbox_file_init(&file->file);
+	return &file->file;
+}
 
-	if (uid == 0) {
-		file->file.fd = file->file.storage->v.
-			file_create_fd(&file->file, file->file.primary_path,
-				       FALSE);
-	}
-	return &file->file;
+struct dbox_file *sdbox_file_create(struct sdbox_mailbox *mbox)
+{
+	struct dbox_file *file;
+
+	file = sdbox_file_init(mbox, 0);
+	file->fd = file->storage->v.
+		file_create_fd(file, file->primary_path, FALSE);
+	return file;
 }
 
 int sdbox_file_assign_uid(struct sdbox_file *file, uint32_t uid)