@@ -300,6 +300,8 @@ static	const	struct tableinit {

 #ifdef	CL_THREAD_SAFE

 static	pthread_mutex_t	tables_mutex = PTHREAD_MUTEX_INITIALIZER;

 #endif

+static	table_t *rfc821 = NULL;

+static	table_t *subtype = NULL;

 int

 cli_mbox(const char *dir, cli_ctx *ctx)

@@ -333,7 +335,6 @@ cli_parse_mbox(const char *dir, cli_ctx *ctx)

 	message *body;

 	char buffer[RFC2821LENGTH + 1];

 	mbox_ctx mctx;

-	static table_t *rfc821, *subtype;

 	size_t at = 0;

 	fmap_t *map = *ctx->fmap;