diff --git a/worker/src/admin_api/admin_mail_api.ts b/worker/src/admin_api/admin_mail_api.ts
index 3868dc9..e1f373a 100644
--- a/worker/src/admin_api/admin_mail_api.ts
+++ b/worker/src/admin_api/admin_mail_api.ts
@@ -2,6 +2,7 @@ import { Context } from "hono";
 import { handleMailListQuery } from "../common";
 import { resolveRawEmailRow } from "../gzip";
 import { getBooleanValue } from "../utils";
+import { serializeMailState } from "../mail_flags";
 
 export default {
     getMails: async (c: Context<HonoCustomType>) => {
@@ -32,8 +33,8 @@ export default {
             `SELECT * FROM raw_mails WHERE id = ?`
         ).bind(id).first();
         if (!result) return c.json(null);
-        return c.json(await resolveRawEmailRow(
-            result,
+        return c.json(serializeMailState(
+            await resolveRawEmailRow(result),
             getBooleanValue(c.env.ENABLE_MAIL_FLAGS),
         ));
     },
diff --git a/worker/src/common.ts b/worker/src/common.ts
index e61995a..d47c117 100644
--- a/worker/src/common.ts
+++ b/worker/src/common.ts
@@ -7,6 +7,7 @@ import { unbindTelegramByAddress } from './telegram_api/common';
 import { CONSTANTS } from './constants';
 import { AddressCreationSettings, AdminWebhookSettings, ExtractResult, WebhookMail, WebhookSettings } from './models';
 import i18n from './i18n';
+import { serializeMailState } from './mail_flags';
 
 const DEFAULT_NAME_REGEX = /[^a-z0-9]/g;
 const DEFAULT_RANDOM_SUBDOMAIN_LENGTH = 8;
@@ -720,14 +721,15 @@ export const handleMailListQuery = async (
     const { results } = await c.env.DB.prepare(resultsQuery).bind(
         ...params, limit, offset
     ).all();
-    const resolvedResults = await resolveRawEmailList(
-        results,
+    const resolvedResults = await resolveRawEmailList(results);
+    const serializedResults = resolvedResults.map(row => serializeMailState(
+        row,
         getBooleanValue(c.env.ENABLE_MAIL_FLAGS),
-    );
+    ));
     const count = offset == 0 ? await c.env.DB.prepare(
         countQuery
     ).bind(...params).first("count") : 0;
-    return c.json({ results: resolvedResults, count });
+    return c.json({ results: serializedResults, count });
 }
 
 export const commonParseMail = async (parsedEmailContext: ParsedEmailContext): Promise<{
diff --git a/worker/src/gzip.ts b/worker/src/gzip.ts
index 31bb58c..8d5e993 100644
--- a/worker/src/gzip.ts
+++ b/worker/src/gzip.ts
@@ -4,7 +4,6 @@
  */
 
 import { RawMailRow } from "./models";
-import { serializeMailState } from "./mail_flags";
 
 export async function compressText(text: string): Promise<ArrayBuffer> {
     const stream = new Blob([text]).stream().pipeThrough(new CompressionStream('gzip'));
@@ -35,21 +34,15 @@ export async function resolveRawEmail(row: RawMailRow): Promise<string> {
 /**
  * Resolve a single row: decompress raw_blob if present, strip raw_blob from result.
  */
-export async function resolveRawEmailRow(
-    row: RawMailRow,
-    enableMailStates = false,
-): Promise<RawMailRow> {
+export async function resolveRawEmailRow(row: RawMailRow): Promise<RawMailRow> {
     const raw = await resolveRawEmail(row);
     const { raw_blob: _, ...rest } = row;
-    return serializeMailState({ ...rest, raw }, enableMailStates);
+    return { ...rest, raw };
 }
 
 /**
  * Batch resolve raw emails for list queries using Promise.all.
  */
-export async function resolveRawEmailList(
-    rows: RawMailRow[],
-    enableMailStates = false,
-): Promise<RawMailRow[]> {
-    return Promise.all(rows.map(row => resolveRawEmailRow(row, enableMailStates)));
+export async function resolveRawEmailList(rows: RawMailRow[]): Promise<RawMailRow[]> {
+    return Promise.all(rows.map(row => resolveRawEmailRow(row)));
 }
diff --git a/worker/src/mails_api/mails_crud.ts b/worker/src/mails_api/mails_crud.ts
index b3077eb..fc96987 100644
--- a/worker/src/mails_api/mails_crud.ts
+++ b/worker/src/mails_api/mails_crud.ts
@@ -9,6 +9,7 @@ import {
     getMailStateQuery,
     getMailStateOptions,
     applyMailStateUpdate,
+    serializeMailState,
 } from '../mail_flags';
 
 const listMails = async (c: Context<HonoCustomType>) => {
@@ -45,8 +46,8 @@ const getMail = async (c: Context<HonoCustomType>) => {
         `SELECT * FROM raw_mails where id = ? and address = ?`
     ).bind(mail_id, address).first();
     if (!result) return c.json(null);
-    return c.json(await resolveRawEmailRow(
-        result,
+    return c.json(serializeMailState(
+        await resolveRawEmailRow(result),
         getBooleanValue(c.env.ENABLE_MAIL_FLAGS),
     ));
 };
diff --git a/worker/src/mails_api/parsed_mail_api.ts b/worker/src/mails_api/parsed_mail_api.ts
index e7d30a6..13fa3c2 100644
--- a/worker/src/mails_api/parsed_mail_api.ts
+++ b/worker/src/mails_api/parsed_mail_api.ts
@@ -3,6 +3,7 @@ import { Context } from 'hono'
 import { commonParseMail, handleMailListQuery, updateAddressUpdatedAt } from '../common'
 import { resolveRawEmailRow } from '../gzip'
 import { getBooleanValue } from '../utils';
+import { serializeMailState } from '../mail_flags';
 
 const toParsedMailRow = async (row: Record<string, unknown>): Promise<Record<string, unknown>> => {
     const raw = typeof row.raw === 'string' ? row.raw : '';
@@ -46,8 +47,8 @@ const getParsedMail = async (c: Context<HonoCustomType>) => {
         `SELECT * FROM raw_mails where id = ? and address = ?`
     ).bind(mail_id, address).first();
     if (!row) return c.json(null);
-    const resolved = await resolveRawEmailRow(
-        row,
+    const resolved = serializeMailState(
+        await resolveRawEmailRow(row),
         getBooleanValue(c.env.ENABLE_MAIL_FLAGS),
     );
     return c.json(await toParsedMailRow(resolved));
diff --git a/worker/src/telegram_api/miniapp.ts b/worker/src/telegram_api/miniapp.ts
index 884b583..0eae0f1 100644
--- a/worker/src/telegram_api/miniapp.ts
+++ b/worker/src/telegram_api/miniapp.ts
@@ -6,6 +6,7 @@ import { checkCfTurnstile, checkIsAdmin, getBooleanValue } from "../utils";
 import { resolveRawEmailRow } from "../gzip";
 import { TelegramSettings } from "./settings";
 import i18n from "../i18n";
+import { serializeMailState } from "../mail_flags";
 
 const encoder = new TextEncoder();
 const TG_AUTH_TIMEOUT = 300;
@@ -145,7 +146,7 @@ async function getMail(c: Context<HonoCustomType>): Promise<Response> {
             if (!result) {
                 return c.text("Mail not found", 404);
             }
-            return c.json(await resolveRawEmailRow(result));
+            return c.json(serializeMailState(await resolveRawEmailRow(result), false));
         }
         const userId = await checkTelegramAuth(c, initData);
         const jwtList = await c.env.KV.get<string[]>(`${CONSTANTS.TG_KV_PREFIX}:${userId}`, 'json') || [];
@@ -168,7 +169,7 @@ async function getMail(c: Context<HonoCustomType>): Promise<Response> {
                 return c.text(msgs.TgNoPermissionViewMailMsg, 403);
             }
         }
-        return c.json(await resolveRawEmailRow(result));
+        return c.json(serializeMailState(await resolveRawEmailRow(result), false));
     }
     catch (e) {
         return c.text((e as Error).message, 400);