diff --git a/src/doveadm/doveadm-mail-fetch.c b/src/doveadm/doveadm-mail-fetch.c
index df1510ab63..9f1eea848d 100644
--- a/src/doveadm/doveadm-mail-fetch.c
+++ b/src/doveadm/doveadm-mail-fetch.c
@@ -605,6 +605,14 @@ static struct doveadm_mail_cmd_context *cmd_fetch_alloc(void)
 	return &ctx->ctx;
 }
 
-struct doveadm_mail_cmd cmd_fetch = {
-	cmd_fetch_alloc, "fetch", "<fields> <search query>"
+struct doveadm_cmd_ver2 doveadm_cmd_fetch_ver2 = {
+	.name = "fetch",
+	.mail_cmd = cmd_fetch_alloc,
+	.usage = "<fields> <search query>",
+DOVEADM_CMD_PARAMS_START
+DOVEADM_CMD_MAIL_COMMON
+DOVEADM_CMD_PARAM('\0', "field", CMD_PARAM_ARRAY, 0)
+DOVEADM_CMD_PARAM('\0', "fieldstr", CMD_PARAM_STR, CMD_PARAM_FLAG_POSITIONAL | CMD_PARAM_FLAG_DO_NOT_EXPOSE) /* FIXME: horrible hack, remove me when possible */
+DOVEADM_CMD_PARAM('\0', "query", CMD_PARAM_ARRAY, CMD_PARAM_FLAG_POSITIONAL)
+DOVEADM_CMD_PARAMS_END
 };
diff --git a/src/doveadm/doveadm-mail.c b/src/doveadm/doveadm-mail.c
index 362634d8dc..dc9ca6e463 100644
--- a/src/doveadm/doveadm-mail.c
+++ b/src/doveadm/doveadm-mail.c
@@ -817,7 +817,6 @@ static struct doveadm_mail_cmd *mail_commands[] = {
 	&cmd_expunge,
 	&cmd_save,
 	&cmd_search,
-	&cmd_fetch,
 	&cmd_flags_add,
 	&cmd_flags_remove,
 	&cmd_flags_replace,
@@ -844,7 +843,8 @@ static struct doveadm_cmd_ver2 *mail_commands_ver2[] = {
 	&doveadm_cmd_mailbox_delete_ver2,
 	&doveadm_cmd_mailbox_rename_ver2,
 	&doveadm_cmd_mailbox_subscribe_ver2,
-	&doveadm_cmd_mailbox_unsubscribe_ver2
+	&doveadm_cmd_mailbox_unsubscribe_ver2,
+	&doveadm_cmd_fetch_ver2
 };
 
 void doveadm_mail_init(void)
diff --git a/src/doveadm/doveadm-mail.h b/src/doveadm/doveadm-mail.h
index aed7848e0c..bcc88426d3 100644
--- a/src/doveadm/doveadm-mail.h
+++ b/src/doveadm/doveadm-mail.h
@@ -172,7 +172,6 @@ void doveadm_mail_failed_list(struct doveadm_mail_cmd_context *ctx,
 extern struct doveadm_mail_cmd cmd_expunge;
 extern struct doveadm_mail_cmd cmd_save;
 extern struct doveadm_mail_cmd cmd_search;
-extern struct doveadm_mail_cmd cmd_fetch;
 extern struct doveadm_mail_cmd cmd_flags_add;
 extern struct doveadm_mail_cmd cmd_flags_remove;
 extern struct doveadm_mail_cmd cmd_flags_replace;
@@ -195,6 +194,7 @@ extern struct doveadm_cmd_ver2 doveadm_cmd_mailbox_delete_ver2;
 extern struct doveadm_cmd_ver2 doveadm_cmd_mailbox_rename_ver2;
 extern struct doveadm_cmd_ver2 doveadm_cmd_mailbox_subscribe_ver2;
 extern struct doveadm_cmd_ver2 doveadm_cmd_mailbox_unsubscribe_ver2;
+extern struct doveadm_cmd_ver2 doveadm_cmd_fetch_ver2;
 
 #define DOVEADM_CMD_MAIL_COMMON \
 DOVEADM_CMD_PARAM('A', "all-users", CMD_PARAM_BOOL, 0) \