diff --git a/dev/tool/src/communication.ts b/dev/tool/src/communication.ts
index a32cf2cf55..f5a3d6abc4 100644
--- a/dev/tool/src/communication.ts
+++ b/dev/tool/src/communication.ts
@@ -746,8 +746,10 @@ async function migrateMessages (
 ): Promise<void> {
   if (cards.length === 0) return
 
-  for (const card of cards) {
-    await createGroupsBlob(hulylake, card._id)
+  if (doc.__migratedUntil == null) {
+    for (const card of cards) {
+      await createGroupsBlob(hulylake, card._id)
+    }
   }
   const iterator = await getActivityCursor(db, ws.uuid, doc._id, chunter.class.ChatMessage, 400, doc.__migratedUntil)
 
@@ -1139,6 +1141,16 @@ function toMessage (r: any): RawMessage | undefined {
 }
 
 function toAttachment (a: any): RawAttachment | undefined {
+  let metadata = a.metadata ?? {}
+
+  if (typeof metadata === 'string') {
+    try {
+      metadata = JSON.parse(metadata)
+    } catch (e) {
+      metadata = {}
+    }
+  }
+
   try {
     return {
       _id: a._id,
@@ -1147,7 +1159,7 @@ function toAttachment (a: any): RawAttachment | undefined {
       type: a.type,
       name: a.name,
       size: Number(a.size ?? 0),
-      metadata: a.metadata ?? {},
+      metadata,
       file: a.file
     }
   } catch (e) {
diff --git a/models/chat/src/index.ts b/models/chat/src/index.ts
index fc7db551cd..2a7d45e156 100644
--- a/models/chat/src/index.ts
+++ b/models/chat/src/index.ts
@@ -18,7 +18,7 @@ import core from '@hcengineering/model-core'
 import workbench from '@hcengineering/model-workbench'
 import { chatId } from '@hcengineering/chat'
 import { createSystemType } from '@hcengineering/model-card'
-import communication, { MessagesNavigationAnchors } from '@hcengineering/communication'
+import communication from '@hcengineering/communication'
 import { PaletteColorIndexes } from '@hcengineering/ui/src/colors'
 
 import chat from './plugin'
@@ -55,8 +55,7 @@ export function createModel (builder: Builder): void {
     chat.string.Thread,
     chat.string.Threads,
     {
-      defaultSection: communication.ids.CardMessagesSection,
-      defaultNavigation: MessagesNavigationAnchors.LatestMessages
+      defaultSection: communication.ids.CardMessagesSection
     },
     PaletteColorIndexes.Houseplant
   )
diff --git a/models/communication/src/index.ts b/models/communication/src/index.ts
index c946db4ddd..7976885ab3 100644
--- a/models/communication/src/index.ts
+++ b/models/communication/src/index.ts
@@ -12,9 +12,6 @@
 // limitations under the License.
 
 import { type Builder } from '@hcengineering/model'
-import core from '@hcengineering/core'
-import card from '@hcengineering/model-card'
-import { MessagesNavigationAnchors } from '@hcengineering/communication'
 
 import communication from './plugin'
 import { buildTypes } from './types'
@@ -29,27 +26,6 @@ export function createModel (builder: Builder): void {
   buildMessageActions(builder)
   buildCardActions(builder)
   buildApplets(builder)
-
-  builder.createDoc(
-    card.class.CardSection,
-    core.space.Model,
-    {
-      label: communication.string.Messages,
-      component: communication.component.CardMessagesSection,
-      order: 9999,
-      navigation: [
-        {
-          id: MessagesNavigationAnchors.ConversationStart,
-          label: communication.string.FirstMessages
-        },
-        {
-          id: MessagesNavigationAnchors.LatestMessages,
-          label: communication.string.LatestMessages
-        }
-      ]
-    },
-    communication.ids.CardMessagesSection
-  )
 }
 
 export default communication
diff --git a/models/communication/src/types.ts b/models/communication/src/types.ts
index a45ef4d19b..007cfce056 100644
--- a/models/communication/src/types.ts
+++ b/models/communication/src/types.ts
@@ -25,8 +25,7 @@ import {
   type Poll,
   type CustomActivityPresenter,
   type GuestCommunicationSettings,
-  type AppletGetTitleFnResource,
-  MessagesNavigationAnchors
+  type AppletGetTitleFnResource
 } from '@hcengineering/communication'
 import { PaletteColorIndexes } from '@hcengineering/ui/src/colors'
 import { type AppletType } from '@hcengineering/communication-types'
@@ -100,8 +99,7 @@ function defineDirect (builder: Builder): void {
     communication.string.Direct,
     communication.string.Directs,
     {
-      defaultSection: communication.ids.CardMessagesSection,
-      defaultNavigation: MessagesNavigationAnchors.LatestMessages
+      defaultSection: communication.ids.CardMessagesSection
     },
     PaletteColorIndexes.Lavander
   )
diff --git a/packages/presentation/src/components/MessageViewer.svelte b/packages/presentation/src/components/MessageViewer.svelte
index 761e4c91d4..2183a364a0 100644
--- a/packages/presentation/src/components/MessageViewer.svelte
+++ b/packages/presentation/src/components/MessageViewer.svelte
@@ -16,7 +16,7 @@
 <script lang="ts">
   import { isEmptyMarkup, markupToJSON } from '@hcengineering/text'
   import Node from './markup/Node.svelte'
-  import { loadParseEmojisFunction, ParsedTextWithEmojis } from '@hcengineering/emoji'
+  import { loadParseEmojisFunction, ParsedTextWithEmojis, getParseEmojisFunction } from '@hcengineering/emoji'
   import { onMount } from 'svelte'
 
   export let message: string
@@ -25,10 +25,10 @@
   $: node = markupToJSON(message)
   $: empty = isEmptyMarkup(message)
 
-  let parseEmojisFunction: ((text: string) => ParsedTextWithEmojis) | undefined = undefined
+  let parseEmojisFunction: ((text: string) => ParsedTextWithEmojis) | undefined = getParseEmojisFunction()
 
   onMount(async () => {
-    parseEmojisFunction = await loadParseEmojisFunction()
+    parseEmojisFunction = getParseEmojisFunction() ?? (await loadParseEmojisFunction())
   })
 
   export function isEmpty (): boolean {
diff --git a/packages/presentation/src/components/markup/NodeContent.svelte b/packages/presentation/src/components/markup/NodeContent.svelte
index e72b76bd57..fcce7a7d29 100644
--- a/packages/presentation/src/components/markup/NodeContent.svelte
+++ b/packages/presentation/src/components/markup/NodeContent.svelte
@@ -84,6 +84,7 @@
             class="emoji"
             style="display: inline-block"
             class:emojiOnly={parsedTextWithEmojis.emojisOnly && singleTextNode}
+            class:custom={'image' in textOrEmoji}
           >
             {#if 'image' in textOrEmoji}
               {@const blob = toRefBlob(textOrEmoji.image)}
@@ -260,6 +261,10 @@
   .emojiOnly {
     font-size: 2rem;
     line-height: 115%;
+
+    &.custom {
+      min-height: 2.625rem;
+    }
   }
 
   .img {
diff --git a/plugins/attachment-resources/src/components/AttachmentImagePreview.svelte b/plugins/attachment-resources/src/components/AttachmentImagePreview.svelte
index 7639ace97e..9fb081d82d 100644
--- a/plugins/attachment-resources/src/components/AttachmentImagePreview.svelte
+++ b/plugins/attachment-resources/src/components/AttachmentImagePreview.svelte
@@ -89,7 +89,7 @@
     width={dimensions.width}
     height={dimensions.height}
     blurhash={value.metadata?.thumbnail?.blurhash}
-    showLoading={true}
+    showLoading={loading}
     on:load={handleLoad}
     on:error={handleError}
     on:loadstart={handleLoadStart}
diff --git a/plugins/card-resources/src/card.ts b/plugins/card-resources/src/card.ts
new file mode 100644
index 0000000000..b5b6902b8a
--- /dev/null
+++ b/plugins/card-resources/src/card.ts
@@ -0,0 +1,80 @@
+// Copyright © 2025 Hardcore Engineering Inc.
+//
+// Licensed under the Eclipse Public License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License. You may
+// obtain a copy of the License at https://www.eclipse.org/legal/epl-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+import { getClient } from '@hcengineering/presentation'
+import cardPlugin, { type Card, type CardSection } from '@hcengineering/card'
+import { getResource } from '@hcengineering/platform'
+import { type Heading } from '@hcengineering/text-editor'
+import communication from '@hcengineering/communication'
+
+export async function getCardSections (card: Card): Promise<CardSection[]> {
+  const client = getClient()
+  const sections: CardSection[] = client
+    .getModel()
+    .findAllSync(cardPlugin.class.CardSection, {})
+    .filter((it) => it._id !== communication.ids.CardMessagesSection)
+    .sort((a, b) => a.order - b.order)
+
+  const res: CardSection[] = []
+  for (const section of sections) {
+    if (section.checkVisibility !== undefined) {
+      const isVisibleFn = await getResource(section.checkVisibility)
+      const isVisible = await isVisibleFn(card)
+      if (isVisible) {
+        res.push(section)
+      }
+    } else {
+      res.push(section)
+    }
+  }
+
+  return res
+}
+
+export function getCardToc (sections: CardSection[], tocBySection: Record<string, Heading[]>): Heading[] {
+  const newToc: Heading[] = []
+
+  for (const section of sections) {
+    const subToc = tocBySection[section._id]
+    if (section.navigation.length > 0) {
+      newToc.push(
+        ...section.navigation.map((nav) => ({
+          id: nav.id,
+          titleIntl: nav.label,
+          level: 0,
+          group: section._id
+        }))
+      )
+    } else {
+      newToc.push({
+        id: section._id,
+        titleIntl: section.label,
+        level: 0,
+        group: section._id
+      })
+    }
+
+    if (subToc !== undefined) {
+      newToc.push(...subToc.map((it) => ({ ...it, group: section._id })))
+    }
+  }
+
+  newToc.push({
+    id: communication.ids.CardMessagesSection,
+    titleIntl: communication.string.Messages,
+    level: 0,
+    group: communication.ids.CardMessagesSection
+  })
+
+  return newToc
+}
diff --git a/plugins/card-resources/src/components/Childs.svelte b/plugins/card-resources/src/components/Childs.svelte
index 6b5e679add..e190af53c5 100644
--- a/plugins/card-resources/src/components/Childs.svelte
+++ b/plugins/card-resources/src/components/Childs.svelte
@@ -35,6 +35,7 @@
   export let object: Card
   export let readonly: boolean = false
   export let emptyKind: 'create' | 'placeholder' = 'create'
+  export let limit = 20
 
   let viewlet: WithLookup<Viewlet> | undefined
   let viewOptions: ViewOptions | undefined
@@ -177,6 +178,7 @@
           {config}
           {viewOptions}
           compactMode={listWidth <= 600}
+          singleCategoryLimit={limit}
           on:docs
           on:row-focus={(event) => {
             listProvider.updateFocus(event.detail ?? undefined)
diff --git a/plugins/card-resources/src/components/EditCardNewContent.svelte b/plugins/card-resources/src/components/EditCardNewContent.svelte
index 348f929c94..fa0b075c0c 100644
--- a/plugins/card-resources/src/components/EditCardNewContent.svelte
+++ b/plugins/card-resources/src/components/EditCardNewContent.svelte
@@ -59,7 +59,6 @@
   <div class="message-input" use:resizeObserver={onInputResize}>
     <MessageInput
       card={doc}
-      title={doc.title}
       on:arrowUp={() => {
         content?.editLastMessage()
       }}
diff --git a/plugins/card-resources/src/components/EditCardTableOfContents.svelte b/plugins/card-resources/src/components/EditCardTableOfContents.svelte
index a3c0699c6f..9ccb0077b8 100644
--- a/plugins/card-resources/src/components/EditCardTableOfContents.svelte
+++ b/plugins/card-resources/src/components/EditCardTableOfContents.svelte
@@ -15,16 +15,18 @@
 
 <script lang="ts">
   import card, { Card, CardSection, CardViewDefaults } from '@hcengineering/card'
-  import { Component, languageStore, Loading, ModernButton, Scroller } from '@hcengineering/ui'
+  import { Component, Loading, Scroller, ModernButton } from '@hcengineering/ui'
   import { getClient } from '@hcengineering/presentation'
   import { NotificationContext } from '@hcengineering/communication-types'
   import { Ref } from '@hcengineering/core'
-  import { SvelteComponent } from 'svelte'
+  import { SvelteComponent, tick } from 'svelte'
   import { TableOfContents } from '@hcengineering/text-editor-resources'
   import { Heading } from '@hcengineering/text-editor'
+  import communication from '@hcengineering/communication'
+  import { MessagesSection } from '@hcengineering/communication-resources'
 
   import { CardSectionAction } from '../types'
-  import { getResource, translate } from '@hcengineering/platform'
+  import { getCardSections, getCardToc } from '../card'
 
   export let doc: Card
   export let context: NotificationContext | undefined = undefined
@@ -32,20 +34,12 @@
   export let readonly: boolean = false
   export let scrollDiv: HTMLDivElement | undefined | null = undefined
 
+  const messagesId = communication.ids.CardMessagesSection
   const client = getClient()
 
-  let sections: CardSection[] = []
-  const _sections: CardSection[] = client
-    .getModel()
-    .findAllSync(card.class.CardSection, {})
-    .sort((a, b) => a.order - b.order)
-
-  let defaults: CardViewDefaults | undefined = undefined
-  $: defaults = client.getHierarchy().classHierarchyMixin(doc._class, card.mixin.CardViewDefaults)
-
   let selectedToc: Heading | undefined = undefined
 
-  const sectionElement: Record<Ref<CardSection>, HTMLElement | undefined> = {}
+  const sectionElement: Record<Ref<CardSection>, HTMLDivElement | undefined> = {}
   const sectionRef: Record<Ref<CardSection>, SvelteComponent | undefined> = {}
   const sectionLoaded: Record<Ref<CardSection>, boolean | undefined> = {}
   let sectionOverlays: Record<Ref<CardSection>, boolean> = {}
@@ -54,15 +48,46 @@
   let subTocBySection: Record<string, Heading[]> = {}
 
   let isScrollInitialized = false
+  let isNavigating = false
   let showOverlay = false
   let timer: any
   let hideBar: boolean = false
 
   let bottomOffset: number = 0
 
-  function onNavigationClick (heading: Heading): void {
-    selectedToc = heading
-    navigate()
+  let sections: CardSection[] = []
+  $: void getCardSections(doc).then((res) => {
+    sections = res
+  })
+
+  let defaults: CardViewDefaults | undefined = client
+    .getHierarchy()
+    .classHierarchyMixin(doc._class, card.mixin.CardViewDefaults)
+  $: defaults = client.getHierarchy().classHierarchyMixin(doc._class, card.mixin.CardViewDefaults)
+
+  let renderTopSections = defaults?.defaultSection !== communication.ids.CardMessagesSection
+
+  export function scrollDown (): void {
+    if (scrollDiv == null) return
+    const lastTocItem = toc[toc.length - 1]
+    if (lastTocItem === undefined) return
+
+    selectedToc = lastTocItem
+    void navigate()
+  }
+
+  export function editLastMessage (): void {
+    sectionRef[messagesId]?.editLastMessage?.()
+  }
+
+  export function hideScrollBar (): void {
+    hideBar = true
+    if (timer != null) {
+      clearTimeout(timer)
+    }
+    timer = setTimeout(() => {
+      hideBar = false
+    }, 1000)
   }
 
   function getBottomOffset (): number {
@@ -70,25 +95,51 @@
     return Math.max(0, Math.floor(scrollDiv.scrollHeight - scrollDiv.scrollTop - scrollDiv.clientHeight))
   }
 
-  function navigate (): void {
+  async function navigate (): Promise<void> {
     if (selectedToc === undefined) return
+    if (selectedToc.id !== messagesId && !renderTopSections) {
+      renderTopSections = true
+      await tick()
+    }
     const sectionId = selectedToc.group as Ref<CardSection>
 
     const ref = sectionRef[sectionId]
-    const isInnerNavigation = selectedToc.id !== sectionId
-    if (ref?.navigate && isInnerNavigation) {
+    const isInnerNavigation = selectedToc.id !== sectionId || sectionId === messagesId
+    if (ref?.navigate != null && isInnerNavigation) {
+      isNavigating = true
       ref.navigate(selectedToc.id)
     } else {
       sectionElement[sectionId]?.scrollIntoView()
+      isNavigating = false
     }
     isScrollInitialized = true
   }
 
+  function updateToc (sections: CardSection[], subTocBySection: Record<string, Heading[]>): void {
+    if (sections.length === 0) return
+
+    toc = getCardToc(sections, subTocBySection)
+
+    if (selectedToc == null || toc.findIndex((it) => it.id === selectedToc?.id) === -1) {
+      selectedToc = toc.find((it) => it.group === defaults?.defaultSection) ?? toc[0]
+
+      isScrollInitialized = isScrollInitialized || selectedToc.id === toc[0].id
+    }
+  }
+
+  function handleNavigationClick (heading: Heading): void {
+    if (heading.group !== messagesId) {
+      renderTopSections = true
+    }
+    selectedToc = heading
+    void navigate()
+  }
+
   function handleSectionLoaded (_id: Ref<CardSection>): void {
     const wasLoaded = sectionLoaded[_id] === true
     sectionLoaded[_id] = true
     if (!wasLoaded && selectedToc?.group === _id) {
-      navigate()
+      void navigate()
     }
   }
 
@@ -113,146 +164,58 @@
     }
   }
 
-  function updateToc (sections: CardSection[], tocBySection: Record<string, Heading[]>): void {
-    const newToc: Heading[] = []
-
-    for (const section of sections) {
-      const subToc = tocBySection[section._id]
-      if (section.navigation.length > 0) {
-        newToc.push(
-          ...section.navigation.map((nav) => ({
-            id: nav.id,
-            titleIntl: nav.label,
-            level: 0,
-            group: section._id
-          }))
-        )
-      } else {
-        newToc.push({
-          id: section._id,
-          titleIntl: section.label,
-          level: 0,
-          group: section._id
-        })
-      }
-
-      if (subToc !== undefined) {
-        newToc.push(...subToc.map((it) => ({ ...it, group: section._id })))
-      }
-    }
-
-    toc = newToc
-    if (selectedToc == null || newToc.findIndex((it) => it.id === selectedToc?.id) === -1) {
-      selectedToc =
-        newToc.find(
-          (it) =>
-            it.group === defaults?.defaultSection &&
-            (defaults?.defaultNavigation === undefined || it.id === defaults?.defaultNavigation)
-        ) ?? newToc[0]
-      isScrollInitialized = isScrollInitialized ?? selectedToc.id === newToc[0].id
-    }
-  }
-
-  export function scrollDown (): void {
-    if (scrollDiv == null) return
-    const lastTocItem = toc[toc.length - 1]
-    if (lastTocItem === undefined) return
-
-    if (selectedToc?.group === lastTocItem.group && selectedToc?.id === lastTocItem.id) {
-      scrollDiv?.scroll({ top: scrollDiv.scrollHeight, behavior: 'instant' })
-    } else {
-      selectedToc = lastTocItem
-      navigate()
-    }
-  }
-
-  export function editLastMessage (): void {
-    if (scrollDiv == null) return
-    const lastTocItem = toc[toc.length - 1]
-    if (lastTocItem?.group === undefined) return
-    ;(sectionRef as any)[lastTocItem.group]?.editLastMessage?.()
-  }
-
-  export function hideScrollBar (): void {
-    hideBar = true
-    if (timer) {
-      clearTimeout(timer)
-    }
-    timer = setTimeout(() => {
-      hideBar = false
-    }, 1000)
-  }
-
   function handleScroll (): void {
     if (scrollDiv == null || showOverlay) return
-    const allLoaded = sections.every(({ _id }) => sectionLoaded[_id] === true)
+
+    const allLoaded = renderTopSections
+      ? sections.every(({ _id }) => sectionLoaded[_id] === true)
+      : sectionLoaded[messagesId] === true
     if (!allLoaded) return
+
     const scrollTop = scrollDiv.scrollTop ?? 0
     const offsets: Array<{ _id: Ref<CardSection>, offsetTop: number }> = []
-    sections.forEach(({ _id }) => {
-      const sectionRef = sectionElement[_id]
-      if (sectionRef != null && scrollDiv != null) {
-        offsets.push({ _id, offsetTop: sectionRef.offsetTop })
+
+    for (const t of toc) {
+      const _id = t.group as Ref<CardSection>
+      if (!renderTopSections && _id !== messagesId) continue
+      if (offsets.some((it) => it._id === _id)) continue
+      const ref = sectionElement[_id]
+      if (ref != null) {
+        offsets.push({ _id, offsetTop: ref.offsetTop ?? 0 })
       }
-    })
+    }
+
     offsets.sort((a, b) => a.offsetTop - b.offsetTop)
 
-    const selectedSectionId = offsets.filter((it) => it.offsetTop <= scrollTop + 50).pop()?._id
+    const newSelectedId = offsets.filter((it) => it.offsetTop <= scrollTop + 50).pop()?._id
 
-    if (selectedSectionId != null && selectedSectionId !== selectedToc?.group) {
-      selectedToc = toc.find((it) => it.group === selectedSectionId)
+    if (newSelectedId != null) {
+      if (isNavigating) {
+        isNavigating = newSelectedId !== selectedToc?.group
+      } else if (newSelectedId !== selectedToc?.group) {
+        selectedToc = toc.find((it) => it.group === newSelectedId)
+      }
     }
 
     bottomOffset = getBottomOffset()
   }
 
-  async function filterSections (s: CardSection[], doc: Card): Promise<void> {
-    const newSections: CardSection[] = []
-    for (const section of s) {
-      if (section.checkVisibility !== undefined) {
-        const isVisibleFn = await getResource(section.checkVisibility)
-        const isVisible = await isVisibleFn(doc)
-        if (isVisible) {
-          newSections.push(section)
-        }
-      } else {
-        newSections.push(section)
-      }
-    }
-
-    sections = newSections
-  }
-
-  $: void filterSections(_sections, doc)
-  $: updateToc(sections, subTocBySection)
-  $: showOverlay = !isScrollInitialized || Object.values(sectionOverlays).some((it) => it)
-
-  function handleLasTocScroll (): void {
-    selectedToc = toc[toc.length - 1]
-    const sectionId = selectedToc.group as Ref<CardSection>
-
-    const ref = sectionRef[sectionId]
-    if (ref?.scrollDown) {
-      ref.scrollDown(selectedToc.id)
+  function handleScrollDown (): void {
+    const ref = sectionRef[messagesId]
+    if (ref?.scrollDown != null) {
+      ref.scrollDown()
     }
   }
 
   function canScrollDown (): boolean {
-    const lastSection = sections[sections.length - 1]
-    if (lastSection === undefined) return false
-    const ref = sectionRef[lastSection._id]
+    const ref = sectionRef[messagesId]
     if (ref === undefined) return false
 
     return ref.canScrollDown?.() ?? false
   }
 
-  async function getDownButtonTitle (item: Heading, lang: string): Promise<string> {
-    if (item.titleIntl) {
-      const label = await translate(item.titleIntl, {}, lang)
-      return '↓ ' + label
-    }
-    return '↓ ' + (item.title ?? '')
-  }
+  $: updateToc(sections, subTocBySection)
+  $: showOverlay = !isScrollInitialized || Object.values(sectionOverlays).some((it) => it)
 </script>
 
 <div class="hulyComponent-content__container columns relative">
@@ -269,7 +232,7 @@
           selected={toc.find((it) => it.id === selectedToc?.id)}
           position="right"
           on:select={(evt) => {
-            onNavigationClick(evt.detail)
+            handleNavigationClick(evt.detail)
           }}
         />
       </div>
@@ -279,14 +242,12 @@
       {hideBar}
       bottomPadding="var(--spacing-3)"
       disablePointerEventsOnScroll
+      disableOverscroll
       bind:divScroll={scrollDiv}
       onScroll={handleScroll}
     >
-      <div class="hulyComponent-content gap withoutMaxWidth">
-        {#each sections as section, i}
-          <!--NOTE: experimental - do not wait loading of previous sections-->
-          <!--{@const isLoadingBefore = sections.slice(0, i).some((section) => sectionLoaded[section._id] === undefined)}-->
-          {@const isLoadingBefore = false}
+      <div class="hulyComponent-content withoutMaxWidth" class:gap={renderTopSections}>
+        {#each sections as section (section._id)}
           <div id={section._id} bind:this={sectionElement[section._id]} class="section">
             <Component
               is={section.component}
@@ -295,13 +256,10 @@
               props={{
                 doc,
                 readonly,
-                isContextLoaded,
-                isLoadingBefore,
                 scrollDiv,
-                notificationContext: context,
                 contentDiv: sectionElement[section._id],
-                active: selectedToc?.group === section._id,
-                navigation: selectedToc?.id
+                navigation: selectedToc?.id,
+                hidden: !renderTopSections
               }}
               on:loaded={() => {
                 handleSectionLoaded(section._id)
@@ -315,15 +273,46 @@
             />
           </div>
         {/each}
+        <div id={messagesId} bind:this={sectionElement[messagesId]} class="section">
+          <MessagesSection
+            bind:this={sectionRef[messagesId]}
+            {doc}
+            {readonly}
+            {isContextLoaded}
+            {scrollDiv}
+            {context}
+            contentDiv={sectionElement[messagesId]}
+            active={selectedToc?.group === messagesId}
+            isDefault={defaults?.defaultSection === messagesId}
+            on:top-loaded={() => {
+              renderTopSections = true
+            }}
+            on:top-hidden={() => {
+              renderTopSections = false
+            }}
+            on:loaded={() => {
+              handleSectionLoaded(messagesId)
+            }}
+            on:change={(ev) => {
+              handleChangeNavigation(messagesId, ev.detail)
+            }}
+            on:action={(ev) => {
+              handleAction(messagesId, ev.detail)
+            }}
+          />
+        </div>
       </div>
     </Scroller>
-    {#if toc.length > 0 && (bottomOffset > 400 || canScrollDown())}
-      {@const lastToc = toc[toc.length - 1]}
-      {#await getDownButtonTitle(lastToc, $languageStore) then title}
-        <div class="down-button">
-          <ModernButton {title} shape="round" size="small" kind="primary" on:click={handleLasTocScroll} />
-        </div>
-      {/await}
+    {#if toc.length > 0 && (bottomOffset > 400 || canScrollDown()) && selectedToc?.group === messagesId}
+      <div class="down-button">
+        <ModernButton
+          label={communication.string.ArrowDownMessages}
+          shape="round"
+          size="small"
+          kind="primary"
+          on:click={handleScrollDown}
+        />
+      </div>
     {/if}
   </div>
 </div>
diff --git a/plugins/card-resources/src/components/sections/AttachmentsSection.svelte b/plugins/card-resources/src/components/sections/AttachmentsSection.svelte
index 1a2d323ee7..6147dc81c1 100644
--- a/plugins/card-resources/src/components/sections/AttachmentsSection.svelte
+++ b/plugins/card-resources/src/components/sections/AttachmentsSection.svelte
@@ -20,6 +20,7 @@
 
   export let readonly: boolean = false
   export let doc: Card
+  export let hidden: boolean = false
 
   const dispatch = createEventDispatcher()
 
@@ -30,16 +31,18 @@
   })
 </script>
 
-<div class="section-attachments">
-  <Attachments
-    objectId={doc._id}
-    _class={doc._class}
-    space={doc.space}
-    attachments={doc.attachments ?? 0}
-    {readonly}
-    on:attachments={() => dispatch('loaded')}
-  />
-</div>
+{#if !hidden}
+  <div class="section-attachments">
+    <Attachments
+      objectId={doc._id}
+      _class={doc._class}
+      space={doc.space}
+      attachments={doc.attachments ?? 0}
+      {readonly}
+      on:attachments={() => dispatch('loaded')}
+    />
+  </div>
+{/if}
 
 <style lang="scss">
   .section-attachments {
diff --git a/plugins/card-resources/src/components/sections/ChildrenSection.svelte b/plugins/card-resources/src/components/sections/ChildrenSection.svelte
index 8221b2c1cf..8df69dff25 100644
--- a/plugins/card-resources/src/components/sections/ChildrenSection.svelte
+++ b/plugins/card-resources/src/components/sections/ChildrenSection.svelte
@@ -21,6 +21,7 @@
 
   export let readonly: boolean = false
   export let doc: Card
+  export let hidden: boolean = false
 
   const dispatch = createEventDispatcher()
 
@@ -31,9 +32,11 @@
   })
 </script>
 
-<div class="section-children">
-  <Childs object={doc} {readonly} on:loaded emptyKind="placeholder" />
-</div>
+{#if !hidden}
+  <div class="section-children">
+    <Childs object={doc} {readonly} on:loaded emptyKind="placeholder" limit={10} />
+  </div>
+{/if}
 
 <style lang="scss">
   .section-children {
diff --git a/plugins/card-resources/src/components/sections/ContentSection.svelte b/plugins/card-resources/src/components/sections/ContentSection.svelte
index d15486db31..0c85663586 100644
--- a/plugins/card-resources/src/components/sections/ContentSection.svelte
+++ b/plugins/card-resources/src/components/sections/ContentSection.svelte
@@ -24,6 +24,7 @@
   export let readonly: boolean = false
   export let doc: Card
   export let contentDiv: HTMLDivElement | undefined | null = undefined
+  export let hidden: boolean = false
 
   const dispatch = createEventDispatcher()
 
@@ -44,7 +45,7 @@
 </script>
 
 {#if contentDiv != null}
-  <div class="content">
+  <div class="content" class:hidden>
     <Content {doc} {readonly} content={contentDiv} showToc={false} on:loaded on:headings={handleHeadings} />
   </div>
 {/if}
@@ -56,5 +57,13 @@
     width: 100%;
     padding: 0 2.5rem;
     flex: 1;
+    min-height: 5.5rem;
+
+    &.hidden {
+      display: none;
+      height: 0;
+      min-height: 0;
+      max-height: 0;
+    }
   }
 </style>
diff --git a/plugins/card-resources/src/components/sections/PropertiesSection.svelte b/plugins/card-resources/src/components/sections/PropertiesSection.svelte
index fec5a77ee6..996a89f534 100644
--- a/plugins/card-resources/src/components/sections/PropertiesSection.svelte
+++ b/plugins/card-resources/src/components/sections/PropertiesSection.svelte
@@ -23,6 +23,7 @@
 
   export let readonly: boolean = false
   export let doc: Card
+  export let hidden: boolean = false
 
   const dispatch = createEventDispatcher()
 
@@ -33,9 +34,11 @@
   })
 </script>
 
-<div class="properties">
-  <CardAttributeEditor value={doc} {mixins} {readonly} ignoreKeys={['title', 'content', 'parent']} />
-</div>
+{#if !hidden}
+  <div class="properties">
+    <CardAttributeEditor value={doc} {mixins} {readonly} ignoreKeys={['title', 'content', 'parent']} />
+  </div>
+{/if}
 
 <style lang="scss">
   .properties {
diff --git a/plugins/card-resources/src/components/sections/RelationsSection.svelte b/plugins/card-resources/src/components/sections/RelationsSection.svelte
index 263f967eaf..6d3573377e 100644
--- a/plugins/card-resources/src/components/sections/RelationsSection.svelte
+++ b/plugins/card-resources/src/components/sections/RelationsSection.svelte
@@ -19,11 +19,14 @@
 
   export let readonly: boolean = false
   export let doc: Card
+  export let hidden: boolean = false
 </script>
 
-<div class="section-relations">
-  <RelationsEditor object={doc} {readonly} on:loaded emptyKind="placeholder" />
-</div>
+{#if hidden}
+  <div class="section-relations">
+    <RelationsEditor object={doc} {readonly} on:loaded emptyKind="placeholder" />
+  </div>
+{/if}
 
 <style lang="scss">
   .section-relations {
diff --git a/plugins/card/src/index.ts b/plugins/card/src/index.ts
index 1395d618b0..0f169f94f3 100644
--- a/plugins/card/src/index.ts
+++ b/plugins/card/src/index.ts
@@ -93,7 +93,6 @@ export interface CardSection extends Doc {
 
 export interface CardViewDefaults extends MasterTag {
   defaultSection: Ref<CardSection>
-  defaultNavigation?: string
 }
 
 export interface FavoriteCard extends Preference {
diff --git a/plugins/communication-assets/lang/cs.json b/plugins/communication-assets/lang/cs.json
index 30e55e3ea2..b45753029c 100644
--- a/plugins/communication-assets/lang/cs.json
+++ b/plugins/communication-assets/lang/cs.json
@@ -90,6 +90,9 @@
     "Direct": "Přímý",
     "Directs": "Přímé",
     "Members": "Členové",
-    "Translate": "Přeložit"
+    "Translate": "Přeložit",
+    "WriteMessageEllipsis": "Napište zprávu...",
+    "EditMessageEllipsis": "Upravit zprávu...",
+    "ArrowDownMessages": "↓ Poslední zprávy"
   }
 }
diff --git a/plugins/communication-assets/lang/de.json b/plugins/communication-assets/lang/de.json
index 919e842c86..0a6d6f3e6e 100644
--- a/plugins/communication-assets/lang/de.json
+++ b/plugins/communication-assets/lang/de.json
@@ -90,6 +90,9 @@
     "Direct": "Direkt",
     "Directs": "Direkte",
     "Members": "Mitglieder",
-    "Translate": "Übersetzen"
+    "Translate": "Übersetzen",
+    "WriteMessageEllipsis": "Nachricht schreiben...",
+    "EditMessageEllipsis": "Nachricht bearbeiten...",
+    "ArrowDownMessages": "↓ Neueste Nachrichten"
   }
 }
diff --git a/plugins/communication-assets/lang/en.json b/plugins/communication-assets/lang/en.json
index 2685cc37be..c7d72da4de 100644
--- a/plugins/communication-assets/lang/en.json
+++ b/plugins/communication-assets/lang/en.json
@@ -90,6 +90,9 @@
     "Direct": "Direct",
     "Directs": "Directs",
     "Members": "Members",
-    "Translate": "Translate"
+    "Translate": "Translate",
+    "WriteMessageEllipsis": "Write a message...",
+    "EditMessageEllipsis": "Edit message...",
+    "ArrowDownMessages": "↓ Latest messages"
   }
 }
diff --git a/plugins/communication-assets/lang/es.json b/plugins/communication-assets/lang/es.json
index dd75030327..0c3404c130 100644
--- a/plugins/communication-assets/lang/es.json
+++ b/plugins/communication-assets/lang/es.json
@@ -90,6 +90,9 @@
     "Direct": "Directo",
     "Directs": "Directos",
     "Members": "Miembros",
-    "Translate": "Traducir"
+    "Translate": "Traducir",
+    "WriteMessageEllipsis": "Escribe un mensaje...",
+    "EditMessageEllipsis": "Editar mensaje...",
+    "ArrowDownMessages": "↓ Últimos mensajes"
   }
 }
diff --git a/plugins/communication-assets/lang/fr.json b/plugins/communication-assets/lang/fr.json
index 1b0211e518..cacd6f04a2 100644
--- a/plugins/communication-assets/lang/fr.json
+++ b/plugins/communication-assets/lang/fr.json
@@ -90,6 +90,9 @@
     "Direct": "Direct",
     "Directs": "Directs",
     "Members": "Membres",
-    "Translate": "Traduire"
+    "Translate": "Traduire",
+    "WriteMessageEllipsis": "Écrire un message...",
+    "EditMessageEllipsis": "Modifier le message...",
+    "ArrowDownMessages": "↓ Derniers messages"
   }
 }
diff --git a/plugins/communication-assets/lang/it.json b/plugins/communication-assets/lang/it.json
index e8a4154f20..676745504e 100644
--- a/plugins/communication-assets/lang/it.json
+++ b/plugins/communication-assets/lang/it.json
@@ -90,6 +90,9 @@
     "Direct": "Diretto",
     "Directs": "Diretti",
     "Members": "Membri",
-    "Translate": "Traduci"
+    "Translate": "Traduci",
+    "WriteMessageEllipsis": "Scrivi un messaggio...",
+    "EditMessageEllipsis": "Modifica messaggio...",
+    "ArrowDownMessages": "↓ Ultimi messaggi"
   }
 }
diff --git a/plugins/communication-assets/lang/ja.json b/plugins/communication-assets/lang/ja.json
index 285a81c42c..92559e405d 100644
--- a/plugins/communication-assets/lang/ja.json
+++ b/plugins/communication-assets/lang/ja.json
@@ -90,6 +90,9 @@
     "Direct": "ダイレクト",
     "Directs": "ダイレクト",
     "Members": "メンバー",
-    "Translate": "翻訳"
+    "Translate": "翻訳",
+    "WriteMessageEllipsis": "メッセージを書く...",
+    "EditMessageEllipsis": "メッセージを編集...",
+    "ArrowDownMessages": "↓ 最新のメッセージ"
   }
 }
diff --git a/plugins/communication-assets/lang/pt.json b/plugins/communication-assets/lang/pt.json
index 3c4d03340a..5bba294faf 100644
--- a/plugins/communication-assets/lang/pt.json
+++ b/plugins/communication-assets/lang/pt.json
@@ -90,6 +90,9 @@
     "Direct": "Direto",
     "Directs": "Diretos",
     "Members": "Membros",
-    "Translate": "Traduzir"
+    "Translate": "Traduzir",
+    "WriteMessageEllipsis": "Escreva uma mensagem...",
+    "EditMessageEllipsis": "Editar mensagem...",
+    "ArrowDownMessages": "↓ Últimas mensagens"
   }
 }
diff --git a/plugins/communication-assets/lang/ru.json b/plugins/communication-assets/lang/ru.json
index 442e53f2f9..a5f2ce0bf2 100644
--- a/plugins/communication-assets/lang/ru.json
+++ b/plugins/communication-assets/lang/ru.json
@@ -90,6 +90,9 @@
     "Direct": "Личные сообщения",
     "Directs": "Личные сообщения",
     "Members": "Участники",
-    "Translate": "Перевести"
+    "Translate": "Перевести",
+    "WriteMessageEllipsis": "Написать сообщение...",
+    "EditMessageEllipsis": "Редактировать сообщение...",
+    "ArrowDownMessages": "↓ Последние сообщения"
   }
 }
diff --git a/plugins/communication-assets/lang/tr.json b/plugins/communication-assets/lang/tr.json
index 90e9daed84..a89d0337d5 100644
--- a/plugins/communication-assets/lang/tr.json
+++ b/plugins/communication-assets/lang/tr.json
@@ -90,6 +90,9 @@
     "Direct": "Direkt",
     "Directs": "Direktler",
     "Members": "Üyeler",
-    "Translate": "Çevir"
+    "Translate": "Çevir",
+    "WriteMessageEllipsis": "Mesaj yaz...",
+    "EditMessageEllipsis": "Mesajı düzenle...",
+    "ArrowDownMessages": "↓ Son mesajlar"
   }
 }
diff --git a/plugins/communication-assets/lang/zh.json b/plugins/communication-assets/lang/zh.json
index e8be955972..0ff297c8df 100644
--- a/plugins/communication-assets/lang/zh.json
+++ b/plugins/communication-assets/lang/zh.json
@@ -90,6 +90,9 @@
     "Direct": "私信",
     "Directs": "私信",
     "Members": "成员",
-    "Translate": "翻译"
+    "Translate": "翻译",
+    "WriteMessageEllipsis": "编写消息...",
+    "EditMessageEllipsis": "编辑消息...",
+    "ArrowDownMessages": "↓ 最新消息"
   }
 }
diff --git a/plugins/communication-resources/src/actions.ts b/plugins/communication-resources/src/actions.ts
index c5cb1adfb4..0f479de4e2 100644
--- a/plugins/communication-resources/src/actions.ts
+++ b/plugins/communication-resources/src/actions.ts
@@ -12,15 +12,27 @@
 // limitations under the License.
 
 import communication, {
+  type Applet,
   type MessageAction,
   type MessageActionFunction,
   type MessageActionVisibilityTester
 } from '@hcengineering/communication'
 import { languageStore, showPopup } from '@hcengineering/ui'
 import emojiPlugin from '@hcengineering/emoji'
-import { type Message, MessageType, SortingOrder } from '@hcengineering/communication-types'
+import {
+  type AppletParams,
+  type AttachmentID,
+  type BlobAttachment,
+  type BlobParams,
+  type LinkPreviewParams,
+  linkPreviewType,
+  type Message,
+  type MessageID,
+  MessageType,
+  SortingOrder
+} from '@hcengineering/communication-types'
 import cardPlugin, { type Card, type MasterTag } from '@hcengineering/card'
-import { addRefreshListener, getClient, getCommunicationClient } from '@hcengineering/presentation'
+import { addRefreshListener, deleteFile, getClient, getCommunicationClient } from '@hcengineering/presentation'
 import {
   AccountRole,
   fillDefaults,
@@ -40,8 +52,10 @@ import { get } from 'svelte/store'
 import { translate as aiTranslate } from '@hcengineering/ai-bot-resources'
 import aiBot from '@hcengineering/ai-bot'
 import CreateCardFromMessagePopup from './components/CreateCardFromMessagePopup.svelte'
+import { Analytics } from '@hcengineering/analytics'
+import { isAppletAttachment, isBlobAttachment, isLinkPreviewAttachment } from '@hcengineering/communication-shared'
 
-import { isCardAllowedForCommunications, showForbidden, toggleReaction, toMarkup } from './utils'
+import { isCardAllowedForCommunications, loadLinkPreviewParams, showForbidden, toggleReaction, toMarkup } from './utils'
 import {
   isMessageManualTranslating,
   messageEditingStore,
@@ -50,6 +64,7 @@ import {
   translateMessagesStore,
   translateToStore
 } from './stores'
+import { type AppletDraft, type BlobDraft, type LinkPreviewDraft } from './types'
 
 export const addReaction: MessageActionFunction = async (message, card: Card, evt, onOpen, onClose) => {
   if (!isCardAllowedForCommunications(card)) {
@@ -287,3 +302,161 @@ async function filterActions (message: Message, actions: MessageAction[]): Promi
 
   return result
 }
+
+export async function createMessage (
+  card: Card,
+  markdown: string,
+  blobs: BlobDraft[],
+  applets: AppletDraft[],
+  appletModels: Applet[],
+  links: LinkPreviewDraft[],
+  urlsToLoad: string[],
+  linksData: Map<string, LinkPreviewParams | null>
+): Promise<void> {
+  const communicationClient = getCommunicationClient()
+  const client = getClient()
+
+  const { messageId } = await communicationClient.createMessage(card._id, card._class, markdown)
+  void client.update(card, {}, false, Date.now())
+
+  void attachApplets(card, messageId, applets, appletModels)
+
+  if (blobs.length > 0) {
+    void communicationClient.attachmentPatch<BlobParams>(card._id, messageId, {
+      add: blobs.map((it) => ({
+        id: it.blobId as any as AttachmentID,
+        mimeType: it.mimeType,
+        params: it
+      }))
+    })
+  }
+
+  if (links.length > 0) {
+    void communicationClient.attachmentPatch<LinkPreviewParams>(card._id, messageId, {
+      add: links.map((it) => ({
+        mimeType: linkPreviewType,
+        params: it
+      }))
+    })
+  }
+
+  for (const url of urlsToLoad) {
+    if (links.some((it) => it.url === url)) continue
+    const fetchedData = linksData.get(url)
+    if (fetchedData === null) continue
+    const params = fetchedData ?? (await loadLinkPreviewParams(url))
+    if (params === undefined) continue
+    void communicationClient.attachmentPatch<LinkPreviewParams>(card._id, messageId, {
+      add: [
+        {
+          mimeType: linkPreviewType,
+          params
+        }
+      ]
+    })
+  }
+}
+
+export async function updateMessage (
+  card: Card,
+  message: Message,
+  markdown: string,
+  blobs: BlobDraft[],
+  applets: AppletDraft[],
+  appletModels: Applet[],
+  links: LinkPreviewDraft[]
+): Promise<void> {
+  const communicationClient = getCommunicationClient()
+
+  await communicationClient.updateMessage(card._id, message.id, markdown)
+
+  const attachBlobs = blobs.filter(
+    (b) => !message.attachments.some((it) => isBlobAttachment(it) && it.params.blobId === b.blobId)
+  )
+
+  void attachApplets(
+    card,
+    message.id,
+    applets.filter((a) => !message.attachments.some((it) => it.id === a.id)),
+    appletModels
+  )
+
+  if (attachBlobs.length > 0) {
+    void communicationClient.attachmentPatch<BlobParams>(card._id, message.id, {
+      add: attachBlobs.map((it) => ({
+        id: it.blobId as any as AttachmentID,
+        mimeType: it.mimeType,
+        params: it
+      }))
+    })
+  }
+
+  const detachBlobs = message.attachments.filter(
+    (it) => isBlobAttachment(it) && !blobs.some((b) => b.blobId === it.params.blobId)
+  ) as BlobAttachment[]
+  if (detachBlobs.length > 0) {
+    detachBlobs.forEach((it) => {
+      void deleteFile(it.params.blobId)
+    })
+    void communicationClient.attachmentPatch(card._id, message.id, {
+      remove: detachBlobs.map((it) => it.id)
+    })
+  }
+
+  const detachApplets = message.attachments.filter(
+    (it) => isAppletAttachment(it) && !applets.some((a) => a.id === it.id)
+  )
+
+  if (detachApplets.length > 0) {
+    void communicationClient.attachmentPatch(card._id, message.id, {
+      remove: detachApplets.map((it) => it.id)
+    })
+  }
+
+  const attachLinks = links.filter(
+    (l) => !message.attachments.some((it) => isLinkPreviewAttachment(it) && it.params.url === l.url)
+  )
+
+  void communicationClient.attachmentPatch(card._id, message.id, {
+    add: attachLinks.map((it) => ({
+      mimeType: linkPreviewType,
+      params: it
+    }))
+  })
+}
+
+async function attachApplets (
+  card: Card,
+  messageId: MessageID,
+  applets: AppletDraft[],
+  models: Applet[]
+): Promise<void> {
+  if (applets.length === 0) return
+
+  const communicationClient = getCommunicationClient()
+  const toAttach: AppletDraft[] = []
+
+  for (const appletDraft of applets) {
+    try {
+      const model = models.find((it) => it._id === appletDraft.appletId)
+      if (model?.createFn == null) {
+        toAttach.push(appletDraft)
+        continue
+      }
+      const r = await getResource(model.createFn)
+      await r(card, messageId, appletDraft.params)
+      toAttach.push(appletDraft)
+    } catch (err: any) {
+      Analytics.handleError(err)
+    }
+  }
+
+  if (toAttach.length > 0) {
+    void communicationClient.attachmentPatch<AppletParams>(card._id, messageId, {
+      add: toAttach.map((it) => ({
+        mimeType: it.mimeType,
+        params: it.params
+      }))
+    })
+  }
+}
diff --git a/plugins/communication-resources/src/components/DateSeparator.svelte b/plugins/communication-resources/src/components/DateSeparator.svelte
index 62c9e04c67..61635e0eb3 100644
--- a/plugins/communication-resources/src/components/DateSeparator.svelte
+++ b/plugins/communication-resources/src/components/DateSeparator.svelte
@@ -77,6 +77,11 @@
       left: 50%;
       transform: translateX(-50%);
       top: 0.25rem;
+      min-height: 1.625rem;
+      min-width: 3.5rem;
+      display: flex;
+      align-items: center;
+      justify-content: center;
     }
   }
 
diff --git a/plugins/communication-resources/src/components/MessagesList.svelte b/plugins/communication-resources/src/components/MessagesList.svelte
index 419b0fca67..b9f71d8f3e 100644
--- a/plugins/communication-resources/src/components/MessagesList.svelte
+++ b/plugins/communication-resources/src/components/MessagesList.svelte
@@ -15,10 +15,10 @@
   import { Card } from '@hcengineering/card'
   import {
     type Message,
+    type NotificationContext,
     MessageType,
-    Notification,
-    NotificationContext,
     NotificationType,
+    Notification,
     Window
   } from '@hcengineering/communication-types'
   import {
@@ -27,9 +27,8 @@
     getCommunicationClient,
     type MessageQueryParams
   } from '@hcengineering/presentation'
-  import { getCurrentAccount, SortingOrder } from '@hcengineering/core'
+  import { SortingOrder, getCurrentAccount } from '@hcengineering/core'
   import { createEventDispatcher, onDestroy, onMount, tick } from 'svelte'
-  import { MessagesNavigationAnchors } from '@hcengineering/communication'
   import { deviceOptionsStore as deviceInfo, isAppFocusedStore } from '@hcengineering/ui'
   import { translationStore } from '@hcengineering/contact-resources'
 
@@ -41,11 +40,9 @@
   export let card: Card
   export let context: NotificationContext | undefined = undefined
   export let readonly = false
-  export let isLoadingBefore: boolean = false
-  export let shouldScrollToStart: boolean = false
-  export let position: MessagesNavigationAnchors = MessagesNavigationAnchors.ConversationStart
   export let scrollDiv: HTMLDivElement
   export let contentDiv: HTMLDivElement
+  export let position: 'start' | 'end'
 
   const dispatch = createEventDispatcher()
   const me = getCurrentAccount()
@@ -75,24 +72,28 @@
   let shouldScrollToNew = false
   let atBottom = false
   let restore: { scrollHeight: number } | undefined = undefined
-  let prevPosition: MessagesNavigationAnchors = position
+
+  let prevPosition: 'start' | 'end' = position
+  let isTopLoaded: boolean | null = null
+  let isTailLoaded = false
 
   let bottomOffset: number = 0
   let topOffset: number = 0
 
-  const limit = $deviceInfo.isMobile ? 25 : 50
+  const limit = $deviceInfo.isMobile ? 20 : 50
   let queryDef = getBaseQuery()
 
   export function scrollDown (): void {
     shouldScrollToEnd = true
-    position = MessagesNavigationAnchors.LatestMessages
-
+    position = 'end'
     reinit(position, true)
+    readAllReactions()
   }
 
   export function canScrollDown (): boolean {
     return window !== undefined && window.hasNextPage()
   }
+
   $: if (
     (context?.lastView?.getTime() ?? 0) >= (context?.lastUpdate?.getTime() ?? 0) &&
     (notifications?.length ?? 0) > 0 &&
@@ -109,6 +110,12 @@
   $: query.query(
     queryDef,
     (res: Window<Message>) => {
+      if (shouldRestoreScrollTop) {
+        restore = {
+          scrollHeight: scrollDiv.scrollHeight
+        }
+        shouldRestoreScrollTop = false
+      }
       window = res
       messages = queryDef.order === SortingOrder.Ascending ? res.getResult() : res.getResult().reverse()
 
@@ -118,9 +125,20 @@
         void window.loadPrevPage()
       }
 
+      if (isTopLoaded !== true && !window.hasPrevPage()) {
+        isTopLoaded = true
+        dispatch('top-loaded')
+      } else if (isTopLoaded !== false && window.hasPrevPage()) {
+        isTopLoaded = false
+        dispatch('top-hidden')
+      }
+
+      isTailLoaded = !window.hasNextPage()
+
       groups = groupMessagesByDay(messages)
       isLoading = messages.length < limit && (res.hasNextPage() || res.hasPrevPage())
-      void onUpdate(messages)
+
+      void onMessagesReceive(messages)
     },
     {
       autoExpand: true,
@@ -160,7 +178,7 @@
         if (!isScrollInitialized) return
         const diff = node.clientHeight - prev
         prev = node.clientHeight
-        if (diff < 0 || position !== MessagesNavigationAnchors.LatestMessages) return
+        if (diff < 0 || window?.hasNextPage()) return
 
         if (atBottom || bottomOffset - diff < 30) {
           dispatch('action', { id: 'hideScrollBar' })
@@ -180,31 +198,30 @@
     }
   }
 
-  function reinit (position: MessagesNavigationAnchors, force = false): void {
-    if (prevPosition === position && !force) {
-      return
-    }
+  function reinit (position: 'start' | 'end', force = false): void {
+    if (prevPosition === position && !force) return
     prevPosition = position
-    if (position === MessagesNavigationAnchors.ConversationStart && window && !window.hasPrevPage()) {
-      if (shouldScrollToStart) {
-        contentDiv?.scrollIntoView({ behavior: 'instant', block: 'start' })
-      }
-    } else if (position === MessagesNavigationAnchors.LatestMessages && window && !window.hasNextPage()) {
+
+    if (position === 'start' && isTopLoaded) return
+
+    if (position === 'end' && isTailLoaded) {
       scrollToBottom(true)
     } else {
-      queryDef = getBaseQuery()
       window = undefined
       isPageLoading = false
+      isTailLoaded = false
+      isTopLoaded = null
       restore = undefined
       messages = []
       groups = []
       isLoading = true
       isScrollInitialized = false
+      queryDef = getBaseQuery()
     }
   }
 
   function getBaseQuery (): MessageQueryParams {
-    if (position === MessagesNavigationAnchors.ConversationStart) {
+    if (position === 'start') {
       return {
         cardId: card._id,
         order: SortingOrder.Ascending,
@@ -215,6 +232,7 @@
     initialLastUpdate = context?.lastUpdate
     const unread = initialLastView != null && initialLastUpdate != null && initialLastUpdate > initialLastView
     const order = unread && !shouldScrollToEnd ? SortingOrder.Ascending : SortingOrder.Descending
+
     return {
       cardId: card._id,
       order,
@@ -243,7 +261,7 @@
   }
 
   function shouldLoadPrevPage (): boolean {
-    return topOffset > -1 && topOffset <= 300
+    return topOffset <= 10
   }
 
   function shouldLoadNextPage (): boolean {
@@ -260,6 +278,8 @@
     }
   }
 
+  let shouldRestoreScrollTop = false
+
   async function loadPrevPage (): Promise<void> {
     if (window === undefined || isPageLoading || scrollDiv == null) return
 
@@ -267,14 +287,8 @@
       isPageLoading = true
       shouldScrollToNew = false
       atBottom = false
+      shouldRestoreScrollTop = true
       await window.loadPrevPage()
-      const topOffset = getTopOffset()
-      const shouldRestore = topOffset > -1 && topOffset <= 70
-      restore = shouldRestore
-        ? {
-            scrollHeight: scrollDiv.scrollHeight
-          }
-        : undefined
     } finally {
       isPageLoading = false
     }
@@ -300,36 +314,13 @@
   }
 
   function restoreScroll (): void {
-    if (restore == null || !$isAppFocusedStore) return
+    if (restore == null) return
     dispatch('action', { id: 'hideScrollBar' })
     const newScrollHeight = scrollDiv.scrollHeight
     scrollDiv.scrollTop = newScrollHeight - restore.scrollHeight + scrollDiv.scrollTop
     restore = undefined
   }
 
-  function checkPositionOnScroll (): void {
-    if (!isScrollInitialized || isPageLoading) return
-
-    if (position === MessagesNavigationAnchors.ConversationStart && window) {
-      if (!window.hasNextPage() && bottomOffset < 400) {
-        dispatch('change', MessagesNavigationAnchors.LatestMessages)
-      }
-      if (!window.hasPrevPage() && topOffset < 400 && topOffset > -1) {
-        dispatch('change', MessagesNavigationAnchors.ConversationStart)
-      }
-    } else if (position === MessagesNavigationAnchors.LatestMessages && window) {
-      if (!window.hasPrevPage() && topOffset < 400 && topOffset > -1) {
-        dispatch('change', MessagesNavigationAnchors.ConversationStart)
-      }
-      if (!window.hasNextPage() && bottomOffset < 400) {
-        dispatch('change', MessagesNavigationAnchors.LatestMessages)
-      }
-    }
-
-    if (topOffset < 0 && isScrollInitialized) {
-      position = MessagesNavigationAnchors.ConversationStart
-    }
-  }
   let rafId: any | null = null
   let lastScrollTop: number = 0
 
@@ -344,7 +335,6 @@
       topOffset = getTopOffset()
       updateShouldScrollToNew()
       loadMore(direction)
-      checkPositionOnScroll()
       void readAll()
       rafId = null
     })
@@ -457,7 +447,7 @@
     }
   }
 
-  async function onUpdate (res: Message[]): Promise<void> {
+  async function onMessagesReceive (res: Message[]): Promise<void> {
     if (messagesCount === res.length) return
     const prevCount = messagesCount
     messagesCount = res.length
@@ -528,7 +518,7 @@
     })
   }
 
-  $: void initializeScroll(isLoading, isLoadingBefore, separatorDiv)
+  $: void initializeScroll(isLoading, separatorDiv)
 
   function scrollToWithOffset (container: HTMLElement, target: HTMLElement, offset: number): void {
     const containerTop = container.getBoundingClientRect().top
@@ -543,28 +533,18 @@
   $: if (isScrollInitialized) {
     dispatch('loaded')
   }
-
-  async function initializeScroll (
-    isLoading: boolean,
-    isLoadingBefore: boolean,
-    separatorDiv?: HTMLDivElement | null
-  ): Promise<void> {
+  async function initializeScroll (isLoading: boolean, separatorDiv?: HTMLDivElement | null): Promise<void> {
     if (isLoading || isScrollInitialized) return
 
-    if (position === MessagesNavigationAnchors.ConversationStart) {
-      if (shouldScrollToStart) {
-        await tick()
-        contentDiv.scrollIntoView()
-      }
+    if (position === 'start') {
       isScrollInitialized = true
       shouldScrollToNew = false
       updateShouldScrollToNew()
-      dispatch('loaded')
       bottomOffset = getBottomOffset()
       topOffset = getTopOffset()
+      dispatch('loaded')
       return
     }
-    if (isLoadingBefore) return
 
     const separatorIndex =
       initialLastView !== undefined
@@ -580,14 +560,11 @@
       scrollToBottom(true)
       shouldScrollToNew = true
       atBottom = true
-      isScrollInitialized = true
-      separatorDate = undefined
       bottomOffset = getBottomOffset()
       topOffset = getTopOffset()
+      separatorDate = undefined
+      isScrollInitialized = true
       dispatch('loaded')
-      if (shouldScrollToEnd) {
-        readAllReactions()
-      }
       return
     }
 
@@ -595,12 +572,12 @@
     if (separatorDiv != null) {
       await tick() // Wait for the DOM to update
       scrollToWithOffset(scrollDiv, separatorDiv, 80)
-      setTimeout(() => {
-        isScrollInitialized = true
-      }, 10)
       updateShouldScrollToNew()
       bottomOffset = getBottomOffset()
       topOffset = getTopOffset()
+      setTimeout(() => {
+        isScrollInitialized = true
+      }, 10)
       dispatch('loaded')
     }
   }
diff --git a/plugins/communication-resources/src/components/CardMessagesSection.svelte b/plugins/communication-resources/src/components/MessagesSection.svelte
similarity index 62%
rename from plugins/communication-resources/src/components/CardMessagesSection.svelte
rename to plugins/communication-resources/src/components/MessagesSection.svelte
index cea2ce1adb..87a2ee47d5 100644
--- a/plugins/communication-resources/src/components/CardMessagesSection.svelte
+++ b/plugins/communication-resources/src/components/MessagesSection.svelte
@@ -17,43 +17,39 @@
   import { Card } from '@hcengineering/card'
   import { NotificationContext } from '@hcengineering/communication-types'
   import { createEventDispatcher, onMount } from 'svelte'
-  import { MessagesNavigationAnchors } from '@hcengineering/communication'
 
   import MessagesList from './MessagesList.svelte'
 
   export let readonly: boolean = false
   export let doc: Card
-  export let notificationContext: NotificationContext | undefined = undefined
-  export let isLoadingBefore: boolean = false
+  export let context: NotificationContext | undefined = undefined
   export let isContextLoaded: boolean = false
   export let scrollDiv: HTMLDivElement | undefined | null = undefined
   export let contentDiv: HTMLDivElement | undefined | null = undefined
   export let active: boolean = false
-  export let navigation: MessagesNavigationAnchors | string = MessagesNavigationAnchors.ConversationStart
+  export let isDefault: boolean = false
 
   const dispatch = createEventDispatcher()
 
   let list: MessagesList | undefined = undefined
 
-  let position: MessagesNavigationAnchors =
-    navigation === MessagesNavigationAnchors.LatestMessages
-      ? MessagesNavigationAnchors.LatestMessages
-      : MessagesNavigationAnchors.ConversationStart
-  let shouldScrollToStart = false
+  let position: 'start' | 'end' = isDefault ? 'end' : 'start'
+  let prevActive: boolean = false
 
-  export function navigate (id: MessagesNavigationAnchors) {
-    if (id !== MessagesNavigationAnchors.ConversationStart) {
-      shouldScrollToStart = false
-    } else {
-      shouldScrollToStart = true
-      contentDiv?.scrollIntoView({ behavior: 'instant', block: 'start' })
+  $: if (active !== prevActive) {
+    if (!active) {
+      position = 'start'
     }
-    position = id
+    prevActive = active
+  }
+
+  export function navigate () {
+    position = 'end'
+    list?.scrollDown()
   }
 
   export function scrollDown (): void {
-    shouldScrollToStart = false
-    position = MessagesNavigationAnchors.LatestMessages
+    position = 'end'
     list?.scrollDown()
   }
 
@@ -66,9 +62,9 @@
   }
 
   onMount(() => {
-    if (active && navigation === MessagesNavigationAnchors.LatestMessages) {
-      position = MessagesNavigationAnchors.LatestMessages
+    if (isDefault) {
       dispatch('action', { id: 'overlay', show: true })
+      position = 'end'
     }
   })
 </script>
@@ -79,12 +75,12 @@
       bind:this={list}
       card={doc}
       {readonly}
-      context={notificationContext}
       {scrollDiv}
       {contentDiv}
-      bind:position
-      shouldScrollToStart={active && position === MessagesNavigationAnchors.ConversationStart && shouldScrollToStart}
-      {isLoadingBefore}
+      {position}
+      {context}
+      on:top-loaded
+      on:top-hidden
       on:change
       on:action
       on:loaded={() => {
diff --git a/plugins/communication-resources/src/components/input/AppletPreview.svelte b/plugins/communication-resources/src/components/input/AppletPreview.svelte
new file mode 100644
index 0000000000..331a347888
--- /dev/null
+++ b/plugins/communication-resources/src/components/input/AppletPreview.svelte
@@ -0,0 +1,47 @@
+<!--
+// Copyright © 2025 Hardcore Engineering Inc.
+//
+// Licensed under the Eclipse Public License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License. You may
+// obtain a copy of the License at https://www.eclipse.org/legal/epl-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//
+// See the License for the specific language governing permissions and
+// limitations under the License.
+-->
+
+<script lang="ts">
+  import { Component, showPopup } from '@hcengineering/ui'
+  import { Applet } from '@hcengineering/communication'
+  import { createEventDispatcher } from 'svelte'
+
+  import { AppletDraft } from '../../types'
+
+  export let applet: AppletDraft
+  export let model: Applet
+  export let editing: boolean
+
+  const dispatch = createEventDispatcher()
+</script>
+
+<Component
+  is={model.previewComponent}
+  props={{
+    applet: model,
+    params: applet.params,
+    editing
+  }}
+  on:change={() => {
+    showPopup(model.createComponent, { applet: model, params: applet.params }, 'center', (result) => {
+      if (result != null) {
+        dispatch('change', { ...applet, params: result })
+      }
+    })
+  }}
+  on:delete={() => {
+    dispatch('delete', applet.id)
+  }}
+/>
diff --git a/plugins/communication-resources/src/components/input/AttachmentsHeader.svelte b/plugins/communication-resources/src/components/input/AttachmentsHeader.svelte
new file mode 100644
index 0000000000..e45c9ccaca
--- /dev/null
+++ b/plugins/communication-resources/src/components/input/AttachmentsHeader.svelte
@@ -0,0 +1,97 @@
+<!--
+// Copyright © 2025 Hardcore Engineering Inc.
+//
+// Licensed under the Eclipse Public License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License. You may
+// obtain a copy of the License at https://www.eclipse.org/legal/epl-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//
+// See the License for the specific language governing permissions and
+// limitations under the License.
+-->
+<script lang="ts">
+  import { createEventDispatcher } from 'svelte'
+  import { getClient } from '@hcengineering/presentation'
+  import { Attachment } from '@hcengineering/communication-types'
+  import { Loading } from '@hcengineering/ui'
+
+  import { AppletDraft, BlobDraft, LinkPreviewDraft } from '../../types'
+  import communication from '../../plugin'
+
+  import AppletPreview from './AppletPreview.svelte'
+  import BlobPreview from './BlobPreview.svelte'
+  import LinkPreview from './LinkPreview.svelte'
+
+  export let blobs: BlobDraft[] = []
+  export let links: LinkPreviewDraft[] = []
+  export let applets: AppletDraft[] = []
+  export let currentAttachments: Attachment[] = []
+  export let progress = false
+
+  const dispatch = createEventDispatcher()
+  const client = getClient()
+  const appletModels = client.getModel().findAllSync(communication.class.Applet, {})
+</script>
+
+<div class="flex-row-center attachments-list scroll-divider-color flex-gap-2 mt-2">
+  {#if progress}
+    <div class="flex p-3">
+      <Loading />
+    </div>
+  {/if}
+
+  {#each applets as applet (applet.id)}
+    {@const model = appletModels.find((it) => it._id === applet.appletId)}
+    {#if model}
+      <AppletPreview
+        {applet}
+        {model}
+        editing={currentAttachments.some((it) => it.id === applet.id)}
+        on:change={(e) => dispatch('change-applet', e.detail)}
+        on:delete={(e) => dispatch('delete-applet', e.detail)}
+      />
+    {/if}
+  {/each}
+
+  {#if applets.length > 0 && (blobs.length > 0 || links.length > 0)}
+    <div class="divider" />
+  {/if}
+
+  {#each blobs as blob (blob.blobId)}
+    <BlobPreview
+      {blob}
+      on:delete={(e) => {
+        dispatch('delete-blob', e.detail)
+      }}
+    />
+  {/each}
+
+  {#if links.length > 0 && (blobs.length > 0 || applets.length > 0)}
+    <div class="divider" />
+  {/if}
+
+  {#each links as link}
+    <LinkPreview
+      {link}
+      on:delete={(e) => {
+        dispatch('delete-link', e.detail)
+      }}
+    />
+  {/each}
+</div>
+
+<style lang="scss">
+  .divider {
+    height: 100%;
+    border-left: 1px solid var(--theme-divider-color);
+  }
+  .attachments-list {
+    overflow-x: auto;
+    overflow-y: hidden;
+    display: flex;
+    gap: 0.5rem;
+  }
+</style>
diff --git a/plugins/communication-resources/src/components/input/BlobPreview.svelte b/plugins/communication-resources/src/components/input/BlobPreview.svelte
new file mode 100644
index 0000000000..f6957e4693
--- /dev/null
+++ b/plugins/communication-resources/src/components/input/BlobPreview.svelte
@@ -0,0 +1,43 @@
+<!--
+// Copyright © 2025 Hardcore Engineering Inc.
+//
+// Licensed under the Eclipse Public License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License. You may
+// obtain a copy of the License at https://www.eclipse.org/legal/epl-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//
+// See the License for the specific language governing permissions and
+// limitations under the License.
+-->
+<script lang="ts">
+  import { createEventDispatcher } from 'svelte'
+  import { AttachmentPresenter } from '@hcengineering/attachment-resources'
+
+  import { BlobDraft } from '../../types'
+
+  export let blob: BlobDraft
+
+  const dispatch = createEventDispatcher()
+</script>
+
+<div class="item flex">
+  <AttachmentPresenter
+    value={{
+      file: blob.blobId,
+      name: blob.fileName,
+      type: blob.mimeType,
+      size: blob.size,
+      metadata: blob.metadata
+    }}
+    showPreview
+    removable
+    on:remove={(result) => {
+      if (result !== undefined) {
+        dispatch('delete', blob.blobId)
+      }
+    }}
+  />
+</div>
diff --git a/plugins/communication-resources/src/components/input/LinkPreview.svelte b/plugins/communication-resources/src/components/input/LinkPreview.svelte
new file mode 100644
index 0000000000..1f72aa878e
--- /dev/null
+++ b/plugins/communication-resources/src/components/input/LinkPreview.svelte
@@ -0,0 +1,32 @@
+<script lang="ts">
+  import { createEventDispatcher } from 'svelte'
+  import { LinkPreviewCard } from '@hcengineering/attachment-resources'
+
+  import { LinkPreviewDraft } from '../../types'
+
+  export let link: LinkPreviewDraft
+
+  const dispatch = createEventDispatcher()
+</script>
+
+<div class="item flex">
+  <LinkPreviewCard
+    value={{
+      url: link.url,
+      host: link.host,
+      title: link.title,
+      description: link.description,
+      hostname: link.siteName,
+      image: link.previewImage?.url,
+      imageWidth: link.previewImage?.width,
+      imageHeight: link.previewImage?.height,
+      icon: link.iconUrl
+    }}
+    on:remove={(event) => {
+      const result = event.detail
+      if (result !== undefined) {
+        dispatch('delete', link.url)
+      }
+    }}
+  />
+</div>
diff --git a/plugins/communication-resources/src/components/message/MessageInput.svelte b/plugins/communication-resources/src/components/input/MessageInput.svelte
similarity index 52%
rename from plugins/communication-resources/src/components/message/MessageInput.svelte
rename to plugins/communication-resources/src/components/input/MessageInput.svelte
index 945cd3bb87..530a2f2e8f 100644
--- a/plugins/communication-resources/src/components/message/MessageInput.svelte
+++ b/plugins/communication-resources/src/components/input/MessageInput.svelte
@@ -14,35 +14,18 @@
 -->
 
 <script lang="ts">
-  import { AttachmentPresenter, LinkPreviewCard } from '@hcengineering/attachment-resources'
   import { Card } from '@hcengineering/card'
-  import { isAppletAttachment, isBlobAttachment, isLinkPreviewAttachment } from '@hcengineering/communication-shared'
-  import {
-    AppletParams,
-    AttachmentID,
-    BlobAttachment,
-    BlobParams,
-    LinkPreviewParams,
-    linkPreviewType,
-    Message,
-    MessageID
-  } from '@hcengineering/communication-types'
+  import { isAppletAttachment, isBlobAttachment } from '@hcengineering/communication-shared'
+  import { BlobParams, LinkPreviewParams, Message, MessageID, BlobID } from '@hcengineering/communication-types'
   import { generateId, getCurrentAccount, Markup, RateLimiter, Ref } from '@hcengineering/core'
   import { getResource, setPlatformStatus, unknownError } from '@hcengineering/platform'
   import { clearTyping, setTyping } from '@hcengineering/presence-resources'
-  import {
-    deleteFile,
-    getClient,
-    getCommunicationClient,
-    isLinkPreviewEnabled,
-    uploadFile
-  } from '@hcengineering/presentation'
+  import { deleteFile, getClient, isLinkPreviewEnabled, uploadFile } from '@hcengineering/presentation'
   import { areEqualMarkups, isEmptyMarkup } from '@hcengineering/text'
-  import { Component, showPopup, ThrottledCaller } from '@hcengineering/ui'
+  import { showPopup, ThrottledCaller } from '@hcengineering/ui'
   import { FileUploadCallbackParams, getUploadHandlers, UploadHandlerDefinition } from '@hcengineering/uploader'
   import { createEventDispatcher, tick } from 'svelte'
 
-  import { Analytics } from '@hcengineering/analytics'
   import { getDraft, getEmptyDraft, messageToDraft, removeDraft, saveDraft } from '../../draft'
   import communication from '../../plugin'
   import { messageEditingStore } from '../../stores'
@@ -58,25 +41,27 @@
   import TextInput from '../TextInput.svelte'
   import TypingPresenter from '../TypingPresenter.svelte'
   import IconAttach from '../icons/Attach.svelte'
+  import AttachmentsHeader from '../input/AttachmentsHeader.svelte'
+  import { createMessage, updateMessage } from '../../actions'
 
   export let card: Card
   export let message: Message | undefined = undefined
-  export let title: string = ''
   export let onCancel: (() => void) | undefined = undefined
 
   const throttle = new ThrottledCaller(500)
   const dispatch = createEventDispatcher()
-  const communicationClient = getCommunicationClient()
   const client = getClient()
   const acc = getCurrentAccount()
 
-  const maxLinkPreviewCount = 4
+  const maxLinkPreviewCount = 5
   const previewUrls = new Map<string, boolean>()
   const linksData = new Map<string, LinkPreviewParams | null>()
 
   let prevCard: Ref<Card> | undefined = card._id
   let prevMessage: MessageID | undefined = message?.id
-  let draft: MessageDraft = message != null ? messageToDraft(message) : getDraft(card._id)
+
+  let markup = message != null ? messageToDraft(message).content : getDraft(card._id).content
+  let attachmentsDraft: Omit<MessageDraft, 'content'> = message != null ? messageToDraft(message) : getDraft(card._id)
 
   let inputElement: HTMLInputElement
   let refContainer: HTMLElement | undefined | null = undefined
@@ -93,19 +78,21 @@
     initDraft()
   }
 
-  $: _saveDraft(draft)
+  $: _saveDraft(markup, attachmentsDraft)
 
   function initDraft (): void {
-    draft = message != null ? messageToDraft(message) : getDraft(card._id)
+    const draft = message != null ? messageToDraft(message) : getDraft(card._id)
+    attachmentsDraft = draft
+    markup = draft.content
     previewUrls.clear()
   }
 
-  function _saveDraft (draft: MessageDraft): void {
+  function _saveDraft (markup: Markup, draft: Omit<MessageDraft, 'content'>): void {
     for (const link of draft.links) {
       previewUrls.set(link.url, true)
     }
     if (message === undefined) {
-      saveDraft(card._id, draft)
+      saveDraft(card._id, { ...draft, content: markup })
     }
   }
 
@@ -119,12 +106,12 @@
     }
 
     const markup = event.detail
-    const blobsToLoad = draft.blobs
-    const linksToLoad = draft.links
-    const appletsToLoad = draft.applets
+    const blobsToLoad = attachmentsDraft.blobs
+    const linksToLoad = attachmentsDraft.links
+    const appletsToLoad = attachmentsDraft.applets
     const urlsToLoad = Array.from(previewUrls.keys()).filter((it) => previewUrls.get(it) === true)
 
-    draft = getEmptyDraft()
+    attachmentsDraft = getEmptyDraft()
     previewUrls.clear()
     if (message === undefined) {
       removeDraft(card._id)
@@ -133,155 +120,16 @@
     const markdown = toMarkdown(markup)
 
     if (message === undefined) {
-      await createMessage(markdown, blobsToLoad, linksToLoad, urlsToLoad, appletsToLoad)
+      await createMessage(card, markdown, blobsToLoad, appletsToLoad, applets, linksToLoad, urlsToLoad, linksData)
       dispatch('sent')
     } else {
-      await editMessage(message, markdown, blobsToLoad, linksToLoad, appletsToLoad)
+      await updateMessage(card, message, markdown, blobsToLoad, appletsToLoad, applets, linksToLoad)
+      dispatch('edited')
     }
 
     void clearTyping(acc.primarySocialId, card._id)
   }
 
-  async function attachApplets (messageId: MessageID, appletDrafts: AppletDraft[]): Promise<void> {
-    if (appletDrafts.length === 0) return
-    const toAttach: AppletDraft[] = []
-    for (const appletDraft of appletDrafts) {
-      try {
-        const ap = applets.find((it) => it._id === appletDraft.appletId)
-        if (ap?.createFn == null) {
-          toAttach.push(appletDraft)
-          continue
-        }
-        const r = await getResource(ap.createFn)
-        await r(card, messageId, appletDraft.params)
-        toAttach.push(appletDraft)
-      } catch (err: any) {
-        Analytics.handleError(err)
-      }
-    }
-
-    if (toAttach.length > 0) {
-      void communicationClient.attachmentPatch<AppletParams>(card._id, messageId, {
-        add: toAttach.map((it) => ({
-          mimeType: it.mimeType,
-          params: it.params
-        }))
-      })
-    }
-  }
-
-  async function createMessage (
-    markdown: string,
-    blobs: (BlobParams & { mimeType: string })[],
-    links: LinkPreviewParams[],
-    urlsToLoad: string[],
-    appletDrafts: AppletDraft[]
-  ): Promise<void> {
-    const { messageId } = await communicationClient.createMessage(card._id, card._class, markdown)
-    void client.update(card, {}, false, Date.now())
-
-    void attachApplets(messageId, appletDrafts)
-
-    if (blobs.length > 0) {
-      void communicationClient.attachmentPatch<BlobParams>(card._id, messageId, {
-        add: blobs.map((it) => ({
-          id: it.blobId as any as AttachmentID,
-          mimeType: it.mimeType,
-          params: it
-        }))
-      })
-    }
-
-    if (links.length > 0) {
-      void communicationClient.attachmentPatch<LinkPreviewParams>(card._id, messageId, {
-        add: links.map((it) => ({
-          mimeType: linkPreviewType,
-          params: it
-        }))
-      })
-    }
-
-    for (const url of urlsToLoad) {
-      if (links.some((it) => it.url === url)) continue
-      const fetchedData = linksData.get(url)
-      if (fetchedData === null) continue
-      const params = fetchedData ?? (await loadLinkPreviewParams(url))
-      if (params === undefined) continue
-      void communicationClient.attachmentPatch<LinkPreviewParams>(card._id, messageId, {
-        add: [
-          {
-            mimeType: linkPreviewType,
-            params
-          }
-        ]
-      })
-    }
-  }
-
-  async function editMessage (
-    message: Message,
-    markdown: string,
-    blobs: (BlobParams & { mimeType: string })[],
-    links: LinkPreviewParams[],
-    appletDrafts: AppletDraft[]
-  ): Promise<void> {
-    await communicationClient.updateMessage(card._id, message.id, markdown)
-
-    const attachBlobs = blobs.filter(
-      (b) => !message.attachments.some((it) => isBlobAttachment(it) && it.params.blobId === b.blobId)
-    )
-
-    void attachApplets(
-      message.id,
-      appletDrafts.filter((a) => !message.attachments.some((it) => it.id === a.id))
-    )
-
-    if (attachBlobs.length > 0) {
-      void communicationClient.attachmentPatch<BlobParams>(card._id, message.id, {
-        add: attachBlobs.map((it) => ({
-          id: it.blobId as any as AttachmentID,
-          mimeType: it.mimeType,
-          params: it
-        }))
-      })
-    }
-
-    const detachBlobs = message.attachments.filter(
-      (it) => isBlobAttachment(it) && !blobs.some((b) => b.blobId === it.params.blobId)
-    ) as BlobAttachment[]
-    if (detachBlobs.length > 0) {
-      detachBlobs.forEach((it) => {
-        void deleteFile(it.params.blobId)
-      })
-      void communicationClient.attachmentPatch(card._id, message.id, {
-        remove: detachBlobs.map((it) => it.id)
-      })
-    }
-
-    const detachApplets = message.attachments.filter(
-      (it) => isAppletAttachment(it) && !appletDrafts.some((a) => a.id === it.id)
-    )
-
-    if (detachApplets.length > 0) {
-      void communicationClient.attachmentPatch(card._id, message.id, {
-        remove: detachApplets.map((it) => it.id)
-      })
-    }
-
-    const attachLinks = links.filter(
-      (l) => !message.attachments.some((it) => isLinkPreviewAttachment(it) && it.params.url === l.url)
-    )
-
-    void communicationClient.attachmentPatch(card._id, message.id, {
-      add: attachLinks.map((it) => ({
-        mimeType: linkPreviewType,
-        params: it
-      }))
-    })
-
-    dispatch('edited')
-  }
-
   async function fileSelected (): Promise<void> {
     progress = true
     await tick()
@@ -310,9 +158,9 @@
       metadata
     }
 
-    draft = {
-      ...draft,
-      blobs: [...draft.blobs, blob]
+    attachmentsDraft = {
+      ...attachmentsDraft,
+      blobs: [...attachmentsDraft.blobs, blob]
     }
   }
 
@@ -328,14 +176,14 @@
 
   async function handleCancel (): Promise<void> {
     onCancel?.()
-    for (const blob of draft.blobs) {
+    for (const blob of attachmentsDraft.blobs) {
       const fromMessage =
         message?.attachments.some((it) => isBlobAttachment(it) && it.params.blobId === blob.blobId) ?? false
       if (!fromMessage) {
         void deleteFile(blob.blobId)
       }
     }
-    draft = getEmptyDraft()
+    attachmentsDraft = getEmptyDraft()
   }
 
   async function loadFiles (evt: ClipboardEvent): Promise<void> {
@@ -420,9 +268,9 @@
 
     for (const url of removedUrls) {
       previewUrls.delete(url)
-      draft = {
-        ...draft,
-        links: draft.links.filter((it) => it.url !== url)
+      attachmentsDraft = {
+        ...attachmentsDraft,
+        links: attachmentsDraft.links.filter((it) => it.url !== url)
       }
     }
     if (newUrls.size > 0) {
@@ -431,17 +279,17 @@
   }
 
   async function loadLinks (urls: string[]): Promise<void> {
-    const draftId = draft._id
+    const draftId = attachmentsDraft._id
 
     for (const url of urls) {
       try {
         const data = linksData.get(url) ?? (await loadLinkPreviewParams(url))
         linksData.set(url, data ?? null)
         if (data === undefined || !previewUrls.has(url)) continue
-        if (draftId !== draft._id) return
-        draft = {
-          ...draft,
-          links: [...draft.links, data]
+        if (draftId !== attachmentsDraft._id) return
+        attachmentsDraft = {
+          ...attachmentsDraft,
+          links: [...attachmentsDraft.links, data]
         }
       } catch (err: any) {
         void setPlatformStatus(unknownError(err))
@@ -450,16 +298,13 @@
   }
 
   async function onUpdate (event: CustomEvent<Markup>): Promise<void> {
-    draft = {
-      ...draft,
-      content: event.detail
-    }
+    markup = event.detail
     const visiblePreviewUrls = Array.from(previewUrls.keys()).filter((it) => previewUrls.get(it) === true)
     if (isLinkPreviewEnabled() && visiblePreviewUrls.length < maxLinkPreviewCount) {
       updateLinkPreview()
     }
     if (message !== undefined) return
-    if (!isEmptyMarkup(draft.content)) {
+    if (!isEmptyMarkup(markup)) {
       throttle.call(() => {
         void setTyping(acc.primarySocialId, card.peerId ? `peer:${card.peerId}` : card._id)
       })
@@ -467,12 +312,12 @@
   }
 
   function isEmptyDraft (): boolean {
-    return isEmptyMarkup(draft.content) && draft.blobs.length === 0 && draft.applets.length === 0
+    return isEmptyMarkup(markup) && attachmentsDraft.blobs.length === 0 && attachmentsDraft.applets.length === 0
   }
 
-  function hasChanges (blobs: BlobParams[], message: Message | undefined, appletDrafts: any[]): boolean {
+  function hasChanges (blobs: BlobParams[], message: Message | undefined, appletDrafts: AppletDraft[]): boolean {
     if (isEmptyDraft()) return false
-    if (message === undefined) return blobs.length > 0 || !isEmptyMarkup(draft.content) || appletDrafts.length > 0
+    if (message === undefined) return blobs.length > 0 || !isEmptyMarkup(markup) || appletDrafts.length > 0
     const messageBlobs = message?.attachments.filter(isBlobAttachment) ?? []
     const messageApplets = message?.attachments.filter(isAppletAttachment) ?? []
 
@@ -481,7 +326,7 @@
     if (messageApplets.length !== appletDrafts.length) return true
     if (messageApplets.some((it) => !appletDrafts.some((a) => a.id === it.id))) return true
 
-    return !areEqualMarkups(draft.content, toMarkup(message.content))
+    return !areEqualMarkups(markup, toMarkup(message.content))
   }
 
   const applets = client.getModel().findAllSync(communication.class.Applet, {})
@@ -492,10 +337,10 @@
       action: () => {
         showPopup(applet.createComponent, { applet }, 'center', (result) => {
           if (result != null) {
-            draft = {
-              ...draft,
+            attachmentsDraft = {
+              ...attachmentsDraft,
               applets: [
-                ...draft.applets,
+                ...attachmentsDraft.applets,
                 { id: generateId(), mimeType: applet.type, appletId: applet._id, params: result }
               ]
             }
@@ -528,9 +373,9 @@
 
       // In case we are in the same card, update the draft in memory
       if (cardId === card._id) {
-        draft = {
-          ...draft,
-          blobs: [...draft.blobs, blob]
+        attachmentsDraft = {
+          ...attachmentsDraft,
+          blobs: [...attachmentsDraft.blobs, blob]
         }
       }
     }
@@ -564,6 +409,43 @@
     }
     return false
   }
+
+  function onChangeApplet (event: CustomEvent<AppletDraft>): void {
+    attachmentsDraft = {
+      ...attachmentsDraft,
+      applets: attachmentsDraft.applets.map((it) => (it.id === event.detail.id ? event.detail : it))
+    }
+  }
+
+  function onDeleteApplet (event: CustomEvent<string>): void {
+    attachmentsDraft = {
+      ...attachmentsDraft,
+      applets: attachmentsDraft.applets.filter((it) => it.id !== event.detail)
+    }
+  }
+
+  function onDeleteBlob (event: CustomEvent<BlobID>): void {
+    const blobId = event.detail
+    attachmentsDraft = {
+      ...attachmentsDraft,
+      blobs: attachmentsDraft.blobs.filter((it) => it.blobId !== blobId)
+    }
+
+    if (message == null || !message.attachments.some((it) => isBlobAttachment(it) && it.params.blobId === blobId)) {
+      void deleteFile(blobId)
+    }
+  }
+
+  function onDeleteLink (event: CustomEvent<string>): void {
+    attachmentsDraft = {
+      ...attachmentsDraft,
+      links: attachmentsDraft.links.filter((it) => it.url !== event.detail)
+    }
+    previewUrls.set(event.detail, false)
+  }
+
+  $: blobs = attachmentsDraft.blobs
+  $: ch = hasChanges(blobs, undefined, [])
 </script>
 
 <!-- svelte-ignore a11y-click-events-have-key-events -->
@@ -586,11 +468,10 @@
     on:change={fileSelected}
   />
   <TextInput
-    content={draft.content}
-    placeholder={title !== '' ? communication.string.MessageIn : undefined}
-    placeholderParams={title !== '' ? { title } : undefined}
+    content={markup}
+    placeholder={message == null ? communication.string.WriteMessageEllipsis : communication.string.EditMessageEllipsis}
     loading={progress}
-    hasChanges={hasChanges(draft.blobs, message, draft.applets)}
+    hasChanges={ch}
     actions={[...defaultMessageInputActions, attachAction, ...uploadActions, ...appletActions]}
     on:submit={handleSubmit}
     on:update={onUpdate}
@@ -600,105 +481,18 @@
     onKeyDown={handleKeyDown}
   >
     <div slot="header" class="header">
-      {#if draft.blobs.length > 0 || draft.links.length > 0 || draft.applets.length > 0}
-        <div class="flex-row-center files-list scroll-divider-color flex-gap-2 mt-2">
-          {#each draft.applets as appletDraft}
-            {@const applet = applets.find((it) => it._id === appletDraft.appletId)}
-            {#if applet}
-              <Component
-                is={applet.previewComponent}
-                props={{
-                  applet,
-                  params: appletDraft.params,
-                  editing: message !== undefined && message.attachments.some((it) => it.id === appletDraft.id)
-                }}
-                on:change={() => {
-                  showPopup(applet.createComponent, { applet, params: appletDraft.params }, 'center', (result) => {
-                    if (result != null) {
-                      draft = {
-                        ...draft,
-                        applets: draft.applets.map((it) => {
-                          if (it.id === appletDraft.id) {
-                            return { ...it, params: result }
-                          }
-                          return it
-                        })
-                      }
-                    }
-                  })
-                }}
-                on:delete={() => {
-                  draft = {
-                    ...draft,
-                    applets: draft.applets.filter((it) => it.id !== appletDraft.id)
-                  }
-                }}
-              />
-            {/if}
-          {/each}
-          {#each draft.blobs as attachedBlob (attachedBlob.blobId)}
-            <div class="item flex">
-              <AttachmentPresenter
-                value={{
-                  file: attachedBlob.blobId,
-                  name: attachedBlob.fileName,
-                  type: attachedBlob.mimeType,
-                  size: attachedBlob.size,
-                  metadata: attachedBlob.metadata
-                }}
-                showPreview
-                removable
-                on:remove={(result) => {
-                  if (result !== undefined) {
-                    draft = {
-                      ...draft,
-                      blobs: draft.blobs.filter((it) => it.blobId !== attachedBlob.blobId)
-                    }
-
-                    if (
-                      !message?.attachments?.some(
-                        (it) => isBlobAttachment(it) && it.params.blobId === attachedBlob.blobId
-                      )
-                    ) {
-                      void deleteFile(attachedBlob.blobId)
-                    }
-                  }
-                }}
-              />
-            </div>
-          {/each}
-          {#if draft.links.length > 0 && draft.blobs.length > 0}
-            <div class="divider" />
-          {/if}
-
-          {#each draft.links as link}
-            <div class="item flex">
-              <LinkPreviewCard
-                value={{
-                  url: link.url,
-                  host: link.host,
-                  title: link.title,
-                  description: link.description,
-                  hostname: link.siteName,
-                  image: link.previewImage?.url,
-                  imageWidth: link.previewImage?.width,
-                  imageHeight: link.previewImage?.height,
-                  icon: link.iconUrl
-                }}
-                on:remove={(event) => {
-                  const result = event.detail
-                  if (result !== undefined) {
-                    previewUrls.set(result.url, false)
-                    draft = {
-                      ...draft,
-                      links: draft.links.filter((it) => it.url !== result.url)
-                    }
-                  }
-                }}
-              />
-            </div>
-          {/each}
-        </div>
+      {#if attachmentsDraft.blobs.length > 0 || attachmentsDraft.links.length > 0 || attachmentsDraft.applets.length > 0 || progress}
+        <AttachmentsHeader
+          blobs={attachmentsDraft.blobs}
+          links={attachmentsDraft.links}
+          applets={attachmentsDraft.applets}
+          currentAttachments={message?.attachments ?? []}
+          {progress}
+          on:change-applet={onChangeApplet}
+          on:delete-applet={onDeleteApplet}
+          on:delete-blob={onDeleteBlob}
+          on:delete-link={onDeleteLink}
+        />
       {/if}
     </div>
   </TextInput>
@@ -715,15 +509,4 @@
     min-width: 0;
     width: 100%;
   }
-
-  .divider {
-    height: 100%;
-    border-left: 1px solid var(--theme-divider-color);
-  }
-  .files-list {
-    overflow-x: auto;
-    overflow-y: hidden;
-    display: flex;
-    gap: 0.5rem;
-  }
 </style>
diff --git a/plugins/communication-resources/src/components/message/MessageBody.svelte b/plugins/communication-resources/src/components/message/MessageBody.svelte
index 31532b6e5a..5f8ae41194 100644
--- a/plugins/communication-resources/src/components/message/MessageBody.svelte
+++ b/plugins/communication-resources/src/components/message/MessageBody.svelte
@@ -21,7 +21,7 @@
   import { Label } from '@hcengineering/ui'
 
   import communication from '../../plugin'
-  import MessageInput from './MessageInput.svelte'
+  import MessageInput from '../input/MessageInput.svelte'
   import MessageContentViewer from './MessageContentViewer.svelte'
   import MessageFooter from './MessageFooter.svelte'
   import {
diff --git a/plugins/communication-resources/src/components/message/MessageFooter.svelte b/plugins/communication-resources/src/components/message/MessageFooter.svelte
index 1f1714454c..56c1739c14 100644
--- a/plugins/communication-resources/src/components/message/MessageFooter.svelte
+++ b/plugins/communication-resources/src/components/message/MessageFooter.svelte
@@ -14,7 +14,7 @@
 -->
 
 <script lang="ts">
-  import { getClient, getCommunicationClient } from '@hcengineering/presentation'
+  import { createQuery, getClient, getCommunicationClient } from '@hcengineering/presentation'
   import cardPlugin, { Card } from '@hcengineering/card'
   import { getCurrentAccount, Ref } from '@hcengineering/core'
   import { AttachmentPreview, LinkPreview } from '@hcengineering/attachment-resources'
@@ -34,6 +34,22 @@
   const me = getCurrentAccount()
   const communicationClient = getCommunicationClient()
   const client = getClient()
+  const threadCardsQuery = createQuery()
+
+  let threadCards: Card[] = []
+
+  $: if (showThreads && message.threads.length > 0) {
+    threadCardsQuery.query(
+      cardPlugin.class.Card,
+      { _id: { $in: message.threads.map((it) => it.threadId) } },
+      (res) => {
+        threadCards = res
+      },
+      { limit: 1 }
+    )
+  } else {
+    threadCardsQuery.unsubscribe()
+  }
 
   function canReply (): boolean {
     return message.type !== MessageType.Activity && message.extra?.threadRoot !== true
@@ -137,7 +153,11 @@
 {#if showThreads && message.threads.length > 0}
   <div class="message__replies overflow-label">
     {#each message.threads as thread (thread.threadId)}
-      <MessageThread {thread} on:click={handleReply} />
+      <MessageThread
+        {thread}
+        threadCard={threadCards.find((it) => it._id === thread.threadId)}
+        on:click={handleReply}
+      />
     {/each}
   </div>
 {/if}
diff --git a/plugins/communication-resources/src/components/thread/Thread.svelte b/plugins/communication-resources/src/components/thread/Thread.svelte
index e0079a332e..a2f9ec969b 100644
--- a/plugins/communication-resources/src/components/thread/Thread.svelte
+++ b/plugins/communication-resources/src/components/thread/Thread.svelte
@@ -14,9 +14,8 @@
 -->
 
 <script lang="ts">
-  import { createQuery } from '@hcengineering/presentation'
   import { Thread } from '@hcengineering/communication-types'
-  import cardPlugin, { Card } from '@hcengineering/card'
+  import { Card } from '@hcengineering/card'
   import { createEventDispatcher } from 'svelte'
 
   import ThreadCollaborators from './ThreadCollaborators.svelte'
@@ -26,29 +25,10 @@
   import ThreadTitle from './ThreadTitle.svelte'
 
   export let thread: Thread
+  export let threadCard: Card | undefined = undefined
 
   const dispatch = createEventDispatcher()
-  const threadCardQuery = createQuery()
 
-  let threadCard: Card | undefined
-
-  $: if (thread?.threadId !== undefined) {
-    threadCardQuery.query(
-      cardPlugin.class.Card,
-      { _id: thread.threadId },
-      (res) => {
-        threadCard = res[0]
-      },
-      { limit: 1 }
-    )
-  } else {
-    threadCard = undefined
-    threadCardQuery.unsubscribe()
-  }
-
-  $: if (thread?.threadId !== threadCard?._id) {
-    threadCard = undefined
-  }
   let clientWidth = 0
 </script>
 
@@ -65,8 +45,8 @@
       </span>
     {/if}
 
-    {#if threadCard && clientWidth > 300}
-      <ThreadTags card={threadCard} />
+    {#if clientWidth > 300}
+      <ThreadTags type={thread.threadType} card={threadCard} />
     {/if}
 
     {#if threadCard && clientWidth > 300}
diff --git a/plugins/communication-resources/src/components/thread/ThreadTags.svelte b/plugins/communication-resources/src/components/thread/ThreadTags.svelte
index aa1cc8fcea..5d663a8b51 100644
--- a/plugins/communication-resources/src/components/thread/ThreadTags.svelte
+++ b/plugins/communication-resources/src/components/thread/ThreadTags.svelte
@@ -12,10 +12,26 @@
 <!-- limitations under the License. -->
 
 <script lang="ts">
-  import cardPlugin, { Card } from '@hcengineering/card'
+  import cardPlugin, { Card, MasterTag } from '@hcengineering/card'
   import { Component } from '@hcengineering/ui'
+  import { CardType } from '@hcengineering/communication-types'
+  import { getClient } from '@hcengineering/presentation'
 
-  export let card: Card
+  export let card: Card | undefined = undefined
+  export let type: CardType
+
+  const client = getClient()
+  const hierarchy = client.getHierarchy()
+
+  $: clazz = hierarchy.findClass(type) as MasterTag | undefined
 </script>
 
-<Component is={cardPlugin.component.CardTagsColored} props={{ value: card }} />
+{#if card}
+  <Component is={cardPlugin.component.CardTagsColored} props={{ value: card }} showLoading={false} />
+{:else if clazz}
+  <Component
+    is={cardPlugin.component.CardTagColored}
+    props={{ labelIntl: clazz.label, color: clazz.background }}
+    showLoading={false}
+  />
+{/if}
diff --git a/plugins/communication-resources/src/draft.ts b/plugins/communication-resources/src/draft.ts
index 0caa29aa45..f85183bd90 100644
--- a/plugins/communication-resources/src/draft.ts
+++ b/plugins/communication-resources/src/draft.ts
@@ -90,7 +90,7 @@ export function saveDraft (card: Ref<Card>, draft: MessageDraft, force = false):
   } else {
     timer = setTimeout(() => {
       localStorage.setItem(key, JSON.stringify(draft))
-    }, 1000)
+    }, 3000)
   }
 }
 
diff --git a/plugins/communication-resources/src/index.ts b/plugins/communication-resources/src/index.ts
index c7143873a7..feb0df38e2 100644
--- a/plugins/communication-resources/src/index.ts
+++ b/plugins/communication-resources/src/index.ts
@@ -15,7 +15,6 @@
 
 import { type Resources } from '@hcengineering/platform'
 
-import CardMessagesSection from './components/CardMessagesSection.svelte'
 import PollPresenter from './components/poll/PollPresenter.svelte'
 import CreatePoll from './components/poll/CreatePoll.svelte'
 import PollPreview from './components/poll/PollPreview.svelte'
@@ -47,16 +46,16 @@ export * from './stores'
 export { defaultMessageInputActions } from './utils'
 
 export { default as MessagePresenter } from './components/message/MessagePresenter.svelte'
-export { default as MessageInput } from './components/message/MessageInput.svelte'
+export { default as MessageInput } from './components/input/MessageInput.svelte'
 export { default as ActivityMessageViewer } from './components/message/ActivityMessageViewer.svelte'
 export { default as AttachmentsPreview } from './components/AttachmentsPreview.svelte'
 export { default as MessagePreview } from './components/MessagePreview.svelte'
 export { default as ExtendedMessagePreview } from './components/preview/ExtendedMessagePreview.svelte'
 export { default as PreviewTemplate } from './components/preview/PreviewTemplate.svelte'
+export { default as MessagesSection } from './components/MessagesSection.svelte'
 
 export default async (): Promise<Resources> => ({
   component: {
-    CardMessagesSection,
     DirectIcon,
     CreateDirect
   },
diff --git a/plugins/communication-resources/src/plugin.ts b/plugins/communication-resources/src/plugin.ts
index c48754cbd8..939c02b5db 100644
--- a/plugins/communication-resources/src/plugin.ts
+++ b/plugins/communication-resources/src/plugin.ts
@@ -89,7 +89,9 @@ export default mergeIds(communicationId, communication, {
     MessageAlreadyHasCardAttached: '' as IntlString,
     Direct: '' as IntlString,
     Directs: '' as IntlString,
-    Members: '' as IntlString
+    Members: '' as IntlString,
+    WriteMessageEllipsis: '' as IntlString,
+    EditMessageEllipsis: '' as IntlString
   },
   messageActionImpl: {
     AddReaction: '' as MessageActionFunctionResource,
diff --git a/plugins/communication-resources/src/types.ts b/plugins/communication-resources/src/types.ts
index 29bfba5a36..f64443e37a 100644
--- a/plugins/communication-resources/src/types.ts
+++ b/plugins/communication-resources/src/types.ts
@@ -46,10 +46,13 @@ export interface AppletDraft {
   params: Record<string, any>
 }
 
+export type LinkPreviewDraft = LinkPreviewParams
+export type BlobDraft = BlobParams & { mimeType: string }
+
 export interface MessageDraft {
   _id: string
   content: Markup
-  blobs: Array<BlobParams & { mimeType: string }>
-  links: LinkPreviewParams[]
+  blobs: BlobDraft[]
+  links: LinkPreviewDraft[]
   applets: AppletDraft[]
 }
diff --git a/plugins/communication/src/index.ts b/plugins/communication/src/index.ts
index 307a86a60e..9854d12894 100644
--- a/plugins/communication/src/index.ts
+++ b/plugins/communication/src/index.ts
@@ -87,7 +87,8 @@ export default plugin(communicationId, {
     Voted: '' as IntlString,
     VotedFor: '' as IntlString,
     RevokedVote: '' as IntlString,
-    AnonymousQuiz: '' as IntlString
+    AnonymousQuiz: '' as IntlString,
+    ArrowDownMessages: '' as IntlString
   },
   ids: {
     CardMessagesSection: '' as Ref<CardSection>,
diff --git a/plugins/communication/src/types.ts b/plugins/communication/src/types.ts
index 83ef43892e..8e6405a2f5 100644
--- a/plugins/communication/src/types.ts
+++ b/plugins/communication/src/types.ts
@@ -21,11 +21,6 @@ import { PersonSpace } from '@hcengineering/contact'
 export * from './poll'
 export * from './direct'
 
-export enum MessagesNavigationAnchors {
-  ConversationStart = 'conversationStart',
-  LatestMessages = 'latestMessages'
-}
-
 export type MessageActionFunction = (
   message: Message,
   card: Card,
diff --git a/plugins/emoji/src/utils.ts b/plugins/emoji/src/utils.ts
index 6e52bdcba8..24fd921d96 100644
--- a/plugins/emoji/src/utils.ts
+++ b/plugins/emoji/src/utils.ts
@@ -28,7 +28,7 @@ import {
   type ShortcodesDataset
 } from 'emojibase'
 import emojiPlugin from './plugin'
-import { getResource } from '@hcengineering/platform'
+import { getResource, getResourceP } from '@hcengineering/platform'
 import { ParsedTextWithEmojis } from './types'
 
 export const emojiRegex = new RegExp(`(?:^|\\s)(${EMOJI_REGEX.source})$`)
@@ -81,4 +81,17 @@ async function loadParseEmojisFunction (): Promise<((text: string) => ParsedText
   }
 }
 
-export { fetchEmojis, fetchMessages, loadParseEmojisFunction, type Locale }
+function getParseEmojisFunction (): ((text: string) => ParsedTextWithEmojis) | undefined {
+  try {
+    const c = getResourceP(emojiPlugin.functions.ParseTextWithEmojis)
+    if (c instanceof Promise) {
+      return undefined
+    }
+    return c
+  } catch (e) {
+    console.log('Cannot locate emoji parsing function')
+    return undefined
+  }
+}
+
+export { fetchEmojis, fetchMessages, loadParseEmojisFunction, type Locale, getParseEmojisFunction }
diff --git a/plugins/inbox-resources/src/components/InboxApplication.svelte b/plugins/inbox-resources/src/components/InboxApplication.svelte
index fed8e6bd91..6c62fc2ad8 100644
--- a/plugins/inbox-resources/src/components/InboxApplication.svelte
+++ b/plugins/inbox-resources/src/components/InboxApplication.svelte
@@ -90,7 +90,7 @@
     if (docInfo._id !== doc?._id) {
       doc = await client.findOne(docInfo._class, { _id: docInfo._id })
 
-      if (doc != null && !hierarchy.isDerived(doc._class, cardPlugin.class.Card)) {
+      if (doc != null) {
         const queryContext = loc.query?.context as Ref<DocNotifyContext>
         const ctx =
           $contextByIdStore.get(queryContext) ?? $contextByDocStore.get(thread) ?? $contextByDocStore.get(urlObjectId)
diff --git a/plugins/process-resources/src/components/ProcessesCardSection.svelte b/plugins/process-resources/src/components/ProcessesCardSection.svelte
index 4fcf02a89d..88bdc6e234 100644
--- a/plugins/process-resources/src/components/ProcessesCardSection.svelte
+++ b/plugins/process-resources/src/components/ProcessesCardSection.svelte
@@ -18,11 +18,14 @@
   import ProcessesExtension from './ProcessesExtension.svelte'
 
   export let doc: Card
+  export let hidden: boolean = false
 </script>
 
-<div class="processes__section">
-  <ProcessesExtension card={doc} on:loaded />
-</div>
+{#if !hidden}
+  <div class="processes__section">
+    <ProcessesExtension card={doc} on:loaded />
+  </div>
+{/if}
 
 <style lang="scss">
   .processes__section {
diff --git a/plugins/view-resources/src/components/list/List.svelte b/plugins/view-resources/src/components/list/List.svelte
index 457d1bdb87..73ed660f3c 100644
--- a/plugins/view-resources/src/components/list/List.svelte
+++ b/plugins/view-resources/src/components/list/List.svelte
@@ -53,6 +53,7 @@
   export let selection: number | undefined = undefined
   export let compactMode: boolean = false
   export let listProvider: SelectionFocusProvider
+  export let singleCategoryLimit: number | undefined = undefined
 
   const limiter = new RateLimiter(10)
 
@@ -217,6 +218,7 @@
     {createItemDialogProps}
     {createItemLabel}
     {createItemEvent}
+    {singleCategoryLimit}
     on:check
     on:uncheckAll={uncheckAll}
     on:row-focus
diff --git a/plugins/view-resources/src/components/list/ListCategories.svelte b/plugins/view-resources/src/components/list/ListCategories.svelte
index 3ac7e29e31..7a7f5df0ce 100644
--- a/plugins/view-resources/src/components/list/ListCategories.svelte
+++ b/plugins/view-resources/src/components/list/ListCategories.svelte
@@ -86,6 +86,7 @@
   export let resultOptions: FindOptions<Doc>
   export let limiter: RateLimiter
   export let listProvider: SelectionFocusProvider
+  export let singleCategoryLimit: number | undefined = undefined
 
   $: groupByKey = viewOptions.groupBy[level] ?? noCategory
   let categories: CategoryType[] = []
@@ -400,6 +401,7 @@
     {configurationsVersion}
     {itemModels}
     {_class}
+    {singleCategoryLimit}
     parentCategories={categories.length}
     groupPersistKey={`${groupPersistKey}_${level}_${typeof category === 'object' ? category.name : category}`}
     singleCat={level === 0 && categories.length === 1}
diff --git a/plugins/view-resources/src/components/list/ListCategory.svelte b/plugins/view-resources/src/components/list/ListCategory.svelte
index 13d3182117..b3897c0480 100644
--- a/plugins/view-resources/src/components/list/ListCategory.svelte
+++ b/plugins/view-resources/src/components/list/ListCategory.svelte
@@ -89,6 +89,7 @@
   export let parentCategories: number = 0
   export let limiter: RateLimiter
   export let listProvider: SelectionFocusProvider
+  export let singleCategoryLimit = 50
 
   $: lastLevel = level + 1 >= viewOptions.groupBy.length
 
@@ -98,7 +99,7 @@
 
   const autoFoldLimit = 20
   const defaultLimit = 20
-  const singleCategoryLimit = 50
+
   let loading = false
   $: initialLimit = !lastLevel ? undefined : singleCat ? singleCategoryLimit : defaultLimit
   $: limit = initialLimit