diff --git a/plugins/activity-resources/src/components/doc-update-message/attributes/SetAttributesPresenter.svelte b/plugins/activity-resources/src/components/doc-update-message/attributes/SetAttributesPresenter.svelte
index 4c80fbd3e29..605c857b63a 100644
--- a/plugins/activity-resources/src/components/doc-update-message/attributes/SetAttributesPresenter.svelte
+++ b/plugins/activity-resources/src/components/doc-update-message/attributes/SetAttributesPresenter.svelte
@@ -64,7 +64,13 @@
       <Label label={isDiffShown ? ui.string.ShowLess : ui.string.ShowMore} />
     </div>
     {#if isDiffShown}
-      <svelte:component this={attributeModel.presenter} value={values[0]} {prevValue} showOnlyDiff />
+      <svelte:component
+        this={attributeModel.presenter}
+        attribute={attributeModel.attribute}
+        value={values[0]}
+        {prevValue}
+        showOnlyDiff
+      />
     {/if}
   {/if}
 {:else}
diff --git a/plugins/text-editor-resources/src/components/MarkupDiffViewer.svelte b/plugins/text-editor-resources/src/components/MarkupDiffViewer.svelte
index a6e41e515d2..79672f26e83 100644
--- a/plugins/text-editor-resources/src/components/MarkupDiffViewer.svelte
+++ b/plugins/text-editor-resources/src/components/MarkupDiffViewer.svelte
@@ -15,11 +15,12 @@
 //
 -->
 <script lang="ts">
+  import { Class, Doc, Ref } from '@hcengineering/core'
+  import { MarkupNode, ReferenceNode, jsonToPmNode } from '@hcengineering/text'
   import { Editor, Extension, mergeAttributes } from '@tiptap/core'
   import { Plugin, PluginKey } from '@tiptap/pm/state'
   import { DecorationSet } from '@tiptap/pm/view'
   import { onDestroy, onMount } from 'svelte'
-  import { MarkupNode, ReferenceNode, jsonToPmNode } from '@hcengineering/text'
 
   import { calculateDecorations } from './diff/decorations'
   import { defaultEditorAttributes } from './editor/editorProps'
@@ -27,6 +28,7 @@
 
   export let content: MarkupNode
   export let comparedVersion: MarkupNode | undefined = undefined
+  export let objectClass: Ref<Class<Doc>> | undefined = undefined
 
   let element: HTMLElement
   let editor: Editor
@@ -79,7 +81,13 @@
       element,
       content,
       editable: false,
-      extensions: [await getEditorKit(), ReferenceNode, DecorationExtension],
+      extensions: [
+        (await getEditorKit()).configure({
+          objectClass
+        }),
+        ReferenceNode,
+        DecorationExtension
+      ],
       onTransaction: () => {
         // force re-render so `editor.isActive` works as expected
         editor = editor
diff --git a/plugins/time-resources/src/utils.ts b/plugins/time-resources/src/utils.ts
index 532f9b50af2..a2e31c49ef4 100644
--- a/plugins/time-resources/src/utils.ts
+++ b/plugins/time-resources/src/utils.ts
@@ -1,6 +1,6 @@
 import type { WorkSlot, ToDo } from '@hcengineering/time'
 import type { DefSeparators } from '@hcengineering/ui'
-import core, { type Class, type Client, type Doc, type Ref, type Space } from '@hcengineering/core'
+import core, { type Class, type Client, type Doc, type Ref } from '@hcengineering/core'
 import time from '@hcengineering/time'
 import { type TextEditorMode, type AnyExtension } from '@hcengineering/text-editor'
 import { SvelteNodeViewRenderer } from '@hcengineering/text-editor-resources'
@@ -56,23 +56,12 @@ function isTodoableClass (objectClass: Ref<Class<Doc>>): boolean {
   }
 }
 
-function isTodoable (
-  mode: TextEditorMode,
-  objectId?: Ref<Doc>,
-  objectClass?: Ref<Class<Doc>>,
-  objectSpace?: Ref<Space>
-): boolean {
-  return (
-    mode === 'full' &&
-    objectId !== undefined &&
-    objectClass !== undefined &&
-    objectSpace !== undefined &&
-    isTodoableClass(objectClass)
-  )
+function isTodoable (mode: TextEditorMode, objectClass?: Ref<Class<Doc>>): boolean {
+  return mode === 'full' && objectClass !== undefined && isTodoableClass(objectClass)
 }
 
 export function createTodoItemExtension (mode: TextEditorMode, ctx: any): AnyExtension | undefined {
-  if (!isTodoable(mode, ctx.objectId, ctx.objectClass, ctx.objectSpace)) {
+  if (!isTodoable(mode, ctx.objectClass)) {
     return
   }
 
@@ -95,7 +84,7 @@ export function createTodoItemExtension (mode: TextEditorMode, ctx: any): AnyExt
 }
 
 export function createTodoListExtension (mode: TextEditorMode, ctx: any): AnyExtension | undefined {
-  if (!isTodoable(mode, ctx.objectId, ctx.objectClass, ctx.objectSpace)) {
+  if (!isTodoable(mode, ctx.objectClass)) {
     return
   }
 
diff --git a/plugins/view-resources/src/components/MarkupDiffPresenter.svelte b/plugins/view-resources/src/components/MarkupDiffPresenter.svelte
index fe160c595cd..3a81fdb9fd8 100644
--- a/plugins/view-resources/src/components/MarkupDiffPresenter.svelte
+++ b/plugins/view-resources/src/components/MarkupDiffPresenter.svelte
@@ -14,7 +14,7 @@
 // limitations under the License.
 -->
 <script lang="ts">
-  import { Markup } from '@hcengineering/core'
+  import { AnyAttribute, Markup } from '@hcengineering/core'
   import { EmptyMarkup, MarkupNode, MarkupNodeType, markupToJSON } from '@hcengineering/text'
   import { MarkupDiffViewer } from '@hcengineering/text-editor-resources'
   import { ShowMore } from '@hcengineering/ui'
@@ -22,6 +22,7 @@
 
   export let value: Markup | undefined
   export let prevValue: Markup | undefined = undefined
+  export let attribute: AnyAttribute | undefined = undefined
 
   export let showOnlyDiff: boolean = false
 
@@ -86,6 +87,6 @@
 
 <ShowMore>
   {#key [value, prevValue]}
-    <MarkupDiffViewer {content} {comparedVersion} />
+    <MarkupDiffViewer objectClass={attribute?.attributeOf} {content} {comparedVersion} />
   {/key}
 </ShowMore>