diff --git a/src/lib-smtp/smtp-server-private.h b/src/lib-smtp/smtp-server-private.h
index 157e83a807..96e50b16d6 100644
--- a/src/lib-smtp/smtp-server-private.h
+++ b/src/lib-smtp/smtp-server-private.h
@@ -64,6 +64,7 @@ struct smtp_server_recipient_hook {
 
 struct smtp_server_reply_content {
 	unsigned int status;
+	const char *enhanced_code;
 	const char *status_prefix;
 
 	string_t *text;
diff --git a/src/lib-smtp/smtp-server-reply.c b/src/lib-smtp/smtp-server-reply.c
index 2069116d9a..23c4949da9 100644
--- a/src/lib-smtp/smtp-server-reply.c
+++ b/src/lib-smtp/smtp-server-reply.c
@@ -118,6 +118,7 @@ smtp_server_reply_create_index(struct smtp_server_command *cmd,
 	if (reply->content == NULL)
 		reply->content = p_new(pool, struct smtp_server_reply_content, 1);
 	reply->content->status = status;
+	reply->content->enhanced_code = p_strdup(pool, enh_code);
 	if (enh_code == NULL || *enh_code == '\0') {
 		reply->content->status_prefix =
 			p_strdup_printf(pool, "%03u-", status);