diff --git a/.github/workflows/fw-lite.yaml b/.github/workflows/fw-lite.yaml
index de78542640..cb7094ba4f 100644
--- a/.github/workflows/fw-lite.yaml
+++ b/.github/workflows/fw-lite.yaml
@@ -82,16 +82,18 @@ jobs:
       - name: Check for stale generated TypeScript types
         run: task fw-lite:has-stale-generated-types -- --no-build
 
-      - name: Set a non-UTC timezone so timezone bugs are observable
-        # Hosted runners default to UTC, which hides date bugs: the error equals the local UTC
-        # offset, which is zero on UTC (see #2092). Eastern is non-UTC, observes DST, and has a
-        # negative offset, so date round-trips run the way real users actually hit them.
-        run: sudo timedatectl set-timezone America/New_York
-
       - name: Dotnet test
         # Benchmarks run in a separate Release-mode job — see `benchmark` below.
         # MAUI tests run in publish-win. `trx` logger writes result files for the TestHistory
         # upload below; --results-directory collects one .trx per test project into a single folder.
+        #
+        # TZ forces a non-UTC timezone so date bugs are observable: on UTC the error equals the
+        # local offset, which is zero and hides bugs (see #2092). Eastern is non-UTC, observes DST,
+        # and has a negative offset. We set TZ instead of `timedatectl set-timezone` because hosted
+        # runners no longer allow it ("Failed to set time zone: Access denied"); .NET honours TZ for
+        # TimeZoneInfo.Local on Linux, so this needs no privileges and only affects the tests.
+        env:
+          TZ: America/New_York
         run: dotnet test FwLiteCore.slnf --logger GitHubActions --logger trx --results-directory "${{ github.workspace }}/TestResults" --no-build -p:BuildAndroid=false --filter "Category!=Benchmark"
 
       - name: Publish test results to TestHistory
