--- a/src/plugins/quota/quota-maildir.c	Tue Jan 10 23:10:04 2012 +0200
+++ b/src/plugins/quota/quota-maildir.c	Tue Jan 10 23:14:18 2012 +0200
@@ -296,13 +296,10 @@
 		return -1;
 	}
 
-	/* keep the fd open since we might want to update it later */
-	if (file_dotlock_replace(&dotlock,
-				 DOTLOCK_REPLACE_FLAG_DONT_CLOSE_FD) < 0) {
+	if (file_dotlock_replace(&dotlock, 0) < 0) {
 		i_error("file_dotlock_replace(%s) failed: %m", path);
 		return -1;
 	}
-	root->fd = fd;
 	return 0;
 }
 
@@ -872,8 +869,11 @@
 		(void)close(root->fd);
 		root->fd = -1;
 		(void)maildirsize_recalculate(root);
-	} else if (maildirsize_update(root, ctx->count_used, ctx->bytes_used) < 0)
+	} else if (maildirsize_update(root, ctx->count_used, ctx->bytes_used) < 0) {
+		(void)close(root->fd);
+		root->fd = -1;
 		maildirsize_rebuild_later(root);
+	}
 
 	return 0;
 }