diff --git a/backend/FwLite/LcmCrdt/CrdtProjectsService.cs b/backend/FwLite/LcmCrdt/CrdtProjectsService.cs
index d145988801..4ba53eae99 100644
--- a/backend/FwLite/LcmCrdt/CrdtProjectsService.cs
+++ b/backend/FwLite/LcmCrdt/CrdtProjectsService.cs
@@ -179,7 +179,7 @@ public record CreateProjectRequest(
     public async Task<CrdtProject> CreateExampleProject(string name)
     {
         // Code must satisfy the lowercase-only ProjectCode rule; the display name keeps its casing.
-        return await CreateProjectFromTemplate(new(name, name.ToLowerInvariant(), AfterCreate: ExampleProjectData.Seed, Role: UserProjectRole.Manager), vernacularWs: "de");
+        return await CreateProjectFromTemplate(new(name, name.ToLowerInvariant(), AfterCreate: ExampleProjectData.Seed, Role: UserProjectRole.Manager, AuthenticatedUser: "Example User", AuthenticatedUserId: "example-user"), vernacularWs: "de");
     }
 
     /// <summary>
diff --git a/frontend/viewer/src/css-breakpoints.ts b/frontend/viewer/src/css-breakpoints.ts
index 5f427284f3..17ab453868 100644
--- a/frontend/viewer/src/css-breakpoints.ts
+++ b/frontend/viewer/src/css-breakpoints.ts
@@ -1,2 +1,4 @@
 // used in the is-mobile.svelte hook and for the tailwind md breakpoint
 export const MOBILE_BREAKPOINT = 768;
+// used for comments sidebar vs bottom dock (and Tailwind xl)
+export const EXTRA_LARGE_BREAKPOINT = 1280;
diff --git a/frontend/viewer/src/lib/components/ui/drawer/drawer-nested.svelte b/frontend/viewer/src/lib/components/ui/drawer/drawer-nested.svelte
index 3005667292..37b4005915 100644
--- a/frontend/viewer/src/lib/components/ui/drawer/drawer-nested.svelte
+++ b/frontend/viewer/src/lib/components/ui/drawer/drawer-nested.svelte
@@ -1,12 +1,30 @@
 <script lang="ts">
+  import {watch} from 'runed';
+  import {tick} from 'svelte';
   import {Drawer as DrawerPrimitive} from 'vaul-svelte';
 
   let {
     shouldScaleBackground = true,
     open = $bindable(false),
     activeSnapPoint = $bindable(null),
+    snapPoints,
     ...restProps
   }: DrawerPrimitive.RootProps = $props();
+
+  // Same Svelte 5 activeSnapPoint workaround as drawer.svelte
+  // https://github.com/huntabyte/vaul-svelte/issues/129
+  watch(
+    () => open,
+    (isOpen) => {
+      if (!isOpen || !snapPoints?.length || activeSnapPoint == null) return;
+      const target = activeSnapPoint;
+      void tick().then(async () => {
+        activeSnapPoint = null;
+        await tick();
+        if (open) activeSnapPoint = target;
+      });
+    },
+  );
 </script>
 
-<DrawerPrimitive.NestedRoot {shouldScaleBackground} bind:open bind:activeSnapPoint {...restProps} />
+<DrawerPrimitive.NestedRoot {shouldScaleBackground} {snapPoints} bind:open bind:activeSnapPoint {...restProps} />
diff --git a/frontend/viewer/src/lib/components/ui/drawer/drawer.svelte b/frontend/viewer/src/lib/components/ui/drawer/drawer.svelte
index fd8d589337..8380772b31 100644
--- a/frontend/viewer/src/lib/components/ui/drawer/drawer.svelte
+++ b/frontend/viewer/src/lib/components/ui/drawer/drawer.svelte
@@ -1,7 +1,9 @@
 <script lang="ts">
   import {IsMobile} from '$lib/hooks/is-mobile.svelte';
-  import {Drawer as DrawerPrimitive} from 'vaul-svelte';
   import {useBackHandler} from '$lib/utils/back-handler.svelte';
+  import {watch} from 'runed';
+  import {tick} from 'svelte';
+  import {Drawer as DrawerPrimitive} from 'vaul-svelte';
 
   let {
     shouldScaleBackground = true,
@@ -13,11 +15,29 @@
     disableBackHandler?: boolean;
   } = $props();
 
+  const snapPoints = $derived(restProps.snapPoints);
+
   useBackHandler({
     addToStack: () => open && IsMobile.value && !disableBackHandler,
     onBack: () => (open = false),
     key: 'drawer',
   });
+
+  // Workaround for vaul-svelte + Svelte 5: bind:activeSnapPoint is ignored on open
+  // (drawer lands on snapPoints[0] until interaction). Re-apply after mount/tick.
+  // https://github.com/huntabyte/vaul-svelte/issues/129
+  watch(
+    () => open,
+    (isOpen) => {
+      if (!isOpen || !snapPoints?.length || activeSnapPoint == null) return;
+      const target = activeSnapPoint;
+      void tick().then(async () => {
+        activeSnapPoint = null;
+        await tick();
+        if (open) activeSnapPoint = target;
+      });
+    },
+  );
 </script>
 
 <DrawerPrimitive.Root {shouldScaleBackground} bind:open bind:activeSnapPoint {...restProps} />
diff --git a/frontend/viewer/src/lib/components/ui/textarea/textarea.svelte b/frontend/viewer/src/lib/components/ui/textarea/textarea.svelte
index d510242641..7f8dea55ee 100644
--- a/frontend/viewer/src/lib/components/ui/textarea/textarea.svelte
+++ b/frontend/viewer/src/lib/components/ui/textarea/textarea.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
   import {cn, type WithElementRef, type WithoutChildren} from '$lib/utils.js';
+  import {onMount} from 'svelte';
   import type {HTMLTextareaAttributes} from 'svelte/elements';
 
   let {
@@ -9,6 +10,11 @@
     'data-slot': dataSlot = 'textarea',
     ...restProps
   }: WithoutChildren<WithElementRef<HTMLTextareaAttributes>> = $props();
+  onMount(() => {
+    if (restProps.autofocus) {
+      ref?.focus();
+    }
+  });
 </script>
 
 <textarea
diff --git a/frontend/viewer/src/lib/entry-editor/CommentDialog.svelte b/frontend/viewer/src/lib/entry-editor/CommentDialog.svelte
deleted file mode 100644
index fa187a4c8b..0000000000
--- a/frontend/viewer/src/lib/entry-editor/CommentDialog.svelte
+++ /dev/null
@@ -1,347 +0,0 @@
-<script lang="ts">
-  import * as Drawer from '$lib/components/ui/drawer';
-  import * as Sheet from '$lib/components/ui/sheet';
-  import * as InputGroup from '$lib/components/ui/input-group';
-  import {Button, buttonVariants} from '$lib/components/ui/button';
-  import {Icon} from '$lib/components/ui/icon';
-  import {Label} from '$lib/components/ui/label';
-  import {Textarea} from '$lib/components/ui/textarea';
-  import {IsMobile} from '$lib/hooks/is-mobile.svelte';
-  import {useMiniLcmApi} from '$lib/services/service-provider';
-  import {useProjectContext} from '$project/project-context.svelte';
-  import {cn, randomId} from '$lib/utils';
-  import type {ICommentThread} from '$lib/dotnet-types/generated-types/MiniLcm/Models/ICommentThread';
-  import type {IUserComment} from '$lib/dotnet-types/generated-types/MiniLcm/Models/IUserComment';
-  import type {SubjectType} from '$lib/dotnet-types/generated-types/MiniLcm/Models/SubjectType';
-  import {ThreadStatus} from '$lib/dotnet-types/generated-types/MiniLcm/Models/ThreadStatus';
-  import type {ClassValue} from 'clsx';
-  import {resource} from 'runed';
-  import {MediaQuery} from 'svelte/reactivity';
-  import {t} from 'svelte-i18n-lingui';
-
-  type ThreadView = {
-    thread: ICommentThread;
-    comments: IUserComment[];
-  };
-
-  let {
-    open = $bindable(false),
-    subjectType,
-    subjectId,
-    subjectName,
-    inlineSidebar = false,
-    class: className,
-  }: {
-    open: boolean;
-    subjectType: SubjectType;
-    subjectId: string;
-    subjectName?: string;
-    inlineSidebar?: boolean;
-    class?: ClassValue;
-  } = $props();
-
-  const api = useMiniLcmApi();
-  const projectContext = useProjectContext();
-  const currentUserId = $derived(projectContext.projectData?.lastUserId);
-  const canComment = $derived(Boolean(currentUserId));
-  const isExtraLarge = new MediaQuery('min-width: 1280px');
-
-  let saving = $state(false);
-  let newThreadText = $state('');
-  let replyTextByThreadId = $state<Record<string, string>>({});
-  let editingCommentId = $state<string>();
-  let editTextByCommentId = $state<Record<string, string>>({});
-
-  const threadsResource = resource(
-    [() => open, () => subjectType, () => subjectId],
-    async ([isOpen, targetSubjectType, targetSubjectId]): Promise<ThreadView[]> => {
-      if (!isOpen) return [];
-      const threads = await api.getCommentThreads(targetSubjectType, targetSubjectId, true);
-      return threads.map((thread) => ({thread, comments: thread.comments ?? []}));
-    },
-    {initialValue: [] satisfies ThreadView[]},
-  );
-  const threadViews = $derived(threadsResource.current);
-  const loading = $derived(threadsResource.loading);
-
-  const title = $derived(subjectName ? $t`Comments for ${subjectName}` : $t`Comments`);
-  const hasThreads = $derived(threadViews.length > 0);
-  const shouldUseSidebar = $derived(inlineSidebar && isExtraLarge.current);
-
-  function onOpenChange(value: boolean): void {
-    open = value;
-  }
-
-  async function startThread(): Promise<void> {
-    const text = newThreadText.trim();
-    if (!text) return;
-
-    saving = true;
-    try {
-      const now = new Date().toISOString();
-      const threadId = randomId();
-      await api.createCommentThread({
-        id: threadId,
-        subjectId,
-        subjectType,
-        status: ThreadStatus.Open,
-        createdAt: now,
-        updatedAt: now,
-      }, {
-        id: randomId(),
-        commentThreadId: threadId,
-        text,
-        createdAt: now,
-        updatedAt: now,
-      });
-      newThreadText = '';
-      await threadsResource.refetch();
-    } finally {
-      saving = false;
-    }
-  }
-
-  async function replyToThread(threadView: ThreadView): Promise<void> {
-    const threadId = threadView.thread.id;
-    const text = replyTextByThreadId[threadId]?.trim();
-    if (!text) return;
-
-    saving = true;
-    try {
-      const now = new Date().toISOString();
-      await api.addUserComment(threadId, {
-        id: randomId(),
-        commentThreadId: threadId,
-        previousCommentId: threadView.comments.at(-1)?.id,
-        text,
-        createdAt: now,
-        updatedAt: now,
-      });
-      replyTextByThreadId[threadId] = '';
-      await threadsResource.refetch();
-    } finally {
-      saving = false;
-    }
-  }
-
-  function startEditing(comment: IUserComment): void {
-    editingCommentId = comment.id;
-    editTextByCommentId[comment.id] = comment.text;
-  }
-
-  function cancelEditing(commentId: string): void {
-    editingCommentId = undefined;
-    delete editTextByCommentId[commentId];
-  }
-
-  async function saveEdit(commentId: string): Promise<void> {
-    const text = editTextByCommentId[commentId]?.trim();
-    if (!text) return;
-
-    saving = true;
-    try {
-      await api.editUserComment(commentId, text);
-      cancelEditing(commentId);
-      await threadsResource.refetch();
-    } finally {
-      saving = false;
-    }
-  }
-
-  function submitOnCtrlEnter(event: KeyboardEvent): void {
-    if (event.key === 'Enter' && event.ctrlKey) {
-      const target = event.target as HTMLTextAreaElement | null;
-      target?.form?.requestSubmit();
-      event.preventDefault();
-    }
-  }
-</script>
-
-{#snippet commentContent()}
-  <div class="flex min-h-0 flex-1 flex-col overflow-hidden">
-    <div class="min-h-0 flex-1 space-y-4 overflow-y-auto px-4 pb-4">
-      <form onsubmit={(e) => { e.preventDefault(); void startThread(); }} class="space-y-2">
-        <Label for="new-comment-thread">{$t`Start a new thread`}</Label>
-        {#if canComment}
-          <InputGroup.Root>
-            <InputGroup.Textarea
-              id="new-comment-thread"
-              bind:value={newThreadText}
-              placeholder={$t`Write the first comment...`}
-              rows={2}
-              disabled={loading || saving}
-              onkeydown={submitOnCtrlEnter}
-              class="min-h-4 py-1"
-            />
-            <InputGroup.Addon align="block-end" class="flex-row-reverse">
-              <InputGroup.Button
-                variant="default"
-                size="icon-xs"
-                icon="i-mdi-send"
-                class="p-0! [&>.icon-wrapper]:flex [&>.icon-wrapper]:items-center [&>.icon-wrapper]:justify-center"
-                iconProps={{ class: 'size-4' }}
-                type="submit" disabled={!newThreadText.trim() || loading} loading={saving}
-              />
-            </InputGroup.Addon>
-          </InputGroup.Root>
-        {:else}
-          <p class="rounded-md border border-dashed p-3 text-sm text-muted-foreground">
-            {$t`Sign in to add comments.`}
-          </p>
-        {/if}
-      </form>
-
-      <div class="space-y-3">
-        {#if loading}
-          <p class="text-sm text-muted-foreground">{$t`Loading comments...`}</p>
-        {:else if !hasThreads}
-          <p class="rounded-md border border-dashed p-4 text-sm text-muted-foreground">
-            {$t`No comment threads yet.`}
-          </p>
-        {:else}
-          {#each threadViews as threadView (threadView.thread.id)}
-            <section class="space-y-3 rounded-md border p-3">
-              <div class="flex items-center justify-between gap-2">
-                <div class="min-w-0">
-                  <h3 class="text-sm font-semibold">{$t`Thread`}</h3>
-                  <span class="text-xs text-muted-foreground">
-                    {threadView.thread.authorName || $t`(unknown)`}
-                  </span>
-                </div>
-                <span class="shrink-0 text-xs text-muted-foreground">
-                  {threadView.thread.status === ThreadStatus.Closed ? $t`Closed` : $t`Open`}
-                </span>
-              </div>
-
-              <div class="space-y-2">
-                {#each threadView.comments as comment (comment.id)}
-                  <article class="rounded-md bg-muted/60 p-3">
-                    <div class="mb-2 flex items-center justify-between gap-2">
-                      <span class="text-xs font-medium text-muted-foreground">
-                        {comment.authorName || $t`(unknown)`}
-                      </span>
-                      {#if currentUserId && comment.authorId === currentUserId}
-                        <Button
-                          variant="ghost"
-                          size="xs"
-                          onclick={() => startEditing(comment)}
-                          disabled={saving || editingCommentId === comment.id}
-                        >
-                          {$t`Edit`}
-                        </Button>
-                      {/if}
-                    </div>
-
-                    {#if editingCommentId === comment.id}
-                      <div class="space-y-2">
-                        <Textarea
-                          bind:value={editTextByCommentId[comment.id]}
-                          aria-label={$t`Edit comment`}
-                          rows={3}
-                          disabled={saving}
-                        />
-                        <div class="flex justify-end gap-2">
-                          <Button variant="secondary" size="sm" onclick={() => cancelEditing(comment.id)} disabled={saving}>
-                            {$t`Cancel`}
-                          </Button>
-                          <Button
-                            size="sm"
-                            onclick={() => void saveEdit(comment.id)}
-                            disabled={!editTextByCommentId[comment.id]?.trim()}
-                            loading={saving}
-                          >
-                            {$t`Save`}
-                          </Button>
-                        </div>
-                      </div>
-                    {:else}
-                      <p class={cn('whitespace-pre-wrap text-sm', !comment.text && 'text-muted-foreground')}>
-                        {comment.text || $t`Empty comment`}
-                      </p>
-                    {/if}
-                  </article>
-                {/each}
-              </div>
-
-              <div class="space-y-2">
-                {#if canComment}
-                  <form onsubmit={(e) => { e.preventDefault(); void replyToThread(threadView); }} class="space-y-2">
-                    <InputGroup.Root>
-                      <InputGroup.Textarea
-                        id={`reply-${threadView.thread.id}`}
-                        bind:value={replyTextByThreadId[threadView.thread.id]}
-                        placeholder={$t`Write a reply...`}
-                        class="min-h-4 py-1"
-                        rows={1}
-                        disabled={saving}
-                        onkeydown={submitOnCtrlEnter}
-                      />
-                      <InputGroup.Addon align="block-end" class="flex-row-reverse">
-                        <InputGroup.Button
-                          variant="ghost"
-                          size="icon-xs"
-                          icon="i-mdi-send"
-                          class="p-0! [&>.icon-wrapper]:flex [&>.icon-wrapper]:items-center [&>.icon-wrapper]:justify-center"
-                          iconProps={{ class: 'size-4' }}
-                          type="submit"
-                          disabled={!replyTextByThreadId[threadView.thread.id]?.trim()}
-                          loading={saving}
-                        />
-                      </InputGroup.Addon>
-                    </InputGroup.Root>
-                  </form>
-                {/if}
-              </div>
-            </section>
-          {/each}
-        {/if}
-      </div>
-    </div>
-  </div>
-{/snippet}
-
-{#if shouldUseSidebar && open}
-  <aside
-    class={cn(
-      'flex h-full min-h-0 w-96 shrink-0 flex-col overflow-hidden rounded-lg border bg-background shadow-sm',
-      className,
-    )}
-  >
-    <div class="flex items-start gap-2 px-4 pt-4 pb-0">
-      <div class="min-w-0 flex-1">
-        <h2 class="truncate text-lg font-semibold" title={title}>{title}</h2>
-      </div>
-      <Button variant="ghost" size="icon" aria-label={$t`Close`} onclick={() => onOpenChange(false)}>
-        <Icon icon="i-mdi-close" />
-      </Button>
-    </div>
-    {@render commentContent()}
-  </aside>
-{:else if IsMobile.value}
-  <Drawer.Root bind:open={() => open, onOpenChange}>
-    <Drawer.Content class="max-h-[90dvh] overflow-hidden">
-      <Drawer.Close
-        class={buttonVariants({variant: 'ghost', size: 'icon', class: 'absolute top-4 right-4 z-10'})}
-        aria-label={$t`Close`}
-      >
-        <Icon icon="i-mdi-close" />
-      </Drawer.Close>
-
-      <div class="mx-auto flex max-h-[90dvh] w-full max-w-lg flex-1 flex-col overflow-hidden">
-        <Drawer.Header class="px-4 text-left">
-          <Drawer.Title class="max-w-[calc(100%-2rem)] truncate pr-2 text-left" title={title}>{title}</Drawer.Title>
-        </Drawer.Header>
-        {@render commentContent()}
-      </div>
-    </Drawer.Content>
-  </Drawer.Root>
-{:else}
-  <Sheet.Root bind:open={() => open, onOpenChange}>
-    <Sheet.Content side="right" class="w-full overflow-hidden p-0 sm:max-w-md">
-      <Sheet.Header class="px-4 pb-0">
-        <Sheet.Title class="max-w-[calc(100%-2rem)] truncate pr-2" title={title}>{title}</Sheet.Title>
-      </Sheet.Header>
-      {@render commentContent()}
-    </Sheet.Content>
-  </Sheet.Root>
-{/if}
diff --git a/frontend/viewer/src/lib/entry-editor/comments/CommentAuthorAvatar.svelte b/frontend/viewer/src/lib/entry-editor/comments/CommentAuthorAvatar.svelte
new file mode 100644
index 0000000000..b5d45dc8eb
--- /dev/null
+++ b/frontend/viewer/src/lib/entry-editor/comments/CommentAuthorAvatar.svelte
@@ -0,0 +1,32 @@
+<script lang="ts">
+  import * as Avatar from '$lib/components/ui/avatar';
+  import {cn} from '$lib/utils';
+  import {getAuthorColor, getAuthorInitials} from './comment-author';
+
+  let {
+    authorName,
+    authorId,
+    size = 'md',
+    class: className,
+  }: {
+    authorName?: string;
+    authorId?: string;
+    size?: 'sm' | 'md';
+    class?: string;
+  } = $props();
+
+  const initials = $derived(getAuthorInitials(authorName));
+  const color = $derived(getAuthorColor(authorId, authorName));
+</script>
+
+<Avatar.Root
+  class={cn(size === 'sm' ? 'size-[22px]' : 'size-[26px]', className)}
+  style={`background-color: ${color}`}
+>
+  <Avatar.Fallback
+    class="bg-transparent text-white"
+    style={`font-size: ${size === 'sm' ? '8px' : '10px'}; font-weight: 600`}
+  >
+    {initials}
+  </Avatar.Fallback>
+</Avatar.Root>
diff --git a/frontend/viewer/src/lib/entry-editor/comments/CommentDialog.svelte b/frontend/viewer/src/lib/entry-editor/comments/CommentDialog.svelte
new file mode 100644
index 0000000000..53dd549e65
--- /dev/null
+++ b/frontend/viewer/src/lib/entry-editor/comments/CommentDialog.svelte
@@ -0,0 +1,338 @@
+<script lang="ts">
+  import * as Drawer from '$lib/components/ui/drawer';
+  import * as Sheet from '$lib/components/ui/sheet';
+  import {buttonVariants} from '$lib/components/ui/button';
+  import {Icon} from '$lib/components/ui/icon';
+  import {IsExtraLarge} from '$lib/hooks/is-extra-large.svelte';
+  import {IsMobile} from '$lib/hooks/is-mobile.svelte';
+  import {useMiniLcmApi} from '$lib/services/service-provider';
+  import {useProjectContext} from '$project/project-context.svelte';
+  import {cn, randomId} from '$lib/utils';
+  import type {IUserComment} from '$lib/dotnet-types/generated-types/MiniLcm/Models/IUserComment';
+  import type {SubjectType} from '$lib/dotnet-types/generated-types/MiniLcm/Models/SubjectType';
+  import {ThreadStatus} from '$lib/dotnet-types/generated-types/MiniLcm/Models/ThreadStatus';
+  import type {ClassValue} from 'clsx';
+  import {resource, watch} from 'runed';
+  import {t} from 'svelte-i18n-lingui';
+  import CommentPanel from './CommentPanel.svelte';
+  import type {ThreadView} from './types';
+
+  let {
+    open = $bindable(false),
+    subjectType,
+    subjectId,
+    subjectName,
+    unreadComments = null,
+    inlineSidebar = false,
+    class: className,
+    onUnreadCommentsChange,
+  }: {
+    open: boolean;
+    subjectType: SubjectType;
+    subjectId: string;
+    subjectName?: string;
+    /** When null, unread comments are fetched for the subject. When set, used as-is (no fetch). */
+    unreadComments?: IUserComment[] | null;
+    inlineSidebar?: boolean;
+    class?: ClassValue;
+    onUnreadCommentsChange?: (comments: IUserComment[]) => void;
+  } = $props();
+
+  const api = useMiniLcmApi();
+  const projectContext = useProjectContext();
+  const currentUserId = $derived(projectContext.projectData?.lastUserId);
+  const canComment = $derived(Boolean(currentUserId) && !!projectContext.features.write);
+
+  let saving = $state(false);
+  let newThreadText = $state('');
+  let editingCommentId = $state<string>();
+  let addingComment = $state(false);
+  let expandedThreadIds = $state(new Set<string>());
+  let mobileThreadId = $state<string | null>(null);
+
+  const threadsResource = resource(
+    [() => open, () => subjectType, () => subjectId],
+    async ([isOpen, targetSubjectType, targetSubjectId]): Promise<ThreadView[]> => {
+      if (!isOpen) return [];
+      const threads = await api.getCommentThreads(targetSubjectType, targetSubjectId, true);
+      return threads.map((thread) => ({thread, comments: thread.comments ?? []}));
+    },
+    {initialValue: [] satisfies ThreadView[]},
+  );
+  const threadViews = $derived(threadsResource.current);
+  const loading = $derived(threadsResource.loading);
+
+  const unreadResource = resource(
+    [() => open, () => subjectType, () => subjectId, () => unreadComments],
+    async ([isOpen, targetSubjectType, targetSubjectId, externalUnread]): Promise<IUserComment[]> => {
+      if (!isOpen || externalUnread !== null) return [];
+      return api.getUnreadCommentsForSubject(targetSubjectType, targetSubjectId);
+    },
+    {initialValue: [] satisfies IUserComment[]},
+  );
+
+  let localUnreadComments = $state<IUserComment[]>([]);
+
+  function syncLocalUnreadFromSource(): void {
+    if (!open) {
+      localUnreadComments = [];
+      return;
+    }
+    if (unreadComments !== null) {
+      localUnreadComments = [...unreadComments];
+      return;
+    }
+    localUnreadComments = [...unreadResource.current];
+  }
+
+  watch(
+    () => [open, subjectType, subjectId, unreadComments, unreadResource.current] as const,
+    () => {
+      syncLocalUnreadFromSource();
+    },
+  );
+
+  const unreadThreadIds = $derived(new Set(localUnreadComments.map((c) => c.commentThreadId)));
+
+  async function refetchUnreadIfNeeded(): Promise<void> {
+    if (open && unreadComments === null) {
+      await unreadResource.refetch();
+      syncLocalUnreadFromSource();
+    }
+  }
+
+  async function onThreadOpen(threadId: string): Promise<void> {
+    if (!unreadThreadIds.has(threadId)) return;
+    await api.markCommentThreadRead(threadId);
+    localUnreadComments = localUnreadComments.filter((c) => c.commentThreadId !== threadId);
+    onUnreadCommentsChange?.(localUnreadComments);
+  }
+
+  const title = $derived(subjectName ? $t`Comments for ${subjectName}` : $t`Comments`);
+  const dockBottom = $derived(!IsExtraLarge.value);
+
+  // Bottom-dock: snap points least→most visible. Default open height is the middle stop.
+  const commentSnapPoints = [0.35, 0.55, 0.9] as const;
+  const defaultCommentSnap = commentSnapPoints[1];
+  let activeSnapPoint = $state<number | string | null>(defaultCommentSnap);
+
+  function setOpen(value: boolean): void {
+    if (value && dockBottom) activeSnapPoint = defaultCommentSnap;
+    open = value;
+  }
+
+  watch(
+    () => open,
+    (isOpen) => {
+      if (isOpen) {
+        if (dockBottom) activeSnapPoint = defaultCommentSnap;
+        return;
+      }
+      addingComment = false;
+      newThreadText = '';
+      editingCommentId = undefined;
+      expandedThreadIds = new Set();
+      mobileThreadId = null;
+      // Vaul assigns snapPoints[0] after close; restore default for the next open.
+      window.setTimeout(() => {
+        if (!open) activeSnapPoint = defaultCommentSnap;
+      }, 500);
+    },
+  );
+
+  watch(
+    () => dockBottom,
+    (isBottom) => {
+      if (!isBottom) mobileThreadId = null;
+      else expandedThreadIds = new Set();
+    },
+  );
+
+  function onOpenChange(value: boolean): void {
+    setOpen(value);
+  }
+
+  async function startThread(): Promise<void> {
+    const text = newThreadText.trim();
+    if (!text) return;
+
+    saving = true;
+    try {
+      const now = new Date().toISOString();
+      const threadId = randomId();
+      await api.createCommentThread({
+        id: threadId,
+        subjectId,
+        subjectType,
+        status: ThreadStatus.Open,
+        createdAt: now,
+        updatedAt: now,
+      }, {
+        id: randomId(),
+        commentThreadId: threadId,
+        text,
+        createdAt: now,
+        updatedAt: now,
+      });
+      newThreadText = '';
+      addingComment = false;
+      await threadsResource.refetch();
+      await refetchUnreadIfNeeded();
+    } finally {
+      saving = false;
+    }
+  }
+
+  async function replyToThread(threadView: ThreadView, text: string): Promise<void> {
+    const threadId = threadView.thread.id;
+    const trimmed = text.trim();
+    if (!trimmed) return;
+
+    saving = true;
+    try {
+      const now = new Date().toISOString();
+      await api.addUserComment(threadId, {
+        id: randomId(),
+        commentThreadId: threadId,
+        previousCommentId: threadView.comments.at(-1)?.id,
+        text: trimmed,
+        createdAt: now,
+        updatedAt: now,
+      });
+      await threadsResource.refetch();
+      await refetchUnreadIfNeeded();
+    } finally {
+      saving = false;
+    }
+  }
+
+  async function resolveThread(threadView: ThreadView): Promise<void> {
+    saving = true;
+    try {
+      const nextStatus =
+        threadView.thread.status === ThreadStatus.Closed ? ThreadStatus.Open : ThreadStatus.Closed;
+      await api.setCommentThreadStatus(threadView.thread.id, nextStatus);
+      await threadsResource.refetch();
+      await refetchUnreadIfNeeded();
+    } finally {
+      saving = false;
+    }
+  }
+
+  function startEditing(comment: IUserComment): void {
+    editingCommentId = comment.id;
+  }
+
+  function cancelEditing(_commentId: string): void {
+    editingCommentId = undefined;
+  }
+
+  async function saveEdit(commentId: string, text: string): Promise<void> {
+    const trimmed = text.trim();
+    if (!trimmed) return;
+
+    saving = true;
+    try {
+      await api.editUserComment(commentId, trimmed);
+      cancelEditing(commentId);
+      await threadsResource.refetch();
+      await refetchUnreadIfNeeded();
+    } finally {
+      saving = false;
+    }
+  }
+</script>
+
+{#snippet panel()}
+  <CommentPanel
+    bind:newThreadText
+    bind:addingComment
+    bind:expandedThreadIds
+    bind:mobileThreadId
+    {canComment}
+    {loading}
+    {saving}
+    {threadViews}
+    {editingCommentId}
+    {currentUserId}
+    {unreadThreadIds}
+    unreadCount={localUnreadComments.length}
+    onClose={() => onOpenChange(false)}
+    onStartThread={startThread}
+    onReply={replyToThread}
+    onResolve={resolveThread}
+    onStartEdit={startEditing}
+    onCancelEdit={cancelEditing}
+    onSaveEdit={saveEdit}
+    onThreadOpen={onThreadOpen}
+  />
+{/snippet}
+
+{#if inlineSidebar && open && !dockBottom}
+  <aside
+    class={cn(
+      'flex h-full min-h-0 w-[360px] shrink-0 flex-col overflow-hidden rounded-lg border bg-background shadow-sm',
+      className,
+    )}
+  >
+    {@render panel()}
+  </aside>
+{:else if inlineSidebar && dockBottom}
+  <Drawer.Root
+    bind:open={() => open, onOpenChange}
+    bind:activeSnapPoint
+    modal={false}
+    shouldScaleBackground={false}
+    snapPoints={[...commentSnapPoints]}
+    snapToSequentialPoint
+  >
+    <Drawer.Content
+      handle={false}
+      class="fixed mt-0 h-dvh max-h-dvh overflow-hidden p-0 data-[vaul-drawer-direction=bottom]:mt-0 data-[vaul-drawer-direction=bottom]:h-dvh data-[vaul-drawer-direction=bottom]:max-h-dvh"
+    >
+      <Drawer.Title class="sr-only">{title}</Drawer.Title>
+      <!--
+        Vaul translates a full-viewport sheet for snaps. Keep position:fixed (do not use
+        relative — it overrides fixed) and size the panel to the active snap so the reply
+        footer sits on the visible bottom edge. Custom handle: the default one sits under
+        this absolute panel and would be covered.
+      -->
+      <div
+        class="absolute inset-x-0 top-0 flex flex-col overflow-hidden bg-background"
+        style:height="{(typeof activeSnapPoint === 'number' ? activeSnapPoint : defaultCommentSnap) * 100}dvh"
+      >
+        <div class="bg-muted mx-auto mt-4 h-2 w-[100px] shrink-0 rounded-full" aria-hidden="true"></div>
+        <div class="flex min-h-0 flex-1 flex-col overflow-hidden">
+          {@render panel()}
+        </div>
+      </div>
+    </Drawer.Content>
+  </Drawer.Root>
+{:else if IsMobile.value}
+  <Drawer.Root bind:open={() => open, onOpenChange}>
+    <Drawer.Content class="max-h-[90dvh] overflow-hidden">
+      <Drawer.Close
+        class={buttonVariants({variant: 'ghost', size: 'icon', class: 'absolute top-4 right-4 z-10'})}
+        aria-label={$t`Close`}
+      >
+        <Icon icon="i-mdi-close" />
+      </Drawer.Close>
+
+      <div class="mx-auto flex max-h-[90dvh] w-full max-w-lg flex-1 flex-col overflow-hidden">
+        <Drawer.Header class="px-4 text-left">
+          <Drawer.Title class="max-w-[calc(100%-2rem)] truncate pr-2 text-left" title={title}>{title}</Drawer.Title>
+        </Drawer.Header>
+        {@render panel()}
+      </div>
+    </Drawer.Content>
+  </Drawer.Root>
+{:else}
+  <Sheet.Root bind:open={() => open, onOpenChange}>
+    <Sheet.Content side="right" class="w-full overflow-hidden p-0 sm:max-w-md">
+      <Sheet.Header class="px-4 pb-0">
+        <Sheet.Title class="max-w-[calc(100%-2rem)] truncate pr-2" title={title}>{title}</Sheet.Title>
+      </Sheet.Header>
+      {@render panel()}
+    </Sheet.Content>
+  </Sheet.Root>
+{/if}
diff --git a/frontend/viewer/src/lib/entry-editor/comments/CommentItem.svelte b/frontend/viewer/src/lib/entry-editor/comments/CommentItem.svelte
new file mode 100644
index 0000000000..9f5827c64e
--- /dev/null
+++ b/frontend/viewer/src/lib/entry-editor/comments/CommentItem.svelte
@@ -0,0 +1,118 @@
+<script lang="ts">
+  import {Button} from '$lib/components/ui/button';
+  import {FormatRelativeDate} from '$lib/components/ui/format';
+  import {Textarea} from '$lib/components/ui/textarea';
+  import type {IUserComment} from '$lib/dotnet-types/generated-types/MiniLcm/Models/IUserComment';
+  import HistoryView from '$lib/history/HistoryView.svelte';
+  import {useFeatures} from '$lib/services/feature-service';
+  import {cn} from '$lib/utils';
+  import {t} from 'svelte-i18n-lingui';
+  import CommentAuthorAvatar from './CommentAuthorAvatar.svelte';
+
+  let {
+    comment,
+    canEdit,
+    saving,
+    editing,
+    compact = false,
+    onStartEdit,
+    onCancelEdit,
+    onSaveEdit,
+  }: {
+    comment: IUserComment;
+    canEdit: boolean;
+    saving: boolean;
+    editing: boolean;
+    compact?: boolean;
+    onStartEdit: () => void;
+    onCancelEdit: () => void;
+    onSaveEdit: (text: string) => void;
+  } = $props();
+
+  const features = useFeatures();
+  let draftText = $state('');
+  let showHistoryView = $state(false);
+
+  const isEdited = $derived(
+    new Date(comment.updatedAt).getTime() !== new Date(comment.createdAt).getTime()
+  );
+
+  $effect(() => {
+    if (editing) {
+      draftText = comment.text;
+    }
+  });
+</script>
+
+<article class={cn('flex gap-2', compact && 'pt-2.5')}>
+  <CommentAuthorAvatar
+    authorName={comment.authorName}
+    authorId={comment.authorId}
+    size={compact ? 'sm' : 'md'}
+  />
+  <div class="min-w-0 flex-1">
+    <div class="mb-0.5 flex items-center gap-1.5">
+      <span class="truncate text-[13px] font-semibold">
+        {comment.authorName || $t`(unknown)`}
+      </span>
+      <div class="ms-auto flex shrink-0 items-center gap-1 text-[11px] text-muted-foreground">
+        <FormatRelativeDate
+          class="shrink-0"
+          date={comment.createdAt}
+          maxUnits={1}
+          smallestUnit="minutes"
+          options={{style: 'narrow'}}
+        />
+        {#if isEdited}
+          {#if features.history}
+            <button
+              type="button"
+              class="cursor-pointer underline-offset-2 hover:underline"
+              onclick={() => (showHistoryView = true)}
+            >
+              {$t`(edited)`}
+            </button>
+            <HistoryView bind:open={showHistoryView} id={comment.id} />
+          {:else}
+            <span>{$t`(edited)`}</span>
+          {/if}
+        {/if}
+      </div>
+    </div>
+
+    {#if editing}
+      <div class="flex flex-col gap-1.5">
+        <Textarea
+          bind:value={draftText}
+          aria-label={$t`Edit comment`}
+          rows={3}
+          disabled={saving}
+          class="max-h-40 overflow-y-auto text-[13px]"
+        />
+        <div class="flex gap-1.5">
+          <Button size="sm" onclick={() => onSaveEdit(draftText)} disabled={!draftText.trim()} loading={saving}>
+            {$t`Save`}
+          </Button>
+          <Button variant="outline" size="sm" onclick={onCancelEdit} disabled={saving}>
+            {$t`Cancel`}
+          </Button>
+        </div>
+      </div>
+    {:else}
+      <p class={cn('m-0 text-[13px] leading-relaxed break-words whitespace-pre-wrap', !comment.text && 'text-muted-foreground')}>
+        {comment.text || $t`Empty comment`}
+      </p>
+      {#if canEdit}
+        <Button
+          variant="ghost"
+          size="xs"
+          class="mt-0.5 h-5 px-1 text-[11px] text-muted-foreground"
+          onclick={onStartEdit}
+          disabled={saving}
+        >
+          {$t`Edit`}
+        </Button>
+      {/if}
+    {/if}
+  </div>
+</article>
diff --git a/frontend/viewer/src/lib/entry-editor/comments/CommentPanel.svelte b/frontend/viewer/src/lib/entry-editor/comments/CommentPanel.svelte
new file mode 100644
index 0000000000..dfb7aa0229
--- /dev/null
+++ b/frontend/viewer/src/lib/entry-editor/comments/CommentPanel.svelte
@@ -0,0 +1,299 @@
+<script lang="ts">
+  import {Button, XButton} from '$lib/components/ui/button';
+  import * as Collapsible from '$lib/components/ui/collapsible';
+  import {Icon} from '$lib/components/ui/icon';
+  import {Textarea} from '$lib/components/ui/textarea';
+  import type {IUserComment} from '$lib/dotnet-types/generated-types/MiniLcm/Models/IUserComment';
+  import {ThreadStatus} from '$lib/dotnet-types/generated-types/MiniLcm/Models/ThreadStatus';
+  import {IsExtraLarge} from '$lib/hooks/is-extra-large.svelte';
+  import {cn} from '$lib/utils';
+  import {useProjectContext} from '$project/project-context.svelte';
+  import {t} from 'svelte-i18n-lingui';
+  import CommentAuthorAvatar from './CommentAuthorAvatar.svelte';
+  import CommentItem from './CommentItem.svelte';
+  import CommentReplyInput from './CommentReplyInput.svelte';
+  import CommentThread from './CommentThread.svelte';
+  import type {ThreadView} from './types';
+  import {slide} from 'svelte/transition';
+  import {SvelteSet} from 'svelte/reactivity';
+
+  let {
+    canComment,
+    loading,
+    saving,
+    threadViews,
+    newThreadText = $bindable(''),
+    editingCommentId,
+    currentUserId,
+    addingComment = $bindable(false),
+    expandedThreadIds = $bindable(new Set<string>()),
+    mobileThreadId = $bindable<string | null>(null),
+    onClose,
+    onStartThread,
+    onReply,
+    onResolve,
+    onStartEdit,
+    onCancelEdit,
+    onSaveEdit,
+    unreadThreadIds = new Set<string>(),
+    unreadCount = 0,
+    onThreadOpen,
+  }: {
+    canComment: boolean;
+    loading: boolean;
+    saving: boolean;
+    threadViews: ThreadView[];
+    newThreadText?: string;
+    editingCommentId?: string;
+    currentUserId?: string;
+    addingComment?: boolean;
+    expandedThreadIds?: Set<string>;
+    mobileThreadId?: string | null;
+    unreadThreadIds?: Set<string>;
+    unreadCount?: number;
+    onClose?: () => void;
+    onStartThread: () => void;
+    onReply: (threadView: ThreadView, text: string) => void | Promise<void>;
+    onResolve: (threadView: ThreadView) => void | Promise<void>;
+    onStartEdit: (comment: IUserComment) => void;
+    onCancelEdit: (commentId: string) => void;
+    onSaveEdit: (commentId: string, text: string) => void;
+    onThreadOpen?: (threadId: string) => void | Promise<void>;
+  } = $props();
+
+  const projectContext = useProjectContext();
+  const authorName = $derived(projectContext.projectData?.lastUserName);
+
+  const openThreads = $derived(threadViews.filter((tv) => tv.thread.status === ThreadStatus.Open));
+  const resolvedThreads = $derived(threadViews.filter((tv) => tv.thread.status === ThreadStatus.Closed));
+  const mobileThreadView = $derived(
+    mobileThreadId ? threadViews.find((tv) => tv.thread.id === mobileThreadId) : undefined,
+  );
+  const mobileResolved = $derived(mobileThreadView?.thread.status === ThreadStatus.Closed);
+  /** Full-area thread detail (mobile + tablet bottom drawer), vs in-place expand on desktop sidebar */
+  const useThreadDetail = $derived(!IsExtraLarge.value);
+  const showThreadDetail = $derived(useThreadDetail && Boolean(mobileThreadView));
+
+  function toggleExpanded(threadId: string): void {
+    if (useThreadDetail) {
+      mobileThreadId = threadId;
+      void onThreadOpen?.(threadId);
+      return;
+    }
+    const next = new SvelteSet(expandedThreadIds);
+    if (next.has(threadId)) next.delete(threadId);
+    else {
+      next.add(threadId);
+      void onThreadOpen?.(threadId);
+    }
+    expandedThreadIds = next;
+  }
+
+  function startAdding(): void {
+    addingComment = true;
+    newThreadText = '';
+  }
+
+  function cancelAdding(): void {
+    addingComment = false;
+    newThreadText = '';
+  }
+
+  function submitNewThread(): void {
+    if (!newThreadText.trim()) return;
+    onStartThread();
+  }
+
+  function backFromMobileDetail(): void {
+    mobileThreadId = null;
+  }
+</script>
+
+<div class="flex h-full min-h-0 flex-col overflow-hidden bg-background">
+  {#if !showThreadDetail}
+    <div class="flex shrink-0 items-center justify-between gap-2 border-b border-border px-4 pt-3.5 pb-2.5">
+      <div class="flex items-center gap-2">
+        {#if onClose}
+          <XButton class="size-6" onclick={onClose} />
+        {/if}
+        <h2 class="text-sm font-semibold">{$t`Comments`}</h2>
+      </div>
+      <div class="flex items-center gap-1.5">
+        {#if canComment}
+          <Button size="xs" icon="i-mdi-plus" class="h-7 px-2.5 text-xs" onclick={startAdding}>
+            {$t`Conversation`}
+          </Button>
+        {/if}
+      </div>
+    </div>
+
+    {#if addingComment}
+      <div class="flex shrink-0 flex-col gap-2 border-b border-border px-3.5 py-3" transition:slide>
+        {#if canComment}
+          <div class="flex items-start gap-2">
+            <CommentAuthorAvatar {authorName} authorId={currentUserId} size="md" class="mt-1 shrink-0" />
+            <div class="flex flex-1 flex-col gap-1.5">
+              <Textarea
+                autofocus
+                bind:value={newThreadText}
+                placeholder={$t`Start a conversation…`}
+                rows={3}
+                disabled={loading || saving}
+                class="max-h-40 overflow-y-auto text-sm"
+                onkeydown={(e) => {
+                  if (e.key === 'Enter' && (e.metaKey || e.ctrlKey)) {
+                    e.preventDefault();
+                    submitNewThread();
+                  }
+                }}
+              />
+              <div class="flex justify-end gap-1.5">
+                <Button variant="outline" size="sm" onclick={cancelAdding} disabled={saving}>
+                  {$t`Cancel`}
+                </Button>
+                <Button size="sm" onclick={submitNewThread} disabled={!newThreadText.trim() || loading} loading={saving}>
+                  {$t`Comment`}
+                </Button>
+              </div>
+            </div>
+          </div>
+        {:else}
+          <p class="rounded-md border border-dashed p-3 text-sm text-muted-foreground">
+            {$t`Sign in to add comments.`}
+          </p>
+        {/if}
+      </div>
+    {/if}
+  {/if}
+
+  {#if showThreadDetail && mobileThreadView}
+    <div class="flex h-full min-h-0 flex-col overflow-hidden">
+      <div class="flex shrink-0 items-center gap-2.5 border-b border-border px-3.5 py-2.5">
+        <Button
+          variant="ghost"
+          size="xs"
+          class="h-7 px-2 text-[13px]"
+          icon="i-mdi-arrow-left"
+          onclick={backFromMobileDetail}
+        >
+          {$t`Back`}
+        </Button>
+        <Button
+          variant="outline"
+          size="xs"
+          class={cn(
+            'ms-auto h-7 shrink-0 px-2.5 text-[11px]',
+            !mobileResolved && 'border-primary text-primary hover:bg-primary/10 hover:text-primary',
+          )}
+          icon={mobileResolved ? 'i-mdi-restore' : 'i-mdi-check-bold'}
+          onclick={() => onResolve(mobileThreadView)}
+          disabled={saving}
+        >
+          {mobileResolved ? $t`Reopen` : $t`Resolve`}
+        </Button>
+      </div>
+
+      <div class="min-h-0 flex-1 overflow-y-auto p-3.5">
+        <div class="flex flex-col">
+          {#each mobileThreadView.comments as comment, index (comment.id)}
+            <CommentItem
+              {comment}
+              compact={index > 0}
+              canEdit={Boolean(currentUserId && comment.authorId === currentUserId)}
+              {saving}
+              editing={editingCommentId === comment.id}
+              onStartEdit={() => onStartEdit(comment)}
+              onCancelEdit={() => onCancelEdit(comment.id)}
+              onSaveEdit={(text) => onSaveEdit(comment.id, text)}
+            />
+          {/each}
+        </div>
+      </div>
+
+      {#if canComment && !mobileResolved}
+        <div class="shrink-0 border-t border-border px-3.5 py-2.5">
+          <CommentReplyInput
+            variant="inline"
+            {saving}
+            onSubmit={(text) => onReply(mobileThreadView, text)}
+          />
+        </div>
+      {/if}
+    </div>
+  {:else}
+    <div class="min-h-0 flex-1 overflow-y-auto p-3">
+      <div class="flex flex-col gap-2.5">
+        {#if loading}
+          <p class="pt-8 text-center text-[13px] text-muted-foreground">{$t`Loading comments...`}</p>
+        {:else}
+          {#if openThreads.length === 0}
+            {#if canComment}
+              <div class="pt-8 text-center text-[13px] leading-relaxed text-muted-foreground">
+                <p>{$t`No open conversations`}</p>
+                <Button size="xs" icon="i-mdi-plus" class="h-7 px-2.5 text-xs" onclick={startAdding}>
+                  {$t`Start a conversation`}
+                </Button>
+              </div>
+            {:else}
+              <p class="pt-8 text-center text-[13px] text-muted-foreground">
+                {$t`No open conversations`}
+              </p>
+            {/if}
+          {:else}
+            {#each openThreads as threadView (threadView.thread.id)}
+              <CommentThread
+                {threadView}
+                {canComment}
+                {saving}
+                {currentUserId}
+                {editingCommentId}
+                hasUnread={unreadThreadIds.has(threadView.thread.id)}
+                expanded={!useThreadDetail && expandedThreadIds.has(threadView.thread.id)}
+                onToggle={() => toggleExpanded(threadView.thread.id)}
+                onResolve={() => onResolve(threadView)}
+                onReply={(text) => onReply(threadView, text)}
+                {onStartEdit}
+                {onCancelEdit}
+                {onSaveEdit}
+              />
+            {/each}
+          {/if}
+          {#if resolvedThreads.length > 0}
+            <Collapsible.Root class={cn(openThreads.length > 0 && 'mt-1')}>
+              <Collapsible.Trigger
+                class="flex cursor-pointer items-center gap-1 text-[11px] text-muted-foreground [&[data-state=open]>.i-mdi-chevron-down]:rotate-180"
+              >
+                <Icon
+                  icon="i-mdi-chevron-down"
+                  class="size-3.5 shrink-0 transition-transform"
+                />
+                {$t`${resolvedThreads.length} resolved`}
+              </Collapsible.Trigger>
+              <Collapsible.Content class="overflow-hidden">
+                <div class="mt-2.5 flex flex-col gap-2.5">
+                  {#each resolvedThreads as threadView (threadView.thread.id)}
+                    <CommentThread
+                      {threadView}
+                      {canComment}
+                      {saving}
+                      {currentUserId}
+                      {editingCommentId}
+                      hasUnread={unreadThreadIds.has(threadView.thread.id)}
+                      expanded={!useThreadDetail && expandedThreadIds.has(threadView.thread.id)}
+                      onToggle={() => toggleExpanded(threadView.thread.id)}
+                      onResolve={() => onResolve(threadView)}
+                      onReply={(text) => onReply(threadView, text)}
+                      {onStartEdit}
+                      {onCancelEdit}
+                      {onSaveEdit}
+                    />
+                  {/each}
+                </div>
+              </Collapsible.Content>
+            </Collapsible.Root>
+          {/if}
+        {/if}
+      </div>
+    </div>
+  {/if}
+</div>
diff --git a/frontend/viewer/src/lib/entry-editor/comments/CommentReplyInput.svelte b/frontend/viewer/src/lib/entry-editor/comments/CommentReplyInput.svelte
new file mode 100644
index 0000000000..d5d0a284be
--- /dev/null
+++ b/frontend/viewer/src/lib/entry-editor/comments/CommentReplyInput.svelte
@@ -0,0 +1,118 @@
+<script lang="ts">
+  import {Button} from '$lib/components/ui/button';
+  import {Textarea} from '$lib/components/ui/textarea';
+  import {useProjectContext} from '$project/project-context.svelte';
+  import {t} from 'svelte-i18n-lingui';
+  import CommentAuthorAvatar from './CommentAuthorAvatar.svelte';
+
+  let {
+    value = $bindable(''),
+    saving = false,
+    placeholder,
+    variant = 'default',
+    autofocus = false,
+    onSubmit,
+  }: {
+    value?: string;
+    saving?: boolean;
+    placeholder?: string;
+    variant?: 'default' | 'inline';
+    autofocus?: boolean;
+    onSubmit: (text: string) => void | Promise<void>;
+  } = $props();
+
+  const projectContext = useProjectContext();
+  const authorId = $derived(projectContext.projectData?.lastUserId);
+  const authorName = $derived(projectContext.projectData?.lastUserName);
+
+  let focused = $state(false);
+  let textareaEl = $state<HTMLTextAreaElement | null>(null);
+
+  const replyPlaceholder = $derived(placeholder ?? $t`Reply…`);
+  const showActions = $derived(focused || value.trim().length > 0);
+  const canSend = $derived(Boolean(value.trim()) && !saving);
+
+  async function submit(): Promise<void> {
+    const text = value.trim();
+    if (!text) return;
+    await onSubmit(text);
+    value = '';
+    focused = false;
+    textareaEl?.blur();
+  }
+
+  function cancel(): void {
+    value = '';
+    focused = false;
+    textareaEl?.blur();
+  }
+
+  function onFocusOut(event: FocusEvent): void {
+    const next = event.relatedTarget as Node | null;
+    if (event.currentTarget instanceof Node && next && event.currentTarget.contains(next)) return;
+    focused = false;
+  }
+
+  function onKeyDown(e: KeyboardEvent): void {
+    if (e.key === 'Enter' && (e.metaKey || e.ctrlKey)) {
+      e.preventDefault();
+      void submit();
+    }
+    if (e.key === 'Escape') {
+      e.preventDefault();
+      cancel();
+    }
+  }
+</script>
+
+{#if variant === 'inline'}
+  <div class="flex items-start gap-2" onfocusin={() => (focused = true)} onfocusout={onFocusOut}>
+    <CommentAuthorAvatar {authorName} {authorId} size="md" class="mt-1.5 shrink-0" />
+    <Textarea
+      {autofocus}
+      bind:ref={textareaEl}
+      bind:value
+      placeholder={replyPlaceholder}
+      rows={1}
+      disabled={saving}
+      class="min-h-9 max-h-40 flex-1 overflow-y-auto py-[7px] text-sm leading-5 md:text-sm"
+      onkeydown={onKeyDown}
+    />
+    <Button
+      variant="default"
+      size="icon"
+      class="size-9 max-h-9 max-w-9 min-h-9 min-w-9 shrink-0"
+      icon="i-mdi-send"
+      aria-label={$t`Reply`}
+      onclick={() => void submit()}
+      disabled={!canSend}
+      loading={saving}
+    />
+  </div>
+{:else}
+  <div class="flex items-start gap-2" onfocusin={() => (focused = true)} onfocusout={onFocusOut}>
+    <CommentAuthorAvatar {authorName} {authorId} size="md" class="mt-1 shrink-0" />
+    <div class="flex flex-1 flex-col gap-1.5">
+      <Textarea
+        {autofocus}
+        bind:ref={textareaEl}
+        bind:value
+        placeholder={replyPlaceholder}
+        rows={1}
+        disabled={saving}
+        class="min-h-8 max-h-40 overflow-y-auto py-1.5 text-sm"
+        onkeydown={onKeyDown}
+      />
+      {#if showActions}
+        <div class="flex justify-end gap-1.5">
+          <Button variant="outline" size="sm" onclick={cancel} disabled={saving}>
+            {$t`Cancel`}
+          </Button>
+          <Button size="sm" onclick={() => void submit()} disabled={!canSend} loading={saving}>
+            {$t`Reply`}
+          </Button>
+        </div>
+      {/if}
+    </div>
+  </div>
+{/if}
diff --git a/frontend/viewer/src/lib/entry-editor/comments/CommentThread.svelte b/frontend/viewer/src/lib/entry-editor/comments/CommentThread.svelte
new file mode 100644
index 0000000000..ef28cecc80
--- /dev/null
+++ b/frontend/viewer/src/lib/entry-editor/comments/CommentThread.svelte
@@ -0,0 +1,149 @@
+<script lang="ts">
+  import {Button} from '$lib/components/ui/button';
+  import * as Collapsible from '$lib/components/ui/collapsible';
+  import {Icon} from '$lib/components/ui/icon';
+  import * as Tooltip from '$lib/components/ui/tooltip';
+  import type {IUserComment} from '$lib/dotnet-types/generated-types/MiniLcm/Models/IUserComment';
+  import {ThreadStatus} from '$lib/dotnet-types/generated-types/MiniLcm/Models/ThreadStatus';
+  import {cn} from '$lib/utils';
+  import {t} from 'svelte-i18n-lingui';
+  import CommentAuthorAvatar from './CommentAuthorAvatar.svelte';
+  import CommentItem from './CommentItem.svelte';
+  import CommentReplyInput from './CommentReplyInput.svelte';
+  import type {ThreadView} from './types';
+
+  let {
+    threadView,
+    canComment,
+    saving,
+    currentUserId,
+    editingCommentId,
+    expanded = false,
+    hasUnread = false,
+    onToggle,
+    onResolve,
+    onReply,
+    onStartEdit,
+    onCancelEdit,
+    onSaveEdit,
+  }: {
+    threadView: ThreadView;
+    canComment: boolean;
+    saving: boolean;
+    currentUserId?: string;
+    editingCommentId?: string;
+    expanded?: boolean;
+    hasUnread?: boolean;
+    onToggle: () => void;
+    onResolve: () => void;
+    onReply: (text: string) => void | Promise<void>;
+    onStartEdit: (comment: IUserComment) => void;
+    onCancelEdit: (commentId: string) => void;
+    onSaveEdit: (commentId: string, text: string) => void;
+  } = $props();
+
+  const resolved = $derived(threadView.thread.status === ThreadStatus.Closed);
+  const firstComment = $derived(threadView.comments[0]);
+  const replyCount = $derived(Math.max(0, threadView.comments.length - 1));
+
+  function onOpenChange(next: boolean): void {
+    if (next !== expanded) onToggle();
+  }
+</script>
+
+<section
+  class={cn(
+    'shrink-0 overflow-hidden rounded-lg border border-border',
+    resolved ? 'opacity-65' : 'border-l-[3px] border-l-primary bg-card',
+  )}
+>
+  <Collapsible.Root open={expanded} onOpenChange={onOpenChange}>
+    <Collapsible.Trigger
+      class="flex w-full cursor-pointer items-center gap-2 px-3.5 py-2.5 text-start [&[data-state=open]>.i-mdi-chevron-down]:rotate-180"
+    >
+      {#if firstComment}
+        <CommentAuthorAvatar
+          authorName={firstComment.authorName}
+          authorId={firstComment.authorId}
+          size="sm"
+        />
+      {/if}
+      <div class="min-w-0 flex-1">
+        {#if !expanded && firstComment}
+          <p class="m-0 truncate text-xs text-muted-foreground">
+            {firstComment.text}
+          </p>
+        {/if}
+      </div>
+      {#if !expanded && replyCount > 0}
+        <span class="shrink-0 text-[11px] text-muted-foreground">
+          {replyCount === 1 ? $t`1 reply` : $t`${replyCount} replies`}
+        </span>
+      {/if}
+      {#if hasUnread}
+        <span
+          class="size-2 shrink-0 rounded-full bg-primary"
+          aria-label={$t`Unread`}
+          title={$t`Unread`}
+        ></span>
+      {/if}
+      <Icon
+        icon="i-mdi-chevron-down"
+        class="size-4 shrink-0 text-muted-foreground transition-transform"
+      />
+      <Tooltip.Root>
+        <Tooltip.Trigger>
+          {#snippet child({props})}
+            <Button
+              variant="outline"
+              size="icon-xs"
+              class={cn(
+                'size-6 shrink-0',
+                resolved
+                  ? 'text-muted-foreground'
+                  : 'border-primary text-primary hover:bg-primary/10 hover:text-primary',
+              )}
+              aria-label={resolved ? $t`Reopen` : $t`Resolve`}
+              icon={resolved ? 'i-mdi-restore' : 'i-mdi-check-bold'}
+              iconProps={{class: 'size-3.5'}}
+              disabled={saving}
+              {...props}
+              onclick={(e) => {
+                e.stopPropagation();
+                onResolve();
+              }}
+            />
+          {/snippet}
+        </Tooltip.Trigger>
+        <Tooltip.Content>
+          {resolved ? $t`Reopen` : $t`Resolve`}
+        </Tooltip.Content>
+      </Tooltip.Root>
+    </Collapsible.Trigger>
+
+    <Collapsible.Content class="overflow-hidden">
+      <div class="border-t border-border px-3.5 pt-2.5 pb-3">
+        <div class="flex flex-col">
+          {#each threadView.comments as comment, index (comment.id)}
+            <CommentItem
+              {comment}
+              compact={index > 0}
+              canEdit={Boolean(currentUserId && comment.authorId === currentUserId)}
+              {saving}
+              editing={editingCommentId === comment.id}
+              onStartEdit={() => onStartEdit(comment)}
+              onCancelEdit={() => onCancelEdit(comment.id)}
+              onSaveEdit={(text) => onSaveEdit(comment.id, text)}
+            />
+          {/each}
+        </div>
+
+        {#if canComment && !resolved}
+          <div class="mt-2.5 border-t border-border pt-2.5">
+            <CommentReplyInput {saving} onSubmit={onReply} />
+          </div>
+        {/if}
+      </div>
+    </Collapsible.Content>
+  </Collapsible.Root>
+</section>
diff --git a/frontend/viewer/src/lib/entry-editor/comments/comment-author.ts b/frontend/viewer/src/lib/entry-editor/comments/comment-author.ts
new file mode 100644
index 0000000000..0c487b8d06
--- /dev/null
+++ b/frontend/viewer/src/lib/entry-editor/comments/comment-author.ts
@@ -0,0 +1,30 @@
+const AVATAR_COLORS = [
+  'oklch(55% 0.17 245)',
+  'oklch(53% 0.15 160)',
+  'oklch(50% 0.2 275)',
+  'oklch(55% 0.16 30)',
+  'oklch(52% 0.14 200)',
+  'oklch(54% 0.15 320)',
+  'oklch(51% 0.16 100)',
+  'oklch(53% 0.14 350)',
+] as const;
+
+function hashString(value: string): number {
+  let hash = 0;
+  for (let i = 0; i < value.length; i++) {
+    hash = (hash * 31 + value.charCodeAt(i)) | 0;
+  }
+  return Math.abs(hash);
+}
+
+export function getAuthorInitials(authorName?: string): string {
+  const parts = (authorName ?? '').trim().split(/\s+/).filter(Boolean);
+  if (parts.length === 0) return '?';
+  if (parts.length === 1) return parts[0].slice(0, 2).toUpperCase();
+  return `${parts[0][0] ?? ''}${parts[1][0] ?? ''}`.toUpperCase();
+}
+
+export function getAuthorColor(authorId?: string, authorName?: string): string {
+  const key = authorId || authorName || '?';
+  return AVATAR_COLORS[hashString(key) % AVATAR_COLORS.length];
+}
diff --git a/frontend/viewer/src/lib/entry-editor/comments/types.ts b/frontend/viewer/src/lib/entry-editor/comments/types.ts
new file mode 100644
index 0000000000..1eb50ce1a3
--- /dev/null
+++ b/frontend/viewer/src/lib/entry-editor/comments/types.ts
@@ -0,0 +1,7 @@
+import type {ICommentThread} from '$lib/dotnet-types/generated-types/MiniLcm/Models/ICommentThread';
+import type {IUserComment} from '$lib/dotnet-types/generated-types/MiniLcm/Models/IUserComment';
+
+export type ThreadView = {
+  thread: ICommentThread;
+  comments: IUserComment[];
+};
diff --git a/frontend/viewer/src/lib/hooks/is-extra-large.svelte.ts b/frontend/viewer/src/lib/hooks/is-extra-large.svelte.ts
new file mode 100644
index 0000000000..c06dc74e2d
--- /dev/null
+++ b/frontend/viewer/src/lib/hooks/is-extra-large.svelte.ts
@@ -0,0 +1,14 @@
+import {EXTRA_LARGE_BREAKPOINT} from '../../css-breakpoints';
+import {MediaQuery} from 'svelte/reactivity';
+
+export class IsExtraLarge extends MediaQuery {
+  private constructor() {
+    super(`min-width: ${EXTRA_LARGE_BREAKPOINT}px`);
+  }
+
+  private static isExtraLarge = new IsExtraLarge();
+
+  static get value(): boolean {
+    return this.isExtraLarge.current;
+  }
+}
diff --git a/frontend/viewer/src/lib/layout/DevToolsDialog.svelte b/frontend/viewer/src/lib/layout/DevToolsDialog.svelte
index da965a487a..7b00e27ae2 100644
--- a/frontend/viewer/src/lib/layout/DevToolsDialog.svelte
+++ b/frontend/viewer/src/lib/layout/DevToolsDialog.svelte
@@ -20,6 +20,9 @@
 
   const { trigger }: Props = $props();
 
+  const projectDataJson = $derived(JSON.stringify(projectContext.projectData, null, 2));
+  const featuresJson = $derived(JSON.stringify(projectContext.features, null, 2));
+
   export async function generateEntries(n: number) {
     for (let i = 0; i < n; i++) {
       const entry = defaultEntry();
@@ -48,6 +51,14 @@
       <div class="flex items-center space-x-2">
         <Switch bind:checked={devSettings.readonly} label="Readonly" />
       </div>
+      <details>
+        <summary>projectData</summary>
+        <code class="whitespace-pre">{projectDataJson}</code>
+      </details>
+      <details>
+        <summary>features</summary>
+        <code class="whitespace-pre">{featuresJson}</code>
+      </details>
     </Dialog.DialogContent>
   </Dialog.Root>
 </DevContent>
diff --git a/frontend/viewer/src/locales/en.po b/frontend/viewer/src/locales/en.po
index 97d0d751d1..531a54abf2 100644
--- a/frontend/viewer/src/locales/en.po
+++ b/frontend/viewer/src/locales/en.po
@@ -20,8 +20,12 @@ msgstr ""
 msgid "– ({0} changes)"
 msgstr "– ({0} changes)"
 
-#: src/lib/entry-editor/CommentDialog.svelte
-#: src/lib/entry-editor/CommentDialog.svelte
+#: src/lib/entry-editor/comments/CommentItem.svelte
+#: src/lib/entry-editor/comments/CommentItem.svelte
+msgid "(edited)"
+msgstr "(edited)"
+
+#: src/lib/entry-editor/comments/CommentItem.svelte
 msgid "(unknown)"
 msgstr "(unknown)"
 
@@ -61,6 +65,14 @@ msgstr "{0} authors"
 msgid "{0} MB"
 msgstr "{0} MB"
 
+#: src/lib/entry-editor/comments/CommentThread.svelte
+msgid "{0} replies"
+msgstr "{0} replies"
+
+#: src/lib/entry-editor/comments/CommentPanel.svelte
+msgid "{0} resolved"
+msgstr "{0} resolved"
+
 #. Display name for server
 #: src/home/Server.svelte
 msgid "{0} Server"
@@ -82,7 +94,6 @@ msgstr "{num, plural, one {# new FieldWorks Classic commit} other {# new FieldWo
 msgid "{num, plural, one {# new FieldWorks Lite commit} other {# new FieldWorks Lite commits}}"
 msgstr "{num, plural, one {# new FieldWorks Lite commit} other {# new FieldWorks Lite commits}}"
 
-#. Button revealing the rest of a truncated possible-duplicates list in the New Entry dialog; # is the number of hidden matches
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "{num, plural, one {Show # more...} other {Show # more...}}"
 msgstr "{num, plural, one {Show # more...} other {Show # more...}}"
@@ -102,21 +113,19 @@ msgstr "**Fewer morpheme types** (only *Root*, *Bound Root*, *Stem*, *Bound Stem
 msgid "**Simpler terminology** (e.g. *Word* instead of *Lexeme form*, *Meaning* instead of *Sense*)"
 msgstr "**Simpler terminology** (e.g. *Word* instead of *Lexeme form*, *Meaning* instead of *Sense*)"
 
+#: src/lib/entry-editor/comments/CommentThread.svelte
+msgid "1 reply"
+msgstr "1 reply"
+
 #. Update notification
 #: src/lib/notifications/NotificationOutlet.svelte
 msgid "A new version of FieldWorks Lite is available."
 msgstr "A new version of FieldWorks Lite is available."
 
-#. Relevant view: Classic
-#. Lite view equivalent: "A similar word already exists"
-#. Warning banner in the New Entry dialog when exactly one possible duplicate was found (none an exact headword match)
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "A similar entry already exists"
 msgstr "A similar entry already exists"
 
-#. Relevant view: Lite
-#. Classic view equivalent: "A similar entry already exists"
-#. Warning banner in the New Word dialog when exactly one possible duplicate was found (none spelled exactly the same)
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "A similar word already exists"
 msgstr "A similar word already exists"
@@ -337,6 +346,10 @@ msgstr "Auto"
 msgid "Auto syncing"
 msgstr "Auto syncing"
 
+#: src/lib/entry-editor/comments/CommentPanel.svelte
+msgid "Back"
+msgstr "Back"
+
 #. Section label in custom view form.
 #. Selects the base view preset (Classic or Lite) that the custom view inherits from.
 #: src/lib/views/custom/CustomViewForm.svelte
@@ -377,9 +390,11 @@ msgstr "Browse view failed"
 #: src/lib/components/SubmitOrCancel.svelte
 #: src/lib/components/audio/AudioDialog.svelte
 #: src/lib/components/field-editors/select.svelte
-#: src/lib/entry-editor/CommentDialog.svelte
 #: src/lib/entry-editor/EditEntryDialog.svelte
 #: src/lib/entry-editor/NewEntryDialog.svelte
+#: src/lib/entry-editor/comments/CommentItem.svelte
+#: src/lib/entry-editor/comments/CommentPanel.svelte
+#: src/lib/entry-editor/comments/CommentReplyInput.svelte
 #: src/lib/entry-editor/field-editors/EditPictureDialog.svelte
 #: src/lib/troubleshoot/TroubleshootDialog.svelte
 #: src/lib/troubleshoot/TroubleshootDialog.svelte
@@ -401,16 +416,10 @@ msgstr "Changes can also be the result of fields being added to new versions of
 msgid "Changing the same field twice, for example, can result in two commits but only one change that needs to be applied to FieldWorks Classic. Commits can also consist of multiple changes."
 msgstr "Changing the same field twice, for example, can result in two commits but only one change that needs to be applied to FieldWorks Classic. Commits can also consist of multiple changes."
 
-#. Relevant view: Classic
-#. Lite view equivalent: "Checking for similar words…"
-#. Status line in the New Entry dialog while searching for possible duplicate entries
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "Checking for similar entries…"
 msgstr "Checking for similar entries…"
 
-#. Relevant view: Lite
-#. Classic view equivalent: "Checking for similar entries…"
-#. Status line in the New Word dialog while searching for possible duplicate words
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "Checking for similar words…"
 msgstr "Checking for similar words…"
@@ -449,8 +458,7 @@ msgstr "clear"
 #: src/lib/about/AboutDialog.svelte
 #: src/lib/components/field-editors/multi-select.svelte
 #: src/lib/components/ui/button/x-button.svelte
-#: src/lib/entry-editor/CommentDialog.svelte
-#: src/lib/entry-editor/CommentDialog.svelte
+#: src/lib/entry-editor/comments/CommentDialog.svelte
 #: src/lib/entry-editor/duplicate-check/DuplicateSummaryPill.svelte
 #: src/project/tasks/SubjectPopup.svelte
 msgid "Close"
@@ -462,10 +470,6 @@ msgstr "Close"
 msgid "Close Dictionary"
 msgstr "Close Dictionary"
 
-#: src/lib/entry-editor/CommentDialog.svelte
-msgid "Closed"
-msgstr "Closed"
-
 #. Field label in the create-project dialog. The project's short machine-readable identifier (slug), e.g. "my-dictionary".
 #: src/home/CreateProjectDialog.svelte
 msgid "Code"
@@ -476,15 +480,24 @@ msgstr "Code"
 msgid "Color"
 msgstr "Color"
 
-#: src/lib/entry-editor/CommentDialog.svelte
+#: src/lib/entry-editor/comments/CommentPanel.svelte
+msgid "Comment"
+msgstr "Comment"
+
+#: src/lib/entry-editor/comments/CommentDialog.svelte
+#: src/lib/entry-editor/comments/CommentPanel.svelte
 #: src/project/browse/EntryView.svelte
 msgid "Comments"
 msgstr "Comments"
 
-#: src/lib/entry-editor/CommentDialog.svelte
+#: src/lib/entry-editor/comments/CommentDialog.svelte
 msgid "Comments for {0}"
 msgstr "Comments for {0}"
 
+#: src/project/browse/EntryView.svelte
+msgid "Comments, {0} unread"
+msgstr "Comments, {0} unread"
+
 #. Field label
 #: src/lib/entry-editor/field-editors/ComplexFormComponents.svelte
 #: src/lib/entry-editor/field-editors/ComplexForms.svelte
@@ -537,6 +550,10 @@ msgstr "Components"
 msgid "Contains"
 msgstr "Contains"
 
+#: src/lib/entry-editor/comments/CommentPanel.svelte
+msgid "Conversation"
+msgstr "Conversation"
+
 #. Success message after copying text
 #: src/lib/components/ui/button/copy-button.svelte
 msgid "Copied to clipboard"
@@ -547,16 +564,10 @@ msgstr "Copied to clipboard"
 msgid "Copy version"
 msgstr "Copy version"
 
-#. Relevant view: Classic
-#. Lite view equivalent: "Could not check for similar words"
-#. Status line in the New Entry dialog when the background duplicate search failed (e.g. connection lost); typing again retries
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "Could not check for similar entries"
 msgstr "Could not check for similar entries"
 
-#. Relevant view: Lite
-#. Classic view equivalent: "Could not check for similar entries"
-#. Status line in the New Word dialog when the background duplicate search failed (e.g. connection lost); typing again retries
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "Could not check for similar words"
 msgstr "Could not check for similar words"
@@ -806,11 +817,11 @@ msgstr "Downloading..."
 msgid "e.g. th, sw"
 msgstr "e.g. th, sw"
 
-#: src/lib/entry-editor/CommentDialog.svelte
+#: src/lib/entry-editor/comments/CommentItem.svelte
 msgid "Edit"
 msgstr "Edit"
 
-#: src/lib/entry-editor/CommentDialog.svelte
+#: src/lib/entry-editor/comments/CommentItem.svelte
 msgid "Edit comment"
 msgstr "Edit comment"
 
@@ -829,7 +840,7 @@ msgstr "Edit Picture"
 msgid "Editor"
 msgstr "Editor"
 
-#: src/lib/entry-editor/CommentDialog.svelte
+#: src/lib/entry-editor/comments/CommentItem.svelte
 msgid "Empty comment"
 msgstr "Empty comment"
 
@@ -1184,16 +1195,10 @@ msgstr "Gloss"
 msgid "Go to {0}"
 msgstr "Go to {0}"
 
-#. Relevant view: Classic
-#. Lite view equivalent: "Go to word"
-#. Tooltip on a possible-duplicate result in the New Entry dialog; clicking closes the dialog and opens that entry
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "Go to entry"
 msgstr "Go to entry"
 
-#. Relevant view: Lite
-#. Classic view equivalent: "Go to entry"
-#. Tooltip on a possible-duplicate result in the New Word dialog; clicking closes the dialog and opens that word
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "Go to word"
 msgstr "Go to word"
@@ -1384,7 +1389,7 @@ msgstr "Loaded file"
 msgid "Loading activity"
 msgstr "Loading activity"
 
-#: src/lib/entry-editor/CommentDialog.svelte
+#: src/lib/entry-editor/comments/CommentPanel.svelte
 msgid "Loading comments..."
 msgstr "Loading comments..."
 
@@ -1638,10 +1643,6 @@ msgstr "No audio"
 msgid "No authors"
 msgstr "No authors"
 
-#: src/lib/entry-editor/CommentDialog.svelte
-msgid "No comment threads yet."
-msgstr "No comment threads yet."
-
 #. Empty state message in the manage custom views dialog when none exist.
 #: src/lib/views/custom/ManageCustomViewsDialog.svelte
 msgid "No custom views yet."
@@ -1681,6 +1682,11 @@ msgstr "No media files found"
 msgid "No new data"
 msgstr "No new data"
 
+#: src/lib/entry-editor/comments/CommentPanel.svelte
+#: src/lib/entry-editor/comments/CommentPanel.svelte
+msgid "No open conversations"
+msgstr "No open conversations"
+
 #. Empty state shown read-only in the Pictures field when a sense has no pictures
 #: src/lib/entry-editor/field-editors/PicturesEditor.svelte
 msgid "No pictures"
@@ -1696,16 +1702,10 @@ msgstr "No server"
 msgid "No server configured"
 msgstr "No server configured"
 
-#. Relevant view: Classic
-#. Lite view equivalent: "No similar words found"
-#. Status line in the New Entry dialog: the duplicate check found no existing entries like the one being typed
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "No similar entries found"
 msgstr "No similar entries found"
 
-#. Relevant view: Lite
-#. Classic view equivalent: "No similar entries found"
-#. Status line in the New Word dialog: the duplicate check found no existing words like the one being typed
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "No similar words found"
 msgstr "No similar words found"
@@ -1814,7 +1814,6 @@ msgstr "One FieldWorks Classic commit may consist of changes to multiple entries
 
 #. Button to open downloaded project
 #: src/home/Server.svelte
-#: src/lib/entry-editor/CommentDialog.svelte
 msgid "Open"
 msgstr "Open"
 
@@ -2061,6 +2060,9 @@ msgstr "Remove audio"
 
 #. Button to reopen in FieldWorks
 #: src/lib/components/OpenInFieldWorksButton.svelte
+#: src/lib/entry-editor/comments/CommentPanel.svelte
+#: src/lib/entry-editor/comments/CommentThread.svelte
+#: src/lib/entry-editor/comments/CommentThread.svelte
 msgid "Reopen"
 msgstr "Reopen"
 
@@ -2073,6 +2075,15 @@ msgstr "Replace audio"
 msgid "Replace Picture"
 msgstr "Replace Picture"
 
+#: src/lib/entry-editor/comments/CommentReplyInput.svelte
+#: src/lib/entry-editor/comments/CommentReplyInput.svelte
+msgid "Reply"
+msgstr "Reply"
+
+#: src/lib/entry-editor/comments/CommentReplyInput.svelte
+msgid "Reply…"
+msgstr "Reply…"
+
 #. Button text
 #: src/lib/about/FeedbackDialog.svelte
 msgid "Report a technical problem"
@@ -2082,6 +2093,12 @@ msgstr "Report a technical problem"
 msgid "Reset"
 msgstr "Reset"
 
+#: src/lib/entry-editor/comments/CommentPanel.svelte
+#: src/lib/entry-editor/comments/CommentThread.svelte
+#: src/lib/entry-editor/comments/CommentThread.svelte
+msgid "Resolve"
+msgstr "Resolve"
+
 #. Button label to restore a deleted Entry or Word inside EntryView
 #: src/project/browse/EntryView.svelte
 msgid "Restore"
@@ -2097,29 +2114,20 @@ msgstr "Review"
 msgid "rose"
 msgstr "rose"
 
-#. Relevant view: Classic
-#. Lite view equivalent: "Same word"
-#. Badge on a possible-duplicate result: its headword is identical to the one being typed in the New Entry dialog
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "Same headword"
 msgstr "Same headword"
 
-#. Relevant view: Classic
-#. Lite view equivalent: "Same word"
-#. Badge on a possible-duplicate result: only its lexeme form matches the typed text, while its citation form (shown as the headword) differs — deliberately NOT claiming "Same headword"
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "Same lexeme form"
 msgstr "Same lexeme form"
 
-#. Relevant view: Lite
-#. Classic view equivalent: "Same headword"
-#. Badge on a possible-duplicate result: it is spelled exactly like the word being typed in the New Word dialog
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "Same word"
 msgstr "Same word"
 
-#: src/lib/entry-editor/CommentDialog.svelte
+#: src/lib/entry-editor/comments/CommentItem.svelte
 msgid "Save"
 msgstr "Save"
 
@@ -2264,48 +2272,30 @@ msgstr "Show"
 msgid "Show {0} more..."
 msgstr "Show {0} more..."
 
-#: src/lib/entry-editor/CommentDialog.svelte
+#: src/lib/entry-editor/comments/CommentPanel.svelte
 msgid "Sign in to add comments."
 msgstr "Sign in to add comments."
 
-#. Relevant view: Classic
-#. Lite view equivalent: "Similar words already exist"
-#. Warning banner in the New Entry dialog; expands to a list of possible duplicate entries
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "Similar entries already exist"
 msgstr "Similar entries already exist"
 
-#. Relevant view: Classic
-#. Lite view equivalent: "Similar meaning"
-#. Badge on a possible-duplicate result: one of its glosses matches the gloss being typed in the New Entry dialog
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "Similar gloss"
 msgstr "Similar gloss"
 
-#. Relevant view: Classic
-#. Lite view equivalent: "Similar word"
-#. Badge on a possible-duplicate result: its headword partly matches the one being typed in the New Entry dialog
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "Similar headword"
 msgstr "Similar headword"
 
-#. Relevant view: Lite
-#. Classic view equivalent: "Similar gloss"
-#. Badge on a possible-duplicate result: one of its meanings matches the meaning being typed in the New Word dialog
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "Similar meaning"
 msgstr "Similar meaning"
 
-#. Relevant view: Lite
-#. Classic view equivalent: "Similar headword"
-#. Badge on a possible-duplicate result: it is spelled almost like the word being typed in the New Word dialog
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "Similar word"
 msgstr "Similar word"
 
-#. Relevant view: Lite
-#. Classic view equivalent: "Similar entries already exist"
-#. Warning banner in the New Word dialog; expands to a list of possible duplicate words
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "Similar words already exist"
 msgstr "Similar words already exist"
@@ -2338,9 +2328,13 @@ msgstr "Something went wrong"
 msgid "Specific field"
 msgstr "Specific field"
 
-#: src/lib/entry-editor/CommentDialog.svelte
-msgid "Start a new thread"
-msgstr "Start a new thread"
+#: src/lib/entry-editor/comments/CommentPanel.svelte
+msgid "Start a conversation"
+msgstr "Start a conversation"
+
+#: src/lib/entry-editor/comments/CommentPanel.svelte
+msgid "Start a conversation…"
+msgstr "Start a conversation…"
 
 #. Filter operator
 #. Search operator: matches fields beginning with the search term
@@ -2512,9 +2506,6 @@ msgstr "This {0} was deleted"
 msgid "This date # and this emoji # are snippets"
 msgstr "This date # and this emoji # are snippets"
 
-#. Relevant view: Classic
-#. Lite view equivalent: "This word may already exist"
-#. Warning banner in the New Entry dialog when an entry with the exact same headword exists; expands to a list of possible duplicates
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "This entry may already exist"
 msgstr "This entry may already exist"
@@ -2556,17 +2547,10 @@ msgstr "This task is complete"
 msgid "This will synchronize the FieldWorks Lite and FieldWorks Classic copies of your project in Lexbox."
 msgstr "This will synchronize the FieldWorks Lite and FieldWorks Classic copies of your project in Lexbox."
 
-#. Relevant view: Lite
-#. Classic view equivalent: "This entry may already exist"
-#. Warning banner in the New Word dialog when a word with the exact same spelling exists; expands to a list of possible duplicates
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "This word may already exist"
 msgstr "This word may already exist"
 
-#: src/lib/entry-editor/CommentDialog.svelte
-msgid "Thread"
-msgstr "Thread"
-
 #. Button to show/hide filter panel
 #: src/project/browse/SearchFilter.svelte
 msgid "Toggle filters"
@@ -2701,6 +2685,15 @@ msgstr "Unknown server"
 msgid "Unknown update result"
 msgstr "Unknown update result"
 
+#: src/lib/entry-editor/comments/CommentThread.svelte
+#: src/lib/entry-editor/comments/CommentThread.svelte
+msgid "Unread"
+msgstr "Unread"
+
+#: src/lib/entry-editor/comments/CommentPanel.svelte
+msgid "Unread comments"
+msgstr "Unread comments"
+
 #. Placeholder for missing value
 #. Displayed when a word/entry/field has no content yet
 #. Used in: entry list, activity changes, change preview, field labels
@@ -2863,14 +2856,6 @@ msgstr "Word or Display as is required"
 msgid "Word or meaning:"
 msgstr "Word or meaning:"
 
-#: src/lib/entry-editor/CommentDialog.svelte
-msgid "Write a reply..."
-msgstr "Write a reply..."
-
-#: src/lib/entry-editor/CommentDialog.svelte
-msgid "Write the first comment..."
-msgstr "Write the first comment..."
-
 #. Column header
 #: src/project/browse/filter/WsSelect.svelte
 msgid "Writing System"
diff --git a/frontend/viewer/src/locales/es.po b/frontend/viewer/src/locales/es.po
index 2c31f4144e..e3d7f717f0 100644
--- a/frontend/viewer/src/locales/es.po
+++ b/frontend/viewer/src/locales/es.po
@@ -25,8 +25,12 @@ msgstr ""
 msgid "– ({0} changes)"
 msgstr "– ({0} cambios)"
 
-#: src/lib/entry-editor/CommentDialog.svelte
-#: src/lib/entry-editor/CommentDialog.svelte
+#: src/lib/entry-editor/comments/CommentItem.svelte
+#: src/lib/entry-editor/comments/CommentItem.svelte
+msgid "(edited)"
+msgstr ""
+
+#: src/lib/entry-editor/comments/CommentItem.svelte
 msgid "(unknown)"
 msgstr ""
 
@@ -66,6 +70,14 @@ msgstr ""
 msgid "{0} MB"
 msgstr "{0} MB"
 
+#: src/lib/entry-editor/comments/CommentThread.svelte
+msgid "{0} replies"
+msgstr ""
+
+#: src/lib/entry-editor/comments/CommentPanel.svelte
+msgid "{0} resolved"
+msgstr ""
+
 #. Display name for server
 #: src/home/Server.svelte
 msgid "{0} Server"
@@ -87,7 +99,6 @@ msgstr "{num, plural, one {# nuevo FieldWorks Classic commit} other {# nuevos Fi
 msgid "{num, plural, one {# new FieldWorks Lite commit} other {# new FieldWorks Lite commits}}"
 msgstr "{num, plural, one {# nuevo commit de FieldWorks Lite} other {# nuevos commits de FieldWorks Lite}}"
 
-#. Button revealing the rest of a truncated possible-duplicates list in the New Entry dialog; # is the number of hidden matches
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "{num, plural, one {Show # more...} other {Show # more...}}"
 msgstr ""
@@ -107,21 +118,19 @@ msgstr "**Menos tipos de morfema** (sólo *Raíz*, *Raíz vinculado*, *Tallo*, *
 msgid "**Simpler terminology** (e.g. *Word* instead of *Lexeme form*, *Meaning* instead of *Sense*)"
 msgstr "**Terminología más simple** (p. ej. *Palabra* en lugar de *Forma del lexema*, *Significado* en lugar de *Acepción*)"
 
+#: src/lib/entry-editor/comments/CommentThread.svelte
+msgid "1 reply"
+msgstr ""
+
 #. Update notification
 #: src/lib/notifications/NotificationOutlet.svelte
 msgid "A new version of FieldWorks Lite is available."
 msgstr "Una nueva versión de FieldWorks Lite está disponible."
 
-#. Relevant view: Classic
-#. Lite view equivalent: "A similar word already exists"
-#. Warning banner in the New Entry dialog when exactly one possible duplicate was found (none an exact headword match)
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "A similar entry already exists"
 msgstr ""
 
-#. Relevant view: Lite
-#. Classic view equivalent: "A similar entry already exists"
-#. Warning banner in the New Word dialog when exactly one possible duplicate was found (none spelled exactly the same)
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "A similar word already exists"
 msgstr ""
@@ -342,6 +351,10 @@ msgstr "Auto"
 msgid "Auto syncing"
 msgstr "Sincronización automática"
 
+#: src/lib/entry-editor/comments/CommentPanel.svelte
+msgid "Back"
+msgstr ""
+
 #. Section label in custom view form.
 #. Selects the base view preset (Classic or Lite) that the custom view inherits from.
 #: src/lib/views/custom/CustomViewForm.svelte
@@ -382,9 +395,11 @@ msgstr ""
 #: src/lib/components/SubmitOrCancel.svelte
 #: src/lib/components/audio/AudioDialog.svelte
 #: src/lib/components/field-editors/select.svelte
-#: src/lib/entry-editor/CommentDialog.svelte
 #: src/lib/entry-editor/EditEntryDialog.svelte
 #: src/lib/entry-editor/NewEntryDialog.svelte
+#: src/lib/entry-editor/comments/CommentItem.svelte
+#: src/lib/entry-editor/comments/CommentPanel.svelte
+#: src/lib/entry-editor/comments/CommentReplyInput.svelte
 #: src/lib/entry-editor/field-editors/EditPictureDialog.svelte
 #: src/lib/troubleshoot/TroubleshootDialog.svelte
 #: src/lib/troubleshoot/TroubleshootDialog.svelte
@@ -406,16 +421,10 @@ msgstr "Los cambios también pueden ser el resultado de que los campos sean agre
 msgid "Changing the same field twice, for example, can result in two commits but only one change that needs to be applied to FieldWorks Classic. Commits can also consist of multiple changes."
 msgstr "Cambiar el mismo campo dos veces, por ejemplo, puede resultar en dos commits pero sólo un cambio que necesita ser aplicado a FieldWorks Classic. Los commits también pueden consistir en varios cambios."
 
-#. Relevant view: Classic
-#. Lite view equivalent: "Checking for similar words…"
-#. Status line in the New Entry dialog while searching for possible duplicate entries
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "Checking for similar entries…"
 msgstr ""
 
-#. Relevant view: Lite
-#. Classic view equivalent: "Checking for similar entries…"
-#. Status line in the New Word dialog while searching for possible duplicate words
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "Checking for similar words…"
 msgstr ""
@@ -454,8 +463,7 @@ msgstr "borrar"
 #: src/lib/about/AboutDialog.svelte
 #: src/lib/components/field-editors/multi-select.svelte
 #: src/lib/components/ui/button/x-button.svelte
-#: src/lib/entry-editor/CommentDialog.svelte
-#: src/lib/entry-editor/CommentDialog.svelte
+#: src/lib/entry-editor/comments/CommentDialog.svelte
 #: src/lib/entry-editor/duplicate-check/DuplicateSummaryPill.svelte
 #: src/project/tasks/SubjectPopup.svelte
 msgid "Close"
@@ -467,10 +475,6 @@ msgstr "Cerrar"
 msgid "Close Dictionary"
 msgstr "Cerrar Diccionario"
 
-#: src/lib/entry-editor/CommentDialog.svelte
-msgid "Closed"
-msgstr ""
-
 #. Field label in the create-project dialog. The project's short machine-readable identifier (slug), e.g. "my-dictionary".
 #: src/home/CreateProjectDialog.svelte
 msgid "Code"
@@ -481,15 +485,24 @@ msgstr ""
 msgid "Color"
 msgstr "Color"
 
-#: src/lib/entry-editor/CommentDialog.svelte
+#: src/lib/entry-editor/comments/CommentPanel.svelte
+msgid "Comment"
+msgstr ""
+
+#: src/lib/entry-editor/comments/CommentDialog.svelte
+#: src/lib/entry-editor/comments/CommentPanel.svelte
 #: src/project/browse/EntryView.svelte
 msgid "Comments"
 msgstr ""
 
-#: src/lib/entry-editor/CommentDialog.svelte
+#: src/lib/entry-editor/comments/CommentDialog.svelte
 msgid "Comments for {0}"
 msgstr ""
 
+#: src/project/browse/EntryView.svelte
+msgid "Comments, {0} unread"
+msgstr ""
+
 #. Field label
 #: src/lib/entry-editor/field-editors/ComplexFormComponents.svelte
 #: src/lib/entry-editor/field-editors/ComplexForms.svelte
@@ -542,6 +555,10 @@ msgstr "Componentes"
 msgid "Contains"
 msgstr "Contiene"
 
+#: src/lib/entry-editor/comments/CommentPanel.svelte
+msgid "Conversation"
+msgstr ""
+
 #. Success message after copying text
 #: src/lib/components/ui/button/copy-button.svelte
 msgid "Copied to clipboard"
@@ -552,16 +569,10 @@ msgstr "Copiado al portapapeles"
 msgid "Copy version"
 msgstr "Copiar versión"
 
-#. Relevant view: Classic
-#. Lite view equivalent: "Could not check for similar words"
-#. Status line in the New Entry dialog when the background duplicate search failed (e.g. connection lost); typing again retries
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "Could not check for similar entries"
 msgstr ""
 
-#. Relevant view: Lite
-#. Classic view equivalent: "Could not check for similar entries"
-#. Status line in the New Word dialog when the background duplicate search failed (e.g. connection lost); typing again retries
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "Could not check for similar words"
 msgstr ""
@@ -811,11 +822,11 @@ msgstr "Descargando..."
 msgid "e.g. th, sw"
 msgstr ""
 
-#: src/lib/entry-editor/CommentDialog.svelte
+#: src/lib/entry-editor/comments/CommentItem.svelte
 msgid "Edit"
 msgstr ""
 
-#: src/lib/entry-editor/CommentDialog.svelte
+#: src/lib/entry-editor/comments/CommentItem.svelte
 msgid "Edit comment"
 msgstr ""
 
@@ -834,7 +845,7 @@ msgstr ""
 msgid "Editor"
 msgstr "Editor"
 
-#: src/lib/entry-editor/CommentDialog.svelte
+#: src/lib/entry-editor/comments/CommentItem.svelte
 msgid "Empty comment"
 msgstr ""
 
@@ -1189,16 +1200,10 @@ msgstr "Glosa"
 msgid "Go to {0}"
 msgstr "Visite {0}"
 
-#. Relevant view: Classic
-#. Lite view equivalent: "Go to word"
-#. Tooltip on a possible-duplicate result in the New Entry dialog; clicking closes the dialog and opens that entry
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "Go to entry"
 msgstr ""
 
-#. Relevant view: Lite
-#. Classic view equivalent: "Go to entry"
-#. Tooltip on a possible-duplicate result in the New Word dialog; clicking closes the dialog and opens that word
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "Go to word"
 msgstr ""
@@ -1389,7 +1394,7 @@ msgstr ""
 msgid "Loading activity"
 msgstr ""
 
-#: src/lib/entry-editor/CommentDialog.svelte
+#: src/lib/entry-editor/comments/CommentPanel.svelte
 msgid "Loading comments..."
 msgstr ""
 
@@ -1643,10 +1648,6 @@ msgstr "Sin audio"
 msgid "No authors"
 msgstr ""
 
-#: src/lib/entry-editor/CommentDialog.svelte
-msgid "No comment threads yet."
-msgstr ""
-
 #. Empty state message in the manage custom views dialog when none exist.
 #: src/lib/views/custom/ManageCustomViewsDialog.svelte
 msgid "No custom views yet."
@@ -1686,6 +1687,11 @@ msgstr ""
 msgid "No new data"
 msgstr "No hay nuevos datos"
 
+#: src/lib/entry-editor/comments/CommentPanel.svelte
+#: src/lib/entry-editor/comments/CommentPanel.svelte
+msgid "No open conversations"
+msgstr ""
+
 #. Empty state shown read-only in the Pictures field when a sense has no pictures
 #: src/lib/entry-editor/field-editors/PicturesEditor.svelte
 msgid "No pictures"
@@ -1701,16 +1707,10 @@ msgstr "Sin servidor"
 msgid "No server configured"
 msgstr "Ningún servidor configurado"
 
-#. Relevant view: Classic
-#. Lite view equivalent: "No similar words found"
-#. Status line in the New Entry dialog: the duplicate check found no existing entries like the one being typed
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "No similar entries found"
 msgstr ""
 
-#. Relevant view: Lite
-#. Classic view equivalent: "No similar entries found"
-#. Status line in the New Word dialog: the duplicate check found no existing words like the one being typed
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "No similar words found"
 msgstr ""
@@ -1819,7 +1819,6 @@ msgstr "Un commit de FieldWorks Classic puede consistir en cambios en múltiples
 
 #. Button to open downloaded project
 #: src/home/Server.svelte
-#: src/lib/entry-editor/CommentDialog.svelte
 msgid "Open"
 msgstr "Abrir"
 
@@ -2066,6 +2065,9 @@ msgstr "Eliminar audio"
 
 #. Button to reopen in FieldWorks
 #: src/lib/components/OpenInFieldWorksButton.svelte
+#: src/lib/entry-editor/comments/CommentPanel.svelte
+#: src/lib/entry-editor/comments/CommentThread.svelte
+#: src/lib/entry-editor/comments/CommentThread.svelte
 msgid "Reopen"
 msgstr "Vuelva a abrir"
 
@@ -2078,6 +2080,15 @@ msgstr "Sustituir audio"
 msgid "Replace Picture"
 msgstr ""
 
+#: src/lib/entry-editor/comments/CommentReplyInput.svelte
+#: src/lib/entry-editor/comments/CommentReplyInput.svelte
+msgid "Reply"
+msgstr ""
+
+#: src/lib/entry-editor/comments/CommentReplyInput.svelte
+msgid "Reply…"
+msgstr ""
+
 #. Button text
 #: src/lib/about/FeedbackDialog.svelte
 msgid "Report a technical problem"
@@ -2087,6 +2098,12 @@ msgstr "Reportar un problema técnico"
 msgid "Reset"
 msgstr ""
 
+#: src/lib/entry-editor/comments/CommentPanel.svelte
+#: src/lib/entry-editor/comments/CommentThread.svelte
+#: src/lib/entry-editor/comments/CommentThread.svelte
+msgid "Resolve"
+msgstr ""
+
 #. Button label to restore a deleted Entry or Word inside EntryView
 #: src/project/browse/EntryView.svelte
 msgid "Restore"
@@ -2102,29 +2119,20 @@ msgstr "Revisión"
 msgid "rose"
 msgstr "rosa"
 
-#. Relevant view: Classic
-#. Lite view equivalent: "Same word"
-#. Badge on a possible-duplicate result: its headword is identical to the one being typed in the New Entry dialog
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "Same headword"
 msgstr ""
 
-#. Relevant view: Classic
-#. Lite view equivalent: "Same word"
-#. Badge on a possible-duplicate result: only its lexeme form matches the typed text, while its citation form (shown as the headword) differs — deliberately NOT claiming "Same headword"
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "Same lexeme form"
 msgstr ""
 
-#. Relevant view: Lite
-#. Classic view equivalent: "Same headword"
-#. Badge on a possible-duplicate result: it is spelled exactly like the word being typed in the New Word dialog
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "Same word"
 msgstr ""
 
-#: src/lib/entry-editor/CommentDialog.svelte
+#: src/lib/entry-editor/comments/CommentItem.svelte
 msgid "Save"
 msgstr ""
 
@@ -2269,48 +2277,30 @@ msgstr "Mostrar"
 msgid "Show {0} more..."
 msgstr "Mostrar {0} más..."
 
-#: src/lib/entry-editor/CommentDialog.svelte
+#: src/lib/entry-editor/comments/CommentPanel.svelte
 msgid "Sign in to add comments."
 msgstr ""
 
-#. Relevant view: Classic
-#. Lite view equivalent: "Similar words already exist"
-#. Warning banner in the New Entry dialog; expands to a list of possible duplicate entries
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "Similar entries already exist"
 msgstr ""
 
-#. Relevant view: Classic
-#. Lite view equivalent: "Similar meaning"
-#. Badge on a possible-duplicate result: one of its glosses matches the gloss being typed in the New Entry dialog
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "Similar gloss"
 msgstr ""
 
-#. Relevant view: Classic
-#. Lite view equivalent: "Similar word"
-#. Badge on a possible-duplicate result: its headword partly matches the one being typed in the New Entry dialog
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "Similar headword"
 msgstr ""
 
-#. Relevant view: Lite
-#. Classic view equivalent: "Similar gloss"
-#. Badge on a possible-duplicate result: one of its meanings matches the meaning being typed in the New Word dialog
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "Similar meaning"
 msgstr ""
 
-#. Relevant view: Lite
-#. Classic view equivalent: "Similar headword"
-#. Badge on a possible-duplicate result: it is spelled almost like the word being typed in the New Word dialog
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "Similar word"
 msgstr ""
 
-#. Relevant view: Lite
-#. Classic view equivalent: "Similar entries already exist"
-#. Warning banner in the New Word dialog; expands to a list of possible duplicate words
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "Similar words already exist"
 msgstr ""
@@ -2343,8 +2333,12 @@ msgstr ""
 msgid "Specific field"
 msgstr "Campo específico"
 
-#: src/lib/entry-editor/CommentDialog.svelte
-msgid "Start a new thread"
+#: src/lib/entry-editor/comments/CommentPanel.svelte
+msgid "Start a conversation"
+msgstr ""
+
+#: src/lib/entry-editor/comments/CommentPanel.svelte
+msgid "Start a conversation…"
 msgstr ""
 
 #. Filter operator
@@ -2517,9 +2511,6 @@ msgstr "Este {0} ha sido eliminado"
 msgid "This date # and this emoji # are snippets"
 msgstr "Esta fecha # y este emoji # son fragmentos"
 
-#. Relevant view: Classic
-#. Lite view equivalent: "This word may already exist"
-#. Warning banner in the New Entry dialog when an entry with the exact same headword exists; expands to a list of possible duplicates
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "This entry may already exist"
 msgstr ""
@@ -2561,17 +2552,10 @@ msgstr "Esta tarea está completa"
 msgid "This will synchronize the FieldWorks Lite and FieldWorks Classic copies of your project in Lexbox."
 msgstr "Esto sincronizará las copias de FieldWorks Lite y FieldWorks Classic de su proyecto en Lexbox."
 
-#. Relevant view: Lite
-#. Classic view equivalent: "This entry may already exist"
-#. Warning banner in the New Word dialog when a word with the exact same spelling exists; expands to a list of possible duplicates
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "This word may already exist"
 msgstr ""
 
-#: src/lib/entry-editor/CommentDialog.svelte
-msgid "Thread"
-msgstr ""
-
 #. Button to show/hide filter panel
 #: src/project/browse/SearchFilter.svelte
 msgid "Toggle filters"
@@ -2706,6 +2690,15 @@ msgstr "Servidor desconocido"
 msgid "Unknown update result"
 msgstr "Resultado de actualización desconocido"
 
+#: src/lib/entry-editor/comments/CommentThread.svelte
+#: src/lib/entry-editor/comments/CommentThread.svelte
+msgid "Unread"
+msgstr ""
+
+#: src/lib/entry-editor/comments/CommentPanel.svelte
+msgid "Unread comments"
+msgstr ""
+
 #. Placeholder for missing value
 #. Displayed when a word/entry/field has no content yet
 #. Used in: entry list, activity changes, change preview, field labels
@@ -2868,14 +2861,6 @@ msgstr "Se requiere Palabra o Mostrar como"
 msgid "Word or meaning:"
 msgstr "Palabra o significado:"
 
-#: src/lib/entry-editor/CommentDialog.svelte
-msgid "Write a reply..."
-msgstr ""
-
-#: src/lib/entry-editor/CommentDialog.svelte
-msgid "Write the first comment..."
-msgstr ""
-
 #. Column header
 #: src/project/browse/filter/WsSelect.svelte
 msgid "Writing System"
diff --git a/frontend/viewer/src/locales/fr.po b/frontend/viewer/src/locales/fr.po
index a128cd090f..cef1dbfd22 100644
--- a/frontend/viewer/src/locales/fr.po
+++ b/frontend/viewer/src/locales/fr.po
@@ -25,8 +25,12 @@ msgstr ""
 msgid "– ({0} changes)"
 msgstr "– ({0} changements)"
 
-#: src/lib/entry-editor/CommentDialog.svelte
-#: src/lib/entry-editor/CommentDialog.svelte
+#: src/lib/entry-editor/comments/CommentItem.svelte
+#: src/lib/entry-editor/comments/CommentItem.svelte
+msgid "(edited)"
+msgstr ""
+
+#: src/lib/entry-editor/comments/CommentItem.svelte
 msgid "(unknown)"
 msgstr ""
 
@@ -66,6 +70,14 @@ msgstr ""
 msgid "{0} MB"
 msgstr "{0} MB"
 
+#: src/lib/entry-editor/comments/CommentThread.svelte
+msgid "{0} replies"
+msgstr ""
+
+#: src/lib/entry-editor/comments/CommentPanel.svelte
+msgid "{0} resolved"
+msgstr ""
+
 #. Display name for server
 #: src/home/Server.svelte
 msgid "{0} Server"
@@ -87,7 +99,6 @@ msgstr "{num, plural, one {# nouveau commit FieldWorks Classic} other {# nouveau
 msgid "{num, plural, one {# new FieldWorks Lite commit} other {# new FieldWorks Lite commits}}"
 msgstr "{num, plural, one {# nouveau commit FieldWorks Lite} other {# nouveaux commits FieldWorks Lite}}"
 
-#. Button revealing the rest of a truncated possible-duplicates list in the New Entry dialog; # is the number of hidden matches
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "{num, plural, one {Show # more...} other {Show # more...}}"
 msgstr ""
@@ -107,21 +118,19 @@ msgstr "**Moins de types de morphèmes** (seulement *Racine*, *Racines liées*,
 msgid "**Simpler terminology** (e.g. *Word* instead of *Lexeme form*, *Meaning* instead of *Sense*)"
 msgstr "**terminologie plus simple** (par exemple *Mot* au lieu de *forme de lexème*, *Signification* au lieu de *Sense*)"
 
+#: src/lib/entry-editor/comments/CommentThread.svelte
+msgid "1 reply"
+msgstr ""
+
 #. Update notification
 #: src/lib/notifications/NotificationOutlet.svelte
 msgid "A new version of FieldWorks Lite is available."
 msgstr "Une nouvelle version de FieldWorks Lite est disponible."
 
-#. Relevant view: Classic
-#. Lite view equivalent: "A similar word already exists"
-#. Warning banner in the New Entry dialog when exactly one possible duplicate was found (none an exact headword match)
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "A similar entry already exists"
 msgstr ""
 
-#. Relevant view: Lite
-#. Classic view equivalent: "A similar entry already exists"
-#. Warning banner in the New Word dialog when exactly one possible duplicate was found (none spelled exactly the same)
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "A similar word already exists"
 msgstr ""
@@ -342,6 +351,10 @@ msgstr "Auto"
 msgid "Auto syncing"
 msgstr "Synchronisation automatique"
 
+#: src/lib/entry-editor/comments/CommentPanel.svelte
+msgid "Back"
+msgstr ""
+
 #. Section label in custom view form.
 #. Selects the base view preset (Classic or Lite) that the custom view inherits from.
 #: src/lib/views/custom/CustomViewForm.svelte
@@ -382,9 +395,11 @@ msgstr ""
 #: src/lib/components/SubmitOrCancel.svelte
 #: src/lib/components/audio/AudioDialog.svelte
 #: src/lib/components/field-editors/select.svelte
-#: src/lib/entry-editor/CommentDialog.svelte
 #: src/lib/entry-editor/EditEntryDialog.svelte
 #: src/lib/entry-editor/NewEntryDialog.svelte
+#: src/lib/entry-editor/comments/CommentItem.svelte
+#: src/lib/entry-editor/comments/CommentPanel.svelte
+#: src/lib/entry-editor/comments/CommentReplyInput.svelte
 #: src/lib/entry-editor/field-editors/EditPictureDialog.svelte
 #: src/lib/troubleshoot/TroubleshootDialog.svelte
 #: src/lib/troubleshoot/TroubleshootDialog.svelte
@@ -406,16 +421,10 @@ msgstr "Les modifications peuvent également résulter de l'ajout de champs à d
 msgid "Changing the same field twice, for example, can result in two commits but only one change that needs to be applied to FieldWorks Classic. Commits can also consist of multiple changes."
 msgstr "Changer le même champ deux fois, par exemple, peut entraîner deux livraisons mais un seul changement qui doit être appliqué à FieldWorks Classic. Les commits peuvent également comporter de multiples changements."
 
-#. Relevant view: Classic
-#. Lite view equivalent: "Checking for similar words…"
-#. Status line in the New Entry dialog while searching for possible duplicate entries
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "Checking for similar entries…"
 msgstr ""
 
-#. Relevant view: Lite
-#. Classic view equivalent: "Checking for similar entries…"
-#. Status line in the New Word dialog while searching for possible duplicate words
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "Checking for similar words…"
 msgstr ""
@@ -454,8 +463,7 @@ msgstr "effacer"
 #: src/lib/about/AboutDialog.svelte
 #: src/lib/components/field-editors/multi-select.svelte
 #: src/lib/components/ui/button/x-button.svelte
-#: src/lib/entry-editor/CommentDialog.svelte
-#: src/lib/entry-editor/CommentDialog.svelte
+#: src/lib/entry-editor/comments/CommentDialog.svelte
 #: src/lib/entry-editor/duplicate-check/DuplicateSummaryPill.svelte
 #: src/project/tasks/SubjectPopup.svelte
 msgid "Close"
@@ -467,10 +475,6 @@ msgstr "Fermer"
 msgid "Close Dictionary"
 msgstr "Fermer le dictionnaire"
 
-#: src/lib/entry-editor/CommentDialog.svelte
-msgid "Closed"
-msgstr ""
-
 #. Field label in the create-project dialog. The project's short machine-readable identifier (slug), e.g. "my-dictionary".
 #: src/home/CreateProjectDialog.svelte
 msgid "Code"
@@ -481,15 +485,24 @@ msgstr ""
 msgid "Color"
 msgstr "Couleur"
 
-#: src/lib/entry-editor/CommentDialog.svelte
+#: src/lib/entry-editor/comments/CommentPanel.svelte
+msgid "Comment"
+msgstr ""
+
+#: src/lib/entry-editor/comments/CommentDialog.svelte
+#: src/lib/entry-editor/comments/CommentPanel.svelte
 #: src/project/browse/EntryView.svelte
 msgid "Comments"
 msgstr ""
 
-#: src/lib/entry-editor/CommentDialog.svelte
+#: src/lib/entry-editor/comments/CommentDialog.svelte
 msgid "Comments for {0}"
 msgstr ""
 
+#: src/project/browse/EntryView.svelte
+msgid "Comments, {0} unread"
+msgstr ""
+
 #. Field label
 #: src/lib/entry-editor/field-editors/ComplexFormComponents.svelte
 #: src/lib/entry-editor/field-editors/ComplexForms.svelte
@@ -542,6 +555,10 @@ msgstr "Composants"
 msgid "Contains"
 msgstr "Contient"
 
+#: src/lib/entry-editor/comments/CommentPanel.svelte
+msgid "Conversation"
+msgstr ""
+
 #. Success message after copying text
 #: src/lib/components/ui/button/copy-button.svelte
 msgid "Copied to clipboard"
@@ -552,16 +569,10 @@ msgstr "Copié dans le presse-papiers"
 msgid "Copy version"
 msgstr "Copier la version dans le presse-papiers"
 
-#. Relevant view: Classic
-#. Lite view equivalent: "Could not check for similar words"
-#. Status line in the New Entry dialog when the background duplicate search failed (e.g. connection lost); typing again retries
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "Could not check for similar entries"
 msgstr ""
 
-#. Relevant view: Lite
-#. Classic view equivalent: "Could not check for similar entries"
-#. Status line in the New Word dialog when the background duplicate search failed (e.g. connection lost); typing again retries
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "Could not check for similar words"
 msgstr ""
@@ -811,11 +822,11 @@ msgstr "Téléchargement en cours..."
 msgid "e.g. th, sw"
 msgstr ""
 
-#: src/lib/entry-editor/CommentDialog.svelte
+#: src/lib/entry-editor/comments/CommentItem.svelte
 msgid "Edit"
 msgstr ""
 
-#: src/lib/entry-editor/CommentDialog.svelte
+#: src/lib/entry-editor/comments/CommentItem.svelte
 msgid "Edit comment"
 msgstr ""
 
@@ -834,7 +845,7 @@ msgstr ""
 msgid "Editor"
 msgstr "Editeur"
 
-#: src/lib/entry-editor/CommentDialog.svelte
+#: src/lib/entry-editor/comments/CommentItem.svelte
 msgid "Empty comment"
 msgstr ""
 
@@ -1189,16 +1200,10 @@ msgstr "Glose"
 msgid "Go to {0}"
 msgstr "Naviguer à {0}"
 
-#. Relevant view: Classic
-#. Lite view equivalent: "Go to word"
-#. Tooltip on a possible-duplicate result in the New Entry dialog; clicking closes the dialog and opens that entry
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "Go to entry"
 msgstr ""
 
-#. Relevant view: Lite
-#. Classic view equivalent: "Go to entry"
-#. Tooltip on a possible-duplicate result in the New Word dialog; clicking closes the dialog and opens that word
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "Go to word"
 msgstr ""
@@ -1389,7 +1394,7 @@ msgstr ""
 msgid "Loading activity"
 msgstr ""
 
-#: src/lib/entry-editor/CommentDialog.svelte
+#: src/lib/entry-editor/comments/CommentPanel.svelte
 msgid "Loading comments..."
 msgstr ""
 
@@ -1643,10 +1648,6 @@ msgstr "Aucun contenu audio"
 msgid "No authors"
 msgstr ""
 
-#: src/lib/entry-editor/CommentDialog.svelte
-msgid "No comment threads yet."
-msgstr ""
-
 #. Empty state message in the manage custom views dialog when none exist.
 #: src/lib/views/custom/ManageCustomViewsDialog.svelte
 msgid "No custom views yet."
@@ -1686,6 +1687,11 @@ msgstr ""
 msgid "No new data"
 msgstr "Aucune nouvelle donnée"
 
+#: src/lib/entry-editor/comments/CommentPanel.svelte
+#: src/lib/entry-editor/comments/CommentPanel.svelte
+msgid "No open conversations"
+msgstr ""
+
 #. Empty state shown read-only in the Pictures field when a sense has no pictures
 #: src/lib/entry-editor/field-editors/PicturesEditor.svelte
 msgid "No pictures"
@@ -1701,16 +1707,10 @@ msgstr "Aucun serveur"
 msgid "No server configured"
 msgstr "Pas de serveur configuré"
 
-#. Relevant view: Classic
-#. Lite view equivalent: "No similar words found"
-#. Status line in the New Entry dialog: the duplicate check found no existing entries like the one being typed
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "No similar entries found"
 msgstr ""
 
-#. Relevant view: Lite
-#. Classic view equivalent: "No similar entries found"
-#. Status line in the New Word dialog: the duplicate check found no existing words like the one being typed
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "No similar words found"
 msgstr ""
@@ -1819,7 +1819,6 @@ msgstr "Un commit FieldWorks Classic peut contenir des modifications à plusieur
 
 #. Button to open downloaded project
 #: src/home/Server.svelte
-#: src/lib/entry-editor/CommentDialog.svelte
 msgid "Open"
 msgstr "Ouvert"
 
@@ -2066,6 +2065,9 @@ msgstr "Supprimer l'audio"
 
 #. Button to reopen in FieldWorks
 #: src/lib/components/OpenInFieldWorksButton.svelte
+#: src/lib/entry-editor/comments/CommentPanel.svelte
+#: src/lib/entry-editor/comments/CommentThread.svelte
+#: src/lib/entry-editor/comments/CommentThread.svelte
 msgid "Reopen"
 msgstr "Rouvrir"
 
@@ -2078,6 +2080,15 @@ msgstr "Remplacer l'audio"
 msgid "Replace Picture"
 msgstr ""
 
+#: src/lib/entry-editor/comments/CommentReplyInput.svelte
+#: src/lib/entry-editor/comments/CommentReplyInput.svelte
+msgid "Reply"
+msgstr ""
+
+#: src/lib/entry-editor/comments/CommentReplyInput.svelte
+msgid "Reply…"
+msgstr ""
+
 #. Button text
 #: src/lib/about/FeedbackDialog.svelte
 msgid "Report a technical problem"
@@ -2087,6 +2098,12 @@ msgstr "Signaler un problème technique"
 msgid "Reset"
 msgstr ""
 
+#: src/lib/entry-editor/comments/CommentPanel.svelte
+#: src/lib/entry-editor/comments/CommentThread.svelte
+#: src/lib/entry-editor/comments/CommentThread.svelte
+msgid "Resolve"
+msgstr ""
+
 #. Button label to restore a deleted Entry or Word inside EntryView
 #: src/project/browse/EntryView.svelte
 msgid "Restore"
@@ -2102,29 +2119,20 @@ msgstr "Évaluer"
 msgid "rose"
 msgstr "rose"
 
-#. Relevant view: Classic
-#. Lite view equivalent: "Same word"
-#. Badge on a possible-duplicate result: its headword is identical to the one being typed in the New Entry dialog
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "Same headword"
 msgstr ""
 
-#. Relevant view: Classic
-#. Lite view equivalent: "Same word"
-#. Badge on a possible-duplicate result: only its lexeme form matches the typed text, while its citation form (shown as the headword) differs — deliberately NOT claiming "Same headword"
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "Same lexeme form"
 msgstr ""
 
-#. Relevant view: Lite
-#. Classic view equivalent: "Same headword"
-#. Badge on a possible-duplicate result: it is spelled exactly like the word being typed in the New Word dialog
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "Same word"
 msgstr ""
 
-#: src/lib/entry-editor/CommentDialog.svelte
+#: src/lib/entry-editor/comments/CommentItem.svelte
 msgid "Save"
 msgstr ""
 
@@ -2269,48 +2277,30 @@ msgstr "Afficher"
 msgid "Show {0} more..."
 msgstr "Afficher {0} plus..."
 
-#: src/lib/entry-editor/CommentDialog.svelte
+#: src/lib/entry-editor/comments/CommentPanel.svelte
 msgid "Sign in to add comments."
 msgstr ""
 
-#. Relevant view: Classic
-#. Lite view equivalent: "Similar words already exist"
-#. Warning banner in the New Entry dialog; expands to a list of possible duplicate entries
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "Similar entries already exist"
 msgstr ""
 
-#. Relevant view: Classic
-#. Lite view equivalent: "Similar meaning"
-#. Badge on a possible-duplicate result: one of its glosses matches the gloss being typed in the New Entry dialog
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "Similar gloss"
 msgstr ""
 
-#. Relevant view: Classic
-#. Lite view equivalent: "Similar word"
-#. Badge on a possible-duplicate result: its headword partly matches the one being typed in the New Entry dialog
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "Similar headword"
 msgstr ""
 
-#. Relevant view: Lite
-#. Classic view equivalent: "Similar gloss"
-#. Badge on a possible-duplicate result: one of its meanings matches the meaning being typed in the New Word dialog
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "Similar meaning"
 msgstr ""
 
-#. Relevant view: Lite
-#. Classic view equivalent: "Similar headword"
-#. Badge on a possible-duplicate result: it is spelled almost like the word being typed in the New Word dialog
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "Similar word"
 msgstr ""
 
-#. Relevant view: Lite
-#. Classic view equivalent: "Similar entries already exist"
-#. Warning banner in the New Word dialog; expands to a list of possible duplicate words
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "Similar words already exist"
 msgstr ""
@@ -2343,8 +2333,12 @@ msgstr ""
 msgid "Specific field"
 msgstr "Champ spécifique"
 
-#: src/lib/entry-editor/CommentDialog.svelte
-msgid "Start a new thread"
+#: src/lib/entry-editor/comments/CommentPanel.svelte
+msgid "Start a conversation"
+msgstr ""
+
+#: src/lib/entry-editor/comments/CommentPanel.svelte
+msgid "Start a conversation…"
 msgstr ""
 
 #. Filter operator
@@ -2517,9 +2511,6 @@ msgstr "Cet {0} a été supprimé"
 msgid "This date # and this emoji # are snippets"
 msgstr "Cette date # et cet emoji # sont des extraits."
 
-#. Relevant view: Classic
-#. Lite view equivalent: "This word may already exist"
-#. Warning banner in the New Entry dialog when an entry with the exact same headword exists; expands to a list of possible duplicates
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "This entry may already exist"
 msgstr ""
@@ -2561,17 +2552,10 @@ msgstr "Cette tâche est terminée"
 msgid "This will synchronize the FieldWorks Lite and FieldWorks Classic copies of your project in Lexbox."
 msgstr "Cela synchronisera les copies FieldWorks Lite et FieldWorks Classic de votre projet dans Lexbox."
 
-#. Relevant view: Lite
-#. Classic view equivalent: "This entry may already exist"
-#. Warning banner in the New Word dialog when a word with the exact same spelling exists; expands to a list of possible duplicates
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "This word may already exist"
 msgstr ""
 
-#: src/lib/entry-editor/CommentDialog.svelte
-msgid "Thread"
-msgstr ""
-
 #. Button to show/hide filter panel
 #: src/project/browse/SearchFilter.svelte
 msgid "Toggle filters"
@@ -2706,6 +2690,15 @@ msgstr "Serveur inconnu"
 msgid "Unknown update result"
 msgstr "Résultat de mise à jour inconnu"
 
+#: src/lib/entry-editor/comments/CommentThread.svelte
+#: src/lib/entry-editor/comments/CommentThread.svelte
+msgid "Unread"
+msgstr ""
+
+#: src/lib/entry-editor/comments/CommentPanel.svelte
+msgid "Unread comments"
+msgstr ""
+
 #. Placeholder for missing value
 #. Displayed when a word/entry/field has no content yet
 #. Used in: entry list, activity changes, change preview, field labels
@@ -2868,14 +2861,6 @@ msgstr "Mot ou affichage tel que requis"
 msgid "Word or meaning:"
 msgstr "Mot ou sens :"
 
-#: src/lib/entry-editor/CommentDialog.svelte
-msgid "Write a reply..."
-msgstr ""
-
-#: src/lib/entry-editor/CommentDialog.svelte
-msgid "Write the first comment..."
-msgstr ""
-
 #. Column header
 #: src/project/browse/filter/WsSelect.svelte
 msgid "Writing System"
diff --git a/frontend/viewer/src/locales/id.po b/frontend/viewer/src/locales/id.po
index 4717ea485a..c2b6afa44e 100644
--- a/frontend/viewer/src/locales/id.po
+++ b/frontend/viewer/src/locales/id.po
@@ -25,8 +25,12 @@ msgstr ""
 msgid "– ({0} changes)"
 msgstr "- ({0} perubahan)"
 
-#: src/lib/entry-editor/CommentDialog.svelte
-#: src/lib/entry-editor/CommentDialog.svelte
+#: src/lib/entry-editor/comments/CommentItem.svelte
+#: src/lib/entry-editor/comments/CommentItem.svelte
+msgid "(edited)"
+msgstr ""
+
+#: src/lib/entry-editor/comments/CommentItem.svelte
 msgid "(unknown)"
 msgstr ""
 
@@ -66,6 +70,14 @@ msgstr ""
 msgid "{0} MB"
 msgstr "{0} MB"
 
+#: src/lib/entry-editor/comments/CommentThread.svelte
+msgid "{0} replies"
+msgstr ""
+
+#: src/lib/entry-editor/comments/CommentPanel.svelte
+msgid "{0} resolved"
+msgstr ""
+
 #. Display name for server
 #: src/home/Server.svelte
 msgid "{0} Server"
@@ -87,7 +99,6 @@ msgstr "{num, plural, one {# new FieldWorks Classic commit} other {# new FieldWo
 msgid "{num, plural, one {# new FieldWorks Lite commit} other {# new FieldWorks Lite commits}}"
 msgstr "{num, plural, one {# new FieldWorks Lite commit} other {# new FieldWorks Lite commits}}"
 
-#. Button revealing the rest of a truncated possible-duplicates list in the New Entry dialog; # is the number of hidden matches
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "{num, plural, one {Show # more...} other {Show # more...}}"
 msgstr ""
@@ -107,21 +118,19 @@ msgstr "**Jenis morfem yang lebih sedikit** (hanya *Root*, *Bound Root*, *Stem*,
 msgid "**Simpler terminology** (e.g. *Word* instead of *Lexeme form*, *Meaning* instead of *Sense*)"
 msgstr "**Terminologi yang lebih sederhana** (mis. *Kata* alih-alih *Bentuk leksem*, *Makna* alih-alih *Rasa*)"
 
+#: src/lib/entry-editor/comments/CommentThread.svelte
+msgid "1 reply"
+msgstr ""
+
 #. Update notification
 #: src/lib/notifications/NotificationOutlet.svelte
 msgid "A new version of FieldWorks Lite is available."
 msgstr "Versi baru FieldWorks Lite telah tersedia."
 
-#. Relevant view: Classic
-#. Lite view equivalent: "A similar word already exists"
-#. Warning banner in the New Entry dialog when exactly one possible duplicate was found (none an exact headword match)
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "A similar entry already exists"
 msgstr ""
 
-#. Relevant view: Lite
-#. Classic view equivalent: "A similar entry already exists"
-#. Warning banner in the New Word dialog when exactly one possible duplicate was found (none spelled exactly the same)
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "A similar word already exists"
 msgstr ""
@@ -342,6 +351,10 @@ msgstr "Otomatis"
 msgid "Auto syncing"
 msgstr "Sinkronisasi otomatis"
 
+#: src/lib/entry-editor/comments/CommentPanel.svelte
+msgid "Back"
+msgstr ""
+
 #. Section label in custom view form.
 #. Selects the base view preset (Classic or Lite) that the custom view inherits from.
 #: src/lib/views/custom/CustomViewForm.svelte
@@ -382,9 +395,11 @@ msgstr ""
 #: src/lib/components/SubmitOrCancel.svelte
 #: src/lib/components/audio/AudioDialog.svelte
 #: src/lib/components/field-editors/select.svelte
-#: src/lib/entry-editor/CommentDialog.svelte
 #: src/lib/entry-editor/EditEntryDialog.svelte
 #: src/lib/entry-editor/NewEntryDialog.svelte
+#: src/lib/entry-editor/comments/CommentItem.svelte
+#: src/lib/entry-editor/comments/CommentPanel.svelte
+#: src/lib/entry-editor/comments/CommentReplyInput.svelte
 #: src/lib/entry-editor/field-editors/EditPictureDialog.svelte
 #: src/lib/troubleshoot/TroubleshootDialog.svelte
 #: src/lib/troubleshoot/TroubleshootDialog.svelte
@@ -406,16 +421,10 @@ msgstr "Perubahan juga dapat terjadi karena adanya penambahan field pada versi b
 msgid "Changing the same field twice, for example, can result in two commits but only one change that needs to be applied to FieldWorks Classic. Commits can also consist of multiple changes."
 msgstr "Mengubah bidang yang sama dua kali, misalnya, dapat menghasilkan dua komit namun hanya satu perubahan yang perlu diterapkan ke FieldWorks Classic. Commit juga dapat terdiri dari beberapa perubahan."
 
-#. Relevant view: Classic
-#. Lite view equivalent: "Checking for similar words…"
-#. Status line in the New Entry dialog while searching for possible duplicate entries
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "Checking for similar entries…"
 msgstr ""
 
-#. Relevant view: Lite
-#. Classic view equivalent: "Checking for similar entries…"
-#. Status line in the New Word dialog while searching for possible duplicate words
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "Checking for similar words…"
 msgstr ""
@@ -454,8 +463,7 @@ msgstr "jelas"
 #: src/lib/about/AboutDialog.svelte
 #: src/lib/components/field-editors/multi-select.svelte
 #: src/lib/components/ui/button/x-button.svelte
-#: src/lib/entry-editor/CommentDialog.svelte
-#: src/lib/entry-editor/CommentDialog.svelte
+#: src/lib/entry-editor/comments/CommentDialog.svelte
 #: src/lib/entry-editor/duplicate-check/DuplicateSummaryPill.svelte
 #: src/project/tasks/SubjectPopup.svelte
 msgid "Close"
@@ -467,10 +475,6 @@ msgstr "Tutup"
 msgid "Close Dictionary"
 msgstr "Tutup Kamus"
 
-#: src/lib/entry-editor/CommentDialog.svelte
-msgid "Closed"
-msgstr ""
-
 #. Field label in the create-project dialog. The project's short machine-readable identifier (slug), e.g. "my-dictionary".
 #: src/home/CreateProjectDialog.svelte
 msgid "Code"
@@ -481,15 +485,24 @@ msgstr ""
 msgid "Color"
 msgstr "Warna"
 
-#: src/lib/entry-editor/CommentDialog.svelte
+#: src/lib/entry-editor/comments/CommentPanel.svelte
+msgid "Comment"
+msgstr ""
+
+#: src/lib/entry-editor/comments/CommentDialog.svelte
+#: src/lib/entry-editor/comments/CommentPanel.svelte
 #: src/project/browse/EntryView.svelte
 msgid "Comments"
 msgstr ""
 
-#: src/lib/entry-editor/CommentDialog.svelte
+#: src/lib/entry-editor/comments/CommentDialog.svelte
 msgid "Comments for {0}"
 msgstr ""
 
+#: src/project/browse/EntryView.svelte
+msgid "Comments, {0} unread"
+msgstr ""
+
 #. Field label
 #: src/lib/entry-editor/field-editors/ComplexFormComponents.svelte
 #: src/lib/entry-editor/field-editors/ComplexForms.svelte
@@ -542,6 +555,10 @@ msgstr "Komponen"
 msgid "Contains"
 msgstr "Berisi"
 
+#: src/lib/entry-editor/comments/CommentPanel.svelte
+msgid "Conversation"
+msgstr ""
+
 #. Success message after copying text
 #: src/lib/components/ui/button/copy-button.svelte
 msgid "Copied to clipboard"
@@ -552,16 +569,10 @@ msgstr "Disalin ke papan klip"
 msgid "Copy version"
 msgstr "Versi salin"
 
-#. Relevant view: Classic
-#. Lite view equivalent: "Could not check for similar words"
-#. Status line in the New Entry dialog when the background duplicate search failed (e.g. connection lost); typing again retries
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "Could not check for similar entries"
 msgstr ""
 
-#. Relevant view: Lite
-#. Classic view equivalent: "Could not check for similar entries"
-#. Status line in the New Word dialog when the background duplicate search failed (e.g. connection lost); typing again retries
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "Could not check for similar words"
 msgstr ""
@@ -811,11 +822,11 @@ msgstr "Mengunduh..."
 msgid "e.g. th, sw"
 msgstr ""
 
-#: src/lib/entry-editor/CommentDialog.svelte
+#: src/lib/entry-editor/comments/CommentItem.svelte
 msgid "Edit"
 msgstr ""
 
-#: src/lib/entry-editor/CommentDialog.svelte
+#: src/lib/entry-editor/comments/CommentItem.svelte
 msgid "Edit comment"
 msgstr ""
 
@@ -834,7 +845,7 @@ msgstr ""
 msgid "Editor"
 msgstr "Editor"
 
-#: src/lib/entry-editor/CommentDialog.svelte
+#: src/lib/entry-editor/comments/CommentItem.svelte
 msgid "Empty comment"
 msgstr ""
 
@@ -1189,16 +1200,10 @@ msgstr "Arti Singkat"
 msgid "Go to {0}"
 msgstr "Buka {0}"
 
-#. Relevant view: Classic
-#. Lite view equivalent: "Go to word"
-#. Tooltip on a possible-duplicate result in the New Entry dialog; clicking closes the dialog and opens that entry
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "Go to entry"
 msgstr ""
 
-#. Relevant view: Lite
-#. Classic view equivalent: "Go to entry"
-#. Tooltip on a possible-duplicate result in the New Word dialog; clicking closes the dialog and opens that word
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "Go to word"
 msgstr ""
@@ -1389,7 +1394,7 @@ msgstr ""
 msgid "Loading activity"
 msgstr ""
 
-#: src/lib/entry-editor/CommentDialog.svelte
+#: src/lib/entry-editor/comments/CommentPanel.svelte
 msgid "Loading comments..."
 msgstr ""
 
@@ -1643,10 +1648,6 @@ msgstr "Tidak ada audio"
 msgid "No authors"
 msgstr ""
 
-#: src/lib/entry-editor/CommentDialog.svelte
-msgid "No comment threads yet."
-msgstr ""
-
 #. Empty state message in the manage custom views dialog when none exist.
 #: src/lib/views/custom/ManageCustomViewsDialog.svelte
 msgid "No custom views yet."
@@ -1686,6 +1687,11 @@ msgstr ""
 msgid "No new data"
 msgstr "Tidak ada data baru"
 
+#: src/lib/entry-editor/comments/CommentPanel.svelte
+#: src/lib/entry-editor/comments/CommentPanel.svelte
+msgid "No open conversations"
+msgstr ""
+
 #. Empty state shown read-only in the Pictures field when a sense has no pictures
 #: src/lib/entry-editor/field-editors/PicturesEditor.svelte
 msgid "No pictures"
@@ -1701,16 +1707,10 @@ msgstr "Tidak ada server"
 msgid "No server configured"
 msgstr "Tidak ada server yang dikonfigurasi"
 
-#. Relevant view: Classic
-#. Lite view equivalent: "No similar words found"
-#. Status line in the New Entry dialog: the duplicate check found no existing entries like the one being typed
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "No similar entries found"
 msgstr ""
 
-#. Relevant view: Lite
-#. Classic view equivalent: "No similar entries found"
-#. Status line in the New Word dialog: the duplicate check found no existing words like the one being typed
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "No similar words found"
 msgstr ""
@@ -1819,7 +1819,6 @@ msgstr "Satu komit FieldWorks Classic dapat terdiri dari perubahan pada beberapa
 
 #. Button to open downloaded project
 #: src/home/Server.svelte
-#: src/lib/entry-editor/CommentDialog.svelte
 msgid "Open"
 msgstr "Buka"
 
@@ -2066,6 +2065,9 @@ msgstr "Menghapus audio"
 
 #. Button to reopen in FieldWorks
 #: src/lib/components/OpenInFieldWorksButton.svelte
+#: src/lib/entry-editor/comments/CommentPanel.svelte
+#: src/lib/entry-editor/comments/CommentThread.svelte
+#: src/lib/entry-editor/comments/CommentThread.svelte
 msgid "Reopen"
 msgstr "Buka kembali"
 
@@ -2078,6 +2080,15 @@ msgstr "Mengganti audio"
 msgid "Replace Picture"
 msgstr ""
 
+#: src/lib/entry-editor/comments/CommentReplyInput.svelte
+#: src/lib/entry-editor/comments/CommentReplyInput.svelte
+msgid "Reply"
+msgstr ""
+
+#: src/lib/entry-editor/comments/CommentReplyInput.svelte
+msgid "Reply…"
+msgstr ""
+
 #. Button text
 #: src/lib/about/FeedbackDialog.svelte
 msgid "Report a technical problem"
@@ -2087,6 +2098,12 @@ msgstr "Melaporkan masalah teknis"
 msgid "Reset"
 msgstr ""
 
+#: src/lib/entry-editor/comments/CommentPanel.svelte
+#: src/lib/entry-editor/comments/CommentThread.svelte
+#: src/lib/entry-editor/comments/CommentThread.svelte
+msgid "Resolve"
+msgstr ""
+
 #. Button label to restore a deleted Entry or Word inside EntryView
 #: src/project/browse/EntryView.svelte
 msgid "Restore"
@@ -2102,29 +2119,20 @@ msgstr "Ulasan"
 msgid "rose"
 msgstr "naik"
 
-#. Relevant view: Classic
-#. Lite view equivalent: "Same word"
-#. Badge on a possible-duplicate result: its headword is identical to the one being typed in the New Entry dialog
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "Same headword"
 msgstr ""
 
-#. Relevant view: Classic
-#. Lite view equivalent: "Same word"
-#. Badge on a possible-duplicate result: only its lexeme form matches the typed text, while its citation form (shown as the headword) differs — deliberately NOT claiming "Same headword"
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "Same lexeme form"
 msgstr ""
 
-#. Relevant view: Lite
-#. Classic view equivalent: "Same headword"
-#. Badge on a possible-duplicate result: it is spelled exactly like the word being typed in the New Word dialog
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "Same word"
 msgstr ""
 
-#: src/lib/entry-editor/CommentDialog.svelte
+#: src/lib/entry-editor/comments/CommentItem.svelte
 msgid "Save"
 msgstr ""
 
@@ -2269,48 +2277,30 @@ msgstr "Tampilkan"
 msgid "Show {0} more..."
 msgstr "Tampilkan {0} selengkapnya..."
 
-#: src/lib/entry-editor/CommentDialog.svelte
+#: src/lib/entry-editor/comments/CommentPanel.svelte
 msgid "Sign in to add comments."
 msgstr ""
 
-#. Relevant view: Classic
-#. Lite view equivalent: "Similar words already exist"
-#. Warning banner in the New Entry dialog; expands to a list of possible duplicate entries
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "Similar entries already exist"
 msgstr ""
 
-#. Relevant view: Classic
-#. Lite view equivalent: "Similar meaning"
-#. Badge on a possible-duplicate result: one of its glosses matches the gloss being typed in the New Entry dialog
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "Similar gloss"
 msgstr ""
 
-#. Relevant view: Classic
-#. Lite view equivalent: "Similar word"
-#. Badge on a possible-duplicate result: its headword partly matches the one being typed in the New Entry dialog
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "Similar headword"
 msgstr ""
 
-#. Relevant view: Lite
-#. Classic view equivalent: "Similar gloss"
-#. Badge on a possible-duplicate result: one of its meanings matches the meaning being typed in the New Word dialog
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "Similar meaning"
 msgstr ""
 
-#. Relevant view: Lite
-#. Classic view equivalent: "Similar headword"
-#. Badge on a possible-duplicate result: it is spelled almost like the word being typed in the New Word dialog
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "Similar word"
 msgstr ""
 
-#. Relevant view: Lite
-#. Classic view equivalent: "Similar entries already exist"
-#. Warning banner in the New Word dialog; expands to a list of possible duplicate words
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "Similar words already exist"
 msgstr ""
@@ -2343,8 +2333,12 @@ msgstr ""
 msgid "Specific field"
 msgstr "Bidang tertentu"
 
-#: src/lib/entry-editor/CommentDialog.svelte
-msgid "Start a new thread"
+#: src/lib/entry-editor/comments/CommentPanel.svelte
+msgid "Start a conversation"
+msgstr ""
+
+#: src/lib/entry-editor/comments/CommentPanel.svelte
+msgid "Start a conversation…"
 msgstr ""
 
 #. Filter operator
@@ -2517,9 +2511,6 @@ msgstr "{0} ini telah dihapus"
 msgid "This date # and this emoji # are snippets"
 msgstr "Tanggal ini # dan emoji ini # adalah cuplikan"
 
-#. Relevant view: Classic
-#. Lite view equivalent: "This word may already exist"
-#. Warning banner in the New Entry dialog when an entry with the exact same headword exists; expands to a list of possible duplicates
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "This entry may already exist"
 msgstr ""
@@ -2561,17 +2552,10 @@ msgstr "Tugas ini selesai"
 msgid "This will synchronize the FieldWorks Lite and FieldWorks Classic copies of your project in Lexbox."
 msgstr "Ini akan menyinkronkan salinan FieldWorks Lite dan FieldWorks Classic dari proyek Anda di Lexbox."
 
-#. Relevant view: Lite
-#. Classic view equivalent: "This entry may already exist"
-#. Warning banner in the New Word dialog when a word with the exact same spelling exists; expands to a list of possible duplicates
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "This word may already exist"
 msgstr ""
 
-#: src/lib/entry-editor/CommentDialog.svelte
-msgid "Thread"
-msgstr ""
-
 #. Button to show/hide filter panel
 #: src/project/browse/SearchFilter.svelte
 msgid "Toggle filters"
@@ -2706,6 +2690,15 @@ msgstr "Server tidak dikenal"
 msgid "Unknown update result"
 msgstr "Hasil pembaruan tidak diketahui"
 
+#: src/lib/entry-editor/comments/CommentThread.svelte
+#: src/lib/entry-editor/comments/CommentThread.svelte
+msgid "Unread"
+msgstr ""
+
+#: src/lib/entry-editor/comments/CommentPanel.svelte
+msgid "Unread comments"
+msgstr ""
+
 #. Placeholder for missing value
 #. Displayed when a word/entry/field has no content yet
 #. Used in: entry list, activity changes, change preview, field labels
@@ -2868,14 +2861,6 @@ msgstr "Kata atau Tampilan sesuai kebutuhan"
 msgid "Word or meaning:"
 msgstr "Kata atau makna:"
 
-#: src/lib/entry-editor/CommentDialog.svelte
-msgid "Write a reply..."
-msgstr ""
-
-#: src/lib/entry-editor/CommentDialog.svelte
-msgid "Write the first comment..."
-msgstr ""
-
 #. Column header
 #: src/project/browse/filter/WsSelect.svelte
 msgid "Writing System"
diff --git a/frontend/viewer/src/locales/ko.po b/frontend/viewer/src/locales/ko.po
index 0dce50ca54..5624f27790 100644
--- a/frontend/viewer/src/locales/ko.po
+++ b/frontend/viewer/src/locales/ko.po
@@ -25,8 +25,12 @@ msgstr ""
 msgid "– ({0} changes)"
 msgstr "- ({0}개 변경)"
 
-#: src/lib/entry-editor/CommentDialog.svelte
-#: src/lib/entry-editor/CommentDialog.svelte
+#: src/lib/entry-editor/comments/CommentItem.svelte
+#: src/lib/entry-editor/comments/CommentItem.svelte
+msgid "(edited)"
+msgstr ""
+
+#: src/lib/entry-editor/comments/CommentItem.svelte
 msgid "(unknown)"
 msgstr ""
 
@@ -66,6 +70,14 @@ msgstr ""
 msgid "{0} MB"
 msgstr "{0} MB"
 
+#: src/lib/entry-editor/comments/CommentThread.svelte
+msgid "{0} replies"
+msgstr ""
+
+#: src/lib/entry-editor/comments/CommentPanel.svelte
+msgid "{0} resolved"
+msgstr ""
+
 #. Display name for server
 #: src/home/Server.svelte
 msgid "{0} Server"
@@ -87,7 +99,6 @@ msgstr "{num, plural, other {# 새 FieldWorks Classic 커밋}}"
 msgid "{num, plural, one {# new FieldWorks Lite commit} other {# new FieldWorks Lite commits}}"
 msgstr "{num, plural, other {# 새 FieldWorks Lite 커밋}}"
 
-#. Button revealing the rest of a truncated possible-duplicates list in the New Entry dialog; # is the number of hidden matches
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "{num, plural, one {Show # more...} other {Show # more...}}"
 msgstr ""
@@ -107,21 +118,19 @@ msgstr "**형태소 유형 감소** (*뿌리*, *결합된 뿌리*, *줄기*, *
 msgid "**Simpler terminology** (e.g. *Word* instead of *Lexeme form*, *Meaning* instead of *Sense*)"
 msgstr "**간단한 용어 사용** (예: *어휘 형태* 대신 *단어*, *의미* 대신 *의미*)"
 
+#: src/lib/entry-editor/comments/CommentThread.svelte
+msgid "1 reply"
+msgstr ""
+
 #. Update notification
 #: src/lib/notifications/NotificationOutlet.svelte
 msgid "A new version of FieldWorks Lite is available."
 msgstr "새 버전의 FieldWorks Lite를 사용할 수 있습니다."
 
-#. Relevant view: Classic
-#. Lite view equivalent: "A similar word already exists"
-#. Warning banner in the New Entry dialog when exactly one possible duplicate was found (none an exact headword match)
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "A similar entry already exists"
 msgstr ""
 
-#. Relevant view: Lite
-#. Classic view equivalent: "A similar entry already exists"
-#. Warning banner in the New Word dialog when exactly one possible duplicate was found (none spelled exactly the same)
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "A similar word already exists"
 msgstr ""
@@ -342,6 +351,10 @@ msgstr "자동"
 msgid "Auto syncing"
 msgstr "자동 동기화"
 
+#: src/lib/entry-editor/comments/CommentPanel.svelte
+msgid "Back"
+msgstr ""
+
 #. Section label in custom view form.
 #. Selects the base view preset (Classic or Lite) that the custom view inherits from.
 #: src/lib/views/custom/CustomViewForm.svelte
@@ -382,9 +395,11 @@ msgstr ""
 #: src/lib/components/SubmitOrCancel.svelte
 #: src/lib/components/audio/AudioDialog.svelte
 #: src/lib/components/field-editors/select.svelte
-#: src/lib/entry-editor/CommentDialog.svelte
 #: src/lib/entry-editor/EditEntryDialog.svelte
 #: src/lib/entry-editor/NewEntryDialog.svelte
+#: src/lib/entry-editor/comments/CommentItem.svelte
+#: src/lib/entry-editor/comments/CommentPanel.svelte
+#: src/lib/entry-editor/comments/CommentReplyInput.svelte
 #: src/lib/entry-editor/field-editors/EditPictureDialog.svelte
 #: src/lib/troubleshoot/TroubleshootDialog.svelte
 #: src/lib/troubleshoot/TroubleshootDialog.svelte
@@ -406,16 +421,10 @@ msgstr "FieldWorks Lite의 새 버전에 필드가 추가되어 변경 사항이
 msgid "Changing the same field twice, for example, can result in two commits but only one change that needs to be applied to FieldWorks Classic. Commits can also consist of multiple changes."
 msgstr "예를 들어 동일한 필드를 두 번 변경하면 두 개의 커밋이 발생하지만 FieldWorks Classic에 적용해야 하는 변경 사항은 하나만 발생할 수 있습니다. 커밋은 여러 변경 사항으로 구성될 수도 있습니다."
 
-#. Relevant view: Classic
-#. Lite view equivalent: "Checking for similar words…"
-#. Status line in the New Entry dialog while searching for possible duplicate entries
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "Checking for similar entries…"
 msgstr ""
 
-#. Relevant view: Lite
-#. Classic view equivalent: "Checking for similar entries…"
-#. Status line in the New Word dialog while searching for possible duplicate words
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "Checking for similar words…"
 msgstr ""
@@ -454,8 +463,7 @@ msgstr "clear"
 #: src/lib/about/AboutDialog.svelte
 #: src/lib/components/field-editors/multi-select.svelte
 #: src/lib/components/ui/button/x-button.svelte
-#: src/lib/entry-editor/CommentDialog.svelte
-#: src/lib/entry-editor/CommentDialog.svelte
+#: src/lib/entry-editor/comments/CommentDialog.svelte
 #: src/lib/entry-editor/duplicate-check/DuplicateSummaryPill.svelte
 #: src/project/tasks/SubjectPopup.svelte
 msgid "Close"
@@ -467,10 +475,6 @@ msgstr "닫기"
 msgid "Close Dictionary"
 msgstr "사전 닫기"
 
-#: src/lib/entry-editor/CommentDialog.svelte
-msgid "Closed"
-msgstr ""
-
 #. Field label in the create-project dialog. The project's short machine-readable identifier (slug), e.g. "my-dictionary".
 #: src/home/CreateProjectDialog.svelte
 msgid "Code"
@@ -481,15 +485,24 @@ msgstr ""
 msgid "Color"
 msgstr "색상"
 
-#: src/lib/entry-editor/CommentDialog.svelte
+#: src/lib/entry-editor/comments/CommentPanel.svelte
+msgid "Comment"
+msgstr ""
+
+#: src/lib/entry-editor/comments/CommentDialog.svelte
+#: src/lib/entry-editor/comments/CommentPanel.svelte
 #: src/project/browse/EntryView.svelte
 msgid "Comments"
 msgstr ""
 
-#: src/lib/entry-editor/CommentDialog.svelte
+#: src/lib/entry-editor/comments/CommentDialog.svelte
 msgid "Comments for {0}"
 msgstr ""
 
+#: src/project/browse/EntryView.svelte
+msgid "Comments, {0} unread"
+msgstr ""
+
 #. Field label
 #: src/lib/entry-editor/field-editors/ComplexFormComponents.svelte
 #: src/lib/entry-editor/field-editors/ComplexForms.svelte
@@ -542,6 +555,10 @@ msgstr "구성 요소"
 msgid "Contains"
 msgstr "포함 사항"
 
+#: src/lib/entry-editor/comments/CommentPanel.svelte
+msgid "Conversation"
+msgstr ""
+
 #. Success message after copying text
 #: src/lib/components/ui/button/copy-button.svelte
 msgid "Copied to clipboard"
@@ -552,16 +569,10 @@ msgstr "클립보드에 복사"
 msgid "Copy version"
 msgstr "복사 버전"
 
-#. Relevant view: Classic
-#. Lite view equivalent: "Could not check for similar words"
-#. Status line in the New Entry dialog when the background duplicate search failed (e.g. connection lost); typing again retries
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "Could not check for similar entries"
 msgstr ""
 
-#. Relevant view: Lite
-#. Classic view equivalent: "Could not check for similar entries"
-#. Status line in the New Word dialog when the background duplicate search failed (e.g. connection lost); typing again retries
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "Could not check for similar words"
 msgstr ""
@@ -811,11 +822,11 @@ msgstr "다운로드 중..."
 msgid "e.g. th, sw"
 msgstr ""
 
-#: src/lib/entry-editor/CommentDialog.svelte
+#: src/lib/entry-editor/comments/CommentItem.svelte
 msgid "Edit"
 msgstr ""
 
-#: src/lib/entry-editor/CommentDialog.svelte
+#: src/lib/entry-editor/comments/CommentItem.svelte
 msgid "Edit comment"
 msgstr ""
 
@@ -834,7 +845,7 @@ msgstr ""
 msgid "Editor"
 msgstr "편집기"
 
-#: src/lib/entry-editor/CommentDialog.svelte
+#: src/lib/entry-editor/comments/CommentItem.svelte
 msgid "Empty comment"
 msgstr ""
 
@@ -1189,16 +1200,10 @@ msgstr "광택"
 msgid "Go to {0}"
 msgstr "{0}으로 이동"
 
-#. Relevant view: Classic
-#. Lite view equivalent: "Go to word"
-#. Tooltip on a possible-duplicate result in the New Entry dialog; clicking closes the dialog and opens that entry
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "Go to entry"
 msgstr ""
 
-#. Relevant view: Lite
-#. Classic view equivalent: "Go to entry"
-#. Tooltip on a possible-duplicate result in the New Word dialog; clicking closes the dialog and opens that word
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "Go to word"
 msgstr ""
@@ -1389,7 +1394,7 @@ msgstr ""
 msgid "Loading activity"
 msgstr ""
 
-#: src/lib/entry-editor/CommentDialog.svelte
+#: src/lib/entry-editor/comments/CommentPanel.svelte
 msgid "Loading comments..."
 msgstr ""
 
@@ -1643,10 +1648,6 @@ msgstr "오디오 없음"
 msgid "No authors"
 msgstr ""
 
-#: src/lib/entry-editor/CommentDialog.svelte
-msgid "No comment threads yet."
-msgstr ""
-
 #. Empty state message in the manage custom views dialog when none exist.
 #: src/lib/views/custom/ManageCustomViewsDialog.svelte
 msgid "No custom views yet."
@@ -1686,6 +1687,11 @@ msgstr ""
 msgid "No new data"
 msgstr "새 데이터 없음"
 
+#: src/lib/entry-editor/comments/CommentPanel.svelte
+#: src/lib/entry-editor/comments/CommentPanel.svelte
+msgid "No open conversations"
+msgstr ""
+
 #. Empty state shown read-only in the Pictures field when a sense has no pictures
 #: src/lib/entry-editor/field-editors/PicturesEditor.svelte
 msgid "No pictures"
@@ -1701,16 +1707,10 @@ msgstr "서버 없음"
 msgid "No server configured"
 msgstr "구성된 서버 없음"
 
-#. Relevant view: Classic
-#. Lite view equivalent: "No similar words found"
-#. Status line in the New Entry dialog: the duplicate check found no existing entries like the one being typed
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "No similar entries found"
 msgstr ""
 
-#. Relevant view: Lite
-#. Classic view equivalent: "No similar entries found"
-#. Status line in the New Word dialog: the duplicate check found no existing words like the one being typed
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "No similar words found"
 msgstr ""
@@ -1819,7 +1819,6 @@ msgstr "하나의 FieldWorks Classic 커밋은 여러 항목 또는 필드에 
 
 #. Button to open downloaded project
 #: src/home/Server.svelte
-#: src/lib/entry-editor/CommentDialog.svelte
 msgid "Open"
 msgstr "열기"
 
@@ -2066,6 +2065,9 @@ msgstr "오디오 제거"
 
 #. Button to reopen in FieldWorks
 #: src/lib/components/OpenInFieldWorksButton.svelte
+#: src/lib/entry-editor/comments/CommentPanel.svelte
+#: src/lib/entry-editor/comments/CommentThread.svelte
+#: src/lib/entry-editor/comments/CommentThread.svelte
 msgid "Reopen"
 msgstr "다시 열기"
 
@@ -2078,6 +2080,15 @@ msgstr "오디오 교체"
 msgid "Replace Picture"
 msgstr ""
 
+#: src/lib/entry-editor/comments/CommentReplyInput.svelte
+#: src/lib/entry-editor/comments/CommentReplyInput.svelte
+msgid "Reply"
+msgstr ""
+
+#: src/lib/entry-editor/comments/CommentReplyInput.svelte
+msgid "Reply…"
+msgstr ""
+
 #. Button text
 #: src/lib/about/FeedbackDialog.svelte
 msgid "Report a technical problem"
@@ -2087,6 +2098,12 @@ msgstr "기술 문제 신고하기"
 msgid "Reset"
 msgstr ""
 
+#: src/lib/entry-editor/comments/CommentPanel.svelte
+#: src/lib/entry-editor/comments/CommentThread.svelte
+#: src/lib/entry-editor/comments/CommentThread.svelte
+msgid "Resolve"
+msgstr ""
+
 #. Button label to restore a deleted Entry or Word inside EntryView
 #: src/project/browse/EntryView.svelte
 msgid "Restore"
@@ -2102,29 +2119,20 @@ msgstr "검토"
 msgid "rose"
 msgstr "rose"
 
-#. Relevant view: Classic
-#. Lite view equivalent: "Same word"
-#. Badge on a possible-duplicate result: its headword is identical to the one being typed in the New Entry dialog
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "Same headword"
 msgstr ""
 
-#. Relevant view: Classic
-#. Lite view equivalent: "Same word"
-#. Badge on a possible-duplicate result: only its lexeme form matches the typed text, while its citation form (shown as the headword) differs — deliberately NOT claiming "Same headword"
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "Same lexeme form"
 msgstr ""
 
-#. Relevant view: Lite
-#. Classic view equivalent: "Same headword"
-#. Badge on a possible-duplicate result: it is spelled exactly like the word being typed in the New Word dialog
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "Same word"
 msgstr ""
 
-#: src/lib/entry-editor/CommentDialog.svelte
+#: src/lib/entry-editor/comments/CommentItem.svelte
 msgid "Save"
 msgstr ""
 
@@ -2269,48 +2277,30 @@ msgstr "표시"
 msgid "Show {0} more..."
 msgstr "보기 {0} 더보기..."
 
-#: src/lib/entry-editor/CommentDialog.svelte
+#: src/lib/entry-editor/comments/CommentPanel.svelte
 msgid "Sign in to add comments."
 msgstr ""
 
-#. Relevant view: Classic
-#. Lite view equivalent: "Similar words already exist"
-#. Warning banner in the New Entry dialog; expands to a list of possible duplicate entries
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "Similar entries already exist"
 msgstr ""
 
-#. Relevant view: Classic
-#. Lite view equivalent: "Similar meaning"
-#. Badge on a possible-duplicate result: one of its glosses matches the gloss being typed in the New Entry dialog
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "Similar gloss"
 msgstr ""
 
-#. Relevant view: Classic
-#. Lite view equivalent: "Similar word"
-#. Badge on a possible-duplicate result: its headword partly matches the one being typed in the New Entry dialog
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "Similar headword"
 msgstr ""
 
-#. Relevant view: Lite
-#. Classic view equivalent: "Similar gloss"
-#. Badge on a possible-duplicate result: one of its meanings matches the meaning being typed in the New Word dialog
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "Similar meaning"
 msgstr ""
 
-#. Relevant view: Lite
-#. Classic view equivalent: "Similar headword"
-#. Badge on a possible-duplicate result: it is spelled almost like the word being typed in the New Word dialog
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "Similar word"
 msgstr ""
 
-#. Relevant view: Lite
-#. Classic view equivalent: "Similar entries already exist"
-#. Warning banner in the New Word dialog; expands to a list of possible duplicate words
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "Similar words already exist"
 msgstr ""
@@ -2343,8 +2333,12 @@ msgstr ""
 msgid "Specific field"
 msgstr "특정 필드"
 
-#: src/lib/entry-editor/CommentDialog.svelte
-msgid "Start a new thread"
+#: src/lib/entry-editor/comments/CommentPanel.svelte
+msgid "Start a conversation"
+msgstr ""
+
+#: src/lib/entry-editor/comments/CommentPanel.svelte
+msgid "Start a conversation…"
 msgstr ""
 
 #. Filter operator
@@ -2517,9 +2511,6 @@ msgstr "이 {0} 삭제됨"
 msgid "This date # and this emoji # are snippets"
 msgstr "이 날짜 #와 이 이모티콘 #은 스니펫입니다."
 
-#. Relevant view: Classic
-#. Lite view equivalent: "This word may already exist"
-#. Warning banner in the New Entry dialog when an entry with the exact same headword exists; expands to a list of possible duplicates
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "This entry may already exist"
 msgstr ""
@@ -2561,17 +2552,10 @@ msgstr "이 작업이 완료되었습니다."
 msgid "This will synchronize the FieldWorks Lite and FieldWorks Classic copies of your project in Lexbox."
 msgstr "이렇게 하면 렉스박스에서 프로젝트의 FieldWorks Lite 및 FieldWorks Classic 사본이 동기화됩니다."
 
-#. Relevant view: Lite
-#. Classic view equivalent: "This entry may already exist"
-#. Warning banner in the New Word dialog when a word with the exact same spelling exists; expands to a list of possible duplicates
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "This word may already exist"
 msgstr ""
 
-#: src/lib/entry-editor/CommentDialog.svelte
-msgid "Thread"
-msgstr ""
-
 #. Button to show/hide filter panel
 #: src/project/browse/SearchFilter.svelte
 msgid "Toggle filters"
@@ -2706,6 +2690,15 @@ msgstr "알 수 없는 서버"
 msgid "Unknown update result"
 msgstr "알 수 없는 업데이트 결과"
 
+#: src/lib/entry-editor/comments/CommentThread.svelte
+#: src/lib/entry-editor/comments/CommentThread.svelte
+msgid "Unread"
+msgstr ""
+
+#: src/lib/entry-editor/comments/CommentPanel.svelte
+msgid "Unread comments"
+msgstr ""
+
 #. Placeholder for missing value
 #. Displayed when a word/entry/field has no content yet
 #. Used in: entry list, activity changes, change preview, field labels
@@ -2868,14 +2861,6 @@ msgstr "단어 또는 표시 이름은 필수 입력 사항입니다."
 msgid "Word or meaning:"
 msgstr "단어 또는 의미:"
 
-#: src/lib/entry-editor/CommentDialog.svelte
-msgid "Write a reply..."
-msgstr ""
-
-#: src/lib/entry-editor/CommentDialog.svelte
-msgid "Write the first comment..."
-msgstr ""
-
 #. Column header
 #: src/project/browse/filter/WsSelect.svelte
 msgid "Writing System"
diff --git a/frontend/viewer/src/locales/ms.po b/frontend/viewer/src/locales/ms.po
index 6b72d7cd0a..f8d65af949 100644
--- a/frontend/viewer/src/locales/ms.po
+++ b/frontend/viewer/src/locales/ms.po
@@ -25,8 +25,12 @@ msgstr ""
 msgid "– ({0} changes)"
 msgstr "– ({0} perubahan)"
 
-#: src/lib/entry-editor/CommentDialog.svelte
-#: src/lib/entry-editor/CommentDialog.svelte
+#: src/lib/entry-editor/comments/CommentItem.svelte
+#: src/lib/entry-editor/comments/CommentItem.svelte
+msgid "(edited)"
+msgstr ""
+
+#: src/lib/entry-editor/comments/CommentItem.svelte
 msgid "(unknown)"
 msgstr ""
 
@@ -66,6 +70,14 @@ msgstr ""
 msgid "{0} MB"
 msgstr "{0} MB"
 
+#: src/lib/entry-editor/comments/CommentThread.svelte
+msgid "{0} replies"
+msgstr ""
+
+#: src/lib/entry-editor/comments/CommentPanel.svelte
+msgid "{0} resolved"
+msgstr ""
+
 #. Display name for server
 #: src/home/Server.svelte
 msgid "{0} Server"
@@ -87,7 +99,6 @@ msgstr "{num, plural, other {# komit FieldWorks Classic baharu}}"
 msgid "{num, plural, one {# new FieldWorks Lite commit} other {# new FieldWorks Lite commits}}"
 msgstr "{num, plural, other {# komit FieldWorks Lite baharu}}"
 
-#. Button revealing the rest of a truncated possible-duplicates list in the New Entry dialog; # is the number of hidden matches
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "{num, plural, one {Show # more...} other {Show # more...}}"
 msgstr ""
@@ -107,21 +118,19 @@ msgstr "**Lebih sedikit jenis morfem** (hanya *Akar*, *Akar Terikat*, *Batang*,
 msgid "**Simpler terminology** (e.g. *Word* instead of *Lexeme form*, *Meaning* instead of *Sense*)"
 msgstr "**Terminologi lebih mudah** (cth. *Perkataan* bukan *bentuk leksem*, *Makna* bukan *Sense*)"
 
+#: src/lib/entry-editor/comments/CommentThread.svelte
+msgid "1 reply"
+msgstr ""
+
 #. Update notification
 #: src/lib/notifications/NotificationOutlet.svelte
 msgid "A new version of FieldWorks Lite is available."
 msgstr "Versi baharu FieldWorks Lite tersedia."
 
-#. Relevant view: Classic
-#. Lite view equivalent: "A similar word already exists"
-#. Warning banner in the New Entry dialog when exactly one possible duplicate was found (none an exact headword match)
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "A similar entry already exists"
 msgstr ""
 
-#. Relevant view: Lite
-#. Classic view equivalent: "A similar entry already exists"
-#. Warning banner in the New Word dialog when exactly one possible duplicate was found (none spelled exactly the same)
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "A similar word already exists"
 msgstr ""
@@ -342,6 +351,10 @@ msgstr "Auto"
 msgid "Auto syncing"
 msgstr "Segerakkan automatik"
 
+#: src/lib/entry-editor/comments/CommentPanel.svelte
+msgid "Back"
+msgstr ""
+
 #. Section label in custom view form.
 #. Selects the base view preset (Classic or Lite) that the custom view inherits from.
 #: src/lib/views/custom/CustomViewForm.svelte
@@ -382,9 +395,11 @@ msgstr ""
 #: src/lib/components/SubmitOrCancel.svelte
 #: src/lib/components/audio/AudioDialog.svelte
 #: src/lib/components/field-editors/select.svelte
-#: src/lib/entry-editor/CommentDialog.svelte
 #: src/lib/entry-editor/EditEntryDialog.svelte
 #: src/lib/entry-editor/NewEntryDialog.svelte
+#: src/lib/entry-editor/comments/CommentItem.svelte
+#: src/lib/entry-editor/comments/CommentPanel.svelte
+#: src/lib/entry-editor/comments/CommentReplyInput.svelte
 #: src/lib/entry-editor/field-editors/EditPictureDialog.svelte
 #: src/lib/troubleshoot/TroubleshootDialog.svelte
 #: src/lib/troubleshoot/TroubleshootDialog.svelte
@@ -406,16 +421,10 @@ msgstr "Perubahan juga boleh menjadi hasil daripada medan yang ditambahkan ke ve
 msgid "Changing the same field twice, for example, can result in two commits but only one change that needs to be applied to FieldWorks Classic. Commits can also consist of multiple changes."
 msgstr "Mengubah medan yang sama dua kali, sebagai contoh, boleh menghasilkan dua komit tetapi hanya satu perubahan yang perlu digunakan pada FieldWorks Classic. Komit juga boleh terdiri daripada berbilang perubahan."
 
-#. Relevant view: Classic
-#. Lite view equivalent: "Checking for similar words…"
-#. Status line in the New Entry dialog while searching for possible duplicate entries
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "Checking for similar entries…"
 msgstr ""
 
-#. Relevant view: Lite
-#. Classic view equivalent: "Checking for similar entries…"
-#. Status line in the New Word dialog while searching for possible duplicate words
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "Checking for similar words…"
 msgstr ""
@@ -454,8 +463,7 @@ msgstr "padam"
 #: src/lib/about/AboutDialog.svelte
 #: src/lib/components/field-editors/multi-select.svelte
 #: src/lib/components/ui/button/x-button.svelte
-#: src/lib/entry-editor/CommentDialog.svelte
-#: src/lib/entry-editor/CommentDialog.svelte
+#: src/lib/entry-editor/comments/CommentDialog.svelte
 #: src/lib/entry-editor/duplicate-check/DuplicateSummaryPill.svelte
 #: src/project/tasks/SubjectPopup.svelte
 msgid "Close"
@@ -467,10 +475,6 @@ msgstr "Tutup"
 msgid "Close Dictionary"
 msgstr "Tutup Kamus"
 
-#: src/lib/entry-editor/CommentDialog.svelte
-msgid "Closed"
-msgstr ""
-
 #. Field label in the create-project dialog. The project's short machine-readable identifier (slug), e.g. "my-dictionary".
 #: src/home/CreateProjectDialog.svelte
 msgid "Code"
@@ -481,15 +485,24 @@ msgstr ""
 msgid "Color"
 msgstr "Warna"
 
-#: src/lib/entry-editor/CommentDialog.svelte
+#: src/lib/entry-editor/comments/CommentPanel.svelte
+msgid "Comment"
+msgstr ""
+
+#: src/lib/entry-editor/comments/CommentDialog.svelte
+#: src/lib/entry-editor/comments/CommentPanel.svelte
 #: src/project/browse/EntryView.svelte
 msgid "Comments"
 msgstr ""
 
-#: src/lib/entry-editor/CommentDialog.svelte
+#: src/lib/entry-editor/comments/CommentDialog.svelte
 msgid "Comments for {0}"
 msgstr ""
 
+#: src/project/browse/EntryView.svelte
+msgid "Comments, {0} unread"
+msgstr ""
+
 #. Field label
 #: src/lib/entry-editor/field-editors/ComplexFormComponents.svelte
 #: src/lib/entry-editor/field-editors/ComplexForms.svelte
@@ -542,6 +555,10 @@ msgstr "Komponen-komponen"
 msgid "Contains"
 msgstr "Mengandungi"
 
+#: src/lib/entry-editor/comments/CommentPanel.svelte
+msgid "Conversation"
+msgstr ""
+
 #. Success message after copying text
 #: src/lib/components/ui/button/copy-button.svelte
 msgid "Copied to clipboard"
@@ -552,16 +569,10 @@ msgstr "Disalin ke papan keratan"
 msgid "Copy version"
 msgstr "Salin versi"
 
-#. Relevant view: Classic
-#. Lite view equivalent: "Could not check for similar words"
-#. Status line in the New Entry dialog when the background duplicate search failed (e.g. connection lost); typing again retries
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "Could not check for similar entries"
 msgstr ""
 
-#. Relevant view: Lite
-#. Classic view equivalent: "Could not check for similar entries"
-#. Status line in the New Word dialog when the background duplicate search failed (e.g. connection lost); typing again retries
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "Could not check for similar words"
 msgstr ""
@@ -811,11 +822,11 @@ msgstr "Memuat turun..."
 msgid "e.g. th, sw"
 msgstr ""
 
-#: src/lib/entry-editor/CommentDialog.svelte
+#: src/lib/entry-editor/comments/CommentItem.svelte
 msgid "Edit"
 msgstr ""
 
-#: src/lib/entry-editor/CommentDialog.svelte
+#: src/lib/entry-editor/comments/CommentItem.svelte
 msgid "Edit comment"
 msgstr ""
 
@@ -834,7 +845,7 @@ msgstr ""
 msgid "Editor"
 msgstr "Editor"
 
-#: src/lib/entry-editor/CommentDialog.svelte
+#: src/lib/entry-editor/comments/CommentItem.svelte
 msgid "Empty comment"
 msgstr ""
 
@@ -1189,16 +1200,10 @@ msgstr "Glos"
 msgid "Go to {0}"
 msgstr "Pergi ke {0}"
 
-#. Relevant view: Classic
-#. Lite view equivalent: "Go to word"
-#. Tooltip on a possible-duplicate result in the New Entry dialog; clicking closes the dialog and opens that entry
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "Go to entry"
 msgstr ""
 
-#. Relevant view: Lite
-#. Classic view equivalent: "Go to entry"
-#. Tooltip on a possible-duplicate result in the New Word dialog; clicking closes the dialog and opens that word
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "Go to word"
 msgstr ""
@@ -1389,7 +1394,7 @@ msgstr ""
 msgid "Loading activity"
 msgstr ""
 
-#: src/lib/entry-editor/CommentDialog.svelte
+#: src/lib/entry-editor/comments/CommentPanel.svelte
 msgid "Loading comments..."
 msgstr ""
 
@@ -1643,10 +1648,6 @@ msgstr "Tiada audio"
 msgid "No authors"
 msgstr ""
 
-#: src/lib/entry-editor/CommentDialog.svelte
-msgid "No comment threads yet."
-msgstr ""
-
 #. Empty state message in the manage custom views dialog when none exist.
 #: src/lib/views/custom/ManageCustomViewsDialog.svelte
 msgid "No custom views yet."
@@ -1686,6 +1687,11 @@ msgstr ""
 msgid "No new data"
 msgstr "Tiada data baru"
 
+#: src/lib/entry-editor/comments/CommentPanel.svelte
+#: src/lib/entry-editor/comments/CommentPanel.svelte
+msgid "No open conversations"
+msgstr ""
+
 #. Empty state shown read-only in the Pictures field when a sense has no pictures
 #: src/lib/entry-editor/field-editors/PicturesEditor.svelte
 msgid "No pictures"
@@ -1701,16 +1707,10 @@ msgstr "Tiada pelayan"
 msgid "No server configured"
 msgstr "Tiada pelayan dikonfigurasikan"
 
-#. Relevant view: Classic
-#. Lite view equivalent: "No similar words found"
-#. Status line in the New Entry dialog: the duplicate check found no existing entries like the one being typed
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "No similar entries found"
 msgstr ""
 
-#. Relevant view: Lite
-#. Classic view equivalent: "No similar entries found"
-#. Status line in the New Word dialog: the duplicate check found no existing words like the one being typed
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "No similar words found"
 msgstr ""
@@ -1819,7 +1819,6 @@ msgstr "Satu komit FieldWorks Classic mungkin terdiri daripada perubahan pada be
 
 #. Button to open downloaded project
 #: src/home/Server.svelte
-#: src/lib/entry-editor/CommentDialog.svelte
 msgid "Open"
 msgstr "Buka"
 
@@ -2066,6 +2065,9 @@ msgstr "Buang audio"
 
 #. Button to reopen in FieldWorks
 #: src/lib/components/OpenInFieldWorksButton.svelte
+#: src/lib/entry-editor/comments/CommentPanel.svelte
+#: src/lib/entry-editor/comments/CommentThread.svelte
+#: src/lib/entry-editor/comments/CommentThread.svelte
 msgid "Reopen"
 msgstr "Buka semula"
 
@@ -2078,6 +2080,15 @@ msgstr "Ganti audio"
 msgid "Replace Picture"
 msgstr ""
 
+#: src/lib/entry-editor/comments/CommentReplyInput.svelte
+#: src/lib/entry-editor/comments/CommentReplyInput.svelte
+msgid "Reply"
+msgstr ""
+
+#: src/lib/entry-editor/comments/CommentReplyInput.svelte
+msgid "Reply…"
+msgstr ""
+
 #. Button text
 #: src/lib/about/FeedbackDialog.svelte
 msgid "Report a technical problem"
@@ -2087,6 +2098,12 @@ msgstr "Laporkan masalah teknikal"
 msgid "Reset"
 msgstr ""
 
+#: src/lib/entry-editor/comments/CommentPanel.svelte
+#: src/lib/entry-editor/comments/CommentThread.svelte
+#: src/lib/entry-editor/comments/CommentThread.svelte
+msgid "Resolve"
+msgstr ""
+
 #. Button label to restore a deleted Entry or Word inside EntryView
 #: src/project/browse/EntryView.svelte
 msgid "Restore"
@@ -2102,29 +2119,20 @@ msgstr "Semak"
 msgid "rose"
 msgstr "merah jambu"
 
-#. Relevant view: Classic
-#. Lite view equivalent: "Same word"
-#. Badge on a possible-duplicate result: its headword is identical to the one being typed in the New Entry dialog
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "Same headword"
 msgstr ""
 
-#. Relevant view: Classic
-#. Lite view equivalent: "Same word"
-#. Badge on a possible-duplicate result: only its lexeme form matches the typed text, while its citation form (shown as the headword) differs — deliberately NOT claiming "Same headword"
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "Same lexeme form"
 msgstr ""
 
-#. Relevant view: Lite
-#. Classic view equivalent: "Same headword"
-#. Badge on a possible-duplicate result: it is spelled exactly like the word being typed in the New Word dialog
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "Same word"
 msgstr ""
 
-#: src/lib/entry-editor/CommentDialog.svelte
+#: src/lib/entry-editor/comments/CommentItem.svelte
 msgid "Save"
 msgstr ""
 
@@ -2269,48 +2277,30 @@ msgstr "Tunjukkan"
 msgid "Show {0} more..."
 msgstr "Tunjukkan {0} lagi..."
 
-#: src/lib/entry-editor/CommentDialog.svelte
+#: src/lib/entry-editor/comments/CommentPanel.svelte
 msgid "Sign in to add comments."
 msgstr ""
 
-#. Relevant view: Classic
-#. Lite view equivalent: "Similar words already exist"
-#. Warning banner in the New Entry dialog; expands to a list of possible duplicate entries
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "Similar entries already exist"
 msgstr ""
 
-#. Relevant view: Classic
-#. Lite view equivalent: "Similar meaning"
-#. Badge on a possible-duplicate result: one of its glosses matches the gloss being typed in the New Entry dialog
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "Similar gloss"
 msgstr ""
 
-#. Relevant view: Classic
-#. Lite view equivalent: "Similar word"
-#. Badge on a possible-duplicate result: its headword partly matches the one being typed in the New Entry dialog
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "Similar headword"
 msgstr ""
 
-#. Relevant view: Lite
-#. Classic view equivalent: "Similar gloss"
-#. Badge on a possible-duplicate result: one of its meanings matches the meaning being typed in the New Word dialog
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "Similar meaning"
 msgstr ""
 
-#. Relevant view: Lite
-#. Classic view equivalent: "Similar headword"
-#. Badge on a possible-duplicate result: it is spelled almost like the word being typed in the New Word dialog
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "Similar word"
 msgstr ""
 
-#. Relevant view: Lite
-#. Classic view equivalent: "Similar entries already exist"
-#. Warning banner in the New Word dialog; expands to a list of possible duplicate words
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "Similar words already exist"
 msgstr ""
@@ -2343,8 +2333,12 @@ msgstr ""
 msgid "Specific field"
 msgstr "Medan tertentu"
 
-#: src/lib/entry-editor/CommentDialog.svelte
-msgid "Start a new thread"
+#: src/lib/entry-editor/comments/CommentPanel.svelte
+msgid "Start a conversation"
+msgstr ""
+
+#: src/lib/entry-editor/comments/CommentPanel.svelte
+msgid "Start a conversation…"
 msgstr ""
 
 #. Filter operator
@@ -2517,9 +2511,6 @@ msgstr "Item {0} telah dipadam"
 msgid "This date # and this emoji # are snippets"
 msgstr "Tarikh ini # dan emoji ini # adalah coretan"
 
-#. Relevant view: Classic
-#. Lite view equivalent: "This word may already exist"
-#. Warning banner in the New Entry dialog when an entry with the exact same headword exists; expands to a list of possible duplicates
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "This entry may already exist"
 msgstr ""
@@ -2561,17 +2552,10 @@ msgstr "Tugasan ini selesai"
 msgid "This will synchronize the FieldWorks Lite and FieldWorks Classic copies of your project in Lexbox."
 msgstr "Ini akan menyegerakkan salinan FieldWorks Lite dan FieldWorks Classic projek anda dalam Lexbox."
 
-#. Relevant view: Lite
-#. Classic view equivalent: "This entry may already exist"
-#. Warning banner in the New Word dialog when a word with the exact same spelling exists; expands to a list of possible duplicates
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "This word may already exist"
 msgstr ""
 
-#: src/lib/entry-editor/CommentDialog.svelte
-msgid "Thread"
-msgstr ""
-
 #. Button to show/hide filter panel
 #: src/project/browse/SearchFilter.svelte
 msgid "Toggle filters"
@@ -2706,6 +2690,15 @@ msgstr "Pelayan tidak diketahui"
 msgid "Unknown update result"
 msgstr "Hasil kemas kini tidak diketahui"
 
+#: src/lib/entry-editor/comments/CommentThread.svelte
+#: src/lib/entry-editor/comments/CommentThread.svelte
+msgid "Unread"
+msgstr ""
+
+#: src/lib/entry-editor/comments/CommentPanel.svelte
+msgid "Unread comments"
+msgstr ""
+
 #. Placeholder for missing value
 #. Displayed when a word/entry/field has no content yet
 #. Used in: entry list, activity changes, change preview, field labels
@@ -2868,14 +2861,6 @@ msgstr "Perkataan atau Papar Sebagai diperlukan"
 msgid "Word or meaning:"
 msgstr "Perkataan atau makna:"
 
-#: src/lib/entry-editor/CommentDialog.svelte
-msgid "Write a reply..."
-msgstr ""
-
-#: src/lib/entry-editor/CommentDialog.svelte
-msgid "Write the first comment..."
-msgstr ""
-
 #. Column header
 #: src/project/browse/filter/WsSelect.svelte
 msgid "Writing System"
diff --git a/frontend/viewer/src/locales/sw.po b/frontend/viewer/src/locales/sw.po
index 83aa36a14c..c0d0a06f1e 100644
--- a/frontend/viewer/src/locales/sw.po
+++ b/frontend/viewer/src/locales/sw.po
@@ -25,8 +25,12 @@ msgstr ""
 msgid "– ({0} changes)"
 msgstr "– ({0} mabadiliko)"
 
-#: src/lib/entry-editor/CommentDialog.svelte
-#: src/lib/entry-editor/CommentDialog.svelte
+#: src/lib/entry-editor/comments/CommentItem.svelte
+#: src/lib/entry-editor/comments/CommentItem.svelte
+msgid "(edited)"
+msgstr ""
+
+#: src/lib/entry-editor/comments/CommentItem.svelte
 msgid "(unknown)"
 msgstr ""
 
@@ -66,6 +70,14 @@ msgstr ""
 msgid "{0} MB"
 msgstr "{0} MB"
 
+#: src/lib/entry-editor/comments/CommentThread.svelte
+msgid "{0} replies"
+msgstr ""
+
+#: src/lib/entry-editor/comments/CommentPanel.svelte
+msgid "{0} resolved"
+msgstr ""
+
 #. Display name for server
 #: src/home/Server.svelte
 msgid "{0} Server"
@@ -87,7 +99,6 @@ msgstr "{num, plural, one {# kumbuka mpya ya FieldWorks Classic} other {# kumbuk
 msgid "{num, plural, one {# new FieldWorks Lite commit} other {# new FieldWorks Lite commits}}"
 msgstr "{num, plural, one {# kumbuka mpya ya FieldWorks Lite} other {# kumbukas mpya za FieldWorks Lite}}"
 
-#. Button revealing the rest of a truncated possible-duplicates list in the New Entry dialog; # is the number of hidden matches
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "{num, plural, one {Show # more...} other {Show # more...}}"
 msgstr ""
@@ -107,21 +118,19 @@ msgstr "**Aina chache za morifemi** (tu *Root*, *Bound Root*, *Stem*, *Bound Ste
 msgid "**Simpler terminology** (e.g. *Word* instead of *Lexeme form*, *Meaning* instead of *Sense*)"
 msgstr "**Istilahi rahisi** (kwa mfano *Neno* badala ya *Lexeme form*, *Maana* badala ya *Sense*)"
 
+#: src/lib/entry-editor/comments/CommentThread.svelte
+msgid "1 reply"
+msgstr ""
+
 #. Update notification
 #: src/lib/notifications/NotificationOutlet.svelte
 msgid "A new version of FieldWorks Lite is available."
 msgstr "Toleo jipya la FieldWorks Lite linapatikana."
 
-#. Relevant view: Classic
-#. Lite view equivalent: "A similar word already exists"
-#. Warning banner in the New Entry dialog when exactly one possible duplicate was found (none an exact headword match)
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "A similar entry already exists"
 msgstr ""
 
-#. Relevant view: Lite
-#. Classic view equivalent: "A similar entry already exists"
-#. Warning banner in the New Word dialog when exactly one possible duplicate was found (none spelled exactly the same)
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "A similar word already exists"
 msgstr ""
@@ -342,6 +351,10 @@ msgstr "Otomatiki"
 msgid "Auto syncing"
 msgstr "Kuoanisha otomatiki"
 
+#: src/lib/entry-editor/comments/CommentPanel.svelte
+msgid "Back"
+msgstr ""
+
 #. Section label in custom view form.
 #. Selects the base view preset (Classic or Lite) that the custom view inherits from.
 #: src/lib/views/custom/CustomViewForm.svelte
@@ -382,9 +395,11 @@ msgstr ""
 #: src/lib/components/SubmitOrCancel.svelte
 #: src/lib/components/audio/AudioDialog.svelte
 #: src/lib/components/field-editors/select.svelte
-#: src/lib/entry-editor/CommentDialog.svelte
 #: src/lib/entry-editor/EditEntryDialog.svelte
 #: src/lib/entry-editor/NewEntryDialog.svelte
+#: src/lib/entry-editor/comments/CommentItem.svelte
+#: src/lib/entry-editor/comments/CommentPanel.svelte
+#: src/lib/entry-editor/comments/CommentReplyInput.svelte
 #: src/lib/entry-editor/field-editors/EditPictureDialog.svelte
 #: src/lib/troubleshoot/TroubleshootDialog.svelte
 #: src/lib/troubleshoot/TroubleshootDialog.svelte
@@ -406,16 +421,10 @@ msgstr "Mabadiliko yanaweza pia kuwa matokeo ya sehemu kuongezwa kwa matoleo map
 msgid "Changing the same field twice, for example, can result in two commits but only one change that needs to be applied to FieldWorks Classic. Commits can also consist of multiple changes."
 msgstr "Kubadilisha sehemu sawa mara mbili, kwa mfano, kunaweza kusababisha kumbukas mbili lakini badiliko moja tu linayohitaji kutumwa kwa FieldWorks Classic. Kumbukas kunaweza pia kuwa na mabadiliko mengi."
 
-#. Relevant view: Classic
-#. Lite view equivalent: "Checking for similar words…"
-#. Status line in the New Entry dialog while searching for possible duplicate entries
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "Checking for similar entries…"
 msgstr ""
 
-#. Relevant view: Lite
-#. Classic view equivalent: "Checking for similar entries…"
-#. Status line in the New Word dialog while searching for possible duplicate words
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "Checking for similar words…"
 msgstr ""
@@ -454,8 +463,7 @@ msgstr "futa"
 #: src/lib/about/AboutDialog.svelte
 #: src/lib/components/field-editors/multi-select.svelte
 #: src/lib/components/ui/button/x-button.svelte
-#: src/lib/entry-editor/CommentDialog.svelte
-#: src/lib/entry-editor/CommentDialog.svelte
+#: src/lib/entry-editor/comments/CommentDialog.svelte
 #: src/lib/entry-editor/duplicate-check/DuplicateSummaryPill.svelte
 #: src/project/tasks/SubjectPopup.svelte
 msgid "Close"
@@ -467,10 +475,6 @@ msgstr "Funga"
 msgid "Close Dictionary"
 msgstr "Funga Kamusi"
 
-#: src/lib/entry-editor/CommentDialog.svelte
-msgid "Closed"
-msgstr ""
-
 #. Field label in the create-project dialog. The project's short machine-readable identifier (slug), e.g. "my-dictionary".
 #: src/home/CreateProjectDialog.svelte
 msgid "Code"
@@ -481,15 +485,24 @@ msgstr ""
 msgid "Color"
 msgstr "Rangi"
 
-#: src/lib/entry-editor/CommentDialog.svelte
+#: src/lib/entry-editor/comments/CommentPanel.svelte
+msgid "Comment"
+msgstr ""
+
+#: src/lib/entry-editor/comments/CommentDialog.svelte
+#: src/lib/entry-editor/comments/CommentPanel.svelte
 #: src/project/browse/EntryView.svelte
 msgid "Comments"
 msgstr ""
 
-#: src/lib/entry-editor/CommentDialog.svelte
+#: src/lib/entry-editor/comments/CommentDialog.svelte
 msgid "Comments for {0}"
 msgstr ""
 
+#: src/project/browse/EntryView.svelte
+msgid "Comments, {0} unread"
+msgstr ""
+
 #. Field label
 #: src/lib/entry-editor/field-editors/ComplexFormComponents.svelte
 #: src/lib/entry-editor/field-editors/ComplexForms.svelte
@@ -542,6 +555,10 @@ msgstr "Sehemu"
 msgid "Contains"
 msgstr "Ina"
 
+#: src/lib/entry-editor/comments/CommentPanel.svelte
+msgid "Conversation"
+msgstr ""
+
 #. Success message after copying text
 #: src/lib/components/ui/button/copy-button.svelte
 msgid "Copied to clipboard"
@@ -552,16 +569,10 @@ msgstr "Imenakiliwa kwenye ubao wa kunakili"
 msgid "Copy version"
 msgstr "Nakili toleo"
 
-#. Relevant view: Classic
-#. Lite view equivalent: "Could not check for similar words"
-#. Status line in the New Entry dialog when the background duplicate search failed (e.g. connection lost); typing again retries
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "Could not check for similar entries"
 msgstr ""
 
-#. Relevant view: Lite
-#. Classic view equivalent: "Could not check for similar entries"
-#. Status line in the New Word dialog when the background duplicate search failed (e.g. connection lost); typing again retries
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "Could not check for similar words"
 msgstr ""
@@ -811,11 +822,11 @@ msgstr "Inapakua..."
 msgid "e.g. th, sw"
 msgstr ""
 
-#: src/lib/entry-editor/CommentDialog.svelte
+#: src/lib/entry-editor/comments/CommentItem.svelte
 msgid "Edit"
 msgstr ""
 
-#: src/lib/entry-editor/CommentDialog.svelte
+#: src/lib/entry-editor/comments/CommentItem.svelte
 msgid "Edit comment"
 msgstr ""
 
@@ -834,7 +845,7 @@ msgstr ""
 msgid "Editor"
 msgstr "Mhariri"
 
-#: src/lib/entry-editor/CommentDialog.svelte
+#: src/lib/entry-editor/comments/CommentItem.svelte
 msgid "Empty comment"
 msgstr ""
 
@@ -1189,16 +1200,10 @@ msgstr "Glosi"
 msgid "Go to {0}"
 msgstr "Nenda kwa {0}"
 
-#. Relevant view: Classic
-#. Lite view equivalent: "Go to word"
-#. Tooltip on a possible-duplicate result in the New Entry dialog; clicking closes the dialog and opens that entry
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "Go to entry"
 msgstr ""
 
-#. Relevant view: Lite
-#. Classic view equivalent: "Go to entry"
-#. Tooltip on a possible-duplicate result in the New Word dialog; clicking closes the dialog and opens that word
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "Go to word"
 msgstr ""
@@ -1389,7 +1394,7 @@ msgstr ""
 msgid "Loading activity"
 msgstr ""
 
-#: src/lib/entry-editor/CommentDialog.svelte
+#: src/lib/entry-editor/comments/CommentPanel.svelte
 msgid "Loading comments..."
 msgstr ""
 
@@ -1643,10 +1648,6 @@ msgstr "Hakuna sauti"
 msgid "No authors"
 msgstr ""
 
-#: src/lib/entry-editor/CommentDialog.svelte
-msgid "No comment threads yet."
-msgstr ""
-
 #. Empty state message in the manage custom views dialog when none exist.
 #: src/lib/views/custom/ManageCustomViewsDialog.svelte
 msgid "No custom views yet."
@@ -1686,6 +1687,11 @@ msgstr ""
 msgid "No new data"
 msgstr "Hakuna data mpya"
 
+#: src/lib/entry-editor/comments/CommentPanel.svelte
+#: src/lib/entry-editor/comments/CommentPanel.svelte
+msgid "No open conversations"
+msgstr ""
+
 #. Empty state shown read-only in the Pictures field when a sense has no pictures
 #: src/lib/entry-editor/field-editors/PicturesEditor.svelte
 msgid "No pictures"
@@ -1701,16 +1707,10 @@ msgstr "Hakuna seva"
 msgid "No server configured"
 msgstr "Hakuna seva iliyotengwa"
 
-#. Relevant view: Classic
-#. Lite view equivalent: "No similar words found"
-#. Status line in the New Entry dialog: the duplicate check found no existing entries like the one being typed
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "No similar entries found"
 msgstr ""
 
-#. Relevant view: Lite
-#. Classic view equivalent: "No similar entries found"
-#. Status line in the New Word dialog: the duplicate check found no existing words like the one being typed
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "No similar words found"
 msgstr ""
@@ -1819,7 +1819,6 @@ msgstr "Kumbuka moja ya FieldWorks Classic inaweza kuwa na mabadiliko kwa ingizo
 
 #. Button to open downloaded project
 #: src/home/Server.svelte
-#: src/lib/entry-editor/CommentDialog.svelte
 msgid "Open"
 msgstr "Fungua"
 
@@ -2066,6 +2065,9 @@ msgstr "Ondoa sauti"
 
 #. Button to reopen in FieldWorks
 #: src/lib/components/OpenInFieldWorksButton.svelte
+#: src/lib/entry-editor/comments/CommentPanel.svelte
+#: src/lib/entry-editor/comments/CommentThread.svelte
+#: src/lib/entry-editor/comments/CommentThread.svelte
 msgid "Reopen"
 msgstr "Fungua Upya"
 
@@ -2078,6 +2080,15 @@ msgstr "Badili sauti"
 msgid "Replace Picture"
 msgstr ""
 
+#: src/lib/entry-editor/comments/CommentReplyInput.svelte
+#: src/lib/entry-editor/comments/CommentReplyInput.svelte
+msgid "Reply"
+msgstr ""
+
+#: src/lib/entry-editor/comments/CommentReplyInput.svelte
+msgid "Reply…"
+msgstr ""
+
 #. Button text
 #: src/lib/about/FeedbackDialog.svelte
 msgid "Report a technical problem"
@@ -2087,6 +2098,12 @@ msgstr "Ripoti tatizo la kiufundi"
 msgid "Reset"
 msgstr ""
 
+#: src/lib/entry-editor/comments/CommentPanel.svelte
+#: src/lib/entry-editor/comments/CommentThread.svelte
+#: src/lib/entry-editor/comments/CommentThread.svelte
+msgid "Resolve"
+msgstr ""
+
 #. Button label to restore a deleted Entry or Word inside EntryView
 #: src/project/browse/EntryView.svelte
 msgid "Restore"
@@ -2102,29 +2119,20 @@ msgstr "Tathmini"
 msgid "rose"
 msgstr "waridi"
 
-#. Relevant view: Classic
-#. Lite view equivalent: "Same word"
-#. Badge on a possible-duplicate result: its headword is identical to the one being typed in the New Entry dialog
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "Same headword"
 msgstr ""
 
-#. Relevant view: Classic
-#. Lite view equivalent: "Same word"
-#. Badge on a possible-duplicate result: only its lexeme form matches the typed text, while its citation form (shown as the headword) differs — deliberately NOT claiming "Same headword"
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "Same lexeme form"
 msgstr ""
 
-#. Relevant view: Lite
-#. Classic view equivalent: "Same headword"
-#. Badge on a possible-duplicate result: it is spelled exactly like the word being typed in the New Word dialog
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "Same word"
 msgstr ""
 
-#: src/lib/entry-editor/CommentDialog.svelte
+#: src/lib/entry-editor/comments/CommentItem.svelte
 msgid "Save"
 msgstr ""
 
@@ -2269,48 +2277,30 @@ msgstr "Onyesha"
 msgid "Show {0} more..."
 msgstr "Onyesha {0} zaidi..."
 
-#: src/lib/entry-editor/CommentDialog.svelte
+#: src/lib/entry-editor/comments/CommentPanel.svelte
 msgid "Sign in to add comments."
 msgstr ""
 
-#. Relevant view: Classic
-#. Lite view equivalent: "Similar words already exist"
-#. Warning banner in the New Entry dialog; expands to a list of possible duplicate entries
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "Similar entries already exist"
 msgstr ""
 
-#. Relevant view: Classic
-#. Lite view equivalent: "Similar meaning"
-#. Badge on a possible-duplicate result: one of its glosses matches the gloss being typed in the New Entry dialog
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "Similar gloss"
 msgstr ""
 
-#. Relevant view: Classic
-#. Lite view equivalent: "Similar word"
-#. Badge on a possible-duplicate result: its headword partly matches the one being typed in the New Entry dialog
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "Similar headword"
 msgstr ""
 
-#. Relevant view: Lite
-#. Classic view equivalent: "Similar gloss"
-#. Badge on a possible-duplicate result: one of its meanings matches the meaning being typed in the New Word dialog
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "Similar meaning"
 msgstr ""
 
-#. Relevant view: Lite
-#. Classic view equivalent: "Similar headword"
-#. Badge on a possible-duplicate result: it is spelled almost like the word being typed in the New Word dialog
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "Similar word"
 msgstr ""
 
-#. Relevant view: Lite
-#. Classic view equivalent: "Similar entries already exist"
-#. Warning banner in the New Word dialog; expands to a list of possible duplicate words
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "Similar words already exist"
 msgstr ""
@@ -2343,8 +2333,12 @@ msgstr ""
 msgid "Specific field"
 msgstr "Sehemu mahsusi"
 
-#: src/lib/entry-editor/CommentDialog.svelte
-msgid "Start a new thread"
+#: src/lib/entry-editor/comments/CommentPanel.svelte
+msgid "Start a conversation"
+msgstr ""
+
+#: src/lib/entry-editor/comments/CommentPanel.svelte
+msgid "Start a conversation…"
 msgstr ""
 
 #. Filter operator
@@ -2517,9 +2511,6 @@ msgstr "Hili {0} limefutwa"
 msgid "This date # and this emoji # are snippets"
 msgstr "Tarehe hii # na emoji hii # ni vigezo"
 
-#. Relevant view: Classic
-#. Lite view equivalent: "This word may already exist"
-#. Warning banner in the New Entry dialog when an entry with the exact same headword exists; expands to a list of possible duplicates
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "This entry may already exist"
 msgstr ""
@@ -2561,17 +2552,10 @@ msgstr "Jukumu hili limekamilika"
 msgid "This will synchronize the FieldWorks Lite and FieldWorks Classic copies of your project in Lexbox."
 msgstr "Hii itaoanisha kopia za FieldWorks Lite na FieldWorks Classic za mradi wako kwenye Lexbox."
 
-#. Relevant view: Lite
-#. Classic view equivalent: "This entry may already exist"
-#. Warning banner in the New Word dialog when a word with the exact same spelling exists; expands to a list of possible duplicates
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "This word may already exist"
 msgstr ""
 
-#: src/lib/entry-editor/CommentDialog.svelte
-msgid "Thread"
-msgstr ""
-
 #. Button to show/hide filter panel
 #: src/project/browse/SearchFilter.svelte
 msgid "Toggle filters"
@@ -2706,6 +2690,15 @@ msgstr "Seva isiyojulikana"
 msgid "Unknown update result"
 msgstr "Matokeo ya sasisho yasiyojulikana"
 
+#: src/lib/entry-editor/comments/CommentThread.svelte
+#: src/lib/entry-editor/comments/CommentThread.svelte
+msgid "Unread"
+msgstr ""
+
+#: src/lib/entry-editor/comments/CommentPanel.svelte
+msgid "Unread comments"
+msgstr ""
+
 #. Placeholder for missing value
 #. Displayed when a word/entry/field has no content yet
 #. Used in: entry list, activity changes, change preview, field labels
@@ -2868,14 +2861,6 @@ msgstr "Neno au Onyesha kulingana na inavyohitajika"
 msgid "Word or meaning:"
 msgstr "Neno au maana:"
 
-#: src/lib/entry-editor/CommentDialog.svelte
-msgid "Write a reply..."
-msgstr ""
-
-#: src/lib/entry-editor/CommentDialog.svelte
-msgid "Write the first comment..."
-msgstr ""
-
 #. Column header
 #: src/project/browse/filter/WsSelect.svelte
 msgid "Writing System"
diff --git a/frontend/viewer/src/locales/vi.po b/frontend/viewer/src/locales/vi.po
index d41873c55d..8d59b17b73 100644
--- a/frontend/viewer/src/locales/vi.po
+++ b/frontend/viewer/src/locales/vi.po
@@ -25,8 +25,12 @@ msgstr ""
 msgid "– ({0} changes)"
 msgstr "– ({0} thay đổi)"
 
-#: src/lib/entry-editor/CommentDialog.svelte
-#: src/lib/entry-editor/CommentDialog.svelte
+#: src/lib/entry-editor/comments/CommentItem.svelte
+#: src/lib/entry-editor/comments/CommentItem.svelte
+msgid "(edited)"
+msgstr ""
+
+#: src/lib/entry-editor/comments/CommentItem.svelte
 msgid "(unknown)"
 msgstr ""
 
@@ -66,6 +70,14 @@ msgstr ""
 msgid "{0} MB"
 msgstr "{0} MB"
 
+#: src/lib/entry-editor/comments/CommentThread.svelte
+msgid "{0} replies"
+msgstr ""
+
+#: src/lib/entry-editor/comments/CommentPanel.svelte
+msgid "{0} resolved"
+msgstr ""
+
 #. Display name for server
 #: src/home/Server.svelte
 msgid "{0} Server"
@@ -87,7 +99,6 @@ msgstr "{num, plural, other {# commit FieldWorks Classic mới}}"
 msgid "{num, plural, one {# new FieldWorks Lite commit} other {# new FieldWorks Lite commits}}"
 msgstr "{num, plural, other {# commit FieldWorks Lite mới}}"
 
-#. Button revealing the rest of a truncated possible-duplicates list in the New Entry dialog; # is the number of hidden matches
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "{num, plural, one {Show # more...} other {Show # more...}}"
 msgstr ""
@@ -107,21 +118,19 @@ msgstr "**Ít loại môrphêm hơn** (chỉ *Gốc*, *Gốc liên kết*, *Thâ
 msgid "**Simpler terminology** (e.g. *Word* instead of *Lexeme form*, *Meaning* instead of *Sense*)"
 msgstr "**Thuật ngữ đơn giản hơn** (ví dụ *Từ* thay vì *Hình thức lexeme*, *Ý nghĩa* thay vì *Sense*)"
 
+#: src/lib/entry-editor/comments/CommentThread.svelte
+msgid "1 reply"
+msgstr ""
+
 #. Update notification
 #: src/lib/notifications/NotificationOutlet.svelte
 msgid "A new version of FieldWorks Lite is available."
 msgstr "Đã có phiên bản mới của FieldWorks Lite."
 
-#. Relevant view: Classic
-#. Lite view equivalent: "A similar word already exists"
-#. Warning banner in the New Entry dialog when exactly one possible duplicate was found (none an exact headword match)
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "A similar entry already exists"
 msgstr ""
 
-#. Relevant view: Lite
-#. Classic view equivalent: "A similar entry already exists"
-#. Warning banner in the New Word dialog when exactly one possible duplicate was found (none spelled exactly the same)
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "A similar word already exists"
 msgstr ""
@@ -342,6 +351,10 @@ msgstr "Tự động"
 msgid "Auto syncing"
 msgstr "Đang đồng bộ tự động"
 
+#: src/lib/entry-editor/comments/CommentPanel.svelte
+msgid "Back"
+msgstr ""
+
 #. Section label in custom view form.
 #. Selects the base view preset (Classic or Lite) that the custom view inherits from.
 #: src/lib/views/custom/CustomViewForm.svelte
@@ -382,9 +395,11 @@ msgstr ""
 #: src/lib/components/SubmitOrCancel.svelte
 #: src/lib/components/audio/AudioDialog.svelte
 #: src/lib/components/field-editors/select.svelte
-#: src/lib/entry-editor/CommentDialog.svelte
 #: src/lib/entry-editor/EditEntryDialog.svelte
 #: src/lib/entry-editor/NewEntryDialog.svelte
+#: src/lib/entry-editor/comments/CommentItem.svelte
+#: src/lib/entry-editor/comments/CommentPanel.svelte
+#: src/lib/entry-editor/comments/CommentReplyInput.svelte
 #: src/lib/entry-editor/field-editors/EditPictureDialog.svelte
 #: src/lib/troubleshoot/TroubleshootDialog.svelte
 #: src/lib/troubleshoot/TroubleshootDialog.svelte
@@ -406,16 +421,10 @@ msgstr "Các thay đổi cũng có thể do các trường mới được thêm
 msgid "Changing the same field twice, for example, can result in two commits but only one change that needs to be applied to FieldWorks Classic. Commits can also consist of multiple changes."
 msgstr "Thay đổi cùng một trường hai lần, ví dụ, có thể dẫn đến hai commit nhưng chỉ một thay đổi cần được áp dụng cho FieldWorks Classic. Commit cũng có thể gồm nhiều thay đổi."
 
-#. Relevant view: Classic
-#. Lite view equivalent: "Checking for similar words…"
-#. Status line in the New Entry dialog while searching for possible duplicate entries
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "Checking for similar entries…"
 msgstr ""
 
-#. Relevant view: Lite
-#. Classic view equivalent: "Checking for similar entries…"
-#. Status line in the New Word dialog while searching for possible duplicate words
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "Checking for similar words…"
 msgstr ""
@@ -454,8 +463,7 @@ msgstr "xóa"
 #: src/lib/about/AboutDialog.svelte
 #: src/lib/components/field-editors/multi-select.svelte
 #: src/lib/components/ui/button/x-button.svelte
-#: src/lib/entry-editor/CommentDialog.svelte
-#: src/lib/entry-editor/CommentDialog.svelte
+#: src/lib/entry-editor/comments/CommentDialog.svelte
 #: src/lib/entry-editor/duplicate-check/DuplicateSummaryPill.svelte
 #: src/project/tasks/SubjectPopup.svelte
 msgid "Close"
@@ -467,10 +475,6 @@ msgstr "Đóng"
 msgid "Close Dictionary"
 msgstr "Đóng Từ điển"
 
-#: src/lib/entry-editor/CommentDialog.svelte
-msgid "Closed"
-msgstr ""
-
 #. Field label in the create-project dialog. The project's short machine-readable identifier (slug), e.g. "my-dictionary".
 #: src/home/CreateProjectDialog.svelte
 msgid "Code"
@@ -481,15 +485,24 @@ msgstr ""
 msgid "Color"
 msgstr "Màu sắc"
 
-#: src/lib/entry-editor/CommentDialog.svelte
+#: src/lib/entry-editor/comments/CommentPanel.svelte
+msgid "Comment"
+msgstr ""
+
+#: src/lib/entry-editor/comments/CommentDialog.svelte
+#: src/lib/entry-editor/comments/CommentPanel.svelte
 #: src/project/browse/EntryView.svelte
 msgid "Comments"
 msgstr ""
 
-#: src/lib/entry-editor/CommentDialog.svelte
+#: src/lib/entry-editor/comments/CommentDialog.svelte
 msgid "Comments for {0}"
 msgstr ""
 
+#: src/project/browse/EntryView.svelte
+msgid "Comments, {0} unread"
+msgstr ""
+
 #. Field label
 #: src/lib/entry-editor/field-editors/ComplexFormComponents.svelte
 #: src/lib/entry-editor/field-editors/ComplexForms.svelte
@@ -542,6 +555,10 @@ msgstr "Các thành phần"
 msgid "Contains"
 msgstr "Chứa"
 
+#: src/lib/entry-editor/comments/CommentPanel.svelte
+msgid "Conversation"
+msgstr ""
+
 #. Success message after copying text
 #: src/lib/components/ui/button/copy-button.svelte
 msgid "Copied to clipboard"
@@ -552,16 +569,10 @@ msgstr "Đã sao chép vào khay nhớ tạm"
 msgid "Copy version"
 msgstr "Sao chép phiên bản"
 
-#. Relevant view: Classic
-#. Lite view equivalent: "Could not check for similar words"
-#. Status line in the New Entry dialog when the background duplicate search failed (e.g. connection lost); typing again retries
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "Could not check for similar entries"
 msgstr ""
 
-#. Relevant view: Lite
-#. Classic view equivalent: "Could not check for similar entries"
-#. Status line in the New Word dialog when the background duplicate search failed (e.g. connection lost); typing again retries
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "Could not check for similar words"
 msgstr ""
@@ -811,11 +822,11 @@ msgstr "Đang tải xuống..."
 msgid "e.g. th, sw"
 msgstr ""
 
-#: src/lib/entry-editor/CommentDialog.svelte
+#: src/lib/entry-editor/comments/CommentItem.svelte
 msgid "Edit"
 msgstr ""
 
-#: src/lib/entry-editor/CommentDialog.svelte
+#: src/lib/entry-editor/comments/CommentItem.svelte
 msgid "Edit comment"
 msgstr ""
 
@@ -834,7 +845,7 @@ msgstr ""
 msgid "Editor"
 msgstr "Biên tập viên"
 
-#: src/lib/entry-editor/CommentDialog.svelte
+#: src/lib/entry-editor/comments/CommentItem.svelte
 msgid "Empty comment"
 msgstr ""
 
@@ -1189,16 +1200,10 @@ msgstr "Ghi chú"
 msgid "Go to {0}"
 msgstr "Đi tới {0}"
 
-#. Relevant view: Classic
-#. Lite view equivalent: "Go to word"
-#. Tooltip on a possible-duplicate result in the New Entry dialog; clicking closes the dialog and opens that entry
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "Go to entry"
 msgstr ""
 
-#. Relevant view: Lite
-#. Classic view equivalent: "Go to entry"
-#. Tooltip on a possible-duplicate result in the New Word dialog; clicking closes the dialog and opens that word
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "Go to word"
 msgstr ""
@@ -1389,7 +1394,7 @@ msgstr ""
 msgid "Loading activity"
 msgstr ""
 
-#: src/lib/entry-editor/CommentDialog.svelte
+#: src/lib/entry-editor/comments/CommentPanel.svelte
 msgid "Loading comments..."
 msgstr ""
 
@@ -1643,10 +1648,6 @@ msgstr "Không có âm thanh"
 msgid "No authors"
 msgstr ""
 
-#: src/lib/entry-editor/CommentDialog.svelte
-msgid "No comment threads yet."
-msgstr ""
-
 #. Empty state message in the manage custom views dialog when none exist.
 #: src/lib/views/custom/ManageCustomViewsDialog.svelte
 msgid "No custom views yet."
@@ -1686,6 +1687,11 @@ msgstr ""
 msgid "No new data"
 msgstr "Không có dữ liệu mới"
 
+#: src/lib/entry-editor/comments/CommentPanel.svelte
+#: src/lib/entry-editor/comments/CommentPanel.svelte
+msgid "No open conversations"
+msgstr ""
+
 #. Empty state shown read-only in the Pictures field when a sense has no pictures
 #: src/lib/entry-editor/field-editors/PicturesEditor.svelte
 msgid "No pictures"
@@ -1701,16 +1707,10 @@ msgstr "Không có máy chủ"
 msgid "No server configured"
 msgstr "Chưa cấu hình máy chủ"
 
-#. Relevant view: Classic
-#. Lite view equivalent: "No similar words found"
-#. Status line in the New Entry dialog: the duplicate check found no existing entries like the one being typed
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "No similar entries found"
 msgstr ""
 
-#. Relevant view: Lite
-#. Classic view equivalent: "No similar entries found"
-#. Status line in the New Word dialog: the duplicate check found no existing words like the one being typed
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "No similar words found"
 msgstr ""
@@ -1819,7 +1819,6 @@ msgstr "Một commit của FieldWorks Classic có thể gồm các thay đổi t
 
 #. Button to open downloaded project
 #: src/home/Server.svelte
-#: src/lib/entry-editor/CommentDialog.svelte
 msgid "Open"
 msgstr "Mở"
 
@@ -2066,6 +2065,9 @@ msgstr "Xóa âm thanh"
 
 #. Button to reopen in FieldWorks
 #: src/lib/components/OpenInFieldWorksButton.svelte
+#: src/lib/entry-editor/comments/CommentPanel.svelte
+#: src/lib/entry-editor/comments/CommentThread.svelte
+#: src/lib/entry-editor/comments/CommentThread.svelte
 msgid "Reopen"
 msgstr "Mở lại"
 
@@ -2078,6 +2080,15 @@ msgstr "Thay thế âm thanh"
 msgid "Replace Picture"
 msgstr ""
 
+#: src/lib/entry-editor/comments/CommentReplyInput.svelte
+#: src/lib/entry-editor/comments/CommentReplyInput.svelte
+msgid "Reply"
+msgstr ""
+
+#: src/lib/entry-editor/comments/CommentReplyInput.svelte
+msgid "Reply…"
+msgstr ""
+
 #. Button text
 #: src/lib/about/FeedbackDialog.svelte
 msgid "Report a technical problem"
@@ -2087,6 +2098,12 @@ msgstr "Báo lỗi kỹ thuật"
 msgid "Reset"
 msgstr ""
 
+#: src/lib/entry-editor/comments/CommentPanel.svelte
+#: src/lib/entry-editor/comments/CommentThread.svelte
+#: src/lib/entry-editor/comments/CommentThread.svelte
+msgid "Resolve"
+msgstr ""
+
 #. Button label to restore a deleted Entry or Word inside EntryView
 #: src/project/browse/EntryView.svelte
 msgid "Restore"
@@ -2102,29 +2119,20 @@ msgstr "Xem lại"
 msgid "rose"
 msgstr "hoa hồng"
 
-#. Relevant view: Classic
-#. Lite view equivalent: "Same word"
-#. Badge on a possible-duplicate result: its headword is identical to the one being typed in the New Entry dialog
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "Same headword"
 msgstr ""
 
-#. Relevant view: Classic
-#. Lite view equivalent: "Same word"
-#. Badge on a possible-duplicate result: only its lexeme form matches the typed text, while its citation form (shown as the headword) differs — deliberately NOT claiming "Same headword"
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "Same lexeme form"
 msgstr ""
 
-#. Relevant view: Lite
-#. Classic view equivalent: "Same headword"
-#. Badge on a possible-duplicate result: it is spelled exactly like the word being typed in the New Word dialog
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "Same word"
 msgstr ""
 
-#: src/lib/entry-editor/CommentDialog.svelte
+#: src/lib/entry-editor/comments/CommentItem.svelte
 msgid "Save"
 msgstr ""
 
@@ -2269,48 +2277,30 @@ msgstr "Hiển thị"
 msgid "Show {0} more..."
 msgstr "Hiển thị thêm {0}..."
 
-#: src/lib/entry-editor/CommentDialog.svelte
+#: src/lib/entry-editor/comments/CommentPanel.svelte
 msgid "Sign in to add comments."
 msgstr ""
 
-#. Relevant view: Classic
-#. Lite view equivalent: "Similar words already exist"
-#. Warning banner in the New Entry dialog; expands to a list of possible duplicate entries
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "Similar entries already exist"
 msgstr ""
 
-#. Relevant view: Classic
-#. Lite view equivalent: "Similar meaning"
-#. Badge on a possible-duplicate result: one of its glosses matches the gloss being typed in the New Entry dialog
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "Similar gloss"
 msgstr ""
 
-#. Relevant view: Classic
-#. Lite view equivalent: "Similar word"
-#. Badge on a possible-duplicate result: its headword partly matches the one being typed in the New Entry dialog
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "Similar headword"
 msgstr ""
 
-#. Relevant view: Lite
-#. Classic view equivalent: "Similar gloss"
-#. Badge on a possible-duplicate result: one of its meanings matches the meaning being typed in the New Word dialog
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "Similar meaning"
 msgstr ""
 
-#. Relevant view: Lite
-#. Classic view equivalent: "Similar headword"
-#. Badge on a possible-duplicate result: it is spelled almost like the word being typed in the New Word dialog
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "Similar word"
 msgstr ""
 
-#. Relevant view: Lite
-#. Classic view equivalent: "Similar entries already exist"
-#. Warning banner in the New Word dialog; expands to a list of possible duplicate words
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "Similar words already exist"
 msgstr ""
@@ -2343,8 +2333,12 @@ msgstr ""
 msgid "Specific field"
 msgstr "Trường cụ thể"
 
-#: src/lib/entry-editor/CommentDialog.svelte
-msgid "Start a new thread"
+#: src/lib/entry-editor/comments/CommentPanel.svelte
+msgid "Start a conversation"
+msgstr ""
+
+#: src/lib/entry-editor/comments/CommentPanel.svelte
+msgid "Start a conversation…"
 msgstr ""
 
 #. Filter operator
@@ -2517,9 +2511,6 @@ msgstr "Đường dẫn này {0} đã bị xóa."
 msgid "This date # and this emoji # are snippets"
 msgstr "Ngày này # và biểu tượng cảm xúc này # là đoạn trích"
 
-#. Relevant view: Classic
-#. Lite view equivalent: "This word may already exist"
-#. Warning banner in the New Entry dialog when an entry with the exact same headword exists; expands to a list of possible duplicates
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "This entry may already exist"
 msgstr ""
@@ -2561,17 +2552,10 @@ msgstr "Nhiệm vụ này đã hoàn thành"
 msgid "This will synchronize the FieldWorks Lite and FieldWorks Classic copies of your project in Lexbox."
 msgstr "Điều này sẽ đồng bộ các bản sao FieldWorks Lite và FieldWorks Classic của dự án của bạn trong Lexbox."
 
-#. Relevant view: Lite
-#. Classic view equivalent: "This entry may already exist"
-#. Warning banner in the New Word dialog when a word with the exact same spelling exists; expands to a list of possible duplicates
 #: src/lib/entry-editor/duplicate-check/DuplicateCheck.svelte
 msgid "This word may already exist"
 msgstr ""
 
-#: src/lib/entry-editor/CommentDialog.svelte
-msgid "Thread"
-msgstr ""
-
 #. Button to show/hide filter panel
 #: src/project/browse/SearchFilter.svelte
 msgid "Toggle filters"
@@ -2706,6 +2690,15 @@ msgstr "Máy chủ không xác định"
 msgid "Unknown update result"
 msgstr "Kết quả cập nhật không xác định"
 
+#: src/lib/entry-editor/comments/CommentThread.svelte
+#: src/lib/entry-editor/comments/CommentThread.svelte
+msgid "Unread"
+msgstr ""
+
+#: src/lib/entry-editor/comments/CommentPanel.svelte
+msgid "Unread comments"
+msgstr ""
+
 #. Placeholder for missing value
 #. Displayed when a word/entry/field has no content yet
 #. Used in: entry list, activity changes, change preview, field labels
@@ -2868,14 +2861,6 @@ msgstr "Từ hoặc Hiển thị như là bắt buộc."
 msgid "Word or meaning:"
 msgstr "Từ hoặc ý nghĩa:"
 
-#: src/lib/entry-editor/CommentDialog.svelte
-msgid "Write a reply..."
-msgstr ""
-
-#: src/lib/entry-editor/CommentDialog.svelte
-msgid "Write the first comment..."
-msgstr ""
-
 #. Column header
 #: src/project/browse/filter/WsSelect.svelte
 msgid "Writing System"
diff --git a/frontend/viewer/src/project/browse/EntryView.svelte b/frontend/viewer/src/project/browse/EntryView.svelte
index 9dac3923d5..3a84586a6b 100644
--- a/frontend/viewer/src/project/browse/EntryView.svelte
+++ b/frontend/viewer/src/project/browse/EntryView.svelte
@@ -25,8 +25,9 @@
   import {pt} from '$lib/views/view-text';
   import {useViewService} from '$lib/views/view-service.svelte';
   import {useProjectStorage} from '$lib/storage/project-storage.svelte';
-  import CommentDialog from '$lib/entry-editor/CommentDialog.svelte';
+  import CommentDialog from '$lib/entry-editor/comments/CommentDialog.svelte';
   import {SubjectType} from '$lib/dotnet-types/generated-types/MiniLcm/Models/SubjectType';
+  import type {IUserComment} from '$lib/dotnet-types/generated-types/MiniLcm/Models/IUserComment';
   import DevContent from '$lib/layout/DevContent.svelte';
 
   type DictionaryPreviewMode = 'show' | 'hide' | 'sticky';
@@ -117,6 +118,23 @@
   let deleted = $state(false);
   let showCommentDialog = $state(false);
 
+  const entryUnreadResource = resource(
+    () => (features.comments ? dedupedEntryId : undefined),
+    async (id): Promise<IUserComment[]> => {
+      if (!id) return [];
+      return miniLcmApi.getUnreadCommentsForSubject(SubjectType.Entry, id);
+    },
+    {initialValue: [] satisfies IUserComment[]},
+  );
+  const entryUnreadCount = $derived(entryUnreadResource.current.length);
+
+  watch(
+    () => showCommentDialog,
+    (isOpen) => {
+      if (isOpen && features.comments) void entryUnreadResource.refetch();
+    },
+  );
+
   const loadedEntryId = $derived(entry?.id);
   let entryScrollViewportRef: HTMLElement | null = $state(null);
   let editorRef: HTMLElement | null = $state(null);
@@ -150,13 +168,24 @@
         <div class="flex">
           <DevContent>
             {#if features.comments}
-              <Button
-                variant="ghost"
-                size="icon"
-                icon="i-mdi-comment-text-outline"
-                aria-label={$t`Comments`}
-                onclick={() => showCommentDialog = !showCommentDialog}
-              />
+              <div class="relative">
+                <Button
+                  variant="ghost"
+                  size="icon"
+                  icon={showCommentDialog ? 'i-mdi-comment-text' : 'i-mdi-comment-text-outline'}
+                  aria-pressed={showCommentDialog}
+                  aria-label={entryUnreadCount > 0
+                    ? $t`Comments, ${entryUnreadCount} unread`
+                    : $t`Comments`}
+                  onclick={() => showCommentDialog = !showCommentDialog}
+                />
+                {#if entryUnreadCount > 0}
+                  <span
+                    class="pointer-events-none absolute top-1.5 right-1.5 size-2 rounded-full bg-primary ring-2 ring-background"
+                    aria-hidden="true"
+                  ></span>
+                {/if}
+              </div>
             {/if}
           </DevContent>
           <ViewPicker bind:dictionaryPreview={() => dictionaryPreview, (v) => void dictionaryPreviewStorage.set(v)} />
@@ -214,6 +243,8 @@
           subjectType={SubjectType.Entry}
           subjectId={entry.id}
           subjectName={headword}
+          unreadComments={entryUnreadResource.current}
+          onUnreadCommentsChange={(comments) => entryUnreadResource.mutate(comments)}
         />
       {/if}
     </div>